Move patch management functions into their own file, patch.py.

tests/checkout_test.py

 #!/usr/bin/env python
 # Copyright (c) 2010 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
 import stat
 import sys
 import unittest
 
 ROOT_DIR = os.path.dirname(os.path.abspath(__file__))
 sys.path.append(os.path.join(ROOT_DIR, '..'))
 
 import checkout
-import pending_manager
+import patch
 from tests import fake_repos
 
 
 # pass -v to enable it.
 DEBUGGING = False
 
 GIT_PATCH = (
 """\
 diff --git a/tests/svn_utils_test_data/svn_utils_test.txt b/tests/svn_utils_test_data/svn_utils_test.txt
 index 0e4de76..8320059 100644
@@ skipping 84 matching lines @@
     co = checkout.SvnCheckout(
         ROOT_DIR, self.name, self.usr, self.pwd, self.svn_url)
     self.assertEquals(self.root_dir, co.project_path)
     revision = co.prepare()
     self.assertTrue(isinstance(revision, int))
     self.assertEquals(2, revision)
     self.assertEquals('pouet', co.get_settings('bar'))
     svn_utils_test_path = os.path.join(self.root_dir, 'svn_utils_test.txt')
     content = read(svn_utils_test_path)
     self.assertTrue(svn_utils_test_path)
-    co.apply_patch(pending_manager.auto_mangle_git_patch(GIT_PATCH))
+    co.apply_patch(patch.auto_mangle_git_patch(GIT_PATCH))
     content_lines = content.splitlines(True)
     content_modified = ''.join(
         content_lines[0:5] + ['FOO!\n'] + content_lines[5:])
     self.assertEquals(
         content_modified,
         read(svn_utils_test_path))
     hook_path = os.path.join(
         self.FAKE_REPOS.repos_dir, 'svn', 'hooks', 'pre-revprop-change')
     write(hook_path, '#!/bin/sh\ntrue\n')
     os.chmod(
@@ skipping 14 matching lines @@
         checkout.SvnCheckout(ROOT_DIR, self.name, None, None, self.svn_url))
     self.assertEquals(self.root_dir, co.project_path)
     revision = co.prepare()
     self.assertTrue(isinstance(revision, int))
     # TODO: Need to fix other test side effects.
     self.assertTrue(2 <= revision <= 4)
     self.assertEquals('pouet', co.get_settings('bar'))
     svn_utils_test_path = os.path.join(self.root_dir, 'svn_utils_test.txt')
     content = read(svn_utils_test_path)
     self.assertTrue(svn_utils_test_path)
-    co.apply_patch(pending_manager.auto_mangle_git_patch(GIT_PATCH))
+    co.apply_patch(patch.auto_mangle_git_patch(GIT_PATCH))
     content_lines = content.splitlines(True)
     content_modified = ''.join(content_lines[0:5] + ['FOO!\n'] +
       content_lines[5:])
     self.assertEquals(content_modified, read(svn_utils_test_path))
     self.assertEquals('FAKE', co.commit('msg', 'usr'))
     revision = co.prepare()
     self.assertEquals(content, read(svn_utils_test_path))
 
 
 class GitSvnCheckout(BaseTest):
@@ skipping 10 matching lines @@
         self.name, self.usr,
         self.svn_base, self.svn_trunk)
     co = checkout.ReadOnlyCheckout(rw_co)
     self.assertEquals(self.root_dir, co.project_path)
     revision = co.prepare()
     self.assertTrue(isinstance(revision, int))
     self.assertEquals(2, revision)
     self.assertEquals('pouet', co.get_settings('bar'))
     content = read(os.path.join(self.root_dir, 'svn_utils_test.txt'))
     self.assertTrue(os.path.join(self.root_dir, 'svn_utils_test.txt'))
-    co.apply_patch(pending_manager.auto_mangle_git_patch(GIT_PATCH))
+    co.apply_patch(patch.auto_mangle_git_patch(GIT_PATCH))
     content_lines = content.splitlines(True)
     content_modified = ''.join(content_lines[0:5] + ['FOO!\n'] +
       content_lines[5:])
     self.assertEquals(content_modified,
       read(os.path.join(self.root_dir, 'svn_utils_test.txt')))
     self.assertEquals('FAKE', co.commit('msg', 'usr'))
     revision = co.prepare()
     self.assertEquals(content,
       read(os.path.join(self.root_dir, 'svn_utils_test.txt')))
 
 
 
 
 if __name__ == '__main__':
   if '-v' in sys.argv:
     DEBUGGING = True
     logging.basicConfig(level=logging.INFO)
   else:
     logging.basicConfig(level=logging.ERROR)
   unittest.main()