mercurial/context.py
changeset 47600 f636dfe83554
parent 47595 14e2f4bd5f16
child 47605 a5701ffc10e4
equal deleted inserted replaced
47599:cce51119bfe6 47600:f636dfe83554
  1709         with self._repo.wlock():
  1709         with self._repo.wlock():
  1710             ds = self._repo.dirstate
  1710             ds = self._repo.dirstate
  1711             uipath = lambda f: ds.pathto(pathutil.join(prefix, f))
  1711             uipath = lambda f: ds.pathto(pathutil.join(prefix, f))
  1712             rejected = []
  1712             rejected = []
  1713             for f in files:
  1713             for f in files:
  1714                 if f not in ds:
  1714                 if not ds.set_untracked(f):
  1715                     self._repo.ui.warn(_(b"%s not tracked!\n") % uipath(f))
  1715                     self._repo.ui.warn(_(b"%s not tracked!\n") % uipath(f))
  1716                     rejected.append(f)
  1716                     rejected.append(f)
  1717                 elif ds[f] != b'a':
       
  1718                     ds.remove(f)
       
  1719                 else:
       
  1720                     ds.drop(f)
       
  1721             return rejected
  1717             return rejected
  1722 
  1718 
  1723     def copy(self, source, dest):
  1719     def copy(self, source, dest):
  1724         try:
  1720         try:
  1725             st = self._repo.wvfs.lstat(dest)
  1721             st = self._repo.wvfs.lstat(dest)