Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(121)

Unified Diff: gcl.py

Issue 113341: Fix a regression on svn cp|ren|mv on gcl upload. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools/
Patch Set: Created 11 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gcl.py
===================================================================
--- gcl.py (revision 15950)
+++ gcl.py (working copy)
@@ -673,10 +673,13 @@
output = RunShell(["svn", "diff", "--config-dir", bogus_dir, file])
if output:
diff.append(output)
- # On Posix platforms, svn diff on a mv/cp'd file outputs nothing.
- # We put in an empty Index entry so upload.py knows about them.
- elif not sys.platform.startswith("win") and IsSVNMoved(file):
+ elif IsSVNMoved(file):
+ # svn diff on a mv/cp'd file outputs nothing.
+ # We put in an empty Index entry so upload.py knows about them.
diff.append("\nIndex: %s\n" % file)
+ else:
+ # The file is not modified anymore. It should be removed from the set.
+ pass
os.chdir(previous_cwd)
return "".join(diff)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698