ttygroup/boartty
Code Issues Proposed changes

Clarify keymap entries for local git operations

Browse Source 
To further distinguish the local vs remote cherry pick operation,
add 'local' to the name in the keymap.  Same for checkout (though
it has no remote).

Change-Id: Idcca8a9dbddfc571eda32634a7dc2a7bfb8a070a
This commit is contained in:
James E. Blair 2014-08-31 16:41:28 -07:00
parent 80460e3b4a
commit 45471c9217
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gertty/keymap.py
View File

@ -39,8 +39,8 @@ TOGGLE_REVIEWED = 'toggle reviewed'
TOGGLE_HIDDEN = 'toggle hidden' TOGGLE_HIDDEN = 'toggle hidden'
REVIEW = 'review' REVIEW = 'review'
DIFF = 'diff' DIFF = 'diff'
CHECKOUT = 'checkout' LOCAL_CHECKOUT = 'local checkout'
CHERRY_PICK = 'cherry pick' LOCAL_CHERRY_PICK = 'local cherry pick'
SEARCH_RESULTS = 'search results' SEARCH_RESULTS = 'search results'
NEXT_CHANGE = 'next change' NEXT_CHANGE = 'next change'
PREV_CHANGE = 'previous change' PREV_CHANGE = 'previous change'
@ -48,7 +48,7 @@ TOGGLE_HIDDEN_COMMENTS = 'toggle hidden comments'
ABANDON_CHANGE = 'abandon change' ABANDON_CHANGE = 'abandon change'
RESTORE_CHANGE = 'restore change' RESTORE_CHANGE = 'restore change'
REBASE_CHANGE = 'rebase change' REBASE_CHANGE = 'rebase change'
CHERRY_PICK_CHANGE = 'cherry-pick change' CHERRY_PICK_CHANGE = 'cherry pick change'
REFRESH = 'refresh' REFRESH = 'refresh'
EDIT_TOPIC = 'edit topic' EDIT_TOPIC = 'edit topic'
EDIT_COMMIT_MESSAGE = 'edit commit message' EDIT_COMMIT_MESSAGE = 'edit commit message'
@ -82,8 +82,8 @@ DEFAULT_KEYMAP = {
TOGGLE_HIDDEN: 'k', TOGGLE_HIDDEN: 'k',
REVIEW: 'r', REVIEW: 'r',
DIFF: 'd', DIFF: 'd',
CHECKOUT: 'c', LOCAL_CHECKOUT: 'c',
CHERRY_PICK: 'x', LOCAL_CHERRY_PICK: 'x',
SEARCH_RESULTS: 'u', SEARCH_RESULTS: 'u',
NEXT_CHANGE: 'n', NEXT_CHANGE: 'n',
PREV_CHANGE: 'p', PREV_CHANGE: 'p',

8
gertty/view/change.py
View File

@ -355,7 +355,7 @@ class ChangeView(urwid.WidgetWrap):
def help(self): def help(self):
key = self.app.config.keymap.formatKeys key = self.app.config.keymap.formatKeys
ret = [ ret = [
(key(keymap.CHECKOUT), (key(keymap.LOCAL_CHECKOUT),
"Checkout the most recent revision into the local repo"), "Checkout the most recent revision into the local repo"),
(key(keymap.DIFF), (key(keymap.DIFF),
"Show the diff of the mont recent revision"), "Show the diff of the mont recent revision"),
@ -373,7 +373,7 @@ class ChangeView(urwid.WidgetWrap):
"Back to the list of changes"), "Back to the list of changes"),
(key(keymap.TOGGLE_REVIEWED), (key(keymap.TOGGLE_REVIEWED),
"Toggle the reviewed flag for the current change"), "Toggle the reviewed flag for the current change"),
(key(keymap.CHERRY_PICK), (key(keymap.LOCAL_CHERRY_PICK),
"Cherry-pick the most recent revision onto the local repo"), "Cherry-pick the most recent revision onto the local repo"),
(key(keymap.ABANDON_CHANGE), (key(keymap.ABANDON_CHANGE),
"Abandon this change"), "Abandon this change"),
@ -724,11 +724,11 @@ class ChangeView(urwid.WidgetWrap):
row = self.revision_rows[self.last_revision_key] row = self.revision_rows[self.last_revision_key]
row.diff(None) row.diff(None)
return None return None
if keymap.CHECKOUT in commands: if keymap.LOCAL_CHECKOUT in commands:
row = self.revision_rows[self.last_revision_key] row = self.revision_rows[self.last_revision_key]
row.checkout(None) row.checkout(None)
return None return None
if keymap.CHERRY_PICK in commands: if keymap.LOCAL_CHERRY_PICK in commands:
row = self.revision_rows[self.last_revision_key] row = self.revision_rows[self.last_revision_key]
row.cherryPick(None) row.cherryPick(None)
return None return None