diff options
| author | Austin Clements <austin@google.com> | 2014-10-22 11:21:16 -0400 |
|---|---|---|
| committer | Austin Clements <austin@google.com> | 2014-10-22 11:21:16 -0400 |
| commit | 2c586384223e980fd3303625ea6b02ed5d9fb9c0 (patch) | |
| tree | 54aa72cd9d5eb1566f682d3b0770141a11b54fc2 /lib | |
| parent | ebe8a09fb603d9510cb982a6c11a3e1638f7f8fb (diff) | |
| parent | 45fcda1dc8d9b4d4a9b642faf8e78941873f508d (diff) | |
| download | go-2c586384223e980fd3303625ea6b02ed5d9fb9c0.tar.gz | |
[dev.power64] build: merge default into dev.power64
LGTM=rsc
R=rsc
CC=golang-codereviews
https://codereview.appspot.com/160200044
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 2801ebf8d..43dbf3ce3 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 fdf11d1f4..263385b79 100644 --- a/lib/codereview/codereview.py +++ b/lib/codereview/codereview.py @@ -3603,11 +3603,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], |