Merge branch 'master' of http://www.physics.drexel.edu/~wking/code/git/be

3 files changed, 17 insertions, 7 deletions

diff --git a/libbe/command/show.py b/libbe/command/show.py
index 27be07c..b24aa94 100644
--- a/libbe/command/show.py
+++ b/libbe/command/show.py
@@ -58,9 +58,9 @@ class Show (libbe.command.Command):
     <be-xml>
       <version>
         <tag>...</tag>
-        <branch-nick>...</branch-nick>
-        <revno>...</revno>
-        <revision-id>...</revision-id>
+        <committer>...</committer>
+        <date>...</date>
+        <revision>...</revision>
       </version>
       <bug>
         <uuid>a</uuid>
@@ -156,8 +156,7 @@ def _xml_header(encoding):
              '<be-xml>',
              '  <version>',
              '    <tag>%s</tag>' % libbe.version.version()]
-    for tag in ['branch-nick', 'revno', 'revision-id']:
-        value = libbe.version.version_info[tag.replace('-', '_')]
+    for tag,value in sorted(libbe.version.version_info.items()):
         lines.append('    <%s>%s</%s>' % (tag, value, tag))
     lines.append('  </version>')
     return lines
diff --git a/libbe/storage/vcs/bzr.py b/libbe/storage/vcs/bzr.py
index 616a486..583a8f6 100644
--- a/libbe/storage/vcs/bzr.py
+++ b/libbe/storage/vcs/bzr.py
@@ -136,12 +136,14 @@ class Bzr(base.VCS):
         cmd = bzrlib.builtins.cmd_root()
         cmd.outf = StringIO.StringIO()
         cmd.run(filename=path)
+        cmd.cleanup_now()
         return cmd.outf.getvalue().rstrip('\n')
 
     def _vcs_init(self, path):
         cmd = bzrlib.builtins.cmd_init()
         cmd.outf = StringIO.StringIO()
         cmd.run(location=path)
+        cmd.cleanup_now()
 
     def _vcs_destroy(self):
         vcs_dir = os.path.join(self.repo, '.bzr')
@@ -153,6 +155,7 @@ class Bzr(base.VCS):
         cmd = bzrlib.builtins.cmd_add()
         cmd.outf = StringIO.StringIO()
         cmd.run(file_list=[path], file_ids_from=self.repo)
+        cmd.cleanup_now()
 
     def _vcs_exists(self, path, revision=None):
         manifest = self._vcs_listdir(
@@ -167,6 +170,7 @@ class Bzr(base.VCS):
         cmd = bzrlib.builtins.cmd_remove()
         cmd.outf = StringIO.StringIO()
         cmd.run(file_list=[path], file_deletion_strategy='force')
+        cmd.cleanup_now()
 
     def _vcs_update(self, path):
         pass
@@ -202,6 +206,7 @@ class Bzr(base.VCS):
             if self.version_cmp(2,0,0) < 0:
                 cmd.outf = sys.stdout
                 sys.stdout = stdout
+            cmd.cleanup_now()
         return cmd.outf.getvalue()
 
     def _vcs_path(self, id, revision):
@@ -236,6 +241,8 @@ class Bzr(base.VCS):
             if 'not present in revision' in str(e):
                 raise base.InvalidPath(path, root=self.repo, revision=revision)
             raise
+        finally:
+            cmd.cleanup_now()
         children = cmd.outf.getvalue().rstrip('\n').splitlines()
         children = [self._u_rel_path(c, path) for c in children]
         if self.version_cmp(2,0,0) < 0 and recursive == False:
@@ -257,12 +264,14 @@ class Bzr(base.VCS):
             raise
         finally:
             os.chdir(cwd)
+            cmd.cleanup_now()
         return self._vcs_revision_id(-1)
 
     def _vcs_revision_id(self, index):
         cmd = bzrlib.builtins.cmd_revno()
         cmd.outf = StringIO.StringIO()
         cmd.run(location=self.repo)
+        cmd.cleanup_now()
         current_revision = int(cmd.outf.getvalue())
         if index > current_revision or index < -current_revision:
             return None
@@ -281,6 +290,7 @@ class Bzr(base.VCS):
             status = cmd.run(revision=revision, file_list=[self.repo])
         finally:
             sys.stdout = stdout
+            cmd.cleanup_now()
         assert status in [0,1], "Invalid status %d" % status
         return cmd.outf.getvalue()
 
diff --git a/libbe/storage/vcs/darcs.py b/libbe/storage/vcs/darcs.py
index 7ff4554..29b25eb 100644
--- a/libbe/storage/vcs/darcs.py
+++ b/libbe/storage/vcs/darcs.py
@@ -229,8 +229,9 @@ class Darcs(base.VCS):
                 descendents = [self._u_rel_path(f, path) for f in files
                                if f != '.']
             else:
-                descendents = [self._u_rel_path(f, path) for f in files
-                               if f.startswith(path)]
+                rel_files = [self._u_rel_path(f, path) for f in files]
+                descendents = [f for f in rel_files
+                               if f != '.' and not f.startswith('..')]
             return [f for f in descendents if f.count(os.path.sep) == 0]
         # Darcs versions <= 2.3.1 lack the --patch option for 'show files'
         raise NotImplementedError