Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/commands.py @ 2574:78c2903fcabe
merge with mpm.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Thu, 06 Jul 2006 15:04:10 -0700 |
parents | b13a98bd078e 82e3b2966862 |
children | 0875cda033fd |
comparison
equal
deleted
inserted
replaced
2572:b13a98bd078e | 2574:78c2903fcabe |
---|---|
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 |