Show More
@@ -312,6 +312,18 b' def _abssource(repo, push=False, abort=T' | |||
|
312 | 312 | if abort: |
|
313 | 313 | raise util.Abort(_("default path for subrepository not found")) |
|
314 | 314 | |
|
315 | def _sanitize(ui, path): | |
|
316 | def v(arg, dirname, names): | |
|
317 | if os.path.basename(dirname).lower() != '.hg': | |
|
318 | return | |
|
319 | for f in names: | |
|
320 | if f.lower() == 'hgrc': | |
|
321 | ui.warn( | |
|
322 | _("warning: removing potentially hostile .hg/hgrc in '%s'" | |
|
323 | % path)) | |
|
324 | os.unlink(os.path.join(dirname, f)) | |
|
325 | os.walk(path, v, None) | |
|
326 | ||
|
315 | 327 | def itersubrepos(ctx1, ctx2): |
|
316 | 328 | """find subrepos in ctx1 or ctx2""" |
|
317 | 329 | # Create a (subpath, ctx) mapping where we prefer subpaths from |
@@ -988,6 +1000,7 b' class svnsubrepo(abstractsubrepo):' | |||
|
988 | 1000 | # update to a directory which has since been deleted and recreated. |
|
989 | 1001 | args.append('%s@%s' % (state[0], state[1])) |
|
990 | 1002 | status, err = self._svncommand(args, failok=True) |
|
1003 | _sanitize(self._ui, self._path) | |
|
991 | 1004 | if not re.search('Checked out revision [0-9]+.', status): |
|
992 | 1005 | if ('is already a working copy for a different URL' in err |
|
993 | 1006 | and (self._wcchanged()[:2] == (False, False))): |
@@ -1248,6 +1261,7 b' class gitsubrepo(abstractsubrepo):' | |||
|
1248 | 1261 | self._gitcommand(['reset', 'HEAD']) |
|
1249 | 1262 | cmd.append('-f') |
|
1250 | 1263 | self._gitcommand(cmd + args) |
|
1264 | _sanitize(self._ui, self._path) | |
|
1251 | 1265 | |
|
1252 | 1266 | def rawcheckout(): |
|
1253 | 1267 | # no branch to checkout, check it out with no branch |
@@ -1331,6 +1345,7 b' class gitsubrepo(abstractsubrepo):' | |||
|
1331 | 1345 | self.get(state) # fast forward merge |
|
1332 | 1346 | elif base != self._state[1]: |
|
1333 | 1347 | self._gitcommand(['merge', '--no-commit', revision]) |
|
1348 | _sanitize(self._ui, self._path) | |
|
1334 | 1349 | |
|
1335 | 1350 | if self.dirty(): |
|
1336 | 1351 | if self._gitstate() != revision: |
General Comments 0
You need to be logged in to leave comments.
Login now