# HG changeset patch # User Matthias Muenzner # Date 1494266621 -7200 # Node ID 003eee5497e078abd14b3785ab1ff817e585ae8a # Parent 132e522fda326fa8ae8f95e640bdfc14c25d7544 * Hotfixed onsub for use with mercurial 4.1+ diff -r 132e522fda32 -r 003eee5497e0 onsub.py --- a/onsub.py Wed May 18 16:30:12 2016 +0300 +++ b/onsub.py Mon May 08 20:03:41 2017 +0200 @@ -116,8 +116,14 @@ ui.write(relpath, "\0") if cmd != '': if not print0: ui.note(_("executing '%s' in %s\n") % (cmd, relpath)) - util.system(cmd, environ=envargdict, cwd=cmdwd, onerr=onerr, - errprefix=_('terminated onsub in %s') % relpath) + rc = util.system(cmd, environ=envargdict, cwd=cmdwd) + if rc: + errprefix=_('terminated onsub in %s') % relpath + errmsg = '%s: %s' % (errprefix, errmsg) + try: + onerr.warn(errmsg + '\n') + except AttributeError: + raise onerr(errmsg) def bfs(): """execute precmd in repo.root and in each subrepository, breadth-first"""