Bug 240256 – [webkit-patch] Include commit messages in patches

• Status: RESOLVED
• Resolution: FIXED
• Component: Tools / Tests

[Jonathan Bedard]

We should be able to upload and apply patches which contain commit messages.

[Radar WebKit Bug Importer]

<rdar://problem/92982358>

[Jonathan Bedard]

Created attachment 459077 [details]
Patch

[Jonathan Bedard]

Created attachment 459313 [details]
Patch

[Jonathan Bedard]

Created attachment 459318 [details]
Patch

[Alexey Proskuryakov]

Comment on attachment 459318 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=459318&action=review

> COMMIT_MESSAGE:1
> +[webkit-patch] Include commit messages in patches 

Woot!

[Jonathan Bedard]

Pull request: https://github.com/WebKit/WebKit/pull/616

[EWS]

Committed r294183 (250550@main): <https://commits.webkit.org/250550@main>

Reviewed commits have been landed. Closing PR #616 and removing active labels.

[Kimmo Kinnunen]

possibly broke webkit-patch upload:

kkinnunen@mpb4 OpenSource % Tools/Scripts/webkit-patch upload -g HEAD~
Traceback (most recent call last):
  File "Tools/Scripts/check-webkit-style", line 46, in <module>
    sys.exit(CheckWebKitStyle().main())
  File "/Users/kkinnunen/WebKit/OpenSource/Tools/Scripts/webkitpy/style/main.py", line 157, in main
    patch = host.scm().create_patch(options.git_commit, changed_files=changed_files, git_index=options.git_index)
  File "/Users/kkinnunen/WebKit/OpenSource/Tools/Scripts/webkitpy/common/checkout/scm/git.py", line 378, in create_patch
    return self.run(command, decode_output=False, cwd=self.checkout_root)
  File "/Users/kkinnunen/WebKit/OpenSource/Tools/Scripts/webkitpy/common/checkout/scm/scm.py", line 73, in run
    return self._executive.run_command(args,
  File "/Users/kkinnunen/WebKit/OpenSource/Tools/Scripts/webkitpy/common/system/executive.py", line 445, in run_command
    (error_handler or self.default_error_handler)(script_error)
  File "/Users/kkinnunen/WebKit/OpenSource/Tools/Scripts/webkitpy/common/system/abstractexecutive.py", line 98, in default_error_handler
    raise error
webkitpy.common.system.executive.ScriptError: Failed to run "['git', 'format-patch', '--stdout', '--binary', '-O', '/Users/kkinnunen/WebKit/OpenSource/Tools/Scripts/webkitpy/common/config/orderfile', 'HEAD...HEAD~^..HEAD~']" exit_code: 128 cwd: /Users/kkinnunen/WebKit/OpenSource
Are you sure you want to continue? [Y/n]: n

[Jonathan Bedard]

Re-opening for pull request https://github.com/WebKit/WebKit/pull/625

[Jonathan Bedard]

(In reply to Kimmo Kinnunen from comment #8)
> possibly broke webkit-patch upload:
> 
> kkinnunen@mpb4 OpenSource % Tools/Scripts/webkit-patch upload -g HEAD~
> Traceback (most recent call last):
>   File "Tools/Scripts/check-webkit-style", line 46, in <module>
>     sys.exit(CheckWebKitStyle().main())
>   File
> "/Users/kkinnunen/WebKit/OpenSource/Tools/Scripts/webkitpy/style/main.py",
> line 157, in main
>     patch = host.scm().create_patch(options.git_commit,
> changed_files=changed_files, git_index=options.git_index)
>   File
> "/Users/kkinnunen/WebKit/OpenSource/Tools/Scripts/webkitpy/common/checkout/
> scm/git.py", line 378, in create_patch
>     return self.run(command, decode_output=False, cwd=self.checkout_root)
>   File
> "/Users/kkinnunen/WebKit/OpenSource/Tools/Scripts/webkitpy/common/checkout/
> scm/scm.py", line 73, in run
>     return self._executive.run_command(args,
>   File
> "/Users/kkinnunen/WebKit/OpenSource/Tools/Scripts/webkitpy/common/system/
> executive.py", line 445, in run_command
>     (error_handler or self.default_error_handler)(script_error)
>   File
> "/Users/kkinnunen/WebKit/OpenSource/Tools/Scripts/webkitpy/common/system/
> abstractexecutive.py", line 98, in default_error_handler
>     raise error
> webkitpy.common.system.executive.ScriptError: Failed to run "['git',
> 'format-patch', '--stdout', '--binary', '-O',
> '/Users/kkinnunen/WebKit/OpenSource/Tools/Scripts/webkitpy/common/config/
> orderfile', 'HEAD...HEAD~^..HEAD~']" exit_code: 128 cwd:
> /Users/kkinnunen/WebKit/OpenSource
> Are you sure you want to continue? [Y/n]: n

Thanks for letting me know, sending a fix to merge-queue now.

[EWS]

Committed r294194 (250560@main): <https://commits.webkit.org/250560@main>

Reviewed commits have been landed. Closing PR #625 and removing active labels.

[Jonathan Bedard]

Reopening to attach new patch.

[Jonathan Bedard]

Created attachment 459365 [details]
Patch

[Jonathan Bedard]

Created attachment 459366 [details]
Patch

[Jonathan Bedard]

Created attachment 459367 [details]
Patch

[Jonathan Bedard]

Created attachment 459369 [details]
Patch

[Jonathan Bedard]

Created attachment 459370 [details]
Patch

[EWS]

Committed r294212 (250570@main): <https://commits.webkit.org/250570@main>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 459370 [details].

"Tools/Scripts/webkit-patch upload"  used to automatically create ChangeLog files but this doesn't seem to be the case any more. Is this something related to this patch?

[Jonathan Bedard]

(In reply to zsun from comment #19)
> "Tools/Scripts/webkit-patch upload"  used to automatically create ChangeLog
> files but this doesn't seem to be the case any more. Is this something
> related to this patch?

Short answer, yes.

Longer answer: If you aren't getting prompted to create a ChangeLog, that probably means you have a local commit. If you run webkit-patch without a local commit and just uncommitted changes, you should get the prompt to create changelogs.

(In reply to Jonathan Bedard from comment #20)
> (In reply to zsun from comment #19)
> > "Tools/Scripts/webkit-patch upload"  used to automatically create ChangeLog
> > files but this doesn't seem to be the case any more. Is this something
> > related to this patch?
> 
> Short answer, yes.
> 
> Longer answer: If you aren't getting prompted to create a ChangeLog, that
> probably means you have a local commit. If you run webkit-patch without a
> local commit and just uncommitted changes, you should get the prompt to
> create changelogs.

Thanks!