ttygroup/boartty
Code Issues Proposed changes

Add local cherry-pick button

Browse Source 
Change-Id: I392b0ce4d672eaf0090018107cc9862f6f95fd50
This commit is contained in:
James E. Blair 2014-05-17 20:34:08 -04:00
parent 7ea4ad8b36
commit ee2df47b95
2 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gertty/gitrepo.py
View File

@ -164,6 +164,13 @@ class Repo(object):
except git.exc.GitCommandError as e:
raise GitCheckoutError(e.stderr.replace('\t', ' '))
def cherryPick(self, ref):
repo = git.Repo(self.path)
try:
repo.git.cherry_pick(ref)
except git.exc.GitCommandError as e:
raise GitCheckoutError(e.stderr.replace('\t', ' '))
def diffstat(self, old, new):
repo = git.Repo(self.path)
diff = repo.git.diff('-M', '--numstat', old, new)

27
gertty/view/change.py
View File

@ -192,8 +192,10 @@ class RevisionRow(urwid.WidgetWrap):
buttons = [self.review_button,
mywid.FixedButton(('revision-button', "Diff"),
on_press=self.diff),
mywid.FixedButton(('revision-button', "Checkout"),
on_press=self.checkout)]
mywid.FixedButton(('revision-button', "Local Checkout"),
on_press=self.checkout),
mywid.FixedButton(('revision-button', "Local Cherry-Pick"),
on_press=self.cherryPick)]
buttons = [('pack', urwid.AttrMap(b, None, focus_map=focus_map)) for b in buttons]
buttons = urwid.Columns(buttons + [urwid.Text('')], dividechars=2)
buttons = urwid.AttrMap(buttons, 'revision-button')
@ -243,6 +245,19 @@ class RevisionRow(urwid.WidgetWrap):
lambda button: self.app.backScreen())
self.app.popup(dialog, min_height=min_height)
def cherryPick(self, button):
repo = self.app.getRepo(self.project_name)
try:
repo.cherryPick(self.commit_sha)
dialog = mywid.MessageDialog('Cherry-Pick', 'Change cherry-picked in %s' % repo.path)
min_height=8
except gitrepo.GitCheckoutError as e:
dialog = mywid.MessageDialog('Error', e.msg)
min_height=12
urwid.connect_signal(dialog, 'close',
lambda button: self.app.backScreen())
self.app.popup(dialog, min_height=min_height)
class ChangeMessageBox(urwid.Text):
def __init__(self, message):
super(ChangeMessageBox, self).__init__(u'')
@ -260,11 +275,12 @@ class ChangeView(urwid.WidgetWrap):
help = mywid.GLOBAL_HELP + """
This Screen
===========
<c> Checkout the most recent revision.
<c> Checkout the most recent revision into the local repo.
<d> Show the diff of the mont recent revision.
<k> Toggle the hidden flag for the current change.
<r> Leave a review for the most recent revision.
<v> Toggle the reviewed flag for the current change.
<x> Cherry-pick the most recent revision onto the local repo.
"""
def __init__(self, app, change_key):
@ -449,6 +465,11 @@ This Screen
if r == 'c':
row = self.revision_rows[self.last_revision_key]
row.checkout(None)
return None
if r == 'x':
row = self.revision_rows[self.last_revision_key]
row.cherryPick(None)
return None
return r
def diff(self, revision_key):