mercurial-scm/hg: mercurial/cmdutil.py comparison

comparison mercurial/cmdutil.py @ 41605:7068c6b0114b

revert: respect ui.relative-paths Differential Revision: https://phab.mercurial-scm.org/D5874

author	Martin von Zweigbergk <martinvonz@google.com>
date	Tue, 05 Feb 2019 10:30:05 -0800
parents	9e545c9a4dfe
children	93620a4ba88d

comparison

equal deleted inserted replaced

-:e944cf4ce1a8
+:7068c6b0114b
 # `names` is a mapping for all elements in working copy and target revision
 # The mapping is in the form:
 #   <abs path in repo> -> (<path from CWD>, <exactly specified by matcher?>)
 names = {}
+uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
 with repo.wlock():
 ## filling of the `names` mapping
 # walk dirstate to fill `names`
 targetsubs = sorted(s for s in wctx.substate if m(s))
 if not m.always():
 matcher = matchmod.badmatch(m, lambda x, y: False)
 for abs in wctx.walk(matcher):
-names[abs] = m.rel(abs), m.exact(abs)
+names[abs] = m.exact(abs)
 # walk target manifest to fill `names`
 def badfn(path, msg):
 if path in names:
 return
 ui.warn("%s: %s\n" % (m.rel(path), msg))
 for abs in ctx.walk(matchmod.badmatch(m, badfn)):
 if abs not in names:
-names[abs] = m.rel(abs), m.exact(abs)
+names[abs] = m.exact(abs)
 # Find status of all file in `names`.
 m = scmutil.matchfiles(repo, names)
 changes = repo.status(node1=node, match=m,
 unknown=True, ignored=True, clean=True)
 else:
 changes = repo.status(node1=node, match=m)
 for kind in changes:
 for abs in kind:
-names[abs] = m.rel(abs), m.exact(abs)
+names[abs] = m.exact(abs)
 m = scmutil.matchfiles(repo, names)
 modified = set(changes.modified)
 added    = set(changes.added)
 mergeadd.remove(path)
 dsadded |= mergeadd
 dsmodified -= mergeadd
 # if f is a rename, update `names` to also revert the source
-cwd = repo.getcwd()
 for f in localchanges:
 src = repo.dirstate.copied(f)
 # XXX should we check for rename down to target node?
 if src and src not in names and repo.dirstate[src] == 'r':
 dsremoved.add(src)
-names[src] = (repo.pathto(src, cwd), True)
+names[src] = True
 # determine the exact nature of the deleted changesets
 deladded = set(_deleted)
 for path in _deleted:
 if path in mf:
 (clean,         actions['noop'],     discard),
 # Existing file, not tracked anywhere
 (unknown,       actions['unknown'],  discard),
 )
-for abs, (rel, exact) in sorted(names.items()):
+for abs, exact in sorted(names.items()):
 # target file to be touch on disk (relative to cwd)
 target = repo.wjoin(abs)
 # search the entry in the dispatch table.
 # if the file is in any of these sets, it was touched in the working
 # directory parent and we are sure it needs to be reverted.
 # If in interactive mode, don't automatically create
 # .orig files (issue4793)
 if dobackup == backupinteractive:
 tobackup.add(abs)
 elif (backup <= dobackup or wctx[abs].cmp(ctx[abs])):
-bakname = scmutil.backuppath(ui, repo, abs)
+absbakname = scmutil.backuppath(ui, repo, abs)
-relbakname = os.path.relpath(bakname)
+bakname = os.path.relpath(absbakname,
+start=repo.root)
 ui.note(_('saving current version of %s as %s\n') %
-(rel, relbakname))
+(uipathfn(abs), uipathfn(bakname)))
 if not opts.get('dry_run'):
 if interactive:
-util.copyfile(target, bakname)
+util.copyfile(target, absbakname)
 else:
-util.rename(target, bakname)
+util.rename(target, absbakname)
 if opts.get('dry_run'):
 if ui.verbose or not exact:
-ui.status(msg % rel)
+ui.status(msg % uipathfn(abs))
 elif exact:
-ui.warn(msg % rel)
+ui.warn(msg % uipathfn(abs))
 break
 if not opts.get('dry_run'):
 needdata = ('revert', 'add', 'undelete')
 oplist = [actions[name][0] for name in needdata]
 prefetch = scmutil.prefetchfiles
 matchfiles = scmutil.matchfiles
 prefetch(repo, [ctx.rev()],
 matchfiles(repo,
 [f for sublist in oplist for f in sublist]))
-_performrevert(repo, parents, ctx, names, actions, interactive,
+_performrevert(repo, parents, ctx, names, uipathfn, actions,
-tobackup)
+interactive, tobackup)
 if targetsubs:
 # Revert the subrepos on the revert list
 for sub in targetsubs:
 try:
 **pycompat.strkwargs(opts))
 except KeyError:
 raise error.Abort("subrepository '%s' does not exist in %s!"
 % (sub, short(ctx.node())))
-def _performrevert(repo, parents, ctx, names, actions, interactive=False,
+def _performrevert(repo, parents, ctx, names, uipathfn, actions,
-tobackup=None):
+interactive=False, tobackup=None):
 """function that actually perform all the actions computed for revert
 This is an independent function to let extension to plug in and react to
 the imminent revert.
 except OSError:
 pass
 repo.dirstate.remove(f)
 def prntstatusmsg(action, f):
-rel, exact = names[f]
+exact = names[f]
 if repo.ui.verbose or not exact:
-repo.ui.status(actions[action][1] % rel)
+repo.ui.status(actions[action][1] % uipathfn(f))
 audit_path = pathutil.pathauditor(repo.root, cached=True)
 for f in actions['forget'][0]:
 if interactive:
 choice = repo.ui.promptchoice(
-_("forget added file %s (Yn)?$$ &Yes $$ &No") % f)
+_("forget added file %s (Yn)?$$ &Yes $$ &No") % uipathfn(f))
 if choice == 0:
 prntstatusmsg('forget', f)
 repo.dirstate.drop(f)
 else:
 excluded_files.append(f)
 repo.dirstate.drop(f)
 for f in actions['remove'][0]:
 audit_path(f)
 if interactive:
 choice = repo.ui.promptchoice(
-_("remove added file %s (Yn)?$$ &Yes $$ &No") % f)
+_("remove added file %s (Yn)?$$ &Yes $$ &No") % uipathfn(f))
 if choice == 0:
 prntstatusmsg('remove', f)
 doremove(f)
 else:
 excluded_files.append(f)

Mercurial > public > mercurial-scm > hg

comparison mercurial/cmdutil.py @ 41605:7068c6b0114b