Make apply_issue.py much more verbose about what it's doing.

tests/checkout_test.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Unit tests for checkout.py."""
 
 import logging
 import os
 import shutil
@@ skipping 290 matching lines @@
         'author': self.FAKE_REPOS.USERS[0][0],
         'revprops': [('realauthor', self.FAKE_REPOS.USERS[1][0])]
     }
     root = os.path.join(self.root_dir, self.name)
     self._check_base(self._get_co(None), root, False, expected)
 
   def testException(self):
     self._check_exception(
         self._get_co(None),
         'While running patch -p1 --forward --force --no-backup-if-mismatch;\n'
-        'patching file chrome/file.cc\n'
-        'Hunk #1 FAILED at 3.\n'
-        '1 out of 1 hunk FAILED -- saving rejects to file '
+        '  patching file chrome/file.cc\n'
+        '  Hunk #1 FAILED at 3.\n'
+        '  1 out of 1 hunk FAILED -- saving rejects to file '
         'chrome/file.cc.rej\n')
 
   def testSvnProps(self):
     co = self._get_co(None)
     co.prepare(None)
     try:
       # svn:ignore can only be applied to directories.
       svn_props = [('svn:ignore', 'foo')]
       co.apply_patch(
           [patch.FilePatchDiff('chrome/file.cc', RAW.PATCH, svn_props)])
       self.fail()
     except checkout.PatchApplicationFailed, e:
       self.assertEquals(e.filename, 'chrome/file.cc')
       self.assertEquals(
           e.status,
           'While running svn propset svn:ignore foo chrome/file.cc '
           '--non-interactive;\n'
-          'patching file chrome/file.cc\n'
-          'svn: Cannot set \'svn:ignore\' on a file (\'chrome/file.cc\')\n')
+          '  patching file chrome/file.cc\n'
+          '  svn: Cannot set \'svn:ignore\' on a file (\'chrome/file.cc\')\n')
     co.prepare(None)
     svn_props = [('svn:eol-style', 'LF'), ('foo', 'bar')]
     co.apply_patch(
         [patch.FilePatchDiff('chrome/file.cc', RAW.PATCH, svn_props)])
     filepath = os.path.join(self.root_dir, self.name, 'chrome/file.cc')
     # Manually verify the properties.
     props = subprocess2.check_output(
         ['svn', 'proplist', filepath],
         cwd=self.root_dir).splitlines()[1:]
     props = sorted(p.strip() for p in props)
@@ skipping 122 matching lines @@
     except NotImplementedError:
       pass
     self.assertTree(self.get_trunk(True), root)
     # Verify that prepare() is a no-op.
     self.assertEquals(None, co.prepare(None))
     self.assertTree(self.get_trunk(True), root)
 
   def testException(self):
     self._check_exception(
         self._get_co(None),
-        'patching file chrome/file.cc\n'
-        'Hunk #1 FAILED at 3.\n'
-        '1 out of 1 hunk FAILED -- saving rejects to file '
+        'While running patch -u --binary -p1;\n'
+        '  patching file chrome/file.cc\n'
+        '  Hunk #1 FAILED at 3.\n'
+        '  1 out of 1 hunk FAILED -- saving rejects to file '
         'chrome/file.cc.rej\n')
 
   def testProcess(self):
     self._test_process(self._get_co)
 
   def testPrepare(self):
     # RawCheckout doesn't support prepare() but emulate it.
     co = self._get_co(None)
     revs = [1]
     def prepare(asked):
@@ skipping 19 matching lines @@
         post_processors)
 
   def testAll(self):
     root = os.path.join(self.root_dir, self.name)
     self._check_base(self._get_co(None), root, False, None)
 
   def testException(self):
     self._check_exception(
         self._get_co(None),
         'While running patch -p1 --forward --force --no-backup-if-mismatch;\n'
-        'patching file chrome/file.cc\n'
-        'Hunk #1 FAILED at 3.\n'
-        '1 out of 1 hunk FAILED -- saving rejects to file '
+        '  patching file chrome/file.cc\n'
+        '  Hunk #1 FAILED at 3.\n'
+        '  1 out of 1 hunk FAILED -- saving rejects to file '
         'chrome/file.cc.rej\n')
 
   def testProcess(self):
     self._test_process(self._get_co)
 
   def testPrepare(self):
     self._test_prepare(self._get_co(None))
 
   def testMove(self):
     self._check_move(self._get_co(None))
 
 
 if __name__ == '__main__':
   if '-v' in sys.argv:
     DEBUGGING = True
     logging.basicConfig(
         level=logging.DEBUG,
         format='%(levelname)5s %(filename)15s(%(lineno)3d): %(message)s')
   else:
     logging.basicConfig(
         level=logging.ERROR,
         format='%(levelname)5s %(filename)15s(%(lineno)3d): %(message)s')
   unittest.main()