This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5900

subrepo: (mostly) use relative path in "skipping missing subrepository"
ClosedPublic

Authored by martinvonz on Feb 8 2019, 1:48 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG799e156785f7: subrepo: (mostly) use relative path in "skipping missing subrepository"
Summary

This is consistent with the other messages printed by these
functions. Note that addremove is a little different and prints
absolute (aka repo-relative) paths if no argument was given.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (16 lines)
Mmercurial/scmutil.py (3 lines)

Diff 13920

mercurial/cmdutil.py

yield change(rev) yield change(rev)
if stopiteration: if stopiteration:
break break
return iterate() return iterate()
def add(ui, repo, match, prefix, explicitonly, **opts): def add(ui, repo, match, prefix, explicitonly, **opts):
join = lambda f: os.path.join(prefix, f)
bad = [] bad = []
badfn = lambda x, y: bad.append(x) or match.bad(x, y) badfn = lambda x, y: bad.append(x) or match.bad(x, y)
names = [] names = []
wctx = repo[None] wctx = repo[None]
cca = None cca = None
abort, warn = scmutil.checkportabilityalert(ui) abort, warn = scmutil.checkportabilityalert(ui)
if abort or warn: if abort or warn:
submatch = matchmod.subdirmatcher(subpath, match) submatch = matchmod.subdirmatcher(subpath, match)
subprefix = repo.wvfs.reljoin(prefix, subpath) subprefix = repo.wvfs.reljoin(prefix, subpath)
if opts.get(r'subrepos'): if opts.get(r'subrepos'):
bad.extend(sub.add(ui, submatch, subprefix, False, **opts)) bad.extend(sub.add(ui, submatch, subprefix, False, **opts))
else: else:
bad.extend(sub.add(ui, submatch, subprefix, True, **opts)) bad.extend(sub.add(ui, submatch, subprefix, True, **opts))
except error.LookupError: except error.LookupError:
ui.status(_("skipping missing subrepository: %s\n") ui.status(_("skipping missing subrepository: %s\n")
% join(subpath)) % match.rel(subpath))
if not opts.get(r'dry_run'): if not opts.get(r'dry_run'):
rejected = wctx.add(names, prefix) rejected = wctx.add(names, prefix)
bad.extend(f for f in rejected if f in match.files()) bad.extend(f for f in rejected if f in match.files())
return bad return bad
def addwebdirpath(repo, serverpath, webconf): def addwebdirpath(repo, serverpath, webconf):
webconf[serverpath] = repo.root webconf[serverpath] = repo.root
repo.ui.debug('adding %s = %s\n' % (serverpath, repo.root)) repo.ui.debug('adding %s = %s\n' % (serverpath, repo.root))
for r in repo.revs('filelog("path:.hgsub")'): for r in repo.revs('filelog("path:.hgsub")'):
ctx = repo[r] ctx = repo[r]
for subpath in ctx.substate: for subpath in ctx.substate:
ctx.sub(subpath).addwebdirpath(serverpath, webconf) ctx.sub(subpath).addwebdirpath(serverpath, webconf)
def forget(ui, repo, match, prefix, explicitonly, dryrun, interactive): def forget(ui, repo, match, prefix, explicitonly, dryrun, interactive):
if dryrun and interactive: if dryrun and interactive:
raise error.Abort(_("cannot specify both --dry-run and --interactive")) raise error.Abort(_("cannot specify both --dry-run and --interactive"))
join = lambda f: os.path.join(prefix, f)
bad = [] bad = []
badfn = lambda x, y: bad.append(x) or match.bad(x, y) badfn = lambda x, y: bad.append(x) or match.bad(x, y)
wctx = repo[None] wctx = repo[None]
forgot = [] forgot = []
s = repo.status(match=matchmod.badmatch(match, badfn), clean=True) s = repo.status(match=matchmod.badmatch(match, badfn), clean=True)
forget = sorted(s.modified + s.added + s.deleted + s.clean) forget = sorted(s.modified + s.added + s.deleted + s.clean)
if explicitonly: if explicitonly:
forget = [f for f in forget if match.exact(f)] forget = [f for f in forget if match.exact(f)]
for subpath in sorted(wctx.substate): for subpath in sorted(wctx.substate):
sub = wctx.sub(subpath) sub = wctx.sub(subpath)
submatch = matchmod.subdirmatcher(subpath, match) submatch = matchmod.subdirmatcher(subpath, match)
subprefix = repo.wvfs.reljoin(prefix, subpath) subprefix = repo.wvfs.reljoin(prefix, subpath)
try: try:
subbad, subforgot = sub.forget(submatch, subprefix, dryrun=dryrun, subbad, subforgot = sub.forget(submatch, subprefix, dryrun=dryrun,
interactive=interactive) interactive=interactive)
bad.extend([subpath + '/' + f for f in subbad]) bad.extend([subpath + '/' + f for f in subbad])
forgot.extend([subpath + '/' + f for f in subforgot]) forgot.extend([subpath + '/' + f for f in subforgot])
except error.LookupError: except error.LookupError:
ui.status(_("skipping missing subrepository: %s\n") ui.status(_("skipping missing subrepository: %s\n")
% join(subpath)) % match.rel(subpath))
if not explicitonly: if not explicitonly:
for f in match.files(): for f in match.files():
if f not in repo.dirstate and not repo.wvfs.isdir(f): if f not in repo.dirstate and not repo.wvfs.isdir(f):
if f not in forgot: if f not in forgot:
if repo.wvfs.exists(f): if repo.wvfs.exists(f):
# Don't complain if the exact case match wasn't given. # Don't complain if the exact case match wasn't given.
# But don't do this until after checking 'forgot', so # But don't do this until after checking 'forgot', so
if (subrepos or m.exact(subpath) or any(submatch.files())): if (subrepos or m.exact(subpath) or any(submatch.files())):
sub = ctx.sub(subpath) sub = ctx.sub(subpath)
try: try:
recurse = m.exact(subpath) or subrepos recurse = m.exact(subpath) or subrepos
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.abs(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, after, force, subrepos, dryrun, warnings=None):
join = lambda f: os.path.join(prefix, f)
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 = []
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, after, force, subrepos,
dryrun, warnings): 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")
% join(subpath)) % m.rel(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:
for abs in ctx.walk(matcher): for abs in ctx.walk(matcher):
write(abs) write(abs)
err = 0 err = 0
for subpath in sorted(ctx.substate): for subpath in sorted(ctx.substate):
sub = ctx.sub(subpath) sub = ctx.sub(subpath)
try: try:
submatch = matchmod.subdirmatcher(subpath, matcher) submatch = matchmod.subdirmatcher(subpath, matcher)
subprefix = os.path.join(prefix, sub._path) subprefix = os.path.join(prefix, subpath)
if not sub.cat(submatch, basefm, fntemplate, subprefix, if not sub.cat(submatch, basefm, fntemplate, subprefix,
**pycompat.strkwargs(opts)): **pycompat.strkwargs(opts)):
err = 0 err = 0
except error.RepoLookupError: except error.RepoLookupError:
ui.status(_("skipping missing subrepository: %s\n") % subprefix) ui.status(_("skipping missing subrepository: %s\n") %
matcher.rel(subpath))
return err return err
def commit(ui, repo, commitfunc, pats, opts): def commit(ui, repo, commitfunc, pats, opts):
'''commit the specified files or all outstanding changes''' '''commit the specified files or all outstanding changes'''
date = opts.get('date') date = opts.get('date')
if date: if date:
opts['date'] = dateutil.parsedate(date) opts['date'] = dateutil.parsedate(date)

mercurial/scmutil.py

similarity = float(opts.get('similarity') or 0) similarity = float(opts.get('similarity') or 0)
except ValueError: except ValueError:
raise error.Abort(_('similarity must be a number')) raise error.Abort(_('similarity must be a number'))
if similarity < 0 or similarity > 100: if similarity < 0 or similarity > 100:
raise error.Abort(_('similarity must be between 0 and 100')) raise error.Abort(_('similarity must be between 0 and 100'))
similarity /= 100.0 similarity /= 100.0
ret = 0 ret = 0
join = lambda f: os.path.join(prefix, f)
wctx = repo[None] wctx = repo[None]
for subpath in sorted(wctx.substate): for subpath in sorted(wctx.substate):
submatch = matchmod.subdirmatcher(subpath, m) submatch = matchmod.subdirmatcher(subpath, m)
if opts.get('subrepos') or m.exact(subpath) or any(submatch.files()): if opts.get('subrepos') or m.exact(subpath) or any(submatch.files()):
sub = wctx.sub(subpath) sub = wctx.sub(subpath)
subprefix = repo.wvfs.reljoin(prefix, subpath) subprefix = repo.wvfs.reljoin(prefix, subpath)
try: try:
if sub.addremove(submatch, subprefix, opts): if sub.addremove(submatch, subprefix, opts):
ret = 1 ret = 1
except error.LookupError: except error.LookupError:
repo.ui.status(_("skipping missing subrepository: %s\n") repo.ui.status(_("skipping missing subrepository: %s\n")
% join(subpath)) % m.uipath(subpath))
rejected = [] rejected = []
def badfn(f, msg): def badfn(f, msg):
if f in m.files(): if f in m.files():
m.bad(f, msg) m.bad(f, msg)
rejected.append(f) rejected.append(f)
badmatch = matchmod.badmatch(m, badfn) badmatch = matchmod.badmatch(m, badfn)