Merge lp://staging/~jelmer/brz/newer-dulwich-3.3 into lp://staging/brz/3.3

Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: 7807
Merged at revision: 7804
Proposed branch: lp://staging/~jelmer/brz/newer-dulwich-3.3
Merge into: lp://staging/brz/3.3
Diff against target: 721 lines (+250/-80)
10 files modified
Makefile (+2/-2)
breezy/git/memorytree.py (+1/-1)
breezy/git/tests/test_workingtree.py (+4/-6)
breezy/git/transform.py (+4/-7)
breezy/git/tree.py (+63/-37)
breezy/git/workingtree.py (+159/-20)
breezy/tests/per_workingtree/test_commit.py (+1/-1)
breezy/tests/per_workingtree/test_merge_from_branch.py (+1/-1)
breezy/tests/per_workingtree/test_transform.py (+12/-2)
pyproject.toml (+3/-3)
To merge this branch: bzr merge lp://staging/~jelmer/brz/newer-dulwich-3.3
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+450513@code.staging.launchpad.net

Commit message

Fix compatibility with newer versions of dulwich

Description of the change

Fix compatibility with newer versions of dulwich

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve
Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :
Download full text (89.4 KiB)

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

Collecting setuptools-gettext
  Downloading setuptools_gettext-0.1.3-py3-none-any.whl (10 kB)
Requirement already satisfied: setuptools>=46.1 in ./lib/python3.11/site-packages (from setuptools-gettext) (68.1.2)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.3
Obtaining file:///tmp/tarmac/branch.t__e8xfr
  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'
  Installing backend dependencies: started
  Installing backend dependencies: finished with status 'done'
  Preparing editable metadata (pyproject.toml): started
  Preparing editable metadata (pyproject.toml): finished with status 'done'
Requirement already satisfied: configobj in /usr/lib/python3/dist-packages (from breezy==3.3.4.dev0) (5.0.8)
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (from breezy==3.3.4.dev0) (0.2)
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (from breezy==3.3.4.dev0) (0.2.13)
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (from breezy==3.3.4.dev0) (0.0.8)
Collecting dulwich>=0.21.6 (from breezy==3.3.4.dev0)
  Obtaining dependency information for dulwich>=0.21.6 from https://files.pythonhosted.org/packages/d5/6d/b2a3ddaf1dce030237e135de9de9116569659862b664696dd48fa5a2d26d/dulwich-0.21.6-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata
  Downloading dulwich-0.21.6-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (4.3 kB)
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (from breezy==3.3.4.dev0) (1.26.12)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (from breezy==3.3.4.dev0) (6.0)
Collecting testtools (from breezy==3.3.4.dev0)
  Downloading testtools-2.6.0-py3-none-any.whl (182 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 182.2/182.2 kB 6.6 MB/s eta 0:00:00
Collecting testscenarios (from breezy==3.3.4.dev0)
  Downloading testscenarios-0.5.0-py2.py3-none-any.whl (21 kB)
Collecting python-subunit (from breezy==3.3.4.dev0)
  Downloading python_subunit-1.4.2-py3-none-any.whl (106 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 106.8/106.8 kB 6.3 MB/s eta 0:00:00
Requirement already satisfied: flake8 in /usr/lib/python3/dist-packages (from breezy==3.3.4.dev0) (5.0.4)
Collecting cython>=0.29 (from breezy==3.3.4.dev0)
  Obtaining dependency information for cython>=0.29 from https://files.pythonhosted.org/packages/d9/fc/3a49ab49ae556b7d644a2d3082f01082bb902befe3e398f11d675d6c2ad0/Cython-3.0.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata
  Using cached Cython-3.0.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (3.1 kB)
Collecting docutils (from breezy==...

Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :
Download full text (88.4 KiB)

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

Collecting setuptools-gettext
  Downloading setuptools_gettext-0.1.3-py3-none-any.whl (10 kB)
Requirement already satisfied: setuptools>=46.1 in ./lib/python3.11/site-packages (from setuptools-gettext) (68.1.2)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.3
Obtaining file:///tmp/tarmac/branch.wkprrocv
  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'
  Installing backend dependencies: started
  Installing backend dependencies: finished with status 'done'
  Preparing editable metadata (pyproject.toml): started
  Preparing editable metadata (pyproject.toml): finished with status 'done'
Requirement already satisfied: configobj in /usr/lib/python3/dist-packages (from breezy==3.3.4.dev0) (5.0.8)
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (from breezy==3.3.4.dev0) (0.2)
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (from breezy==3.3.4.dev0) (0.2.13)
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (from breezy==3.3.4.dev0) (0.0.8)
Collecting dulwich>=0.21.6 (from breezy==3.3.4.dev0)
  Obtaining dependency information for dulwich>=0.21.6 from https://files.pythonhosted.org/packages/d5/6d/b2a3ddaf1dce030237e135de9de9116569659862b664696dd48fa5a2d26d/dulwich-0.21.6-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata
  Downloading dulwich-0.21.6-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (4.3 kB)
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (from breezy==3.3.4.dev0) (1.26.12)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (from breezy==3.3.4.dev0) (6.0)
Collecting testtools (from breezy==3.3.4.dev0)
  Downloading testtools-2.6.0-py3-none-any.whl (182 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 182.2/182.2 kB 5.7 MB/s eta 0:00:00
Collecting testscenarios (from breezy==3.3.4.dev0)
  Downloading testscenarios-0.5.0-py2.py3-none-any.whl (21 kB)
Collecting python-subunit (from breezy==3.3.4.dev0)
  Downloading python_subunit-1.4.2-py3-none-any.whl (106 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 106.8/106.8 kB 5.9 MB/s eta 0:00:00
Requirement already satisfied: flake8 in /usr/lib/python3/dist-packages (from breezy==3.3.4.dev0) (5.0.4)
Collecting cython>=0.29 (from breezy==3.3.4.dev0)
  Obtaining dependency information for cython>=0.29 from https://files.pythonhosted.org/packages/d9/fc/3a49ab49ae556b7d644a2d3082f01082bb902befe3e398f11d675d6c2ad0/Cython-3.0.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata
  Using cached Cython-3.0.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (3.1 kB)
Collecting docutils (from breezy==...

Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :
Download full text (88.7 KiB)

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

Collecting setuptools-gettext
  Obtaining dependency information for setuptools-gettext from https://files.pythonhosted.org/packages/b3/ca/15674b5c914d8df93581ed96032c4503c706888cbeadae117fe6ab401287/setuptools_gettext-0.1.4-py3-none-any.whl.metadata
  Downloading setuptools_gettext-0.1.4-py3-none-any.whl.metadata (1.3 kB)
Requirement already satisfied: setuptools>=46.1 in ./lib/python3.11/site-packages (from setuptools-gettext) (68.1.2)
Downloading setuptools_gettext-0.1.4-py3-none-any.whl (11 kB)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.4
Obtaining file:///tmp/tarmac/branch.kadllrzu
  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'
  Installing backend dependencies: started
  Installing backend dependencies: finished with status 'done'
  Preparing editable metadata (pyproject.toml): started
  Preparing editable metadata (pyproject.toml): finished with status 'done'
Requirement already satisfied: configobj in /usr/lib/python3/dist-packages (from breezy==3.3.4.dev0) (5.0.8)
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (from breezy==3.3.4.dev0) (0.2)
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (from breezy==3.3.4.dev0) (0.2.13)
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (from breezy==3.3.4.dev0) (0.0.8)
Collecting dulwich>=0.21.6 (from breezy==3.3.4.dev0)
  Obtaining dependency information for dulwich>=0.21.6 from https://files.pythonhosted.org/packages/d5/6d/b2a3ddaf1dce030237e135de9de9116569659862b664696dd48fa5a2d26d/dulwich-0.21.6-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata
  Downloading dulwich-0.21.6-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (4.3 kB)
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (from breezy==3.3.4.dev0) (1.26.12)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (from breezy==3.3.4.dev0) (6.0)
Collecting testtools (from breezy==3.3.4.dev0)
  Downloading testtools-2.6.0-py3-none-any.whl (182 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 182.2/182.2 kB 6.1 MB/s eta 0:00:00
Collecting testscenarios (from breezy==3.3.4.dev0)
  Downloading testscenarios-0.5.0-py2.py3-none-any.whl (21 kB)
Collecting python-subunit (from breezy==3.3.4.dev0)
  Downloading python_subunit-1.4.2-py3-none-any.whl (106 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 106.8/106.8 kB 5.6 MB/s eta 0:00:00
Requirement already satisfied: flake8 in /usr/lib/python3/dist-packages (from breezy==3.3.4.dev0) (5.0.4)
Collecting cython>=0.29 (from breezy==3.3.4.dev0)
  Obtaining dependency information for cython>=0.29 from https://files.pythonhosted.org/pac...

Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

7807. By Jelmer Vernooij

Fix flake8

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches