Changeset 457

Timestamp:

29-12-09 21:21:52 (3 years ago)

Author:

jelmer

bzr:base-revision:

svn-v4:375192ae-a00c-0410-900a-bafd95fcb19a:trunk:456

bzr:committer:

Jelmer Vernooij <jelmer@samba.org>

bzr:file-ids:

moap/test/test_vcs_bzr.py 258@375192ae-a00c-0410-900a-bafd95fcb19a:trunk%2Fmoap%2Ftest%2Ftest_vcs_bzr.py
moap/vcs/bzr.py 256@375192ae-a00c-0410-900a-bafd95fcb19a:trunk%2Fmoap%2Fvcs%2Fbzr.py

bzr:mapping-version:

v4

bzr:repository-uuid:

375192ae-a00c-0410-900a-bafd95fcb19a

bzr:revision-id:

jelmer@samba.org-20091229163546-ybnssv2k37df4bgj

bzr:revno:

441

bzr:revprop:branch-nick:

trunk

bzr:revprop:bugs:

http://thomas.apestaart.org/moap/trac/ticket/296 fixed

bzr:root:

trunk

bzr:text-parents:

moap/test/test_vcs_bzr.py svn-v4:375192ae-a00c-0410-900a-bafd95fcb19a:trunk:402
moap/vcs/bzr.py svn-v4:375192ae-a00c-0410-900a-bafd95fcb19a:trunk:419

bzr:timestamp:

2009-12-29 17:35:46.413000107 +0100

bzr:user-agent:

bzr2.0.3+bzr-svn1.0.2dev0

svn:original-date:

2009-12-29T16:35:46.413000Z

Message:

Use bzrlib directly for bzr branches rather than invoking the bzr command.

This fixes some of the tests for me and it should make use of bzr from moap somewhat faster.

Location:

trunk/moap

Files:

• test/test_vcs_bzr.py (modified) (1 diff)
• vcs/bzr.py (modified) (5 diffs)

trunk/moap/test/test_vcs_bzr.py

@@ -90 +90 @@
         v.ignore(['test', ])
         
+        self.assertEquals(v.getIgnored(v.path), ["test"])
         self.assertEquals(v.getUnknown(v.path), [])
 

trunk/moap/vcs/bzr.py

@@ -6 +6 @@
 """
 
-import os
-import commands
+from cStringIO import StringIO
 import re
 
@@ -19 +18 @@
     @return: True if the given path looks like a Bazaar tree.
     """
-    while path and path != '/':
-        if (os.path.exists(os.path.join(path, '.bzr'))
-            and os.path.exists(os.path.join(path, '.bzr', 'checkout'))):
-            return True
-        path = os.path.dirname(path)
-    return False
+    from bzrlib.bzrdir import BzrDir
+    from bzrlib.errors import NotBranchError
+    try:
+        return BzrDir.open(path).has_workingtree()
+    except NotBranchError:
+        return False
 
 
@@ -31 +30 @@
 
     def getUnknown(self, path):
-        oldPath = os.getcwd()
-        os.chdir(path)
+        wt, _ = self._get_workingtree()
+        return list(wt.unknowns())
 
-        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 getIgnored(self, path):
+        wt, _ = self._get_workingtree()
+        wt.lock_read()
+        try:
+            return [path for path, pattern in wt.ignored_files()]
+        finally:
+            wt.unlock()
 
     def ignore(self, paths, commit=True):
@@ -46 +45 @@
             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)
+        wt, _ = self._get_workingtree()
 
-        if commit:
-            self.commit([os.path.join(self.path, '.bzrignore'), ],
-                        'moap ignore')
+        from bzrlib.ignores import tree_ignores_add_patterns
 
-        os.chdir(oldPath)
+        tree_ignores_add_patterns(wt, paths)
+
+        wt.commit(message="moap ignore", specific_files=['.bzrignore'])
+
+    def _get_workingtree(self):
+        from bzrlib.workingtree import WorkingTree
+        return WorkingTree.open_containing(self.path)
 
     def commit(self, paths, message):
-        try:
-            oldPath = os.getcwd()
-            os.chdir(self.path)
-            temp = util.writeTemp([message, ])
-            os.system("bzr commit --file %s %s" % (temp, " ".join(paths)))
-            os.unlink(temp)
-        finally:
-            os.chdir(oldPath)
+        wt, _ = self._get_workingtree() 
+        wt.commit(message=message, specific_files=paths)
 
     def diff(self, path, revision1=None, revision2=None):
-        output = commands.getoutput("bzr diff %s" % path)
-
-        return output
+        from bzrlib.diff import show_diff_trees
+        wt, _ = self._get_workingtree()
+        outf = StringIO()
+        show_diff_trees(wt.basis_tree(), wt, outf, [wt.relpath(path)],
+                        old_label="", new_label="")
+        outf.seek(0)
+        return outf.read()
 
     def getFileMatcher(self):
@@ -80 +76 @@
 
     def update(self, path, revision=None):
-        # FIXME: No way to pull just updates to the given path
-        status, output = commands.getstatusoutput("bzr pull")
-        if status != 0:
-            raise vcs.VCSException(output)
-
-        return output
+        wt, _ = self._get_workingtree()
+        wt.pull()
+        return ""
 
 VCSClass = Bzr