Mercurial > public > mercurial-scm > hg

comparison mercurial/revlog.py @ 16686:67964cda8701

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup: "not x in y" -> "x not in y"
author Brodie Rao <brodie@sf.io>
date Sat, 12 May 2012 16:00:57 +0200
parents e410be860393
children 93f8b9565257
comparison
equal deleted inserted replaced
16685:43d55088415a 16686:67964cda8701
1206 # this can happen if two branches make the same change 1206 # this can happen if two branches make the same change
1207 chain = node 1207 chain = node
1208 continue 1208 continue
1209 1209
1210 for p in (p1, p2): 1210 for p in (p1, p2):
1211 if not p in self.nodemap: 1211 if p not in self.nodemap:
1212 raise LookupError(p, self.indexfile, 1212 raise LookupError(p, self.indexfile,
1213 _('unknown parent')) 1213 _('unknown parent'))
1214 1214
1215 if deltabase not in self.nodemap: 1215 if deltabase not in self.nodemap:
1216 raise LookupError(deltabase, self.indexfile, 1216 raise LookupError(deltabase, self.indexfile,