ttygroup/gertty
Code Issues Proposed changes

Suggest a 'cherry-picked from' line when cherry picking

Browse Source 
Emulates the behavior of "git cherry-pick -x" and the web UI.

Change-Id: I1c3654e39351cd0c6fc84a57b04560877bdf3b31
This commit is contained in:
Dmitry Tantsur 2021-07-06 13:05:27 +02:00
parent cd60a82f6a
commit e96a663f1e
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gertty/view/change.py
View File

@ -97,6 +97,14 @@ class EditHashtagsDialog(mywid.ButtonDialog):
class CherryPickDialog(urwid.WidgetWrap, mywid.LineBoxTitlePropertyMixin): class CherryPickDialog(urwid.WidgetWrap, mywid.LineBoxTitlePropertyMixin):
signals = ['save', 'cancel'] signals = ['save', 'cancel']
def _cherry_pick_message(self, change):
revision = change.revisions[-1]
return "{}\n(cherry picked from commit {})".format(
revision.message.rstrip('\n'),
revision.commit,
)
def __init__(self, app, change): def __init__(self, app, change):
save_button = mywid.FixedButton('Propose Change') save_button = mywid.FixedButton('Propose Change')
cancel_button = mywid.FixedButton('Cancel') cancel_button = mywid.FixedButton('Cancel')
@ -108,7 +116,7 @@ class CherryPickDialog(urwid.WidgetWrap, mywid.LineBoxTitlePropertyMixin):
('pack', cancel_button)] ('pack', cancel_button)]
button_columns = urwid.Columns(button_widgets, dividechars=2) button_columns = urwid.Columns(button_widgets, dividechars=2)
rows = [] rows = []
self.entry = mywid.MyEdit(edit_text=change.revisions[-1].message, self.entry = mywid.MyEdit(edit_text=self._cherry_pick_message(change),
multiline=True, ring=app.ring) multiline=True, ring=app.ring)
self.branch_buttons = [] self.branch_buttons = []
rows.append(urwid.Text(u"Branch:")) rows.append(urwid.Text(u"Branch:"))