Mercurial > public > mercurial-scm > hg-stable
diff mercurial/commands.py @ 4045:1bd6868b0b11
merge with stable
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 24 Jan 2007 23:07:09 +0100 |
parents | a195f11ed1a2 31047b6f7ec1 |
children | 431f3c1d3a37 |
line wrap: on
line diff
--- a/mercurial/commands.py Wed Jan 24 23:06:45 2007 +0100 +++ b/mercurial/commands.py Wed Jan 24 23:07:09 2007 +0100 @@ -2372,8 +2372,7 @@ files, matchfn, anypats = cmdutil.matchpats(repo, pats, opts) cwd = (pats and repo.getcwd()) or '' modified, added, removed, deleted, unknown, ignored, clean = [ - [util.pathto(cwd, x) for x in n] - for n in repo.status(node1=node1, node2=node2, files=files, + n for n in repo.status(node1=node1, node2=node2, files=files, match=matchfn, list_ignored=all or opts['ignored'], list_clean=all or opts['clean'])] @@ -2398,11 +2397,11 @@ format = "%s %%s%s" % (char, end) for f in changes: - ui.write(format % f) + ui.write(format % util.pathto(cwd, f)) if ((all or opts.get('copies')) and not opts.get('no_status')): copied = repo.dirstate.copied(f) if copied: - ui.write(' %s%s' % (copied, end)) + ui.write(' %s%s' % (util.pathto(cwd, copied), end)) def tag(ui, repo, name, rev_=None, **opts): """add a tag for the current or given revision