This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6178

crecord: new keys g & G to navigate to the top and bottom respectively
ClosedPublic

Authored by arun on Apr 2 2019, 1:30 AM.

Details

Reviewers
JordiGH
pulkit
Group Reviewers
hg-reviewers
Commits
rHG80103ed2e8ee: crecord: new keys g & G to navigate to the top and bottom respectively
Summary

This patch introduces two new keys 'g' and 'G' that helps to navigate to the
top and bottom of the file/hunk/line respectively. This is inline with the shortcuts
used in man, less, more and such tools that makes it convenient to navigate
swiftly.

'g' or HOME navigates to the top most file in the ncurses window.

'G' or END navigates to the bottom most file/hunk/line depending on the whether
the fold is active or not.

If the bottom most file is folded, it navigates to that file and stops there.
If the bottom most file is unfolded, it navigates to the bottom most hunk in
that file and stops there. If the bottom most hunk is unfolded, it navigates to
the bottom most line in that hunk.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

arun created this revision.Apr 2 2019, 1:30 AM
arun edited the summary of this revision. (Show Details)Apr 2 2019, 1:35 PM
arun retitled this revision from crecord: new keys g & G to navigate to the top and bottom hunks respectively to crecord: new keys g & G to navigate to the top and bottom respectively.
arun updated this revision to Diff 14620.
arun updated this revision to Diff 14621.Apr 2 2019, 1:38 PM
JordiGH added a subscriber: JordiGH.Apr 2 2019, 1:38 PM
JordiGH added inline comments.
mercurial/crecord.py
1471

We should find a better way to phrase this, since it's not about hunk. Maybe just "first line" and "last line".

1772

It would be nice to map these to Home and End (which by the way, also map on less).

arun edited the summary of this revision. (Show Details)Apr 2 2019, 1:53 PM
arun updated this revision to Diff 14623.
arun marked an inline comment as done.Apr 2 2019, 1:58 PM
arun added inline comments.
mercurial/crecord.py
1471

Amended the patch. Simply top/bottom seems good as well. Can you have another look?

JordiGH accepted this revision.Apr 5 2019, 10:56 AM
pulkit accepted this revision.Apr 5 2019, 11:01 AM
pulkit added a comment.Apr 5 2019, 11:13 AM

Amending this diff to make test-check-code.t happy which complains about lines longer than 80.

diff --git a/mercurial/crecord.py b/mercurial/crecord.py
--- a/mercurial/crecord.py
+++ b/mercurial/crecord.py
@@ -1528,10 +1528,10 @@ the following are valid keystrokes:
         Handle 'G' to navigate to the bottom most file/hunk/line depending
         on the whether the fold is active or not.
 
