##// END OF EJS Templates
histedit: improve discoverability of edit commit message
timeless@mozdev.org -
r26100:5706d130 default
parent child Browse files
Show More
@@ -38,7 +38,7 b' file open in your editor::'
38 # f, fold = use commit, but combine it with the one above
38 # f, fold = use commit, but combine it with the one above
39 # r, roll = like fold, but discard this commit's description
39 # r, roll = like fold, but discard this commit's description
40 # d, drop = remove commit from history
40 # d, drop = remove commit from history
41 # m, mess = edit message without changing commit content
41 # m, mess = edit commit message without changing commit content
42 #
42 #
43
43
44 In this file, lines beginning with ``#`` are ignored. You must specify a rule
44 In this file, lines beginning with ``#`` are ignored. You must specify a rule
@@ -60,7 +60,7 b' would reorganize the file to look like t'
60 # f, fold = use commit, but combine it with the one above
60 # f, fold = use commit, but combine it with the one above
61 # r, roll = like fold, but discard this commit's description
61 # r, roll = like fold, but discard this commit's description
62 # d, drop = remove commit from history
62 # d, drop = remove commit from history
63 # m, mess = edit message without changing commit content
63 # m, mess = edit commit message without changing commit content
64 #
64 #
65
65
66 At which point you close the editor and ``histedit`` starts working. When you
66 At which point you close the editor and ``histedit`` starts working. When you
@@ -198,7 +198,7 b' editcomment = _("""# Edit history betwee'
198 # f, fold = use commit, but combine it with the one above
198 # f, fold = use commit, but combine it with the one above
199 # r, roll = like fold, but discard this commit's description
199 # r, roll = like fold, but discard this commit's description
200 # d, drop = remove commit from history
200 # d, drop = remove commit from history
201 # m, mess = edit message without changing commit content
201 # m, mess = edit commit message without changing commit content
202 #
202 #
203 """)
203 """)
204
204
@@ -69,7 +69,7 b' Run a dummy edit to make sure we get tip'
69 # f, fold = use commit, but combine it with the one above
69 # f, fold = use commit, but combine it with the one above
70 # r, roll = like fold, but discard this commit's description
70 # r, roll = like fold, but discard this commit's description
71 # d, drop = remove commit from history
71 # d, drop = remove commit from history
72 # m, mess = edit message without changing commit content
72 # m, mess = edit commit message without changing commit content
73 #
73 #
74 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
74 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
75
75
@@ -292,7 +292,7 b' Test that trimming description using mul'
292 # f, fold = use commit, but combine it with the one above
292 # f, fold = use commit, but combine it with the one above
293 # r, roll = like fold, but discard this commit's description
293 # r, roll = like fold, but discard this commit's description
294 # d, drop = remove commit from history
294 # d, drop = remove commit from history
295 # m, mess = edit message without changing commit content
295 # m, mess = edit commit message without changing commit content
296 #
296 #
297 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
297 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
298
298
@@ -75,7 +75,7 b''
75 # f, fold = use commit, but combine it with the one above
75 # f, fold = use commit, but combine it with the one above
76 # r, roll = like fold, but discard this commit's description
76 # r, roll = like fold, but discard this commit's description
77 # d, drop = remove commit from history
77 # d, drop = remove commit from history
78 # m, mess = edit message without changing commit content
78 # m, mess = edit commit message without changing commit content
79 #
79 #
80 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
80 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
81 $ hg histedit 1 --commands - --verbose << EOF | grep histedit
81 $ hg histedit 1 --commands - --verbose << EOF | grep histedit
@@ -136,7 +136,7 b''
136 # f, fold = use commit, but combine it with the one above
136 # f, fold = use commit, but combine it with the one above
137 # r, roll = like fold, but discard this commit's description
137 # r, roll = like fold, but discard this commit's description
138 # d, drop = remove commit from history
138 # d, drop = remove commit from history
139 # m, mess = edit message without changing commit content
139 # m, mess = edit commit message without changing commit content
140 #
140 #
141 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
141 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
142 $ hg histedit 1 --commands - --verbose << EOF | grep histedit
142 $ hg histedit 1 --commands - --verbose << EOF | grep histedit
@@ -69,7 +69,7 b' show the edit commands offered'
69 # f, fold = use commit, but combine it with the one above
69 # f, fold = use commit, but combine it with the one above
70 # r, roll = like fold, but discard this commit's description
70 # r, roll = like fold, but discard this commit's description
71 # d, drop = remove commit from history
71 # d, drop = remove commit from history
72 # m, mess = edit message without changing commit content
72 # m, mess = edit commit message without changing commit content
73 #
73 #
74 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
74 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
75
75
@@ -347,7 +347,7 b' Verify that revsetalias entries work wit'
347 # f, fold = use commit, but combine it with the one above
347 # f, fold = use commit, but combine it with the one above
348 # r, roll = like fold, but discard this commit's description
348 # r, roll = like fold, but discard this commit's description
349 # d, drop = remove commit from history
349 # d, drop = remove commit from history
350 # m, mess = edit message without changing commit content
350 # m, mess = edit commit message without changing commit content
351 #
351 #
352 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
352 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
353
353
@@ -54,7 +54,7 b' Enable obsolete'
54 # f, fold = use commit, but combine it with the one above
54 # f, fold = use commit, but combine it with the one above
55 # r, roll = like fold, but discard this commit's description
55 # r, roll = like fold, but discard this commit's description
56 # d, drop = remove commit from history
56 # d, drop = remove commit from history
57 # m, mess = edit message without changing commit content
57 # m, mess = edit commit message without changing commit content
58 #
58 #
59 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
59 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
60 $ hg histedit 1 --commands - --verbose <<EOF | grep histedit
60 $ hg histedit 1 --commands - --verbose <<EOF | grep histedit
@@ -51,7 +51,7 b' show the edit commands offered by outgoi'
51 # f, fold = use commit, but combine it with the one above
51 # f, fold = use commit, but combine it with the one above
52 # r, roll = like fold, but discard this commit's description
52 # r, roll = like fold, but discard this commit's description
53 # d, drop = remove commit from history
53 # d, drop = remove commit from history
54 # m, mess = edit message without changing commit content
54 # m, mess = edit commit message without changing commit content
55 #
55 #
56 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
56 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
57 $ cd ..
57 $ cd ..
@@ -83,7 +83,7 b' show the error from unrelated repos'
83 # f, fold = use commit, but combine it with the one above
83 # f, fold = use commit, but combine it with the one above
84 # r, roll = like fold, but discard this commit's description
84 # r, roll = like fold, but discard this commit's description
85 # d, drop = remove commit from history
85 # d, drop = remove commit from history
86 # m, mess = edit message without changing commit content
86 # m, mess = edit commit message without changing commit content
87 #
87 #
88 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
88 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
89 $ cd ..
89 $ cd ..
@@ -107,7 +107,7 b' test sensitivity to branch in URL:'
107 # f, fold = use commit, but combine it with the one above
107 # f, fold = use commit, but combine it with the one above
108 # r, roll = like fold, but discard this commit's description
108 # r, roll = like fold, but discard this commit's description
109 # d, drop = remove commit from history
109 # d, drop = remove commit from history
110 # m, mess = edit message without changing commit content
110 # m, mess = edit commit message without changing commit content
111 #
111 #
112 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
112 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
113
113
General Comments 0
You need to be logged in to leave comments. Login now