Patchwork D6178: crecord: new keys g & G to navigate to the top and bottom hunks respectively

login
register
mail settings
Submitter phabricator
Date April 2, 2019, 5:30 a.m.
Message ID <differential-rev-PHID-DREV-7pu7sqvj7z35sk2t4mzf-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/39436/
State Superseded
Headers show

Comments

phabricator - April 2, 2019, 5:30 a.m.
arun created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

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

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D6178

AFFECTED FILES
  mercurial/crecord.py

CHANGE DETAILS




To: arun, #hg-reviewers
Cc: mercurial-devel
phabricator - April 2, 2019, 5:38 p.m.
JordiGH added inline comments.

INLINE COMMENTS

> crecord.py:1471
> +                      g : go to the first hunk line
> +                      G : go to the last hunk line
>                        f : fold / unfold item, hiding/revealing its children

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

> crecord.py:1766
> +        elif keypressed in ["G"]:
> +            self.handlelastlineevent()
>          elif keypressed in ["?"]:

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

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D6178

To: arun, #hg-reviewers
Cc: JordiGH, mercurial-devel
phabricator - April 2, 2019, 5:58 p.m.
arun marked an inline comment as done.
arun added inline comments.

INLINE COMMENTS

> JordiGH wrote in 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".

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

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D6178

To: arun, #hg-reviewers
Cc: JordiGH, mercurial-devel
phabricator - April 5, 2019, 3:13 p.m.
pulkit added a comment.


  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()

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D6178

To: arun, #hg-reviewers, JordiGH, pulkit
Cc: JordiGH, mercurial-devel

Patch

diff --git a/mercurial/crecord.py b/mercurial/crecord.py
--- a/mercurial/crecord.py
+++ b/mercurial/crecord.py
@@ -1467,6 +1467,8 @@ 
         pgup/pgdn [K/J] : go to previous/next item of same type
  right/left-arrow [l/h] : go to child item / parent item
  shift-left-arrow   [H] : go to parent header / fold selected header
+                      g : go to the first hunk line
+                      G : go to the last hunk line
                       f : fold / unfold item, hiding/revealing its children
                       F : fold / unfold parent item and all of its ancestors
                  ctrl-l : scroll the selected line to the top of the screen
@@ -1505,6 +1507,39 @@ 
         self.stdscr.refresh()
         self.stdscr.keypad(1) # allow arrow-keys to continue to function
 
+    def handlefirstlineevent(self):
+        """
+        Handle 'g' to navigate to the top most hunk.
+        """
+        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 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):
         "display an informational window, then wait for and return a keypress."
 
@@ -1725,6 +1760,10 @@ 
             self.togglefolded(foldparent=True)
         elif keypressed in ["m"]:
             self.commitMessageWindow()
+        elif keypressed in ["g"]:
+            self.handlefirstlineevent()
+        elif keypressed in ["G"]:
+            self.handlelastlineevent()
         elif keypressed in ["?"]:
             self.helpwindow()
             self.stdscr.clear()