Show More
@@ -2378,8 +2378,7 b' def status(ui, repo, *pats, **opts):' | |||||
2378 | files, matchfn, anypats = cmdutil.matchpats(repo, pats, opts) |
|
2378 | files, matchfn, anypats = cmdutil.matchpats(repo, pats, opts) | |
2379 | cwd = (pats and repo.getcwd()) or '' |
|
2379 | cwd = (pats and repo.getcwd()) or '' | |
2380 | modified, added, removed, deleted, unknown, ignored, clean = [ |
|
2380 | modified, added, removed, deleted, unknown, ignored, clean = [ | |
2381 | [util.pathto(cwd, x) for x in n] |
|
2381 | n for n in repo.status(node1=node1, node2=node2, files=files, | |
2382 | for n in repo.status(node1=node1, node2=node2, files=files, |
|
|||
2383 | match=matchfn, |
|
2382 | match=matchfn, | |
2384 | list_ignored=all or opts['ignored'], |
|
2383 | list_ignored=all or opts['ignored'], | |
2385 | list_clean=all or opts['clean'])] |
|
2384 | list_clean=all or opts['clean'])] | |
@@ -2404,11 +2403,11 b' def status(ui, repo, *pats, **opts):' | |||||
2404 | format = "%s %%s%s" % (char, end) |
|
2403 | format = "%s %%s%s" % (char, end) | |
2405 |
|
2404 | |||
2406 | for f in changes: |
|
2405 | for f in changes: | |
2407 | ui.write(format % f) |
|
2406 | ui.write(format % util.pathto(cwd, f)) | |
2408 | if ((all or opts.get('copies')) and not opts.get('no_status')): |
|
2407 | if ((all or opts.get('copies')) and not opts.get('no_status')): | |
2409 | copied = repo.dirstate.copied(f) |
|
2408 | copied = repo.dirstate.copied(f) | |
2410 | if copied: |
|
2409 | if copied: | |
2411 | ui.write(' %s%s' % (copied, end)) |
|
2410 | ui.write(' %s%s' % (util.pathto(cwd, copied), end)) | |
2412 |
|
2411 | |||
2413 | def tag(ui, repo, name, rev_=None, **opts): |
|
2412 | def tag(ui, repo, name, rev_=None, **opts): | |
2414 | """add a tag for the current or given revision |
|
2413 | """add a tag for the current or given revision |
General Comments 0
You need to be logged in to leave comments.
Login now