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

Unified Diff: gcl.py

Issue 115179: Fix incorrect variable in LoadChangelistInfo and recognize directories properly in GenerateDiff. (Closed) Base URL: http://src.chromium.org/svn/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 15750)
+++ gcl.py (working copy)
@@ -531,7 +531,9 @@
# File has been reverted.
save = True
files.remove(file)
- elif status != file[0]:
+ continue
+ status = status_result[0][0]
+ if status != file[0]:
save = True
files[files.index(file)] = (status, file[1])
change_info = ChangeInfo(changename, issue, description, files)
@@ -748,7 +750,7 @@
for file in files:
# Use svn info output instead of os.path.isdir because the latter fails
# when the file is deleted.
- if GetSVNFileInfo(file).get("Node Kind") == "directory":
+ if GetSVNFileInfo(file).get("Node Kind") in ("dir", "directory"):
continue
# If the user specified a custom diff command in their svn config file,
# then it'll be used when we do svn diff, which we don't want to happen
« 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