diff --git a/gclient.py b/gclient.py index 52dfb6881..30bad034d 100644 --- a/gclient.py +++ b/gclient.py @@ -1007,7 +1007,7 @@ solutions = [ revision_overrides = {} # It's unnecessary to check for revision overrides for 'recurse'. # Save a few seconds by not calling _EnforceRevisions() in that case. - if command is not 'recurse': + if command not in ('diff', 'recurse', 'runhooks', 'status'): revision_overrides = self._EnforceRevisions() pm = None # Disable progress for non-tty stdout. diff --git a/tests/trychange_unittest.py b/tests/trychange_unittest.py index 6467b6a7d..3e8887e0b 100755 --- a/tests/trychange_unittest.py +++ b/tests/trychange_unittest.py @@ -108,6 +108,7 @@ class SVNUnittest(TryChangeTestsBase): self.compareMembers(trychange.SVN, members) def testBasic(self): + # pylint: disable=E1103 trychange.os.path.abspath(self.fake_root).AndReturn(self.fake_root) trychange.scm.SVN.GetCheckoutRoot(self.fake_root).AndReturn(self.fake_root) trychange.scm.SVN.GenerateDiff(['foo.txt', 'bar.txt'],