Delete nag_max and nag_timer
It's impossible to sync by default on Windows and has been since this was
added: https://www.google.com/search?q=chromium-dev+nag_max
Most recently: https://groups.google.com/a/chromium.org/forum/#!topic/chromium-dev/CEpATyu9udc
So, remove it. If someone needs it they can figure out a more targeted
implementation.
Keep --no-nag-max for backwards compat so that bot scripts won't fail out.
I'll remove it from bot scripts after this has baked a while, and then
come back and remove the option.
R=iannucci@chromium.org
Review URL: https://chromiumcodereview.appspot.com/24950002
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@225730 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/gclient_scm.py b/gclient_scm.py
index 5288f6c..9a25a25 100644
--- a/gclient_scm.py
+++ b/gclient_scm.py
@@ -123,9 +123,6 @@
This is the abstraction layer to bind to different SCM.
"""
- nag_timer = 30
- nag_max = 30
-
def __init__(self, url=None, root_dir=None, relpath=None):
self.url = url
self._root_dir = root_dir
@@ -247,8 +244,6 @@
gclient_utils.CheckCallAndFilter(
['git', 'diff', merge_base],
cwd=self.checkout_path,
- nag_timer=self.nag_timer,
- nag_max=self.nag_max,
filter_fn=GitDiffFilterer(self.relpath).Filter)
def UpdateSubmoduleConfig(self):
@@ -262,8 +257,6 @@
cmd4 = ['git', 'config', 'fetch.recurseSubmodules', 'false']
kwargs = {'cwd': self.checkout_path,
'print_stdout': False,
- 'nag_timer': self.nag_timer,
- 'nag_max': self.nag_max,
'filter_fn': lambda x: None}
try:
gclient_utils.CheckCallAndFilter(cmd, **kwargs)
@@ -1036,8 +1029,6 @@
return subprocess2.check_output(
['git'] + args,
stderr=subprocess2.VOID,
- nag_timer=self.nag_timer,
- nag_max=self.nag_max,
cwd=cwd or self.checkout_path).strip()
def _UpdateBranchHeads(self, options, fetch=False):
@@ -1064,11 +1055,8 @@
def _Run(self, args, _options, git_filter=False, **kwargs):
kwargs.setdefault('cwd', self.checkout_path)
- kwargs.setdefault('nag_timer', self.nag_timer)
- kwargs.setdefault('nag_max', self.nag_max)
if git_filter:
- kwargs['filter_fn'] = GitFilter(kwargs['nag_timer'] / 2,
- kwargs.get('filter_fn'))
+ kwargs['filter_fn'] = GitFilter(kwargs.get('filter_fn'))
kwargs.setdefault('print_stdout', False)
# Don't prompt for passwords; just fail quickly and noisily.
# By default, git will use an interactive terminal prompt when a username/
@@ -1136,8 +1124,6 @@
['svn', 'diff', '-x', '--ignore-eol-style'] + args,
cwd=self.checkout_path,
print_stdout=False,
- nag_timer=self.nag_timer,
- nag_max=self.nag_max,
filter_fn=SvnDiffFilterer(self.relpath).Filter)
def update(self, options, args, file_list):
@@ -1442,8 +1428,6 @@
def _Run(self, args, options, **kwargs):
"""Runs a commands that goes to stdout."""
kwargs.setdefault('cwd', self.checkout_path)
- kwargs.setdefault('nag_timer', self.nag_timer)
- kwargs.setdefault('nag_max', self.nag_max)
gclient_utils.CheckCallAndFilterAndHeader(['svn'] + args,
always=options.verbose, **kwargs)