diff options
| author | Gustavo Niemeyer <gustavo@niemeyer.net> | 2011-02-23 11:48:40 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2011-02-23 11:48:40 -0500 |
| commit | 73aacbda205127dd5a51eae4ab02869a98f92404 (patch) | |
| tree | 472474f74e887a17d48083077bdfc6c14ce776c3 | |
| parent | 83da7d15a3520e18361b488b803bf38804b86350 (diff) | |
| download | go-73aacbda205127dd5a51eae4ab02869a98f92404.tar.gz go-73aacbda205127dd5a51eae4ab02869a98f92404.zip | |
codereview: fix clpatch with empty diffs
Avoid passing the placeholder diff to hgpatch, so that
clpatch-ing an empty diff grabs the metadata and warns
about it being empty, rather than failing with a
hard-to-debug problem ("mkdir: no such file or dir",
no metadata, etc).
R=rsc
CC=golang-dev
https://golang.org/cl/4172060
| -rw-r--r-- | lib/codereview/codereview.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/codereview/codereview.py b/lib/codereview/codereview.py index 96efc855b6..fa703c711f 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: |