diff options
| author | Russ Cox <rsc@golang.org> | 2014-11-14 11:37:54 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2014-11-14 11:37:54 -0500 |
| commit | 3dcc62e1dad3c62a1c8df1b6f613f93521124764 (patch) | |
| tree | 104445da5e3ecfc84f1973cef910a4ab481b2fde /lib | |
| parent | 18ed947ee17be6bbd9d169256ad9382611eb3eb1 (diff) | |
| parent | c99616fc6795123ec1a6b4d742099789865bd939 (diff) | |
| download | go-git-3dcc62e1dad3c62a1c8df1b6f613f93521124764.tar.gz | |
[dev.garbage] all: merge default (f38460037b72) into dev.garbage
This is the revision that dev.cc is branched from.
LGTM=austin
R=austin
CC=golang-codereviews
https://golang.org/cl/169590043
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/codereview/codereview.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/codereview/codereview.py b/lib/codereview/codereview.py index 3aac8f43c9..0c9b27a318 100644 --- a/lib/codereview/codereview.py +++ b/lib/codereview/codereview.py @@ -1631,7 +1631,7 @@ def clpatch_or_undo(ui, repo, clname, opts, mode): try: cmd = subprocess.Popen(argv, shell=False, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=None, close_fds=sys.platform != "win32") except: - return "hgapplydiff: " + ExceptionDetail() + "\nInstall hgapplydiff with:\n$ go get code.google.com/p/go.codereview/cmd/hgapplydiff\n" + return "hgapplydiff: " + ExceptionDetail() + "\nInstall hgapplydiff with:\n$ go get golang.org/x/codereview/cmd/hgapplydiff\n" out, err = cmd.communicate(patch) if cmd.returncode != 0 and not opts["ignore_hgapplydiff_failure"]: @@ -3451,6 +3451,7 @@ class FakeMercurialUI(object): def __init__(self): self.quiet = True self.output = '' + self.debugflag = False def write(self, *args, **opts): self.output += ' '.join(args) |