Mercurial > public > mercurial-scm > hg-stable
comparison 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 |
comparison
equal
deleted
inserted
replaced
4208:bd9b84b9a84b | 4209:dbc3846c09a1 |
---|---|
64 def node(self): return self._node | 64 def node(self): return self._node |
65 def user(self): return self._changeset[1] | 65 def user(self): return self._changeset[1] |
66 def date(self): return self._changeset[2] | 66 def date(self): return self._changeset[2] |
67 def files(self): return self._changeset[3] | 67 def files(self): return self._changeset[3] |
68 def description(self): return self._changeset[4] | 68 def description(self): return self._changeset[4] |
69 def branch(self): return self._changeset[5].get("branch", "") | 69 def branch(self): return self._changeset[5].get("branch") |
70 | 70 |
71 def parents(self): | 71 def parents(self): |
72 """return contexts for each parent changeset""" | 72 """return contexts for each parent changeset""" |
73 p = self._repo.changelog.parents(self._node) | 73 p = self._repo.changelog.parents(self._node) |
74 return [changectx(self._repo, x) for x in p] | 74 return [changectx(self._repo, x) for x in p] |
410 def added(self): return self._status[1] | 410 def added(self): return self._status[1] |
411 def removed(self): return self._status[2] | 411 def removed(self): return self._status[2] |
412 def deleted(self): return self._status[3] | 412 def deleted(self): return self._status[3] |
413 def unknown(self): return self._status[4] | 413 def unknown(self): return self._status[4] |
414 def clean(self): return self._status[5] | 414 def clean(self): return self._status[5] |
415 def branch(self): | 415 def branch(self): return self._repo.dirstate.branch() |
416 try: | |
417 return self._repo.opener("branch").read().strip() | |
418 except IOError: | |
419 return "" | |
420 | 416 |
421 def parents(self): | 417 def parents(self): |
422 """return contexts for each parent changeset""" | 418 """return contexts for each parent changeset""" |
423 return self._parents | 419 return self._parents |
424 | 420 |