[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[mihaip at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 3fc6060fd59cf74b6a3f224a642cbd9f9f44ed95
Author: mihaip at chromium.org <mihaip at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 21 00:12:34 2010 +0000

    2010-09-20  Mihai Parparita  <mihaip at chromium.org>
    
            Reviewed by Adam Barth.
    
            Add explicit --force-patch flag to webkitpy tools
            https://bugs.webkit.org/show_bug.cgi?id=46103
    
            It wasn't obvious until I read the applypatch.py source code that
            --non-interfactive implies passing --force to patch. Add --force-patch
            as an alias to the flag, so that this behavior is more discoverable.
    
            * Scripts/webkitpy/tool/steps/applypatch.py:
            * Scripts/webkitpy/tool/steps/options.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67896 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d9c1001..3bda658 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-20  Mihai Parparita  <mihaip at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Add explicit --force-patch flag to webkitpy tools
+        https://bugs.webkit.org/show_bug.cgi?id=46103
+        
+        It wasn't obvious until I read the applypatch.py source code that
+        --non-interfactive implies passing --force to patch. Add --force-patch
+        as an alias to the flag, so that this behavior is more discoverable.
+
+        * Scripts/webkitpy/tool/steps/applypatch.py:
+        * Scripts/webkitpy/tool/steps/options.py:
+
 2010-09-20  Eric Seidel  <eric at webkit.org>
 
         Unreviewed, adding a line which got dropped and is trivially correct (and tested).
diff --git a/WebKitTools/Scripts/webkitpy/tool/steps/applypatch.py b/WebKitTools/Scripts/webkitpy/tool/steps/applypatch.py
index 6cded27..327ac09 100644
--- a/WebKitTools/Scripts/webkitpy/tool/steps/applypatch.py
+++ b/WebKitTools/Scripts/webkitpy/tool/steps/applypatch.py
@@ -35,8 +35,9 @@ class ApplyPatch(AbstractStep):
     def options(cls):
         return AbstractStep.options() + [
             Options.non_interactive,
+            Options.force_patch,
         ]
 
     def run(self, state):
         log("Processing patch %s from bug %s." % (state["patch"].id(), state["patch"].bug_id()))
-        self._tool.checkout().apply_patch(state["patch"], force=self._options.non_interactive)
+        self._tool.checkout().apply_patch(state["patch"], force=self._options.non_interactive or self._options.force_patch)
diff --git a/WebKitTools/Scripts/webkitpy/tool/steps/options.py b/WebKitTools/Scripts/webkitpy/tool/steps/options.py
index e7e3855..3dc1963 100644
--- a/WebKitTools/Scripts/webkitpy/tool/steps/options.py
+++ b/WebKitTools/Scripts/webkitpy/tool/steps/options.py
@@ -43,6 +43,7 @@ class Options(object):
     description = make_option("-m", "--description", action="store", type="string", dest="description", help="Description string for the attachment (default: \"patch\")")
     email = make_option("--email", action="store", type="string", dest="email", help="Email address to use in ChangeLogs.")
     force_clean = make_option("--force-clean", action="store_true", dest="force_clean", default=False, help="Clean working directory before applying patches (removes local changes and commits)")
+    force_patch = make_option("--force-patch", action="store_true", dest="force_patch", default=False, help="Forcefully applies the patch, continuing past errors.")
     git_commit = make_option("-g", "--git-commit", action="store", dest="git_commit", help="Operate on a local commit. If a range, the commits are squashed into one. HEAD.. operates on working copy changes only.")
     local_commit = make_option("--local-commit", action="store_true", dest="local_commit", default=False, help="Make a local commit for each applied patch")
     non_interactive = make_option("--non-interactive", action="store_true", dest="non_interactive", default=False, help="Never prompt the user, fail as fast as possible.")

-- 
WebKit Debian packaging