qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-21 18:54:43 -07:00
Code Releases Activity

codereview: fix clpatch with empty diffs

Browse Source 
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
This commit is contained in:
Gustavo Niemeyer 2011-02-23 11:48:40 -05:00 committed by Russ Cox
parent 83da7d15a3
commit 73aacbda20
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/codereview/codereview.py
View File

@ -1136,11 +1136,14 @@ def clpatch(ui, repo, clname, **opts):
return missing_codereview return missing_codereview
cl, patch, err = DownloadCL(ui, repo, clname) cl, patch, err = DownloadCL(ui, repo, clname)
if err != "":
return err
if patch == emptydiff:
return "codereview issue %s has no diff" % clname
argv = ["hgpatch"] argv = ["hgpatch"]
if opts["no_incoming"]: if opts["no_incoming"]:
argv += ["--checksync=false"] argv += ["--checksync=false"]
if err != "":
return err
try: try:
cmd = subprocess.Popen(argv, shell=False, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=None, close_fds=sys.platform != "win32") cmd = subprocess.Popen(argv, shell=False, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=None, close_fds=sys.platform != "win32")
except: except:
@ -1151,6 +1154,8 @@ def clpatch(ui, repo, clname, **opts):
return "hgpatch failed" return "hgpatch failed"
cl.local = True cl.local = True
cl.files = out.strip().split() cl.files = out.strip().split()
if not cl.files:
return "codereview issue %s has no diff" % clname
files = ChangedFiles(ui, repo, [], opts) files = ChangedFiles(ui, repo, [], opts)
extra = Sub(cl.files, files) extra = Sub(cl.files, files)
if extra: if extra: