1272 if self._svnversion >= (1, 5): |
1272 if self._svnversion >= (1, 5): |
1273 args.append('--force') |
1273 args.append('--force') |
1274 # The revision must be specified at the end of the URL to properly |
1274 # The revision must be specified at the end of the URL to properly |
1275 # update to a directory which has since been deleted and recreated. |
1275 # update to a directory which has since been deleted and recreated. |
1276 args.append('%s@%s' % (state[0], state[1])) |
1276 args.append('%s@%s' % (state[0], state[1])) |
|
1277 |
|
1278 # SEC: check that the ssh url is safe |
|
1279 util.checksafessh(state[0]) |
|
1280 |
1277 status, err = self._svncommand(args, failok=True) |
1281 status, err = self._svncommand(args, failok=True) |
1278 _sanitize(self.ui, self.wvfs, '.svn') |
1282 _sanitize(self.ui, self.wvfs, '.svn') |
1279 if not re.search('Checked out revision [0-9]+.', status): |
1283 if not re.search('Checked out revision [0-9]+.', status): |
1280 if ('is already a working copy for a different URL' in err |
1284 if ('is already a working copy for a different URL' in err |
1281 and (self._wcchanged()[:2] == (False, False))): |
1285 and (self._wcchanged()[:2] == (False, False))): |