-        If the bottom most file is folded, it navigates to that file and stops there.
-        If the bottom most file is unfolded, it navigates to the bottom most hunk in
-        that file and stops there. If the bottom most hunk is unfolded, it navigates to
-        the bottom most line in that hunk.
+        If the bottom most file is folded, it navigates to that file and
+        stops there. If the bottom most file is unfolded, it navigates to
+        the bottom most hunk in that file and stops there. If the bottom most
+        hunk is unfolded, it navigates to the bottom most line in that hunk.
         """
         currentitem = self.currentselecteditem
         nextitem = currentitem.nextitem()
Closed by commit rHG80103ed2e8ee: crecord: new keys g & G to navigate to the top and bottom respectively (authored by carun). · Explain WhyApr 5 2019, 11:13 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/crecord.py (45 lines)

Diff 14681

mercurial/crecord.py

[space] : (un-)select item ([~]/[x] = partly/fully applied) [space] : (un-)select item ([~]/[x] = partly/fully applied)
[enter] : (un-)select item and go to next item of same type [enter] : (un-)select item and go to next item of same type
A : (un-)select all items A : (un-)select all items
up/down-arrow [k/j] : go to previous/next unfolded item up/down-arrow [k/j] : go to previous/next unfolded item
pgup/pgdn [K/J] : go to previous/next item of same type pgup/pgdn [K/J] : go to previous/next item of same type
right/left-arrow [l/h] : go to child item / parent item right/left-arrow [l/h] : go to child item / parent item
shift-left-arrow [H] : go to parent header / fold selected header shift-left-arrow [H] : go to parent header / fold selected header
g : go to the top
G : go to the bottom
JordiGHUnsubmitted
Not Done

We should find a better way to phrase this, since it's not about hunk. Maybe just "first line" and "last line".

JordiGH: We should find a better way to phrase this, since it's not about hunk. Maybe just "first line"…
arunAuthorUnsubmitted
Not Done

Amended the patch. Simply top/bottom seems good as well. Can you have another look?

arun: Amended the patch. Simply top/bottom seems good as well. Can you have another look?
f : fold / unfold item, hiding/revealing its children f : fold / unfold item, hiding/revealing its children
F : fold / unfold parent item and all of its ancestors F : fold / unfold parent item and all of its ancestors
ctrl-l : scroll the selected line to the top of the screen ctrl-l : scroll the selected line to the top of the screen
m : edit / resume editing the commit message m : edit / resume editing the commit message
e : edit the currently selected hunk e : edit the currently selected hunk
a : toggle amend mode, only with commit -i a : toggle amend mode, only with commit -i
c : confirm selected changes c : confirm selected changes
r : review/edit and confirm selected changes r : review/edit and confirm selected changes
curses.raw() curses.raw()
curses.def_prog_mode() curses.def_prog_mode()
curses.endwin() curses.endwin()
self.commenttext = self.ui.edit(self.commenttext, self.ui.username()) self.commenttext = self.ui.edit(self.commenttext, self.ui.username())
curses.cbreak() curses.cbreak()
self.stdscr.refresh() self.stdscr.refresh()
self.stdscr.keypad(1) # allow arrow-keys to continue to function self.stdscr.keypad(1) # allow arrow-keys to continue to function
def handlefirstlineevent(self):
"""
Handle 'g' to navigate to the top most file in the ncurses window.
"""
self.currentselecteditem = self.headerlist[0]
currentitem = self.currentselecteditem
# select the parent item recursively until we're at a header
while True:
nextitem = currentitem.parentitem()
if nextitem is None:
break
else:
currentitem = nextitem
self.currentselecteditem = currentitem
def handlelastlineevent(self):
"""
Handle 'G' to navigate to the bottom most file/hunk/line depending
on the whether the fold is active or not.
If the bottom most file is folded, it navigates to that file and
stops there. If the bottom most file is unfolded, it navigates to
the bottom most hunk in that file and stops there. If the bottom most
hunk is unfolded, it navigates to the bottom most line in that hunk.
"""
currentitem = self.currentselecteditem
nextitem = currentitem.nextitem()
# select the child item recursively until we're at a footer
while nextitem is not None:
nextitem = currentitem.nextitem()
if nextitem is None:
break
else:
currentitem = nextitem
self.currentselecteditem = currentitem
self.recenterdisplayedarea()
def confirmationwindow(self, windowtext): def confirmationwindow(self, windowtext):
"display an informational window, then wait for and return a keypress." "display an informational window, then wait for and return a keypress."
confirmwin = curses.newwin(self.yscreensize, 0, 0, 0) confirmwin = curses.newwin(self.yscreensize, 0, 0, 0)
try: try:
lines = windowtext.split("\n") lines = windowtext.split("\n")
for line in lines: for line in lines:
self.printstring(confirmwin, line, pairname="selected") self.printstring(confirmwin, line, pairname="selected")
elif keypressed in ['e']: elif keypressed in ['e']:
self.toggleedit(test=test) self.toggleedit(test=test)
elif keypressed in ["f"]: elif keypressed in ["f"]:
self.togglefolded() self.togglefolded()
elif keypressed in ["F"]: elif keypressed in ["F"]:
self.togglefolded(foldparent=True) self.togglefolded(foldparent=True)
elif keypressed in ["m"]: elif keypressed in ["m"]:
self.commitMessageWindow() self.commitMessageWindow()
elif keypressed in ["g", "KEY_HOME"]:
self.handlefirstlineevent()
elif keypressed in ["G", "KEY_END"]:
self.handlelastlineevent()
JordiGHUnsubmitted
Done

It would be nice to map these to Home and End (which by the way, also map on less).

JordiGH: It would be nice to map these to Home and End (which by the way, also map on `less`).
elif keypressed in ["?"]: elif keypressed in ["?"]:
self.helpwindow() self.helpwindow()
self.stdscr.clear() self.stdscr.clear()
self.stdscr.refresh() self.stdscr.refresh()
elif curses.unctrl(keypressed) in ["^L"]: elif curses.unctrl(keypressed) in ["^L"]:
# scroll the current line to the top of the screen, and redraw # scroll the current line to the top of the screen, and redraw
# everything # everything
self.scrolllines(self.selecteditemstartline) self.scrolllines(self.selecteditemstartline)