Merge lp:~jelmer/brz/more-foreign-3 into lp:brz

[Jelmer Vernooij]

More foreign branch test fixes.

This brings the number of brz-git test failures down to 338.

[Martin Packman (gz)]

Thanks!

review: Approve

=== modified file 'breezy/tests/per_branch/test_branch.py'
--- breezy/tests/per_branch/test_branch.py	2017-11-21 00:34:39 +0000
+++ breezy/tests/per_branch/test_branch.py	2018-02-03 13:43:32 +0000
@@ -644,7 +644,7 @@
         try:
             this_branch._format.set_reference(this_branch.controldir, None,
                 other_branch)
-        except NotImplementedError:
+        except (NotImplementedError, errors.IncompatibleFormat):
             # that's ok
             pass
         else:

=== modified file 'breezy/tests/per_tree/__init__.py'
--- breezy/tests/per_tree/__init__.py	2017-10-08 02:49:53 +0000
+++ breezy/tests/per_tree/__init__.py	2018-02-03 13:43:32 +0000
@@ -246,13 +246,13 @@
                             by breezy.osutils.has_symlinks() function.
 
         The returned tree has the following inventory:
-            [('', inventory.ROOT_ID),
-             ('0file', '2file'),
-             ('1top-dir', '1top-dir'),
-             (u'2utf\u1234file', u'0utf\u1234file'),
-             ('symlink', 'symlink'),            # only if symlinks arg is True
-             ('1top-dir/0file-in-1topdir', '1file-in-1topdir'),
-             ('1top-dir/1dir-in-1topdir', '0dir-in-1topdir')]
+            ['',
+             '0file',
+             '1top-dir',
+             u'2utf\u1234file',
+             'symlink',            # only if symlinks arg is True
+             '1top-dir/0file-in-1topdir',
+             '1top-dir/1dir-in-1topdir']
         where each component has the type of its name -
         i.e. '1file..' is afile.
 
@@ -267,15 +267,8 @@
             '1top-dir/0file-in-1topdir',
             '1top-dir/1dir-in-1topdir/'
             ]
-        ids = [
-            '2file',
-            '1top-dir',
-            u'0utf\u1234file'.encode('utf8'),
-            '1file-in-1topdir',
-            '0dir-in-1topdir'
-            ]
         self.build_tree(paths)
-        tree.add(paths, ids)
+        tree.add(paths)
         tt = transform.TreeTransform(tree)
         if symlinks:
             root_transaction_id = tt.trans_id_tree_path('')

=== modified file 'breezy/tests/per_tree/test_test_trees.py'
--- breezy/tests/per_tree/test_test_trees.py	2018-01-12 08:52:43 +0000
+++ breezy/tests/per_tree/test_test_trees.py	2018-02-03 13:43:32 +0000
@@ -163,26 +163,21 @@
         # __iter__ has no strongly defined order
         tree_root = tree.path2id('')
         self.assertEqual(
-            {tree_root,
-                '2file',
-                '1top-dir',
-                '1file-in-1topdir',
-                '0dir-in-1topdir',
-                 u'0utf\u1234file'.encode('utf8'),
-                'symlink',
-                 },
+            {tree.path2id(p) for p in [
+                '', '0file', '1top-dir', '1top-dir/1dir-in-1topdir',
+                '1top-dir/0file-in-1topdir', 'symlink', u'2utf\u1234file']},
             set(tree.all_file_ids()))
         # note that the order of the paths and fileids is deliberately
         # mismatched to ensure that the result order is path based.
         self.assertEqual(
-            [('', tree_root, 'directory'),
-             ('0file', '2file', 'file'),
-             ('1top-dir', '1top-dir', 'directory'),
-             (u'2utf\u1234file', u'0utf\u1234file'.encode('utf8'), 'file'),
-             ('symlink', 'symlink', 'symlink'),
-             ('1top-dir/0file-in-1topdir', '1file-in-1topdir', 'file'),
-             ('1top-dir/1dir-in-1topdir', '0dir-in-1topdir', 'directory')],
-            [(path, node.file_id, node.kind) for path, node in tree.iter_entries_by_dir()])
+            [('', 'directory'),
+             ('0file', 'file'),
+             ('1top-dir', 'directory'),
+             (u'2utf\u1234file', 'file'),
+             ('symlink', 'symlink'),
+             ('1top-dir/0file-in-1topdir', 'file'),
+             ('1top-dir/1dir-in-1topdir', 'directory')],
+            [(path, node.kind) for path, node in tree.iter_entries_by_dir()])
 
     def test_tree_with_subdirs_and_all_content_types_wo_symlinks(self):
         # currently this test tree requires unicode. It might be good
