Bug 239296 – [git-webkit] Found branch name instead of hash

• Component: Tools / Tests
• Status: RESOLVED FIXED

[Michael Catanzaro]

I tested 'git-webkit pr' for the first time today, and noticed it got most of the way before crashing with a ValueError:


$ git-webkit pr
'main' is not a pull request branch, enter name of new branch (or bug URL): https://bugs.webkit.org/show_bug.cgi?id=239290
Switched to a new branch 'eng/Misc-compiler-warnings-April-2022-edition'
Created the local development branch 'eng/Misc-compiler-warnings-April-2022-edition'
branch 'main' set up to track 'origin/main'.
  Running status to find changed, added, or removed files.
  Reviewing diff to determine which lines changed.
  Extracting affected function names from source files.
  Change author: Michael Catanzaro <[e-mail]>.
[eng/Misc-compiler-warnings-April-2022-edition f42be8cb8662] Misc compiler warnings, April 2022 edition https://bugs.webkit.org/show_bug.cgi?id=239290
 Date: Wed Apr 13 14:10:41 2022 -0500
 14 files changed, 70 insertions(+), 4 deletions(-)
remote: Enumerating objects: 883, done.
remote: Counting objects: 100% (883/883), done.
remote: Compressing objects: 100% (353/353), done.
remote: Total 883 (delta 606), reused 797 (delta 527), pack-reused 0
Receiving objects: 100% (883/883), 2.63 MiB | 8.17 MiB/s, done.
Resolving deltas: 100% (606/606), completed with 300 local objects.
From github.com:WebKit/WebKit
   d900a59b35b4..3edd7d730f8d  main       -> main
   d900a59b35b4..3edd7d730f8d  main       -> origin/main
From github.com:WebKit/WebKit
 * branch                      main       -> FETCH_HEAD
Running 'git rebase --continue'...
Successfully rebased and updated refs/heads/eng/Misc-compiler-warnings-April-2022-edition.
Running 'git rebase --continue'...
fatal: No rebase in progress?
Running 'git rebase --continue'...
fatal: No rebase in progress?
Successfully rebased and updated .
Rewrite 8734aa0fbbe6b93d301c2867aa7a6c19daf1bef3 (1/1) (0 seconds passed, remaining 0 predicted)    
WARNING: Ref 'refs/remotes/origin/main' is unchanged
Ref 'refs/heads/eng/Misc-compiler-warnings-April-2022-edition' was rewritten
Enumerating objects: 84, done.
Counting objects: 100% (84/84), done.
Delta compression using up to 32 threads
Compressing objects: 100% (33/33), done.
Writing objects: 100% (46/46), 6.70 KiB | 6.70 MiB/s, done.
Total 46 (delta 44), reused 14 (delta 13), pack-reused 0
remote: Resolving deltas: 100% (44/44), completed with 38 local objects.
remote: 
remote: Create a pull request for 'eng/Misc-compiler-warnings-April-2022-edition' on GitHub by visiting:
remote:      https://github.com/mcatanzaro/WebKit/pull/new/eng/Misc-compiler-warnings-April-2022-edition
remote: 
To github.com:mcatanzaro/WebKit.git
 * [new branch]                eng/Misc-compiler-warnings-April-2022-edition -> eng/Misc-compiler-warnings-April-2022-edition
Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
To github.com:mcatanzaro/WebKit.git
   b4b03c423633..3edd7d730f8d  main -> main
Traceback (most recent call last):
  File "/home/mcatanzaro/Projects/WebKit/Tools/Scripts/git-webkit", line 69, in <module>
    sys.exit(program.main(
  File "/home/mcatanzaro/Projects/WebKit/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/__init__.py", line 140, in main
    return parsed.main(
  File "/home/mcatanzaro/Projects/WebKit/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py", line 237, in main
    commits = list(repository.commits(begin=dict(hash=branch_point.hash), end=dict(branch=repository.branch)))
  File "/home/mcatanzaro/Projects/WebKit/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py", line 776, in commits
    commit = Commit(
  File "/home/mcatanzaro/Projects/WebKit/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/commit.py", line 181, in __init__
    self.hash = self._parse_hash(hash, do_assert=True)
  File "/home/mcatanzaro/Projects/WebKit/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/commit.py", line 75, in _parse_hash
    raise ValueError("Provided string '{}' is not a git hash".format(hash))
ValueError: Provided string 'fork/eng/Misc-compiler-warnings-April-2022-edition)' is not a git hash

[Radar WebKit Bug Importer]

<rdar://problem/91720224>

[Jonathan Bedard]

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

[EWS]

Committed r292844 (249617@main): <https://commits.webkit.org/249617@main>

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