Show More
@@ -9,7 +9,7 b" echo 'hgext.graphlog = ' >> $HGRCPATH" | |||||
9 |
|
9 | |||
10 | glog() |
|
10 | glog() | |
11 | { |
|
11 | { | |
12 |
hg glog --template ' |
|
12 | hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@" | |
13 | } |
|
13 | } | |
14 |
|
14 | |||
15 | manifest() |
|
15 | manifest() |
@@ -2,7 +2,7 b'' | |||||
2 |
|
2 | |||
3 | heads() |
|
3 | heads() | |
4 | { |
|
4 | { | |
5 |
hg heads --template ' |
|
5 | hg heads --template '{rev}: {desc|firstline|strip}\n' "$@" | |
6 | } |
|
6 | } | |
7 |
|
7 | |||
8 | hg init a |
|
8 | hg init a |
@@ -115,13 +115,13 b' hg log --template \'<changeset author="{a' | |||||
115 |
|
115 | |||
116 | echo '# formatnode filter works' |
|
116 | echo '# formatnode filter works' | |
117 | echo '# quiet' |
|
117 | echo '# quiet' | |
118 |
hg -q log -r 0 --template ' |
|
118 | hg -q log -r 0 --template '{node|formatnode}\n' | |
119 | echo '# normal' |
|
119 | echo '# normal' | |
120 |
hg log -r 0 --template ' |
|
120 | hg log -r 0 --template '{node|formatnode}\n' | |
121 | echo '# verbose' |
|
121 | echo '# verbose' | |
122 |
hg -v log -r 0 --template ' |
|
122 | hg -v log -r 0 --template '{node|formatnode}\n' | |
123 | echo '# debug' |
|
123 | echo '# debug' | |
124 |
hg --debug log -r 0 --template ' |
|
124 | hg --debug log -r 0 --template '{node|formatnode}\n' | |
125 |
|
125 | |||
126 | echo '# error on syntax' |
|
126 | echo '# error on syntax' | |
127 | echo 'x = "f' >> t |
|
127 | echo 'x = "f' >> t |
@@ -73,7 +73,7 b' baz register-archive -d baz@mercurial--c' | |||||
73 |
|
73 | |||
74 | glog() |
|
74 | glog() | |
75 | { |
|
75 | { | |
76 |
hg glog --template ' |
|
76 | hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@" | |
77 | } |
|
77 | } | |
78 |
|
78 | |||
79 | echo % show graph log |
|
79 | echo % show graph log |
@@ -63,7 +63,7 b' echo % convert fresh repo with --filemap' | |||||
63 | echo include b/c > filemap |
|
63 | echo include b/c > filemap | |
64 | hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' |
|
64 | hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' | |
65 | hgcat b/c |
|
65 | hgcat b/c | |
66 |
hg -R src-filemap log --template ' |
|
66 | hg -R src-filemap log --template '{rev} {desc} files: {files}\n' | |
67 |
|
67 | |||
68 | echo % commit new file revisions |
|
68 | echo % commit new file revisions | |
69 | cd src |
|
69 | cd src | |
@@ -81,7 +81,7 b' hgcat b/c' | |||||
81 | echo % convert again with --filemap |
|
81 | echo % convert again with --filemap | |
82 | hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' |
|
82 | hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' | |
83 | hgcat b/c |
|
83 | hgcat b/c | |
84 |
hg -R src-filemap log --template ' |
|
84 | hg -R src-filemap log --template '{rev} {desc} files: {files}\n' | |
85 |
|
85 | |||
86 | echo % commit branch |
|
86 | echo % commit branch | |
87 | cd src |
|
87 | cd src | |
@@ -101,5 +101,5 b' hgcat b/c' | |||||
101 | echo % convert again with --filemap |
|
101 | echo % convert again with --filemap | |
102 | hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' |
|
102 | hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' | |
103 | hgcat b/c |
|
103 | hgcat b/c | |
104 |
hg -R src-filemap log --template ' |
|
104 | hg -R src-filemap log --template '{rev} {desc} files: {files}\n' | |
105 |
hg -R src-hg glog --template ' |
|
105 | hg -R src-hg glog --template '{rev} ({branches}) {desc} files: {files}\n' |
@@ -61,4 +61,4 b" hg convert src | sed -e 's/connecting to" | |||||
61 |
|
61 | |||
62 | echo % Check the result |
|
62 | echo % Check the result | |
63 |
|
63 | |||
64 |
hg -R src-hg glog --template ' |
|
64 | hg -R src-hg glog --template '{rev} ({branches}) {desc} files: {files}\n' |
@@ -62,7 +62,7 b' echo % convert fresh repo with --filemap' | |||||
62 | echo include b/c > filemap |
|
62 | echo include b/c > filemap | |
63 | hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' |
|
63 | hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' | |
64 | hgcat b/c |
|
64 | hgcat b/c | |
65 |
hg -R src-filemap log --template ' |
|
65 | hg -R src-filemap log --template '{rev} {desc} files: {files}\n' | |
66 |
|
66 | |||
67 | echo % commit new file revisions |
|
67 | echo % commit new file revisions | |
68 | cd src |
|
68 | cd src | |
@@ -80,7 +80,7 b' hgcat b/c' | |||||
80 | echo % convert again with --filemap |
|
80 | echo % convert again with --filemap | |
81 | hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' |
|
81 | hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' | |
82 | hgcat b/c |
|
82 | hgcat b/c | |
83 |
hg -R src-filemap log --template ' |
|
83 | hg -R src-filemap log --template '{rev} {desc} files: {files}\n' | |
84 |
|
84 | |||
85 | echo % commit branch |
|
85 | echo % commit branch | |
86 | cd src |
|
86 | cd src | |
@@ -100,7 +100,7 b' hgcat b/c' | |||||
100 | echo % convert again with --filemap |
|
100 | echo % convert again with --filemap | |
101 | hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' |
|
101 | hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' | |
102 | hgcat b/c |
|
102 | hgcat b/c | |
103 |
hg -R src-filemap log --template ' |
|
103 | hg -R src-filemap log --template '{rev} {desc} files: {files}\n' | |
104 |
|
104 | |||
105 | echo % commit a new revision with funny log message |
|
105 | echo % commit a new revision with funny log message | |
106 | cd src |
|
106 | cd src | |
@@ -116,7 +116,7 b' echo % convert again' | |||||
116 | hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' |
|
116 | hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' | |
117 |
|
117 | |||
118 | echo "graphlog = " >> $HGRCPATH |
|
118 | echo "graphlog = " >> $HGRCPATH | |
119 |
hg -R src-hg glog --template ' |
|
119 | hg -R src-hg glog --template '{rev} ({branches}) {desc} files: {files}\n' | |
120 |
|
120 | |||
121 | echo % testing debugcvsps |
|
121 | echo % testing debugcvsps | |
122 | cd src |
|
122 | cd src |
@@ -53,7 +53,7 b' cd ..' | |||||
53 |
|
53 | |||
54 | glog() |
|
54 | glog() | |
55 | { |
|
55 | { | |
56 |
hg glog --template ' |
|
56 | hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@" | |
57 | } |
|
57 | } | |
58 |
|
58 | |||
59 | hg convert darcs-repo darcs-repo-hg 2>&1 | grep -v hGetLine | grep -v '^$' |
|
59 | hg convert darcs-repo darcs-repo-hg 2>&1 | grep -v hGetLine | grep -v '^$' |
@@ -36,5 +36,5 b' cd ..' | |||||
36 | echo % convert with datesort |
|
36 | echo % convert with datesort | |
37 | hg convert --datesort t t2 |
|
37 | hg convert --datesort t t2 | |
38 | echo % graph converted repo |
|
38 | echo % graph converted repo | |
39 |
hg -R t2 glog --template ' |
|
39 | hg -R t2 glog --template '{rev} "{desc}"\n' | |
40 |
|
40 |
@@ -8,7 +8,7 b" echo 'hgext.convert =' >> $HGRCPATH" | |||||
8 |
|
8 | |||
9 | glog() |
|
9 | glog() | |
10 | { |
|
10 | { | |
11 |
hg glog --template ' |
|
11 | hg glog --template '{rev} "{desc}" files: {files}\n' "$@" | |
12 | } |
|
12 | } | |
13 |
|
13 | |||
14 | hg init source |
|
14 | hg init source |
@@ -101,7 +101,7 b' cd ..' | |||||
101 |
|
101 | |||
102 | glog() |
|
102 | glog() | |
103 | { |
|
103 | { | |
104 |
hg glog --template ' |
|
104 | hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@" | |
105 | } |
|
105 | } | |
106 |
|
106 | |||
107 | splitrepo() |
|
107 | splitrepo() |
@@ -6,7 +6,7 b" echo 'hgext.convert =' >> $HGRCPATH" | |||||
6 |
|
6 | |||
7 | glog() |
|
7 | glog() | |
8 | { |
|
8 | { | |
9 |
hg -R "$1" glog --template ' |
|
9 | hg -R "$1" glog --template '{rev} "{desc}" files: {files}\n' | |
10 | } |
|
10 | } | |
11 |
|
11 | |||
12 | hg init source |
|
12 | hg init source |
@@ -115,7 +115,7 b' hg convert -s mtn repo.mtn' | |||||
115 |
|
115 | |||
116 | glog() |
|
116 | glog() | |
117 | { |
|
117 | { | |
118 |
hg glog --template ' |
|
118 | hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@" | |
119 | } |
|
119 | } | |
120 |
|
120 | |||
121 | cd repo.mtn-hg |
|
121 | cd repo.mtn-hg |
@@ -49,7 +49,7 b' p4 submit -d "change b/c"' | |||||
49 |
|
49 | |||
50 | echo % convert |
|
50 | echo % convert | |
51 | hg convert -s p4 $DEPOTPATH dst |
|
51 | hg convert -s p4 $DEPOTPATH dst | |
52 |
hg -R dst log --template 'rev= |
|
52 | hg -R dst log --template 'rev={rev} desc="{desc}" tags="{tags}" files="{files}"\n' | |
53 |
|
53 | |||
54 | echo % change some files |
|
54 | echo % change some files | |
55 | p4 edit a b/c |
|
55 | p4 edit a b/c | |
@@ -59,7 +59,7 b' p4 submit -d "change a b/c"' | |||||
59 |
|
59 | |||
60 | echo % convert again |
|
60 | echo % convert again | |
61 | hg convert -s p4 $DEPOTPATH dst |
|
61 | hg convert -s p4 $DEPOTPATH dst | |
62 |
hg -R dst log --template 'rev= |
|
62 | hg -R dst log --template 'rev={rev} desc="{desc}" tags="{tags}" files="{files}"\n' | |
63 |
|
63 | |||
64 | echo % interesting names |
|
64 | echo % interesting names | |
65 | echo dddd > "d d" |
|
65 | echo dddd > "d d" | |
@@ -70,6 +70,6 b' p4 submit -d "add d e f"' | |||||
70 |
|
70 | |||
71 | echo % convert again |
|
71 | echo % convert again | |
72 | hg convert -s p4 $DEPOTPATH dst |
|
72 | hg convert -s p4 $DEPOTPATH dst | |
73 |
hg -R dst log --template 'rev= |
|
73 | hg -R dst log --template 'rev={rev} desc="{desc}" tags="{tags}" files="{files}"\n' | |
74 |
|
74 | |||
75 |
|
75 |
@@ -6,7 +6,7 b" echo 'hgext.graphlog =' >> $HGRCPATH" | |||||
6 |
|
6 | |||
7 | glog() |
|
7 | glog() | |
8 | { |
|
8 | { | |
9 |
hg glog --template ' |
|
9 | hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@" | |
10 | } |
|
10 | } | |
11 |
|
11 | |||
12 | hg init repo1 |
|
12 | hg init repo1 |
@@ -33,7 +33,7 b' echo % convert again' | |||||
33 | hg convert --branchmap=branchmap --datesort $svnurl A-hg |
|
33 | hg convert --branchmap=branchmap --datesort $svnurl A-hg | |
34 |
|
34 | |||
35 | cd A-hg |
|
35 | cd A-hg | |
36 |
hg glog --template 'branch= |
|
36 | hg glog --template 'branch={branches} {rev} {desc|firstline} files: {files}\n' | |
37 | hg branches | sed 's/:.*/:/' |
|
37 | hg branches | sed 's/:.*/:/' | |
38 | hg tags -q |
|
38 | hg tags -q | |
39 | cd .. |
|
39 | cd .. |
@@ -27,6 +27,6 b' echo % convert trunk and branches' | |||||
27 | hg convert --datesort $svnurl/subproject A-hg |
|
27 | hg convert --datesort $svnurl/subproject A-hg | |
28 |
|
28 | |||
29 | cd A-hg |
|
29 | cd A-hg | |
30 |
hg glog --template ' |
|
30 | hg glog --template '{rev} {desc|firstline} files: {files}\n' | |
31 | hg branches | sed 's/:.*/:/' |
|
31 | hg branches | sed 's/:.*/:/' | |
32 | cd .. |
|
32 | cd .. |
@@ -72,14 +72,14 b' echo % test incremental conversion' | |||||
72 | hg convert $svnurl B-hg |
|
72 | hg convert $svnurl B-hg | |
73 |
|
73 | |||
74 | cd B-hg |
|
74 | cd B-hg | |
75 |
hg glog --template ' |
|
75 | hg glog --template '{rev} {desc|firstline} files: {files}\n' | |
76 | hg tags -q |
|
76 | hg tags -q | |
77 | cd .. |
|
77 | cd .. | |
78 |
|
78 | |||
79 | echo % test filemap |
|
79 | echo % test filemap | |
80 | echo 'include letter2.txt' > filemap |
|
80 | echo 'include letter2.txt' > filemap | |
81 | hg convert --filemap filemap $svnurl/trunk fmap |
|
81 | hg convert --filemap filemap $svnurl/trunk fmap | |
82 |
hg glog -R fmap --template ' |
|
82 | hg glog -R fmap --template '{rev} {desc|firstline} files: {files}\n' | |
83 |
|
83 | |||
84 | echo % test stop revision |
|
84 | echo % test stop revision | |
85 | hg convert --rev 1 $svnurl/trunk stoprev |
|
85 | hg convert --rev 1 $svnurl/trunk stoprev |
@@ -32,7 +32,7 b' convert()' | |||||
32 | --config convert.svn.branches=" " \ |
|
32 | --config convert.svn.branches=" " \ | |
33 | --config convert.svn.tags= \ |
|
33 | --config convert.svn.tags= \ | |
34 | --datesort $svnurl $repopath |
|
34 | --datesort $svnurl $repopath | |
35 |
hg -R $repopath glog --template ' |
|
35 | hg -R $repopath glog --template '{rev} {desc|firstline} files: {files}\n' | |
36 | echo |
|
36 | echo | |
37 | } |
|
37 | } | |
38 |
|
38 |
@@ -27,7 +27,7 b' echo % convert' | |||||
27 | hg convert --datesort $svnurl A-hg |
|
27 | hg convert --datesort $svnurl A-hg | |
28 |
|
28 | |||
29 | cd A-hg |
|
29 | cd A-hg | |
30 |
hg glog --template ' |
|
30 | hg glog --template '{rev} {desc|firstline} tags: {tags}\n' | |
31 | hg tags | sed 's/:.*/:/' |
|
31 | hg tags | sed 's/:.*/:/' | |
32 | cd .. |
|
32 | cd .. | |
33 |
|
33 |
@@ -64,7 +64,7 b' tla register-archive -d tla@mercurial--c' | |||||
64 |
|
64 | |||
65 | glog() |
|
65 | glog() | |
66 | { |
|
66 | { | |
67 |
hg glog --template ' |
|
67 | hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@" | |
68 | } |
|
68 | } | |
69 |
|
69 | |||
70 | echo % show graph log |
|
70 | echo % show graph log |
@@ -20,7 +20,7 b' hg co' | |||||
20 | chmod +x a |
|
20 | chmod +x a | |
21 | hg ci -m "chmod +x a" -d "1000000 0" |
|
21 | hg ci -m "chmod +x a" -d "1000000 0" | |
22 | echo % the changelog should mention file a: |
|
22 | echo % the changelog should mention file a: | |
23 |
hg tip --template ' |
|
23 | hg tip --template '{files}\n' | |
24 |
|
24 | |||
25 | cd ../test1 |
|
25 | cd ../test1 | |
26 | echo 123 >>a |
|
26 | echo 123 >>a |
@@ -144,10 +144,10 b' echo line 3 >> a/a' | |||||
144 | hg --cwd a ci -m'third change' |
|
144 | hg --cwd a ci -m'third change' | |
145 | hg --cwd a export -o '../patch%R' 1 2 |
|
145 | hg --cwd a export -o '../patch%R' 1 2 | |
146 | hg clone -qr0 a b |
|
146 | hg clone -qr0 a b | |
147 |
hg --cwd b parents --template 'parent: |
|
147 | hg --cwd b parents --template 'parent: {rev}\n' | |
148 | hg --cwd b import ../patch1 ../patch2 |
|
148 | hg --cwd b import ../patch1 ../patch2 | |
149 | hg --cwd b rollback |
|
149 | hg --cwd b rollback | |
150 |
hg --cwd b parents --template 'parent: |
|
150 | hg --cwd b parents --template 'parent: {rev}\n' | |
151 | rm -r b |
|
151 | rm -r b | |
152 |
|
152 | |||
153 | # bug non regression test |
|
153 | # bug non regression test |
@@ -33,7 +33,7 b' rm bar' | |||||
33 | echo line1 > bar |
|
33 | echo line1 > bar | |
34 | hg ci -m '4: revert content change from rev 2' |
|
34 | hg ci -m '4: revert content change from rev 2' | |
35 |
|
35 | |||
36 |
hg log --template ' |
|
36 | hg log --template '{rev}:{node|short} {parents}\n' | |
37 | echo '% this should use bar@rev2 as the ancestor' |
|
37 | echo '% this should use bar@rev2 as the ancestor' | |
38 | hg --debug merge 3 |
|
38 | hg --debug merge 3 | |
39 | echo '% contents of bar should be line1 line2' |
|
39 | echo '% contents of bar should be line1 line2' | |
@@ -64,7 +64,7 b' rm bar' | |||||
64 | echo line1 > bar |
|
64 | echo line1 > bar | |
65 | hg ci -m '4: revert content change from rev 2' |
|
65 | hg ci -m '4: revert content change from rev 2' | |
66 |
|
66 | |||
67 |
hg log --template ' |
|
67 | hg log --template '{rev}:{node|short} {parents}\n' | |
68 | echo '% this should use bar@rev2 as the ancestor' |
|
68 | echo '% this should use bar@rev2 as the ancestor' | |
69 | hg --debug merge 3 |
|
69 | hg --debug merge 3 | |
70 | echo '% contents of bar should be line1 line2' |
|
70 | echo '% contents of bar should be line1 line2' |
@@ -8,7 +8,7 b' show_branch_cache()' | |||||
8 | { |
|
8 | { | |
9 | # force cache (re)generation |
|
9 | # force cache (re)generation | |
10 | hg log -r does-not-exist 2> /dev/null |
|
10 | hg log -r does-not-exist 2> /dev/null | |
11 |
hg log -r tip --template 'tip: |
|
11 | hg log -r tip --template 'tip: {rev}\n' | |
12 | if [ -f $branches ]; then |
|
12 | if [ -f $branches ]; then | |
13 | sort $branches |
|
13 | sort $branches | |
14 | else |
|
14 | else | |
@@ -16,7 +16,7 b' show_branch_cache()' | |||||
16 | fi |
|
16 | fi | |
17 | if [ "$1" = 1 ]; then |
|
17 | if [ "$1" = 1 ]; then | |
18 | for b in foo bar; do |
|
18 | for b in foo bar; do | |
19 |
hg log -r $b --template "branch $b: "' |
|
19 | hg log -r $b --template "branch $b: "'{rev}\n' | |
20 | done |
|
20 | done | |
21 | fi |
|
21 | fi | |
22 | } |
|
22 | } | |
@@ -68,7 +68,7 b' echo' | |||||
68 | echo '# importing rev 1 (the cache now ends in one of the patches)' |
|
68 | echo '# importing rev 1 (the cache now ends in one of the patches)' | |
69 | hg qimport -r 1 -n p0 |
|
69 | hg qimport -r 1 -n p0 | |
70 | show_branch_cache 1 |
|
70 | show_branch_cache 1 | |
71 |
hg log -r qbase --template 'qbase: |
|
71 | hg log -r qbase --template 'qbase: {rev}\n' | |
72 |
|
72 | |||
73 | echo |
|
73 | echo | |
74 | echo '# detect an invalid cache' |
|
74 | echo '# detect an invalid cache' |
@@ -41,4 +41,4 b" echo '% qrefresh'" | |||||
41 | hg qrefresh |
|
41 | hg qrefresh | |
42 |
|
42 | |||
43 | echo '% tip:' |
|
43 | echo '% tip:' | |
44 |
hg tip --template ' |
|
44 | hg tip --template '{rev} {desc}\n' |
@@ -33,7 +33,7 b" commit '4: change foo 2b' 1" | |||||
33 | commit '5: merge' 3 4 |
|
33 | commit '5: merge' 3 4 | |
34 | commit '6: change foo again' |
|
34 | commit '6: change foo again' | |
35 |
|
35 | |||
36 |
hg log --template ' |
|
36 | hg log --template '{rev}:{node|short} {parents}\n' | |
37 | echo |
|
37 | echo | |
38 |
|
38 | |||
39 | lookup() |
|
39 | lookup() |
General Comments 0
You need to be logged in to leave comments.
Login now