Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/commands.py @ 3622:535da78ae47b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with upstream
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 07 Nov 2006 22:18:34 +0100
parents 8c4fd0de5de8
children 44e75d9fa654
comparison
equal deleted inserted replaced
3619:7d3d603e7df9 3622:535da78ae47b
322 322
323 hexfunc = self.ui.debugflag and hex or short 323 hexfunc = self.ui.debugflag and hex or short
324 324
325 parents = log.parentrevs(rev) 325 parents = log.parentrevs(rev)
326 if not self.ui.debugflag: 326 if not self.ui.debugflag:
327 parents = [p for p in parents if p != nullrev] 327 if parents[1] == nullrev:
328 if len(parents) == 1 and parents[0] == rev-1: 328 if parents[0] >= rev - 1:
329 parents = [] 329 parents = []
330 else:
331 parents = [parents[0]]
330 parents = [(p, hexfunc(log.node(p))) for p in parents] 332 parents = [(p, hexfunc(log.node(p))) for p in parents]
331
332 333
333 self.ui.write(_("changeset: %d:%s\n") % (rev, hexfunc(changenode))) 334 self.ui.write(_("changeset: %d:%s\n") % (rev, hexfunc(changenode)))
334 335
335 if branch: 336 if branch:
336 self.ui.write(_("branch: %s\n") % branch) 337 self.ui.write(_("branch: %s\n") % branch)