Commit 9c23ddc8 authored by eric@webkit.org's avatar eric@webkit.org

2009-06-23 Eric Seidel <eric@webkit.org>

        Reviewed by Dave Levin.

        Fix missing comment message during land-patches and SVN.commit_with_message respecting --dry-run
        https://bugs.webkit.org/show_bug.cgi?id=26669

        * Scripts/bugzilla-tool:
        * Scripts/modules/scm.py:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@45062 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 8d5ba53c
2009-06-23 Eric Seidel <eric@webkit.org>
Reviewed by Dave Levin.
Fix missing comment message during land-patches and SVN.commit_with_message respecting --dry-run
https://bugs.webkit.org/show_bug.cgi?id=26669
* Scripts/bugzilla-tool:
* Scripts/modules/scm.py:
2009-06-23 Takeshi Yoshino <tyoshino@google.com>
Reviewed by Mark Rowe.
......
......@@ -230,7 +230,7 @@ class LandPatchesFromBug(Command):
try:
patches = tool.bugs.fetch_reviewed_patches_from_bug(bug_id)
commit_text = ""
comment_text = ""
os.chdir(tool.scm().checkout_root)
tool.scm().ensure_no_local_commits(options.force_clean)
......@@ -253,9 +253,9 @@ class LandPatchesFromBug(Command):
tool.bugs.obsolete_attachment(patch['id'], comment_text)
if len(patches) > 1:
commit_text = "All reviewed patches landed, closing."
comment_text = "All reviewed patches landed, closing."
tool.bugs.close_bug_as_fixed(bug_id, commit_text)
tool.bugs.close_bug_as_fixed(bug_id, comment_text)
except ScriptError, error:
log(error)
# We could add a comment to the bug about the failure.
......
......@@ -75,7 +75,7 @@ class SCM:
print self.run_command(self.status_command())
error("Working directory has modifications, pass --force-clean or --no-clean to continue.")
log("Cleaning the working directory")
log("Cleaning working directory")
self.clean_working_directory()
def ensure_no_local_commits(self, force):
......@@ -204,6 +204,8 @@ class SVN(SCM):
return "svn-create-patch"
def commit_with_message(self, message):
if self.dryrun:
return "Dry run, no remote commit."
return self.run_command('svn commit -F -', input=message)
# All git-specific logic should go here.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment