From 50104cc32a498f7517a51c8dc93106c51c7a54b4 Mon Sep 17 00:00:00 2001 From: Ondřej Surý Date: Wed, 20 Apr 2011 15:44:41 +0200 Subject: Imported Upstream version 2011.03.07.1 --- lib/codereview/codereview.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'lib/codereview') diff --git a/lib/codereview/codereview.py b/lib/codereview/codereview.py index 96efc855b..fa703c711 100644 --- a/lib/codereview/codereview.py +++ b/lib/codereview/codereview.py @@ -1136,11 +1136,14 @@ def clpatch(ui, repo, clname, **opts): return missing_codereview cl, patch, err = DownloadCL(ui, repo, clname) + if err != "": + return err + if patch == emptydiff: + return "codereview issue %s has no diff" % clname + argv = ["hgpatch"] if opts["no_incoming"]: argv += ["--checksync=false"] - if err != "": - return err try: cmd = subprocess.Popen(argv, shell=False, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=None, close_fds=sys.platform != "win32") except: @@ -1151,6 +1154,8 @@ def clpatch(ui, repo, clname, **opts): return "hgpatch failed" cl.local = True cl.files = out.strip().split() + if not cl.files: + return "codereview issue %s has no diff" % clname files = ChangedFiles(ui, repo, [], opts) extra = Sub(cl.files, files) if extra: -- cgit v1.2.3