Mercurial > public > mercurial-scm > hg
comparison mercurial/cmdutil.py @ 23577:597b071a0e0d
subrepo: drop the 'ui' parameter to forget()
This no longer needs to be explicitly passed because the subrepo object tracks
the 'ui' reference since fcbc66b5da6a. See the change to 'archive' for details
about the differences between the output level in the root repo and subrepo 'ui'
object.
The only use for 'ui' in forget is to emit status and warning messages, and to
check the verbose flag prior to printing files to be forgotten. The bad()
method on the matcher still uses the root repo's ui, because narrowing the
matcher doesn't change the ui object.
The local repo's ui was already being used to print a warning message in
wctx.forget() and for 'ui.slash' when walking dirstate in the repo.status()
call.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sat, 13 Dec 2014 19:23:30 -0500 |
parents | 70a7478c33de |
children | d0546e8e1def |
comparison
equal
deleted
inserted
replaced
23576:70a7478c33de | 23577:597b071a0e0d |
---|---|
2026 | 2026 |
2027 for subpath in sorted(wctx.substate): | 2027 for subpath in sorted(wctx.substate): |
2028 sub = wctx.sub(subpath) | 2028 sub = wctx.sub(subpath) |
2029 try: | 2029 try: |
2030 submatch = matchmod.narrowmatcher(subpath, match) | 2030 submatch = matchmod.narrowmatcher(subpath, match) |
2031 subbad, subforgot = sub.forget(ui, submatch, prefix) | 2031 subbad, subforgot = sub.forget(submatch, prefix) |
2032 bad.extend([subpath + '/' + f for f in subbad]) | 2032 bad.extend([subpath + '/' + f for f in subbad]) |
2033 forgot.extend([subpath + '/' + f for f in subforgot]) | 2033 forgot.extend([subpath + '/' + f for f in subforgot]) |
2034 except error.LookupError: | 2034 except error.LookupError: |
2035 ui.status(_("skipping missing subrepository: %s\n") | 2035 ui.status(_("skipping missing subrepository: %s\n") |
2036 % join(subpath)) | 2036 % join(subpath)) |