Dylan Baker
8fb354fa95
core: don't pass the ui back into commit.apply
2022-04-21 16:11:05 -07:00
Dylan Baker
e238597cbf
pick/core: have update_commits return the commit list
2022-04-21 16:10:21 -07:00
Dylan Baker
b25f04acbe
core: don't pass the ui back into commit.apply
2022-03-23 09:10:04 -07:00
Dylan Baker
1178741fd0
pick/ui: correctly handle MANUAL_RESOLUTION
2022-03-23 09:10:04 -07:00
Dylan Baker
93f5f9b75f
pick/core: Add a MANUAL_RESOLUTION resolution
...
This status is given by the auto-picker when it cannot successfully
auto-pick
2022-03-23 09:10:04 -07:00
Dylan Baker
3348844bc4
pick/core: Add a method for updating commits
...
This is almost the same as the one in the ui, but without the UI
elements. It would be nice to share code between them, but I'm not sure
how to do that yet.
2022-03-23 09:10:04 -07:00
Dylan Baker
29960e0b4a
pick/core: Add proper type annotation for update_commits callback
2022-03-23 09:10:04 -07:00
Dylan Baker
8bd46a976b
pick/core: drop the main_sha field
...
It isn't actually used, so we don't need it.
2022-03-23 09:10:04 -07:00
Dylan Baker
4286b5c02a
pick/ui: Fix mypy issue
2022-03-23 09:10:04 -07:00
Eric Engestrom
4128acdee3
pick-ui: show commit date
...
With our ff-only merge setup, the commit date ends up being when the
commit actually landed (as opposed to when it was first written).
Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12289 >
2021-08-10 21:36:43 +00:00
Eric Engestrom
7ec42b5eda
pick-ui: show nomination type in the UI
...
Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12289 >
2021-08-10 21:36:43 +00:00
Eric Engestrom
db14f2a932
pick-ui: drop assert that optional argument is passed
...
Let's just make it not-optional instead.
Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12289 >
2021-08-10 21:36:43 +00:00
Jordan Justen
6e86d1f503
bin/pick: Rename master branch to main
...
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
2021-05-05 12:20:11 -07:00
Eric Engestrom
e3069c4257
pick-ui: specify git commands in "resolve cherry pick" message
...
Cc: mesa-stable
Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6134 >
2020-08-08 12:27:48 +00:00
Eric Engestrom
444138d6d9
tree-wide: fix deprecated GitLab URLs
...
They will stop working in the next GitLab release, so let's update them
ASAP to make sure things are propagated to everyone by then.
See:
https://about.gitlab.com/releases/2020/05/06/gitlab-com-13-0-breaking-changes/#removal-of-deprecated-project-paths
Cc: mesa-stable@lists.freedesktop.org
Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5111 >
2020-05-23 15:33:50 +00:00
Eric Engestrom
57e65cabd4
pick-ui: show commit sha in the pick list
...
Useful to get more context when a manual merge is needed, for instance.
Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4651 >
2020-04-21 01:25:44 +00:00
Eric Engestrom
32451a15ec
pick-ui: make .pick_status.json path relative to the git root instead of the script
...
This allows the script to be called from another git worktree for instance,
which I need for my workflow :)
Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4649 >
2020-04-21 01:13:53 +00:00
Eric Engestrom
26a26a3584
pick-ui: compute .pick_status.json path only once
...
Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4649 >
2020-04-21 01:13:53 +00:00
Eric Engestrom
a24ab26ff7
pick-ui: auto-scroll the feedback window
...
Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4650 >
2020-04-20 22:11:00 +02:00
Dylan Baker
8b8a99ba56
bin/pick-ui: Add a new maintainer script for picking patches
...
In the long term the goal of this script is to nearly completely
automate the process of picking stable nominations, in a well tested
way.
In the short term the goal is to provide a better, faster UI to interact
with stable nominations.
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3608 >
2020-04-20 19:40:55 +00:00
