Show More
@@ -2028,7 +2028,7 b' def forget(ui, repo, match, prefix, expl' | |||||
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( |
|
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: |
@@ -496,7 +496,7 b' class abstractsubrepo(object):' | |||||
496 | ''' |
|
496 | ''' | |
497 | pass |
|
497 | pass | |
498 |
|
498 | |||
499 |
def forget(self, |
|
499 | def forget(self, match, prefix): | |
500 | return ([], []) |
|
500 | return ([], []) | |
501 |
|
501 | |||
502 | def removefiles(self, ui, matcher, prefix, after, force, subrepos): |
|
502 | def removefiles(self, ui, matcher, prefix, after, force, subrepos): | |
@@ -850,8 +850,8 b' class hgsubrepo(abstractsubrepo):' | |||||
850 | return ctx.walk(match) |
|
850 | return ctx.walk(match) | |
851 |
|
851 | |||
852 | @annotatesubrepoerror |
|
852 | @annotatesubrepoerror | |
853 |
def forget(self, |
|
853 | def forget(self, match, prefix): | |
854 | return cmdutil.forget(ui, self._repo, match, |
|
854 | return cmdutil.forget(self.ui, self._repo, match, | |
855 | os.path.join(prefix, self._path), True) |
|
855 | os.path.join(prefix, self._path), True) | |
856 |
|
856 | |||
857 | @annotatesubrepoerror |
|
857 | @annotatesubrepoerror |
General Comments 0
You need to be logged in to leave comments.
Login now