equal
deleted
inserted
replaced
1362 self._repo.dirstate.remove(f) |
1362 self._repo.dirstate.remove(f) |
1363 else: |
1363 else: |
1364 self._repo.dirstate.drop(f) |
1364 self._repo.dirstate.drop(f) |
1365 return rejected |
1365 return rejected |
1366 |
1366 |
1367 def undelete(self, list): |
|
1368 pctxs = self.parents() |
|
1369 with self._repo.wlock(): |
|
1370 ds = self._repo.dirstate |
|
1371 for f in list: |
|
1372 if self._repo.dirstate[f] != 'r': |
|
1373 self._repo.ui.warn(_("%s not removed!\n") % ds.pathto(f)) |
|
1374 else: |
|
1375 fctx = f in pctxs[0] and pctxs[0][f] or pctxs[1][f] |
|
1376 t = fctx.data() |
|
1377 self._repo.wwrite(f, t, fctx.flags()) |
|
1378 self._repo.dirstate.normal(f) |
|
1379 |
|
1380 def copy(self, source, dest): |
1367 def copy(self, source, dest): |
1381 try: |
1368 try: |
1382 st = self._repo.wvfs.lstat(dest) |
1369 st = self._repo.wvfs.lstat(dest) |
1383 except OSError as err: |
1370 except OSError as err: |
1384 if err.errno != errno.ENOENT: |
1371 if err.errno != errno.ENOENT: |