facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

subrepo: sanitize non-hg subrepos

Browse Source
This commit is contained in:
Matt Mackall 2013-11-25 13:50:36 -06:00
parent d11d77ad19
commit 82c7f5838c
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mercurial/subrepo.py
View File

@ -312,6 +312,18 @@ def _abssource(repo, push=False, abort=True):
if abort:
raise util.Abort(_("default path for subrepository not found"))
def _sanitize(ui, path):
def v(arg, dirname, names):
if os.path.basename(dirname).lower() != '.hg':
return
for f in names:
if f.lower() == 'hgrc':
ui.warn(
_("warning: removing potentially hostile .hg/hgrc in '%s'"
% path))
os.unlink(os.path.join(dirname, f))
os.walk(path, v, None)
def itersubrepos(ctx1, ctx2):
"""find subrepos in ctx1 or ctx2"""
# Create a (subpath, ctx) mapping where we prefer subpaths from
@ -988,6 +1000,7 @@ class svnsubrepo(abstractsubrepo):
# 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._path)
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))):
@ -1248,6 +1261,7 @@ class gitsubrepo(abstractsubrepo):
self._gitcommand(['reset', 'HEAD'])
cmd.append('-f')
self._gitcommand(cmd + args)
_sanitize(self._ui, self._path)
def rawcheckout():
# no branch to checkout, check it out with no branch
@ -1331,6 +1345,7 @@ class gitsubrepo(abstractsubrepo):
self.get(state) # fast forward merge
elif base != self._state[1]:
self._gitcommand(['merge', '--no-commit', revision])
_sanitize(self._ui, self._path)
if self.dirty():
if self._gitstate() != revision: