##// END OF EJS Templates
histedit: prefer edit commit, edit message, use commit...
timeless -
r27674:78d86664 default
parent child Browse files
Show More
@@ -218,7 +218,8 def geteditcomment(first, last):
218 218 """ construct the editor comment
219 219 The comment includes::
220 220 - an intro
221 - short commands
221 - sorted primary commands
222 - sorted short commands
222 223
223 224 Commands are only included once.
224 225 """
@@ -229,12 +230,12 Commits are listed from least to most re
229 230 Commands:""")
230 231 # i18n: command names and abbreviations must remain untranslated
231 232 verbs = _("""
233 e, edit = use commit, but stop for amending
234 m, mess = edit commit message without changing commit content
232 235 p, pick = use commit
233 e, edit = use commit, but stop for amending
236 d, drop = remove commit from history
234 237 f, fold = use commit, but combine it with the one above
235 238 r, roll = like fold, but discard this commit's description
236 d, drop = remove commit from history
237 m, mess = edit commit message without changing commit content
238 239 """)
239 240
240 241 return ''.join(['# %s\n' % l if l else '#\n'
@@ -64,12 +64,13 Run a dummy edit to make sure we get tip
64 64 # Commits are listed from least to most recent
65 65 #
66 66 # Commands:
67 #
68 # e, edit = use commit, but stop for amending
69 # m, mess = edit commit message without changing commit content
67 70 # p, pick = use commit
68 # e, edit = use commit, but stop for amending
71 # d, drop = remove commit from history
69 72 # f, fold = use commit, but combine it with the one above
70 73 # r, roll = like fold, but discard this commit's description
71 # d, drop = remove commit from history
72 # m, mess = edit commit message without changing commit content
73 74 #
74 75
75 76 Run on a revision not ancestors of the current working directory.
@@ -293,12 +294,13 Test that trimming description using mul
293 294 # Commits are listed from least to most recent
294 295 #
295 296 # Commands:
297 #
298 # e, edit = use commit, but stop for amending
299 # m, mess = edit commit message without changing commit content
296 300 # p, pick = use commit
297 # e, edit = use commit, but stop for amending
301 # d, drop = remove commit from history
298 302 # f, fold = use commit, but combine it with the one above
299 303 # r, roll = like fold, but discard this commit's description
300 # d, drop = remove commit from history
301 # m, mess = edit commit message without changing commit content
302 304 #
303 305
304 306 Test --continue with --keep
@@ -70,12 +70,13
70 70 # Commits are listed from least to most recent
71 71 #
72 72 # Commands:
73 #
74 # e, edit = use commit, but stop for amending
75 # m, mess = edit commit message without changing commit content
73 76 # p, pick = use commit
74 # e, edit = use commit, but stop for amending
77 # d, drop = remove commit from history
75 78 # f, fold = use commit, but combine it with the one above
76 79 # r, roll = like fold, but discard this commit's description
77 # d, drop = remove commit from history
78 # m, mess = edit commit message without changing commit content
79 80 #
80 81 $ hg histedit 1 --commands - --verbose << EOF | grep histedit
81 82 > pick 177f92b77385 2 c
@@ -130,12 +131,13
130 131 # Commits are listed from least to most recent
131 132 #
132 133 # Commands:
134 #
135 # e, edit = use commit, but stop for amending
136 # m, mess = edit commit message without changing commit content
133 137 # p, pick = use commit
134 # e, edit = use commit, but stop for amending
138 # d, drop = remove commit from history
135 139 # f, fold = use commit, but combine it with the one above
136 140 # r, roll = like fold, but discard this commit's description
137 # d, drop = remove commit from history
138 # m, mess = edit commit message without changing commit content
139 141 #
140 142 $ hg histedit 1 --commands - --verbose << EOF | grep histedit
141 143 > pick b346ab9a313d 1 c
@@ -64,12 +64,13 show the edit commands offered
64 64 # Commits are listed from least to most recent
65 65 #
66 66 # Commands:
67 #
68 # e, edit = use commit, but stop for amending
69 # m, mess = edit commit message without changing commit content
67 70 # p, pick = use commit
68 # e, edit = use commit, but stop for amending
71 # d, drop = remove commit from history
69 72 # f, fold = use commit, but combine it with the one above
70 73 # r, roll = like fold, but discard this commit's description
71 # d, drop = remove commit from history
72 # m, mess = edit commit message without changing commit content
73 74 #
74 75
75 76 edit the history
@@ -342,12 +343,13 Verify that revsetalias entries work wit
342 343 # Commits are listed from least to most recent
343 344 #
344 345 # Commands:
346 #
347 # e, edit = use commit, but stop for amending
348 # m, mess = edit commit message without changing commit content
345 349 # p, pick = use commit
346 # e, edit = use commit, but stop for amending
350 # d, drop = remove commit from history
347 351 # f, fold = use commit, but combine it with the one above
348 352 # r, roll = like fold, but discard this commit's description
349 # d, drop = remove commit from history
350 # m, mess = edit commit message without changing commit content
351 353 #
352 354
353 355 should also work if a commit message is missing
@@ -469,10 +469,11 Attempting to fold a change into a publi
469 469 # Commits are listed from least to most recent
470 470 #
471 471 # Commands:
472 #
473 # e, edit = use commit, but stop for amending
474 # m, mess = edit commit message without changing commit content
472 475 # p, fold = use commit
473 # e, edit = use commit, but stop for amending
476 # d, drop = remove commit from history
474 477 # f, fold = use commit, but combine it with the one above
475 478 # r, roll = like fold, but discard this commit's description
476 # d, drop = remove commit from history
477 # m, mess = edit commit message without changing commit content
478 479 #
@@ -49,12 +49,13 Enable obsolete
49 49 # Commits are listed from least to most recent
50 50 #
51 51 # Commands:
52 #
53 # e, edit = use commit, but stop for amending
54 # m, mess = edit commit message without changing commit content
52 55 # p, pick = use commit
53 # e, edit = use commit, but stop for amending
56 # d, drop = remove commit from history
54 57 # f, fold = use commit, but combine it with the one above
55 58 # r, roll = like fold, but discard this commit's description
56 # d, drop = remove commit from history
57 # m, mess = edit commit message without changing commit content
58 59 #
59 60 $ hg histedit 1 --commands - --verbose <<EOF | grep histedit
60 61 > pick 177f92b77385 2 c
@@ -46,12 +46,13 show the edit commands offered by outgoi
46 46 # Commits are listed from least to most recent
47 47 #
48 48 # Commands:
49 #
50 # e, edit = use commit, but stop for amending
51 # m, mess = edit commit message without changing commit content
49 52 # p, pick = use commit
50 # e, edit = use commit, but stop for amending
53 # d, drop = remove commit from history
51 54 # f, fold = use commit, but combine it with the one above
52 55 # r, roll = like fold, but discard this commit's description
53 # d, drop = remove commit from history
54 # m, mess = edit commit message without changing commit content
55 56 #
56 57 $ cd ..
57 58
@@ -77,12 +78,13 show the error from unrelated repos
77 78 # Commits are listed from least to most recent
78 79 #
79 80 # Commands:
81 #
82 # e, edit = use commit, but stop for amending
83 # m, mess = edit commit message without changing commit content
80 84 # p, pick = use commit
81 # e, edit = use commit, but stop for amending
85 # d, drop = remove commit from history
82 86 # f, fold = use commit, but combine it with the one above
83 87 # r, roll = like fold, but discard this commit's description
84 # d, drop = remove commit from history
85 # m, mess = edit commit message without changing commit content
86 88 #
87 89 $ cd ..
88 90
@@ -100,12 +102,13 test sensitivity to branch in URL:
100 102 # Commits are listed from least to most recent
101 103 #
102 104 # Commands:
105 #
106 # e, edit = use commit, but stop for amending
107 # m, mess = edit commit message without changing commit content
103 108 # p, pick = use commit
104 # e, edit = use commit, but stop for amending
109 # d, drop = remove commit from history
105 110 # f, fold = use commit, but combine it with the one above
106 111 # r, roll = like fold, but discard this commit's description
107 # d, drop = remove commit from history
108 # m, mess = edit commit message without changing commit content
109 112 #
110 113
111 114 test to check number of roots in outgoing revisions
General Comments 0
You need to be logged in to leave comments. Login now