Mercurial > hg

changeset 11300:24eeca1f2791

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Sune Foldager <cryo@cyanite.org>
date Mon, 07 Jun 2010 16:29:06 +0200
parents 3e46d76eaabf (current diff) 05ac42e56452 (diff)
children 3d0591a66118
files mercurial/hg.py tests/test-branch-option.out
diffstat 2 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/hg.py	Sun Jun 06 22:39:32 2010 +0530
+++ b/mercurial/hg.py	Mon Jun 07 16:29:06 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):
--- a/tests/test-branch-option.out	Sun Jun 06 22:39:32 2010 +0530
+++ b/tests/test-branch-option.out	Mon Jun 07 16:29:06 2010 +0200
@@ -19,7 +19,9 @@
 1:dd6e60a716c6
 2:f25d57ab0566
 out branch .
+1:b84708d77ab7
 2:65511d0e2b55
+1:b84708d77ab7
 2:65511d0e2b55
 clone branch b
 requesting all changes