comparison mercurial/crecord.py @ 24840:a5e3634ba024 stable

record: change wording for record curses interface

We are using record and crecord in different context, not just for commiting
changes but also reverting and shelving changes. This diff changes the wording
from commiting to confirming changes to avoid confusing the users with what
they are doing.

24839:6e38b6fc4123

            printstring(self.statuswin,
                        "SELECT CHUNKS: (j/k/up/dn/pgup/pgdn) move cursor; "
                        "(space/A) toggle hunk/all; (e)dit hunk;",
                        pairname="legend")
            printstring(self.statuswin,
                        " (f)old/unfold; (c)ommit applied; (q)uit; (?) help "
                        "| [X]=hunk applied **=folded",
                        pairname="legend")
        except curses.error:
            pass

    def helpwindow(self):
        "print a help window to the screen.  exit after any keypress."
        helptext = """            [press any key to return to the patch-display]

crecord allows you to interactively choose among the changes you have made,
and commit only those changes you select.  after committing the selected
changes, the unselected changes are still present in your working copy, so you
can use crecord multiple times to split large changes into smaller changesets.
the following are valid keystrokes:

                [space] : (un-)select item ([~]/[x] = partly/fully applied)

                      f : fold / unfold item, hiding/revealing its children
                      f : fold / unfold parent item and all of its ancestors
                      m : edit / resume editing the commit message
                      e : edit the currently selected hunk
                      a : toggle amend mode (hg rev >= 2.2)
                      c : commit selected changes
                      r : review/edit and commit selected changes
                      q : quit without committing (no changes will be made)
                      ? : help (what you're currently reading)"""

        helpwin = curses.newwin(self.yscreensize, 0, 0, 0)
        helplines = helptext.split("\n")
        helplines = helplines + [" "]*(

            response = None

        return response

    def confirmcommit(self, review=False):
        "ask for 'y' to be pressed to confirm commit. return True if confirmed."
        if review:
            confirmtext = (
"""if you answer yes to the following, the your currently chosen patch chunks
will be loaded into an editor.  you may modify the patch from the editor, and
save the changes if you wish to change the patch.  otherwise, you can just
close the editor without saving to accept the current patch as-is.

note: don't add/remove lines unless you also modify the range information.
      failing to follow this rule will result in the commit aborting.

are you sure you want to review/edit and commit the selected changes [yn]? """)
        else:
            confirmtext = (
                "are you sure you want to commit the selected changes [yn]? ")

        response = self.confirmationwindow(confirmtext)
        if response is None:
            response = "n"
        if response.lower().startswith("y"):

24840:a5e3634ba024

            printstring(self.statuswin,
                        "SELECT CHUNKS: (j/k/up/dn/pgup/pgdn) move cursor; "
                        "(space/A) toggle hunk/all; (e)dit hunk;",
                        pairname="legend")
            printstring(self.statuswin,
                        " (f)old/unfold; (c)onfirm applied; (q)uit; (?) help "
                        "| [X]=hunk applied **=folded",
                        pairname="legend")
        except curses.error:
            pass

    def helpwindow(self):
        "print a help window to the screen.  exit after any keypress."
        helptext = """            [press any key to return to the patch-display]

crecord allows you to interactively choose among the changes you have made,
and confirm only those changes you select for further processing by the command
you are running (commit/shelve/revert), after confirming the selected
changes, the unselected changes are still present in your working copy, so you
can use crecord multiple times to split large changes into smaller changesets.
the following are valid keystrokes:

                [space] : (un-)select item ([~]/[x] = partly/fully applied)

                      f : fold / unfold item, hiding/revealing its children
                      f : fold / unfold parent item and all of its ancestors
                      m : edit / resume editing the commit message
                      e : edit the currently selected hunk
                      a : toggle amend mode (hg rev >= 2.2)
                      c : confirm selected changes
                      r : review/edit and confirm selected changes
                      q : quit without confirming (no changes will be made)
                      ? : help (what you're currently reading)"""

        helpwin = curses.newwin(self.yscreensize, 0, 0, 0)
        helplines = helptext.split("\n")
        helplines = helplines + [" "]*(

            response = None

        return response

    def confirmcommit(self, review=False):
        """ask for 'y' to be pressed to confirm selected. return True if
        confirmed."""
        if review:
            confirmtext = (
"""if you answer yes to the following, the your currently chosen patch chunks
will be loaded into an editor.  you may modify the patch from the editor, and
save the changes if you wish to change the patch.  otherwise, you can just
close the editor without saving to accept the current patch as-is.

note: don't add/remove lines unless you also modify the range information.
      failing to follow this rule will result in the commit aborting.

are you sure you want to review/edit and confirm the selected changes [yn]?
""")
        else:
            confirmtext = (
                "are you sure you want to confirm the selected changes [yn]? ")

        response = self.confirmationwindow(confirmtext)
        if response is None:
            response = "n"
        if response.lower().startswith("y"):