Mercurial > evolve
changeset 1132:7a1784a1c642
pullobsolete: handle migration from todosteps to donesteps
This make evolve compatible with change made in Mercurial (92bf9abc4deb)
| author | Augie Fackler <raf@durin42.com> |
|---|---|
| date | Fri, 17 Oct 2014 17:43:52 -0400 |
| parents | a44a26f8cc48 |
| children | 8b3b0549a4b6 |
| files | hgext/evolve.py |
| diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/evolve.py Thu Oct 16 04:38:37 2014 -0700 +++ b/hgext/evolve.py Fri Oct 17 17:43:52 2014 -0400 @@ -2591,7 +2591,9 @@ def _pullobsolete(orig, pullop): if not obsolete._enabled: return None - if 'obsmarkers' not in pullop.todosteps: + if 'obsmarkers' not in getattr(pullop, 'todosteps', ['obsmarkers']): + return None + if 'obsmarkers' in getattr(pullop, 'stepsdone', []): return None wirepull = pullop.remote.capable('_evoext_pullobsmarkers_0') if not wirepull: