Merge lp:~jelmer/brz/merge-3.2 into lp:brz

[Jelmer Vernooij]

Merge lp:brz/3.2.

Merge lp:brz/3.2.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'Makefile'
--- Makefile	2021-11-17 20:30:19 +0000
+++ Makefile	2021-12-25 12:35:58 +0000
@@ -253,7 +253,7 @@
 	$(PYTHON) setup.py build_ext -i -f $(PYTHON_BUILDFLAGS)
 	$(PYTHON) setup.py py2exe > py2exe.log
 	$(PYTHON) tools/win32/ostools.py copytodir tools/win32/start_brz.bat win32_brz.exe
-	$(PYTHON) tools/win32/ostools.py copytodir tools/win32/bazaar.url win32_brz.exe
+	$(PYTHON) tools/win32/ostools.py copytodir tools/win32/breezy.url win32_brz.exe
 
 # win32 installer for brz.exe
 installer: exe copy-docs
@@ -268,7 +268,8 @@
 
 copy-docs: docs
 	$(PYTHON) tools/win32/ostools.py copytodir README win32_brz.exe/doc
-	$(PYTHON) tools/win32/ostools.py copytree $(WEB_DOCS) win32_brz.exe
+	$(PYTHON) tools/win32/ostools.py copydir doc/en/_build/html win32_brz.exe/doc
+	$(PYTHON) tools/win32/ostools.py copydir doc/developers/_build/html win32_brz.exe/doc/developers
 
 # clean on win32 all installer-related files and directories
 clean-win32: clean-docs

=== modified file 'breezy/bzr/inventorytree.py'
--- breezy/bzr/inventorytree.py	2021-11-16 01:24:28 +0000
+++ breezy/bzr/inventorytree.py	2021-12-25 12:35:58 +0000
@@ -135,6 +135,9 @@
     private to external API users.
     """
 
+    def supports_symlinks(self):
+        return True
+
     def _get_root_inventory(self):
         return self._inventory
 

=== modified file 'breezy/bzr/tests/test__dirstate_helpers.py'
--- breezy/bzr/tests/test__dirstate_helpers.py	2020-06-10 02:56:53 +0000
+++ breezy/bzr/tests/test__dirstate_helpers.py	2021-12-25 12:35:58 +0000
@@ -952,7 +952,7 @@
 
     def test_update_entry_symlink(self):
         """Update entry should read symlinks."""
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         state, entry = self.get_state_with_a()
         state.save()
         self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
@@ -1149,7 +1149,7 @@
 
     def test_update_file_to_symlink(self):
         """File becomes a symlink"""
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         state, entry = self.get_state_with_a()
         # The file sha1 won't be cached unless the file is old
         state.adjust_time(+10)
@@ -1168,7 +1168,7 @@
 
     def test_update_dir_to_symlink(self):
         """Directory becomes a symlink"""
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         state, entry = self.get_state_with_a()
         # The symlink target won't be cached if it isn't old
         state.adjust_time(+10)
@@ -1178,7 +1178,7 @@
 
     def test_update_symlink_to_file(self):
         """Symlink becomes a file"""
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         state, entry = self.get_state_with_a()
         # The symlink and file info won't be cached unless old
         state.adjust_time(+10)
@@ -1188,7 +1188,7 @@
 
     def test_update_symlink_to_dir(self):
         """Symlink becomes a directory"""
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         state, entry = self.get_state_with_a()
         # The symlink target won't be cached if it isn't old
         state.adjust_time(+10)

=== modified file 'breezy/bzr/tests/test_bundle.py'
--- breezy/bzr/tests/test_bundle.py	2020-07-04 12:29:00 +0000
+++ breezy/bzr/tests/test_bundle.py	2021-12-25 12:35:58 +0000
@@ -670,7 +670,7 @@
     def _test_symlink_bundle(self, link_name, link_target, new_link_target):
         link_id = b'link-1'
 
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         self.tree1 = self.make_branch_and_tree('b1')
         self.b1 = self.tree1.branch
 

=== modified file 'breezy/bzr/tests/test_dirstate.py'
--- breezy/bzr/tests/test_dirstate.py	2020-06-10 02:56:53 +0000
+++ breezy/bzr/tests/test_dirstate.py	2021-12-25 12:35:58 +0000
@@ -1224,7 +1224,7 @@
         # The most trivial addition of a symlink when there are no parents and
         # its in the root and all data about the file is supplied
         # bzr doesn't support fake symlinks on windows, yet.
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         os.symlink(target, link_name)
         stat = os.lstat(link_name)
         expected_entries = [

=== modified file 'breezy/bzr/tests/test_testament.py'
--- breezy/bzr/tests/test_testament.py	2020-07-04 12:29:00 +0000
+++ breezy/bzr/tests/test_testament.py	2021-12-25 12:35:58 +0000
@@ -103,7 +103,7 @@
 
     def test_testament_symlinks(self):
         """Testament containing symlink (where possible)"""
-        self.requireFeature(SymlinkFeature)
+        self.requireFeature(SymlinkFeature(self.test_dir))
         os.symlink('wibble/linktarget', 'link')
         self.wt.add(['link'], [b'link-id'])
         self.wt.commit(message='add symlink',

=== modified file 'breezy/bzr/tests/test_transform.py'
--- breezy/bzr/tests/test_transform.py	2020-09-02 17:00:38 +0000
+++ breezy/bzr/tests/test_transform.py	2021-12-25 12:35:58 +0000
@@ -62,7 +62,7 @@
 class TestBuildTree(TestCaseWithTransport):
 
     def test_build_tree_with_symlinks(self):
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         os.mkdir('a')
         a = ControlDir.create_standalone_workingtree('a')
         os.mkdir('a/foo')
@@ -113,7 +113,7 @@
 
     def test_symlink_conflict_handling(self):
         """Ensure that when building trees, conflict handling is done"""
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         source = self.make_branch_and_tree('source')
         os.symlink('foo', 'source/symlink')
         source.add('symlink', b'new-symlink')
@@ -272,7 +272,7 @@
         self.assertEqual([], list(target.iter_changes(revision_tree)))
 
     def test_build_tree_accelerator_wrong_kind(self):
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         source = self.make_branch_and_tree('source')
         self.build_tree_contents([('source/file1', b'')])
         self.build_tree_contents([('source/file2', b'')])
@@ -300,7 +300,7 @@
         self.assertEqual([], list(target.iter_changes(revision_tree)))
 
     def test_build_tree_hardlink(self):
-        self.requireFeature(features.HardlinkFeature)
+        self.requireFeature(features.HardlinkFeature(self.test_dir))
         source = self.create_ab_tree()
         target = self.make_branch_and_tree('target')
         revision_tree = source.basis_tree()
@@ -342,7 +342,7 @@
         self.assertEqual([], list(target.iter_changes(revision_tree)))
 
     def test_build_tree_hardlinks_preserve_execute(self):
-        self.requireFeature(features.HardlinkFeature)
+        self.requireFeature(features.HardlinkFeature(self.test_dir))
         source = self.create_ab_tree()
         tt = source.transform()
         trans_id = tt.trans_id_tree_path('file1')
@@ -393,7 +393,7 @@
         applied to them (but will still hardlink other files from the same tree
         if it can).
         """
-        self.requireFeature(features.HardlinkFeature)
+        self.requireFeature(features.HardlinkFeature(self.test_dir))
         self.install_rot13_content_filter(b'file1')
         source = self.create_ab_tree()
         target = self.make_branch_and_tree('target')

=== modified file 'breezy/bzr/transform.py'
--- breezy/bzr/transform.py	2021-11-13 13:01:39 +0000
+++ breezy/bzr/transform.py	2021-12-25 12:35:58 +0000
@@ -1923,6 +1923,9 @@
     def supports_setting_file_ids(self):
         return True
 
+    def supports_symlinks(self):
+        return self._transform._create_symlinks
+
     def supports_tree_reference(self):
         # TODO(jelmer): Support tree references in PreviewTree.
         # return self._transform._tree.supports_tree_reference()

=== modified file 'breezy/commit.py'
--- breezy/commit.py	2020-08-10 15:00:17 +0000
+++ breezy/commit.py	2021-12-25 12:35:58 +0000
@@ -62,7 +62,7 @@
                      StrictCommitFailed
                      )
 from .osutils import (get_user_encoding,
-                      has_symlinks,
+                      supports_symlinks,
                       is_inside_any,
                       minimum_path_selection,
                       )

=== modified file 'breezy/git/tests/test_object_store.py'
--- breezy/git/tests/test_object_store.py	2020-02-18 01:57:45 +0000
+++ breezy/git/tests/test_object_store.py	2021-12-25 12:35:58 +0000
@@ -171,7 +171,7 @@
         self.assertEqual(b, self.store[b.id])
 
     def test_directory_converted_to_symlink(self):
-        self.requireFeature(SymlinkFeature)
+        self.requireFeature(SymlinkFeature(self.test_dir))
         b = Blob()
         b.data = b'trgt'
         self.store.lock_read()

=== modified file 'breezy/git/transform.py'
--- breezy/git/transform.py	2021-11-15 23:21:12 +0000
+++ breezy/git/transform.py	2021-12-25 12:35:58 +0000
@@ -1582,6 +1582,9 @@
     def supports_setting_file_ids(self):
         return False
 
+    def supports_symlinks(self):
+        return self._transform._create_symlinks
+
     def _supports_executable(self):
         return self._transform._limbo_supports_executable()
 

=== modified file 'breezy/git/tree.py'
--- breezy/git/tree.py	2021-11-16 17:49:16 +0000
+++ breezy/git/tree.py	2021-12-25 12:35:58 +0000
@@ -257,6 +257,9 @@
 
     supports_file_ids = False
 
+    def supports_symlinks(self):
+        return True
+
     def iter_git_objects(self):
         """Iterate over all the objects in the tree.
 

=== modified file 'breezy/location.py'
--- breezy/location.py	2021-06-04 19:21:33 +0000
+++ breezy/location.py	2021-12-25 12:35:58 +0000
@@ -47,7 +47,8 @@
     :return: A URL, e.g. "ssh://foo/bar"
     :raises ValueError: if this is not a RCP-style URL
     """
-    m = re.match('^(?P<user>[^@:/]+@)?(?P<host>[^/:]+):(?P<path>.*)$', location)
+    m = re.match('^(?P<user>[^@:/]+@)?(?P<host>[^/:]{2,}):(?P<path>.*)$',
+        location)
     if not m:
         raise ValueError("Not a RCP URL")
     if m.group('path').startswith('//'):

=== modified file 'breezy/osutils.py'
--- breezy/osutils.py	2021-11-13 13:01:39 +0000
+++ breezy/osutils.py	2021-12-25 12:35:58 +0000
@@ -329,31 +329,37 @@
     drive, path = ntpath.splitdrive(path)
     return drive.upper() + path
 
+def _win32_fix_separators(path):
+    """Return path with directory separators changed to forward slashes"""
+    if isinstance(path, bytes):
+        return path.replace(b'\\', b'/')
+    else:
+        return path.replace('\\', '/')
 
 def _win32_abspath(path):
     # Real ntpath.abspath doesn't have a problem with a unicode cwd
-    return _win32_fixdrive(ntpath.abspath(path).replace('\\', '/'))
+    return _win32_fixdrive(_win32_fix_separators(ntpath.abspath(path)))
 
 
 def _win32_realpath(path):
     # Real ntpath.realpath doesn't have a problem with a unicode cwd
-    return _win32_fixdrive(ntpath.realpath(path).replace('\\', '/'))
+    return _win32_fixdrive(_win32_fix_separators(ntpath.realpath(path)))
 
 
 def _win32_pathjoin(*args):
-    return ntpath.join(*args).replace('\\', '/')
+    return _win32_fix_separators(ntpath.join(*args))
 
 
 def _win32_normpath(path):
-    return _win32_fixdrive(ntpath.normpath(path).replace('\\', '/'))
+    return _win32_fixdrive(_win32_fix_separators(ntpath.normpath(path)))
 
 
 def _win32_getcwd():
-    return _win32_fixdrive(_getcwd().replace('\\', '/'))
+    return _win32_fixdrive(_win32_fix_separators(_getcwd()))
 
 
 def _win32_mkdtemp(*args, **kwargs):
-    return _win32_fixdrive(tempfile.mkdtemp(*args, **kwargs).replace('\\', '/'))
+    return _win32_fixdrive(_win32_fix_separators(tempfile.mkdtemp(*args, **kwargs)))
 
 
 def _win32_rename(old, new):
@@ -456,7 +462,7 @@
         Helps to remove files and dirs marked as read-only.
         """
         exception = excinfo[1]
-        if function in (os.remove, os.rmdir) \
+        if function in (os.unlink, os.remove, os.rmdir) \
                 and isinstance(exception, OSError) \
                 and exception.errno == errno.EACCES:
             make_writable(path)
@@ -1139,22 +1145,23 @@
         os.unlink(path)
 
 
-def has_symlinks():
-    if getattr(os, 'symlink', None) is not None:
-        return True
-    else:
-        return False
-
-
-def has_hardlinks():
-    if getattr(os, 'link', None) is not None:
-        return True
-    else:
-        return False
+def supports_hardlinks(path):
+    if getattr(os, 'link', None) is None:
+        return False
+    try:
+        fs_type = get_fs_type(path)
+    except errors.DependencyNotPresent as e:
+        trace.mutter('Unable to get fs type for %r: %s', path, e)
+        return True
+    else:
+        if fs_type in ('vfat', 'ntfs'):
+            # filesystems known to not support hardlinks
+            return False
+        return True
 
 
 def host_os_dereferences_symlinks():
-    return (has_symlinks()
+    return (getattr(os, 'symlink', None) is not None
             and sys.platform not in ('cygwin', 'win32'))
 
 
@@ -1582,7 +1589,7 @@
     """Return if the filesystem at path supports the creation of symbolic links.
 
     """
-    if not has_symlinks():
+    if getattr(os, 'symlink', None) is None:
         return False
     try:
         fs_type = get_fs_type(path)
@@ -2327,51 +2334,6 @@
             data, _ = self.encode(object, self.errors)
             self.stream.write(data)
 
-
-if sys.platform == 'win32':
-    def open_file(filename, mode='r', bufsize=-1):
-        """This function is used to override the ``open`` builtin.
-
-        But it uses O_NOINHERIT flag so the file handle is not inherited by
-        child processes.  Deleting or renaming a closed file opened with this
-        function is not blocking child processes.
-        """
-        writing = 'w' in mode
-        appending = 'a' in mode
-        updating = '+' in mode
-        binary = 'b' in mode
-
-        flags = O_NOINHERIT
-        # see http://msdn.microsoft.com/en-us/library/yeby3zcb%28VS.71%29.aspx
-        # for flags for each modes.
-        if binary:
-            flags |= O_BINARY
-        else:
-            flags |= O_TEXT
-
-        if writing:
-            if updating:
-                flags |= os.O_RDWR
-            else:
-                flags |= os.O_WRONLY
-            flags |= os.O_CREAT | os.O_TRUNC
-        elif appending:
-            if updating:
-                flags |= os.O_RDWR
-            else:
-                flags |= os.O_WRONLY
-            flags |= os.O_CREAT | os.O_APPEND
-        else:  # reading
-            if updating:
-                flags |= os.O_RDWR
-            else:
-                flags |= os.O_RDONLY
-
-        return os.fdopen(os.open(filename, flags), mode, bufsize)
-else:
-    open_file = open
-
-
 def available_backup_name(base, exists):
     """Find a non-existing backup file name.
 

=== modified file 'breezy/plugins/fastimport/exporter.py'
--- breezy/plugins/fastimport/exporter.py	2020-07-18 23:14:00 +0000
+++ breezy/plugins/fastimport/exporter.py	2021-12-25 12:35:58 +0000
@@ -504,7 +504,7 @@
         # Map kind changes to a delete followed by an add
         for change in changes.kind_changed:
             path = self._adjust_path_for_renames(
-                path, renamed, tree_new.get_revision_id())
+                change.path[0], renamed, tree_new.get_revision_id())
             # IGC: I don't understand why a delete is needed here.
             # In fact, it seems harmful? If you uncomment this line,
             # please file a bug explaining why you needed to.

=== modified file 'breezy/plugins/fastimport/tests/test_commands.py'
--- breezy/plugins/fastimport/tests/test_commands.py	2020-02-18 01:57:45 +0000
+++ breezy/plugins/fastimport/tests/test_commands.py	2021-12-25 12:35:58 +0000
@@ -156,7 +156,7 @@
 
     def test_symlink(self):
         tree = self.make_branch_and_tree("br")
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         os.symlink('symlink-target', 'br/symlink')
         tree.add('symlink')
         tree.commit("add a symlink")

=== modified file 'breezy/plugins/po_merge/po_merge.py'
--- breezy/plugins/po_merge/po_merge.py	2020-02-18 01:57:45 +0000
+++ breezy/plugins/po_merge/po_merge.py	2021-12-25 12:35:58 +0000
@@ -152,13 +152,13 @@
         env['result'] = osutils.pathjoin(tmpdir, 'result')
         env['pot_file'] = self.pot_file_abspath
         try:
-            with osutils.open_file(env['this'], 'wb') as f:
+            with open(env['this'], 'wb') as f:
                 f.writelines(params.this_lines)
-            with osutils.open_file(env['other'], 'wb') as f:
+            with open(env['other'], 'wb') as f:
                 f.writelines(params.other_lines)
             command = self.conf.expand_options(self.command, env)
             retcode, out, err = self._invoke(command)
-            with osutils.open_file(env['result'], 'rb') as f:
+            with open(env['result'], 'rb') as f:
                 # FIXME: To avoid the list() construct below which means the
                 # whole 'result' file is kept in memory, there may be a way to
                 # use an iterator that will close the file when it's done, but

=== modified file 'breezy/plugins/upload/tests/test_upload.py'
--- breezy/plugins/upload/tests/test_upload.py	2020-06-21 02:15:25 +0000
+++ breezy/plugins/upload/tests/test_upload.py	2021-12-25 12:35:58 +0000
@@ -176,13 +176,13 @@
         self.tree.commit('change %s from file to dir' % path)
 
     def add_symlink(self, path, target, base=branch_dir):
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         os.symlink(target, osutils.pathjoin(base, path))
         self.tree.add(path)
         self.tree.commit('add symlink %s -> %s' % (path, target))
 
     def modify_symlink(self, path, target, base=branch_dir):
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         full_path = osutils.pathjoin(base, path)
         os.unlink(full_path)
         os.symlink(target, full_path)

=== modified file 'breezy/smtp_connection.py'
--- breezy/smtp_connection.py	2020-02-18 01:57:45 +0000
+++ breezy/smtp_connection.py	2021-12-25 12:35:58 +0000
@@ -111,9 +111,8 @@
 
     def _create_connection(self):
         """Create an SMTP connection."""
-        self._connection = self._smtp_factory()
         try:
-            self._connection.connect(self._smtp_server)
+            self._connection = self._smtp_factory(host=self._smtp_server)
         except socket.error as e:
             if e.args[0] == errno.ECONNREFUSED:
                 if self._config_smtp_server is None:

=== modified file 'breezy/tests/blackbox/test_add.py'
--- breezy/tests/blackbox/test_add.py	2018-11-17 18:49:41 +0000
+++ breezy/tests/blackbox/test_add.py	2021-12-25 12:35:58 +0000
@@ -211,7 +211,7 @@
         self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
 
     def test_add_via_symlink(self):
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         self.make_branch_and_tree('source')
         self.build_tree(['source/top.txt'])
         os.symlink('source', 'link')
@@ -219,7 +219,7 @@
         self.assertEqual(out, 'adding top.txt\n')
 
     def test_add_symlink_to_abspath(self):
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         self.make_branch_and_tree('tree')
         os.symlink(osutils.abspath('target'), 'tree/link')
         out = self.run_bzr(['add', 'tree/link'])[0]

=== modified file 'breezy/tests/blackbox/test_branch.py'
--- breezy/tests/blackbox/test_branch.py	2020-06-13 02:58:24 +0000
+++ breezy/tests/blackbox/test_branch.py	2021-12-25 12:35:58 +0000
@@ -251,7 +251,7 @@
         self.assertTrue(pushed_repo.has_revision(b'b-1'))
 
     def test_branch_hardlink(self):
-        self.requireFeature(HardlinkFeature)
+        self.requireFeature(HardlinkFeature(self.test_dir))
         source = self.make_branch_and_tree('source')
         self.build_tree(['source/file1'])
         source.add('file1')
@@ -270,7 +270,7 @@
         self.assertPathExists('target/file1')
 
     def test_branch_files_from_hardlink(self):
-        self.requireFeature(HardlinkFeature)
+        self.requireFeature(HardlinkFeature(self.test_dir))
         source = self.make_branch_and_tree('source')
         self.build_tree(['source/file1'])
         source.add('file1')

=== modified file 'breezy/tests/blackbox/test_checkout.py'
--- breezy/tests/blackbox/test_checkout.py	2020-06-13 02:58:24 +0000
+++ breezy/tests/blackbox/test_checkout.py	2021-12-25 12:35:58 +0000
@@ -157,7 +157,7 @@
                       'branch'])
 
     def test_checkout_hardlink(self):
-        self.requireFeature(HardlinkFeature)
+        self.requireFeature(HardlinkFeature(self.test_dir))
         source = self.make_branch_and_tree('source')
         self.build_tree(['source/file1'])
         source.add('file1')
@@ -168,7 +168,7 @@
         self.assertEqual(source_stat, target_stat)
 
     def test_checkout_hardlink_files_from(self):
