mercurial/subrepo.py
changeset 13096 6e74b912fa5c
parent 13095 49c7e875482d
child 13097 c922aacf6f1f
equal deleted inserted replaced
13095:49c7e875482d 13096:6e74b912fa5c
   680                                 '--verbose', '--no-abbrev'])
   680                                 '--verbose', '--no-abbrev'])
   681         for line in out.split('\n'):
   681         for line in out.split('\n'):
   682             if line[2:].startswith('(no branch)'):
   682             if line[2:].startswith('(no branch)'):
   683                 continue
   683                 continue
   684             branch, revision = line[2:].split()[:2]
   684             branch, revision = line[2:].split()[:2]
   685             if revision == '->':
   685             if revision == '->' or branch.endswith('/HEAD'):
   686                 continue # ignore remote/HEAD redirects
   686                 continue # ignore remote/HEAD redirects
       
   687             if '/' in branch and not branch.startswith('remotes/'):
       
   688                 # old git compatability
       
   689                 branch = 'remotes/' + branch
   687             if line[0] == '*':
   690             if line[0] == '*':
   688                 current = branch
   691                 current = branch
   689             branch2rev[branch] = revision
   692             branch2rev[branch] = revision
   690             rev2branch.setdefault(revision, []).append(branch)
   693             rev2branch.setdefault(revision, []).append(branch)
   691         return current, branch2rev, rev2branch
   694         return current, branch2rev, rev2branch