Changeset 73384 in webkit

Timestamp:

Dec 6, 2010 12:00:21 PM (13 years ago)

Author:

ojan@chromium.org

Message:

2010-12-02 Ojan Vafai <​ojan@chromium.org>

Reviewed by Eric Seidel.

make webkit-patch command work when the git branch is not synced to the remote svn branch
​https://bugs.webkit.org/show_bug.cgi?id=50424

• Scripts/webkitpy/common/checkout/scm.py:
• Scripts/webkitpy/common/checkout/scm_unittest.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/checkout/scm.py (modified) (3 diffs)
• Scripts/webkitpy/common/checkout/scm_unittest.py (modified) (5 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-12-02  Ojan Vafai  <ojan@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        make webkit-patch command work when the git branch is not synced to the remote svn branch
+        https://bugs.webkit.org/show_bug.cgi?id=50424
+
+        * Scripts/webkitpy/common/checkout/scm.py:
+        * Scripts/webkitpy/common/checkout/scm_unittest.py:
+
 2010-12-06  Patrick Gansterer  <paroga@webkit.org>
 

trunk/WebKitTools/Scripts/webkitpy/common/checkout/scm.py

@@ -643 +643 @@
         return self.run(["git", "rm", "-f", path])
 
-    def _assert_synced(self):
-        if len(run_command(['git', 'rev-list', '--max-count=1', self.remote_branch_ref(), '^HEAD'])):
-            raise ScriptError(message="Not fully merged/rebased to %s. This branch needs to be synced first." % self.remote_branch_ref())
-
     def merge_base(self, git_commit):
         if git_commit:
@@ -657 +653 @@
             return git_commit
 
-        self._assert_synced()
         return self.remote_merge_base()
 
@@ -789 +784 @@
         if not force_squash:
             self._assert_can_squash(working_directory_is_clean)
-        self._assert_synced()
-        self.run(['git', 'reset', '--soft', self.remote_branch_ref()])
+        self.run(['git', 'reset', '--soft', self.remote_merge_base()])
         self.commit_locally_with_message(message)
         return self.push_local_commits_to_server()

trunk/WebKitTools/Scripts/webkitpy/common/checkout/scm_unittest.py

@@ -963 +963 @@
         self.assertTrue(re.search(r'test_file_commit1', svn_log))
 
+    def _local_commit(self, filename, contents, message):
+        write_into_file_at_path(filename, contents)
+        run_command(['git', 'add', filename])
+        self.scm.commit_locally_with_message(message)
+
     def _one_local_commit(self):
-        write_into_file_at_path('test_file_commit1', 'more test content')
-        run_command(['git', 'add', 'test_file_commit1'])
-        self.scm.commit_locally_with_message("another test commit")
+        self._local_commit('test_file_commit1', 'more test content', 'another test commit')
 
     def _one_local_commit_plus_working_copy_changes(self):
@@ -975 +978 @@
     def _two_local_commits(self):
         self._one_local_commit()
-        write_into_file_at_path('test_file_commit2', 'still more test content')
-        run_command(['git', 'add', 'test_file_commit2'])
-        self.scm.commit_locally_with_message("yet another test commit")
+        self._local_commit('test_file_commit2', 'still more test content', 'yet another test commit')
 
     def _three_local_commits(self):
-        write_into_file_at_path('test_file_commit0', 'more test content')
-        run_command(['git', 'add', 'test_file_commit0'])
-        self.scm.commit_locally_with_message("another test commit")
+        self._local_commit('test_file_commit0', 'more test content', 'another test commit')
         self._two_local_commits()
 
@@ -1084 +1083 @@
         scm = detect_scm_system(self.git_checkout_path)
         self.assertRaises(AmbiguousCommitError, scm.commit_with_message, "another test commit")
+        commit_text = scm.commit_with_message("another test commit", force_squash=True)
+
+        self.assertEqual(scm.svn_revision_from_commit_text(commit_text), '6')
+
+        svn_log = run_command(['git', 'svn', 'log', '--limit=1', '--verbose'])
+        self.assertFalse(re.search(r'test_file2', svn_log))
+        self.assertTrue(re.search(r'test_file_commit2', svn_log))
+        self.assertTrue(re.search(r'test_file_commit1', svn_log))
+
+    def test_commit_with_message_not_synced_with_conflict(self):
+        run_command(['git', 'checkout', '-b', 'my-branch', 'trunk~3'])
+        self._local_commit('test_file2', 'asdf', 'asdf commit')
+
+        scm = detect_scm_system(self.git_checkout_path)
+        # There's a conflict between trunk and the test_file2 modification.
         self.assertRaises(ScriptError, scm.commit_with_message, "another test commit", force_squash=True)
 
@@ -1159 +1173 @@
         self._two_local_commits()
         scm = detect_scm_system(self.git_checkout_path)
-        self.assertRaises(ScriptError, scm.create_patch)
+        patch = scm.create_patch()
+        self.assertFalse(re.search(r'test_file2', patch))
+        self.assertTrue(re.search(r'test_file_commit2', patch))
+        self.assertTrue(re.search(r'test_file_commit1', patch))
 
     def test_create_binary_patch(self):
@@ -1227 +1244 @@
         self._two_local_commits()
         scm = detect_scm_system(self.git_checkout_path)
-        self.assertRaises(ScriptError, scm.changed_files)
+        files = scm.changed_files()
+        self.assertFalse('test_file2' in files)
+        self.assertTrue('test_file_commit2' in files)
+        self.assertTrue('test_file_commit1' in files)
+
+    def test_changed_files_not_synced(self):
+        run_command(['git', 'checkout', '-b', 'my-branch', 'trunk~3'])
+        self._two_local_commits()
+        scm = detect_scm_system(self.git_checkout_path)
+        files = scm.changed_files()
+        self.assertFalse('test_file2' in files)
+        self.assertTrue('test_file_commit2' in files)
+        self.assertTrue('test_file_commit1' in files)
 
     def test_changed_files(self):