-        self.requireFeature(HardlinkFeature)
+        self.requireFeature(HardlinkFeature(self.test_dir))
         source = self.make_branch_and_tree('source')
         self.build_tree(['source/file1'])
         source.add('file1')

=== modified file 'breezy/tests/blackbox/test_cp.py'
--- breezy/tests/blackbox/test_cp.py	2018-07-16 22:59:06 +0000
+++ breezy/tests/blackbox/test_cp.py	2021-12-25 12:35:58 +0000
@@ -29,7 +29,6 @@
     )
 from breezy.tests.features import (
     CaseInsensitiveFilesystemFeature,
-    SymlinkFeature,
     UnicodeFilenameFeature,
     )
 

=== modified file 'breezy/tests/blackbox/test_link_tree.py'
--- breezy/tests/blackbox/test_link_tree.py	2018-02-18 15:21:06 +0000
+++ breezy/tests/blackbox/test_link_tree.py	2021-12-25 12:35:58 +0000
@@ -30,10 +30,9 @@
 
 class TestLinkTreeCommand(tests.TestCaseWithTransport):
 
-    _test_needs_features = [HardlinkFeature]
-
     def setUp(self):
         tests.TestCaseWithTransport.setUp(self)
+        self.requireFeature(HardlinkFeature(self.test_dir))
         self.parent_tree = self.make_branch_and_tree('parent')
         self.parent_tree.lock_write()
         self.addCleanup(self.parent_tree.unlock)

=== modified file 'breezy/tests/blackbox/test_merge_directive.py'
--- breezy/tests/blackbox/test_merge_directive.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/blackbox/test_merge_directive.py	2021-12-25 12:35:58 +0000
@@ -119,6 +119,7 @@
 
         def connect(self, host='localhost', port=0):
             connect_calls.append((self, host, port))
+            return (220, 'Ok')
 
         def has_extn(self, extension):
             return False

=== modified file 'breezy/tests/blackbox/test_mv.py'
--- breezy/tests/blackbox/test_mv.py	2018-11-23 19:47:13 +0000
+++ breezy/tests/blackbox/test_mv.py	2021-12-25 12:35:58 +0000
@@ -192,7 +192,7 @@
             'mv . a')
 
     def test_mv_through_symlinks(self):
-        self.requireFeature(SymlinkFeature)
+        self.requireFeature(SymlinkFeature(self.test_dir))
         tree = self.make_branch_and_tree('.')
         self.build_tree(['a/', 'a/b'])
         os.symlink('a', 'c')

=== modified file 'breezy/tests/blackbox/test_remove.py'
--- breezy/tests/blackbox/test_remove.py	2019-06-29 19:54:32 +0000
+++ breezy/tests/blackbox/test_remove.py	2021-12-25 12:35:58 +0000
@@ -123,7 +123,7 @@
         self.assertNotInWorkingTree('bar', tree=tree)
 
     def test_remove_no_files_specified_missing_link(self):
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         tree = self._make_tree_and_add(['foo'])
         os.symlink('foo', 'linkname')
         tree.add(['linkname'])

=== modified file 'breezy/tests/blackbox/test_revert.py'
--- breezy/tests/blackbox/test_revert.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/blackbox/test_revert.py	2021-12-25 12:35:58 +0000
@@ -145,7 +145,7 @@
         os.rmdir('revertdir')
         self.run_bzr('revert')
 
-        if breezy.osutils.has_symlinks():
+        if breezy.osutils.supports_symlinks(self.test_dir):
             os.symlink('/unlikely/to/exist', 'symlink')
             self.run_bzr('add symlink')
             self.run_bzr('commit -m f')

=== modified file 'breezy/tests/blackbox/test_too_much.py'
--- breezy/tests/blackbox/test_too_much.py	2020-06-21 02:15:25 +0000
+++ breezy/tests/blackbox/test_too_much.py	2021-12-25 12:35:58 +0000
@@ -85,7 +85,7 @@
         os.rmdir('revertdir')
         self.run_bzr('revert')
 
-        if osutils.has_symlinks():
+        if osutils.supports_symlinks(self.test_dir):
             os.symlink('/unlikely/to/exist', 'symlink')
             self.run_bzr('add symlink')
             self.run_bzr('commit -m f')
@@ -460,7 +460,7 @@
 
         self.run_bzr('info')
 
-        if osutils.has_symlinks():
+        if osutils.supports_symlinks(self.test_dir):
             progress("symlinks")
             mkdir('symlinks')
             chdir('symlinks')

=== modified file 'breezy/tests/features.py'
--- breezy/tests/features.py	2021-11-13 13:01:39 +0000
+++ breezy/tests/features.py	2021-12-25 12:35:58 +0000
@@ -59,30 +59,33 @@
         return self.__class__.__name__
 
 
-class _SymlinkFeature(Feature):
+class SymlinkFeature(Feature):
+    """Whether symlinks can be created by the current user."""
+
+    def __init__(self, path):
+        super(SymlinkFeature, self).__init__()
+        self.path = path
 
     def _probe(self):
-        return osutils.has_symlinks()
+        return osutils.supports_symlinks(self.path)
 
     def feature_name(self):
         return 'symlinks'
 
 
-SymlinkFeature = _SymlinkFeature()
-
-
-class _HardlinkFeature(Feature):
+class HardlinkFeature(Feature):
+
+    def __init__(self, path):
+        super(HardlinkFeature, self).__init__()
+        self.path = path
 
     def _probe(self):
-        return osutils.has_hardlinks()
+        return osutils.supports_hardlinks(self.path)
 
     def feature_name(self):
         return 'hardlinks'
 
 
-HardlinkFeature = _HardlinkFeature()
-
-
 class _OsFifoFeature(Feature):
 
     def _probe(self):

=== modified file 'breezy/tests/per_branch/test_sprout.py'
--- breezy/tests/per_branch/test_sprout.py	2020-01-12 13:56:10 +0000
+++ breezy/tests/per_branch/test_sprout.py	2021-12-25 12:35:58 +0000
@@ -161,7 +161,7 @@
         # Since the trigger function seems to be set_parent_trees, there exists
         # also a similar test, with name test_unicode_symlink, in class
         # TestSetParents at file per_workingtree/test_parents.py
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         self.requireFeature(features.UnicodeFilenameFeature)
 
         tree = self.make_branch_and_tree('tree1')

=== modified file 'breezy/tests/per_intertree/test_compare.py'
--- breezy/tests/per_intertree/test_compare.py	2021-11-13 17:24:04 +0000
+++ breezy/tests/per_intertree/test_compare.py	2021-12-25 12:35:58 +0000
@@ -25,7 +25,7 @@
     tests,
     )
 from breezy.tree import TreeChange
-from breezy.osutils import has_symlinks
+from breezy.osutils import supports_symlinks
 from breezy.bzr.inventorytree import InventoryTreeChange
 from breezy.tests.per_intertree import TestCaseWithTwoTrees
 from breezy.tests import (
@@ -390,7 +390,7 @@
         tree2 = self.make_to_branch_and_tree('tree2')
         tree2.set_root_id(tree1.path2id(''))
         self.build_tree(['tree2/file', 'tree2/dir/'])
-        if has_symlinks():
+        if supports_symlinks(self.test_dir):
             os.symlink('target', 'tree2/link')
             links_supported = True
         else:
@@ -1267,7 +1267,7 @@
         tree2 = self.make_to_branch_and_tree('tree2')
         tree2.set_root_id(tree1.path2id(''))
         self.build_tree(['tree2/file', 'tree2/dir/'])
-        if has_symlinks():
+        if supports_symlinks(self.test_dir):
             os.symlink('target', 'tree2/link')
             links_supported = True
         else:
@@ -1288,7 +1288,7 @@
         tree1 = self.make_branch_and_tree('tree1')
         tree2 = self.make_to_branch_and_tree('tree2')
         self.build_tree(['tree2/file', 'tree2/dir/'])
-        if has_symlinks():
+        if supports_symlinks(self.test_dir):
             os.symlink('target', 'tree2/link')
             links_supported = True
         else:
@@ -1322,7 +1322,7 @@
         self.build_tree(['tree2/file', 'tree2/dir/',
                          'tree1/file', 'tree2/movedfile',
                          'tree1/dir/', 'tree2/moveddir/'])
-        if has_symlinks():
+        if supports_symlinks(self.test_dir):
             os.symlink('target', 'tree1/link')
             os.symlink('target', 'tree2/link')
             os.symlink('target', 'tree2/movedlink')
@@ -1459,7 +1459,7 @@
         return self.mutable_trees_to_locked_test_trees(tree1, tree2)
 
     def test_versioned_symlinks(self):
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         tree1, tree2 = self.make_trees_with_symlinks()
         self.not_applicable_if_cannot_represent_unversioned(tree2)
         root_id = tree1.path2id('')
@@ -1482,7 +1482,7 @@
         self.check_has_changes(True, tree1, tree2)
 
     def test_versioned_symlinks_specific_files(self):
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         tree1, tree2 = self.make_trees_with_symlinks()
         root_id = tree1.path2id('')
         expected = [

=== modified file 'breezy/tests/per_repository/test_commit_builder.py'
--- breezy/tests/per_repository/test_commit_builder.py	2021-11-16 01:24:28 +0000
+++ breezy/tests/per_repository/test_commit_builder.py	2021-12-25 12:35:58 +0000
@@ -323,7 +323,7 @@
 
     def test_last_modified_revision_after_commit_link_unchanged(self):
         # committing without changing a link does not change the last modified.
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         tree = self.make_branch_and_tree('.')
         os.symlink('target', 'link')
         self._add_commit_check_unchanged(tree, 'link')
@@ -374,7 +374,7 @@
 
     def test_last_modified_revision_after_rename_link_changes(self):
         # renaming a link changes the last modified.
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         tree = self.make_branch_and_tree('.')
         os.symlink('target', 'link')
         self._add_commit_renamed_check_changed(tree, 'link')
@@ -419,7 +419,7 @@
 
     def test_last_modified_revision_after_reparent_link_changes(self):
         # reparenting a link changes the last modified.
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         tree = self.make_branch_and_tree('.')
         os.symlink('target', 'link')
         self._add_commit_reparent_check_changed(tree, 'link')
@@ -567,7 +567,7 @@
     def _test_last_mod_rev_after_content_link_changes(
             self, link, target, newtarget):
         # changing a link changes the last modified.
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         tree = self.make_branch_and_tree('.')
         os.symlink(target, link)
 
@@ -642,7 +642,7 @@
 
     def test_last_modified_revision_after_merge_link_changes(self):
         # merge a link changes the last modified.
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         tree1 = self.make_branch_and_tree('t1')
         os.symlink('target', 't1/link')
         self._commit_sprout_rename_merge(tree1, 'link')
@@ -720,7 +720,7 @@
 
     def test_last_modified_revision_after_converged_merge_link_unchanged(self):
         # merge a link that changed preserves the last modified.
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         tree1 = self.make_branch_and_tree('t1')
         os.symlink('target', 't1/link')
         self._commit_sprout_rename_merge_converged(tree1, 'link')
@@ -750,7 +750,7 @@
         self.build_tree([name])
 
     def make_link(self, name):
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         os.symlink('target', name)
 
     def make_reference(self, name):

=== modified file 'breezy/tests/per_tree/__init__.py'
--- breezy/tests/per_tree/__init__.py	2020-11-18 22:02:00 +0000
+++ breezy/tests/per_tree/__init__.py	2021-12-25 12:35:58 +0000
@@ -247,7 +247,7 @@
                             Note: if you wish to automatically set this
                             parameters depending on underlying system,
                             please use value returned
-                            by breezy.osutils.has_symlinks() function.
+                            by breezy.osutils.supports_symlinks() function.
 
         The returned tree has the following inventory:
             ['',

=== modified file 'breezy/tests/per_tree/test_archive.py'
--- breezy/tests/per_tree/test_archive.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/per_tree/test_archive.py	2021-12-25 12:35:58 +0000
@@ -47,7 +47,7 @@
         self.assertIn('dir', names)
 
     def test_export_symlink(self):
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         work_a = self.make_branch_and_tree('wta')
         os.symlink('target', 'wta/link')
         work_a.add('link')
@@ -99,7 +99,7 @@
             zf.close()
 
     def test_export_symlink(self):
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         work_a = self.make_branch_and_tree('wta')
         os.symlink('target', 'wta/link')
         work_a.add('link')

=== modified file 'breezy/tests/per_tree/test_export.py'
--- breezy/tests/per_tree/test_export.py	2018-02-18 15:21:06 +0000
+++ breezy/tests/per_tree/test_export.py	2021-12-25 12:35:58 +0000
@@ -40,7 +40,7 @@
         export(tree_a, 'output', self.exporter)
 
     def prepare_symlink_export(self):
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         work_a = self.make_branch_and_tree('wta')
         os.symlink('target', 'wta/link')
         work_a.add('link')

=== modified file 'breezy/tests/per_tree/test_get_symlink_target.py'
--- breezy/tests/per_tree/test_get_symlink_target.py	2021-11-13 13:01:39 +0000
+++ breezy/tests/per_tree/test_get_symlink_target.py	2021-12-25 12:35:58 +0000
@@ -31,7 +31,7 @@
 class TestGetSymlinkTarget(per_tree.TestCaseWithTree):
 
     def get_tree_with_symlinks(self):
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         tree = self.make_branch_and_tree('tree')
         os.symlink('foo', 'tree/link')
         os.symlink('../bar', 'tree/rel_link')
@@ -53,7 +53,7 @@
                          tree.get_symlink_target('link'))
 
     def test_get_unicode_symlink_target(self):
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         self.requireFeature(features.UnicodeFilenameFeature)
         tree = self.make_branch_and_tree('tree')
         target = u'targ\N{Euro Sign}t'

=== modified file 'breezy/tests/per_tree/test_is_executable.py'
--- breezy/tests/per_tree/test_is_executable.py	2017-11-12 14:19:13 +0000
+++ breezy/tests/per_tree/test_is_executable.py	2021-12-25 12:35:58 +0000
@@ -32,7 +32,7 @@
         self.assertEqual(False, tree.is_executable('1top-dir'))
 
     def test_is_executable_symlink(self):
-        self.requireFeature(SymlinkFeature)
+        self.requireFeature(SymlinkFeature(self.test_dir))
         tree = self.get_tree_with_subdirs_and_all_content_types()
         tree.lock_read()
         self.addCleanup(tree.unlock)

=== modified file 'breezy/tests/per_tree/test_path_content_summary.py'
--- breezy/tests/per_tree/test_path_content_summary.py	2021-11-13 13:01:39 +0000
+++ breezy/tests/per_tree/test_path_content_summary.py	2021-12-25 12:35:58 +0000
@@ -56,7 +56,7 @@
             self.fail("invalid size in summary: %r" % (returned_size,))
 
     def test_symlink_content_summary(self):
-        self.requireFeature(SymlinkFeature)
+        self.requireFeature(SymlinkFeature(self.test_dir))
         tree = self.make_branch_and_tree('tree')
         os.symlink('target', 'tree/path')
         tree.add(['path'])
@@ -64,7 +64,7 @@
         self.assertEqual(('symlink', None, None, 'target'), summary)
 
     def test_unicode_symlink_content_summary(self):
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         self.requireFeature(features.UnicodeFilenameFeature)
         tree = self.make_branch_and_tree('tree')
         os.symlink('target', os.fsencode(u'tree/\u03b2-path'))
@@ -73,7 +73,7 @@
         self.assertEqual(('symlink', None, None, 'target'), summary)
 
     def test_unicode_symlink_target_summary(self):
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         self.requireFeature(features.UnicodeFilenameFeature)
         tree = self.make_branch_and_tree('tree')
         os.symlink(os.fsencode(u'tree/\u03b2-path'), 'tree/link')

=== modified file 'breezy/tests/per_tree/test_symlinks.py'
--- breezy/tests/per_tree/test_symlinks.py	2020-07-07 20:32:36 +0000
+++ breezy/tests/per_tree/test_symlinks.py	2021-12-25 12:35:58 +0000
@@ -46,10 +46,9 @@
 
 class TestTreeWithSymlinks(per_tree.TestCaseWithTree):
 
-    _test_needs_features = [features.SymlinkFeature]
-
     def setUp(self):
         super(TestTreeWithSymlinks, self).setUp()
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         self.tree = self.get_tree_with_subdirs_and_all_content_types()
         self.tree.lock_read()
         self.addCleanup(self.tree.unlock)

=== modified file 'breezy/tests/per_tree/test_test_trees.py'
--- breezy/tests/per_tree/test_test_trees.py	2021-11-13 21:30:35 +0000
+++ breezy/tests/per_tree/test_test_trees.py	2021-12-25 12:35:58 +0000
@@ -204,7 +204,7 @@
         # currently this test tree requires unicode. It might be good
         # to have it simply stop having the single unicode file in it
         # when dealing with a non-unicode filesystem.
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         tree = self.get_tree_with_subdirs_and_all_content_types()
         tree.lock_read()
         self.addCleanup(tree.unlock)

=== modified file 'breezy/tests/per_tree/test_transform.py'
--- breezy/tests/per_tree/test_transform.py	2021-11-13 16:17:55 +0000
+++ breezy/tests/per_tree/test_transform.py	2021-12-25 12:35:58 +0000
@@ -38,7 +38,6 @@
 
 
 from ..features import (
-    HardlinkFeature,
     SymlinkFeature,
     UnicodeFilenameFeature,
     )
@@ -96,7 +95,7 @@
         self.assertEqual(lines[4], b"+content B")
 
     def test_unsupported_symlink_diff(self):
-        self.requireFeature(SymlinkFeature)
+        self.requireFeature(SymlinkFeature(self.test_dir))
         tree = self.make_branch_and_tree('.')
         self.build_tree_contents([('a', 'content 1')])
         tree.add('a')
@@ -104,16 +103,16 @@
         tree.add('foo')
         revid1 = tree.commit('rev1')
         revision_tree = tree.branch.repository.revision_tree(revid1)
-        preview = revision_tree.preview_transform()
-        self.addCleanup(preview.finalize)
-        preview.delete_versioned(preview.trans_id_tree_path('foo'))
-        preview_tree = preview.get_preview_tree()
-        out = BytesIO()
-        log = BytesIO()
-        trace.push_log_file(log)
         os_symlink = getattr(os, 'symlink', None)
         os.symlink = None
         try:
+            preview = revision_tree.preview_transform()
+            self.addCleanup(preview.finalize)
+            preview.delete_versioned(preview.trans_id_tree_path('foo'))
+            preview_tree = preview.get_preview_tree()
+            out = BytesIO()
+            log = BytesIO()
+            trace.push_log_file(log)
             show_diff_trees(revision_tree, preview_tree, out)
             lines = out.getvalue().splitlines()
         finally:
@@ -253,7 +252,7 @@
             self.assertEqual(b'contents', tree_file.read())
 
     def test_get_symlink_target(self):
-        self.requireFeature(SymlinkFeature)
+        self.requireFeature(SymlinkFeature(self.test_dir))
         preview = self.get_empty_preview()
         preview.new_symlink('symlink', preview.root, 'target', b'symlink-id')
         preview_tree = preview.get_preview_tree()
@@ -391,7 +390,7 @@
         self.assertMatchingIterEntries(tt, ['', 'parent/child'])
 
     def test_symlink_content_summary(self):
-        self.requireFeature(SymlinkFeature)
+        self.requireFeature(SymlinkFeature(self.test_dir))
         preview = self.get_empty_preview()
         preview.new_symlink('path', preview.root, 'target', b'path-id')
         summary = preview.get_preview_tree().path_content_summary('path')

=== modified file 'breezy/tests/per_tree/test_walkdirs.py'
--- breezy/tests/per_tree/test_walkdirs.py	2021-11-13 21:30:35 +0000
+++ breezy/tests/per_tree/test_walkdirs.py	2021-12-25 12:35:58 +0000
@@ -20,7 +20,7 @@
 
 from breezy import tests
 from breezy.mutabletree import MutableTree
-from breezy.osutils import has_symlinks
+from breezy.osutils import supports_symlinks
 from breezy.tests.per_tree import TestCaseWithTree
 
 
@@ -55,10 +55,10 @@
 
     def test_walkdir_root(self):
         tree = self.get_tree_with_subdirs_and_all_supported_content_types(
-            has_symlinks())
+            supports_symlinks(self.test_dir))
         with tree.lock_read():
             expected_dirblocks = self.get_all_subdirs_expected(
-                tree, has_symlinks())
+                tree, supports_symlinks(self.test_dir))
             # test that its iterable by iterating
             result = []
             for dirinfo, block in tree.walkdirs():
@@ -76,12 +76,12 @@
 
     def test_walkdir_subtree(self):
         tree = self.get_tree_with_subdirs_and_all_supported_content_types(
-            has_symlinks())
+            supports_symlinks(self.test_dir))
         # test that its iterable by iterating
         result = []
         with tree.lock_read():
             expected_dirblocks = self.get_all_subdirs_expected(
-                tree, has_symlinks())[1:]
+                tree, supports_symlinks(self.test_dir))[1:]
             for dirinfo, block in tree.walkdirs('1top-dir'):
                 newblock = []
                 for row in block:

=== modified file 'breezy/tests/per_workingtree/test_parents.py'
--- breezy/tests/per_workingtree/test_parents.py	2020-02-07 02:14:30 +0000
+++ breezy/tests/per_workingtree/test_parents.py	2021-12-25 12:35:58 +0000
@@ -254,7 +254,7 @@
 
     def test_unicode_symlink(self):
         # this tests bug #272444
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         self.requireFeature(features.UnicodeFilenameFeature)
 
         tree = self.make_branch_and_tree('tree1')

=== modified file 'breezy/tests/per_workingtree/test_symlinks.py'
--- breezy/tests/per_workingtree/test_symlinks.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/per_workingtree/test_symlinks.py	2021-12-25 12:35:58 +0000
@@ -34,7 +34,9 @@
 
     # See eg <https://bugs.launchpad.net/bzr/+bug/192859>
 
-    _test_needs_features = [features.SymlinkFeature]
+    def setUp(self):
+        super(TestSmartAddTree, self).setUp()
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
 
     def test_smart_add_symlink(self):
         tree = self.make_branch_and_tree('tree')
@@ -84,7 +86,9 @@
 
 class TestKindChanges(TestCaseWithWorkingTree):
 
-    _test_needs_features = [features.SymlinkFeature]
+    def setUp(self):
+        super(TestKindChanges, self).setUp()
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
 
     def test_symlink_changes_to_dir(self):
         # <https://bugs.launchpad.net/bzr/+bug/192859>:
@@ -134,7 +138,9 @@
 
 class TestOpenTree(TestCaseWithWorkingTree):
 
-    _test_needs_features = [features.SymlinkFeature]
+    def setUp(self):
+        super(TestOpenTree, self).setUp()
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
 
     def test_open_containing_through_symlink(self):
         self.make_test_tree()

=== modified file 'breezy/tests/per_workingtree/test_transform.py'
--- breezy/tests/per_workingtree/test_transform.py	2021-11-16 01:24:28 +0000
+++ breezy/tests/per_workingtree/test_transform.py	2021-12-25 12:35:58 +0000
@@ -380,7 +380,7 @@
         self.assertEqual(old_root_id, self.wt.path2id(''))
 
     def test_hardlink(self):
-        self.requireFeature(HardlinkFeature)
+        self.requireFeature(HardlinkFeature(self.test_dir))
         transform, root = self.transform()
         transform.new_file('file1', root, [b'contents'])
         transform.apply()
@@ -830,7 +830,7 @@
         def ozpath(p):
             return 'oz/' + p
 
-        self.requireFeature(SymlinkFeature)
+        self.requireFeature(SymlinkFeature(self.test_dir))
         transform, root = self.transform()
         oz_id = transform.new_directory('oz', root, b'oz-id')
         transform.new_symlink(link_name1, oz_id, link_target1, b'wizard-id')
@@ -1700,7 +1700,7 @@
         self.assertFalse(changes.has_changed(), changes)
 
     def test_file_to_symlink(self):
-        self.requireFeature(SymlinkFeature)
+        self.requireFeature(SymlinkFeature(self.test_dir))
         wt = self.make_branch_and_tree('.')
         self.build_tree(['foo'])
         wt.add(['foo'])
@@ -1753,7 +1753,7 @@
         self.assertEqual(wt.kind("foo"), "file")
 
     def test_dir_to_hardlink(self):
-        self.requireFeature(HardlinkFeature)
+        self.requireFeature(HardlinkFeature(self.test_dir))
         wt = self.make_branch_and_tree('.')
         self.build_tree(['foo/', 'foo/bar'])
         wt.add(['foo', 'foo/bar'])
@@ -1807,7 +1807,7 @@
         self.assertFileEqual(b'qux', 'tree2/foo')
 
     def test_create_from_tree_symlink(self):
-        self.requireFeature(SymlinkFeature)
+        self.requireFeature(SymlinkFeature(self.test_dir))
         tree1 = self.make_branch_and_tree('tree1')
         os.symlink('bar', 'tree1/foo')
         tree1.add('foo')

=== modified file 'breezy/tests/per_workingtree/test_walkdirs.py'
--- breezy/tests/per_workingtree/test_walkdirs.py	2020-08-07 18:35:50 +0000
+++ breezy/tests/per_workingtree/test_walkdirs.py	2021-12-25 12:35:58 +0000
@@ -162,7 +162,7 @@
 
     def test_walkdirs_type_changes(self):
         """Walkdir shows the actual kinds on disk and the recorded kinds."""
-        self.requireFeature(SymlinkFeature)
+        self.requireFeature(SymlinkFeature(self.test_dir))
         tree = self.make_branch_and_tree('.')
         paths = ['file1', 'file2', 'dir1/', 'dir2/']
         self.build_tree(paths)

=== modified file 'breezy/tests/per_workingtree/test_workingtree.py'
--- breezy/tests/per_workingtree/test_workingtree.py	2021-11-16 17:49:16 +0000
+++ breezy/tests/per_workingtree/test_workingtree.py	2021-12-25 12:35:58 +0000
@@ -41,7 +41,7 @@
     )
 from ...bzr.inventory import Inventory
 from ...mutabletree import MutableTree
-from ...osutils import pathjoin, getcwd, has_symlinks
+from ...osutils import pathjoin, getcwd, supports_symlinks
 from .. import (
     features,
     TestSkipped,
@@ -83,7 +83,7 @@
     def test_list_files(self):
         tree = self.make_branch_and_tree('.')
         self.build_tree(['dir/', 'file'])
-        if has_symlinks():
+        if supports_symlinks(self.test_dir):
             os.symlink('target', 'symlink')
         tree.lock_read()
         files = list(tree.list_files())
@@ -91,7 +91,7 @@
         self.assertEqual(
             files.pop(0), ('dir', '?', 'directory', TreeDirectory()))
         self.assertEqual(files.pop(0), ('file', '?', 'file', TreeFile()))
-        if has_symlinks():
+        if supports_symlinks(self.test_dir):
             self.assertEqual(
                 files.pop(0), ('symlink', '?', 'symlink', TreeLink()))
 
@@ -977,7 +977,7 @@
         self.addCleanup(tree.unlock)
         self.build_tree(['file', 'directory/'])
         names = ['file', 'directory']
-        if has_symlinks():
+        if supports_symlinks(self.test_dir):
             os.symlink('target', 'symlink')
             names.append('symlink')
         tree.add(names)

=== modified file 'breezy/tests/test_clean_tree.py'
--- breezy/tests/test_clean_tree.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/test_clean_tree.py	2021-12-25 12:35:58 +0000
@@ -29,7 +29,7 @@
     iter_deletables,
     )
 from ..osutils import (
-    has_symlinks,
+    supports_symlinks,
     )
 from . import (
     TestCaseInTempDir,
@@ -39,7 +39,7 @@
 class TestCleanTree(TestCaseInTempDir):
 
     def test_symlinks(self):
-        if has_symlinks() is False:
+        if supports_symlinks(self.test_dir) is False:
             return
         os.mkdir('branch')
         ControlDir.create_standalone_workingtree('branch')

=== modified file 'breezy/tests/test_commit.py'
--- breezy/tests/test_commit.py	2021-11-13 16:17:55 +0000
+++ breezy/tests/test_commit.py	2021-12-25 12:35:58 +0000
@@ -677,7 +677,7 @@
             basis.unlock()
 
     def test_unsupported_symlink_commit(self):
-        self.requireFeature(SymlinkFeature)
+        self.requireFeature(SymlinkFeature(self.test_dir))
         tree = self.make_branch_and_tree('.')
         self.build_tree(['hello'])
         tree.add('hello')
@@ -706,7 +706,7 @@
             b'supported on this filesystem\\.')
 
     def test_commit_kind_changes(self):
-        self.requireFeature(SymlinkFeature)
+        self.requireFeature(SymlinkFeature(self.test_dir))
         tree = self.make_branch_and_tree('.')
         os.symlink('target', 'name')
         tree.add('name', b'a-file-id')

=== modified file 'breezy/tests/test_commit_merge.py'
--- breezy/tests/test_commit_merge.py	2019-06-29 13:16:26 +0000
+++ breezy/tests/test_commit_merge.py	2021-12-25 12:35:58 +0000
@@ -106,7 +106,7 @@
         check.check_dwim(by.base, False, True, True)
 
     def test_merge_with_symlink(self):
-        self.requireFeature(SymlinkFeature)
+        self.requireFeature(SymlinkFeature(self.test_dir))
         tree_a = self.make_branch_and_tree('tree_a')
         os.symlink('target', osutils.pathjoin('tree_a', 'link'))
         tree_a.add('link')

=== modified file 'breezy/tests/test_diff.py'
--- breezy/tests/test_diff.py	2020-07-18 23:14:00 +0000
+++ breezy/tests/test_diff.py	2021-12-25 12:35:58 +0000
@@ -790,7 +790,7 @@
             br' \@\@\n-old\n\+new\n\n')
 
     def test_diff_kind_change(self):
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         self.build_tree_contents([('old-tree/olddir/',),
                                   ('old-tree/olddir/oldfile', b'old\n')])
         self.old_tree.add('olddir')

=== modified file 'breezy/tests/test_export.py'
--- breezy/tests/test_export.py	2020-02-07 02:14:30 +0000
+++ breezy/tests/test_export.py	2021-12-25 12:35:58 +0000
@@ -50,7 +50,7 @@
         self.assertEqual([], os.listdir("target"))
 
     def test_symlink(self):
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         wt = self.make_branch_and_tree('.')
         os.symlink('source', 'link')
         wt.add(['link'])

=== modified file 'breezy/tests/test_location.py'
--- breezy/tests/test_location.py	2021-06-04 19:21:33 +0000
+++ breezy/tests/test_location.py	2021-12-25 12:35:58 +0000
@@ -131,3 +131,5 @@
     def test_invalid(self):
         self.assertRaises(ValueError, rcp_location_to_url, "http://srv/git/bar")
         self.assertRaises(ValueError, rcp_location_to_url, "git/bar")
+        # rcp host names cannot be shorter than two characters
+        self.assertRaises(ValueError, rcp_location_to_url, "c:/git/bar")

=== modified file 'breezy/tests/test_merge.py'
--- breezy/tests/test_merge.py	2021-03-22 21:07:08 +0000
+++ breezy/tests/test_merge.py	2021-12-25 12:35:58 +0000
@@ -2290,7 +2290,7 @@
         self.assertTrue(wt.is_executable('foo'))
 
     def test_create_symlink(self):
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         #   A
         #  / \
         # B   C
@@ -2361,7 +2361,7 @@
                              wt.get_file_text('foo'))
 
     def test_modified_symlink(self):
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         #   A       Create symlink foo => bar
         #  / \
         # B   C     B relinks foo => baz
@@ -2406,7 +2406,7 @@
         self.assertEqual('bing', wt.get_symlink_target('foo'))
 
     def test_renamed_symlink(self):
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         #   A       Create symlink foo => bar
         #  / \
         # B   C     B renames foo => barry
@@ -2463,7 +2463,7 @@
         self.assertEqual('blah', wt.id2path(b'foo-id'))
 
     def test_symlink_no_content_change(self):
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         #   A       Create symlink foo => bar
         #  / \
         # B   C     B relinks foo => baz
@@ -2513,7 +2513,7 @@
         self.assertEqual('bing', wt.get_symlink_target('foo'))
 
     def test_symlink_this_changed_kind(self):
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         #   A       Nothing
         #  / \
         # B   C     B creates symlink foo => bar
@@ -2567,7 +2567,7 @@
 
     def test_symlink_all_wt(self):
         """Check behavior if all trees are Working Trees."""
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         # The big issue is that entry.symlink_target is None for WorkingTrees.
         # So we need to make sure we handle that case correctly.
         #   A   foo => bar

=== modified file 'breezy/tests/test_osutils.py'
--- breezy/tests/test_osutils.py	2021-11-13 13:01:39 +0000
+++ breezy/tests/test_osutils.py	2021-12-25 12:35:58 +0000
@@ -294,7 +294,7 @@
         self.build_tree(['file', 'dir/'])
         self.assertEqual('file', osutils.file_kind('file'))
         self.assertEqual('directory', osutils.file_kind('dir/'))
-        if osutils.has_symlinks():
+        if osutils.supports_symlinks(self.test_dir):
             os.symlink('symlink', 'symlink')
             self.assertEqual('symlink', osutils.file_kind('symlink'))
 
@@ -479,7 +479,7 @@
 class TestLinks(tests.TestCaseInTempDir):
 
     def test_dereference_path(self):
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         cwd = osutils.realpath('.')
         os.mkdir('bar')
         bar_path = osutils.pathjoin(cwd, 'bar')
@@ -519,7 +519,7 @@
         mode = os.lstat('file').st_mode
         self.assertEqual(mode, mode | 0o200)
 
-        if osutils.has_symlinks():
+        if osutils.supports_symlinks(self.test_dir):
             # should not error when handed a symlink
             os.symlink('nonexistent', 'dangling')
             osutils.make_readonly('dangling')
@@ -1603,7 +1603,7 @@
         self.assertEqual(['c'], os.listdir('target/b'))
 
     def test_copy_tree_symlinks(self):
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         self.build_tree(['source/'])
         os.symlink('a/generic/path', 'source/lnk')
         osutils.copy_tree('source', 'target')
@@ -1628,7 +1628,7 @@
                     }
 
         self.build_tree(['source/', 'source/a', 'source/b/', 'source/b/c'])
-        if osutils.has_symlinks():
+        if osutils.supports_symlinks(self.test_dir):
             os.symlink('a/generic/path', 'source/lnk')
         osutils.copy_tree('source', 'target', handlers=handlers)
 
@@ -1638,7 +1638,7 @@
                           ('f', 'source/b/c', 'target/b/c'),
                           ], processed_files)
         self.assertPathDoesNotExist('target')
-        if osutils.has_symlinks():
+        if osutils.supports_symlinks(self.test_dir):
             self.assertEqual([('source/lnk', 'target/lnk')], processed_links)
 
 
@@ -1860,7 +1860,7 @@
         self.assertEqual(expected_dirblocks, self._filter_out(result))
 
     def test_symlink(self):
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         self.requireFeature(features.UnicodeFilenameFeature)
         target = u'target\N{Euro Sign}'
         link_name = u'l\N{Euro Sign}nk'
@@ -1884,11 +1884,11 @@
     But prior python versions failed to properly encode the passed unicode
     string.
     """
-    _test_needs_features = [features.SymlinkFeature,
-                            features.UnicodeFilenameFeature]
+    _test_needs_features = [features.UnicodeFilenameFeature]
 
     def setUp(self):
         super(tests.TestCaseInTempDir, self).setUp()
+        self._test_needs_features.append(features.SymlinkFeature(self.test_dir))
         self.link = u'l\N{Euro Sign}ink'
         self.target = u'targe\N{Euro Sign}t'
         os.symlink(self.target, self.link)
@@ -2121,7 +2121,7 @@
     def envvar_to_override(self):
         if sys.platform == "win32":
             # Disable use of platform calls on windows so envvar is used
-            self.overrideAttr(win32utils, 'has_ctypes', False)
+            self.overrideAttr(win32utils.ctypes, 'windll', None)
             return 'USERNAME'  # only variable used on windows
         return 'LOGNAME'  # first variable checked by getpass.getuser()
 

=== modified file 'breezy/tests/test_server.py'
--- breezy/tests/test_server.py	2020-06-10 23:47:24 +0000
+++ breezy/tests/test_server.py	2021-12-25 12:35:58 +0000
@@ -350,6 +350,7 @@
             accepted_errnos = [errno.EBADF,
                                errno.EPIPE,
                                errno.WSAEBADF,
+                               errno.WSAENOTSOCK,
                                errno.WSAECONNRESET,
                                errno.WSAENOTCONN,
                                errno.WSAESHUTDOWN,

=== modified file 'breezy/tests/test_shelf.py'
--- breezy/tests/test_shelf.py	2020-07-04 12:29:00 +0000
+++ breezy/tests/test_shelf.py	2021-12-25 12:35:58 +0000
@@ -257,7 +257,7 @@
 
     def _test_shelve_symlink_creation(self, link_name, link_target,
                                       shelve_change=False):
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         tree = self.make_branch_and_tree('.')
         tree.lock_write()
         self.addCleanup(tree.unlock)
@@ -297,7 +297,7 @@
     def _test_shelve_symlink_target_change(self, link_name,
                                            old_target, new_target,
                                            shelve_change=False):
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         tree = self.make_branch_and_tree('.')
         tree.lock_write()
         self.addCleanup(tree.unlock)

=== modified file 'breezy/tests/test_shelf_ui.py'
--- breezy/tests/test_shelf_ui.py	2020-02-07 02:14:30 +0000
+++ breezy/tests/test_shelf_ui.py	2021-12-25 12:35:58 +0000
@@ -214,7 +214,7 @@
         shelver.expect('Shelve 1 change(s)?', 0)
 
     def test_shelve_modify_target(self):
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         tree = self.create_shelvable_tree()
         os.symlink('bar', 'tree/baz')
         tree.add('baz', b'baz-id')
@@ -443,7 +443,7 @@
         shelver.expect('Apply 1 change(s)?', 0)
 
     def test_shelve_modify_target(self):
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         tree = self.create_shelvable_tree()
         os.symlink('bar', 'tree/baz')
         tree.add('baz', b'baz-id')

=== modified file 'breezy/tests/test_smtp_connection.py'
--- breezy/tests/test_smtp_connection.py	2020-02-07 02:14:30 +0000
+++ breezy/tests/test_smtp_connection.py	2021-12-25 12:35:58 +0000
@@ -28,12 +28,8 @@
     )
 
 
-def connection_refuser():
-    def connect(server):
-        raise socket.error(errno.ECONNREFUSED, 'Connection Refused')
-    smtp = smtplib.SMTP()
-    smtp.connect = connect
-    return smtp
+def connection_refuser(host):
+    raise socket.error(errno.ECONNREFUSED, 'Connection Refused')
 
 
 class StubSMTPFactory(object):
@@ -45,12 +41,13 @@
         self._smtp_features = smtp_features or []
         self._ehlo_called = False
 
-    def __call__(self):
+    def __call__(self, host='localhost'):
+        self._calls.append(('connect', host))
         # The factory pretends to be a connection
         return self
 
     def connect(self, server):
-        self._calls.append(('connect', server))
+        raise NotImplementedError
 
     def helo(self):
         self._calls.append(('helo',))
@@ -218,8 +215,9 @@
     def test_create_connection_starttls_fails(self):
         # Check that we raise an exception if the server claims to
         # support STARTTLS, but then fails when we try to activate it.
-        factory = StubSMTPFactory(fail_on=['starttls'],
-                                  smtp_features=['starttls'])
+        factory = StubSMTPFactory(
+            fail_on=['starttls'],
+            smtp_features=['starttls'])
         conn = self.get_connection(b'', smtp_factory=factory)
         self.assertRaises(smtp_connection.SMTPError, conn._create_connection)
         self.assertEqual([('connect', 'localhost'),

=== modified file 'breezy/tests/test_transform.py'
--- breezy/tests/test_transform.py	2021-08-18 22:38:08 +0000
+++ breezy/tests/test_transform.py	2021-12-25 12:35:58 +0000
@@ -184,7 +184,7 @@
         this.wt.revert()
 
     def test_file_merge(self):
-        self.requireFeature(SymlinkFeature)
+        self.requireFeature(SymlinkFeature(self.test_dir))
         root_id = generate_ids.gen_root_id()
         base = TransformGroup("BASE", root_id)
         this = TransformGroup("THIS", root_id)
@@ -358,14 +358,14 @@
         branch, tt = self.get_branch_and_transform()
         tt.new_file('file', tt.root, [b'contents'], b'file-id')
         trans_id = tt.new_directory('dir', tt.root, b'dir-id')
-        if SymlinkFeature.available():
+        if SymlinkFeature(self.test_dir).available():
             tt.new_symlink('symlink', trans_id, 'target', b'symlink-id')
         tt.commit(branch, 'message')
         tree = branch.basis_tree()
         self.assertEqual('file', tree.id2path(b'file-id'))
         self.assertEqual(b'contents', tree.get_file_text('file'))
         self.assertEqual('dir', tree.id2path(b'dir-id'))
-        if SymlinkFeature.available():
+        if SymlinkFeature(self.test_dir).available():
             self.assertEqual('dir/symlink', tree.id2path(b'symlink-id'))
             self.assertEqual('target', tree.get_symlink_target('dir/symlink'))
 
@@ -802,13 +802,13 @@
         return self.make_records(attribs, contents)
 
     def test_serialize_symlink_creation(self):
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         tt = self.get_preview()
         tt.new_symlink(u'foo\u1234', tt.root, u'bar\u1234')
         self.assertSerializesTo(self.symlink_creation_records(), tt)
 
     def test_deserialize_symlink_creation(self):
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         tt = self.get_preview()
         tt.deserialize(iter(self.symlink_creation_records()))
         abspath = tt._limbo_name('new-1')
@@ -1115,10 +1115,9 @@
 
 class TestLinkTree(tests.TestCaseWithTransport):
 
-    _test_needs_features = [HardlinkFeature]
-
     def setUp(self):
         tests.TestCaseWithTransport.setUp(self)
+        self.requireFeature(HardlinkFeature(self.test_dir))
         self.parent_tree = self.make_branch_and_tree('parent')
         self.parent_tree.lock_write()
         self.addCleanup(self.parent_tree.unlock)

=== modified file 'breezy/tests/test_treeshape.py'
--- breezy/tests/test_treeshape.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/test_treeshape.py	2021-12-25 12:35:58 +0000
@@ -38,7 +38,7 @@
         self.assertFileEqual(b'hello', '.bzr/README')
 
     def test_build_tree_symlink(self):
-        self.requireFeature(features.SymlinkFeature)
+        self.requireFeature(features.SymlinkFeature(self.test_dir))
         self.build_tree_contents([('link@', 'target')])
         self.assertEqual('target',
                          os.readlink('link'))

=== modified file 'breezy/tests/test_workingtree.py'
--- breezy/tests/test_workingtree.py	2020-08-09 18:10:01 +0000
+++ breezy/tests/test_workingtree.py	2021-12-25 12:35:58 +0000
@@ -457,7 +457,7 @@
         self.assertPathDoesNotExist('this/hello.BASE')
 
     def test_unsupported_symlink_auto_resolve(self):
-        self.requireFeature(SymlinkFeature)
+        self.requireFeature(SymlinkFeature(self.test_dir))
         base = self.make_branch_and_tree('base')
         self.build_tree_contents([('base/hello', 'Hello')])
         base.add('hello', b'hello_id')

=== modified file 'breezy/transform.py'
--- breezy/transform.py	2021-11-13 16:17:01 +0000
+++ breezy/transform.py	2021-12-25 12:35:58 +0000
@@ -50,7 +50,6 @@
     pathjoin,
     sha_file,
     splitpath,
-    supports_symlinks,
     )
 from .progress import ProgressPhase
 from .tree import (
@@ -1132,6 +1131,9 @@
     def supports_setting_file_ids(self):
         raise NotImplementedError(self.supports_setting_file_ids)
 
+    def supports_symlinks(self):
+        return self._transform._tree.supports_symlinks()
+
     @property
     def _by_parent(self):
         if self.__by_parent is None:

=== modified file 'breezy/transport/local.py'
--- breezy/transport/local.py	2020-02-18 01:57:45 +0000
+++ breezy/transport/local.py	2021-12-25 12:35:58 +0000
@@ -152,7 +152,7 @@
             transport._file_streams[canonical_url].flush()
         try:
             path = self._abspath(relpath)
-            return osutils.open_file(path, 'rb')
+            return open(path, 'rb')
         except (IOError, OSError) as e:
             if e.errno == errno.EISDIR:
                 return LateReadError(relpath)
@@ -323,7 +323,7 @@
         """See Transport.open_write_stream."""
         abspath = self._abspath(relpath)
         try:
-            handle = osutils.open_file(abspath, 'wb')
+            handle = open(abspath, 'wb')
         except (IOError, OSError) as e:
             self._translate_error(e, abspath)
         handle.truncate()

=== modified file 'breezy/tree.py'
--- breezy/tree.py	2021-11-16 01:24:28 +0000
+++ breezy/tree.py	2021-12-25 12:35:58 +0000
@@ -203,7 +203,7 @@
     def supports_symlinks(self):
         """Does this tree support symbolic links?
         """
-        return osutils.has_symlinks()
+        return True
 
     @property
     def supports_file_ids(self):

=== modified file 'breezy/win32utils.py'
--- breezy/win32utils.py	2020-05-24 00:42:36 +0000
+++ breezy/win32utils.py	2021-12-25 12:35:58 +0000
@@ -14,11 +14,9 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-"""Win32-specific helper functions
-
-Only one dependency: ctypes should be installed.
-"""
-
+"""Win32-specific helper functions"""
+
+import ctypes
 import glob
 import os
 import struct
@@ -54,7 +52,6 @@
 
 def debug_memory_win32api(message='', short=True):
     """Use trace.note() to dump the running memory info."""
-    import ctypes
     from breezy import trace
     class PROCESS_MEMORY_COUNTERS_EX(ctypes.Structure):
         """Used by GetProcessMemoryInfo"""
@@ -119,7 +116,6 @@
     console window and return tuple (sizex, sizey) if success,
     or default size (defaultx, defaulty) otherwise.
     """
-    import ctypes
     # To avoid problem with redirecting output via pipe
     # we need to use stderr instead of stdout
     h = ctypes.windll.kernel32.GetStdHandle(WIN32_STDERR_HANDLE)
@@ -142,7 +138,6 @@
 
     Result is always unicode (or None).
     """
-    import ctypes
     try:
         SHGetSpecialFolderPath = \
             ctypes.windll.shell32.SHGetSpecialFolderPathW
@@ -242,7 +237,6 @@
 
     :return: A unicode string representing the host name.
     """
-    import ctypes
     buf = ctypes.create_unicode_buffer(MAX_COMPUTERNAME_LENGTH + 1)
     n = ctypes.c_int(MAX_COMPUTERNAME_LENGTH + 1)
 
@@ -320,26 +314,26 @@
     :return:    full path to aplication executable from registry,
                 or appname itself if nothing found.
     """
-    import _winreg
+    import winreg
 
     basename = appname
     if not os.path.splitext(basename)[1]:
         basename = appname + '.exe'
 
     try:
-        hkey = _winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE,
-                               'SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\' +
-                               basename)
+        hkey = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE,
+            'SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\'
+            + basename)
     except EnvironmentError:
         return appname
 
     try:
         try:
-            path, type_id = _winreg.QueryValueEx(hkey, '')
+            path, type_id = winreg.QueryValueEx(hkey, '')
         except WindowsError:
             return appname
     finally:
-        _winreg.CloseKey(hkey)
+        winreg.CloseKey(hkey)
 
     if type_id == REG_SZ:
         return path
@@ -404,8 +398,7 @@
 
 
 def _ctypes_is_local_pid_dead(pid):
-    import ctypes
-    kernel32 = ctypes.wintypes.windll.kernel32
+    kernel32 = ctypes.windll.kernel32
     """True if pid doesn't correspond to live process on this machine"""
     handle = kernel32.OpenProcess(1, False, pid)
     if not handle:
@@ -416,7 +409,7 @@
         elif errorcode == 87:  # ERROR_INVALID_PARAMETER
             return True
         raise ctypes.WinError(errorcode)
-    Kernel32.CloseHandle(handle)
+    kernel32.CloseHandle(handle)
     return False
 
 is_local_pid_dead = _ctypes_is_local_pid_dead

=== modified file 'doc/developers/testing.txt'
--- doc/developers/testing.txt	2017-07-30 16:59:50 +0000
+++ doc/developers/testing.txt	2021-12-25 12:35:58 +0000
@@ -710,16 +710,17 @@
 are defined by subclassing ``breezy.tests.Feature`` and overriding the
 ``_probe`` and ``feature_name`` methods.  For example::
 
-    class _SymlinkFeature(Feature):
+    class SymlinkFeature(Feature):
+
+        def __init__(self, path):
+            self.path = path
 
         def _probe(self):
-            return osutils.has_symlinks()
+            return osutils.supports_symlinks(self.path)
 
         def feature_name(self):
             return 'symlinks'
 
-    SymlinkFeature = _SymlinkFeature()
-
 A helper for handling running tests based on whether a python
 module is available. This can handle 3rd-party dependencies (is
 ``paramiko`` available?) as well as stdlib (``termios``) or

=== modified file 'setup.py'
--- setup.py	2021-08-20 15:32:58 +0000
+++ setup.py	2021-12-25 12:35:58 +0000
@@ -376,7 +376,8 @@
     ico_root = os.path.join(tbzr_root, 'tbreezy', 'resources')
     icos = [] # list of (path_root, relative_ico_path)
     # First always brz's icon and its in the root of the brz tree.
-    icos.append(('', 'brz.ico'))
+    # FIXME: There's no such thing as brz.ico
+    #icos.append(('', 'brz.ico'))
     for root, dirs, files in os.walk(ico_root):
         icos.extend([(ico_root, os.path.join(root, f)[len(ico_root) + 1:])
                      for f in files if f.endswith('.ico')])
@@ -534,7 +535,7 @@
 
 elif 'py2exe' in sys.argv:
     # py2exe setup
-    import py2exe
+    from py2exe import distutils_buildexe as py2exe
 
     # pick real brz version
     import breezy
@@ -578,15 +579,17 @@
             self.outfiles.extend([f + 'o' for f in compile_names])
     # end of class install_data_with_bytecompile
 
