[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 85271b39dbcc1b13419cfa7af47fd93877df7684
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 16 08:49:00 2009 +0000

    2009-11-16  Eric Seidel  <eric at webkit.org>
    
            Reviewed by Adam Barth.
    
            bugzilla-tool land-diff should know how to parse bug ids out of ChangeLogs
            https://bugs.webkit.org/show_bug.cgi?id=31530
    
            * Scripts/bugzilla-tool:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51017 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 24caf02..4cc8291 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,15 @@
 
         Reviewed by Adam Barth.
 
+        bugzilla-tool land-diff should know how to parse bug ids out of ChangeLogs
+        https://bugs.webkit.org/show_bug.cgi?id=31530
+
+        * Scripts/bugzilla-tool:
+
+2009-11-16  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Adam Barth.
+
         bugzilla-tool needs apply-attachment
         https://bugs.webkit.org/show_bug.cgi?id=31528
 
diff --git a/WebKitTools/Scripts/bugzilla-tool b/WebKitTools/Scripts/bugzilla-tool
index 967e0c9..68b244c 100755
--- a/WebKitTools/Scripts/bugzilla-tool
+++ b/WebKitTools/Scripts/bugzilla-tool
@@ -349,11 +349,11 @@ class LandAndUpdateBug(Command):
             ChangeLog(changelog_path).set_reviewer(reviewer)
 
     def execute(self, options, args, tool):
-        bug_id = args[0] if len(args) else None
-        os.chdir(tool.scm().checkout_root)
+        bug_id = (args and args[0]) or parse_bug_id(tool.scm().create_patch())
 
         WebKitLandingScripts.ensure_builders_are_green(tool.buildbot, options)
 
+        os.chdir(tool.scm().checkout_root)
         self.update_changelogs_with_reviewer(options.reviewer, bug_id, tool)
 
         comment_text = WebKitLandingScripts.build_and_commit(tool.scm(), options)

-- 
WebKit Debian packaging