Merge lp:~jelmer/brz/workspace into lp:brz/3.3

[Jelmer Vernooij]

workspace: Allow passing in basis_tree.

workspace: Allow passing in basis_tree.

[Jelmer Vernooij (jelmer)]

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz-3.2/job/brz-3.2-land/105/

[Jelmer Vernooij (jelmer)]

review: Approve

[The Breezy Bot (the-breezy-bot)]

Attempt to merge into lp:brz/3.3 failed due to conflicts:

text conflict in breezy/workspace.py

[The Breezy Bot (the-breezy-bot)]

Attempt to merge into lp:brz/3.3 failed due to conflicts:

text conflict in breezy/workspace.py

[The Breezy Bot (the-breezy-bot)]

The attempt to merge lp:~jelmer/brz/workspace into lp:brz/3.3 failed. Command exited with 142.
Below is the output from the failed tests.

Collecting setuptools-gettext
  Using cached setuptools_gettext-0.1.1-py3-none-any.whl (10 kB)
Requirement already satisfied: setuptools>=46.1 in ./lib/python3.10/site-packages (from setuptools-gettext) (65.5.0)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.1
Obtaining file:///tmp/tarmac/branch.v6lqq730
  Installing build dependencies: started
  Installing build dependencies: finished with status 'done'
  Checking if build backend supports build_editable: started
  Checking if build backend supports build_editable: finished with status 'done'
  Getting requirements to build editable: started
  Getting requirements to build editable: finished with status 'done'
  Preparing editable metadata (pyproject.toml): started
  Preparing editable metadata (pyproject.toml): finished with status 'done'
Requirement already satisfied: dulwich>=0.20.46 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.20.46)
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.0.8)
Requirement already satisfied: configobj in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (5.0.6)
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.26.12)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (5.4.1)
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.2.3)
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.0.12)
Collecting sphinx-epytext
  Using cached sphinx-epytext-0.0.4.tar.gz (3.6 kB)
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Collecting sphinx
  Using cached sphinx-5.3.0-py3-none-any.whl (3.2 MB)
Requirement already satisfied: setuptools in ./lib/python3.10/site-packages (from breezy==3.3.1.dev0) (65.5.0)
Requirement already satisfied: launchpadlib>=1.6.3 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.10.17)
Requirement already satisfied: gpg in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.18.0)
Collecting python-subunit
  Using cached python_subunit-1.4.0-py2.py3-none-any.whl (106 kB)
Collecting testtools
  Using cached testtools-2.5.0-py3-none-any.whl (181 kB)
Collecting fastimport
  Using cached fastimport-0.9.14.tar.gz (41 kB)
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Requirement already satisfied: httplib2 in /usr/lib/python3/dist-packages (from launchpadlib>=1.6.3->breezy==3.3.1.dev0) (0.20.4)
Collecting keyring
  Using cached keyring-23.9.3-py3-none-any.whl (35 kB)
Requirement already satisfied: lazr.restfulclient>=0.9.19 in /usr/lib/python3/dist-packages (from launchpadlib>=1.6.3->breezy==3.3.1.dev0) (0.14.5)
Requirement already satisfied: lazr.uri in /usr/lib/python3/dist-packages (from launchpadlib>=1.6.3->breezy==3.3.1.dev0) (1.0.6)
Requirement already...

[The Breezy Bot (the-breezy-bot)]

The attempt to merge lp:~jelmer/brz/workspace into lp:brz/3.3 failed. Command exited with 1.
Below is the output from the failed tests.

Collecting setuptools-gettext
  Using cached setuptools_gettext-0.1.1-py3-none-any.whl (10 kB)
Requirement already satisfied: setuptools>=46.1 in ./lib/python3.10/site-packages (from setuptools-gettext) (65.5.0)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.1
Obtaining file:///tmp/tarmac/branch.dfsjabgb
  Installing build dependencies: started
  Installing build dependencies: finished with status 'done'
  Checking if build backend supports build_editable: started
  Checking if build backend supports build_editable: finished with status 'done'
  Getting requirements to build editable: started
  Getting requirements to build editable: finished with status 'done'
  Preparing editable metadata (pyproject.toml): started
  Preparing editable metadata (pyproject.toml): finished with status 'done'
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.0.12)
Requirement already satisfied: configobj in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (5.0.6)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (5.4.1)
Requirement already satisfied: dulwich>=0.20.46 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.20.46)
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.2.3)
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.26.12)
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.0.8)
Requirement already satisfied: launchpadlib>=1.6.3 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.10.17)
Collecting python-subunit
  Using cached python_subunit-1.4.0-py2.py3-none-any.whl (106 kB)
Collecting testtools
  Using cached testtools-2.5.0-py3-none-any.whl (181 kB)
Requirement already satisfied: gpg in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.18.0)
Collecting sphinx-epytext
  Using cached sphinx-epytext-0.0.4.tar.gz (3.6 kB)
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Requirement already satisfied: setuptools in ./lib/python3.10/site-packages (from breezy==3.3.1.dev0) (65.5.0)
Collecting sphinx
  Using cached sphinx-5.3.0-py3-none-any.whl (3.2 MB)
Collecting fastimport
  Using cached fastimport-0.9.14.tar.gz (41 kB)
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Requirement already satisfied: httplib2 in /usr/lib/python3/dist-packages (from launchpadlib>=1.6.3->breezy==3.3.1.dev0) (0.20.4)
Collecting keyring
  Using cached keyring-23.9.3-py3-none-any.whl (35 kB)
Requirement already satisfied: lazr.restfulclient>=0.9.19 in /usr/lib/python3/dist-packages (from launchpadlib>=1.6.3->breezy==3.3.1.dev0) (0.14.5)
Requirement already satisfied: lazr.uri in /usr/lib/python3/dist-packages (from launchpadlib>=1.6.3->breezy==3.3.1.dev0) (1.0.6)
Requirement already s...

[The Breezy Bot (the-breezy-bot)]

Attempt to merge into lp:brz/3.3 failed due to conflicts:

text conflict in breezy/workspace.py

[The Breezy Bot (the-breezy-bot)]

The attempt to merge lp:~jelmer/brz/workspace into lp:brz/3.3 failed. Command exited with 2.
Below is the output from the failed tests.

Collecting setuptools-gettext
  Using cached setuptools_gettext-0.1.1-py3-none-any.whl (10 kB)
Requirement already satisfied: setuptools>=46.1 in ./lib/python3.10/site-packages (from setuptools-gettext) (65.5.0)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.1
Obtaining file:///tmp/tarmac/branch.eukxeqnp
  Installing build dependencies: started
  Installing build dependencies: finished with status 'done'
  Checking if build backend supports build_editable: started
  Checking if build backend supports build_editable: finished with status 'done'
  Getting requirements to build editable: started
  Getting requirements to build editable: finished with status 'done'
  Preparing editable metadata (pyproject.toml): started
  Preparing editable metadata (pyproject.toml): finished with status 'done'
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (0.0.8)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (6.0)
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (1.26.12)
Requirement already satisfied: dulwich>=0.20.46 in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (0.20.50)
Requirement already satisfied: configobj in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (5.0.6)
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (0.0.12)
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (0.2.3)
Collecting fastimport
  Using cached fastimport-0.9.14-py2.py3-none-any.whl
Requirement already satisfied: launchpadlib>=1.6.3 in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (1.10.17)
Requirement already satisfied: gpg in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (1.18.0)
Requirement already satisfied: setuptools in ./lib/python3.10/site-packages (from breezy==3.3.2.dev0) (65.5.0)
Collecting sphinx
  Using cached sphinx-5.3.0-py3-none-any.whl (3.2 MB)
Collecting docutils
  Using cached docutils-0.19-py3-none-any.whl (570 kB)
Collecting sphinx-epytext
  Using cached sphinx_epytext-0.0.4-py3-none-any.whl
Requirement already satisfied: paramiko in /usr/local/lib/python3.10/dist-packages (from breezy==3.3.2.dev0) (2.12.0)
Collecting testscenarios
  Using cached testscenarios-0.5.0-py2.py3-none-any.whl (21 kB)
Requirement already satisfied: flake8 in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (5.0.4)
Collecting testtools
  Using cached testtools-2.5.0-py3-none-any.whl (181 kB)
Collecting python-subunit
  Using cached python_subunit-1.4.2-py3-none-any.whl (106 kB)
Requirement already satisfied: httplib2 in /usr/lib/python3/dist-packages (from launchpadlib>=1.6.3->breezy==3.3.2.dev0) (0.20.4)
Requirement already satisfied: keyring in /usr/local/lib/python3.10/dist-packages (from launchpadlib>=1.6.3->breezy==3.3.2.dev0) (23.11.0)
Requirement already satisfied: lazr.restfulclien...

Unmerged revisions

7748. By Jelmer Vernooij on 2022-11-27

Allow passing in basis tree.

7747. By Jelmer Vernooij on 2022-11-27

Make stage() public.

=== modified file 'breezy/workspace.py'
--- breezy/workspace.py	2022-11-02 20:28:56 +0000
+++ breezy/workspace.py	2022-11-27 12:34:23 +0000
@@ -20,7 +20,7 @@
 high performance in large trees with a small number of changes.
 """
 
-from contextlib import ExitStack
+from contextlib import ExitStack, contextmanager
 import errno
 import os
 import shutil
@@ -173,9 +173,10 @@
     :param use_inotify: whether to use inotify (default: yes, if available)
     """
 
-    def __init__(self, tree, subpath='', use_inotify=None):
+    def __init__(self, tree, *, basis_tree=None, subpath='', use_inotify=None):
         self.tree = tree
         self.subpath = subpath
+        self._basis_tree = basis_tree
         self.use_inotify = use_inotify
         self._dirty_tracker = None
         self._es = ExitStack()
@@ -183,7 +184,7 @@
     @classmethod
     def from_path(cls, path, use_inotify=None):
         tree, subpath = WorkingTree.open_containing(path)
-        return cls(tree, subpath, use_inotify=use_inotify)
+        return cls(tree, subpath=subpath, use_inotify=use_inotify)
 
     def __enter__(self):
         check_clean_tree(self.tree)
@@ -199,6 +200,13 @@
                 self._dirty_tracker = None
         return self
 
+    @contextmanager
+    def basis_tree(self):
+        if self._basis_tree:
+            yield self._basis_tree
+            return
+        yield self.tree.basis_tree()
+
     def __exit__(self, exc_type, exc_val, exc_tb):
         return self._es.__exit__(exc_type, exc_val, exc_tb)
 
@@ -216,12 +224,13 @@
         """
         if self._dirty_tracker and not self._dirty_tracker.is_dirty():
             return
-        reset_tree(self.tree, subpath=self.subpath)
+        with self.tree.lock_write():
+            reset_tree(self.tree, subpath=self.subpath)
         if self._dirty_tracker is not None:
             self._dirty_tracker.mark_clean()
 
-    def _stage(self) -> Optional[List[str]]:
-        changed: Optional[List[str]]
+    def stage(self) -> List[str]:
+        changed: List[str]
         if self._dirty_tracker:
             relpaths = self._dirty_tracker.relpaths()
             # Sort paths so that directories get added before the files they
@@ -239,15 +248,14 @@
 
         if self.tree.supports_setting_file_ids():
             from .rename_map import RenameMap
-            basis_tree = self.tree.basis_tree()
-            RenameMap.guess_renames(
-                basis_tree, self.tree, dry_run=False)
+            with self.basis_tree() as basis_tree:
+                RenameMap.guess_renames(
+                    basis_tree, self.tree, dry_run=False)
         return changed
 
     def iter_changes(self):
-        with self.tree.lock_write():
-            specific_files = self._stage()
-            basis_tree = self.tree.basis_tree()
+        with self.tree.lock_write(), self.basis_tree() as basis_tree:
+            specific_files = self.stage()
             for change in self.tree.iter_changes(
                     basis_tree, specific_files=specific_files,
                     want_unversioned=False, require_versioned=True):
@@ -267,7 +275,7 @@
             raise NotImplementedError(self.commit)
 
         with self.tree.lock_write():
-            specific_files = self._stage()
+            specific_files = self.stage()
 
             kwargs['specific_files'] = specific_files
             revid = self.tree.commit(**kwargs)