Changeset 257

Timestamp:

26-05-07 13:21:34 (6 years ago)

Author:

thomas

Message:

Patch by: Andy Wingo <wingo at pobox dot com>

• moap/vcs/Makefile.am:
• moap/vcs/bzr.py (_getoutput, _getstatusoutput, detect, Bzr, Bzr.getNotIgnored, Bzr.ignore, Bzr.commit, Bzr.diff, Bzr.getFileMatcher, Bzr.update): Added Bazaar backend. Fixes #243.

File:

• trunk/moap/vcs/bzr.py (modified) (4 diffs)

trunk/moap/vcs/bzr.py

@@ -8 +8 @@
 import os
 import commands
-import subprocess
 import re
 
@@ -14 +13 @@
 from moap.vcs import vcs
 
-def _getoutput(argv):
-    return subprocess.Popen(argv, stdout=subprocess.PIPE).communicate()[0]
-
-def _getstatusoutput(argv):
-    p = subprocess.Popen(argv, stdout=subprocess.PIPE)
-    out = p.communicate()[0]
-    return p.returncode, out
-
 def detect(path):
     """
-    Detect if the given source tree is using Bzr.
+    Detect if the given source tree is using Bazaar.
 
-    @return: True if the given path looks like a Bzr tree.
+    @return: True if the given path looks like a Bazaar tree.
     """
     while path and path != '/':
@@ -40 +31 @@
 
     def getNotIgnored(self):
-        return _getoutput(["bzr", "unknowns"]).split('\n')
+        oldPath = os.getcwd()
+        os.chdir(self.path)
+
+        result = commands.getoutput("bzr unknowns").split('\n')
+        # one empty line does not a return value make
+        if result and result == ['']:
+            result = []
+
+        os.chdir(oldPath)
+        return result
 
     def ignore(self, paths, commit=True):
-        subprocess.call(['bzr', 'ignore'] + list(paths))
+        if not paths:
+            return
+
+        oldPath = os.getcwd()
+        os.chdir(self.path)
+
+        self.debug("Ignoring %d paths" % len(paths))
+
+        cmd = "bzr ignore %s" % " ".join(paths)
+        self.debug("Running %s" % cmd)
+        os.system(cmd)
+
         if commit:
-            self.commit([os.path.join(self.path, '.bzrignore'),],
+            self.commit([os.path.join(self.path, '.bzrignore'), ],
                         'moap ignore')
+
+        os.chdir(oldPath)
 
     def commit(self, paths, message):
         try:
-            curpath = os.getcwd()
+            oldPath = os.getcwd()
             os.chdir(self.path)
-            subprocess.call(['bzr', 'commit', '-m', message] + paths)
+            os.system("bzr commit -m \"%s\" %s" % (message, " ".join(paths)))
         finally:
-            os.chdir(curpath)
+            os.chdir(oldPath)
 
     def diff(self, path):
-        return _getoutput(['bzr', 'diff'])
+        oldPath = os.getcwd()
+        os.chdir(path)
+
+        output = commands.getoutput("bzr diff")
+
+        os.chdir(oldPath)
+        return output
 
     def getFileMatcher(self):
@@ -64 +83 @@
     def update(self, path):
         # FIXME: No way to pull just updates to the given path
-        status, output = _getstatusoutput(['bzr', 'pull'])
+        status, output = commands.getstatusoutput("bzr pull")
         if status != 0:
             raise vcs.VCSException(output)