Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/commands.py @ 2573:82e3b2966862

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix annotate breakage
author Matt Mackall <mpm@selenic.com>
date Thu, 06 Jul 2006 14:15:24 -0500
parents 2748253b49c2
children 78c2903fcabe
comparison
equal deleted inserted replaced
2567:2748253b49c2 2573:82e3b2966862
763 if not opts['user'] and not opts['changeset'] and not opts['date']: 763 if not opts['user'] and not opts['changeset'] and not opts['date']:
764 opts['number'] = 1 764 opts['number'] = 1
765 765
766 ctx = repo.changectx(opts['rev'] or repo.dirstate.parents()[0]) 766 ctx = repo.changectx(opts['rev'] or repo.dirstate.parents()[0])
767 767
768 for src, abs, rel, exact in walk(repo, pats, opts, node=node): 768 for src, abs, rel, exact in walk(repo, pats, opts, node=ctx.node()):
769 fctx = ctx.filectx(abs) 769 fctx = ctx.filectx(abs)
770 if not opts['text'] and util.binary(fctx.data()): 770 if not opts['text'] and util.binary(fctx.data()):
771 ui.write(_("%s: binary file\n") % ((pats and rel) or abs)) 771 ui.write(_("%s: binary file\n") % ((pats and rel) or abs))
772 continue 772 continue
773 773