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

Side by Side Diff: gclient_scm.py

Issue 10630010: Use default value of 'all' for submodule.*.ignore. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools/
Patch Set: Created 8 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 """Gclient-specific SCM-specific operations.""" 5 """Gclient-specific SCM-specific operations."""
6 6
7 import logging 7 import logging
8 import os 8 import os
9 import posixpath 9 import posixpath
10 import re 10 import re
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 merge_base = self._Capture(['merge-base', 'HEAD', 'origin']) 191 merge_base = self._Capture(['merge-base', 'HEAD', 'origin'])
192 gclient_utils.CheckCallAndFilter( 192 gclient_utils.CheckCallAndFilter(
193 ['git', 'diff', merge_base], 193 ['git', 'diff', merge_base],
194 cwd=self.checkout_path, 194 cwd=self.checkout_path,
195 filter_fn=GitDiffFilterer(self.relpath).Filter) 195 filter_fn=GitDiffFilterer(self.relpath).Filter)
196 196
197 def UpdateSubmoduleConfig(self): 197 def UpdateSubmoduleConfig(self):
198 submod_cmd = ['git', 'config', '-f', '$toplevel/.git/config', 198 submod_cmd = ['git', 'config', '-f', '$toplevel/.git/config',
199 'submodule.$name.ignore', '||', 199 'submodule.$name.ignore', '||',
200 'git', 'config', '-f', '$toplevel/.git/config', 200 'git', 'config', '-f', '$toplevel/.git/config',
201 'submodule.$name.ignore', 'dirty'] 201 'submodule.$name.ignore', 'all']
202 cmd = ['git', 'submodule', '--quiet', 'foreach', ' '.join(submod_cmd)] 202 cmd = ['git', 'submodule', '--quiet', 'foreach', ' '.join(submod_cmd)]
203 try: 203 try:
204 gclient_utils.CheckCallAndFilter( 204 gclient_utils.CheckCallAndFilter(
205 cmd, cwd=self.checkout_path, print_stdout=False, 205 cmd, cwd=self.checkout_path, print_stdout=False,
206 filter_fn=lambda x: None) 206 filter_fn=lambda x: None)
207 except subprocess2.CalledProcessError: 207 except subprocess2.CalledProcessError:
208 # Not a fatal error, or even very interesting in a non-git-submodule 208 # Not a fatal error, or even very interesting in a non-git-submodule
209 # world. So just keep it quiet. 209 # world. So just keep it quiet.
210 pass 210 pass
211 211
(...skipping 976 matching lines...) Expand 10 before | Expand all | Expand 10 after
1188 new_command.append('--force') 1188 new_command.append('--force')
1189 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]: 1189 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1190 new_command.extend(('--accept', 'theirs-conflict')) 1190 new_command.extend(('--accept', 'theirs-conflict'))
1191 elif options.manually_grab_svn_rev: 1191 elif options.manually_grab_svn_rev:
1192 new_command.append('--force') 1192 new_command.append('--force')
1193 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]: 1193 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1194 new_command.extend(('--accept', 'postpone')) 1194 new_command.extend(('--accept', 'postpone'))
1195 elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]: 1195 elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1196 new_command.extend(('--accept', 'postpone')) 1196 new_command.extend(('--accept', 'postpone'))
1197 return new_command 1197 return new_command
OLDNEW
« 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