# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1412283007 18000
# Node ID fbc400c1b0221706064bf53cee1a03421139a4ef
# Parent  98f4e356a431690dff7cfb9a8f3476b065b5f6b5
evolve: adapt to core changeset 4f14303e8954

pushop.ret is now pushop.cgresult

diff -r 98f4e356a431 -r fbc400c1b022 hgext/evolve.py
--- a/hgext/evolve.py	Thu Oct 02 14:16:32 2014 -0500
+++ b/hgext/evolve.py	Thu Oct 02 15:50:07 2014 -0500
@@ -2427,7 +2427,11 @@
         if 'obsmarkers' in stepsdone:
             return
         stepsdone.add('obsmarkers')
-    if pushop.ret == 0:
+    if util.safehasattr(pushop, 'cgresult'):
+        cgresult = pushop.cgresult
+    else:
+        cgresult = pushop.ret
+    if cgresult == 0:
         return
     pushop.ui.debug('try to push obsolete markers to remote\n')
     repo = pushop.repo