Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor default branch cleanups
authorMatt Mackall <mpm@selenic.com>
Tue, 13 Mar 2007 15:47:55 -0500
changeset 4178 0b48e3985765
parent 4177 a7af0eeae8a3
child 4179 7e1c8a565a4f
Minor default branch cleanups
mercurial/context.py file | annotate | diff | comparison | revisions
mercurial/localrepo.py file | annotate | diff | comparison | revisions 
--- a/mercurial/context.py	Tue Mar 13 15:18:10 2007 -0500
+++ b/mercurial/context.py	Tue Mar 13 15:47:55 2007 -0500
@@ -67,7 +67,7 @@
     def date(self): return self._changeset[2]
     def files(self): return self._changeset[3]
     def description(self): return self._changeset[4]
-    def branch(self): return self._changeset[5].get("branch", "")
+    def branch(self): return self._changeset[5].get("branch")
 
     def parents(self):
         """return contexts for each parent changeset"""
--- a/mercurial/localrepo.py	Tue Mar 13 15:18:10 2007 -0500
+++ b/mercurial/localrepo.py	Tue Mar 13 15:47:55 2007 -0500
@@ -709,7 +709,7 @@
             branchname = ""
 
         if use_dirstate:
-            oldname = c1[5].get("branch") or "default" # stored in UTF-8
+            oldname = c1[5].get("branch") # stored in UTF-8
             if not commit and not remove and not force and p2 == nullid and \
                    branchname == oldname:
                 self.ui.status(_("nothing changed\n"))
Mercurial