aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2010-01-27 16:14:11 -0800
committerRuss Cox <rsc@golang.org>2010-01-27 16:14:11 -0800
commit84b044e8fb882dbf29c382733cf9b62a08f6d63c (patch)
tree543af368e9fad387157265d19e4c8a9e43f2518e
parent9f48f7e67db568c1c2e6e4c03a19281987eb89a2 (diff)
downloadgo-84b044e8fb882dbf29c382733cf9b62a08f6d63c.tar.gz
go-84b044e8fb882dbf29c382733cf9b62a08f6d63c.zip
codereview: correct handling of files created with hg cp
R=r CC=golang-dev https://golang.org/cl/194118
-rw-r--r--lib/codereview/codereview.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/codereview/codereview.py b/lib/codereview/codereview.py
index c74ad97296..9f7470be52 100644
--- a/lib/codereview/codereview.py
+++ b/lib/codereview/codereview.py
@@ -2881,13 +2881,10 @@ class MercurialVCS(VersionControlSystem):
# the working copy
if out[0].startswith('%s: ' % relpath):
out = out[1:]
- if len(out) > 1:
- # Moved/copied => considered as modified, use old filename to
- # retrieve base contents
+ status, what = out[0].split(' ', 1)
+ if len(out) > 1 and status == "A" and what == relpath:
oldrelpath = out[1].strip()
status = "M"
- else:
- status, _ = out[0].split(' ', 1)
if ":" in self.base_rev:
base_rev = self.base_rev.split(":", 1)[0]
else: