comparison hgext/histedit.py @ 27674:78d86664e3a2

histedit: prefer edit commit, edit message, use commit

Selecting editing commits, rewording commit messages, and
selecting commits are key actions, we will prefer them more
generally in a future commit, this pulls them ahead before
that to make the diffs easier to read.

The remaining commands are left alphabetically sorted

27673:d93d340dc6ee

def geteditcomment(first, last):
    """ construct the editor comment
    The comment includes::
     - an intro
     - short commands

    Commands are only included once.
    """
    intro = _("""Edit history between %s and %s

Commits are listed from least to most recent

Commands:""")
    # i18n: command names and abbreviations must remain untranslated
    verbs = _("""
 p, pick = use commit
 e, edit = use commit, but stop for amending
 f, fold = use commit, but combine it with the one above
 r, roll = like fold, but discard this commit's description
 d, drop = remove commit from history
 m, mess = edit commit message without changing commit content
""")

    return ''.join(['# %s\n' % l if l else '#\n'
                    for l in ((intro % (first, last) + verbs).split('\n'))])

27674:78d86664e3a2

def geteditcomment(first, last):
    """ construct the editor comment
    The comment includes::
     - an intro
     - sorted primary commands
     - sorted short commands

    Commands are only included once.
    """
    intro = _("""Edit history between %s and %s

Commits are listed from least to most recent

Commands:""")
    # i18n: command names and abbreviations must remain untranslated
    verbs = _("""
 e, edit = use commit, but stop for amending
 m, mess = edit commit message without changing commit content
 p, pick = use commit
 d, drop = remove commit from history
 f, fold = use commit, but combine it with the one above
 r, roll = like fold, but discard this commit's description
""")

    return ''.join(['# %s\n' % l if l else '#\n'
                    for l in ((intro % (first, last) + verbs).split('\n'))])