-    target = py2exe.build_exe.Target(
+    target = py2exe.runtime.Target(
         script="brz",
         dest_base="brz",
-        icon_resources=[(0, 'brz.ico')],
+        # FIXME: There's no such thing as brz.ico
+        #icon_resources=[(0, 'brz.ico')],
         name=META_INFO['name'],
         version=version_str,
         description=META_INFO['description'],
-        author=META_INFO['author'],
-        copyright="(c) Canonical Ltd, 2005-2010",
+        maintainer=META_INFO['maintainer'],
+        copyright="Copyright 2005-2012 Canonical Ltd.\n"
+            "Copyright 2017-2021 Breezy developers",
         company_name="Canonical Ltd.",
         comments=META_INFO['description'],
     )
@@ -647,6 +650,14 @@
             # rest of the svn plugin wasn't. So we tell py2exe to leave the
             # plugins out of the .zip file
             excludes.extend(["breezy.plugins." + d for d in dirs])
+            # svn plugin requires subvertpy,
+            # and pip cannot install it on Windows.
+            # When subvertpy is not available, remove svn from plugins
+            if "svn" in dirs:
+                try:
+                    import subvertpy
+                except ImportError:
+                    dirs.remove("svn")
         x = []
         for i in files:
             # Throw away files we don't want packaged. Note that plugins may
@@ -661,16 +672,20 @@
         if x:
             target_dir = root[len('breezy/'):]  # install to 'plugins/...'
             plugins_files.append((target_dir, x))
-    # find modules for built-in plugins
+    # find modules required by built-in plugins
     import tools.package_mf
-    mf = tools.package_mf.CustomModuleFinder()
-    mf.run_package('breezy/plugins')
-    packs, mods = mf.get_result()
-    additional_packages.update(packs)
-    includes.extend(mods)
+    mf = tools.package_mf.CustomModuleFinder('.')
+    mf.load_package_recursive('breezy.plugins')
+    (packs, mods) = mf.get_result()
+    # Don't add the plugins packages and modules,
+    # as they are listed in excluded
+    additional_packages.update(pack for pack in packs
+        if not (pack.startswith('breezy.plugins.') or pack in excludes))
+    includes.extend(mod for mod in mods
+        if not (mod.startswith('breezy.plugins.') or mod in excludes))
 
     console_targets = [target,
-                       'tools/win32/bzr_postinstall.py',
+                       'tools/win32/brz_postinstall.py',
                        ]
     gui_targets = [gui_target]
     data_files = topics_files + plugins_files + I18N_FILES
@@ -725,7 +740,7 @@
                                "includes": includes,
                                "excludes": excludes,
                                "dll_excludes": dll_excludes,
-                               "dist_dir": "win32_bzr.exe",
+                               "dist_dir": "win32_brz.exe",
                                "optimize": 2,
                                "custom_boot_script":
                                    "tools/win32/py2exe_boot_common.py",
@@ -735,10 +750,10 @@
     # We want the libaray.zip to have optimize = 2, but the exe to have
     # optimize = 1, so that .py files that get compilied at run time
     # (e.g. user installed plugins) dont have their doc strings removed.
-    class py2exe_no_oo_exe(py2exe.build_exe.py2exe):
-        def build_executable(self, *args, **kwargs):
+    class py2exe_no_oo_exe(py2exe.py2exe):
+        def run(self, *args, **kwargs):
             self.optimize = 1
-            py2exe.build_exe.py2exe.build_executable(self, *args, **kwargs)
+            super(py2exe_no_oo_exe, self).run(*args, **kwargs)
             self.optimize = 2
 
     if __name__ == '__main__':

=== modified file 'tools/package_mf.py'
--- tools/package_mf.py	2018-11-16 12:25:18 +0000
+++ tools/package_mf.py	2021-12-25 12:35:58 +0000
@@ -16,10 +16,12 @@
 
 """Custom module finder for entire package"""
 
-import modulefinder
 import os
 import sys
 
+# At present, this is only used on Windows (see setup.py)
+from py2exe import mf310 as modulefinder
+
 
 class CustomModuleFinder(modulefinder.ModuleFinder):
     """Custom module finder for processing python packages,
@@ -35,27 +37,54 @@
         modulefinder.ModuleFinder.__init__(
             self, path, debug, excludes, replace_paths)
 
-    def run_package(self, package_path):
-        """Recursively process each module in package with run_script method.
+    def load_package_recursive(self, fqname):
+        """Recursively process each module in package
 
-        :param  package_path:   path to package directory.
+        :param  fqname:   name of the package.
         """
-        stack = [package_path]
+        # Load all the parents
+        parent = None
+        path = []
+        for partname in fqname.split("."):
+            parent_path = ".".join(path)
+            path.append(partname)
+            # import_module works recursively,
+            # and some of the dependencies may try
+            # to import modules not present on the system.
+            # (The actual error is
+            # AttributeError: 'NoneType' object has no attribute 'is_package')
+            # Ignore errors here and bail out in the collection loop.
+            try:
+                self.import_module(partname, ".".join(path),
+                    self.modules.get(parent_path, None))
+            except:
+                pass
+        stack = [(fqname, parent_path)]
         while stack:
-            curdir = stack.pop(0)
-            py = os.listdir(curdir)
-            for i in py:
-                full = os.path.join(curdir, i)
+            (package, parent_path) = stack.pop(0)
+            # Here we assume that all parents have already been imported.
+            # Abort when a parent is missing.
+            parent = self.modules[parent_path]
+            pkg_module = self.import_module(package, package, parent)
+            curdir = pkg_module.__file__
+            dirlist = os.listdir(curdir)
+            for filename in dirlist:
+                full = os.path.join(curdir, filename)
                 if os.path.isdir(full):
+                    if filename == "tests":
+                        continue
                     init = os.path.join(full, '__init__.py')
                     if os.path.isfile(init):
-                        stack.append(full)
-                    continue
-                if not i.endswith('.py'):
-                    continue
-                if i == 'setup.py':     # skip
-                    continue
-                self.run_script(full)
+                        stack.append((".".join((package, filename)), package))
+                    continue
+                if not filename.endswith('.py'):
+                    continue
+                if filename == 'setup.py':     # skip
+                    continue
+                # We only accept .py files, so could use [:-3] too - faster...
+                partname = os.path.splitext(filename)[0]
+                self.import_module(partname,
+                    ".".join((package, partname)), pkg_module)
 
     def get_result(self):
         """Return 2-tuple: (list of packages, list of modules)"""

=== modified file 'tools/win32/brz.iss.cog'
--- tools/win32/brz.iss.cog	2021-12-20 23:40:21 +0000
+++ tools/win32/brz.iss.cog	2021-12-25 12:35:58 +0000
@@ -78,6 +78,14 @@
 ; [[[cog cog.outl('AppVersion=%s' % VERSION) ]]]
 ; [[[end]]]
 
+; [[[cog
+; import platform
+;
+; if platform.machine().endswith("64"):
+;     cog.outl('ArchitecturesAllowed=x64')
+;     cog.outl('ArchitecturesInstallIn64BitMode=x64')
+; ]]]
+; [[[end]]]
 ChangesEnvironment=yes
 ; MARKH: PrivilegesRequired=none means it can't be installed by a non-admin
 ; user - but sadly we still need admin - eg, tortoise overlays, installing
@@ -115,8 +123,12 @@
 Source: "plugins\*.*"; DestDir: "{app}\\plugins"; Flags: createallsubdirs ignoreversion recursesubdirs restartreplace uninsrestartdelete; Components: plugins
 Source: "*.bat"; DestDir: "{app}"; Flags: ignoreversion restartreplace uninsrestartdelete;
 Source: "*.url"; DestDir: "{app}"; Flags: ignoreversion restartreplace uninsrestartdelete;
-Source: "msvc*.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace uninsrestartdelete;
-Source: "bz*.exe"; DestDir: "{app}"; Flags: ignoreversion restartreplace uninsrestartdelete;
+; Python3 includes vcruntime*.dll which is not packed in by py2exe.
+; I'm not sure if the installer has to contain it.
+; It looks like the binaries work OK without vcruntime dll.
+; Delete this dll line when we're sure.
+;Source: "msvc*.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace uninsrestartdelete;
+Source: "brz*.exe"; DestDir: "{app}"; Flags: ignoreversion restartreplace uninsrestartdelete;
 Source: "Python*.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace uninsrestartdelete;
 Source: "lib\*.*"; DestDir: "{app}\lib"; Flags: createallsubdirs ignoreversion recursesubdirs restartreplace uninsrestartdelete;
 Source: "doc\*.*"; DestDir: "{app}\doc"; Flags: createallsubdirs ignoreversion recursesubdirs restartreplace uninsrestartdelete;
@@ -141,7 +153,7 @@
 ; imageformats plugins for PyQt4
 ; [[[cog
 ; plug_dir = os.path.join(os.path.dirname(cog.inFile), # $(bzr_src_root)/tools/win32
-;                         '..', '..', 'win32_bzr.exe', 'imageformats')
+;                         '..', '..', 'win32_brz.exe', 'imageformats')
 ; if os.path.isdir(plug_dir):
 ;     cog.outl('Source: "imageformats\\*.*"; DestDir: "{app}\\imageformats"; '
 ;              'Flags: createallsubdirs ignoreversion recursesubdirs restartreplace uninsrestartdelete;')
@@ -179,9 +191,9 @@
 [Icons]
 Name: "{group}\Documentation index"; Filename: "{app}\doc\index.html"; WorkingDir: "{app}\doc";
 Name: "{group}\Breezy Home Page"; Filename: "{app}\breezy.url"; Comment: "https://www.breezy-vcs.org/";
-Name: "{group}\Start Bzr in cmd shell"; Filename: "{cmd}"; Parameters: "/K start_bzr.bat"; WorkingDir: "{app}"; IconFilename: "{app}\bzr.exe"; Comment: "Open new Bzr session";
+Name: "{group}\Start Bzr in cmd shell"; Filename: "{cmd}"; Parameters: "/K start_brz.bat"; WorkingDir: "{app}"; IconFilename: "{app}\brz.exe"; Comment: "Open new Bzr session";
 ; NOTE: Intent is to change the log file location - the line below will need to change to reflect that.
-Name: "{group}\Open Bzr log file"; Filename: "notepad.exe"; Parameters: "{userdocs}\.bzr.log"; Comment: "Launch notepad to view the bzr log file";
+Name: "{group}\Open Bzr log file"; Filename: "notepad.exe"; Parameters: "{userdocs}\.brz.log"; Comment: "Launch notepad to view the brz log file";
 
 ; [[[cog
 ; if "TBZR" in os.environ:
@@ -224,7 +236,7 @@
 
 
 [UninstallRun]
-Filename: "{app}\bzr_postinstall.exe"; Parameters: "--delete-path --delete-shell-menu --silent"; Flags: skipifdoesntexist runhidden;
+Filename: "{app}\brz_postinstall.exe"; Parameters: "--delete-path --delete-shell-menu --silent"; Flags: skipifdoesntexist runhidden;
 ; [[[cog
 ; if "TBZR" in os.environ:
 ;     cog.outl('Filename: "regsvr32.exe"; Parameters: "/u /s /i: tbzrshellext_x86.dll"; WorkingDir: "{app}"; Components: tortoise; StatusMsg: "Unregistering Tortoise"; Flags: skipifdoesntexist')
@@ -320,7 +332,7 @@
                              ewWaitUntilTerminated, ErrorCode) then
                 MsgBox('Failed to install TortoiseOverlays: ' + SysErrorMessage(ErrorCode),
                         mbInformation, MB_OK);
-            // Ideally we could be bzr_postinstall.exe this way too, but
+            // Ideally we could be brz_postinstall.exe this way too, but
             // its needed at uninstall time.
         end;
         // cause explorer to re-fetch handlers.

=== modified file 'tools/win32/info.txt'
--- tools/win32/info.txt	2010-03-30 20:13:52 +0000
+++ tools/win32/info.txt	2021-12-25 12:35:58 +0000
@@ -1,6 +1,6 @@
-Bazaar is free software; you can redistribute and/or modify it under
-the terms of the GNU General Public License version 2. 
+Breezy is free software; you can redistribute and/or modify it
+under the terms of the GNU General Public License version 2. 
 
 See: http://www.gnu.org/copyleft/gpl.html
 
-Managing source code in Bazaar does not make it subject to the GPL.
+Managing source code in Breezy does not make it subject to the GPL.

=== modified file 'tools/win32/ostools.py'
--- tools/win32/ostools.py	2020-01-31 17:43:44 +0000
+++ tools/win32/ostools.py	2021-12-25 12:35:58 +0000
@@ -12,6 +12,9 @@
     ostools.py copytree FILES... DIR
                     copy files to specified directory keeping relative paths
 
+    ostools.py copydir SOURCE TARGET
+                    recursively copy SOURCE directory tree to TARGET directory
+
     ostools.py remove [FILES...] [DIRS...]
                     remove files or directories (recursive)
 """
@@ -89,6 +92,19 @@
 
         return 0
 
+    if cmd == 'copydir':
+        if len(argv) != 2:
+            print("Usage:  ostools.py copydir SOURCE TARGET")
+            return 1
+
+        def _copy(src, dest, follow_symlinks=True):
+            shutil.copy(src, dest, follow_symlinks=follow_symlinks)
+            print("Copied:", src, "=>", dest)
+        shutil.copytree(argv[0], argv[1],
+            copy_function=_copy, dirs_exist_ok=True)
+
+        return 0
+
     if cmd == 'remove':
         if len(argv) == 0:
             print("Usage:  ostools.py remove [FILES...] [DIRS...]")

=== modified file 'tools/win32/start_brz.bat'
--- tools/win32/start_brz.bat	2017-05-21 14:47:52 +0000
+++ tools/win32/start_brz.bat	2021-12-25 12:35:58 +0000
@@ -6,7 +6,7 @@
 REM    ******************************************************
 
 REM Add the Brz directory to system-wide PATH environment variable
-SET PATH=C:\Program Files\Bazaar;%PATH%
+SET PATH=C:\Program Files\Breezy;%PATH%
 
 REM Change next line to set-up e-mail to identify yourself in brz
 REM SET BZREMAIL=