Show More
@@ -1050,7 +1050,7 b' class svnsubrepo(abstractsubrepo):' | |||||
1050 | # update to a directory which has since been deleted and recreated. |
|
1050 | # update to a directory which has since been deleted and recreated. | |
1051 | args.append('%s@%s' % (state[0], state[1])) |
|
1051 | args.append('%s@%s' % (state[0], state[1])) | |
1052 | status, err = self._svncommand(args, failok=True) |
|
1052 | status, err = self._svncommand(args, failok=True) | |
1053 | _sanitize(self._ui, self._path) |
|
1053 | _sanitize(self._ui, self._ctx._repo.wjoin(self._path)) | |
1054 | if not re.search('Checked out revision [0-9]+.', status): |
|
1054 | if not re.search('Checked out revision [0-9]+.', status): | |
1055 | if ('is already a working copy for a different URL' in err |
|
1055 | if ('is already a working copy for a different URL' in err | |
1056 | and (self._wcchanged()[:2] == (False, False))): |
|
1056 | and (self._wcchanged()[:2] == (False, False))): | |
@@ -1343,7 +1343,7 b' class gitsubrepo(abstractsubrepo):' | |||||
1343 | self._gitcommand(['reset', 'HEAD']) |
|
1343 | self._gitcommand(['reset', 'HEAD']) | |
1344 | cmd.append('-f') |
|
1344 | cmd.append('-f') | |
1345 | self._gitcommand(cmd + args) |
|
1345 | self._gitcommand(cmd + args) | |
1346 | _sanitize(self._ui, self._path) |
|
1346 | _sanitize(self._ui, self._abspath) | |
1347 |
|
1347 | |||
1348 | def rawcheckout(): |
|
1348 | def rawcheckout(): | |
1349 | # no branch to checkout, check it out with no branch |
|
1349 | # no branch to checkout, check it out with no branch | |
@@ -1392,7 +1392,7 b' class gitsubrepo(abstractsubrepo):' | |||||
1392 | if tracking[remote] != self._gitcurrentbranch(): |
|
1392 | if tracking[remote] != self._gitcurrentbranch(): | |
1393 | checkout([tracking[remote]]) |
|
1393 | checkout([tracking[remote]]) | |
1394 | self._gitcommand(['merge', '--ff', remote]) |
|
1394 | self._gitcommand(['merge', '--ff', remote]) | |
1395 | _sanitize(self._ui, self._path) |
|
1395 | _sanitize(self._ui, self._abspath) | |
1396 | else: |
|
1396 | else: | |
1397 | # a real merge would be required, just checkout the revision |
|
1397 | # a real merge would be required, just checkout the revision | |
1398 | rawcheckout() |
|
1398 | rawcheckout() | |
@@ -1428,7 +1428,7 b' class gitsubrepo(abstractsubrepo):' | |||||
1428 | self.get(state) # fast forward merge |
|
1428 | self.get(state) # fast forward merge | |
1429 | elif base != self._state[1]: |
|
1429 | elif base != self._state[1]: | |
1430 | self._gitcommand(['merge', '--no-commit', revision]) |
|
1430 | self._gitcommand(['merge', '--no-commit', revision]) | |
1431 | _sanitize(self._ui, self._path) |
|
1431 | _sanitize(self._ui, self._abspath) | |
1432 |
|
1432 | |||
1433 | if self.dirty(): |
|
1433 | if self.dirty(): | |
1434 | if self._gitstate() != revision: |
|
1434 | if self._gitstate() != revision: |
@@ -592,11 +592,11 b' Test sanitizing ".hg/hgrc" in subrepo' | |||||
592 | c4069473b459cf27fd4d7c2f50c4346b4e936599 s |
|
592 | c4069473b459cf27fd4d7c2f50c4346b4e936599 s | |
593 | $ cd .. |
|
593 | $ cd .. | |
594 |
|
594 | |||
|
595 | $ hg -R tc pull -q | |||
|
596 | $ hg -R tc update -q -C 3473d20bddcf 2>&1 | sort | |||
|
597 | warning: removing potentially hostile 'hgrc' in '$TESTTMP/tc/s/.hg' (glob) | |||
|
598 | warning: removing potentially hostile 'hgrc' in '$TESTTMP/tc/s/sub/.hg' (glob) | |||
595 | $ cd tc |
|
599 | $ cd tc | |
596 | $ hg pull -q |
|
|||
597 | $ hg update -q -C 3473d20bddcf 2>&1 | sort |
|
|||
598 | warning: removing potentially hostile 'hgrc' in 's/.hg' (glob) |
|
|||
599 | warning: removing potentially hostile 'hgrc' in 's/sub/.hg' (glob) |
|
|||
600 | $ hg parents -q |
|
600 | $ hg parents -q | |
601 | 8:3473d20bddcf |
|
601 | 8:3473d20bddcf | |
602 | $ grep ' s$' .hgsubstate |
|
602 | $ grep ' s$' .hgsubstate | |
@@ -642,10 +642,12 b' additional test for "git merge --ff" rou' | |||||
642 | $ cat s/sub/.hg/hgrc |
|
642 | $ cat s/sub/.hg/hgrc | |
643 | cat: s/sub/.hg/hgrc: No such file or directory |
|
643 | cat: s/sub/.hg/hgrc: No such file or directory | |
644 | [1] |
|
644 | [1] | |
645 | $ hg pull -q |
|
645 | $ cd .. | |
646 | $ hg update -q -C ed23f7fe024e 2>&1 | sort |
|
646 | $ hg -R tc pull -q | |
647 | warning: removing potentially hostile 'hgrc' in 's/.hg' (glob) |
|
647 | $ hg -R tc update -q -C ed23f7fe024e 2>&1 | sort | |
648 |
warning: removing potentially hostile 'hgrc' in 's |
|
648 | warning: removing potentially hostile 'hgrc' in '$TESTTMP/tc/s/.hg' (glob) | |
|
649 | warning: removing potentially hostile 'hgrc' in '$TESTTMP/tc/s/sub/.hg' (glob) | |||
|
650 | $ cd tc | |||
649 | $ hg parents -q |
|
651 | $ hg parents -q | |
650 | 9:ed23f7fe024e |
|
652 | 9:ed23f7fe024e | |
651 | $ grep ' s$' .hgsubstate |
|
653 | $ grep ' s$' .hgsubstate |
@@ -663,10 +663,10 b' Test sanitizing ".hg/hgrc" in subrepo' | |||||
663 | 16 s |
|
663 | 16 s | |
664 | $ cd .. |
|
664 | $ cd .. | |
665 |
|
665 | |||
|
666 | $ hg -R tc pull -u -q 2>&1 | sort | |||
|
667 | warning: removing potentially hostile 'hgrc' in '$TESTTMP/sub/tc/s/.hg' (glob) | |||
|
668 | warning: removing potentially hostile 'hgrc' in '$TESTTMP/sub/tc/s/sub/.hg' (glob) | |||
666 | $ cd tc |
|
669 | $ cd tc | |
667 | $ hg pull -u -q 2>&1 | sort |
|
|||
668 | warning: removing potentially hostile 'hgrc' in 's/.hg' (glob) |
|
|||
669 | warning: removing potentially hostile 'hgrc' in 's/sub/.hg' (glob) |
|
|||
670 | $ grep ' s$' .hgsubstate |
|
670 | $ grep ' s$' .hgsubstate | |
671 | 16 s |
|
671 | 16 s | |
672 | $ cat s/.hg/hgrc |
|
672 | $ cat s/.hg/hgrc |
General Comments 0
You need to be logged in to leave comments.
Login now