File hg-convert_fix_git_convert_using_servers_branch... of Package mercurial

Overview Repositories Revisions Requests Users Attributes Meta

File hg-convert_fix_git_convert_using_servers_branches.name of Package mercurial (Revision 541720e06497e06670c314ccb2f99e55)

Currently displaying revision 541720e06497e06670c314ccb2f99e55 , Show latest

# HG changeset patch
# User Durham Goode <durham@fb.com>
# Date 1438201263 25200
#      Wed Jul 29 13:21:03 2015 -0700
# Node ID 80149d0b6842713b8fdebf34404fc3520306c7a2
# Parent  fbaa2de13cf62c454d8a939c7e691857d9b814aa
convert: fix git convert using servers branches

The conversion from git to hg was reading the remote branch list directly from
the origin server. If the origin's branch had moved forward since the last git
fetch, it would return a git hash which didn't exist locally, and therefore the
branch was not converted.

This changes it to rely on the local repo's refs/remotes list of branches
instead, so it's completely cut off from the server.

---
 hgext/convert/git.py     |   39 +++++++++++++++++++++------------------
 tests/test-convert-git.t |   22 ++++++++++++++++++++++
 2 files changed, 43 insertions(+), 18 deletions(-)

--- a/hgext/convert/git.py
+++ b/hgext/convert/git.py
@@ -377,28 +377,31 @@ class convert_git(converter_source):
     def getbookmarks(self):
         bookmarks = {}
 
-        # Interesting references in git are prefixed
-        prefix = 'refs/heads/'
-        prefixlen = len(prefix)
-
-        # factor two commands
+        # Handle local and remote branches
         remoteprefix = self.ui.config('convert', 'git.remoteprefix', 'remote')
-        gitcmd = { remoteprefix + '/': 'git ls-remote --heads origin',
-                                   '': 'git show-ref'}
+        reftypes = [
+            # (git prefix, hg prefix)
+            ('refs/remotes/origin/', remoteprefix + '/'),
+            ('refs/heads/', '')
+        ]
+
+        exclude = set([
+            'refs/remotes/origin/HEAD',
+        ])
 
-        # Origin heads
-        for reftype in gitcmd:
-            try:
-                fh = self.gitopen(gitcmd[reftype], err=subprocess.PIPE)
-                for line in fh:
-                    line = line.strip()
-                    rev, name = line.split(None, 1)
-                    if not name.startswith(prefix):
+        try:
+            fh = self.gitopen('git show-ref', err=subprocess.PIPE)
+            for line in fh:
+                line = line.strip()
+                rev, name = line.split(None, 1)
+                # Process each type of branch
+                for gitprefix, hgprefix in reftypes:
+                    if not name.startswith(gitprefix) or name in exclude:
                         continue
-                    name = '%s%s' % (reftype, name[prefixlen:])
+                    name = '%s%s' % (hgprefix, name[len(gitprefix):])
                     bookmarks[name] = rev
-            except Exception:
-                pass
+        except Exception:
+            pass
 
         return bookmarks
 
--- a/tests/test-convert-git.t
+++ b/tests/test-convert-git.t
@@ -678,6 +678,28 @@ a block, so do this for now.
      master                    0:03bf38caa4c6
      origin/master             0:03bf38caa4c6
 
+Run convert when the remote branches have changed
+(there was an old bug where the local convert read branches from the server)
+
+  $ cd git-repo7
+  $ echo a >> a
+  $ git commit -am "move master forward"
+  [master 0c81947] move master forward
+   Author: nottest <test@example.org>
+   1 file changed, 1 insertion(+)
+  $ cd ..
+  $ rm -rf hg-repo7
+  $ hg convert --config convert.git.remoteprefix=origin git-repo7-client hg-repo7
+  initializing destination hg-repo7 repository
+  scanning source...
+  sorting...
+  converting...
+  0 commit a
+  updating bookmarks
+  $ hg -R hg-repo7 bookmarks
+     master                    0:03bf38caa4c6
+     origin/master             0:03bf38caa4c6
+
 damaged git repository tests:
 In case the hard-coded hashes change, the following commands can be used to
 list the hashes and their corresponding types in the repository:

Places

File hg-convert_fix_git_convert_using_servers_branches.name of Package mercurial (Revision 541720e06497e06670c314ccb2f99e55)

Places