Prioritize the currently checked out branch when picking the canonical one.

[mattwoodrow]

df65178

Prioritize the currently checked out branch when picking the canonical one.
https://bugs.webkit.org/show_bug.cgi?id=246385

Reviewed by Jonathan Bedard.

* Tools/Scripts/libraries/webkitscmpy/setup.py:
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py:
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
(Git.commit):
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/scm_base.py:
(ScmBase.prioritize_branches):

Canonical link: https://commits.webkit.org/255516@main

aaecf14

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	🛠 ios	🛠 mac	🛠 wpe	🛠 🧪 win
✅ 🧪 bindings	🛠 ios-sim	🛠 mac-debug	🛠 gtk	🛠 wincairo
🧪 webkitperl	🧪 ios-wk2	🛠 mac-AS-debug	🧪 gtk-wk2
❌ 🧪 webkitpy	🧪 api-ios	🧪 api-mac	🧪 api-gtk
	🛠 tv	🧪 mac-wk1
🧪 services	🛠 tv-sim	🧪 mac-wk2
	🛠 watch	🧪 mac-AS-debug-wk2	✅ 🛠 jsc-mips
✅ 🛠 🧪 unsafe-merge	✅ 🛠 watch-sim	🧪 mac-wk2-stress	🧪 jsc-mips-tests

[webkit-early-warning-system]

EWS run on previous version of this PR (hash 978ac06)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	⏳ 🛠 🧪 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-debug	✅ 🛠 gtk	✅ 🛠 wincairo
✅ 🧪 webkitperl	❌ 🧪 ios-wk2	✅ 🛠 mac-AS-debug	✅ 🧪 gtk-wk2
✅ 🧪 webkitpy	✅ 🧪 api-ios	✅ 🧪 api-mac	✅ 🧪 api-gtk
	✅ 🛠 tv	✅ 🧪 mac-wk1
✅ 🧪 services	✅ 🛠 tv-sim	✅ 🧪 mac-wk2
	✅ 🛠 watch	✅ 🧪 mac-AS-debug-wk2
	✅ 🛠 watch-sim	✅ 🧪 mac-wk2-stress

[JonWBedard]

I'm curious the motivation for this, because I don't think it's correct.

As an example, if I'm on main and run git checkout -b new-branch, HEAD is canonically on main. It's also on new-branch, but the canonical identifier of HEAD will remain 1234@main, this change would make the canonical identifier depend on the branch you're on (in our example, 1234.0@new-branch), which is what we're trying to avoid

[webkit-early-warning-system]

EWS run on previous version of this PR (hash 1c7e7b7)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	⏳ 🛠 🧪 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-debug	✅ 🛠 gtk	✅ 🛠 wincairo
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🛠 mac-AS-debug	✅ 🧪 gtk-wk2
✅ 🧪 webkitpy	✅ 🧪 api-ios	✅ 🧪 api-mac	❌ 🧪 api-gtk
	✅ 🛠 tv	✅ 🧪 mac-wk1
✅ 🧪 services	✅ 🛠 tv-sim	❌ 🧪 mac-wk2
	✅ 🛠 watch	✅ 🧪 mac-AS-debug-wk2
	✅ 🛠 watch-sim	✅ 🧪 mac-wk2-stress

[JonWBedard]

Will need to bump the version number in Tools/Scripts/libraries/webkitscmpy/setup.py and Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py for our pip package when landing.

[webkit-commit-queue]

Committed 255516@main (df65178): https://commits.webkit.org/255516@main

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

[webkit-early-warning-system]

EWS run on current version of this PR (hash aaecf14)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	🛠 ios	🛠 mac	🛠 wpe	🛠 🧪 win
✅ 🧪 bindings	🛠 ios-sim	🛠 mac-debug	🛠 gtk	🛠 wincairo
🧪 webkitperl	🧪 ios-wk2	🛠 mac-AS-debug	🧪 gtk-wk2
❌ 🧪 webkitpy	🧪 api-ios	🧪 api-mac	🧪 api-gtk
	🛠 tv	🧪 mac-wk1
🧪 services	🛠 tv-sim	🧪 mac-wk2
	🛠 watch	🧪 mac-AS-debug-wk2	✅ 🛠 jsc-mips
✅ 🛠 🧪 unsafe-merge	✅ 🛠 watch-sim	🧪 mac-wk2-stress	🧪 jsc-mips-tests