Mercurial > hg-stable
diff mercurial/cmdutil.py @ 41664:16a49c778bde
forget: pass around uipathfn and use instead of m.rel() (API)
Differential Revision: https://phab.mercurial-scm.org/D5911
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 08 Feb 2019 13:08:01 -0800 |
parents | 6a447a3d1bd0 |
children | e41449818bee |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Thu Feb 07 23:25:39 2019 -0800 +++ b/mercurial/cmdutil.py Fri Feb 08 13:08:01 2019 -0800 @@ -2084,7 +2084,8 @@ for subpath in ctx.substate: ctx.sub(subpath).addwebdirpath(serverpath, webconf) -def forget(ui, repo, match, prefix, explicitonly, dryrun, interactive): +def forget(ui, repo, match, prefix, uipathfn, explicitonly, dryrun, + interactive): if dryrun and interactive: raise error.Abort(_("cannot specify both --dry-run and --interactive")) bad = [] @@ -2101,14 +2102,16 @@ sub = wctx.sub(subpath) submatch = matchmod.subdirmatcher(subpath, match) subprefix = repo.wvfs.reljoin(prefix, subpath) + subuipathfn = scmutil.subdiruipathfn(subpath, uipathfn) try: - subbad, subforgot = sub.forget(submatch, subprefix, dryrun=dryrun, + subbad, subforgot = sub.forget(submatch, subprefix, subuipathfn, + dryrun=dryrun, interactive=interactive) bad.extend([subpath + '/' + f for f in subbad]) forgot.extend([subpath + '/' + f for f in subforgot]) except error.LookupError: ui.status(_("skipping missing subrepository: %s\n") - % match.rel(subpath)) + % uipathfn(subpath)) if not explicitonly: for f in match.files(): @@ -2123,7 +2126,7 @@ continue ui.warn(_('not removing %s: ' 'file is already untracked\n') - % match.rel(f)) + % uipathfn(f)) bad.append(f) if interactive: @@ -2154,7 +2157,7 @@ for f in forget: if ui.verbose or not match.exact(f) or interactive: - ui.status(_('removing %s\n') % match.rel(f), + ui.status(_('removing %s\n') % uipathfn(f), label='ui.addremove.removed') if not dryrun: