Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/context.py @ 16111:131d1a09108a stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
context: make workingctx.forget() really warn about untracked files
author Patrick Mezard <patrick@mezard.eu>
date Thu, 16 Feb 2012 12:56:48 +0100
parents 2bd54ffaa27e
children 004982e5d782 fceb2964fa6c
comparison
equal deleted inserted replaced
16110:41417443b7d0 16111:131d1a09108a
904 join = lambda f: os.path.join(prefix, f) 904 join = lambda f: os.path.join(prefix, f)
905 wlock = self._repo.wlock() 905 wlock = self._repo.wlock()
906 try: 906 try:
907 rejected = [] 907 rejected = []
908 for f in files: 908 for f in files:
909 if self._repo.dirstate[f] != 'a': 909 if f not in self._repo.dirstate:
910 self._repo.dirstate.remove(f)
911 elif f not in self._repo.dirstate:
912 self._repo.ui.warn(_("%s not tracked!\n") % join(f)) 910 self._repo.ui.warn(_("%s not tracked!\n") % join(f))
913 rejected.append(f) 911 rejected.append(f)
912 elif self._repo.dirstate[f] != 'a':
913 self._repo.dirstate.remove(f)
914 else: 914 else:
915 self._repo.dirstate.drop(f) 915 self._repo.dirstate.drop(f)
916 return rejected 916 return rejected
917 finally: 917 finally:
918 wlock.release() 918 wlock.release()