Mesa (master): pick-ui: show commit sha in the pick list

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Tue Apr 21 01:35:07 UTC 2020


Module: Mesa
Branch: master
Commit: 57e65cabd4f030f325fce2ef3e52af77792c4b66
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=57e65cabd4f030f325fce2ef3e52af77792c4b66

Author: Eric Engestrom <eric at engestrom.ch>
Date:   Wed Mar 11 15:18:00 2020 +0100

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 at engestrom.ch>
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4651>

---

 bin/pick/ui.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/pick/ui.py b/bin/pick/ui.py
index d309c9db883..2d7b510703f 100644
--- a/bin/pick/ui.py
+++ b/bin/pick/ui.py
@@ -67,7 +67,7 @@ class CommitWidget(urwid.Text):
     _selectable = True
 
     def __init__(self, ui: 'UI', commit: 'core.Commit'):
-        super().__init__(commit.description)
+        super().__init__(f'{commit.sha[:10]} {commit.description}')
         self.ui = ui
         self.commit = commit
 



More information about the mesa-commit mailing list