Merge lp:~acsone-openerp/anybox.recipe.openerp/trunk-bug-1234014-lmi into lp:anybox.recipe.openerp

[Laurent Mignon (Acsone)]

we need to use the command 'git pull' to update a tracked branch

[lp:~acsone-openerp/anybox.recipe.openerp/trunk-bug-1234014-lmi]

514. By Laurent Mignon (Acsone) on 2014-05-23

[MRG] lp:anybox.recipe.openerp r523

515. By Laurent Mignon (Acsone) on 2014-05-23

[FIX] lp:1234014 add test to avoid regression

[Laurent Mignon (Acsone) (lmi)]

Hi Georges,

I finally added the unit test. Without this patch the branches from git are never updated when running the buildout...

Regards,

lmi

[Georges Racinet (gracinet)]

Test passes for me, I'm merging in trunk and will backport to current stable branch (1.8)
Sorry for being so slow on this one !

I guess we'll use much more Git now :-)

=== modified file 'anybox/recipe/openerp/vcs/git.py'
--- anybox/recipe/openerp/vcs/git.py	2013-09-08 21:48:12 +0000
+++ anybox/recipe/openerp/vcs/git.py	2014-05-23 15:17:21 +0000
@@ -80,6 +80,12 @@
                             target_dir, revision)
                 self._switch(revision)
 
+            if self._isATrackedBranch(revision):
+                if not offline:
+                    logger.info("Pull for git repo %s (rev %s)...",
+                                target_dir, rev_str)
+                    subprocess.check_call(['git', 'pull'])
+
     def archive(self, target_path):
         revision = self.parents()[0]
         if not os.path.exists(target_path):
@@ -95,6 +101,14 @@
                                    '-C', target_path])
             os.unlink(target_tar.name)
 
+    def _isATrackedBranch(self, revision):
+        rbp = self._remote_branch_prefix
+        branches = utils.check_output(["git", "branch", "-a"])
+        branch = revision
+        return re.search(
+            "^  " + re.escape(rbp) + "\/" + re.escape(branch) + "$", branches,
+            re.M)
+
     def _needToSwitchRevision(self, revision):
         """ Check if we need to checkout to an other branch
         """

=== modified file 'anybox/recipe/openerp/vcs/tests/test_git.py'
--- anybox/recipe/openerp/vcs/tests/test_git.py	2013-09-15 12:57:12 +0000
+++ anybox/recipe/openerp/vcs/tests/test_git.py	2014-05-23 15:17:21 +0000
@@ -137,6 +137,24 @@
             f.write('mod')
         self.assertTrue(repo.uncommitted_changes())
 
+    def test_update_needs_pull(self):
+        """Update needs to be pulled from target."""
+        target_dir = os.path.join(self.dst_dir, "clone to update")
+        repo = GitRepo(target_dir, self.src_repo)
+        repo('master')
+
+        self.assertFalse(repo.uncommitted_changes())
+        
+        # update the cloned repo
+        new_sha = git_write_commit(self.src_repo, 'tracked',
+                                             "new content", msg="new commit")
+        # We really don't have the new rev in our clone
+        self.assertNotEqual(repo.parents(), [new_sha])
+
+        # update our clone
+        repo('master')
+        self.assertEqual(repo.parents(), [new_sha])
+
 
 class GitBranchTestCase(GitBaseTestCase):