Always list the args in the same order

gclient_scm.py

 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Gclient-specific SCM-specific operations."""
 
 import logging
 import os
 import posixpath
 import re
@@ skipping 97 matching lines @@
           command, self.scm_name))
 
     return getattr(self, command)(options, args, file_list)
 
 
 class GitWrapper(SCMWrapper, scm.GIT):
   """Wrapper for Git"""
 
   def cleanup(self, options, args, file_list):
     """Cleanup working copy."""
-    __pychecker__ = 'unusednames=args,file_list,options'
+    __pychecker__ = 'unusednames=options,args,file_list'
     self._Run(['prune'], redirect_stdout=False)
     self._Run(['fsck'], redirect_stdout=False)
     self._Run(['gc'], redirect_stdout=False)
 
   def diff(self, options, args, file_list):
-    __pychecker__ = 'unusednames=args,file_list,options'
+    __pychecker__ = 'unusednames=options,args,file_list'
     merge_base = self._Run(['merge-base', 'HEAD', 'origin'])
     self._Run(['diff', merge_base], redirect_stdout=False)
 
   def export(self, options, args, file_list):
     """Export a clean directory tree into the given path.
 
     Exports into the specified directory, creating the path if it does
     already exist.
     """
-    __pychecker__ = 'unusednames=file_list,options'
+    __pychecker__ = 'unusednames=options,file_list'
     assert len(args) == 1
     export_path = os.path.abspath(os.path.join(args[0], self.relpath))
     if not os.path.exists(export_path):
       os.makedirs(export_path)
     self._Run(['checkout-index', '-a', '--prefix=%s/' % export_path],
               redirect_stdout=False)
 
   def pack(self, options, args, file_list):
     """Generates a patch file which can be applied to the root of the
     repository.
 
     The patch file is generated from a diff of the merge base of HEAD and
     its upstream branch.
     """
-    __pychecker__ = 'unusednames=file_list,options'
+    __pychecker__ = 'unusednames=options,file_list'
     path = os.path.join(self._root_dir, self.relpath)
     merge_base = self._Run(['merge-base', 'HEAD', 'origin'])
     command = ['diff', merge_base]
     filterer = DiffFilterer(self.relpath)
     self.RunAndFilterOutput(command, path, False, False, filterer.Filter)
 
   def update(self, options, args, file_list):
     """Runs git to update or transparently checkout the working copy.
 
     All updated files will be appended to file_list.
@@ skipping 79 matching lines @@
       print("\n_____ %s is missing, synching instead" % self.relpath)
       # Don't reuse the args.
       return self.update(options, [], file_list)
     merge_base = self._Run(['merge-base', 'HEAD', 'origin'])
     files = self._Run(['diff', merge_base, '--name-only']).split()
     self._Run(['reset', '--hard', merge_base], redirect_stdout=False)
     file_list.extend([os.path.join(self.checkout_path, f) for f in files])
 
   def revinfo(self, options, args, file_list):
     """Display revision"""
-    __pychecker__ = 'unusednames=args,file_list,options'
+    __pychecker__ = 'unusednames=options,args,file_list'
     return self._Run(['rev-parse', 'HEAD'])
 
   def runhooks(self, options, args, file_list):
     self.status(options, args, file_list)
 
   def status(self, options, args, file_list):
     """Display status information."""
-    __pychecker__ = 'unusednames=args,options'
+    __pychecker__ = 'unusednames=options,args'
     if not os.path.isdir(self.checkout_path):
       print('\n________ couldn\'t run status in %s:\nThe directory '
             'does not exist.' % self.checkout_path)
     else:
       merge_base = self._Run(['merge-base', 'HEAD', 'origin'])
       self._Run(['diff', '--name-status', merge_base], redirect_stdout=False)
       files = self._Run(['diff', '--name-only', merge_base]).split()
       file_list.extend([os.path.join(self.checkout_path, f) for f in files])
 
   def FullUrlForRelativeUrl(self, url):
@@ skipping 279 matching lines @@
       print("\n________ couldn't run \'%s\' in \'%s\':\nThe directory "
             "does not exist."
             % (' '.join(command), path))
       # There's no file list to retrieve.
     else:
       self.RunAndGetFileList(options, command, path, file_list)
 
   def FullUrlForRelativeUrl(self, url):
     # Find the forth '/' and strip from there. A bit hackish.
     return '/'.join(self.url.split('/')[:4]) + url