comparison mercurial/commands.py @ 3256:7c114915fbdb

Make status -C work with merge+rename
author Matt Mackall <mpm@selenic.com>
date Wed, 04 Oct 2006 17:59:27 -0500
parents 53e843840349
children bb057b6ce3cf
comparison
equal deleted inserted replaced
3255:f05c182430a0 3256:7c114915fbdb
2530 else: 2530 else:
2531 format = "%s %%s%s" % (char, end) 2531 format = "%s %%s%s" % (char, end)
2532 2532
2533 for f in changes: 2533 for f in changes:
2534 ui.write(format % f) 2534 ui.write(format % f)
2535 if ((all or opts.get('copies')) and not opts.get('no_status') 2535 if ((all or opts.get('copies')) and not opts.get('no_status')):
2536 and opt == 'added'):
2537 copied = repo.dirstate.copied(f) 2536 copied = repo.dirstate.copied(f)
2538 if copied: 2537 if copied:
2539 ui.write(' %s%s' % (copied, end)) 2538 ui.write(' %s%s' % (copied, end))
2540 2539
2541 def tag(ui, repo, name, rev_=None, **opts): 2540 def tag(ui, repo, name, rev_=None, **opts):