Show More
@@ -6,7 +6,7 b" echo 'convert = ' >> $HGRCPATH" | |||||
6 |
|
6 | |||
7 | glog() |
|
7 | glog() | |
8 | { |
|
8 | { | |
9 | hg log -G --template '{rev}@{branch} "{desc|firstline}" files: {files}\n' "$@" |
|
9 | hg log -G --template '{rev}@{branch} "{desc|firstline}" files+: [{file_adds}], files-: [{file_dels}], files: [{file_mods}]\n' "$@" | |
10 | } |
|
10 | } | |
11 |
|
11 | |||
12 | manifest() |
|
12 | manifest() |
@@ -31,9 +31,9 b' ghost revisions' | |||||
31 | 1 Initial layout setup |
|
31 | 1 Initial layout setup | |
32 | 0 Commit with ghost revision |
|
32 | 0 Commit with ghost revision | |
33 | $ glog -R source-hg |
|
33 | $ glog -R source-hg | |
34 | o 1@source "Commit with ghost revision" files: somefile |
|
34 | o 1@source "Commit with ghost revision" files+: [], files-: [], files: [somefile] | |
35 | | |
|
35 | | | |
36 | o 0@source "Initial layout setup" files: somefile |
|
36 | o 0@source "Initial layout setup" files+: [somefile], files-: [], files: [] | |
37 |
|
37 | |||
38 |
|
38 | |||
39 | $ cd .. |
|
39 | $ cd .. |
@@ -39,6 +39,8 b' test multiple merges at once' | |||||
39 | $ bzr merge -q --force ../source-branch2 |
|
39 | $ bzr merge -q --force ../source-branch2 | |
40 | $ bzr commit -q -m 'Merged branches' '--commit-time=2009-10-10 08:00:04 +0100' |
|
40 | $ bzr commit -q -m 'Merged branches' '--commit-time=2009-10-10 08:00:04 +0100' | |
41 | $ cd .. |
|
41 | $ cd .. | |
|
42 | ||||
|
43 | BUG: file-branch2 should not be added in rev 4 | |||
42 | $ hg convert --datesort --config convert.bzr.saverev=False source source-hg |
|
44 | $ hg convert --datesort --config convert.bzr.saverev=False source source-hg | |
43 | initializing destination source-hg repository |
|
45 | initializing destination source-hg repository | |
44 | scanning source... |
|
46 | scanning source... | |
@@ -50,17 +52,17 b' test multiple merges at once' | |||||
50 | 1 Added brach2 file |
|
52 | 1 Added brach2 file | |
51 | 0 Merged branches |
|
53 | 0 Merged branches | |
52 | $ glog -R source-hg |
|
54 | $ glog -R source-hg | |
53 | o 5@source "(octopus merge fixup)" files: |
|
55 | o 5@source "(octopus merge fixup)" files+: [], files-: [], files: [] | |
54 | |\ |
|
56 | |\ | |
55 | | o 4@source "Merged branches" files: file-branch2 |
|
57 | | o 4@source "Merged branches" files+: [file-branch1 file-branch2], files-: [], files: [file] | |
56 | | |\ |
|
58 | | |\ | |
57 | o---+ 3@source-branch2 "Added brach2 file" files: file-branch2 |
|
59 | o---+ 3@source-branch2 "Added brach2 file" files+: [file-branch2], files-: [], files: [] | |
58 | / / |
|
60 | / / | |
59 | | o 2@source "Added parent file" files: file-parent |
|
61 | | o 2@source "Added parent file" files+: [file-parent], files-: [], files: [] | |
60 | | | |
|
62 | | | | |
61 |
o | 1@source-branch1 "Added branch1 file" files: |
|
63 | o | 1@source-branch1 "Added branch1 file" files+: [file-branch1], files-: [], files: [file] | |
62 | |/ |
|
64 | |/ | |
63 | o 0@source "Initial add" files: file |
|
65 | o 0@source "Initial add" files+: [file], files-: [], files: [] | |
64 |
|
66 | |||
65 | $ manifest source-hg tip |
|
67 | $ manifest source-hg tip | |
66 | % manifest of tip |
|
68 | % manifest of tip |
@@ -42,9 +42,9 b' back to the rename stuff' | |||||
42 | 1 Initial add: a, c, e |
|
42 | 1 Initial add: a, c, e | |
43 | 0 rename a into b, create a, rename c into d |
|
43 | 0 rename a into b, create a, rename c into d | |
44 | $ glog -R source-hg |
|
44 | $ glog -R source-hg | |
45 |
o 1@source "rename a into b, create a, rename c into d" files: |
|
45 | o 1@source "rename a into b, create a, rename c into d" files+: [b d f], files-: [c e], files: [a] | |
46 | | |
|
46 | | | |
47 | o 0@source "Initial add: a, c, e" files: a c e |
|
47 | o 0@source "Initial add: a, c, e" files+: [a c e], files-: [], files: [] | |
48 |
|
48 | |||
49 |
|
49 | |||
50 | manifest |
|
50 | manifest | |
@@ -64,7 +64,7 b' test --rev option' | |||||
64 | converting... |
|
64 | converting... | |
65 | 0 Initial add: a, c, e |
|
65 | 0 Initial add: a, c, e | |
66 | $ glog -R source-1-hg |
|
66 | $ glog -R source-1-hg | |
67 | o 0@source "Initial add: a, c, e" files: a c e |
|
67 | o 0@source "Initial add: a, c, e" files+: [a c e], files-: [], files: [] | |
68 |
|
68 | |||
69 |
|
69 | |||
70 | test with filemap |
|
70 | test with filemap | |
@@ -147,13 +147,13 b' merge' | |||||
147 | 1 Editing b |
|
147 | 1 Editing b | |
148 | 0 Merged improve branch |
|
148 | 0 Merged improve branch | |
149 | $ glog -R source-hg |
|
149 | $ glog -R source-hg | |
150 | o 3@source "Merged improve branch" files: |
|
150 | o 3@source "Merged improve branch" files+: [], files-: [], files: [b] | |
151 | |\ |
|
151 | |\ | |
152 | | o 2@source-improve "Editing b" files: b |
|
152 | | o 2@source-improve "Editing b" files+: [], files-: [], files: [b] | |
153 | | | |
|
153 | | | | |
154 | o | 1@source "Editing a" files: a |
|
154 | o | 1@source "Editing a" files+: [], files-: [], files: [a] | |
155 | |/ |
|
155 | |/ | |
156 | o 0@source "Initial add" files: a b |
|
156 | o 0@source "Initial add" files+: [a b], files-: [], files: [] | |
157 |
|
157 | |||
158 | $ cd .. |
|
158 | $ cd .. | |
159 |
|
159 | |||
@@ -250,13 +250,13 b' Multiple branches' | |||||
250 | 0 changea |
|
250 | 0 changea | |
251 | updating tags |
|
251 | updating tags | |
252 | $ (cd repo-bzr; glog) |
|
252 | $ (cd repo-bzr; glog) | |
253 | o 3@default "update tags" files: .hgtags |
|
253 | o 3@default "update tags" files+: [.hgtags], files-: [], files: [] | |
254 | | |
|
254 | | | |
255 | o 2@default "changea" files: a |
|
255 | o 2@default "changea" files+: [], files-: [], files: [a] | |
256 | | |
|
256 | | | |
257 | | o 1@branch "addb" files: b |
|
257 | | o 1@branch "addb" files+: [b], files-: [], files: [] | |
258 | |/ |
|
258 | |/ | |
259 | o 0@default "adda" files: a |
|
259 | o 0@default "adda" files+: [a], files-: [], files: [] | |
260 |
|
260 | |||
261 |
|
261 | |||
262 | Test tags (converted identifiers are not stable because bzr ones are |
|
262 | Test tags (converted identifiers are not stable because bzr ones are |
General Comments 0
You need to be logged in to leave comments.
Login now