Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: work around old git's remote naming scheme
authorEric Eisner <ede@mit.edu>
Mon, 06 Dec 2010 21:17:27 -0500
changeset 13096 6e74b912fa5c
parent 13095 49c7e875482d
child 13097 c922aacf6f1f
subrepo: work around old git's remote naming scheme Older git versions use 'origin/master' Current git uses 'remotes/origin/master'
mercurial/subrepo.py file | annotate | diff | comparison | revisions 
--- a/mercurial/subrepo.py	Mon Dec 06 21:17:27 2010 -0500
+++ b/mercurial/subrepo.py	Mon Dec 06 21:17:27 2010 -0500
@@ -682,8 +682,11 @@
             if line[2:].startswith('(no branch)'):
                 continue
             branch, revision = line[2:].split()[:2]
-            if revision == '->':
+            if revision == '->' or branch.endswith('/HEAD'):
                 continue # ignore remote/HEAD redirects
+            if '/' in branch and not branch.startswith('remotes/'):
+                # old git compatability
+                branch = 'remotes/' + branch
             if line[0] == '*':
                 current = branch
             branch2rev[branch] = revision
Mercurial