equal
deleted
inserted
replaced
3 > hgext.graphlog= |
3 > hgext.graphlog= |
4 > EOF |
4 > EOF |
5 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH |
5 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH |
6 |
6 |
7 $ glog() { |
7 $ glog() { |
8 > hg glog --template '{rev}:{node|short}@{branch}({obsolete}/{phase}) {desc|firstline}\n' "$@" |
8 > hg glog --template '{rev}:{node|short}@{branch}({separate("/", obsolete, phase)}) {desc|firstline}\n' "$@" |
9 > } |
9 > } |
10 |
10 |
11 $ hg init repo |
11 $ hg init repo |
12 $ cd repo |
12 $ cd repo |
13 |
13 |
116 o |
116 o |
117 |
117 |
118 Add a couple of bookmarks |
118 Add a couple of bookmarks |
119 |
119 |
120 $ glog --hidden |
120 $ glog --hidden |
121 @ 3:5eb72dbe0cb4@bar(stable/draft) touncommit |
121 @ 3:5eb72dbe0cb4@bar(draft) touncommit |
122 | |
122 | |
123 o 2:f63b90038565@default(stable/draft) merge |
123 o 2:f63b90038565@default(draft) merge |
124 |\ |
124 |\ |
125 | o 1:f15c744d48e8@default(stable/draft) addmore |
125 | o 1:f15c744d48e8@default(draft) addmore |
126 | |
126 | |
127 o 0:07f494440405@default(stable/draft) adda |
127 o 0:07f494440405@default(draft) adda |
128 |
128 |
129 $ hg bookmark -r 2 unrelated |
129 $ hg bookmark -r 2 unrelated |
130 $ hg bookmark touncommit-bm |
130 $ hg bookmark touncommit-bm |
131 $ hg bookmark --inactive touncommit-bm-inactive |
131 $ hg bookmark --inactive touncommit-bm-inactive |
132 $ hg bookmarks |
132 $ hg bookmarks |
215 d |
215 d |
216 d |
216 d |
217 $ hg cat -r . e |
217 $ hg cat -r . e |
218 e |
218 e |
219 $ glog --hidden |
219 $ glog --hidden |
220 @ 4:e8db4aa611f6@bar(stable/draft) touncommit |
220 @ 4:e8db4aa611f6@bar(draft) touncommit |
221 | |
221 | |
222 | x 3:5eb72dbe0cb4@bar(extinct/draft) touncommit |
222 | x 3:5eb72dbe0cb4@bar(obsolete/draft) touncommit |
223 |/ |
223 |/ |
224 o 2:f63b90038565@default(stable/draft) merge |
224 o 2:f63b90038565@default(draft) merge |
225 |\ |
225 |\ |
226 | o 1:f15c744d48e8@default(stable/draft) addmore |
226 | o 1:f15c744d48e8@default(draft) addmore |
227 | |
227 | |
228 o 0:07f494440405@default(stable/draft) adda |
228 o 0:07f494440405@default(draft) adda |
229 |
229 |
230 $ hg bookmarks |
230 $ hg bookmarks |
231 * touncommit-bm 4:e8db4aa611f6 |
231 * touncommit-bm 4:e8db4aa611f6 |
232 touncommit-bm-inactive 4:e8db4aa611f6 |
232 touncommit-bm-inactive 4:e8db4aa611f6 |
233 unrelated 2:f63b90038565 |
233 unrelated 2:f63b90038565 |
262 R f |
262 R f |
263 R g |
263 R g |
264 R m |
264 R m |
265 R n |
265 R n |
266 $ glog --hidden |
266 $ glog --hidden |
267 @ 5:c706fe2c12f8@bar(stable/draft) touncommit |
267 @ 5:c706fe2c12f8@bar(draft) touncommit |
268 | |
268 | |
269 | o 4:e8db4aa611f6@bar(stable/draft) touncommit |
269 | o 4:e8db4aa611f6@bar(draft) touncommit |
270 |/ |
270 |/ |
271 | x 3:5eb72dbe0cb4@bar(extinct/draft) touncommit |
271 | x 3:5eb72dbe0cb4@bar(obsolete/draft) touncommit |
272 |/ |
272 |/ |
273 o 2:f63b90038565@default(stable/draft) merge |
273 o 2:f63b90038565@default(draft) merge |
274 |\ |
274 |\ |
275 | o 1:f15c744d48e8@default(stable/draft) addmore |
275 | o 1:f15c744d48e8@default(draft) addmore |
276 | |
276 | |
277 o 0:07f494440405@default(stable/draft) adda |
277 o 0:07f494440405@default(draft) adda |
278 |
278 |
279 $ hg debugobsolete |
279 $ hg debugobsolete |
280 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (*) {'user': 'test'} (glob) |
280 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (*) {'user': 'test'} (glob) |
281 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c706fe2c12f83ba5010cb60ea6af3bd1f0c2d6d3 0 (*) {'user': 'test'} (glob) |
281 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c706fe2c12f83ba5010cb60ea6af3bd1f0c2d6d3 0 (*) {'user': 'test'} (glob) |
282 |
282 |