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

hgext/histedit.py

@@ -218,7 +218,8 b' def geteditcomment(first, last):'
     """ construct the editor comment
     The comment includes::
      - an intro
-     - short commands
+     - sorted primary commands
+     - sorted short commands
 
     Commands are only included once.
     """
@@ -229,12 +230,12 b' Commits are listed from least to most re'
 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
- e, edit = use commit, but stop for amending
+ 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
- d, drop = remove commit from history
- m, mess = edit commit message without changing commit content
 """)
 
     return ''.join(['# %s\n' % l if l else '#\n'

tests/test-histedit-arguments.t

@@ -64,12 +64,13 b' Run a dummy edit to make sure we get tip'
   # Commits are listed from least to most recent
   #
   # Commands:
+  #
+  #  e, edit = use commit, but stop for amending
+  #  m, mess = edit commit message without changing commit content
   #  p, pick = use commit
-  #  e, edit = use commit, but stop for amending
+  #  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
-  #  d, drop = remove commit from history
-  #  m, mess = edit commit message without changing commit content
   #
 
 Run on a revision not ancestors of the current working directory.
@@ -293,12 +294,13 b' Test that trimming description using mul'
   # Commits are listed from least to most recent
   #
   # Commands:
+  #
+  #  e, edit = use commit, but stop for amending
+  #  m, mess = edit commit message without changing commit content
   #  p, pick = use commit
-  #  e, edit = use commit, but stop for amending
+  #  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
-  #  d, drop = remove commit from history
-  #  m, mess = edit commit message without changing commit content
   #
 
 Test --continue with --keep

tests/test-histedit-bookmark-motion.t

@@ -70,12 +70,13 b''
   # Commits are listed from least to most recent
   #
   # Commands:
+  #
+  #  e, edit = use commit, but stop for amending
+  #  m, mess = edit commit message without changing commit content
   #  p, pick = use commit
-  #  e, edit = use commit, but stop for amending
+  #  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
-  #  d, drop = remove commit from history
-  #  m, mess = edit commit message without changing commit content
   #
   $ hg histedit 1 --commands - --verbose << EOF | grep histedit
   > pick 177f92b77385 2 c
@@ -130,12 +131,13 b''
   # Commits are listed from least to most recent
   #
   # Commands:
+  #
+  #  e, edit = use commit, but stop for amending
+  #  m, mess = edit commit message without changing commit content
   #  p, pick = use commit
-  #  e, edit = use commit, but stop for amending
+  #  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
-  #  d, drop = remove commit from history
-  #  m, mess = edit commit message without changing commit content
   #
   $ hg histedit 1 --commands - --verbose << EOF | grep histedit
   > pick b346ab9a313d 1 c

tests/test-histedit-commute.t

@@ -64,12 +64,13 b' show the edit commands offered'
   # Commits are listed from least to most recent
   #
   # Commands:
+  #
+  #  e, edit = use commit, but stop for amending
+  #  m, mess = edit commit message without changing commit content
   #  p, pick = use commit
-  #  e, edit = use commit, but stop for amending
+  #  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
-  #  d, drop = remove commit from history
-  #  m, mess = edit commit message without changing commit content
   #
 
 edit the history
@@ -342,12 +343,13 b' Verify that revsetalias entries work wit'
   # Commits are listed from least to most recent
   #
   # Commands:
+  #
+  #  e, edit = use commit, but stop for amending
+  #  m, mess = edit commit message without changing commit content
   #  p, pick = use commit
-  #  e, edit = use commit, but stop for amending
+  #  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
-  #  d, drop = remove commit from history
-  #  m, mess = edit commit message without changing commit content
   #
 
 should also work if a commit message is missing

tests/test-histedit-edit.t

@@ -469,10 +469,11 b' Attempting to fold a change into a publi'
   # Commits are listed from least to most recent
   #
   # Commands:
+  #
+  #  e, edit = use commit, but stop for amending
+  #  m, mess = edit commit message without changing commit content
   #  p, fold = use commit
-  #  e, edit = use commit, but stop for amending
+  #  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
-  #  d, drop = remove commit from history
-  #  m, mess = edit commit message without changing commit content
   #

tests/test-histedit-obsolete.t

@@ -49,12 +49,13 b' Enable obsolete'
   # Commits are listed from least to most recent
   #
   # Commands:
+  #
+  #  e, edit = use commit, but stop for amending
+  #  m, mess = edit commit message without changing commit content
   #  p, pick = use commit
-  #  e, edit = use commit, but stop for amending
+  #  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
-  #  d, drop = remove commit from history
-  #  m, mess = edit commit message without changing commit content
   #
   $ hg histedit 1 --commands - --verbose <<EOF | grep histedit
   > pick 177f92b77385 2 c

tests/test-histedit-outgoing.t

@@ -46,12 +46,13 b' show the edit commands offered by outgoi'
   # Commits are listed from least to most recent
   #
   # Commands:
+  #
+  #  e, edit = use commit, but stop for amending
+  #  m, mess = edit commit message without changing commit content
   #  p, pick = use commit
-  #  e, edit = use commit, but stop for amending
+  #  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
-  #  d, drop = remove commit from history
-  #  m, mess = edit commit message without changing commit content
   #
   $ cd ..
 
@@ -77,12 +78,13 b' show the error from unrelated repos'
   # Commits are listed from least to most recent
   #
   # Commands:
+  #
+  #  e, edit = use commit, but stop for amending
+  #  m, mess = edit commit message without changing commit content
   #  p, pick = use commit
-  #  e, edit = use commit, but stop for amending
+  #  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
-  #  d, drop = remove commit from history
-  #  m, mess = edit commit message without changing commit content
   #
   $ cd ..
 
@@ -100,12 +102,13 b' test sensitivity to branch in URL:'
   # Commits are listed from least to most recent
   #
   # Commands:
+  #
+  #  e, edit = use commit, but stop for amending
+  #  m, mess = edit commit message without changing commit content
   #  p, pick = use commit
-  #  e, edit = use commit, but stop for amending
+  #  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
-  #  d, drop = remove commit from history
-  #  m, mess = edit commit message without changing commit content
   #
 
 test to check number of roots in outgoing revisions