##// END OF EJS Templates
tests: don't load unnecessary graphlog extension...
Martin Geisler -
r20117:aa9385f9 default
parent child Browse files
Show More
@@ -5,11 +5,10 b''
5 TERM=dumb; export TERM
5 TERM=dumb; export TERM
6 echo '[extensions]' >> $HGRCPATH
6 echo '[extensions]' >> $HGRCPATH
7 echo 'convert = ' >> $HGRCPATH
7 echo 'convert = ' >> $HGRCPATH
8 echo 'hgext.graphlog = ' >> $HGRCPATH
9
8
10 glog()
9 glog()
11 {
10 {
12 hg glog --template '{rev}@{branch} "{desc|firstline}" files: {files}\n' "$@"
11 hg log -G --template '{rev}@{branch} "{desc|firstline}" files: {files}\n' "$@"
13 }
12 }
14
13
15 manifest()
14 manifest()
@@ -1,8 +1,5 b''
1 $ HGFOO=BAR; export HGFOO
1 $ HGFOO=BAR; export HGFOO
2 $ cat >> $HGRCPATH <<EOF
2 $ cat >> $HGRCPATH <<EOF
3 > [extensions]
4 > graphlog=
5 >
6 > [alias]
3 > [alias]
7 > # should clobber ci but not commit (issue2993)
4 > # should clobber ci but not commit (issue2993)
8 > ci = version
5 > ci = version
@@ -34,7 +31,7 b''
34 > count = !hg log -r "\$@" --template=. | wc -c | sed -e 's/ //g'
31 > count = !hg log -r "\$@" --template=. | wc -c | sed -e 's/ //g'
35 > mcount = !hg log \$@ --template=. | wc -c | sed -e 's/ //g'
32 > mcount = !hg log \$@ --template=. | wc -c | sed -e 's/ //g'
36 > rt = root
33 > rt = root
37 > tglog = glog --template "{rev}:{node|short}: '{desc}' {branches}\n"
34 > tglog = log -G --template "{rev}:{node|short}: '{desc}' {branches}\n"
38 > idalias = id
35 > idalias = id
39 > idaliaslong = id
36 > idaliaslong = id
40 > idaliasshell = !echo test
37 > idaliasshell = !echo test
@@ -549,7 +549,7 b' test missing revisions'
549
549
550 test stripping a non-checked-out but bookmarked revision
550 test stripping a non-checked-out but bookmarked revision
551
551
552 $ hg --config extensions.graphlog= log --graph
552 $ hg log --graph
553 o changeset: 4:9ba5f110a0b3
553 o changeset: 4:9ba5f110a0b3
554 | branch: test
554 | branch: test
555 | tag: tip
555 | tag: tip
@@ -587,7 +587,7 b' test stripping a non-checked-out but boo'
587 saved backup bundle to * (glob)
587 saved backup bundle to * (glob)
588 should-end-on-two should end up pointing to revision 2, as that's the
588 should-end-on-two should end up pointing to revision 2, as that's the
589 tipmost surviving ancestor of the stripped revision.
589 tipmost surviving ancestor of the stripped revision.
590 $ hg --config extensions.graphlog= log --graph
590 $ hg log --graph
591 @ changeset: 3:9ba5f110a0b3
591 @ changeset: 3:9ba5f110a0b3
592 | branch: test
592 | branch: test
593 | bookmark: four
593 | bookmark: four
@@ -75,12 +75,9 b' back to "second branch" to make another '
75 $ mkrev 8
75 $ mkrev 8
76 rev 8
76 rev 8
77
77
78 $ echo "[extensions]" >> $HGRCPATH
79 $ echo "graphlog=" >> $HGRCPATH
80
81 the story so far
78 the story so far
82
79
83 $ hg glog --template "{rev}\n"
80 $ hg log -G --template "{rev}\n"
84 @ 8
81 @ 8
85 |
82 |
86 | o 7
83 | o 7
@@ -4,7 +4,6 b' create test repo'
4 $ cat <<EOF >> $HGRCPATH
4 $ cat <<EOF >> $HGRCPATH
5 > [extensions]
5 > [extensions]
6 > transplant =
6 > transplant =
7 > graphlog =
8 > EOF
7 > EOF
9 $ hg init repo
8 $ hg init repo
10 $ cd repo
9 $ cd repo
@@ -39,7 +38,7 b' commit bug fixes on bug fix branch'
39 $ echo fix2 > bugfix
38 $ echo fix2 > bugfix
40 $ echo fix2 >> file1
39 $ echo fix2 >> file1
41 $ hg ci -Am"fix 2"
40 $ hg ci -Am"fix 2"
42 $ hg glog --template="$template"
41 $ hg log -G --template="$template"
43 @ 3 fix 2 [fixes]
42 @ 3 fix 2 [fixes]
44 |
43 |
45 o 2 fix 1 [fixes]
44 o 2 fix 1 [fixes]
@@ -59,7 +58,7 b' transplant bug fixes onto release branch'
59 [0-9a-f]{12} transplanted to [0-9a-f]{12} (re)
58 [0-9a-f]{12} transplanted to [0-9a-f]{12} (re)
60 applying [0-9a-f]{12} (re)
59 applying [0-9a-f]{12} (re)
61 [0-9a-f]{12} transplanted to [0-9a-f]{12} (re)
60 [0-9a-f]{12} transplanted to [0-9a-f]{12} (re)
62 $ hg glog --template="$template"
61 $ hg log -G --template="$template"
63 @ 5 fix 2 [release]
62 @ 5 fix 2 [release]
64 |
63 |
65 o 4 fix 1 [release]
64 o 4 fix 1 [release]
@@ -1,6 +1,3 b''
1 $ echo "[extensions]" >> $HGRCPATH
2 $ echo "graphlog=" >> $HGRCPATH
3
4 $ addcommit () {
1 $ addcommit () {
5 > echo $1 > $1
2 > echo $1 > $1
6 > hg add $1
3 > hg add $1
@@ -4,7 +4,6 b''
4
4
5 $ echo "[extensions]" >> $HGRCPATH
5 $ echo "[extensions]" >> $HGRCPATH
6 $ echo "convert=" >> $HGRCPATH
6 $ echo "convert=" >> $HGRCPATH
7 $ echo 'graphlog =' >> $HGRCPATH
8
7
9 create baz archive
8 create baz archive
10 $ baz make-archive baz@mercurial--convert hg-test-convert-baz
9 $ baz make-archive baz@mercurial--convert hg-test-convert-baz
@@ -129,7 +128,7 b' converting baz repo to Mercurial'
129
128
130 $ glog()
129 $ glog()
131 > {
130 > {
132 > hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
131 > hg log -G --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
133 > }
132 > }
134
133
135 show graph log
134 show graph log
@@ -8,7 +8,6 b' and http://mercurial.selenic.com/bts/iss'
8 > }
8 > }
9 $ echo "[extensions]" >> $HGRCPATH
9 $ echo "[extensions]" >> $HGRCPATH
10 $ echo "convert = " >> $HGRCPATH
10 $ echo "convert = " >> $HGRCPATH
11 $ echo "graphlog = " >> $HGRCPATH
12 $ echo "[convert]" >> $HGRCPATH
11 $ echo "[convert]" >> $HGRCPATH
13 $ echo "cvsps.cache=0" >> $HGRCPATH
12 $ echo "cvsps.cache=0" >> $HGRCPATH
14
13
@@ -79,7 +78,7 b' Convert'
79
78
80 Check the result
79 Check the result
81
80
82 $ hg -R src-hg glog --template '{rev} ({branches}) {desc} files: {files}\n'
81 $ hg -R src-hg log -G --template '{rev} ({branches}) {desc} files: {files}\n'
83 o 5 () update tags files: .hgtags
82 o 5 () update tags files: .hgtags
84 |
83 |
85 | o 4 (BRANCH) mod a again files: a
84 | o 4 (BRANCH) mod a again files: a
@@ -24,7 +24,6 b' XXX copied from test-convert-cvs-synthet'
24
24
25 $ echo "[extensions]" >> $HGRCPATH
25 $ echo "[extensions]" >> $HGRCPATH
26 $ echo "convert = " >> $HGRCPATH
26 $ echo "convert = " >> $HGRCPATH
27 $ echo "graphlog = " >> $HGRCPATH
28 $ echo "[convert]" >> $HGRCPATH
27 $ echo "[convert]" >> $HGRCPATH
29 $ echo "cvsps.cache=0" >> $HGRCPATH
28 $ echo "cvsps.cache=0" >> $HGRCPATH
30 $ echo "cvsps.mergefrom=\[MERGE from (\S+)\]" >> $HGRCPATH
29 $ echo "cvsps.mergefrom=\[MERGE from (\S+)\]" >> $HGRCPATH
@@ -210,7 +209,7 b' complete log'
210
209
211 graphical log
210 graphical log
212
211
213 $ hg -R proj.hg glog --template="$template"
212 $ hg -R proj.hg log -G --template="$template"
214 o 9: '' fix file1 [MERGE from v1-1]
213 o 9: '' fix file1 [MERGE from v1-1]
215 |
214 |
216 | o 8: 'v1_1' fix file1
215 | o 8: 'v1_1' fix file1
@@ -3,7 +3,6 b' This feature requires use of builtin cvs'
3 $ "$TESTDIR/hghave" cvs || exit 80
3 $ "$TESTDIR/hghave" cvs || exit 80
4 $ echo "[extensions]" >> $HGRCPATH
4 $ echo "[extensions]" >> $HGRCPATH
5 $ echo "convert = " >> $HGRCPATH
5 $ echo "convert = " >> $HGRCPATH
6 $ echo "graphlog = " >> $HGRCPATH
7
6
8 create cvs repository with one project
7 create cvs repository with one project
9
8
@@ -153,9 +152,9 b' convert to hg (#1)'
153 1 MERGE from HEAD: add file6
152 1 MERGE from HEAD: add file6
154 0 MERGE from v1_2: add file5
153 0 MERGE from v1_2: add file5
155
154
156 hg glog output (#1)
155 hg log -G output (#1)
157
156
158 $ hg -R proj.hg glog --template "{rev} {desc}\n"
157 $ hg -R proj.hg log -G --template "{rev} {desc}\n"
159 o 8 MERGE from v1_2: add file5
158 o 8 MERGE from v1_2: add file5
160 |
159 |
161 | o 7 MERGE from HEAD: add file6
160 | o 7 MERGE from HEAD: add file6
@@ -200,9 +199,9 b' convert to hg (#2: with merge detection)'
200 1 MERGE from HEAD: add file6
199 1 MERGE from HEAD: add file6
201 0 MERGE from v1_2: add file5
200 0 MERGE from v1_2: add file5
202
201
203 hg glog output (#2)
202 hg log -G output (#2)
204
203
205 $ hg -R proj.hg2 glog --template "{rev} {desc}\n"
204 $ hg -R proj.hg2 log -G --template "{rev} {desc}\n"
206 o 8 MERGE from v1_2: add file5
205 o 8 MERGE from v1_2: add file5
207 |
206 |
208 | o 7 MERGE from HEAD: add file6
207 | o 7 MERGE from HEAD: add file6
@@ -10,7 +10,6 b''
10 > }
10 > }
11 $ echo "[extensions]" >> $HGRCPATH
11 $ echo "[extensions]" >> $HGRCPATH
12 $ echo "convert = " >> $HGRCPATH
12 $ echo "convert = " >> $HGRCPATH
13 $ echo "graphlog = " >> $HGRCPATH
14 $ cat > cvshooks.py <<EOF
13 $ cat > cvshooks.py <<EOF
15 > def cvslog(ui,repo,hooktype,log):
14 > def cvslog(ui,repo,hooktype,log):
16 > print "%s hook: %d entries"%(hooktype,len(log))
15 > print "%s hook: %d entries"%(hooktype,len(log))
@@ -307,7 +306,7 b' convert again'
307 2 funny
306 2 funny
308 1 fuzzy
307 1 fuzzy
309 0 fuzzy
308 0 fuzzy
310 $ hg -R src-hg glog --template '{rev} ({branches}) {desc} date: {date|date} files: {files}\n'
309 $ hg -R src-hg log -G --template '{rev} ({branches}) {desc} date: {date|date} files: {files}\n'
311 o 8 (branch) fuzzy date: * -1000 files: b/c (glob)
310 o 8 (branch) fuzzy date: * -1000 files: b/c (glob)
312 |
311 |
313 o 7 (branch) fuzzy date: * -1000 files: a (glob)
312 o 7 (branch) fuzzy date: * -1000 files: a (glob)
@@ -22,7 +22,6 b" output of 'cvs ci' varies unpredictably,"
22 > }
22 > }
23 $ echo "[extensions]" >> $HGRCPATH
23 $ echo "[extensions]" >> $HGRCPATH
24 $ echo "convert = " >> $HGRCPATH
24 $ echo "convert = " >> $HGRCPATH
25 $ echo "graphlog = " >> $HGRCPATH
26
25
27 create cvs repository
26 create cvs repository
28
27
@@ -2,7 +2,6 b''
2 $ "$TESTDIR/hghave" darcs || exit 80
2 $ "$TESTDIR/hghave" darcs || exit 80
3 $ echo "[extensions]" >> $HGRCPATH
3 $ echo "[extensions]" >> $HGRCPATH
4 $ echo "convert=" >> $HGRCPATH
4 $ echo "convert=" >> $HGRCPATH
5 $ echo 'graphlog =' >> $HGRCPATH
6 $ DARCS_EMAIL='test@example.org'; export DARCS_EMAIL
5 $ DARCS_EMAIL='test@example.org'; export DARCS_EMAIL
7
6
8 initialize darcs repo
7 initialize darcs repo
@@ -2,7 +2,6 b''
2 $ cat >> $HGRCPATH <<EOF
2 $ cat >> $HGRCPATH <<EOF
3 > [extensions]
3 > [extensions]
4 > convert=
4 > convert=
5 > graphlog=
6 > EOF
5 > EOF
7 $ hg init t
6 $ hg init t
8 $ cd t
7 $ cd t
@@ -83,7 +82,7 b' convert with datesort'
83
82
84 graph converted repo
83 graph converted repo
85
84
86 $ hg -R t-datesort glog --template '{rev} "{desc}"\n'
85 $ hg -R t-datesort log -G --template '{rev} "{desc}"\n'
87 o 12 "c1"
86 o 12 "c1"
88 |\
87 |\
89 | o 11 "b2x"
88 | o 11 "b2x"
@@ -134,7 +133,7 b' convert with datesort (default mode)'
134
133
135 graph converted repo
134 graph converted repo
136
135
137 $ hg -R t-sourcesort glog --template '{rev} "{desc}"\n'
136 $ hg -R t-sourcesort log -G --template '{rev} "{desc}"\n'
138 o 12 "c1"
137 o 12 "c1"
139 |\
138 |\
140 | o 11 "b2x"
139 | o 11 "b2x"
@@ -185,7 +184,7 b' convert with closesort'
185
184
186 graph converted repo
185 graph converted repo
187
186
188 $ hg -R t-closesort glog --template '{rev} "{desc}"\n'
187 $ hg -R t-closesort log -G --template '{rev} "{desc}"\n'
189 o 12 "c1"
188 o 12 "c1"
190 |\
189 |\
191 | o 11 "c0"
190 | o 11 "c0"
@@ -1,11 +1,10 b''
1
1
2 $ HGMERGE=true; export HGMERGE
2 $ HGMERGE=true; export HGMERGE
3 $ echo '[extensions]' >> $HGRCPATH
3 $ echo '[extensions]' >> $HGRCPATH
4 $ echo 'graphlog =' >> $HGRCPATH
5 $ echo 'convert =' >> $HGRCPATH
4 $ echo 'convert =' >> $HGRCPATH
6 $ glog()
5 $ glog()
7 > {
6 > {
8 > hg glog --template '{rev} "{desc}" files: {files}\n' "$@"
7 > hg log -G --template '{rev} "{desc}" files: {files}\n' "$@"
9 > }
8 > }
10 $ hg init source
9 $ hg init source
11 $ cd source
10 $ cd source
@@ -473,7 +472,7 b' test merge parents/empty merges pruning'
473
472
474 $ glog()
473 $ glog()
475 > {
474 > {
476 > hg glog --template '{rev}:{node|short}@{branch} "{desc}" files: {files}\n' "$@"
475 > hg log -G --template '{rev}:{node|short}@{branch} "{desc}" files: {files}\n' "$@"
477 > }
476 > }
478
477
479 test anonymous branch pruning
478 test anonymous branch pruning
@@ -6,7 +6,6 b''
6 $ echo "autocrlf = false" >> $HOME/.gitconfig
6 $ echo "autocrlf = false" >> $HOME/.gitconfig
7 $ echo "[extensions]" >> $HGRCPATH
7 $ echo "[extensions]" >> $HGRCPATH
8 $ echo "convert=" >> $HGRCPATH
8 $ echo "convert=" >> $HGRCPATH
9 $ echo 'hgext.graphlog =' >> $HGRCPATH
10 $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
9 $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
11 $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
10 $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
12 $ GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0000"; export GIT_AUTHOR_DATE
11 $ GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0000"; export GIT_AUTHOR_DATE
@@ -114,7 +113,7 b' Remove the directory, then try to replac'
114 $ cd ..
113 $ cd ..
115 $ glog()
114 $ glog()
116 > {
115 > {
117 > hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
116 > hg log -G --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
118 > }
117 > }
119 $ splitrepo()
118 $ splitrepo()
120 > {
119 > {
@@ -1,7 +1,6 b''
1
1
2 $ cat >> $HGRCPATH <<EOF
2 $ cat >> $HGRCPATH <<EOF
3 > [extensions]
3 > [extensions]
4 > graphlog =
5 > convert =
4 > convert =
6 > [convert]
5 > [convert]
7 > hg.saverev = yes
6 > hg.saverev = yes
@@ -9,7 +8,7 b''
9
8
10 $ glog()
9 $ glog()
11 > {
10 > {
12 > hg -R "$1" glog --template '{rev} "{desc}" files: {files}\n'
11 > hg -R "$1" log -G --template '{rev} "{desc}" files: {files}\n'
13 > }
12 > }
14
13
15 $ hg init source
14 $ hg init source
@@ -16,7 +16,6 b' on Windows.'
16
16
17 $ echo "[extensions]" >> $HGRCPATH
17 $ echo "[extensions]" >> $HGRCPATH
18 $ echo "convert=" >> $HGRCPATH
18 $ echo "convert=" >> $HGRCPATH
19 $ echo 'graphlog =' >> $HGRCPATH
20
19
21 Windows version of monotone home
20 Windows version of monotone home
22
21
@@ -257,7 +256,7 b' convert incrementally'
257 0 largefile
256 0 largefile
258 $ glog()
257 $ glog()
259 > {
258 > {
260 > hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
259 > hg log -G --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
261 > }
260 > }
262 $ cd repo.mtn-hg
261 $ cd repo.mtn-hg
263 $ hg up -C
262 $ hg up -C
@@ -1,10 +1,9 b''
1
1
2 $ echo "[extensions]" >> $HGRCPATH
2 $ echo "[extensions]" >> $HGRCPATH
3 $ echo "convert=" >> $HGRCPATH
3 $ echo "convert=" >> $HGRCPATH
4 $ echo 'graphlog =' >> $HGRCPATH
5 $ glog()
4 $ glog()
6 > {
5 > {
7 > hg glog --template '{rev}:{node|short} "{desc|firstline}"\
6 > hg log -G --template '{rev}:{node|short} "{desc|firstline}"\
8 > files: {files}\n' "$@"
7 > files: {files}\n' "$@"
9 > }
8 > }
10 $ hg init repo1
9 $ hg init repo1
@@ -4,7 +4,6 b''
4 $ cat >> $HGRCPATH <<EOF
4 $ cat >> $HGRCPATH <<EOF
5 > [extensions]
5 > [extensions]
6 > convert =
6 > convert =
7 > graphlog =
8 > EOF
7 > EOF
9
8
10 $ svnadmin create svn-repo
9 $ svnadmin create svn-repo
@@ -58,7 +57,7 b' Convert again'
58 0 branch trunk@1 into old3
57 0 branch trunk@1 into old3
59
58
60 $ cd A-hg
59 $ cd A-hg
61 $ hg glog --template 'branch={branches} {rev} {desc|firstline} files: {files}\n'
60 $ hg log -G --template 'branch={branches} {rev} {desc|firstline} files: {files}\n'
62 o branch=newbranch 11 branch trunk@1 into old3 files:
61 o branch=newbranch 11 branch trunk@1 into old3 files:
63 |
62 |
64 | o branch= 10 last change to a files: a
63 | o branch= 10 last change to a files: a
@@ -4,7 +4,6 b''
4 $ cat >> $HGRCPATH <<EOF
4 $ cat >> $HGRCPATH <<EOF
5 > [extensions]
5 > [extensions]
6 > convert =
6 > convert =
7 > graphlog =
8 > EOF
7 > EOF
9
8
10 $ svnadmin create svn-repo
9 $ svnadmin create svn-repo
@@ -4,7 +4,6 b''
4 $ cat >> $HGRCPATH <<EOF
4 $ cat >> $HGRCPATH <<EOF
5 > [extensions]
5 > [extensions]
6 > convert =
6 > convert =
7 > graphlog =
8 > EOF
7 > EOF
9
8
10 $ svnadmin create svn-repo
9 $ svnadmin create svn-repo
@@ -39,7 +38,7 b' Convert trunk and branches'
39 0 rename d4old into d4new
38 0 rename d4old into d4new
40
39
41 $ cd A-hg
40 $ cd A-hg
42 $ hg glog --template '{rev} {desc|firstline} files: {files}\n'
41 $ hg log -G --template '{rev} {desc|firstline} files: {files}\n'
43 o 13 rename d4old into d4new files: d4new/g d4old/g
42 o 13 rename d4old into d4new files: d4new/g d4old/g
44 |
43 |
45 o 12 add d4old files: d4old/g
44 o 12 add d4old files: d4old/g
@@ -17,7 +17,6 b''
17 $ cat >> $HGRCPATH <<EOF
17 $ cat >> $HGRCPATH <<EOF
18 > [extensions]
18 > [extensions]
19 > convert =
19 > convert =
20 > graphlog =
21 > EOF
20 > EOF
22
21
23 $ hg init a
22 $ hg init a
@@ -4,7 +4,6 b''
4 $ cat >> $HGRCPATH <<EOF
4 $ cat >> $HGRCPATH <<EOF
5 > [extensions]
5 > [extensions]
6 > convert =
6 > convert =
7 > graphlog =
8 > [convert]
7 > [convert]
9 > svn.trunk = mytrunk
8 > svn.trunk = mytrunk
10 > EOF
9 > EOF
@@ -127,7 +126,7 b' Test incremental conversion'
127 updating tags
126 updating tags
128
127
129 $ cd B-hg
128 $ cd B-hg
130 $ hg glog --template '{rev} {desc|firstline} date: {date|date} files: {files}\n'
129 $ hg log -G --template '{rev} {desc|firstline} date: {date|date} files: {files}\n'
131 o 7 update tags date: * +0000 files: .hgtags (glob)
130 o 7 update tags date: * +0000 files: .hgtags (glob)
132 |
131 |
133 o 6 work in progress date: * -1000 files: letter2.txt (glob)
132 o 6 work in progress date: * -1000 files: letter2.txt (glob)
@@ -165,7 +164,7 b' Test filemap'
165 0 work in progress
164 0 work in progress
166 $ hg -R fmap branch -q
165 $ hg -R fmap branch -q
167 default
166 default
168 $ hg glog -R fmap --template '{rev} {desc|firstline} files: {files}\n'
167 $ hg log -G -R fmap --template '{rev} {desc|firstline} files: {files}\n'
169 o 1 work in progress files: letter2.txt
168 o 1 work in progress files: letter2.txt
170 |
169 |
171 o 0 second letter files: letter2.txt
170 o 0 second letter files: letter2.txt
@@ -4,7 +4,6 b''
4 $ cat >> $HGRCPATH <<EOF
4 $ cat >> $HGRCPATH <<EOF
5 > [extensions]
5 > [extensions]
6 > convert =
6 > convert =
7 > graphlog =
8 > EOF
7 > EOF
9 $ convert()
8 $ convert()
10 > {
9 > {
@@ -15,7 +14,7 b''
15 > --config convert.svn.branches=" " \
14 > --config convert.svn.branches=" " \
16 > --config convert.svn.tags= \
15 > --config convert.svn.tags= \
17 > --datesort svn-repo $repopath
16 > --datesort svn-repo $repopath
18 > hg -R $repopath glog \
17 > hg -R $repopath log -G \
19 > --template '{rev} {desc|firstline} files: {files}\n'
18 > --template '{rev} {desc|firstline} files: {files}\n'
20 > echo
19 > echo
21 > }
20 > }
@@ -4,7 +4,6 b''
4 $ cat >> $HGRCPATH <<EOF
4 $ cat >> $HGRCPATH <<EOF
5 > [extensions]
5 > [extensions]
6 > convert =
6 > convert =
7 > graphlog =
8 > EOF
7 > EOF
9
8
10 $ svnadmin create svn-repo
9 $ svnadmin create svn-repo
@@ -25,7 +24,7 b' Convert'
25 updating tags
24 updating tags
26
25
27 $ cd A-hg
26 $ cd A-hg
28 $ hg glog --template '{rev} {desc|firstline} tags: {tags}\n'
27 $ hg log -G --template '{rev} {desc|firstline} tags: {tags}\n'
29 o 6 update tags tags: tip
28 o 6 update tags tags: tip
30 |
29 |
31 o 5 changea tags: trunk.goodtag
30 o 5 changea tags: trunk.goodtag
@@ -6,7 +6,6 b''
6 $ echo "autocrlf = false" >> $HOME/.gitconfig
6 $ echo "autocrlf = false" >> $HOME/.gitconfig
7 $ echo "[extensions]" >> $HGRCPATH
7 $ echo "[extensions]" >> $HGRCPATH
8 $ echo "convert=" >> $HGRCPATH
8 $ echo "convert=" >> $HGRCPATH
9 $ echo 'hgext.graphlog =' >> $HGRCPATH
10 $ echo '[convert]' >> $HGRCPATH
9 $ echo '[convert]' >> $HGRCPATH
11 $ echo 'hg.usebranchnames = True' >> $HGRCPATH
10 $ echo 'hg.usebranchnames = True' >> $HGRCPATH
12 $ echo 'hg.tagsbranch = tags-update' >> $HGRCPATH
11 $ echo 'hg.tagsbranch = tags-update' >> $HGRCPATH
@@ -26,7 +25,7 b''
26 > }
25 > }
27 $ glog()
26 $ glog()
28 > {
27 > {
29 > hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
28 > hg log -G --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
30 > }
29 > }
31 $ convertrepo()
30 $ convertrepo()
32 > {
31 > {
@@ -3,7 +3,6 b''
3 $ tla my-id "mercurial <mercurial@selenic.com>"
3 $ tla my-id "mercurial <mercurial@selenic.com>"
4 $ echo "[extensions]" >> $HGRCPATH
4 $ echo "[extensions]" >> $HGRCPATH
5 $ echo "convert=" >> $HGRCPATH
5 $ echo "convert=" >> $HGRCPATH
6 $ echo 'graphlog =' >> $HGRCPATH
7
6
8 create tla archive
7 create tla archive
9
8
@@ -109,7 +108,7 b' converting tla repo to Mercurial'
109 $ tla register-archive -d tla@mercurial--convert
108 $ tla register-archive -d tla@mercurial--convert
110 $ glog()
109 $ glog()
111 > {
110 > {
112 > hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
111 > hg log -G --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
113 > }
112 > }
114
113
115 show graph log
114 show graph log
@@ -1,5 +1,3 b''
1 $ echo "[extensions]" >> $HGRCPATH
2 $ echo "graphlog=" >> $HGRCPATH
3
1
4 plain
2 plain
5
3
@@ -60,7 +58,7 b' tip'
60 $ hg id
58 $ hg id
61 000000000000
59 000000000000
62 glog
60 glog
63 $ hg glog --template '{rev}: {desc} [{branches}] @ {date}\n'
61 $ hg log -G --template '{rev}: {desc} [{branches}] @ {date}\n'
64 o 11: r11 [] @ 11.00
62 o 11: r11 [] @ 11.00
65 |
63 |
66 o 10: r10 [] @ 10.00
64 o 10: r10 [] @ 10.00
@@ -106,7 +104,7 b' tip'
106 $ hg id
104 $ hg id
107 000000000000
105 000000000000
108 glog
106 glog
109 $ hg glog --template '{rev}: {desc} [{branches}] @ {date}\n'
107 $ hg log -G --template '{rev}: {desc} [{branches}] @ {date}\n'
110 o 11: r11 [] @ 11.00
108 o 11: r11 [] @ 11.00
111 |
109 |
112 o 10: r10 [] @ 10.00
110 o 10: r10 [] @ 10.00
@@ -132,7 +130,7 b' glog'
132 o 0: r0 [start] @ 0.00
130 o 0: r0 [start] @ 0.00
133
131
134 glog of
132 glog of
135 $ hg glog --template '{rev}: {desc} [{branches}]\n' of
133 $ hg log -G --template '{rev}: {desc} [{branches}]\n' of
136 o 11: r11 []
134 o 11: r11 []
137 |
135 |
138 o 10: r10 []
136 o 10: r10 []
@@ -182,7 +180,7 b' tip'
182 $ hg id
180 $ hg id
183 000000000000
181 000000000000
184 glog
182 glog
185 $ hg glog --template '{rev}: {desc} [{branches}] @ {date}\n'
183 $ hg log -G --template '{rev}: {desc} [{branches}] @ {date}\n'
186 o 11: r11 [] @ 11.00
184 o 11: r11 [] @ 11.00
187 |
185 |
188 o 10: r10 [] @ 10.00
186 o 10: r10 [] @ 10.00
@@ -208,7 +206,7 b' glog'
208 o 0: r0 [] @ 0.00
206 o 0: r0 [] @ 0.00
209
207
210 glog mf
208 glog mf
211 $ hg glog --template '{rev}: {desc} [{branches}]\n' mf
209 $ hg log -G --template '{rev}: {desc} [{branches}]\n' mf
212 o 11: r11 []
210 o 11: r11 []
213 |
211 |
214 o 10: r10 []
212 o 10: r10 []
@@ -2,17 +2,12 b''
2
2
3 = Test the getbundle() protocol function =
3 = Test the getbundle() protocol function =
4
4
5 Enable graphlog extension:
6
7 $ echo "[extensions]" >> $HGRCPATH
8 $ echo "graphlog=" >> $HGRCPATH
9
10 Create a test repository:
5 Create a test repository:
11
6
12 $ hg init repo
7 $ hg init repo
13 $ cd repo
8 $ cd repo
14 $ hg debugbuilddag -n -m '+2 :fork +5 :p1 *fork +6 :p2 /p1 :m1 +3' > /dev/null
9 $ hg debugbuilddag -n -m '+2 :fork +5 :p1 *fork +6 :p2 /p1 :m1 +3' > /dev/null
15 $ hg glog --template '{node}\n'
10 $ hg log -G --template '{node}\n'
16 o 10c14a2cc935e1d8c31f9e98587dcf27fb08a6da
11 o 10c14a2cc935e1d8c31f9e98587dcf27fb08a6da
17 |
12 |
18 o 4801a72e5d88cb515b0c7e40fae34180f3f837f2
13 o 4801a72e5d88cb515b0c7e40fae34180f3f837f2
@@ -102,7 +102,6 b' o (0) root'
102 > EOF
102 > EOF
103
103
104 $ echo "[extensions]" >> $HGRCPATH
104 $ echo "[extensions]" >> $HGRCPATH
105 $ echo "graphlog=" >> $HGRCPATH
106 $ echo "printrevset=`pwd`/printrevset.py" >> $HGRCPATH
105 $ echo "printrevset=`pwd`/printrevset.py" >> $HGRCPATH
107
106
108 $ hg init repo
107 $ hg init repo
@@ -110,7 +109,7 b' o (0) root'
110
109
111 Empty repo:
110 Empty repo:
112
111
113 $ hg glog
112 $ hg log -G
114
113
115
114
116 Building DAG:
115 Building DAG:
@@ -152,7 +151,7 b' Building DAG:'
152 $ commit 34 "head" 32
151 $ commit 34 "head" 32
153
152
154
153
155 $ hg glog -q
154 $ hg log -G -q
156 @ 34:fea3ac5810e0
155 @ 34:fea3ac5810e0
157 |
156 |
158 | o 33:68608f5145f9
157 | o 33:68608f5145f9
@@ -224,7 +223,7 b' Building DAG:'
224 o 0:e6eb3150255d
223 o 0:e6eb3150255d
225
224
226
225
227 $ hg glog
226 $ hg log -G
228 @ changeset: 34:fea3ac5810e0
227 @ changeset: 34:fea3ac5810e0
229 | tag: tip
228 | tag: tip
230 | parent: 32:d06dffa21a31
229 | parent: 32:d06dffa21a31
@@ -461,7 +460,7 b' Building DAG:'
461
460
462
461
463 File glog:
462 File glog:
464 $ hg glog a
463 $ hg log -G a
465 @ changeset: 34:fea3ac5810e0
464 @ changeset: 34:fea3ac5810e0
466 | tag: tip
465 | tag: tip
467 | parent: 32:d06dffa21a31
466 | parent: 32:d06dffa21a31
@@ -699,7 +698,7 b' File glog:'
699
698
700 File glog per revset:
699 File glog per revset:
701
700
702 $ hg glog -r 'file("a")'
701 $ hg log -G -r 'file("a")'
703 @ changeset: 34:fea3ac5810e0
702 @ changeset: 34:fea3ac5810e0
704 | tag: tip
703 | tag: tip
705 | parent: 32:d06dffa21a31
704 | parent: 32:d06dffa21a31
@@ -1131,14 +1130,14 b' File glog per revset (only merges):'
1131
1130
1132
1131
1133 Empty revision range - display nothing:
1132 Empty revision range - display nothing:
1134 $ hg glog -r 1..0
1133 $ hg log -G -r 1..0
1135
1134
1136 $ cd ..
1135 $ cd ..
1137
1136
1138 #if no-outer-repo
1137 #if no-outer-repo
1139
1138
1140 From outer space:
1139 From outer space:
1141 $ hg glog -l1 repo
1140 $ hg log -G -l1 repo
1142 @ changeset: 34:fea3ac5810e0
1141 @ changeset: 34:fea3ac5810e0
1143 | tag: tip
1142 | tag: tip
1144 | parent: 32:d06dffa21a31
1143 | parent: 32:d06dffa21a31
@@ -1146,7 +1145,7 b' From outer space:'
1146 | date: Thu Jan 01 00:00:34 1970 +0000
1145 | date: Thu Jan 01 00:00:34 1970 +0000
1147 | summary: (34) head
1146 | summary: (34) head
1148 |
1147 |
1149 $ hg glog -l1 repo/a
1148 $ hg log -G -l1 repo/a
1150 @ changeset: 34:fea3ac5810e0
1149 @ changeset: 34:fea3ac5810e0
1151 | tag: tip
1150 | tag: tip
1152 | parent: 32:d06dffa21a31
1151 | parent: 32:d06dffa21a31
@@ -1154,7 +1153,7 b' From outer space:'
1154 | date: Thu Jan 01 00:00:34 1970 +0000
1153 | date: Thu Jan 01 00:00:34 1970 +0000
1155 | summary: (34) head
1154 | summary: (34) head
1156 |
1155 |
1157 $ hg glog -l1 repo/missing
1156 $ hg log -G -l1 repo/missing
1158
1157
1159 #endif
1158 #endif
1160
1159
@@ -1169,7 +1168,7 b' File log with revs != cset revs:'
1169 $ hg commit -mtwo
1168 $ hg commit -mtwo
1170 $ echo more >two
1169 $ echo more >two
1171 $ hg commit -mmore
1170 $ hg commit -mmore
1172 $ hg glog two
1171 $ hg log -G two
1173 @ changeset: 2:12c28321755b
1172 @ changeset: 2:12c28321755b
1174 | tag: tip
1173 | tag: tip
1175 | user: test
1174 | user: test
@@ -1183,14 +1182,14 b' File log with revs != cset revs:'
1183 |
1182 |
1184
1183
1185 Issue1896: File log with explicit style
1184 Issue1896: File log with explicit style
1186 $ hg glog --style=default one
1185 $ hg log -G --style=default one
1187 o changeset: 0:3d578b4a1f53
1186 o changeset: 0:3d578b4a1f53
1188 user: test
1187 user: test
1189 date: Thu Jan 01 00:00:00 1970 +0000
1188 date: Thu Jan 01 00:00:00 1970 +0000
1190 summary: one
1189 summary: one
1191
1190
1192 Issue2395: glog --style header and footer
1191 Issue2395: glog --style header and footer
1193 $ hg glog --style=xml one
1192 $ hg log -G --style=xml one
1194 <?xml version="1.0"?>
1193 <?xml version="1.0"?>
1195 <log>
1194 <log>
1196 o <logentry revision="0" node="3d578b4a1f537d5fcf7301bfa9c0b97adfaa6fb1">
1195 o <logentry revision="0" node="3d578b4a1f537d5fcf7301bfa9c0b97adfaa6fb1">
@@ -1276,7 +1275,7 b' File + limit with revs != cset revs:'
1276 $ cd repo
1275 $ cd repo
1277 $ touch b
1276 $ touch b
1278 $ hg ci -Aqm0
1277 $ hg ci -Aqm0
1279 $ hg glog -l2 a
1278 $ hg log -G -l2 a
1280 o changeset: 34:fea3ac5810e0
1279 o changeset: 34:fea3ac5810e0
1281 | parent: 32:d06dffa21a31
1280 | parent: 32:d06dffa21a31
1282 | user: test
1281 | user: test
@@ -1291,7 +1290,7 b' File + limit with revs != cset revs:'
1291 | |
1290 | |
1292
1291
1293 File + limit + -ra:b, (b - a) < limit:
1292 File + limit + -ra:b, (b - a) < limit:
1294 $ hg glog -l3000 -r32:tip a
1293 $ hg log -G -l3000 -r32:tip a
1295 o changeset: 34:fea3ac5810e0
1294 o changeset: 34:fea3ac5810e0
1296 | parent: 32:d06dffa21a31
1295 | parent: 32:d06dffa21a31
1297 | user: test
1296 | user: test
@@ -1314,7 +1313,7 b' File + limit + -ra:b, (b - a) < limit:'
1314
1313
1315 Point out a common and an uncommon unshown parent
1314 Point out a common and an uncommon unshown parent
1316
1315
1317 $ hg glog -r 'rev(8) or rev(9)'
1316 $ hg log -G -r 'rev(8) or rev(9)'
1318 o changeset: 9:7010c0af0a35
1317 o changeset: 9:7010c0af0a35
1319 |\ parent: 7:b632bb1b1224
1318 |\ parent: 7:b632bb1b1224
1320 | | parent: 8:7a0b11f71937
1319 | | parent: 8:7a0b11f71937
@@ -1332,7 +1331,7 b' Point out a common and an uncommon unsho'
1332
1331
1333 File + limit + -ra:b, b < tip:
1332 File + limit + -ra:b, b < tip:
1334
1333
1335 $ hg glog -l1 -r32:34 a
1334 $ hg log -G -l1 -r32:34 a
1336 o changeset: 34:fea3ac5810e0
1335 o changeset: 34:fea3ac5810e0
1337 | parent: 32:d06dffa21a31
1336 | parent: 32:d06dffa21a31
1338 | user: test
1337 | user: test
@@ -1342,7 +1341,7 b' File + limit + -ra:b, b < tip:'
1342
1341
1343 file(File) + limit + -ra:b, b < tip:
1342 file(File) + limit + -ra:b, b < tip:
1344
1343
1345 $ hg glog -l1 -r32:34 -r 'file("a")'
1344 $ hg log -G -l1 -r32:34 -r 'file("a")'
1346 o changeset: 34:fea3ac5810e0
1345 o changeset: 34:fea3ac5810e0
1347 | parent: 32:d06dffa21a31
1346 | parent: 32:d06dffa21a31
1348 | user: test
1347 | user: test
@@ -1352,7 +1351,7 b' file(File) + limit + -ra:b, b < tip:'
1352
1351
1353 limit(file(File) and a::b), b < tip:
1352 limit(file(File) and a::b), b < tip:
1354
1353
1355 $ hg glog -r 'limit(file("a") and 32::34, 1)'
1354 $ hg log -G -r 'limit(file("a") and 32::34, 1)'
1356 o changeset: 32:d06dffa21a31
1355 o changeset: 32:d06dffa21a31
1357 |\ parent: 27:886ed638191b
1356 |\ parent: 27:886ed638191b
1358 | | parent: 31:621d83e11f67
1357 | | parent: 31:621d83e11f67
@@ -1363,11 +1362,11 b' limit(file(File) and a::b), b < tip:'
1363
1362
1364 File + limit + -ra:b, b < tip:
1363 File + limit + -ra:b, b < tip:
1365
1364
1366 $ hg glog -r 'limit(file("a") and 34::32, 1)'
1365 $ hg log -G -r 'limit(file("a") and 34::32, 1)'
1367
1366
1368 File + limit + -ra:b, b < tip, (b - a) < limit:
1367 File + limit + -ra:b, b < tip, (b - a) < limit:
1369
1368
1370 $ hg glog -l10 -r33:34 a
1369 $ hg log -G -l10 -r33:34 a
1371 o changeset: 34:fea3ac5810e0
1370 o changeset: 34:fea3ac5810e0
1372 | parent: 32:d06dffa21a31
1371 | parent: 32:d06dffa21a31
1373 | user: test
1372 | user: test
@@ -1387,7 +1386,7 b' Do not crash or produce strange graphs i'
1387 marked working directory as branch branch
1386 marked working directory as branch branch
1388 (branches are permanent and global, did you want a bookmark?)
1387 (branches are permanent and global, did you want a bookmark?)
1389 $ commit 36 "buggy merge: identical parents" 35 35
1388 $ commit 36 "buggy merge: identical parents" 35 35
1390 $ hg glog -l5
1389 $ hg log -G -l5
1391 @ changeset: 36:08a19a744424
1390 @ changeset: 36:08a19a744424
1392 | branch: branch
1391 | branch: branch
1393 | tag: tip
1392 | tag: tip
@@ -1561,7 +1560,7 b' have 2 filelog topological heads in a li'
1561 $ hg ci -m "mv a b; add d"
1560 $ hg ci -m "mv a b; add d"
1562 $ hg mv dir/b e
1561 $ hg mv dir/b e
1563 $ hg ci -m "mv dir/b e"
1562 $ hg ci -m "mv dir/b e"
1564 $ hg glog --template '({rev}) {desc|firstline}\n'
1563 $ hg log -G --template '({rev}) {desc|firstline}\n'
1565 @ (4) mv dir/b e
1564 @ (4) mv dir/b e
1566 |
1565 |
1567 o (3) mv a b; add d
1566 o (3) mv a b; add d
@@ -2058,7 +2057,7 b' Test --hidden'
2058 $ testlog --hidden
2057 $ testlog --hidden
2059 []
2058 []
2060 []
2059 []
2061 $ hg glog --template '{rev} {desc}\n'
2060 $ hg log -G --template '{rev} {desc}\n'
2062 o 7 Added tag foo-bar for changeset fc281d8ff18d
2061 o 7 Added tag foo-bar for changeset fc281d8ff18d
2063 |
2062 |
2064 o 6 merge 5 and 4
2063 o 6 merge 5 and 4
@@ -2078,7 +2077,7 b' Test --hidden'
2078
2077
2079 A template without trailing newline should do something sane
2078 A template without trailing newline should do something sane
2080
2079
2081 $ hg glog -r ::2 --template '{rev} {desc}'
2080 $ hg log -G -r ::2 --template '{rev} {desc}'
2082 o 2 mv b dir/b
2081 o 2 mv b dir/b
2083 |
2082 |
2084 o 1 copy a b
2083 o 1 copy a b
@@ -2088,7 +2087,7 b' A template without trailing newline shou'
2088
2087
2089 Extra newlines must be preserved
2088 Extra newlines must be preserved
2090
2089
2091 $ hg glog -r ::2 --template '\n{rev} {desc}\n\n'
2090 $ hg log -G -r ::2 --template '\n{rev} {desc}\n\n'
2092 o
2091 o
2093 | 2 mv b dir/b
2092 | 2 mv b dir/b
2094 |
2093 |
@@ -2101,7 +2100,7 b' Extra newlines must be preserved'
2101
2100
2102 The almost-empty template should do something sane too ...
2101 The almost-empty template should do something sane too ...
2103
2102
2104 $ hg glog -r ::2 --template '\n'
2103 $ hg log -G -r ::2 --template '\n'
2105 o
2104 o
2106 |
2105 |
2107 o
2106 o
@@ -2111,12 +2110,12 b' The almost-empty template should do some'
2111
2110
2112 issue3772
2111 issue3772
2113
2112
2114 $ hg glog -r :null
2113 $ hg log -G -r :null
2115 o changeset: -1:000000000000
2114 o changeset: -1:000000000000
2116 user:
2115 user:
2117 date: Thu Jan 01 00:00:00 1970 +0000
2116 date: Thu Jan 01 00:00:00 1970 +0000
2118
2117
2119 $ hg glog -r null:null
2118 $ hg log -G -r null:null
2120 o changeset: -1:000000000000
2119 o changeset: -1:000000000000
2121 user:
2120 user:
2122 date: Thu Jan 01 00:00:00 1970 +0000
2121 date: Thu Jan 01 00:00:00 1970 +0000
@@ -25,7 +25,7 b' Create a repo with some stuff in it:'
25 $ hg phase --public 3
25 $ hg phase --public 3
26 $ hg phase --force --secret 6
26 $ hg phase --force --secret 6
27
27
28 $ hg --config extensions.graphlog= log -G --template '{author}@{rev}.{phase}: {desc}\n'
28 $ hg log -G --template '{author}@{rev}.{phase}: {desc}\n'
29 @ test@6.secret: 6
29 @ test@6.secret: 6
30 |\
30 |\
31 | o test@5.draft: 5
31 | o test@5.draft: 5
@@ -249,7 +249,7 b' Compare with original:'
249
249
250 View graph:
250 View graph:
251
251
252 $ hg --config extensions.graphlog= log -G --template '{author}@{rev}.{phase}: {desc}\n'
252 $ hg log -G --template '{author}@{rev}.{phase}: {desc}\n'
253 @ test@11.draft: 3
253 @ test@11.draft: 3
254 |
254 |
255 o test@10.draft: 4
255 o test@10.draft: 4
@@ -2,7 +2,6 b''
2
2
3 $ cat >> $HGRCPATH <<EOF
3 $ cat >> $HGRCPATH <<EOF
4 > [extensions]
4 > [extensions]
5 > graphlog=
6 > histedit=
5 > histedit=
7 > EOF
6 > EOF
8
7
@@ -2,7 +2,6 b''
2
2
3 $ cat >> $HGRCPATH <<EOF
3 $ cat >> $HGRCPATH <<EOF
4 > [extensions]
4 > [extensions]
5 > graphlog=
6 > histedit=
5 > histedit=
7 > EOF
6 > EOF
8
7
@@ -2,7 +2,6 b''
2
2
3 $ cat >> $HGRCPATH <<EOF
3 $ cat >> $HGRCPATH <<EOF
4 > [extensions]
4 > [extensions]
5 > graphlog=
6 > histedit=
5 > histedit=
7 > EOF
6 > EOF
8
7
@@ -2,7 +2,6 b''
2
2
3 $ cat >> $HGRCPATH <<EOF
3 $ cat >> $HGRCPATH <<EOF
4 > [extensions]
4 > [extensions]
5 > graphlog=
6 > histedit=
5 > histedit=
7 > EOF
6 > EOF
8
7
@@ -2,7 +2,6 b''
2
2
3 $ cat >> $HGRCPATH <<EOF
3 $ cat >> $HGRCPATH <<EOF
4 > [extensions]
4 > [extensions]
5 > graphlog=
6 > histedit=
5 > histedit=
7 > EOF
6 > EOF
8
7
@@ -14,7 +14,6 b' Initialization'
14 > [alias]
14 > [alias]
15 > logt = log --template '{rev}:{node|short} {desc|firstline}\n'
15 > logt = log --template '{rev}:{node|short} {desc|firstline}\n'
16 > [extensions]
16 > [extensions]
17 > graphlog=
18 > histedit=
17 > histedit=
19 > EOF
18 > EOF
20
19
@@ -5,7 +5,6 b' editing a changeset without any actual c'
5
5
6 $ cat >> $HGRCPATH <<EOF
6 $ cat >> $HGRCPATH <<EOF
7 > [extensions]
7 > [extensions]
8 > graphlog=
9 > histedit=
8 > histedit=
10 > EOF
9 > EOF
11
10
@@ -64,7 +63,7 b' editing a changeset without any actual c'
64 > {
63 > {
65 > comment="${1:-log}"
64 > comment="${1:-log}"
66 > echo % "${comment}"
65 > echo % "${comment}"
67 > hg glog --template '{rev} {node} \"{desc|firstline}\"\n'
66 > hg log -G --template '{rev} {node} \"{desc|firstline}\"\n'
68 > }
67 > }
69
68
70
69
@@ -2,7 +2,6 b''
2
2
3 $ cat >> $HGRCPATH <<EOF
3 $ cat >> $HGRCPATH <<EOF
4 > [extensions]
4 > [extensions]
5 > graphlog=
6 > histedit=
5 > histedit=
7 > EOF
6 > EOF
8
7
@@ -2,7 +2,6 b''
2
2
3 $ cat >> $HGRCPATH <<EOF
3 $ cat >> $HGRCPATH <<EOF
4 > [extensions]
4 > [extensions]
5 > graphlog=
6 > histedit=
5 > histedit=
7 > EOF
6 > EOF
8
7
@@ -1,6 +1,5 b''
1 $ cat >> $HGRCPATH <<EOF
1 $ cat >> $HGRCPATH <<EOF
2 > [extensions]
2 > [extensions]
3 > graphlog=
4 > histedit=
3 > histedit=
5 > EOF
4 > EOF
6
5
@@ -1,9 +1,8 b''
1 $ echo "[extensions]" >> $HGRCPATH
1 $ echo "[extensions]" >> $HGRCPATH
2 $ echo "purge=" >> $HGRCPATH
2 $ echo "purge=" >> $HGRCPATH
3 $ echo "graphlog=" >> $HGRCPATH
4
3
5 $ shortlog() {
4 $ shortlog() {
6 > hg glog --template '{rev}:{node|short} {author} {date|hgdate} - {branch} - {desc|firstline}\n'
5 > hg log -G --template '{rev}:{node|short} {author} {date|hgdate} - {branch} - {desc|firstline}\n'
7 > }
6 > }
8
7
9 Test --bypass with other options
8 Test --bypass with other options
@@ -4,7 +4,6 b''
4 > [extensions]
4 > [extensions]
5 > largefiles =
5 > largefiles =
6 > share =
6 > share =
7 > graphlog =
8 > strip =
7 > strip =
9 > convert =
8 > convert =
10 > [largefiles]
9 > [largefiles]
@@ -134,7 +133,7 b' add some changesets to rename/remove/mer'
134 $ hg cat -r . sub/maybelarge.dat > stuff/maybelarge.dat
133 $ hg cat -r . sub/maybelarge.dat > stuff/maybelarge.dat
135 $ hg resolve -m stuff/maybelarge.dat
134 $ hg resolve -m stuff/maybelarge.dat
136 $ hg commit -m"merge"
135 $ hg commit -m"merge"
137 $ hg glog --template "{rev}:{node|short} {desc|firstline}\n"
136 $ hg log -G --template "{rev}:{node|short} {desc|firstline}\n"
138 @ 5:4884f215abda merge
137 @ 5:4884f215abda merge
139 |\
138 |\
140 | o 4:7285f817b77e remove large, normal3
139 | o 4:7285f817b77e remove large, normal3
@@ -154,7 +153,7 b' lfconvert with rename, merge, and remove'
154 $ hg lfconvert --size 0.2 bigfile-repo largefiles-repo
153 $ hg lfconvert --size 0.2 bigfile-repo largefiles-repo
155 initializing destination largefiles-repo
154 initializing destination largefiles-repo
156 $ cd largefiles-repo
155 $ cd largefiles-repo
157 $ hg glog --template "{rev}:{node|short} {desc|firstline}\n"
156 $ hg log -G --template "{rev}:{node|short} {desc|firstline}\n"
158 o 5:8e05f5f2b77e merge
157 o 5:8e05f5f2b77e merge
159 |\
158 |\
160 | o 4:a5a02de7a8e4 remove large, normal3
159 | o 4:a5a02de7a8e4 remove large, normal3
@@ -248,7 +247,7 b' round-trip: converting back to a normal '
248 # "hg remove" + "hg merge" + "hg commit".
247 # "hg remove" + "hg merge" + "hg commit".
249 # $ hg -R ../bigfile-repo debugdata -c 5
248 # $ hg -R ../bigfile-repo debugdata -c 5
250 # $ hg debugdata -c 5
249 # $ hg debugdata -c 5
251 $ hg glog --template "{rev}:{node|short} {desc|firstline}\n"
250 $ hg log -G --template "{rev}:{node|short} {desc|firstline}\n"
252 o 6:1635824e6f59 add anotherlarge (should be a largefile)
251 o 6:1635824e6f59 add anotherlarge (should be a largefile)
253 |
252 |
254 o 5:7215f8deeaaf merge
253 o 5:7215f8deeaaf merge
@@ -292,7 +291,7 b' from the working dir on a convert.'
292 1 merge
291 1 merge
293 0 add anotherlarge (should be a largefile)
292 0 add anotherlarge (should be a largefile)
294
293
295 $ hg -R largefiles-repo-hg glog --template "{rev}:{node|short} {desc|firstline}\n"
294 $ hg -R largefiles-repo-hg log -G --template "{rev}:{node|short} {desc|firstline}\n"
296 o 6:17126745edfd add anotherlarge (should be a largefile)
295 o 6:17126745edfd add anotherlarge (should be a largefile)
297 |
296 |
298 o 5:9cc5aa7204f0 merge
297 o 5:9cc5aa7204f0 merge
@@ -1,6 +1,5 b''
1 $ echo "[extensions]" >> $HGRCPATH
1 $ echo "[extensions]" >> $HGRCPATH
2 $ echo "mq=" >> $HGRCPATH
2 $ echo "mq=" >> $HGRCPATH
3 $ echo "graphlog=" >> $HGRCPATH
4
3
5 make a test repository that looks like this:
4 make a test repository that looks like this:
6
5
@@ -1,6 +1,5 b''
1 $ echo '[extensions]' >> $HGRCPATH
1 $ echo '[extensions]' >> $HGRCPATH
2 $ echo 'hgext.mq =' >> $HGRCPATH
2 $ echo 'hgext.mq =' >> $HGRCPATH
3 $ echo 'hgext.graphlog =' >> $HGRCPATH
4
3
5 $ hg init repo
4 $ hg init repo
6 $ cd repo
5 $ cd repo
@@ -10,9 +10,8 b' Check that obsolete properly strip heads'
10 > [ui]
10 > [ui]
11 > logtemplate='{node|short} ({phase}) {desc|firstline}\n'
11 > logtemplate='{node|short} ({phase}) {desc|firstline}\n'
12 > [extensions]
12 > [extensions]
13 > graphlog=
13 > obs=${TESTTMP}/obs.py
14 > EOF
14 > EOF
15 $ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH
16 $ mkcommit() {
15 $ mkcommit() {
17 > echo "$1" > "$1"
16 > echo "$1" > "$1"
18 > hg add "$1"
17 > hg add "$1"
@@ -52,7 +51,7 b' setup'
52 $ mkcommit new
51 $ mkcommit new
53 created new head
52 created new head
54 $ hg debugobsolete --flags 1 `getid old` `getid new`
53 $ hg debugobsolete --flags 1 `getid old` `getid new`
55 $ hg glog --hidden
54 $ hg log -G --hidden
56 @ 71e3228bffe1 (draft) add new
55 @ 71e3228bffe1 (draft) add new
57 |
56 |
58 | x c70b08862e08 (draft) add old
57 | x c70b08862e08 (draft) add old
@@ -84,7 +83,7 b' setup'
84 pulling from $TESTTMP/remote (glob)
83 pulling from $TESTTMP/remote (glob)
85 searching for changes
84 searching for changes
86 no changes found
85 no changes found
87 $ hg glog --hidden
86 $ hg log -G --hidden
88 @ 71e3228bffe1 (draft) add new
87 @ 71e3228bffe1 (draft) add new
89 |
88 |
90 | o c70b08862e08 (public) add old
89 | o c70b08862e08 (public) add old
@@ -112,7 +111,7 b' TODO: Not implemented yet.'
112 # $ cp -r ../backup1 ../remote
111 # $ cp -r ../backup1 ../remote
113 # $ hg -R ../remote phase --public c70b08862e08
112 # $ hg -R ../remote phase --public c70b08862e08
114 # $ hg phase --draft --force c70b08862e08
113 # $ hg phase --draft --force c70b08862e08
115 # $ hg glog --hidden
114 # $ hg log -G --hidden
116 # @ 71e3228bffe1 (draft) add new
115 # @ 71e3228bffe1 (draft) add new
117 # |
116 # |
118 # | x c70b08862e08 (draft) add old
117 # | x c70b08862e08 (draft) add old
@@ -141,7 +140,7 b' setup'
141 $ hg up -q '.^'
140 $ hg up -q '.^'
142 $ mkcommit other
141 $ mkcommit other
143 created new head
142 created new head
144 $ hg glog --hidden
143 $ hg log -G --hidden
145 @ d7d41ccbd4de (draft) add other
144 @ d7d41ccbd4de (draft) add other
146 |
145 |
147 | o 71e3228bffe1 (draft) add new
146 | o 71e3228bffe1 (draft) add new
@@ -193,7 +192,7 b' setup. (The obsolete marker is known loc'
193 $ mkcommit desc2
192 $ mkcommit desc2
194 created new head
193 created new head
195 $ hg debugobsolete `getid old` `getid new`
194 $ hg debugobsolete `getid old` `getid new`
196 $ hg glog --hidden
195 $ hg log -G --hidden
197 @ 5fe37041cc2b (draft) add desc2
196 @ 5fe37041cc2b (draft) add desc2
198 |
197 |
199 | o a3ef1d111c5f (draft) add desc1
198 | o a3ef1d111c5f (draft) add desc1
@@ -204,7 +203,7 b' setup. (The obsolete marker is known loc'
204 |/
203 |/
205 o b4952fcf48cf (public) add base
204 o b4952fcf48cf (public) add base
206
205
207 $ hg glog --hidden -R ../remote
206 $ hg log -G --hidden -R ../remote
208 o 71e3228bffe1 (draft) add new
207 o 71e3228bffe1 (draft) add new
209 |
208 |
210 | o c70b08862e08 (draft) add old
209 | o c70b08862e08 (draft) add old
@@ -248,12 +247,12 b' setup'
248 $ hg id --debug -r tip
247 $ hg id --debug -r tip
249 71e3228bffe1886550777233d6c97bb5a6b2a650 tip
248 71e3228bffe1886550777233d6c97bb5a6b2a650 tip
250 $ hg debugobsolete c70b08862e0838ea6d7c59c85da2f1ed6c8d67da 71e3228bffe1886550777233d6c97bb5a6b2a650
249 $ hg debugobsolete c70b08862e0838ea6d7c59c85da2f1ed6c8d67da 71e3228bffe1886550777233d6c97bb5a6b2a650
251 $ hg glog --hidden
250 $ hg log -G --hidden
252 @ 71e3228bffe1 (draft) add new
251 @ 71e3228bffe1 (draft) add new
253 |
252 |
254 o b4952fcf48cf (public) add base
253 o b4952fcf48cf (public) add base
255
254
256 $ hg glog --hidden -R ../remote
255 $ hg log -G --hidden -R ../remote
257 o c70b08862e08 (draft) add old
256 o c70b08862e08 (draft) add old
258 |
257 |
259 @ b4952fcf48cf (public) add base
258 @ b4952fcf48cf (public) add base
@@ -1,6 +1,4 b''
1 $ cat >> $HGRCPATH << EOF
1 $ cat >> $HGRCPATH << EOF
2 > [extensions]
3 > graphlog=
4 > [phases]
2 > [phases]
5 > # public changeset are not obsolete
3 > # public changeset are not obsolete
6 > publish=false
4 > publish=false
@@ -120,7 +118,7 b' Refuse pathological nullid successors'
120
118
121 Check that graphlog detect that a changeset is obsolete:
119 Check that graphlog detect that a changeset is obsolete:
122
120
123 $ hg glog
121 $ hg log -G
124 @ changeset: 5:5601fb93a350
122 @ changeset: 5:5601fb93a350
125 | tag: tip
123 | tag: tip
126 | parent: 1:7c3bad9141dc
124 | parent: 1:7c3bad9141dc
@@ -217,7 +215,7 b' check that various commands work well wi'
217 Check that public changeset are not accounted as obsolete:
215 Check that public changeset are not accounted as obsolete:
218
216
219 $ hg --hidden phase --public 2
217 $ hg --hidden phase --public 2
220 $ hg --config 'extensions.graphlog=' glog
218 $ hg log -G
221 @ changeset: 5:5601fb93a350
219 @ changeset: 5:5601fb93a350
222 | tag: tip
220 | tag: tip
223 | parent: 1:7c3bad9141dc
221 | parent: 1:7c3bad9141dc
@@ -514,7 +512,7 b' detect outgoing obsolete and unstable'
514 ---------------------------------------
512 ---------------------------------------
515
513
516
514
517 $ hg glog
515 $ hg log -G
518 o changeset: 3:6f9641995072
516 o changeset: 3:6f9641995072
519 | tag: tip
517 | tag: tip
520 | parent: 1:7c3bad9141dc
518 | parent: 1:7c3bad9141dc
@@ -548,7 +546,7 b' detect outgoing obsolete and unstable'
548 date: Thu Jan 01 00:00:00 1970 +0000
546 date: Thu Jan 01 00:00:00 1970 +0000
549 summary: add original_d
547 summary: add original_d
550
548
551 $ hg glog -r '::unstable()'
549 $ hg log -G -r '::unstable()'
552 @ changeset: 5:cda648ca50f5
550 @ changeset: 5:cda648ca50f5
553 | tag: tip
551 | tag: tip
554 | user: test
552 | user: test
@@ -653,7 +651,7 b' no warning displayed'
653
651
654 Do not warn about new head when the new head is a successors of a remote one
652 Do not warn about new head when the new head is a successors of a remote one
655
653
656 $ hg glog
654 $ hg log -G
657 @ changeset: 5:cda648ca50f5
655 @ changeset: 5:cda648ca50f5
658 | tag: tip
656 | tag: tip
659 | user: test
657 | user: test
@@ -2127,7 +2127,7 b' test outgoing:'
2127 $ hg ci -md -d '4 0'
2127 $ hg ci -md -d '4 0'
2128 $ echo d >> d
2128 $ echo d >> d
2129 $ hg ci -mdd -d '5 0'
2129 $ hg ci -mdd -d '5 0'
2130 $ hg --config extensions.graphlog= glog --template "{rev}:{node|short} {desc|firstline}\n"
2130 $ hg log -G --template "{rev}:{node|short} {desc|firstline}\n"
2131 @ 10:3b6f1ec9dde9 dd
2131 @ 10:3b6f1ec9dde9 dd
2132 |
2132 |
2133 o 9:2f9fa9b998c5 d
2133 o 9:2f9fa9b998c5 d
@@ -1,9 +1,5 b''
1 $ "$TESTDIR/hghave" killdaemons || exit 80
1 $ "$TESTDIR/hghave" killdaemons || exit 80
2
2
3 $ cat >> $HGRCPATH <<EOF
4 > [extensions]
5 > graphlog=
6 > EOF
7 $ hgph() { hg log -G --template "{rev} {phase} {desc} - {node|short}\n" $*; }
3 $ hgph() { hg log -G --template "{rev} {phase} {desc} - {node|short}\n" $*; }
8
4
9 $ mkcommit() {
5 $ mkcommit() {
@@ -399,7 +395,7 b' Push back to alpha'
399
395
400 initial setup
396 initial setup
401
397
402 $ hg glog # of alpha
398 $ hg log -G # of alpha
403 o changeset: 6:145e75495359
399 o changeset: 6:145e75495359
404 | tag: tip
400 | tag: tip
405 | user: test
401 | user: test
@@ -378,10 +378,6 b' Test phase command'
378
378
379 initial picture
379 initial picture
380
380
381 $ cat >> $HGRCPATH << EOF
382 > [extensions]
383 > hgext.graphlog=
384 > EOF
385 $ hg log -G --template "{rev} {phase} {desc}\n"
381 $ hg log -G --template "{rev} {phase} {desc}\n"
386 @ 7 secret merge B' and E
382 @ 7 secret merge B' and E
387 |\
383 |\
@@ -1,6 +1,3 b''
1 $ echo "[extensions]" >> $HGRCPATH
2 $ echo "graphlog=" >> $HGRCPATH
3
4 $ hg init a
1 $ hg init a
5 $ cd a
2 $ cd a
6 $ echo foo > t1
3 $ echo foo > t1
@@ -532,7 +529,7 b' A, not B'
532
529
533 glog of local:
530 glog of local:
534
531
535 $ hg glog --template "{rev}: {branches} {desc}\n"
532 $ hg log -G --template "{rev}: {branches} {desc}\n"
536 @ 2: A a2
533 @ 2: A a2
537 |
534 |
538 | o 1: B b
535 | o 1: B b
@@ -541,7 +538,7 b' glog of local:'
541
538
542 glog of remote:
539 glog of remote:
543
540
544 $ hg glog -R inner --template "{rev}: {branches} {desc}\n"
541 $ hg log -G -R inner --template "{rev}: {branches} {desc}\n"
545 @ 2: B b1
542 @ 2: B b1
546 |
543 |
547 o 1: B b
544 o 1: B b
@@ -615,7 +612,7 b' it replaces a former topological and bra'
615
612
616 glog of local:
613 glog of local:
617
614
618 $ hg glog --template "{rev}: {branches} {desc}\n"
615 $ hg log -G --template "{rev}: {branches} {desc}\n"
619 @ 3: A a2
616 @ 3: A a2
620 |
617 |
621 o 2: A a1
618 o 2: A a1
@@ -626,7 +623,7 b' glog of local:'
626
623
627 glog of remote:
624 glog of remote:
628
625
629 $ hg glog -R inner --template "{rev}: {branches} {desc}\n"
626 $ hg log -G -R inner --template "{rev}: {branches} {desc}\n"
630 @ 3: B b1
627 @ 3: B b1
631 |
628 |
632 | o 2: A a1
629 | o 2: A a1
@@ -700,7 +697,7 b' but child is on different branch:'
700
697
701 glog of local:
698 glog of local:
702
699
703 $ hg glog --template "{rev}: {branches} {desc}\n"
700 $ hg log -G --template "{rev}: {branches} {desc}\n"
704 @ 5: A b3
701 @ 5: A b3
705 |
702 |
706 | o 4: B a3
703 | o 4: B a3
@@ -715,7 +712,7 b' glog of local:'
715
712
716 glog of remote:
713 glog of remote:
717
714
718 $ hg glog -R inner --template "{rev}: {branches} {desc}\n"
715 $ hg log -G -R inner --template "{rev}: {branches} {desc}\n"
719 @ 3: B b1
716 @ 3: B b1
720 |
717 |
721 o 2: B b0
718 o 2: B b0
@@ -1,6 +1,5 b''
1 $ cat >> $HGRCPATH <<EOF
1 $ cat >> $HGRCPATH <<EOF
2 > [extensions]
2 > [extensions]
3 > graphlog=
4 > rebase=
3 > rebase=
5 >
4 >
6 > [phases]
5 > [phases]
@@ -1,6 +1,5 b''
1 $ cat >> $HGRCPATH <<EOF
1 $ cat >> $HGRCPATH <<EOF
2 > [extensions]
2 > [extensions]
3 > graphlog=
4 > rebase=
3 > rebase=
5 >
4 >
6 > [phases]
5 > [phases]
@@ -1,6 +1,5 b''
1 $ cat >> $HGRCPATH <<EOF
1 $ cat >> $HGRCPATH <<EOF
2 > [extensions]
2 > [extensions]
3 > graphlog=
4 > rebase=
3 > rebase=
5 > mq=
4 > mq=
6 >
5 >
@@ -1,6 +1,5 b''
1 $ cat >> $HGRCPATH <<EOF
1 $ cat >> $HGRCPATH <<EOF
2 > [extensions]
2 > [extensions]
3 > graphlog=
4 > rebase=
3 > rebase=
5 >
4 >
6 > [phases]
5 > [phases]
@@ -1,6 +1,5 b''
1 $ cat >> $HGRCPATH <<EOF
1 $ cat >> $HGRCPATH <<EOF
2 > [extensions]
2 > [extensions]
3 > graphlog=
4 > rebase=
3 > rebase=
5 > mq=
4 > mq=
6 >
5 >
@@ -1,6 +1,5 b''
1 $ cat >> $HGRCPATH <<EOF
1 $ cat >> $HGRCPATH <<EOF
2 > [extensions]
2 > [extensions]
3 > graphlog=
4 > rebase=
3 > rebase=
5 >
4 >
6 > [phases]
5 > [phases]
@@ -1,6 +1,5 b''
1 $ cat >> $HGRCPATH <<EOF
1 $ cat >> $HGRCPATH <<EOF
2 > [extensions]
2 > [extensions]
3 > graphlog=
4 > rebase=
3 > rebase=
5 >
4 >
6 > [phases]
5 > [phases]
@@ -1,6 +1,5 b''
1 $ cat >> $HGRCPATH <<EOF
1 $ cat >> $HGRCPATH <<EOF
2 > [extensions]
2 > [extensions]
3 > graphlog=
4 > rebase=
3 > rebase=
5 >
4 >
6 > [phases]
5 > [phases]
@@ -1,6 +1,5 b''
1 $ cat >> $HGRCPATH <<EOF
1 $ cat >> $HGRCPATH <<EOF
2 > [extensions]
2 > [extensions]
3 > graphlog=
4 > rebase=
3 > rebase=
5 >
4 >
6 > [phases]
5 > [phases]
@@ -3,7 +3,6 b' already has one local mq patch'
3
3
4 $ cat >> $HGRCPATH <<EOF
4 $ cat >> $HGRCPATH <<EOF
5 > [extensions]
5 > [extensions]
6 > graphlog=
7 > rebase=
6 > rebase=
8 > mq=
7 > mq=
9 >
8 >
@@ -1,6 +1,5 b''
1 $ cat >> $HGRCPATH <<EOF
1 $ cat >> $HGRCPATH <<EOF
2 > [extensions]
2 > [extensions]
3 > graphlog=
4 > rebase=
3 > rebase=
5 > mq=
4 > mq=
6 >
5 >
@@ -1,6 +1,5 b''
1 $ cat >> $HGRCPATH <<EOF
1 $ cat >> $HGRCPATH <<EOF
2 > [extensions]
2 > [extensions]
3 > graphlog=
4 > rebase=
3 > rebase=
5 >
4 >
6 > [phases]
5 > [phases]
@@ -1,6 +1,5 b''
1 $ cat >> $HGRCPATH <<EOF
1 $ cat >> $HGRCPATH <<EOF
2 > [extensions]
2 > [extensions]
3 > graphlog=
4 > rebase=
3 > rebase=
5 >
4 >
6 > [alias]
5 > [alias]
@@ -1,6 +1,5 b''
1 $ cat >> $HGRCPATH <<EOF
1 $ cat >> $HGRCPATH <<EOF
2 > [extensions]
2 > [extensions]
3 > graphlog=
4 > rebase=
3 > rebase=
5 >
4 >
6 > [phases]
5 > [phases]
@@ -1,6 +1,5 b''
1 $ cat >> $HGRCPATH <<EOF
1 $ cat >> $HGRCPATH <<EOF
2 > [extensions]
2 > [extensions]
3 > graphlog=
4 > rebase=
3 > rebase=
5 >
4 >
6 > [alias]
5 > [alias]
@@ -1,6 +1,5 b''
1 $ cat >> $HGRCPATH <<EOF
1 $ cat >> $HGRCPATH <<EOF
2 > [extensions]
2 > [extensions]
3 > graphlog=
4 > rebase=
3 > rebase=
5 >
4 >
6 > [alias]
5 > [alias]
@@ -1,6 +1,5 b''
1 $ cat >> $HGRCPATH <<EOF
1 $ cat >> $HGRCPATH <<EOF
2 > [extensions]
2 > [extensions]
3 > graphlog=
4 > rebase=
3 > rebase=
5 >
4 >
6 > [phases]
5 > [phases]
@@ -1,7 +1,4 b''
1 $ cat >> $HGRCPATH <<EOF
1 $ cat >> $HGRCPATH <<EOF
2 > [extensions]
3 > graphlog=
4 >
5 > [alias]
2 > [alias]
6 > tlog = log --template "{rev}:{node|short}: '{desc}' {branches}\n"
3 > tlog = log --template "{rev}:{node|short}: '{desc}' {branches}\n"
7 > tglog = tlog -G
4 > tglog = tlog -G
@@ -1,7 +1,7 b''
1 test stripping of filelogs where the linkrev doesn't always increase
1 test stripping of filelogs where the linkrev doesn't always increase
2
2
3 $ echo '[extensions]' >> $HGRCPATH
3 $ echo '[extensions]' >> $HGRCPATH
4 $ echo 'hgext.strip =' >> $HGRCPATH
4 $ echo 'strip =' >> $HGRCPATH
5 $ hg init orig
5 $ hg init orig
6 $ cd orig
6 $ cd orig
7 $ commit()
7 $ commit()
@@ -1,6 +1,5 b''
1 $ echo "[extensions]" >> $HGRCPATH
1 $ echo "[extensions]" >> $HGRCPATH
2 $ echo "strip=" >> $HGRCPATH
2 $ echo "strip=" >> $HGRCPATH
3 $ echo "graphlog=" >> $HGRCPATH
4
3
5 $ restore() {
4 $ restore() {
6 > hg unbundle -q .hg/strip-backup/*
5 > hg unbundle -q .hg/strip-backup/*
@@ -226,7 +225,7 b' after strip of merge parent'
226
225
227 $ hg up
226 $ hg up
228 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
227 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
229 $ hg glog
228 $ hg log -G
230 @ changeset: 4:264128213d29
229 @ changeset: 4:264128213d29
231 | tag: tip
230 | tag: tip
232 | parent: 1:ef3a871183d7
231 | parent: 1:ef3a871183d7
@@ -259,7 +258,7 b' 2 is parent of 3, only one strip should '
259
258
260 $ hg strip "roots(2)" 3
259 $ hg strip "roots(2)" 3
261 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
260 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
262 $ hg glog
261 $ hg log -G
263 @ changeset: 2:264128213d29
262 @ changeset: 2:264128213d29
264 | tag: tip
263 | tag: tip
265 | user: test
264 | user: test
@@ -277,7 +276,7 b' 2 is parent of 3, only one strip should '
277 summary: a
276 summary: a
278
277
279 $ restore
278 $ restore
280 $ hg glog
279 $ hg log -G
281 o changeset: 4:443431ffac4f
280 o changeset: 4:443431ffac4f
282 | tag: tip
281 | tag: tip
283 | user: test
282 | user: test
@@ -311,7 +310,7 b' 2 different branches: 2 strips'
311 $ hg strip 2 4
310 $ hg strip 2 4
312 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
311 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
313 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
312 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
314 $ hg glog
313 $ hg log -G
315 o changeset: 2:65bd5f99a4a3
314 o changeset: 2:65bd5f99a4a3
316 | tag: tip
315 | tag: tip
317 | user: test
316 | user: test
@@ -5,8 +5,6 b' Tests discovery against servers without '
5 $ cat >> $HGRCPATH <<EOF
5 $ cat >> $HGRCPATH <<EOF
6 > [ui]
6 > [ui]
7 > logtemplate="{rev} {node|short}: {desc} {branches}\n"
7 > logtemplate="{rev} {node|short}: {desc} {branches}\n"
8 > [extensions]
9 > graphlog=
10 > EOF
8 > EOF
11 $ cp $HGRCPATH $HGRCPATH-withcap
9 $ cp $HGRCPATH $HGRCPATH-withcap
12
10
@@ -66,7 +64,7 b' Base repo:'
66 $ hg init main
64 $ hg init main
67 $ cd main
65 $ cd main
68 $ hg debugbuilddag -mo '+2:tbase @name1 +3:thead1 <tbase @name2 +4:thead2 @both /thead1 +2:tmaintip'
66 $ hg debugbuilddag -mo '+2:tbase @name1 +3:thead1 <tbase @name2 +4:thead2 @both /thead1 +2:tmaintip'
69 $ hg glog
67 $ hg log -G
70 o 11 a19bfa7e7328: r11 both
68 o 11 a19bfa7e7328: r11 both
71 |
69 |
72 o 10 8b6bad1512e1: r10 both
70 o 10 8b6bad1512e1: r10 both
@@ -7,8 +7,6 b' Tests discovery against servers without '
7 $ cat >> $HGRCPATH <<EOF
7 $ cat >> $HGRCPATH <<EOF
8 > [ui]
8 > [ui]
9 > logtemplate="{rev} {node|short}: {desc} {branches}\n"
9 > logtemplate="{rev} {node|short}: {desc} {branches}\n"
10 > [extensions]
11 > graphlog=
12 > EOF
10 > EOF
13
11
14 Setup HTTP server control:
12 Setup HTTP server control:
@@ -53,7 +51,7 b' Base repo:'
53 $ hg init main
51 $ hg init main
54 $ cd main
52 $ cd main
55 $ hg debugbuilddag -mo '+2:tbase @name1 +3:thead1 <tbase @name2 +4:thead2 @both /thead1 +2:tmaintip'
53 $ hg debugbuilddag -mo '+2:tbase @name1 +3:thead1 <tbase @name2 +4:thead2 @both /thead1 +2:tmaintip'
56 $ hg glog
54 $ hg log -G
57 o 11 a19bfa7e7328: r11 both
55 o 11 a19bfa7e7328: r11 both
58 |
56 |
59 o 10 8b6bad1512e1: r10 both
57 o 10 8b6bad1512e1: r10 both
@@ -34,8 +34,7 b''
34
34
35 Initial repo state:
35 Initial repo state:
36
36
37 $ hg --config 'extensions.graphlog=' \
37 $ hg log -G --template '{rev}:{node|short} {parents} {branches}\n'
38 > glog --template '{rev}:{node|short} {parents} {branches}\n'
39 @ 5:ff252e8273df b1
38 @ 5:ff252e8273df b1
40 |
39 |
41 o 4:d047485b3896 0:60829823a42a b1
40 o 4:d047485b3896 0:60829823a42a b1
General Comments 0
You need to be logged in to leave comments. Login now