Refactor nag functionality in to NagTimer class.

gclient_scm.py

Index: gclient_scm.py
diff --git a/gclient_scm.py b/gclient_scm.py
index 26845b828059ace39915bf412f284663faa2a52f..d1f7885f26828887ded17e62afb28d61305e9948 100644
--- a/gclient_scm.py
+++ b/gclient_scm.py
@@ -116,6 +116,8 @@ class SCMWrapper(object):
 
   This is the abstraction layer to bind to different SCM.
   """
+  nag_timer = 30
+
   def __init__(self, url=None, root_dir=None, relpath=None):
     self.url = url
     self._root_dir = root_dir
@@ -195,6 +197,7 @@ class GitWrapper(SCMWrapper):
     gclient_utils.CheckCallAndFilter(
         ['git', 'diff', merge_base],
         cwd=self.checkout_path,
+        nag_timer=self.nag_timer,
         filter_fn=GitDiffFilterer(self.relpath).Filter)
 
   def UpdateSubmoduleConfig(self):
@@ -208,6 +211,7 @@ class GitWrapper(SCMWrapper):
     cmd4 = ['git', 'config', 'fetch.recurseSubmodules', 'false']
     kwargs = {'cwd': self.checkout_path,
               'print_stdout': False,
+              'nag_timer': self.nag_timer,
               'filter_fn': lambda x: None}
     try:
       gclient_utils.CheckCallAndFilter(cmd, **kwargs)
@@ -852,6 +856,7 @@ class GitWrapper(SCMWrapper):
     return subprocess2.check_output(
         ['git'] + args,
         stderr=subprocess2.PIPE,
+        nag_timer=self.nag_timer,
         cwd=self.checkout_path).strip()
 
   def _UpdateBranchHeads(self, options, fetch=False):
@@ -879,6 +884,7 @@ class GitWrapper(SCMWrapper):
   def _Run(self, args, options, **kwargs):
     kwargs.setdefault('cwd', self.checkout_path)
     kwargs.setdefault('print_stdout', True)
+    kwargs.setdefault('nag_timer', self.nag_timer)
     stdout = kwargs.get('stdout', sys.stdout)
     stdout.write('\n________ running \'git %s\' in \'%s\'\n' % (
                  ' '.join(args), kwargs['cwd']))
@@ -928,6 +934,7 @@ class SVNWrapper(SCMWrapper):
         ['svn', 'diff', '-x', '--ignore-eol-style'] + args,
         cwd=self.checkout_path,
         print_stdout=False,
+        nag_timer=self.nag_timer,
         filter_fn=SvnDiffFilterer(self.relpath).Filter)
 
   def update(self, options, args, file_list):
@@ -1225,6 +1232,7 @@ class SVNWrapper(SCMWrapper):
   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)
     gclient_utils.CheckCallAndFilterAndHeader(['svn'] + args,
         always=options.verbose, **kwargs)