# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1531499586 14400
# Node ID 7a88643bc0efd23ffdea4a57cdbd385d8cab8b21
# Parent  d7ac6dafc6097531d89ee747e28bb1fad190ec80
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.

diff -r d7ac6dafc609 -r 7a88643bc0ef tests/bzr-definitions
--- a/tests/bzr-definitions	Mon Aug 20 22:04:22 2018 -0400
+++ b/tests/bzr-definitions	Fri Jul 13 12:33:06 2018 -0400
@@ -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()
diff -r d7ac6dafc609 -r 7a88643bc0ef tests/test-convert-bzr-ghosts.t
--- a/tests/test-convert-bzr-ghosts.t	Mon Aug 20 22:04:22 2018 -0400
+++ b/tests/test-convert-bzr-ghosts.t	Fri Jul 13 12:33:06 2018 -0400
@@ -31,9 +31,9 @@
   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]
   |
-  o  0@source "Initial layout setup" files: somefile
+  o  0@source "Initial layout setup" files+: [somefile], files-: [], files: []
   
 
   $ cd ..
diff -r d7ac6dafc609 -r 7a88643bc0ef tests/test-convert-bzr-merges.t
--- a/tests/test-convert-bzr-merges.t	Mon Aug 20 22:04:22 2018 -0400
+++ b/tests/test-convert-bzr-merges.t	Fri Jul 13 12:33:06 2018 -0400
@@ -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,17 +52,17 @@
   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: []
   |\
-  | o    4@source "Merged branches" files: file-branch2
+  | o    4@source "Merged branches" files+: [file-branch1 file-branch2], files-: [], files: [file]
   | |\
-  o---+  3@source-branch2 "Added brach2 file" files: file-branch2
+  o---+  3@source-branch2 "Added brach2 file" files+: [file-branch2], files-: [], files: []
    / /
-  | o  2@source "Added parent file" files: file-parent
+  | o  2@source "Added parent file" files+: [file-parent], files-: [], files: []
   | |
-  o |  1@source-branch1 "Added branch1 file" files: file file-branch1
+  o |  1@source-branch1 "Added branch1 file" files+: [file-branch1], files-: [], files: [file]
   |/
-  o  0@source "Initial add" files: file
+  o  0@source "Initial add" files+: [file], files-: [], files: []
   
   $ manifest source-hg tip
   % manifest of tip
diff -r d7ac6dafc609 -r 7a88643bc0ef tests/test-convert-bzr.t
--- a/tests/test-convert-bzr.t	Mon Aug 20 22:04:22 2018 -0400
+++ b/tests/test-convert-bzr.t	Fri Jul 13 12:33:06 2018 -0400
@@ -42,9 +42,9 @@
   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]
   |
-  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,13 +147,13 @@
   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]
   |\
-  | o  2@source-improve "Editing b" files: b
+  | o  2@source-improve "Editing b" files+: [], files-: [], files: [b]
   | |
-  o |  1@source "Editing a" files: a
+  o |  1@source "Editing a" files+: [], files-: [], files: [a]
   |/
-  o  0@source "Initial add" files: a b
+  o  0@source "Initial add" files+: [a b], files-: [], files: []
   
   $ cd ..
 
@@ -250,13 +250,13 @@
   0 changea
   updating tags
   $ (cd repo-bzr; glog)
-  o  3@default "update tags" files: .hgtags
+  o  3@default "update tags" files+: [.hgtags], files-: [], files: []
   |
-  o  2@default "changea" files: a
+  o  2@default "changea" files+: [], files-: [], files: [a]
   |
-  | o  1@branch "addb" files: b
+  | o  1@branch "addb" files+: [b], files-: [], files: []
   |/
-  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