Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pullobsolete: handle migration from todosteps to donesteps
authorAugie Fackler <raf@durin42.com>
Fri, 17 Oct 2014 17:43:52 -0400
changeset 1132 7a1784a1c642
parent 1131 a44a26f8cc48
child 1133 8b3b0549a4b6
pullobsolete: handle migration from todosteps to donesteps This make evolve compatible with change made in Mercurial (92bf9abc4deb)
hgext/evolve.py file | annotate | diff | comparison | revisions 
--- 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:
evolve