From f79bcb4b86f9a9638e7574d37732ac95db890b67 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Mon, 27 Jun 2011 13:45:17 -0400 Subject: [PATCH] codereview: make --ignore_hgpatch_failure work again R=golang-dev, bradfitz CC=golang-dev https://golang.org/cl/4627067 --- lib/codereview/codereview.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/codereview/codereview.py b/lib/codereview/codereview.py index a222919d860..0b636c06a4f 100644 --- a/lib/codereview/codereview.py +++ b/lib/codereview/codereview.py @@ -1352,10 +1352,12 @@ def clpatch_or_undo(ui, repo, clname, opts, mode): repo[vers].description() except: return "local repository is out of date; sync to get %s" % (vers) - patch, err = portPatch(repo, patch, vers, id) + patch1, err = portPatch(repo, patch, vers, id) if err != "": - return "codereview issue %s is out of date: %s (%s->%s)" % (clname, err, vers, id) - + if not opts["ignore_hgpatch_failure"]: + return "codereview issue %s is out of date: %s (%s->%s)" % (clname, err, vers, id) + else: + patch = patch1 argv = ["hgpatch"] if opts["no_incoming"] or mode == "backport": argv += ["--checksync=false"] @@ -1369,7 +1371,7 @@ def clpatch_or_undo(ui, repo, clname, opts, mode): return "hgpatch failed" cl.local = True cl.files = out.strip().split() - if not cl.files: + if not cl.files and not opts["ignore_hgpatch_failure"]: return "codereview issue %s has no changed files" % clname files = ChangedFiles(ui, repo, [], opts) extra = Sub(cl.files, files)