Mercurial > evolve
comparison hgext/obsolete.py @ 300:3b1f326878e5
obsolete: suspended changeset with secret only children should be secret too
test-obsolete-push.t: exhibit outgoing bug with suspended changeset in this case
| author | Patrick Mezard <patrick@mezard.eu> |
|---|---|
| date | Sat, 23 Jun 2012 01:14:49 +0200 |
| parents | eda6491ca269 |
| children | b41ff69388a8 |
comparison
equal
deleted
inserted
replaced
| 299:eda6491ca269 | 300:3b1f326878e5 |
|---|---|
| 851 def _turn_extinct_secret(self): | 851 def _turn_extinct_secret(self): |
| 852 """ensure all extinct changeset are secret""" | 852 """ensure all extinct changeset are secret""" |
| 853 self._clearobsoletecache() | 853 self._clearobsoletecache() |
| 854 # this is mainly for safety purpose | 854 # this is mainly for safety purpose |
| 855 # both pull and push | 855 # both pull and push |
| 856 expobs = [c.node() for c in repo.set('extinct() - secret()')] | 856 query = '(obsolete() - obsolete()::(unstable() - secret())) - secret()' |
| 857 expobs = [c.node() for c in repo.set(query)] | |
| 857 phases.retractboundary(repo, 2, expobs) | 858 phases.retractboundary(repo, 2, expobs) |
| 858 | 859 |
| 859 ### Disk IO | 860 ### Disk IO |
| 860 | 861 |
| 861 def lock(self, *args, **kwargs): | 862 def lock(self, *args, **kwargs): |