This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5881

subrepo: avoid calculating subrepo prefix twice for cat() (API)
ClosedPublic

Authored by martinvonz on Feb 7 2019, 1:44 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG93620a4ba88d: subrepo: avoid calculating subrepo prefix twice for cat() (API)

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/cmdutil.py (8 lines)

Diff 13955

mercurial/cmdutil.py

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)
if not sub.cat(submatch, basefm, fntemplate, if not sub.cat(submatch, basefm, fntemplate, subprefix,
os.path.join(prefix, sub._path),
**pycompat.strkwargs(opts)): **pycompat.strkwargs(opts)):
err = 0 err = 0
except error.RepoLookupError: except error.RepoLookupError:
ui.status(_("skipping missing subrepository: %s\n") ui.status(_("skipping missing subrepository: %s\n") % subprefix)
% os.path.join(prefix, 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)