Mercurial > hg-stable
changeset 23481:94091ab9d112
addremove: restore the relative path printing when files are named
This fixes the previously mentioned issue with 3778884197f0, and undoes its
corresponding test change.
The test change demonstrates the correctness when a file is specified (i.e. the
glob is required on Windows because relative paths use '\' and absolute paths
use '/'). It is admittedly very subtle, but there will be a more robust test in
the addremove -S v3 series.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Thu, 04 Dec 2014 23:08:27 -0500 |
| parents | 88d2d77eb981 |
| children | 208ec8ca7c79 |
| files | mercurial/scmutil.py tests/test-addremove-similar.t |
| diffstat | 2 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/scmutil.py Thu Dec 04 23:04:55 2014 -0500 +++ b/mercurial/scmutil.py Thu Dec 04 23:08:27 2014 -0500 @@ -730,11 +730,10 @@ toprint.update(deleted) for abs in sorted(toprint): if repo.ui.verbose or not m.exact(abs): - rel = m.rel(abs) if abs in unknownset: - status = _('adding %s\n') % ((m.anypats() and rel) or abs) + status = _('adding %s\n') % m.uipath(abs) else: - status = _('removing %s\n') % ((m.anypats() and rel) or abs) + status = _('removing %s\n') % m.uipath(abs) repo.ui.status(status) renames = _findrenames(repo, m, added + unknown, removed + deleted,