This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5902

remove: pass around uipathfn and use instead of m.rel() (API)
ClosedPublic

Authored by martinvonz on Feb 8 2019, 2:15 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGb2df5dc3ebfb: remove: pass around uipathfn and use instead of m.rel() (API)
Summary

Same as previous commit, but now for remove.

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.

Event Timeline

martinvonz created this revision.Feb 8 2019, 2:15 PM
martinvonz retitled this revision from remove: pass around uipathfn and use instead of m.rel() to remove: pass around uipathfn and use instead of m.rel() (API).Feb 8 2019, 3:18 PM
martinvonz updated this revision to Diff 13928.
martinvonz updated this revision to Diff 13969.Feb 9 2019, 5:21 PM
Closed by commit rHGb2df5dc3ebfb: remove: pass around uipathfn and use instead of m.rel() (API) (authored by martinvonz). · Explain WhyFeb 9 2019, 10:38 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 13983

hgext/largefiles/overrides.py

normalmatcher = composenormalfilematcher(matcher, repo[None].manifest(), normalmatcher = composenormalfilematcher(matcher, repo[None].manifest(),
ladded) ladded)
bad = orig(ui, repo, normalmatcher, prefix, uipathfn, explicitonly, **opts) bad = orig(ui, repo, normalmatcher, prefix, uipathfn, explicitonly, **opts)
bad.extend(f for f in lbad) bad.extend(f for f in lbad)
return bad return bad
@eh.wrapfunction(cmdutil, 'remove') @eh.wrapfunction(cmdutil, 'remove')
def cmdutilremove(orig, ui, repo, matcher, prefix, after, force, subrepos, def cmdutilremove(orig, ui, repo, matcher, prefix, uipathfn, after, force,
dryrun): subrepos, dryrun):
normalmatcher = composenormalfilematcher(matcher, repo[None].manifest()) normalmatcher = composenormalfilematcher(matcher, repo[None].manifest())
result = orig(ui, repo, normalmatcher, prefix, after, force, subrepos, result = orig(ui, repo, normalmatcher, prefix, uipathfn, after, force,
dryrun) subrepos, dryrun)
return removelargefiles(ui, repo, False, matcher, dryrun, after=after, return removelargefiles(ui, repo, False, matcher, dryrun, after=after,
force=force) or result force=force) or result
@eh.wrapfunction(subrepo.hgsubrepo, 'status') @eh.wrapfunction(subrepo.hgsubrepo, 'status')
def overridestatusfn(orig, repo, rev2, **opts): def overridestatusfn(orig, repo, rev2, **opts):
try: try:
repo._repo.lfstatus = True repo._repo.lfstatus = True
return orig(repo, rev2, **opts) return orig(repo, rev2, **opts)

mercurial/cmdutil.py

