Mercurial > hg > gitweb
diff mercurial/context.py @ 4209:dbc3846c09a1
Merge with -stable, fix small test failure
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 14 Mar 2007 01:26:09 -0500 |
| parents | eb0967c6e77b 7e1c8a565a4f |
| children | 0912d8df5e19 |
line wrap: on
line diff
--- a/mercurial/context.py Tue Mar 13 21:54:34 2007 -0700 +++ b/mercurial/context.py Wed Mar 14 01:26:09 2007 -0500 @@ -66,7 +66,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""" @@ -412,11 +412,7 @@ def deleted(self): return self._status[3] def unknown(self): return self._status[4] def clean(self): return self._status[5] - def branch(self): - try: - return self._repo.opener("branch").read().strip() - except IOError: - return "" + def branch(self): return self._repo.dirstate.branch() def parents(self): """return contexts for each parent changeset"""