Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/context.py @ 13001:cc4e13c92dfa
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 15 Nov 2010 17:05:54 -0600 |
parents | 4832717aed98 acd69df118ab |
children | 3da456d0c885 |
comparison
equal
deleted
inserted
replaced
12998:91cb08a9e7fb | 13001:cc4e13c92dfa |
---|---|
819 else: | 819 else: |
820 self._repo.dirstate.forget(f) | 820 self._repo.dirstate.forget(f) |
821 finally: | 821 finally: |
822 wlock.release() | 822 wlock.release() |
823 | 823 |
824 def ancestors(self): | |
825 for a in self._repo.changelog.ancestors( | |
826 *[p.rev() for p in self._parents]): | |
827 yield changectx(self._repo, a) | |
828 | |
824 def remove(self, list, unlink=False): | 829 def remove(self, list, unlink=False): |
825 if unlink: | 830 if unlink: |
826 for f in list: | 831 for f in list: |
827 try: | 832 try: |
828 util.unlink(self._repo.wjoin(f)) | 833 util.unlink(self._repo.wjoin(f)) |