Mercurial > hg > mercurial-crew-with-dirclash

changeset 4206:0b48e3985765

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor default branch cleanups
author Matt Mackall <mpm@selenic.com>
date Tue, 13 Mar 2007 15:47:55 -0500
parents a7af0eeae8a3
children 7e1c8a565a4f
files mercurial/context.py mercurial/localrepo.py
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -67,7 +67,7 @@ class changectx(object):
     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
+++ b/mercurial/localrepo.py
@@ -709,7 +709,7 @@ class localrepository(repo.repository):
             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"))