1
0
mirror of https://github.com/golang/go synced 2024-11-21 15:54:43 -07:00

codereview: fix upload of hg copied file

Fixes #1134.

R=r, r2
CC=golang-dev
https://golang.org/cl/2264043
This commit is contained in:
Russ Cox 2010-09-28 20:29:20 -04:00
parent 5474e166bc
commit 9499856488

View File

@ -2600,7 +2600,7 @@ 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][filename].data())
base_content = str(self.repo[base_rev][oldrelpath].data())
is_binary = "\0" in base_content # Mercurial's heuristic
if status != "R":
new_content = open(relpath, "rb").read()