This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5913

addremove: use uipathfn instead of m.rel() for recorded similatity message
ClosedPublic

Authored by martinvonz on Feb 8 2019, 5:31 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG0a5a6675c86c: addremove: use uipathfn instead of m.rel() for recorded similatity message
Summary

When no path arguments are given to addremove, it generally prints
absolute paths. However, before this patch, we would always print the
"recording removal of foo as rename to bar (78% similar)" message with
relative paths.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/scmutil.py (12 lines)

Diff 13994

mercurial/scmutil.py

status = _('adding %s\n') % uipathfn(abs) status = _('adding %s\n') % uipathfn(abs)
label = 'ui.addremove.added' label = 'ui.addremove.added'
else: else:
status = _('removing %s\n') % uipathfn(abs) status = _('removing %s\n') % uipathfn(abs)
label = 'ui.addremove.removed' label = 'ui.addremove.removed'
repo.ui.status(status, label=label) repo.ui.status(status, label=label)
renames = _findrenames(repo, m, added + unknown, removed + deleted, renames = _findrenames(repo, m, added + unknown, removed + deleted,
similarity) similarity, uipathfn)
if not dry_run: if not dry_run:
_markchanges(repo, unknown + forgotten, deleted, renames) _markchanges(repo, unknown + forgotten, deleted, renames)
for f in rejected: for f in rejected:
if f in m.files(): if f in m.files():
return 1 return 1
return ret return ret
toprint.update(deleted) toprint.update(deleted)
for abs in sorted(toprint): for abs in sorted(toprint):
if abs in unknownset: if abs in unknownset:
status = _('adding %s\n') % abs status = _('adding %s\n') % abs
else: else:
status = _('removing %s\n') % abs status = _('removing %s\n') % abs
repo.ui.status(status) repo.ui.status(status)
# TODO: We should probably have the caller pass in uipathfn and apply it to
# the messages above too. forcerelativevalue=True is consistent with how
# it used to work.
uipathfn = getuipathfn(repo, forcerelativevalue=True)
renames = _findrenames(repo, m, added + unknown, removed + deleted, renames = _findrenames(repo, m, added + unknown, removed + deleted,
similarity) similarity, uipathfn)
_markchanges(repo, unknown + forgotten, deleted, renames) _markchanges(repo, unknown + forgotten, deleted, renames)
for f in rejected: for f in rejected:
if f in m.files(): if f in m.files():
return 1 return 1
return 0 return 0
# for finding renames # for finding renames
elif dstate == 'r' and not st: elif dstate == 'r' and not st:
removed.append(abs) removed.append(abs)
elif dstate == 'a': elif dstate == 'a':
added.append(abs) added.append(abs)
return added, unknown, deleted, removed, forgotten return added, unknown, deleted, removed, forgotten
def _findrenames(repo, matcher, added, removed, similarity): def _findrenames(repo, matcher, added, removed, similarity, uipathfn):
'''Find renames from removed files to added ones.''' '''Find renames from removed files to added ones.'''
renames = {} renames = {}
if similarity > 0: if similarity > 0:
for old, new, score in similar.findrenames(repo, added, removed, for old, new, score in similar.findrenames(repo, added, removed,
similarity): similarity):
if (repo.ui.verbose or not matcher.exact(old) if (repo.ui.verbose or not matcher.exact(old)
or not matcher.exact(new)): or not matcher.exact(new)):
repo.ui.status(_('recording removal of %s as rename to %s ' repo.ui.status(_('recording removal of %s as rename to %s '
'(%d%% similar)\n') % '(%d%% similar)\n') %
(matcher.rel(old), matcher.rel(new), (uipathfn(old), uipathfn(new),
score * 100)) score * 100))
renames[new] = old renames[new] = old
return renames return renames
def _markchanges(repo, unknown, deleted, renames): def _markchanges(repo, unknown, deleted, renames):
'''Marks the files in unknown as added, the files in deleted as removed, '''Marks the files in unknown as added, the files in deleted as removed,
and the files in renames as copied.''' and the files in renames as copied.'''
wctx = repo[None] wctx = repo[None]