Mercurial > hg
changeset 24724:95eb067b2b5e
subrepo: pass wvfs to _sanitize instead of absolute path to a subrepository
As a preparation for vfs migration of "_sanitize()", this patch passes
"wvfs" to "_sanitize()" and use "wvfs.base" instead of absolute path
to a subrepository.
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Sat, 11 Apr 2015 23:00:04 +0900 |
| parents | 467a33142425 |
| children | ee751d47cf2c |
| files | mercurial/subrepo.py |
| diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/subrepo.py Wed Apr 01 18:43:29 2015 -0700 +++ b/mercurial/subrepo.py Sat Apr 11 23:00:04 2015 +0900 @@ -302,8 +302,8 @@ if abort: raise util.Abort(_("default path for subrepository not found")) -def _sanitize(ui, path, ignore): - for dirname, dirs, names in os.walk(path): +def _sanitize(ui, vfs, ignore): + for dirname, dirs, names in os.walk(vfs.base): for i, d in enumerate(dirs): if d.lower() == ignore: del dirs[i] @@ -1132,7 +1132,7 @@ # update to a directory which has since been deleted and recreated. args.append('%s@%s' % (state[0], state[1])) status, err = self._svncommand(args, failok=True) - _sanitize(self.ui, self._ctx.repo().wjoin(self._path), '.svn') + _sanitize(self.ui, self.wvfs, '.svn') if not re.search('Checked out revision [0-9]+.', status): if ('is already a working copy for a different URL' in err and (self._wcchanged()[:2] == (False, False))): @@ -1433,7 +1433,7 @@ self._gitcommand(['reset', 'HEAD']) cmd.append('-f') self._gitcommand(cmd + args) - _sanitize(self.ui, self._abspath, '.git') + _sanitize(self.ui, self.wvfs, '.git') def rawcheckout(): # no branch to checkout, check it out with no branch @@ -1482,7 +1482,7 @@ if tracking[remote] != self._gitcurrentbranch(): checkout([tracking[remote]]) self._gitcommand(['merge', '--ff', remote]) - _sanitize(self.ui, self._abspath, '.git') + _sanitize(self.ui, self.wvfs, '.git') else: # a real merge would be required, just checkout the revision rawcheckout() @@ -1518,7 +1518,7 @@ self.get(state) # fast forward merge elif base != self._state[1]: self._gitcommand(['merge', '--no-commit', revision]) - _sanitize(self.ui, self._abspath, '.git') + _sanitize(self.ui, self.wvfs, '.git') if self.dirty(): if self._gitstate() != revision: