Mercurial > public > mercurial-scm > hg

comparison mercurial/context.py @ 41611:4bf166a020a7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
context: delete unused undelete() Maybe it's been unused since c8e2a5ea7062 (mq: avoid data loss upon qfold + qmv (issue3058), 2011-10-20), maybe not. Differential Revision: https://phab.mercurial-scm.org/D5888
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 07 Feb 2019 21:48:24 -0800
parents 9087513df412
children fbd4ce55bcbd
comparison
equal deleted inserted replaced
41610:d683aca738cd 41611:4bf166a020a7
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: