diff options
| author | Russ Cox <rsc@golang.org> | 2014-11-14 12:10:52 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2014-11-14 12:10:52 -0500 |
| commit | 6b31cfd20257f4d7226d5c4e95c67ed9b48ab58c (patch) | |
| tree | fd7941be82dd45f113d8f0668e2c9b6a6ec3c77f /lib | |
| parent | 9cabb766eb4acbe2c11ad0084659710919f40c0d (diff) | |
| parent | 0fdd42d52b29f44cf6cffa4c881ee8b40f9b3090 (diff) | |
| download | go-6b31cfd20257f4d7226d5c4e95c67ed9b48ab58c.tar.gz | |
[dev.cc] all: merge dev.power64 (7667e41f3ced) into dev.cc
This is to reduce the delta between dev.cc and dev.garbage to just garbage collector changes.
These are the files that had merge conflicts and have been edited by hand:
malloc.go
mem_linux.go
mgc.go
os1_linux.go
proc1.go
panic1.go
runtime1.go
LGTM=austin
R=austin
CC=golang-codereviews
https://codereview.appspot.com/174180043
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 263385b79..9181f1df3 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) |