[webkit-changes] [WebKit/WebKit] 9eedf0: [git-webkit] Accidental overwrite of pull request ...

[Jonathan Bedard]

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 9eedf00c442768bab889b5e7ca6bc3e24c07bb53
      https://github.com/WebKit/WebKit/commit/9eedf00c442768bab889b5e7ca6bc3e24c07bb53
  Author: Jonathan Bedard <jbedard at apple.com>
  Date:   2022-09-14 (Wed, 14 Sep 2022)

  Changed paths:
    M Tools/Scripts/libraries/webkitscmpy/setup.py
    M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
    M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/contributor.py
    M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py
    M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py
    M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/bitbucket.py
    M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/land_unittest.py

  Log Message:
  -----------
  [git-webkit] Accidental overwrite of pull request with similar branch names in Github
https://bugs.webkit.org/show_bug.cgi?id=244660
<rdar://problem/99648208>

Reviewed by Elliott Williams and Ryan Haddad.

* Tools/Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/contributor.py:
(Contributor.__repr__): Print ? if 'email' is 'None'.
(Contributor.__cmp__): Consider other string representations of a Contributor when comparing against a string.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
(Git.remote): Pass contributors object so that Contributors have their actual names.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py:
(PullRequest.find_existing_pull_request): Prefer pull-requests owned by the current user if branch names collide.
(PullRequest.create_pull_request): If the user provides a branch name already used by another user, offer to
push to that user's branch instead of the current user's branch. If the user opts out of this, create a new pull-request.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/bitbucket.py:
(BitBucket.credentials): Accept options GitHub's credential's function accepts.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/land_unittest.py:
(TestLandGitHub): Specify current user.

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