mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 07:49:11 +03:00
Copied files sources were not shown by status -C under Win32.
repo.dirstate.copied() takes a normalized paths while local paths were passed.
This commit is contained in:
parent
83a6730e68
commit
f73963b537
@ -2378,8 +2378,7 @@ def status(ui, repo, *pats, **opts):
|
||||
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'])]
|
||||
@ -2404,11 +2403,11 @@ def status(ui, repo, *pats, **opts):
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user