##// END OF EJS Templates
test: use a lighter log style in histedit test...
Pierre-Yves David -
r19014:7b50120e default
parent child Browse files
Show More
@@ -1,6 +1,8 b''
1 $ . "$TESTDIR/histedit-helpers.sh"
1 $ . "$TESTDIR/histedit-helpers.sh"
2
2
3 $ cat >> $HGRCPATH <<EOF
3 $ cat >> $HGRCPATH <<EOF
4 > [alias]
5 > logt = log --template '{rev}:{node|short} {desc|firstline}\n'
4 > [extensions]
6 > [extensions]
5 > graphlog=
7 > graphlog=
6 > histedit=
8 > histedit=
@@ -27,37 +29,18 b''
27 $ initrepo
29 $ initrepo
28
30
29 log before edit
31 log before edit
30 $ hg log --graph
32 $ hg logt --graph
31 @ changeset: 5:652413bf663e
33 @ 5:652413bf663e f
32 | tag: tip
33 | user: test
34 | date: Thu Jan 01 00:00:00 1970 +0000
35 | summary: f
36 |
34 |
37 o changeset: 4:e860deea161a
35 o 4:e860deea161a e
38 | user: test
39 | date: Thu Jan 01 00:00:00 1970 +0000
40 | summary: e
41 |
36 |
42 o changeset: 3:055a42cdd887
37 o 3:055a42cdd887 d
43 | user: test
44 | date: Thu Jan 01 00:00:00 1970 +0000
45 | summary: d
46 |
38 |
47 o changeset: 2:177f92b77385
39 o 2:177f92b77385 c
48 | user: test
49 | date: Thu Jan 01 00:00:00 1970 +0000
50 | summary: c
51 |
40 |
52 o changeset: 1:d2ae7f538514
41 o 1:d2ae7f538514 b
53 | user: test
54 | date: Thu Jan 01 00:00:00 1970 +0000
55 | summary: b
56 |
42 |
57 o changeset: 0:cb9a9f314b8b
43 o 0:cb9a9f314b8b a
58 user: test
59 date: Thu Jan 01 00:00:00 1970 +0000
60 summary: a
61
44
62
45
63 edit the history
46 edit the history
@@ -71,32 +54,16 b' edit the history'
71 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
54 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
72
55
73 log after edit
56 log after edit
74 $ hg log --graph
57 $ hg logt --graph
75 @ changeset: 4:7e0a290363ed
58 @ 4:7e0a290363ed d
76 | tag: tip
77 | user: test
78 | date: Thu Jan 01 00:00:00 1970 +0000
79 | summary: d
80 |
59 |
81 o changeset: 3:5e24935bad3d
60 o 3:5e24935bad3d pick e860deea161a e
82 | user: test
83 | date: Thu Jan 01 00:00:00 1970 +0000
84 | summary: pick e860deea161a e
85 |
61 |
86 o changeset: 2:ee283cb5f2d5
62 o 2:ee283cb5f2d5 e
87 | user: test
88 | date: Thu Jan 01 00:00:00 1970 +0000
89 | summary: e
90 |
63 |
91 o changeset: 1:d2ae7f538514
64 o 1:d2ae7f538514 b
92 | user: test
93 | date: Thu Jan 01 00:00:00 1970 +0000
94 | summary: b
95 |
65 |
96 o changeset: 0:cb9a9f314b8b
66 o 0:cb9a9f314b8b a
97 user: test
98 date: Thu Jan 01 00:00:00 1970 +0000
99 summary: a
100
67
101
68
102 post-fold manifest
69 post-fold manifest
@@ -145,27 +112,14 b' folding and creating no new change doesn'
145 $ hg commit -m '+5'
112 $ hg commit -m '+5'
146 $ echo 6 >> file
113 $ echo 6 >> file
147 $ hg commit -m '+6'
114 $ hg commit -m '+6'
148 $ hg log --graph
115 $ hg logt --graph
149 @ changeset: 3:251d831eeec5
116 @ 3:251d831eeec5 +6
150 | tag: tip
151 | user: test
152 | date: Thu Jan 01 00:00:00 1970 +0000
153 | summary: +6
154 |
117 |
155 o changeset: 2:888f9082bf99
118 o 2:888f9082bf99 +5
156 | user: test
157 | date: Thu Jan 01 00:00:00 1970 +0000
158 | summary: +5
159 |
119 |
160 o changeset: 1:617f94f13c0f
120 o 1:617f94f13c0f +4
161 | user: test
162 | date: Thu Jan 01 00:00:00 1970 +0000
163 | summary: +4
164 |
121 |
165 o changeset: 0:0189ba417d34
122 o 0:0189ba417d34 1+2+3
166 user: test
167 date: Thu Jan 01 00:00:00 1970 +0000
168 summary: 1+2+3
169
123
170
124
171 $ cat > editor.py <<EOF
125 $ cat > editor.py <<EOF
@@ -197,17 +151,10 b' should effectively drop the changes from'
197 $ hg histedit --continue
151 $ hg histedit --continue
198 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
152 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
199 saved backup bundle to $TESTTMP/*-backup.hg (glob)
153 saved backup bundle to $TESTTMP/*-backup.hg (glob)
200 $ hg log --graph
154 $ hg logt --graph
201 @ changeset: 1:617f94f13c0f
155 @ 1:617f94f13c0f +4
202 | tag: tip
203 | user: test
204 | date: Thu Jan 01 00:00:00 1970 +0000
205 | summary: +4
206 |
156 |
207 o changeset: 0:0189ba417d34
157 o 0:0189ba417d34 1+2+3
208 user: test
209 date: Thu Jan 01 00:00:00 1970 +0000
210 summary: 1+2+3
211
158
212
159
213 $ cd ..
160 $ cd ..
@@ -227,7 +174,7 b' dropped revision.'
227 $ hg commit -m '+5'
174 $ hg commit -m '+5'
228 $ echo 6 >> file
175 $ echo 6 >> file
229 $ hg commit -m '+6'
176 $ hg commit -m '+6'
230 $ hg log -G --template '{rev}:{node|short} {desc|firstline}\n'
177 $ hg logt -G --template '{rev}:{node|short} {desc|firstline}\n'
231 @ 3:251d831eeec5 +6
178 @ 3:251d831eeec5 +6
232 |
179 |
233 o 2:888f9082bf99 +5
180 o 2:888f9082bf99 +5
@@ -279,17 +226,10 b' dropped revision.'
279 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
226 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
280 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
227 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
281 saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/617f94f13c0f-backup.hg (glob)
228 saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/617f94f13c0f-backup.hg (glob)
282 $ hg log -G
229 $ hg logt -G
283 @ changeset: 1:10c647b2cdd5
230 @ 1:10c647b2cdd5 +4
284 | tag: tip
285 | user: test
286 | date: Thu Jan 01 00:00:00 1970 +0000
287 | summary: +4
288 |
231 |
289 o changeset: 0:0189ba417d34
232 o 0:0189ba417d34 1+2+3
290 user: test
291 date: Thu Jan 01 00:00:00 1970 +0000
292 summary: 1+2+3
293
233
294 $ hg export tip
234 $ hg export tip
295 # HG changeset patch
235 # HG changeset patch
General Comments 0
You need to be logged in to leave comments. Login now