Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/subrepo.py @ 41662:b2df5dc3ebfb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove: pass around uipathfn and use instead of m.rel() (API) Same as previous commit, but now for remove. Differential Revision: https://phab.mercurial-scm.org/D5902
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 07 Feb 2019 23:19:33 -0800
parents f8b18583049f
children 6a447a3d1bd0
comparison
equal deleted inserted replaced
41661:f8b18583049f 41662:b2df5dc3ebfb
356 ''' 356 '''
357 357
358 def forget(self, match, prefix, dryrun, interactive): 358 def forget(self, match, prefix, dryrun, interactive):
359 return ([], []) 359 return ([], [])
360 360
361 def removefiles(self, matcher, prefix, after, force, subrepos, 361 def removefiles(self, matcher, prefix, uipathfn, after, force, subrepos,
362 dryrun, warnings): 362 dryrun, warnings):
363 """remove the matched files from the subrepository and the filesystem, 363 """remove the matched files from the subrepository and the filesystem,
364 possibly by force and/or after the file has been removed from the 364 possibly by force and/or after the file has been removed from the
365 filesystem. Return 0 on success, 1 on any warning. 365 filesystem. Return 0 on success, 1 on any warning.
366 """ 366 """
839 def forget(self, match, prefix, dryrun, interactive): 839 def forget(self, match, prefix, dryrun, interactive):
840 return cmdutil.forget(self.ui, self._repo, match, prefix, 840 return cmdutil.forget(self.ui, self._repo, match, prefix,
841 True, dryrun=dryrun, interactive=interactive) 841 True, dryrun=dryrun, interactive=interactive)
842 842
843 @annotatesubrepoerror 843 @annotatesubrepoerror
844 def removefiles(self, matcher, prefix, after, force, subrepos, 844 def removefiles(self, matcher, prefix, uipathfn, after, force, subrepos,
845 dryrun, warnings): 845 dryrun, warnings):
846 return cmdutil.remove(self.ui, self._repo, matcher, prefix, 846 return cmdutil.remove(self.ui, self._repo, matcher, prefix, uipathfn,
847 after, force, subrepos, dryrun) 847 after, force, subrepos, dryrun)
848 848
849 @annotatesubrepoerror 849 @annotatesubrepoerror
850 def revert(self, substate, *pats, **opts): 850 def revert(self, substate, *pats, **opts):
851 # reverting a subrepo is a 2 step process: 851 # reverting a subrepo is a 2 step process: