Skip to content
Snippets Groups Projects
Commit 7a88643b authored by Matt Harbison's avatar Matt Harbison
Browse files

tests: show added/modified/removed files when logging repos converted from bzr

There's a bug related to incorrect status values that can be triggered by an
octopus fixup merge.  Seeing what the current status is (instead of just the
aggregate list) will hopefully help track this down.
parent d7ac6daf
No related branches found
No related tags found
No related merge requests found
......@@ -6,7 +6,7 @@
glog()
{
hg log -G --template '{rev}@{branch} "{desc|firstline}" files: {files}\n' "$@"
hg log -G --template '{rev}@{branch} "{desc|firstline}" files+: [{file_adds}], files-: [{file_dels}], files: [{file_mods}]\n' "$@"
}
manifest()
......
......@@ -31,5 +31,5 @@
1 Initial layout setup
0 Commit with ghost revision
$ glog -R source-hg
o 1@source "Commit with ghost revision" files: somefile
o 1@source "Commit with ghost revision" files+: [], files-: [], files: [somefile]
|
......@@ -35,5 +35,5 @@
|
o 0@source "Initial layout setup" files: somefile
o 0@source "Initial layout setup" files+: [somefile], files-: [], files: []
$ cd ..
......@@ -39,6 +39,8 @@
$ bzr merge -q --force ../source-branch2
$ bzr commit -q -m 'Merged branches' '--commit-time=2009-10-10 08:00:04 +0100'
$ cd ..
BUG: file-branch2 should not be added in rev 4
$ hg convert --datesort --config convert.bzr.saverev=False source source-hg
initializing destination source-hg repository
scanning source...
......@@ -50,5 +52,5 @@
1 Added brach2 file
0 Merged branches
$ glog -R source-hg
o 5@source "(octopus merge fixup)" files:
o 5@source "(octopus merge fixup)" files+: [], files-: [], files: []
|\
......@@ -54,3 +56,3 @@
|\
| o 4@source "Merged branches" files: file-branch2
| o 4@source "Merged branches" files+: [file-branch1 file-branch2], files-: [], files: [file]
| |\
......@@ -56,3 +58,3 @@
| |\
o---+ 3@source-branch2 "Added brach2 file" files: file-branch2
o---+ 3@source-branch2 "Added brach2 file" files+: [file-branch2], files-: [], files: []
/ /
......@@ -58,3 +60,3 @@
/ /
| o 2@source "Added parent file" files: file-parent
| o 2@source "Added parent file" files+: [file-parent], files-: [], files: []
| |
......@@ -60,3 +62,3 @@
| |
o | 1@source-branch1 "Added branch1 file" files: file file-branch1
o | 1@source-branch1 "Added branch1 file" files+: [file-branch1], files-: [], files: [file]
|/
......@@ -62,5 +64,5 @@
|/
o 0@source "Initial add" files: file
o 0@source "Initial add" files+: [file], files-: [], files: []
$ manifest source-hg tip
% manifest of tip
......
......@@ -42,5 +42,5 @@
1 Initial add: a, c, e
0 rename a into b, create a, rename c into d
$ glog -R source-hg
o 1@source "rename a into b, create a, rename c into d" files: a b c d e f
o 1@source "rename a into b, create a, rename c into d" files+: [b d f], files-: [c e], files: [a]
|
......@@ -46,5 +46,5 @@
|
o 0@source "Initial add: a, c, e" files: a c e
o 0@source "Initial add: a, c, e" files+: [a c e], files-: [], files: []
manifest
......@@ -64,7 +64,7 @@
converting...
0 Initial add: a, c, e
$ glog -R source-1-hg
o 0@source "Initial add: a, c, e" files: a c e
o 0@source "Initial add: a, c, e" files+: [a c e], files-: [], files: []
test with filemap
......@@ -147,5 +147,5 @@
1 Editing b
0 Merged improve branch
$ glog -R source-hg
o 3@source "Merged improve branch" files:
o 3@source "Merged improve branch" files+: [], files-: [], files: [b]
|\
......@@ -151,3 +151,3 @@
|\
| o 2@source-improve "Editing b" files: b
| o 2@source-improve "Editing b" files+: [], files-: [], files: [b]
| |
......@@ -153,3 +153,3 @@
| |
o | 1@source "Editing a" files: a
o | 1@source "Editing a" files+: [], files-: [], files: [a]
|/
......@@ -155,5 +155,5 @@
|/
o 0@source "Initial add" files: a b
o 0@source "Initial add" files+: [a b], files-: [], files: []
$ cd ..
......@@ -250,5 +250,5 @@
0 changea
updating tags
$ (cd repo-bzr; glog)
o 3@default "update tags" files: .hgtags
o 3@default "update tags" files+: [.hgtags], files-: [], files: []
|
......@@ -254,3 +254,3 @@
|
o 2@default "changea" files: a
o 2@default "changea" files+: [], files-: [], files: [a]
|
......@@ -256,3 +256,3 @@
|
| o 1@branch "addb" files: b
| o 1@branch "addb" files+: [b], files-: [], files: []
|/
......@@ -258,5 +258,5 @@
|/
o 0@default "adda" files: a
o 0@default "adda" files+: [a], files-: [], files: []
Test tags (converted identifiers are not stable because bzr ones are
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment