Mercurial > evolve
changeset 1086:96b9e0c31cc1
compat: adapt to change to memctx
Since core mercurial 650b5b6e75ed we must return None instead of raising
IOError. Hooray for mads!!
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Fri, 29 Aug 2014 10:44:40 +0200 |
parents | 0f31e3c44d82 |
children | 82873af0cf10 |
files | hgext/evolve.py |
diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/evolve.py Wed Aug 27 17:49:08 2014 +0200 +++ b/hgext/evolve.py Fri Aug 29 10:44:40 2014 +0200 @@ -725,7 +725,7 @@ isexec='x' in flags, copied=copied.get(path)) return mctx - raise IOError() + return None message = cmdutil.logmessage(repo.ui, commitopts) if not message: @@ -1381,7 +1381,7 @@ isexec='x' in flags, copied=copied.get(path)) return mctx - raise IOError() + return None text = 'bumped update to %s:\n\n' % prec text += bumped.description() @@ -1814,7 +1814,7 @@ if path in redirect: return filectxfn(repo, memctx, path, contentctx=target, redirect=()) if path not in contentctx: - raise IOError() + return None fctx = contentctx[path] flags = fctx.flags() mctx = memfilectx(repo, fctx.path(), fctx.data(),