fix default branchheads() argument (e85951aeec6e was very broken)
authorDirkjan Ochtman <dirkjan@ochtman.nl>
Wed, 25 Jun 2008 10:54:48 +0200
changeset 6732 3e532b97d1e1
parent 6731 eed52e7ab9cc
child 6733 936a9073bb73
fix default branchheads() argument (e85951aeec6e was very broken)
mercurial/localrepo.py
--- a/mercurial/localrepo.py	Wed Jun 25 10:37:07 2008 +0200
+++ b/mercurial/localrepo.py	Wed Jun 25 10:54:48 2008 +0200
@@ -1205,7 +1205,7 @@
         return [n for (r, n) in heads]
 
     def branchheads(self, branch=None, start=None):
-        branch = branch is None and 'default' or self.workingctx().branch()
+        branch = branch is None and self.workingctx().branch() or branch
         branches = self.branchtags()
         if branch not in branches:
             return []