qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-24 17:50:15 -07:00
Code Releases Activity

codereview.py: correct error handling without decorator

Browse Source 
The decorator hides the number of function arguments from Mercurial,
so Mercurial cannot give proper error messages about commands
invoked with the wrong number of arguments.

Left a 'dummy' hgcommand decorator in place as a way to document
what functions are hg commands, and just in case we need some other
kind of hack in the future.

R=adg, rsc
CC=golang-dev
https://golang.org/cl/6488059
This commit is contained in:
Uriel Mangado 2012-09-01 19:55:29 -04:00 committed by Russ Cox
parent 5fa8987fe3
commit 9b8c94a46f
1 changed files with 32 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
lib/codereview/codereview.py
View File

@ -1247,24 +1247,8 @@ def MatchAt(ctx, pats=None, opts=None, globbed=False, default='relpath'):
####################################################################### #######################################################################
# Commands added by code review extension. # Commands added by code review extension.
# As of Mercurial 2.1 the commands are all required to return integer
# exit codes, whereas earlier versions allowed returning arbitrary strings
# to be printed as errors. We wrap the old functions to make sure we
# always return integer exit codes now. Otherwise Mercurial dies
# with a TypeError traceback (unsupported operand type(s) for &: 'str' and 'int').
# Introduce a Python decorator to convert old functions to the new
# stricter convention.
def hgcommand(f): def hgcommand(f):
def wrapped(ui, repo, *pats, **opts): return f
err = f(ui, repo, *pats, **opts)
if type(err) is int:
return err
if not err:
return 0
raise hg_util.Abort(err)
wrapped.__doc__ = f.__doc__
return wrapped
####################################################################### #######################################################################
# hg change # hg change
@ -1293,42 +1277,42 @@ def change(ui, repo, *pats, **opts):
""" """
if codereview_disabled: if codereview_disabled:
return codereview_disabled raise hg_util.Abort(codereview_disabled)
dirty = {} dirty = {}
if len(pats) > 0 and GoodCLName(pats[0]): if len(pats) > 0 and GoodCLName(pats[0]):
name = pats[0] name = pats[0]
if len(pats) != 1: if len(pats) != 1:
return "cannot specify CL name and file patterns" raise hg_util.Abort("cannot specify CL name and file patterns")
pats = pats[1:] pats = pats[1:]
cl, err = LoadCL(ui, repo, name, web=True) cl, err = LoadCL(ui, repo, name, web=True)
if err != '': if err != '':
return err raise hg_util.Abort(err)
if not cl.local and (opts["stdin"] or not opts["stdout"]): if not cl.local and (opts["stdin"] or not opts["stdout"]):
return "cannot change non-local CL " + name raise hg_util.Abort("cannot change non-local CL " + name)
else: else:
name = "new" name = "new"
cl = CL("new") cl = CL("new")
if repo[None].branch() != "default": if repo[None].branch() != "default":
return "cannot create CL outside default branch; switch with 'hg update default'" raise hg_util.Abort("cannot create CL outside default branch; switch with 'hg update default'")
dirty[cl] = True dirty[cl] = True
files = ChangedFiles(ui, repo, pats, taken=Taken(ui, repo)) files = ChangedFiles(ui, repo, pats, taken=Taken(ui, repo))
if opts["delete"] or opts["deletelocal"]: if opts["delete"] or opts["deletelocal"]:
if opts["delete"] and opts["deletelocal"]: if opts["delete"] and opts["deletelocal"]:
return "cannot use -d and -D together" raise hg_util.Abort("cannot use -d and -D together")
flag = "-d" flag = "-d"
if opts["deletelocal"]: if opts["deletelocal"]:
flag = "-D" flag = "-D"
if name == "new": if name == "new":
return "cannot use "+flag+" with file patterns" raise hg_util.Abort("cannot use "+flag+" with file patterns")
if opts["stdin"] or opts["stdout"]: if opts["stdin"] or opts["stdout"]:
return "cannot use "+flag+" with -i or -o" raise hg_util.Abort("cannot use "+flag+" with -i or -o")
if not cl.local: if not cl.local:
return "cannot change non-local CL " + name raise hg_util.Abort("cannot change non-local CL " + name)
if opts["delete"]: if opts["delete"]:
if cl.copied_from: if cl.copied_from:
return "original author must delete CL; hg change -D will remove locally" raise hg_util.Abort("original author must delete CL; hg change -D will remove locally")
PostMessage(ui, cl.name, "*** Abandoned ***", send_mail=cl.mailed) PostMessage(ui, cl.name, "*** Abandoned ***", send_mail=cl.mailed)
EditDesc(cl.name, closed=True, private=cl.private) EditDesc(cl.name, closed=True, private=cl.private)
cl.Delete(ui, repo) cl.Delete(ui, repo)
@ -1338,7 +1322,7 @@ def change(ui, repo, *pats, **opts):
s = sys.stdin.read() s = sys.stdin.read()
clx, line, err = ParseCL(s, name) clx, line, err = ParseCL(s, name)
if err != '': if err != '':
return "error parsing change list: line %d: %s" % (line, err) raise hg_util.Abort("error parsing change list: line %d: %s" % (line, err))
if clx.desc is not None: if clx.desc is not None:
cl.desc = clx.desc; cl.desc = clx.desc;
dirty[cl] = True dirty[cl] = True
@ -1360,7 +1344,7 @@ def change(ui, repo, *pats, **opts):
cl.files = files cl.files = files
err = EditCL(ui, repo, cl) err = EditCL(ui, repo, cl)
if err != "": if err != "":
return err raise hg_util.Abort(err)
dirty[cl] = True dirty[cl] = True
for d, _ in dirty.items(): for d, _ in dirty.items():
@ -1391,7 +1375,7 @@ def code_login(ui, repo, **opts):
a file in your home directory. a file in your home directory.
""" """
if codereview_disabled: if codereview_disabled:
return codereview_disabled raise hg_util.Abort(codereview_disabled)
MySend(None) MySend(None)
@ -1411,8 +1395,10 @@ def clpatch(ui, repo, clname, **opts):
name as the Author: line but add your own name to a Committer: line. name as the Author: line but add your own name to a Committer: line.
""" """
if repo[None].branch() != "default": if repo[None].branch() != "default":
return "cannot run hg clpatch outside default branch" raise hg_util.Abort("cannot run hg clpatch outside default branch")
return clpatch_or_undo(ui, repo, clname, opts, mode="clpatch") err = clpatch_or_undo(ui, repo, clname, opts, mode="clpatch")
if err:
raise hg_util.Abort(err)
@hgcommand @hgcommand
def undo(ui, repo, clname, **opts): def undo(ui, repo, clname, **opts):
@ -1423,8 +1409,10 @@ def undo(ui, repo, clname, **opts):
you can add the reason for the undo to the description. you can add the reason for the undo to the description.
""" """
if repo[None].branch() != "default": if repo[None].branch() != "default":
return "cannot run hg undo outside default branch" raise hg_util.Abort("cannot run hg undo outside default branch")
return clpatch_or_undo(ui, repo, clname, opts, mode="undo") err = clpatch_or_undo(ui, repo, clname, opts, mode="undo")
if err:
raise hg_util.Abort(err)
@hgcommand @hgcommand
def release_apply(ui, repo, clname, **opts): def release_apply(ui, repo, clname, **opts):
@ -1468,13 +1456,13 @@ def release_apply(ui, repo, clname, **opts):
""" """
c = repo[None] c = repo[None]
if not releaseBranch: if not releaseBranch:
return "no active release branches" raise hg_util.Abort("no active release branches")
if c.branch() != releaseBranch: if c.branch() != releaseBranch:
if c.modified() or c.added() or c.removed(): if c.modified() or c.added() or c.removed():
raise hg_util.Abort("uncommitted local changes - cannot switch branches") raise hg_util.Abort("uncommitted local changes - cannot switch branches")
err = hg_clean(repo, releaseBranch) err = hg_clean(repo, releaseBranch)
if err: if err:
return err raise hg_util.Abort(err)
try: try:
err = clpatch_or_undo(ui, repo, clname, opts, mode="backport") err = clpatch_or_undo(ui, repo, clname, opts, mode="backport")
if err: if err:
@ -1482,7 +1470,6 @@ def release_apply(ui, repo, clname, **opts):
except Exception, e: except Exception, e:
hg_clean(repo, "default") hg_clean(repo, "default")
raise e raise e
return None
def rev2clname(rev): def rev2clname(rev):
# Extract CL name from revision description. # Extract CL name from revision description.
@ -1687,7 +1674,7 @@ def download(ui, repo, clname, **opts):
followed by its diff, downloaded from the code review server. followed by its diff, downloaded from the code review server.
""" """
if codereview_disabled: if codereview_disabled:
return codereview_disabled raise hg_util.Abort(codereview_disabled)
cl, vers, patch, err = DownloadCL(ui, repo, clname) cl, vers, patch, err = DownloadCL(ui, repo, clname)
if err != "": if err != "":
@ -1709,7 +1696,7 @@ def file(ui, repo, clname, pat, *pats, **opts):
It does not edit them or remove them from the repository. It does not edit them or remove them from the repository.
""" """
if codereview_disabled: if codereview_disabled:
return codereview_disabled raise hg_util.Abort(codereview_disabled)
pats = tuple([pat] + list(pats)) pats = tuple([pat] + list(pats))
if not GoodCLName(clname): if not GoodCLName(clname):
@ -1773,7 +1760,7 @@ def gofmt(ui, repo, *pats, **opts):
the given patterns. the given patterns.
""" """
if codereview_disabled: if codereview_disabled:
return codereview_disabled raise hg_util.Abort(codereview_disabled)
files = ChangedExistingFiles(ui, repo, pats, opts) files = ChangedExistingFiles(ui, repo, pats, opts)
files = gofmt_required(files) files = gofmt_required(files)
@ -1807,7 +1794,7 @@ def mail(ui, repo, *pats, **opts):
to the reviewer and CC list asking for a review. to the reviewer and CC list asking for a review.
""" """
if codereview_disabled: if codereview_disabled:
return codereview_disabled raise hg_util.Abort(codereview_disabled)
cl, err = CommandLineCL(ui, repo, pats, opts, defaultcc=defaultcc) cl, err = CommandLineCL(ui, repo, pats, opts, defaultcc=defaultcc)
if err != "": if err != "":
@ -1853,7 +1840,7 @@ def pending(ui, repo, *pats, **opts):
Lists pending changes followed by a list of unassigned but modified files. Lists pending changes followed by a list of unassigned but modified files.
""" """
if codereview_disabled: if codereview_disabled:
return codereview_disabled raise hg_util.Abort(codereview_disabled)
quick = opts.get('quick', False) quick = opts.get('quick', False)
short = opts.get('short', False) short = opts.get('short', False)
@ -1890,7 +1877,7 @@ def submit(ui, repo, *pats, **opts):
Bails out if the local repository is not in sync with the remote one. Bails out if the local repository is not in sync with the remote one.
""" """
if codereview_disabled: if codereview_disabled:
return codereview_disabled raise hg_util.Abort(codereview_disabled)
# We already called this on startup but sometimes Mercurial forgets. # We already called this on startup but sometimes Mercurial forgets.
set_mercurial_encoding_to_utf8() set_mercurial_encoding_to_utf8()
@ -2023,7 +2010,7 @@ def sync(ui, repo, **opts):
into the local repository. into the local repository.
""" """
if codereview_disabled: if codereview_disabled:
return codereview_disabled raise hg_util.Abort(codereview_disabled)
if not opts["local"]: if not opts["local"]:
err = hg_pull(ui, repo, update=True) err = hg_pull(ui, repo, update=True)
@ -2076,7 +2063,7 @@ def upload(ui, repo, name, **opts):
Uploads the current modifications for a given change to the server. Uploads the current modifications for a given change to the server.
""" """
if codereview_disabled: if codereview_disabled:
return codereview_disabled raise hg_util.Abort(codereview_disabled)
repo.ui.quiet = True repo.ui.quiet = True
cl, err = LoadCL(ui, repo, name, web=True) cl, err = LoadCL(ui, repo, name, web=True)