comparison mercurial/context.py @ 3203:14792adabf80

Merge with upstream
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 30 Sep 2006 09:46:03 +0200
parents 5c93dd0ae413 05c588e1803d
children 9e8dd6114a4e
comparison
equal deleted inserted replaced
3195:f8e67b7c57a4 3203:14792adabf80
30 return 30 return
31 31
32 self._node = self._repo.lookup(changeid) 32 self._node = self._repo.lookup(changeid)
33 self._rev = self._repo.changelog.rev(self._node) 33 self._rev = self._repo.changelog.rev(self._node)
34 34
35 def __str__(self):
36 return short(self.node())
37
35 def __repr__(self): 38 def __repr__(self):
36 return "<changectx %s>" % short(self.node()) 39 return "<changectx %s>" % short(self.node())
40
41 def __eq__(self, other):
42 return self._rev == other._rev
43
44 def __nonzero__(self):
45 return self._rev != -1
37 46
38 def changeset(self): 47 def changeset(self):
39 try: 48 try:
40 return self._changeset 49 return self._changeset
41 except AttributeError: 50 except AttributeError:
125 self._filerev = self._filelog.rev(self._filenode) 134 self._filerev = self._filelog.rev(self._filenode)
126 return self._filerev 135 return self._filerev
127 else: 136 else:
128 raise AttributeError, name 137 raise AttributeError, name
129 138
139 def __nonzero__(self):
140 return self._filerev != nullid
141
142 def __str__(self):
143 return "%s@%s" % (self.path(), short(self.node()))
144
130 def __repr__(self): 145 def __repr__(self):
131 return "<filectx %s@%s>" % (self.path(), short(self.node())) 146 return "<filectx %s@%s>" % (self.path(), short(self.node()))
147
148 def __eq__(self, other):
149 return self._path == other._path and self._changeid == other._changeid
132 150
133 def filerev(self): return self._filerev 151 def filerev(self): return self._filerev
134 def filenode(self): return self._filenode 152 def filenode(self): return self._filenode
135 def filelog(self): return self._filelog 153 def filelog(self): return self._filelog
136 154