git hyper-blame: Fixed --no-default-ignores option to not take argument.

BUG=709835

Change-Id: Ia203cf24adf752ef3acdf660b4fe0990503782b9
Reviewed-on: https://chromium-review.googlesource.com/472587
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Matt Giuca <mgiuca@chromium.org>
changes/87/472587/5
Matt Giuca 8 years ago committed by Commit Bot
parent 56431bf304
commit 17a530722b

@ -345,6 +345,7 @@ def main(args, stdout=sys.stdout, stderr=sys.stderr):
type=argparse.FileType('r'), dest='ignore_file',
help='a file containing a list of revisions to ignore')
parser.add_argument('--no-default-ignores', dest='no_default_ignores',
action='store_true',
help='Do not ignore commits from .git-blame-ignore-revs.')
parser.add_argument('revision', nargs='?', default='HEAD', metavar='REVISION',
help='revision to look at')

@ -217,6 +217,26 @@ class GitHyperBlameMainTest(GitHyperBlameTestBase):
self.assertEqual(expected_output, stdout.getvalue().rstrip().split('\n'))
self.assertEqual('', stderr.getvalue())
def testNoDefaultIgnores(self):
"""Tests the --no-default-ignores switch."""
# Check out revision D. This has a .git-blame-ignore-revs file, which we
# expect to be ignored due to --no-default-ignores.
self.repo.git('checkout', '-f', 'tag_D')
expected_output = [self.blame_line('C', '1) line 1.1'),
self.blame_line('B', '2) line 2.1')]
stdout = StringIO.StringIO()
stderr = StringIO.StringIO()
retval = self.repo.run(
self.git_hyper_blame.main,
args=['tag_D', 'some/files/file', '--no-default-ignores'],
stdout=stdout, stderr=stderr)
self.assertEqual(0, retval)
self.assertEqual(expected_output, stdout.getvalue().rstrip().split('\n'))
self.assertEqual('', stderr.getvalue())
class GitHyperBlameSimpleTest(GitHyperBlameTestBase):
REPO_SCHEMA = """
A B D E F G H

Loading…
Cancel
Save