if sub.printfiles(ui, submatch, fm, fmt, recurse) == 0: if sub.printfiles(ui, submatch, fm, fmt, recurse) == 0:
ret = 0 ret = 0
except error.LookupError: except error.LookupError:
ui.status(_("skipping missing subrepository: %s\n") ui.status(_("skipping missing subrepository: %s\n")
% m.rel(subpath)) % m.rel(subpath))
return ret return ret
def remove(ui, repo, m, prefix, after, force, subrepos, dryrun, warnings=None): def remove(ui, repo, m, prefix, uipathfn, after, force, subrepos, dryrun,
warnings=None):
ret = 0 ret = 0
s = repo.status(match=m, clean=True) s = repo.status(match=m, clean=True)
modified, added, deleted, clean = s[0], s[1], s[3], s[6] modified, added, deleted, clean = s[0], s[1], s[3], s[6]
wctx = repo[None] wctx = repo[None]
if warnings is None: if warnings is None:
warnings = [] warnings = []
warn = True warn = True
else: else:
warn = False warn = False
subs = sorted(wctx.substate) subs = sorted(wctx.substate)
progress = ui.makeprogress(_('searching'), total=len(subs), progress = ui.makeprogress(_('searching'), total=len(subs),
unit=_('subrepos')) unit=_('subrepos'))
for subpath in subs: for subpath in subs:
submatch = matchmod.subdirmatcher(subpath, m) submatch = matchmod.subdirmatcher(subpath, m)
subprefix = repo.wvfs.reljoin(prefix, subpath) subprefix = repo.wvfs.reljoin(prefix, subpath)
subuipathfn = scmutil.subdiruipathfn(subpath, uipathfn)
if subrepos or m.exact(subpath) or any(submatch.files()): if subrepos or m.exact(subpath) or any(submatch.files()):
progress.increment() progress.increment()
sub = wctx.sub(subpath) sub = wctx.sub(subpath)
try: try:
if sub.removefiles(submatch, subprefix, after, force, subrepos, if sub.removefiles(submatch, subprefix, subuipathfn, after,
dryrun, warnings): force, subrepos, dryrun, warnings):
ret = 1 ret = 1
except error.LookupError: except error.LookupError:
warnings.append(_("skipping missing subrepository: %s\n") warnings.append(_("skipping missing subrepository: %s\n")
% m.rel(subpath)) % uipathfn(subpath))
progress.complete() progress.complete()
# warn about failure to delete explicit files/dirs # warn about failure to delete explicit files/dirs
deleteddirs = util.dirs(deleted) deleteddirs = util.dirs(deleted)
files = m.files() files = m.files()
progress = ui.makeprogress(_('deleting'), total=len(files), progress = ui.makeprogress(_('deleting'), total=len(files),
unit=_('files')) unit=_('files'))
for f in files: for f in files:
def insubrepo(): def insubrepo():
for subpath in wctx.substate: for subpath in wctx.substate:
if f.startswith(subpath + '/'): if f.startswith(subpath + '/'):
return True return True
return False return False
progress.increment() progress.increment()
isdir = f in deleteddirs or wctx.hasdir(f) isdir = f in deleteddirs or wctx.hasdir(f)
if (f in repo.dirstate or isdir or f == '.' if (f in repo.dirstate or isdir or f == '.'
or insubrepo() or f in subs): or insubrepo() or f in subs):
continue continue
if repo.wvfs.exists(f): if repo.wvfs.exists(f):
if repo.wvfs.isdir(f): if repo.wvfs.isdir(f):
warnings.append(_('not removing %s: no tracked files\n') warnings.append(_('not removing %s: no tracked files\n')
% m.rel(f)) % uipathfn(f))
else: else:
warnings.append(_('not removing %s: file is untracked\n') warnings.append(_('not removing %s: file is untracked\n')
% m.rel(f)) % uipathfn(f))
# missing files will generate a warning elsewhere # missing files will generate a warning elsewhere
ret = 1 ret = 1
progress.complete() progress.complete()
if force: if force:
list = modified + deleted + clean + added list = modified + deleted + clean + added
elif after: elif after:
list = deleted list = deleted
remaining = modified + added + clean remaining = modified + added + clean
progress = ui.makeprogress(_('skipping'), total=len(remaining), progress = ui.makeprogress(_('skipping'), total=len(remaining),
unit=_('files')) unit=_('files'))
for f in remaining: for f in remaining:
progress.increment() progress.increment()
if ui.verbose or (f in files): if ui.verbose or (f in files):
warnings.append(_('not removing %s: file still exists\n') warnings.append(_('not removing %s: file still exists\n')
% m.rel(f)) % uipathfn(f))
ret = 1 ret = 1
progress.complete() progress.complete()
else: else:
list = deleted + clean list = deleted + clean
progress = ui.makeprogress(_('skipping'), progress = ui.makeprogress(_('skipping'),
total=(len(modified) + len(added)), total=(len(modified) + len(added)),
unit=_('files')) unit=_('files'))
for f in modified: for f in modified:
progress.increment() progress.increment()
warnings.append(_('not removing %s: file is modified (use -f' warnings.append(_('not removing %s: file is modified (use -f'
' to force removal)\n') % m.rel(f)) ' to force removal)\n') % uipathfn(f))
ret = 1 ret = 1
for f in added: for f in added:
progress.increment() progress.increment()
warnings.append(_("not removing %s: file has been marked for add" warnings.append(_("not removing %s: file has been marked for add"
" (use 'hg forget' to undo add)\n") % m.rel(f)) " (use 'hg forget' to undo add)\n") % uipathfn(f))
ret = 1 ret = 1
progress.complete() progress.complete()
list = sorted(list) list = sorted(list)
progress = ui.makeprogress(_('deleting'), total=len(list), progress = ui.makeprogress(_('deleting'), total=len(list),
unit=_('files')) unit=_('files'))
for f in list: for f in list:
if ui.verbose or not m.exact(f): if ui.verbose or not m.exact(f):
progress.increment() progress.increment()
ui.status(_('removing %s\n') % m.rel(f), ui.status(_('removing %s\n') % uipathfn(f),
label='ui.addremove.removed') label='ui.addremove.removed')
progress.complete() progress.complete()
if not dryrun: if not dryrun:
with repo.wlock(): with repo.wlock():
if not after: if not after:
for f in list: for f in list:
if f in added: if f in added:

