Mercurial > public > mercurial-scm > hg

comparison mercurial/hg.py @ 12729:55f0648c7e2d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
incoming: rename variable Groundwork so that incoming and graphlog.incoming code look the same and get easier to unify.
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Thu, 14 Oct 2010 21:37:00 +0200
parents 40852b4b910c
children 33e1fd2aeb3c
comparison
equal deleted inserted replaced
12728:80a3d1121c10 12729:55f0648c7e2d
457 cleanup = None 457 cleanup = None
458 if not other.local(): 458 if not other.local():
459 # use the created uncompressed bundlerepo 459 # use the created uncompressed bundlerepo
460 other = bundlerepo.bundlerepository(ui, repo.root, fname) 460 other = bundlerepo.bundlerepository(ui, repo.root, fname)
461 461
462 o = other.changelog.nodesbetween(incoming, revs)[0] 462 chlist = other.changelog.nodesbetween(incoming, revs)[0]
463 if opts.get('newest_first'): 463 if opts.get('newest_first'):
464 o.reverse() 464 chlist.reverse()
465 displayer = cmdutil.show_changeset(ui, other, opts) 465 displayer = cmdutil.show_changeset(ui, other, opts)
466 count = 0 466 count = 0
467 for n in o: 467 for n in chlist:
468 if limit is not None and count >= limit: 468 if limit is not None and count >= limit:
469 break 469 break
470 parents = [p for p in other.changelog.parents(n) if p != nullid] 470 parents = [p for p in other.changelog.parents(n) if p != nullid]
471 if opts.get('no_merges') and len(parents) == 2: 471 if opts.get('no_merges') and len(parents) == 2:
472 continue 472 continue