Show More
@@ -1078,11 +1078,11 b' def postcommitstatus(orig, repo, *args, ' | |||
|
1078 | 1078 | repo.lfstatus = False |
|
1079 | 1079 | |
|
1080 | 1080 | @eh.wrapfunction(cmdutil, 'forget') |
|
1081 | def cmdutilforget(orig, ui, repo, match, prefix, explicitonly, dryrun, | |
|
1081 | def cmdutilforget(orig, ui, repo, match, prefix, uipathfn, explicitonly, dryrun, | |
|
1082 | 1082 | interactive): |
|
1083 | 1083 | normalmatcher = composenormalfilematcher(match, repo[None].manifest()) |
|
1084 |
bad, forgot = orig(ui, repo, normalmatcher, prefix, explicitonly, |
|
|
1085 | interactive) | |
|
1084 | bad, forgot = orig(ui, repo, normalmatcher, prefix, uipathfn, explicitonly, | |
|
1085 | dryrun, interactive) | |
|
1086 | 1086 | m = composelargefilematcher(match, repo[None].manifest()) |
|
1087 | 1087 | |
|
1088 | 1088 | try: |
@@ -1098,12 +1098,12 b' def cmdutilforget(orig, ui, repo, match,' | |||
|
1098 | 1098 | fstandin = lfutil.standin(f) |
|
1099 | 1099 | if fstandin not in repo.dirstate and not repo.wvfs.isdir(fstandin): |
|
1100 | 1100 | ui.warn(_('not removing %s: file is already untracked\n') |
|
1101 |
% |
|
|
1101 | % uipathfn(f)) | |
|
1102 | 1102 | bad.append(f) |
|
1103 | 1103 | |
|
1104 | 1104 | for f in forget: |
|
1105 | 1105 | if ui.verbose or not m.exact(f): |
|
1106 |
ui.status(_('removing %s\n') % |
|
|
1106 | ui.status(_('removing %s\n') % uipathfn(f)) | |
|
1107 | 1107 | |
|
1108 | 1108 | # Need to lock because standin files are deleted then removed from the |
|
1109 | 1109 | # repository and we could race in-between. |
@@ -2084,7 +2084,8 b' def addwebdirpath(repo, serverpath, webc' | |||
|
2084 | 2084 | for subpath in ctx.substate: |
|
2085 | 2085 | ctx.sub(subpath).addwebdirpath(serverpath, webconf) |
|
2086 | 2086 | |
|
2087 |
def forget(ui, repo, match, prefix, explicitonly, dryrun, |
|
|
2087 | def forget(ui, repo, match, prefix, uipathfn, explicitonly, dryrun, | |
|
2088 | interactive): | |
|
2088 | 2089 | if dryrun and interactive: |
|
2089 | 2090 | raise error.Abort(_("cannot specify both --dry-run and --interactive")) |
|
2090 | 2091 | bad = [] |
@@ -2101,14 +2102,16 b' def forget(ui, repo, match, prefix, expl' | |||
|
2101 | 2102 | sub = wctx.sub(subpath) |
|
2102 | 2103 | submatch = matchmod.subdirmatcher(subpath, match) |
|
2103 | 2104 | subprefix = repo.wvfs.reljoin(prefix, subpath) |
|
2105 | subuipathfn = scmutil.subdiruipathfn(subpath, uipathfn) | |
|
2104 | 2106 | try: |
|
2105 |
subbad, subforgot = sub.forget(submatch, subprefix, |
|
|
2107 | subbad, subforgot = sub.forget(submatch, subprefix, subuipathfn, | |
|
2108 | dryrun=dryrun, | |
|
2106 | 2109 | interactive=interactive) |
|
2107 | 2110 | bad.extend([subpath + '/' + f for f in subbad]) |
|
2108 | 2111 | forgot.extend([subpath + '/' + f for f in subforgot]) |
|
2109 | 2112 | except error.LookupError: |
|
2110 | 2113 | ui.status(_("skipping missing subrepository: %s\n") |
|
2111 |
% |
|
|
2114 | % uipathfn(subpath)) | |
|
2112 | 2115 | |
|
2113 | 2116 | if not explicitonly: |
|
2114 | 2117 | for f in match.files(): |
@@ -2123,7 +2126,7 b' def forget(ui, repo, match, prefix, expl' | |||
|
2123 | 2126 | continue |
|
2124 | 2127 | ui.warn(_('not removing %s: ' |
|
2125 | 2128 | 'file is already untracked\n') |
|
2126 |
% |
|
|
2129 | % uipathfn(f)) | |
|
2127 | 2130 | bad.append(f) |
|
2128 | 2131 | |
|
2129 | 2132 | if interactive: |
@@ -2154,7 +2157,7 b' def forget(ui, repo, match, prefix, expl' | |||
|
2154 | 2157 | |
|
2155 | 2158 | for f in forget: |
|
2156 | 2159 | if ui.verbose or not match.exact(f) or interactive: |
|
2157 |
ui.status(_('removing %s\n') % |
|
|
2160 | ui.status(_('removing %s\n') % uipathfn(f), | |
|
2158 | 2161 | label='ui.addremove.removed') |
|
2159 | 2162 | |
|
2160 | 2163 | if not dryrun: |
@@ -2258,7 +2258,8 b' def forget(ui, repo, *pats, **opts):' | |||
|
2258 | 2258 | |
|
2259 | 2259 | m = scmutil.match(repo[None], pats, opts) |
|
2260 | 2260 | dryrun, interactive = opts.get('dry_run'), opts.get('interactive') |
|
2261 | rejected = cmdutil.forget(ui, repo, m, prefix="", | |
|
2261 | uipathfn = scmutil.getuipathfn(repo, forcerelativevalue=True) | |
|
2262 | rejected = cmdutil.forget(ui, repo, m, prefix="", uipathfn=uipathfn, | |
|
2262 | 2263 | explicitonly=False, dryrun=dryrun, |
|
2263 | 2264 | interactive=interactive)[0] |
|
2264 | 2265 | return rejected and 1 or 0 |
@@ -355,7 +355,7 b' class abstractsubrepo(object):' | |||
|
355 | 355 | matched by the match function |
|
356 | 356 | ''' |
|
357 | 357 | |
|
358 | def forget(self, match, prefix, dryrun, interactive): | |
|
358 | def forget(self, match, prefix, uipathfn, dryrun, interactive): | |
|
359 | 359 | return ([], []) |
|
360 | 360 | |
|
361 | 361 | def removefiles(self, matcher, prefix, uipathfn, after, force, subrepos, |
@@ -836,8 +836,8 b' class hgsubrepo(abstractsubrepo):' | |||
|
836 | 836 | return ctx.walk(match) |
|
837 | 837 | |
|
838 | 838 | @annotatesubrepoerror |
|
839 | def forget(self, match, prefix, dryrun, interactive): | |
|
840 | return cmdutil.forget(self.ui, self._repo, match, prefix, | |
|
839 | def forget(self, match, prefix, uipathfn, dryrun, interactive): | |
|
840 | return cmdutil.forget(self.ui, self._repo, match, prefix, uipathfn, | |
|
841 | 841 | True, dryrun=dryrun, interactive=interactive) |
|
842 | 842 | |
|
843 | 843 | @annotatesubrepoerror |
General Comments 0
You need to be logged in to leave comments.
Login now