mercurial/commands.py

opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
after, force = opts.get('after'), opts.get('force') after, force = opts.get('after'), opts.get('force')
dryrun = opts.get('dry_run') dryrun = opts.get('dry_run')
if not pats and not after: if not pats and not after:
raise error.Abort(_('no files specified')) raise error.Abort(_('no files specified'))
m = scmutil.match(repo[None], pats, opts) m = scmutil.match(repo[None], pats, opts)
subrepos = opts.get('subrepos') subrepos = opts.get('subrepos')
return cmdutil.remove(ui, repo, m, "", after, force, subrepos, uipathfn = scmutil.getuipathfn(repo, forcerelativevalue=True)
return cmdutil.remove(ui, repo, m, "", uipathfn, after, force, subrepos,
dryrun=dryrun) dryrun=dryrun)
@command('rename|move|mv', @command('rename|move|mv',
[('A', 'after', None, _('record a rename that has already occurred')), [('A', 'after', None, _('record a rename that has already occurred')),
('f', 'force', None, _('forcibly copy over an existing managed file')), ('f', 'force', None, _('forcibly copy over an existing managed file')),
] + walkopts + dryrunopts, ] + walkopts + dryrunopts,
_('[OPTION]... SOURCE... DEST'), _('[OPTION]... SOURCE... DEST'),
helpcategory=command.CATEGORY_WORKING_DIRECTORY) helpcategory=command.CATEGORY_WORKING_DIRECTORY)

mercurial/subrepo.py

''' '''
walk recursively through the directory tree, finding all files walk recursively through the directory tree, finding all files
matched by the match function matched by the match function
''' '''
def forget(self, match, prefix, dryrun, interactive): def forget(self, match, prefix, dryrun, interactive):
return ([], []) return ([], [])
def removefiles(self, matcher, prefix, after, force, subrepos, def removefiles(self, matcher, prefix, uipathfn, after, force, subrepos,
dryrun, warnings): dryrun, warnings):
"""remove the matched files from the subrepository and the filesystem, """remove the matched files from the subrepository and the filesystem,
possibly by force and/or after the file has been removed from the possibly by force and/or after the file has been removed from the
filesystem. Return 0 on success, 1 on any warning. filesystem. Return 0 on success, 1 on any warning.
""" """
warnings.append(_("warning: removefiles not implemented (%s)") warnings.append(_("warning: removefiles not implemented (%s)")
% self._path) % self._path)
return 1 return 1
return ctx.walk(match) return ctx.walk(match)
@annotatesubrepoerror @annotatesubrepoerror
def forget(self, match, prefix, dryrun, interactive): def forget(self, match, prefix, dryrun, interactive):
return cmdutil.forget(self.ui, self._repo, match, prefix, return cmdutil.forget(self.ui, self._repo, match, prefix,
True, dryrun=dryrun, interactive=interactive) True, dryrun=dryrun, interactive=interactive)
@annotatesubrepoerror @annotatesubrepoerror
def removefiles(self, matcher, prefix, after, force, subrepos, def removefiles(self, matcher, prefix, uipathfn, after, force, subrepos,
dryrun, warnings): dryrun, warnings):
return cmdutil.remove(self.ui, self._repo, matcher, prefix, return cmdutil.remove(self.ui, self._repo, matcher, prefix, uipathfn,
after, force, subrepos, dryrun) after, force, subrepos, dryrun)
@annotatesubrepoerror @annotatesubrepoerror
def revert(self, substate, *pats, **opts): def revert(self, substate, *pats, **opts):
# reverting a subrepo is a 2 step process: # reverting a subrepo is a 2 step process:
# 1. if the no_backup is not set, revert all modified # 1. if the no_backup is not set, revert all modified
# files inside the subrepo # files inside the subrepo
# 2. update the subrepo to the revision specified in # 2. update the subrepo to the revision specified in