@@ -197,24 +192,19 @@
         # __iter__ has no strongly defined order
         tree_root = tree.path2id('')
         self.assertEqual(
-            {tree_root,
-                '2file',
-                '1top-dir',
-                '1file-in-1topdir',
-                '0dir-in-1topdir',
-                 u'0utf\u1234file'.encode('utf8'),
-                 },
-            set(tree.all_file_ids()))
+            {'', '0file', '1top-dir', '1top-dir/0file-in-1topdir',
+             '1top-dir/1dir-in-1topdir', u'2utf\u1234file'},
+            set(tree.all_versioned_paths()))
         # note that the order of the paths and fileids is deliberately
         # mismatched to ensure that the result order is path based.
         self.assertEqual(
-            [('', tree_root, 'directory'),
-             ('0file', '2file', 'file'),
-             ('1top-dir', '1top-dir', 'directory'),
-             (u'2utf\u1234file', u'0utf\u1234file'.encode('utf8'), 'file'),
-             ('1top-dir/0file-in-1topdir', '1file-in-1topdir', 'file'),
-             ('1top-dir/1dir-in-1topdir', '0dir-in-1topdir', 'directory')],
-            [(path, node.file_id, node.kind) for path, node in tree.iter_entries_by_dir()])
+            [('', 'directory'),
+             ('0file', 'file'),
+             ('1top-dir', 'directory'),
+             (u'2utf\u1234file', 'file'),
+             ('1top-dir/0file-in-1topdir', 'file'),
+             ('1top-dir/1dir-in-1topdir', 'directory')],
+            [(path, node.kind) for path, node in tree.iter_entries_by_dir()])
 
     def test_tree_with_utf8(self):
         tree = self.make_branch_and_tree('.')

=== modified file 'breezy/tests/per_tree/test_walkdirs.py'
--- breezy/tests/per_tree/test_walkdirs.py	2017-10-08 02:49:53 +0000
+++ breezy/tests/per_tree/test_walkdirs.py	2018-02-03 13:43:32 +0000
@@ -28,19 +28,19 @@
     def get_all_subdirs_expected(self, tree, symlinks):
         dirblocks = [
             (('', tree.path2id('')),
-             [('0file', '0file', 'file', None, '2file', 'file'),
+             [('0file', '0file', 'file', None, tree.path2id('0file'), 'file'),
               ('1top-dir', '1top-dir', 'directory', None,
-               '1top-dir', 'directory'),
+               tree.path2id('1top-dir'), 'directory'),
               (u'2utf\u1234file', u'2utf\u1234file', 'file', None,
-               u'0utf\u1234file'.encode('utf8'), 'file'),
+               tree.path2id(u'2utf\u1234file'), 'file'),
               ]),
-            (('1top-dir', '1top-dir'),
+            (('1top-dir', tree.path2id('1top-dir')),
              [('1top-dir/0file-in-1topdir', '0file-in-1topdir',
-               'file', None, '1file-in-1topdir', 'file'),
+               'file', None, tree.path2id('1top-dir/0file-in-1topdir'), 'file'),
               ('1top-dir/1dir-in-1topdir', '1dir-in-1topdir',
-               'directory', None, '0dir-in-1topdir', 'directory'),
+               'directory', None, tree.path2id('1top-dir/1dir-in-1topdir'), 'directory'),
               ]),
-            (('1top-dir/1dir-in-1topdir', '0dir-in-1topdir'),
+            (('1top-dir/1dir-in-1topdir', tree.path2id('1top-dir/1dir-in-1topdir')),
              []),
             ]
         if symlinks:

=== modified file 'breezy/tests/per_workingtree/test_mkdir.py'
--- breezy/tests/per_workingtree/test_mkdir.py	2017-11-12 20:07:32 +0000
+++ breezy/tests/per_workingtree/test_mkdir.py	2018-02-03 13:43:32 +0000
@@ -19,6 +19,8 @@
 
 from breezy.tests.per_workingtree import TestCaseWithWorkingTree
 
+from breezy.workingtree import SettingFileIdUnsupported
+
 
 class TestMkdir(TestCaseWithWorkingTree):
 
@@ -33,6 +35,11 @@
         t = self.make_branch_and_tree('t1')
         t.lock_write()
         self.addCleanup(t.unlock)
-        file_id = t.mkdir('path', 'my-id')
-        self.assertEqual('my-id', file_id)
-        self.assertEqual('directory', t.kind('path', file_id))
+        if not t.supports_setting_file_ids():
+            self.assertRaises(
+                SettingFileIdUnsupported,
+                t.mkdir, 'path', 'my-id')
+        else:
+            file_id = t.mkdir('path', 'my-id')
+            self.assertEqual('my-id', file_id)
+            self.assertEqual('directory', t.kind('path', file_id))

=== modified file 'breezy/tests/per_workingtree/test_move.py'
--- breezy/tests/per_workingtree/test_move.py	2018-01-22 01:01:48 +0000
+++ breezy/tests/per_workingtree/test_move.py	2018-02-03 13:43:32 +0000
@@ -105,8 +105,11 @@
         self.build_tree(['a/', 'b'])
         tree.add(['b'])
         tree.commit('initial')
-        self.assertRaises(errors.BzrMoveFailedError,
-                          tree.move, ['b'], 'a')
+        if tree.has_versioned_directories():
+            self.assertRaises(errors.BzrMoveFailedError,
+                              tree.move, ['b'], 'a')
+        else:
+            tree.move(['b'], 'a')
         tree._validate()
 
     def test_move_unversioned(self):

=== modified file 'breezy/tests/per_workingtree/test_parents.py'
--- breezy/tests/per_workingtree/test_parents.py	2018-01-15 06:07:39 +0000
+++ breezy/tests/per_workingtree/test_parents.py	2018-02-03 13:43:32 +0000
@@ -430,8 +430,7 @@
             def get_file(self, path, file_id=None):
                 return BytesIO(self.get_file_text(path, file_id))
 
-        tree.lock_write()
-        try:
+        with tree.lock_write():
             if shape.root.revision is None:
                 shape.root.revision = revid
             builder = tree.branch.get_commit_builder(
@@ -449,8 +448,6 @@
                 base_tree.get_revision_id(), changes))
             builder.finish_inventory()
             builder.commit("Message")
-        finally:
-            tree.unlock()
 
     def add_entry(self, inv, rev_id, entry):
         entry.revision = rev_id

=== modified file 'breezy/tests/per_workingtree/test_paths2ids.py'
--- breezy/tests/per_workingtree/test_paths2ids.py	2018-01-22 01:01:48 +0000
+++ breezy/tests/per_workingtree/test_paths2ids.py	2018-02-03 13:43:32 +0000
@@ -172,6 +172,8 @@
         # should not raise an error: it must be unversioned in *all* trees to
         # error.
         tree = self.make_branch_and_tree('tree')
+        if not tree.supports_setting_file_ids():
+            raise TestNotApplicable('tree does not support setting file ids')
         tree.commit('make basis')
         basis = tree.basis_tree()
         self.build_tree(['tree/in-one'])

=== modified file 'breezy/tests/per_workingtree/test_rename_one.py'
--- breezy/tests/per_workingtree/test_rename_one.py	2017-11-13 18:40:41 +0000
+++ breezy/tests/per_workingtree/test_rename_one.py	2018-02-03 13:43:32 +0000
@@ -61,8 +61,11 @@
         self.build_tree(['a/', 'b'])
         tree.add(['b'])
         tree.commit('initial')
-        self.assertRaises(errors.BzrMoveFailedError,
-                          tree.rename_one, 'b', 'a/b')
+        if tree.has_versioned_directories():
+            self.assertRaises(errors.BzrMoveFailedError,
+                              tree.rename_one, 'b', 'a/b')
+        else:
+            tree.rename_one('b', 'a/b')
 
     def test_rename_one_unversioned(self):
         tree = self.make_branch_and_tree('.')

=== modified file 'breezy/tests/per_workingtree/test_smart_add.py'
--- breezy/tests/per_workingtree/test_smart_add.py	2017-11-12 13:53:51 +0000
+++ breezy/tests/per_workingtree/test_smart_add.py	2018-02-03 13:43:32 +0000
@@ -25,6 +25,7 @@
     osutils,
     tests,
     trace,
+    workingtree,
     )
 from ...sixish import (
     BytesIO,
@@ -259,14 +260,20 @@
         self.build_tree(['file1', 'dir1/', 'dir1/file2'])
 
         wt = self.make_branch_and_tree('.')
+        if not wt._format.supports_setting_file_ids:
+            self.assertRaises(
+                workingtree.SettingFileIdUnsupported,
+                wt.smart_add, ['.'], action=action)
+            return
+
         wt.smart_add(['.'], action=action)
         # The order of adds is not strictly fixed:
         sio.seek(0)
         lines = sorted(sio.readlines())
-        self.assertEqualDiff(['added dir1 with id directory-dir1\n',
-                              'added dir1/file2 with id file-dir1%file2\n',
-                              'added file1 with id file-file1\n',
-                             ], lines)
+        self.assertEqual(['added dir1 with id directory-dir1\n',
+                          'added dir1/file2 with id file-dir1%file2\n',
+                          'added file1 with id file-file1\n', ]
+                          , lines)
         wt.lock_read()
         self.addCleanup(wt.unlock)
         self.assertEqual([('', wt.path2id('')),