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 | 3e804631d905162d9e0fc1eba63bce6f95965a24 (patch) | |
| tree | 5a3c5fe864320ef097c2cd8808620d15a1c21913 /lib | |
| parent | 9ad6b7e322deaf72e3c373952249dd078d6bd30e (diff) | |
| parent | 743bdf612a63d631bac88a6b857094152ac33d5c (diff) | |
| download | go-git-3e804631d905162d9e0fc1eba63bce6f95965a24.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://golang.org/cl/174180043
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/codereview/codereview.cfg | 1 | ||||
| -rw-r--r-- | lib/codereview/codereview.py | 12 |
2 files changed, 10 insertions, 3 deletions
diff --git a/lib/codereview/codereview.cfg b/lib/codereview/codereview.cfg index 2801ebf8d6..43dbf3ce3b 100644 --- a/lib/codereview/codereview.cfg +++ b/lib/codereview/codereview.cfg @@ -1 +1,2 @@ defaultcc: golang-codereviews@googlegroups.com +contributors: http://go.googlecode.com/hg/CONTRIBUTORS diff --git a/lib/codereview/codereview.py b/lib/codereview/codereview.py index 416702c634..9181f1df3c 100644 --- a/lib/codereview/codereview.py +++ b/lib/codereview/codereview.py @@ -3604,11 +3604,17 @@ class MercurialVCS(VersionControlSystem): if use_hg_shell: base_content = RunShell(["hg", "cat", "-r", base_rev, oldrelpath], silent_ok=True) else: - base_content = str(self.repo[base_rev][oldrelpath].data()) + try: + base_content = str(self.repo[base_rev][oldrelpath].data()) + except Exception: + pass is_binary = "\0" in base_content # Mercurial's heuristic if status != "R": - new_content = open(relpath, "rb").read() - is_binary = is_binary or "\0" in new_content + try: + new_content = open(relpath, "rb").read() + is_binary = is_binary or "\0" in new_content + except Exception: + pass if is_binary and base_content and use_hg_shell: # Fetch again without converting newlines base_content = RunShell(["hg", "cat", "-r", base_rev, oldrelpath], |