histedit: clarify description of fold command
N and (N-1) didn't add any information to description of fold.
More useful is refering to the commit list as it is displayed in editor.
--- a/hgext/histedit.py Fri Feb 07 17:24:12 2014 +0100
+++ b/hgext/histedit.py Thu Feb 13 18:05:35 2014 -0800
@@ -30,10 +30,12 @@
# Edit history between c561b4e977df and 7c2fd3b9020c
#
+ # Commits are listed from least to most recent
+ #
# Commands:
# p, pick = use commit
# e, edit = use commit, but stop for amending
- # f, fold = use commit, but fold into previous commit (combines N and N-1)
+ # f, fold = use commit, but fold into previous commit (combines this commit with the one above)
# d, drop = remove commit from history
# m, mess = edit message without changing commit content
#
@@ -49,10 +51,12 @@
# Edit history between c561b4e977df and 7c2fd3b9020c
#
+ # Commits are listed from least to most recent
+ #
# Commands:
# p, pick = use commit
# e, edit = use commit, but stop for amending
- # f, fold = use commit, but fold into previous commit (combines N and N-1)
+ # f, fold = use commit, but fold into previous commit (combines this commit with the one above)
# d, drop = remove commit from history
# m, mess = edit message without changing commit content
#
@@ -170,10 +174,12 @@
# i18n: command names and abbreviations must remain untranslated
editcomment = _("""# Edit history between %s and %s
#
+# Commits are listed from least to most recent
+#
# Commands:
# p, pick = use commit
# e, edit = use commit, but stop for amending
-# f, fold = use commit, but fold into previous commit (combines N and N-1)
+# f, fold = use commit, but fold into previous commit (combines this commit with the one above)
# d, drop = remove commit from history
# m, mess = edit message without changing commit content
#
--- a/tests/test-histedit-arguments.t Fri Feb 07 17:24:12 2014 +0100
+++ b/tests/test-histedit-arguments.t Thu Feb 13 18:05:35 2014 -0800
@@ -51,10 +51,12 @@
# Edit history between eb57da33312f and 08d98a8350f3
#
+ # Commits are listed from least to most recent
+ #
# Commands:
# p, pick = use commit
# e, edit = use commit, but stop for amending
- # f, fold = use commit, but fold into previous commit (combines N and N-1)
+ # f, fold = use commit, but fold into previous commit (combines this commit with the one above)
# d, drop = remove commit from history
# m, mess = edit message without changing commit content
#
--- a/tests/test-histedit-bookmark-motion.t Fri Feb 07 17:24:12 2014 +0100
+++ b/tests/test-histedit-bookmark-motion.t Thu Feb 13 18:05:35 2014 -0800
@@ -67,10 +67,12 @@
# Edit history between d2ae7f538514 and 652413bf663e
#
+ # Commits are listed from least to most recent
+ #
# Commands:
# p, pick = use commit
# e, edit = use commit, but stop for amending
- # f, fold = use commit, but fold into previous commit (combines N and N-1)
+ # f, fold = use commit, but fold into previous commit (combines this commit with the one above)
# d, drop = remove commit from history
# m, mess = edit message without changing commit content
#
@@ -125,10 +127,12 @@
# Edit history between b346ab9a313d and cacdfd884a93
#
+ # Commits are listed from least to most recent
+ #
# Commands:
# p, pick = use commit
# e, edit = use commit, but stop for amending
- # f, fold = use commit, but fold into previous commit (combines N and N-1)
+ # f, fold = use commit, but fold into previous commit (combines this commit with the one above)
# d, drop = remove commit from history
# m, mess = edit message without changing commit content
#
--- a/tests/test-histedit-commute.t Fri Feb 07 17:24:12 2014 +0100
+++ b/tests/test-histedit-commute.t Thu Feb 13 18:05:35 2014 -0800
@@ -61,10 +61,12 @@
# Edit history between 177f92b77385 and 652413bf663e
#
+ # Commits are listed from least to most recent
+ #
# Commands:
# p, pick = use commit
# e, edit = use commit, but stop for amending
- # f, fold = use commit, but fold into previous commit (combines N and N-1)
+ # f, fold = use commit, but fold into previous commit (combines this commit with the one above)
# d, drop = remove commit from history
# m, mess = edit message without changing commit content
#
--- a/tests/test-histedit-obsolete.t Fri Feb 07 17:24:12 2014 +0100
+++ b/tests/test-histedit-obsolete.t Thu Feb 13 18:05:35 2014 -0800
@@ -51,10 +51,12 @@
# Edit history between d2ae7f538514 and 652413bf663e
#
+ # Commits are listed from least to most recent
+ #
# Commands:
# p, pick = use commit
# e, edit = use commit, but stop for amending
- # f, fold = use commit, but fold into previous commit (combines N and N-1)
+ # f, fold = use commit, but fold into previous commit (combines this commit with the one above)
# d, drop = remove commit from history
# m, mess = edit message without changing commit content
#
--- a/tests/test-histedit-outgoing.t Fri Feb 07 17:24:12 2014 +0100
+++ b/tests/test-histedit-outgoing.t Thu Feb 13 18:05:35 2014 -0800
@@ -43,10 +43,12 @@
# Edit history between 055a42cdd887 and 652413bf663e
#
+ # Commits are listed from least to most recent
+ #
# Commands:
# p, pick = use commit
# e, edit = use commit, but stop for amending
- # f, fold = use commit, but fold into previous commit (combines N and N-1)
+ # f, fold = use commit, but fold into previous commit (combines this commit with the one above)
# d, drop = remove commit from history
# m, mess = edit message without changing commit content
#
@@ -72,10 +74,12 @@
# Edit history between 2a4042b45417 and 51281e65ba79
#
+ # Commits are listed from least to most recent
+ #
# Commands:
# p, pick = use commit
# e, edit = use commit, but stop for amending
- # f, fold = use commit, but fold into previous commit (combines N and N-1)
+ # f, fold = use commit, but fold into previous commit (combines this commit with the one above)
# d, drop = remove commit from history
# m, mess = edit message without changing commit content
#
@@ -93,10 +97,12 @@
# Edit history between f26599ee3441 and f26599ee3441
#
+ # Commits are listed from least to most recent
+ #
# Commands:
# p, pick = use commit
# e, edit = use commit, but stop for amending
- # f, fold = use commit, but fold into previous commit (combines N and N-1)
+ # f, fold = use commit, but fold into previous commit (combines this commit with the one above)
# d, drop = remove commit from history
# m, mess = edit message without changing commit content
#