From 9b31f1678be34e24d6860d70b1ebbdcd290208c8 Mon Sep 17 00:00:00 2001 From: "maruel@chromium.org" Date: Thu, 26 Jan 2012 19:02:31 +0000 Subject: [PATCH] Fix running presubmit_support.py directly R=cmp@chromium.org BUG= TEST= Review URL: http://codereview.chromium.org/9234038 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@119264 0039d316-1c4b-4281-b951-d872f2087c98 --- presubmit_support.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/presubmit_support.py b/presubmit_support.py index 79a61f84a..f583fb67e 100755 --- a/presubmit_support.py +++ b/presubmit_support.py @@ -1183,22 +1183,22 @@ def load_files(options, args): """Tries to determine the SCM.""" change_scm = scm.determine_scm(options.root) files = [] + if args: + files = ParseFiles(args, options.recursive) if change_scm == 'svn': change_class = SvnChange - status_fn = scm.SVN.CaptureStatus + if not files: + files = scm.SVN.CaptureStatus([], options.root) elif change_scm == 'git': change_class = GitChange - status_fn = scm.GIT.CaptureStatus + # TODO(maruel): Get upstream. + if not files: + files = scm.GIT.CaptureStatus([], options.root, None) else: logging.info('Doesn\'t seem under source control. Got %d files' % len(args)) - if not args: + if not files: return None, None change_class = Change - if args: - files = ParseFiles(args, options.recursive) - else: - # Grab modified files. - files = status_fn([options.root]) return change_class, files