Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit: read branch with workingctx
authorMatt Mackall <mpm@selenic.com>
Tue, 17 Oct 2006 22:26:14 -0500
changeset 3440 0f1fd9854cdc
parent 3439 a7ef6b6cc311
child 3441 ef2e990f9047
commit: read branch with workingctx
mercurial/localrepo.py file | annotate | diff | comparison | revisions 
--- a/mercurial/localrepo.py	Tue Oct 17 22:09:56 2006 -0500
+++ b/mercurial/localrepo.py	Tue Oct 17 22:26:14 2006 -0500
@@ -610,10 +610,7 @@
         m1 = self.manifest.read(c1[0]).copy()
         m2 = self.manifest.read(c2[0])
 
-        try:
-            branchname = self.opener("branch").read().rstrip()
-        except IOError:
-            branchname = ""
+        branchname = self.workingctx().branch()
         oldname = c1[5].get("branch", "")
 
         if not commit and not remove and not force and p2 == nullid and \
hg-stable