merge with stable

mercurial/hg.py

@@ -30,13 +30,12 b' def addbranchrevs(lrepo, repo, branches,'
         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):

tests/test-branch-option.out

@@ -19,7 +19,9 b' 2:f25d57ab0566'
 1:dd6e60a716c6
 2:f25d57ab0566
 out branch .
+1:b84708d77ab7
 2:65511d0e2b55
+1:b84708d77ab7
 2:65511d0e2b55
 clone branch b
 requesting all changes