Merge pull request #80 from pre-commit/no_stash_68

Don't stash with --all-files.

pre_commit/commands.py

@@ -21,6 +21,7 @@ from pre_commit.jsonschema_extensions import remove_defaults
 from pre_commit.logging_handler import LoggingHandler
 from pre_commit.repository import Repository
 from pre_commit.staged_files_only import staged_files_only
+from pre_commit.util import noop_context
 
 
 logger = logging.getLogger('pre_commit')
@@ -230,10 +231,15 @@ def _run_hook(runner, hook_id, args, write):
 
 def run(runner, args, write=sys.stdout.write):
     # Set up our logging handler
-    logger.addHandler(LoggingHandler(args.color))
+    logger.addHandler(LoggingHandler(args.color, write=write))
     logger.setLevel(logging.INFO)
 
-    with staged_files_only(runner.cmd_runner):
+    if args.no_stash or args.all_files:
+        ctx = noop_context()
+    else:
+        ctx = staged_files_only(runner.cmd_runner)
+
+    with ctx:
         if args.hook:
             return _run_hook(runner, args.hook, args, write=write)
         else:

pre_commit/logging_handler.py

@@ -1,6 +1,5 @@
-from __future__ import print_function
-
 import logging
+import sys
 
 from pre_commit import color
 
@@ -14,19 +13,19 @@ LOG_LEVEL_COLORS = {
 
 
 class LoggingHandler(logging.Handler):
-    def __init__(self, use_color, print_fn=print):
+    def __init__(self, use_color, write=sys.stdout.write):
         logging.Handler.__init__(self)
         self.use_color = use_color
-        self.__print_fn = print_fn
+        self.__write = write
 
     def emit(self, record):
-        self.__print_fn(
+        self.__write(
-            u'{0}{1}'.format(
+            u'{0}{1}\n'.format(
                 color.format_color(
                     '[{0}]'.format(record.levelname),
                     LOG_LEVEL_COLORS[record.levelname],
                     self.use_color,
-                ) + ' ' if record.levelno >= logging.WARNING else '',
+                ) + ' ',
                 record.getMessage(),
             )
         )

pre_commit/run.py

@@ -25,12 +25,16 @@ def run(argv):
     run_parser.add_argument('hook', nargs='?', help='A single hook-id to run')
     run_parser.add_argument(
         '--all-files', '-a', action='store_true', default=False,
-        help='Run on all the files in the repo.',
+        help='Run on all the files in the repo.  Implies --no-stash.',
     )
     run_parser.add_argument(
         '--color', default='auto', type=color.use_color,
         help='Whether to use color in output.  Defaults to `auto`',
     )
+    run_parser.add_argument(
+        '--no-stash', default=False, action='store_true',
+        help='Use this option to prevent auto stashing of unstaged files.',
+    )
     run_parser.add_argument('--verbose', '-v', action='store_true', default=False)
 
     help = subparsers.add_parser('help', help='Show help for a specific command.')

pre_commit/util.py

@@ -62,3 +62,9 @@ def clean_path_on_failure(path):
         if os.path.exists(path):
             shutil.rmtree(path)
         raise
+
+
+# TODO: asottile.contextlib this with a forward port of nested
+@contextlib.contextmanager
+def noop_context():
+    yield

tests/commands_test.py

@@ -192,20 +192,30 @@ def get_write_mock_output(write_mock):
     return ''.join(call[0][0] for call in write_mock.call_args_list)
 
 
+def _get_opts(all_files=False, color=False, verbose=False, hook=None, no_stash=False):
+    return auto_namedtuple(
+        all_files=all_files,
+        color=color,
+        verbose=verbose,
+        hook=hook,
+        no_stash=no_stash,
+    )
+
+
+def _do_run(repo, args):
+    runner = Runner(repo)
+    write_mock = mock.Mock()
+    ret = commands.run(runner, args, write=write_mock)
+    printed = get_write_mock_output(write_mock)
+    return ret, printed
+
+
 def _test_run(repo, options, expected_outputs, expected_ret, stage):
     if stage:
         stage_a_file()
-    runner = Runner(repo)
+    args = _get_opts(**options)
-    args = auto_namedtuple(
+    ret, printed = _do_run(repo, args)
-        **dict(
-            dict(all_files=False, color=False, verbose=False, hook=None),
-            **options
-        )
-    )
-    write_mock = mock.Mock()
-    ret = commands.run(runner, args, write=write_mock)
     assert ret == expected_ret
-    printed = get_write_mock_output(write_mock)
     for expected_output_part in expected_outputs:
         assert expected_output_part in printed
 
@@ -240,3 +250,28 @@ def test_run_all_hooks_failing(repo_with_failing_hook):
 )
 def test_run(repo_with_passing_hook, options, outputs, expected_ret, stage):
     _test_run(repo_with_passing_hook, options, outputs, expected_ret, stage)
+
+
+@pytest.mark.parametrize(
+    ('no_stash', 'all_files', 'expect_stash'),
+    (
+        (True, True, False),
+        (True, False, False),
+        (False, True, False),
+        (False, False, True),
+    ),
+)
+def test_no_stash(repo_with_passing_hook, no_stash, all_files, expect_stash):
+    stage_a_file()
+    # Make unstaged changes
+    with open('foo.py', 'w') as foo_file:
+        foo_file.write('import os\n')
+
+    args = _get_opts(no_stash=no_stash, all_files=all_files)
+    ret, printed = _do_run(repo_with_passing_hook, args)
+    assert ret == 0
+    warning_msg = '[WARNING] Unstaged files detected.'
+    if expect_stash:
+        assert warning_msg in printed
+    else:
+        assert warning_msg not in printed

tests/logging_handler_test.py

@@ -19,7 +19,7 @@ def test_logging_handler_color():
     handler = LoggingHandler(True, print_mock)
     handler.emit(FakeLogRecord('hi', 'WARNING', 30))
     print_mock.assert_called_once_with(
-        color.YELLOW + '[WARNING]' + color.NORMAL + ' hi',
+        color.YELLOW + '[WARNING]' + color.NORMAL + ' hi\n',
     )
 
 
@@ -28,5 +28,5 @@ def test_logging_handler_no_color():
     handler = LoggingHandler(False, print_mock)
     handler.emit(FakeLogRecord('hi', 'WARNING', 30))
     print_mock.assert_called_once_with(
-        '[WARNING] hi',
+        '[WARNING] hi\n',
     )