Mercurial > public > mercurial-scm > hg-stable
diff mercurial/hg.py @ 11299:05ac42e56452 stable
push/pull: fix bug in "--branch ." handling
The branch wasn't expanded, so only the tip was operated on.
| author | Sune Foldager <cryo@cyanite.org> |
|---|---|
| date | Mon, 07 Jun 2010 16:28:23 +0200 |
| parents | e4dbaa40096d |
| children | 24eeca1f2791 deaeb2d84d8a |
line wrap: on
line diff
--- a/mercurial/hg.py Tue Jun 01 18:29:52 2010 -0400 +++ b/mercurial/hg.py Mon Jun 07 16:28:23 2010 +0200 @@ -30,13 +30,12 @@ if branch == '.': if not lrepo or not lrepo.local(): raise util.Abort(_("dirstate branch not accessible")) - revs.append(lrepo.dirstate.branch()) + branch = lrepo.dirstate.branch() + butf8 = encoding.fromlocal(branch) + if butf8 in branchmap: + revs.extend(node.hex(r) for r in reversed(branchmap[butf8])) else: - butf8 = encoding.fromlocal(branch) - if butf8 in branchmap: - revs.extend(node.hex(r) for r in reversed(branchmap[butf8])) - else: - revs.append(branch) + revs.append(branch) return revs, revs[0] def parseurl(url, branches=None):