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

Unified Diff: gclient_scm.py

Issue 3601007: Skipped syncing svn working copy which has a .hg subdirectory.... (Closed) Base URL: http://src.chromium.org/svn/trunk/tools/depot_tools/
Patch Set: '' Created 10 years, 2 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: gclient_scm.py
===================================================================
--- gclient_scm.py (revision 61448)
+++ gclient_scm.py (working copy)
@@ -681,12 +681,17 @@
Raises:
Error: if can't get URL for relative path.
"""
- # Only update if git is not controlling the directory.
+ # Only update if git or hg is not controlling the directory.
git_path = os.path.join(self.checkout_path, '.git')
if os.path.exists(git_path):
print('________ found .git directory; skipping %s' % self.relpath)
return
+ hg_path = os.path.join(self.checkout_path, '.hg')
+ if os.path.exists(hg_path):
+ print('________ found .hg directory; skipping %s' % self.relpath)
+ return
+
if args:
raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
« 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