Bug 45988 – webkit-patch throws exception on prepare when failing to parse ChangeLogs

• Status: NEW
• Component: Tools / Tests

[Eric U.]

This just happened twice in a row; I'm not sure what's causing it, but here's the repro + stack in the client I used.
I see nothing odd in the ChangeLog that it should be modifying.

[WebKit] gvim WebKit/chromium/src/AsyncFileWriterChromium.h
[WebKit] WebKitTools/Scripts/webkit-patch prepare
Please enter a bug number or a title for a new bug:
Build fix: remove empty AsyncFileWriterChromium destructor declaration.
Reading Keychain for bugs.webkit.org account and password.  Click "Allow" to continue...
Could not find a keychain entry for bugs.webkit.org.
bugs.webkit.org login: [e-mail]
bugs.webkit.org password for [e-mail]: 
Logging in as [e-mail]...
Creating bug with title "Build fix: remove empty AsyncFileWriterChromium destructor declaration."
Bug 45987 created.
https://bugs.webkit.org/show_bug.cgi?id=45987
Traceback (most recent call last):
  File "WebKitTools/Scripts/webkit-patch", line 70, in <module>
    main()
  File "WebKitTools/Scripts/webkit-patch", line 65, in main
    WebKitPatch(__file__).main()
  File "/Users/ericu/four/src/third_party/WebKit/WebKitTools/Scripts/webkitpy/tool/multicommandtool.py", line 308, in main
    result = command.check_arguments_and_execute(options, args, self)
  File "/Users/ericu/four/src/third_party/WebKit/WebKitTools/Scripts/webkitpy/tool/multicommandtool.py", line 117, in check_arguments_and_execute
    return self.execute(options, args, tool) or 0
  File "/Users/ericu/four/src/third_party/WebKit/WebKitTools/Scripts/webkitpy/tool/commands/abstractsequencedcommand.py", line 43, in execute
    self._sequence.run_and_handle_errors(tool, options, self._prepare_state(options, args, tool))
  File "/Users/ericu/four/src/third_party/WebKit/WebKitTools/Scripts/webkitpy/tool/commands/stepsequence.py", line 70, in run_and_handle_errors
    self._run(tool, options, state)
  File "/Users/ericu/four/src/third_party/WebKit/WebKitTools/Scripts/webkitpy/tool/commands/stepsequence.py", line 64, in _run
    step(tool, options).run(state)
  File "/Users/ericu/four/src/third_party/WebKit/WebKitTools/Scripts/webkitpy/tool/steps/preparechangelog.py", line 62, in run
    self._ensure_bug_url(state)
  File "/Users/ericu/four/src/third_party/WebKit/WebKitTools/Scripts/webkitpy/tool/steps/preparechangelog.py", line 55, in _ensure_bug_url
    if not changelog.latest_entry().bug_id():
AttributeError: 'NoneType' object has no attribute 'bug_id'
[WebKit] WebKitTools/Scripts/webkit-patch prepare
Please enter a bug number or a title for a new bug:
45987
Traceback (most recent call last):
  File "WebKitTools/Scripts/webkit-patch", line 70, in <module>
    main()
  File "WebKitTools/Scripts/webkit-patch", line 65, in main
    WebKitPatch(__file__).main()
  File "/Users/ericu/four/src/third_party/WebKit/WebKitTools/Scripts/webkitpy/tool/multicommandtool.py", line 308, in main
    result = command.check_arguments_and_execute(options, args, self)
  File "/Users/ericu/four/src/third_party/WebKit/WebKitTools/Scripts/webkitpy/tool/multicommandtool.py", line 117, in check_arguments_and_execute
    return self.execute(options, args, tool) or 0
  File "/Users/ericu/four/src/third_party/WebKit/WebKitTools/Scripts/webkitpy/tool/commands/abstractsequencedcommand.py", line 43, in execute
    self._sequence.run_and_handle_errors(tool, options, self._prepare_state(options, args, tool))
  File "/Users/ericu/four/src/third_party/WebKit/WebKitTools/Scripts/webkitpy/tool/commands/stepsequence.py", line 70, in run_and_handle_errors
    self._run(tool, options, state)
  File "/Users/ericu/four/src/third_party/WebKit/WebKitTools/Scripts/webkitpy/tool/commands/stepsequence.py", line 64, in _run
    step(tool, options).run(state)
  File "/Users/ericu/four/src/third_party/WebKit/WebKitTools/Scripts/webkitpy/tool/steps/preparechangelog.py", line 62, in run
    self._ensure_bug_url(state)
  File "/Users/ericu/four/src/third_party/WebKit/WebKitTools/Scripts/webkitpy/tool/steps/preparechangelog.py", line 55, in _ensure_bug_url
    if not changelog.latest_entry().bug_id():
AttributeError: 'NoneType' object has no attribute 'bug_id'

[Eric U.]

It turned out I had a bunch of ChangeLogs in the conflicted state.  I'd done a large patch in that client, it got committed via the CQ, I'd synced, and everything but the ChangeLogs was happily up-to-date.  I'm not sure which ChangeLog was the problem, but I'm guessing webkit-patch was choking on a conflict indicator in the text.

[Eric Seidel (no email)]

*** Bug 49575 has been marked as a duplicate of this bug. ***