Mercurial > hg > evolve
changeset 1214:fbc400c1b022
evolve: adapt to core changeset 4f14303e8954
pushop.ret is now pushop.cgresult
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Thu, 02 Oct 2014 15:50:07 -0500 |
parents | 98f4e356a431 |
children | 7068ccfed963 |
files | hgext/evolve.py |
diffstat | 1 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/evolve.py +++ b/hgext/evolve.py @@ -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