equal
deleted
inserted
replaced
12 > qlog = log --template='{rev} - {node|short} {desc} ({phase})\n' |
12 > qlog = log --template='{rev} - {node|short} {desc} ({phase})\n' |
13 > [diff] |
13 > [diff] |
14 > git = 1 |
14 > git = 1 |
15 > unified = 0 |
15 > unified = 0 |
16 > [extensions] |
16 > [extensions] |
17 > hgext.graphlog= |
|
18 > EOF |
17 > EOF |
19 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
18 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
20 $ mkcommit() { |
19 $ mkcommit() { |
21 > echo "$1" > "$1" |
20 > echo "$1" > "$1" |
22 > hg add "$1" |
21 > hg add "$1" |
29 > shift |
28 > shift |
30 > mkcommits $* |
29 > mkcommits $* |
31 > } |
30 > } |
32 |
31 |
33 $ glog() { |
32 $ glog() { |
34 > hg glog --template '{rev}:{node|short}@{branch}({phase}) {desc|firstline}\n' "$@" |
33 > hg log -G --template '{rev}:{node|short}@{branch}({phase}) {desc|firstline}\n' "$@" |
35 > } |
34 > } |
36 |
35 |
37 $ shaof() { |
36 $ shaof() { |
38 > hg log -T {node} -r "first(desc($1))" |
37 > hg log -T {node} -r "first(desc($1))" |
39 > } |
38 > } |
102 [255] |
101 [255] |
103 $ hg metaedit --fold |
102 $ hg metaedit --fold |
104 abort: revisions must be specified with --fold |
103 abort: revisions must be specified with --fold |
105 [255] |
104 [255] |
106 $ hg metaedit -r 0 --fold |
105 $ hg metaedit -r 0 --fold |
107 abort: cannot fold public revisions |
106 abort: cannot fold public changesets: ea207398892e |
|
107 (see 'hg help phases' for details) |
108 [255] |
108 [255] |
109 $ hg metaedit 'desc(C) + desc(F)' --fold |
109 $ hg metaedit 'desc(C) + desc(F)' --fold |
110 abort: cannot fold non-linear revisions (multiple roots given) |
110 abort: cannot fold non-linear revisions (multiple roots given) |
111 [255] |
111 [255] |
112 $ hg metaedit "desc(C)::desc(D2) + desc(E)" --fold |
112 $ hg metaedit "desc(C)::desc(D2) + desc(E)" --fold |
116 $ hg metaedit '.^' --config 'experimental.evolution=createmarkers, allnewcommands' |
116 $ hg metaedit '.^' --config 'experimental.evolution=createmarkers, allnewcommands' |
117 abort: cannot edit commit information in the middle of a stack |
117 abort: cannot edit commit information in the middle of a stack |
118 (587528abfffe will become unstable and new unstable changes are not allowed) |
118 (587528abfffe will become unstable and new unstable changes are not allowed) |
119 [255] |
119 [255] |
120 $ hg metaedit 'desc(A)::desc(B)' --fold --config 'experimental.evolution=createmarkers, allnewcommands' |
120 $ hg metaedit 'desc(A)::desc(B)' --fold --config 'experimental.evolution=createmarkers, allnewcommands' |
121 abort: cannot fold chain not ending with a head or with branching |
121 abort: fold will orphan 4 descendants |
122 (new unstable changesets are not allowed) |
122 (see 'hg help evolution.instability') |
123 [255] |
123 [255] |
124 $ hg metaedit --user foobar |
124 $ hg metaedit --user foobar |
125 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
125 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
126 $ hg log --template '{rev}: {author}\n' -r 'desc(F):' --hidden |
126 $ hg log --template '{rev}: {author}\n' -r 'desc(F):' --hidden |
127 5: test |
127 5: test |
207 11: test |
207 11: test |
208 12: foobar2 |
208 12: foobar2 |
209 $ hg diff -r "10" -r "11" --hidden |
209 $ hg diff -r "10" -r "11" --hidden |
210 |
210 |
211 'fold' one commit |
211 'fold' one commit |
212 $ hg metaedit "desc(D2)" --fold --user foobar3 |
212 $ HGUSER=foobar3 hg metaedit "desc(D2)" --fold -U --config |
213 1 changesets folded |
213 1 changesets folded |
214 $ hg log -r "tip" --template '{rev}: {author}\n' |
214 $ hg log -r "tip" --template '{rev}: {author}\n' |
215 13: foobar3 |
215 13: foobar3 |