Mercurial > hg-stable
changeset 4178:0b48e3985765
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 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"))