Merge lp:~jelmer/brz/join-debian into lp:brz

[Jelmer Vernooij]

Import debian plugin

Import debian plugin

[Jelmer Vernooij (jelmer)]

review: Approve

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

Fixup command "sudo apt -y update && sudo apt -y install git quilt cargo rustc python3-venv python3-tdb python3-pyinotify python3-gpg libpython3-dev make python3-setuptools-rust openssh-client patch mypy rustfmt xz-utils" failed: Command exited with 2

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

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

text conflict in tarmac.conf

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

Fixup command "sudo apt -y update && sudo apt -y install git quilt cargo rustc python3-venv python3-tdb python3-pyinotify python3-gpg libpython3-dev make python3-setuptools-rust openssh-client patch mypy rustfmt xz-utils python3-pip && pip3 install --break-system-packages ruff" failed: Command exited with 2

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

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

text conflict in tarmac.conf

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

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

text conflict in tarmac.conf

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

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

Collecting setuptools-gettext
  Downloading setuptools_gettext-0.1.7-py3-none-any.whl.metadata (1.5 kB)
Requirement already satisfied: setuptools>=46.1 in ./lib/python3.11/site-packages (from setuptools-gettext) (68.1.2)
Downloading setuptools_gettext-0.1.7-py3-none-any.whl (5.5 kB)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.7
Obtaining file:///tmp/tarmac/branch.jmvsvy6s
  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 (5.0.8)
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (0.2)
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (0.2.13)
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (0.0.8)
Requirement already satisfied: dulwich>=0.21.6 in /usr/lib/python3/dist-packages (0.21.6)
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (1.26.18)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (6.0.1)
Collecting testtools>=0.9.5
  Downloading testtools-2.7.1-py3-none-any.whl.metadata (5.3 kB)
Collecting testscenarios
  Downloading testscenarios-0.5.0-py2.py3-none-any.whl (21 kB)
Collecting python-subunit
  Downloading python_subunit-1.4.3-py3-none-any.whl.metadata (22 kB)
Collecting cython>=0.29
  Using cached Cython-3.0.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (3.2 kB)
Requirement already satisfied: ruff in /usr/local/lib/python3.11/dist-packages (0.1.4)
Collecting docutils
  Downloading docutils-0.20.1-py3-none-any.whl.metadata (2.8 kB)
Requirement already satisfied: setuptools in ./lib/python3.11/site-packages (68.1.2)
Collecting sphinx
  Downloading sphinx-7.2.6-py3-none-any.whl.metadata (5.9 kB)
Collecting sphinx-epytext
  Downloading sphinx-epytext-0.0.4.tar.gz (3.6 kB)
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Collecting fastimport
  Downloading fastimport-0.9.14.tar.gz (41 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 41.8/41.8 kB 1.7 MB/s eta 0:00:00
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Requirement already satisfied: launchpadlib>=1.6.3 in /usr/lib/python3/dist-packages (1.11.0)
Requirement already satisfied: paramiko>=1.6.2 in /usr/local/lib/python3.11/dist-packages (3.3.1)
Requirement already satisfied: gpg in /usr/lib/python3/dist-packages (1.18.0)
...

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

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

Collecting setuptools-gettext
  Downloading setuptools_gettext-0.1.7-py3-none-any.whl.metadata (1.5 kB)
Requirement already satisfied: setuptools>=46.1 in ./lib/python3.11/site-packages (from setuptools-gettext) (68.1.2)
Downloading setuptools_gettext-0.1.7-py3-none-any.whl (5.5 kB)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.7
Obtaining file:///tmp/tarmac/branch.cqrqkrag
  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 (5.0.8)
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (0.2)
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (0.2.13)
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (0.0.8)
Requirement already satisfied: dulwich>=0.21.6 in /usr/lib/python3/dist-packages (0.21.6)
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (1.26.18)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (6.0.1)
Collecting testtools>=0.9.5
  Downloading testtools-2.7.1-py3-none-any.whl.metadata (5.3 kB)
Collecting testscenarios
  Downloading testscenarios-0.5.0-py2.py3-none-any.whl (21 kB)
Collecting python-subunit
  Downloading python_subunit-1.4.3-py3-none-any.whl.metadata (22 kB)
Collecting cython>=0.29
  Using cached Cython-3.0.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (3.2 kB)
Requirement already satisfied: ruff in /usr/local/lib/python3.11/dist-packages (0.1.5)
Collecting docutils
  Downloading docutils-0.20.1-py3-none-any.whl.metadata (2.8 kB)
Requirement already satisfied: setuptools in ./lib/python3.11/site-packages (68.1.2)
Collecting sphinx
  Downloading sphinx-7.2.6-py3-none-any.whl.metadata (5.9 kB)
Collecting sphinx-epytext
  Downloading sphinx-epytext-0.0.4.tar.gz (3.6 kB)
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Collecting fastimport
  Downloading fastimport-0.9.14.tar.gz (41 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 41.8/41.8 kB 2.0 MB/s eta 0:00:00
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Requirement already satisfied: launchpadlib>=1.6.3 in /usr/lib/python3/dist-packages (1.11.0)
Requirement already satisfied: paramiko>=1.6.2 in /usr/local/lib/python3.11/dist-packages (3.3.1)
Requirement already satisfied: gpg in /usr/lib/python3/dist-packages (1.18.0)
...

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

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

Collecting setuptools-gettext
  Downloading setuptools_gettext-0.1.7-py3-none-any.whl.metadata (1.5 kB)
Requirement already satisfied: setuptools>=46.1 in ./lib/python3.11/site-packages (from setuptools-gettext) (68.1.2)
Downloading setuptools_gettext-0.1.7-py3-none-any.whl (5.5 kB)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.7
Obtaining file:///tmp/tarmac/branch.xp8dimlq
  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 (5.0.8)
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (0.2)
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (0.2.13)
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (0.0.8)
Requirement already satisfied: dulwich>=0.21.6 in /usr/lib/python3/dist-packages (0.21.6)
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (1.26.18)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (6.0.1)
Collecting testtools>=0.9.5
  Downloading testtools-2.7.1-py3-none-any.whl.metadata (5.3 kB)
Collecting testscenarios
  Downloading testscenarios-0.5.0-py2.py3-none-any.whl (21 kB)
Collecting python-subunit
  Downloading python_subunit-1.4.3-py3-none-any.whl.metadata (22 kB)
Collecting cython>=0.29
  Using cached Cython-3.0.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (3.2 kB)
Requirement already satisfied: ruff in /usr/local/lib/python3.11/dist-packages (0.1.5)
Collecting docutils
  Downloading docutils-0.20.1-py3-none-any.whl.metadata (2.8 kB)
Requirement already satisfied: setuptools in ./lib/python3.11/site-packages (68.1.2)
Collecting sphinx
  Downloading sphinx-7.2.6-py3-none-any.whl.metadata (5.9 kB)
Collecting sphinx-epytext
  Downloading sphinx-epytext-0.0.4.tar.gz (3.6 kB)
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Collecting fastimport
  Downloading fastimport-0.9.14.tar.gz (41 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 41.8/41.8 kB 2.4 MB/s eta 0:00:00
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Requirement already satisfied: launchpadlib>=1.6.3 in /usr/lib/python3/dist-packages (1.11.0)
Requirement already satisfied: paramiko>=1.6.2 in /usr/local/lib/python3.11/dist-packages (3.3.1)
Requirement already satisfied: gpg in /usr/lib/python3/dist-packages (1.18.0)
...

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

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

Collecting setuptools-gettext
  Downloading setuptools_gettext-0.1.7-py3-none-any.whl.metadata (1.5 kB)
Requirement already satisfied: setuptools>=46.1 in ./lib/python3.11/site-packages (from setuptools-gettext) (68.1.2)
Downloading setuptools_gettext-0.1.7-py3-none-any.whl (5.5 kB)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.7
Obtaining file:///tmp/tarmac/branch.zua7ut_h
  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 (5.0.8)
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (0.2)
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (0.2.13)
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (0.0.8)
Requirement already satisfied: dulwich>=0.21.6 in /usr/lib/python3/dist-packages (0.21.6)
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (1.26.18)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (6.0.1)
Collecting testtools>=0.9.5
  Downloading testtools-2.7.1-py3-none-any.whl.metadata (5.3 kB)
Collecting testscenarios
  Downloading testscenarios-0.5.0-py2.py3-none-any.whl (21 kB)
Collecting python-subunit
  Downloading python_subunit-1.4.3-py3-none-any.whl.metadata (22 kB)
Collecting cython>=0.29
  Using cached Cython-3.0.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (3.2 kB)
Requirement already satisfied: ruff in /usr/local/lib/python3.11/dist-packages (0.1.5)
Collecting docutils
  Downloading docutils-0.20.1-py3-none-any.whl.metadata (2.8 kB)
Requirement already satisfied: setuptools in ./lib/python3.11/site-packages (68.1.2)
Collecting sphinx
  Downloading sphinx-7.2.6-py3-none-any.whl.metadata (5.9 kB)
Collecting sphinx-epytext
  Downloading sphinx-epytext-0.0.4.tar.gz (3.6 kB)
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Collecting fastimport
  Downloading fastimport-0.9.14.tar.gz (41 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 41.8/41.8 kB 2.4 MB/s eta 0:00:00
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Requirement already satisfied: launchpadlib>=1.6.3 in /usr/lib/python3/dist-packages (1.11.0)
Requirement already satisfied: paramiko>=1.6.2 in /usr/local/lib/python3.11/dist-packages (3.3.1)
Requirement already satisfied: gpg in /usr/lib/python3/dist-packages (1.18.0)
...

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

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

text conflict in Cargo.lock

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

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

text conflict in Cargo.lock

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

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

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

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

Collecting setuptools-gettext
  Downloading setuptools_gettext-0.1.7-py3-none-any.whl.metadata (1.5 kB)
Requirement already satisfied: setuptools>=46.1 in ./lib/python3.11/site-packages (from setuptools-gettext) (68.1.2)
Downloading setuptools_gettext-0.1.7-py3-none-any.whl (5.5 kB)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.7
Obtaining file:///tmp/tarmac/branch.0d4ayhym
  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 (5.0.8)
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (0.2)
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (0.2.13)
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (0.0.8)
Requirement already satisfied: dulwich>=0.21.6 in /usr/lib/python3/dist-packages (0.21.6)
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (1.26.18)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (6.0.1)
Collecting testtools>=0.9.5
  Downloading testtools-2.7.1-py3-none-any.whl.metadata (5.3 kB)
Collecting testscenarios
  Downloading testscenarios-0.5.0-py2.py3-none-any.whl (21 kB)
Collecting python-subunit
  Downloading python_subunit-1.4.4-py3-none-any.whl.metadata (22 kB)
Collecting cython>=0.29
  Using cached Cython-3.0.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (3.2 kB)
Requirement already satisfied: ruff in /usr/local/lib/python3.11/dist-packages (0.1.5)
Collecting docutils
  Downloading docutils-0.20.1-py3-none-any.whl.metadata (2.8 kB)
Requirement already satisfied: setuptools in ./lib/python3.11/site-packages (68.1.2)
Collecting sphinx
  Downloading sphinx-7.2.6-py3-none-any.whl.metadata (5.9 kB)
Collecting sphinx-epytext
  Downloading sphinx-epytext-0.0.4.tar.gz (3.6 kB)
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Collecting fastimport
  Downloading fastimport-0.9.14.tar.gz (41 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 41.8/41.8 kB 2.1 MB/s eta 0:00:00
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Requirement already satisfied: launchpadlib>=1.6.3 in /usr/lib/python3/dist-packages (1.11.0)
Requirement already satisfied: paramiko>=1.6.2 in /usr/local/lib/python3.11/dist-packages (3.3.1)
Requirement already satisfied: gpg in /usr/lib/python3/dist-packages (1.18.0)
...

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

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

Collecting setuptools-gettext
  Using cached setuptools_gettext-0.1.7-py3-none-any.whl.metadata (1.5 kB)
Requirement already satisfied: setuptools>=46.1 in ./lib/python3.11/site-packages (from setuptools-gettext) (68.1.2)
Using cached setuptools_gettext-0.1.7-py3-none-any.whl (5.5 kB)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.7
Obtaining file:///tmp/tarmac/branch.2mqzdls8
  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 (5.0.8)
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (0.2)
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (0.2.13)
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (0.0.8)
Requirement already satisfied: dulwich>=0.21.6 in /usr/lib/python3/dist-packages (0.21.6)
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (1.26.18)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (6.0.1)
Collecting testtools>=0.9.5
  Using cached testtools-2.7.1-py3-none-any.whl.metadata (5.3 kB)
Collecting testscenarios
  Using cached testscenarios-0.5.0-py2.py3-none-any.whl (21 kB)
Collecting python-subunit
  Using cached python_subunit-1.4.4-py3-none-any.whl.metadata (22 kB)
Collecting cython>=0.29
  Using cached Cython-3.0.6-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (3.2 kB)
Requirement already satisfied: ruff in /usr/local/lib/python3.11/dist-packages (0.1.6)
Collecting docutils
  Using cached docutils-0.20.1-py3-none-any.whl.metadata (2.8 kB)
Requirement already satisfied: setuptools in ./lib/python3.11/site-packages (68.1.2)
Collecting sphinx
  Using cached sphinx-7.2.6-py3-none-any.whl.metadata (5.9 kB)
Collecting sphinx-epytext
  Using cached sphinx_epytext-0.0.4-py3-none-any.whl
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 (1.11.0)
Requirement already satisfied: paramiko>=1.6.2 in /usr/local/lib/python3.11/dist-packages (3.3.1)
Requirement already satisfied: gpg in /usr/lib/python3/dist-packages (1.18.0)
Requirement already satisfied: httplib2 in /usr/lib/python3/dist-packages (from launchpadlib>=1.6.3) (0.20.4)
Requirement already satisfied: lazr.restfulclient>=0.14.2 in /usr/lib/python3/dist-packages (from launchpadlib>=1.6.3) (0.14.5)
Requirement already satisfied:...

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

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

Collecting setuptools-gettext
  Downloading setuptools_gettext-0.1.7-py3-none-any.whl.metadata (1.5 kB)
Requirement already satisfied: setuptools>=46.1 in ./lib/python3.11/site-packages (from setuptools-gettext) (68.1.2)
Downloading setuptools_gettext-0.1.7-py3-none-any.whl (5.5 kB)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.7
Obtaining file:///tmp/tarmac/branch.sv_t844m
  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 (5.0.8)
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (0.2)
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (0.2.13)
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (0.0.8)
Requirement already satisfied: dulwich>=0.21.6 in /usr/lib/python3/dist-packages (0.21.6)
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (1.26.18)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (6.0.1)
Collecting testtools>=0.9.5
  Downloading testtools-2.7.1-py3-none-any.whl.metadata (5.3 kB)
Collecting testscenarios
  Downloading testscenarios-0.5.0-py2.py3-none-any.whl (21 kB)
Collecting python-subunit
  Downloading python_subunit-1.4.4-py3-none-any.whl.metadata (22 kB)
Collecting cython>=0.29
  Using cached Cython-3.0.6-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (3.2 kB)
Requirement already satisfied: ruff in /usr/local/lib/python3.11/dist-packages (0.1.6)
Collecting docutils
  Downloading docutils-0.20.1-py3-none-any.whl.metadata (2.8 kB)
Requirement already satisfied: setuptools in ./lib/python3.11/site-packages (68.1.2)
Collecting sphinx
  Downloading sphinx-7.2.6-py3-none-any.whl.metadata (5.9 kB)
Collecting sphinx-epytext
  Downloading sphinx-epytext-0.0.4.tar.gz (3.6 kB)
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Collecting fastimport
  Downloading fastimport-0.9.14.tar.gz (41 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 41.8/41.8 kB 2.2 MB/s eta 0:00:00
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Requirement already satisfied: launchpadlib>=1.6.3 in /usr/lib/python3/dist-packages (1.11.0)
Requirement already satisfied: paramiko>=1.6.2 in /usr/local/lib/python3.11/dist-packages (3.3.1)
Requirement already satisfied: gpg in /usr/lib/python3/dist-packages (1.18.0)
...

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

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

Collecting setuptools-gettext
  Downloading setuptools_gettext-0.1.8-py3-none-any.whl.metadata (1.9 kB)
Requirement already satisfied: setuptools>=60.8 in ./lib/python3.11/site-packages (from setuptools-gettext) (68.1.2)
Downloading setuptools_gettext-0.1.8-py3-none-any.whl (12 kB)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.8
Obtaining file:///tmp/tarmac/branch.kti0gmbf
  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 (5.0.8)
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (0.2)
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (0.2.13)
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (0.0.8)
Requirement already satisfied: dulwich>=0.21.6 in /usr/lib/python3/dist-packages (0.21.6)
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (1.26.18)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (6.0.1)
Collecting testtools>=0.9.5
  Downloading testtools-2.7.1-py3-none-any.whl.metadata (5.3 kB)
Collecting testscenarios
  Downloading testscenarios-0.5.0-py2.py3-none-any.whl (21 kB)
Collecting python-subunit
  Downloading python_subunit-1.4.4-py3-none-any.whl.metadata (22 kB)
Collecting cython>=0.29
  Using cached Cython-3.0.7-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (3.2 kB)
Requirement already satisfied: ruff in /usr/local/lib/python3.11/dist-packages (0.1.9)
Collecting docutils
  Downloading docutils-0.20.1-py3-none-any.whl.metadata (2.8 kB)
Requirement already satisfied: setuptools in ./lib/python3.11/site-packages (68.1.2)
Collecting sphinx
  Downloading sphinx-7.2.6-py3-none-any.whl.metadata (5.9 kB)
Collecting sphinx-epytext
  Downloading sphinx-epytext-0.0.4.tar.gz (3.6 kB)
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Collecting fastimport
  Downloading fastimport-0.9.14.tar.gz (41 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 41.8/41.8 kB 2.7 MB/s eta 0:00:00
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Requirement already satisfied: launchpadlib>=1.6.3 in /usr/lib/python3/dist-packages (1.11.0)
Requirement already satisfied: paramiko>=1.6.2 in /usr/local/lib/python3.11/dist-packages (3.3.1)
Requirement already satisfied: gpg in /usr/lib/python3/dist-packages (1.18.0)
R...

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

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

Collecting setuptools-gettext
  Downloading setuptools_gettext-0.1.8-py3-none-any.whl.metadata (1.9 kB)
Requirement already satisfied: setuptools>=60.8 in ./lib/python3.11/site-packages (from setuptools-gettext) (68.1.2)
Downloading setuptools_gettext-0.1.8-py3-none-any.whl (12 kB)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.8
Obtaining file:///tmp/tarmac/branch.uowdbirk
  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 (5.0.8)
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (0.2)
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (0.2.13)
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (0.0.8)
Requirement already satisfied: dulwich>=0.21.6 in /usr/lib/python3/dist-packages (0.21.6)
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (1.26.18)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (6.0.1)
Collecting testtools>=0.9.5
  Downloading testtools-2.7.1-py3-none-any.whl.metadata (5.3 kB)
Collecting testscenarios
  Downloading testscenarios-0.5.0-py2.py3-none-any.whl (21 kB)
Collecting python-subunit
  Downloading python_subunit-1.4.4-py3-none-any.whl.metadata (22 kB)
Collecting cython>=0.29
  Using cached Cython-3.0.7-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (3.2 kB)
Requirement already satisfied: ruff in /usr/local/lib/python3.11/dist-packages (0.1.11)
Collecting docutils
  Downloading docutils-0.20.1-py3-none-any.whl.metadata (2.8 kB)
Requirement already satisfied: setuptools in ./lib/python3.11/site-packages (68.1.2)
Collecting sphinx
  Downloading sphinx-7.2.6-py3-none-any.whl.metadata (5.9 kB)
Collecting sphinx-epytext
  Downloading sphinx-epytext-0.0.4.tar.gz (3.6 kB)
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Collecting fastimport
  Downloading fastimport-0.9.14.tar.gz (41 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 41.8/41.8 kB 2.3 MB/s eta 0:00:00
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Requirement already satisfied: launchpadlib>=1.6.3 in /usr/lib/python3/dist-packages (1.11.0)
Requirement already satisfied: paramiko>=1.6.2 in /usr/local/lib/python3.11/dist-packages (3.3.1)
Requirement already satisfied: gpg in /usr/lib/python3/dist-packages (1.18.0)
...

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

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

text conflict in Cargo.lock
text conflict in crates/graph-py/src/lib.rs

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

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

Collecting setuptools-gettext
  Downloading setuptools_gettext-0.1.11-py3-none-any.whl.metadata (1.9 kB)
Requirement already satisfied: setuptools>=60.8 in ./lib/python3.11/site-packages (from setuptools-gettext) (68.1.2)
Downloading setuptools_gettext-0.1.11-py3-none-any.whl (13 kB)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.11
Obtaining file:///tmp/tarmac/branch._4ouwour
  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.4.0.dev0) (5.0.8)
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (0.2)
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (0.2.13)
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (0.0.8)
Requirement already satisfied: dulwich>=0.21.6 in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (0.21.6)
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (1.26.18)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (6.0.1)
Collecting testtools>=0.9.5 (from breezy==3.4.0.dev0)
  Downloading testtools-2.7.1-py3-none-any.whl.metadata (5.3 kB)
Collecting testscenarios (from breezy==3.4.0.dev0)
  Downloading testscenarios-0.5.0-py2.py3-none-any.whl (21 kB)
Collecting python-subunit (from breezy==3.4.0.dev0)
  Downloading python_subunit-1.4.4-py3-none-any.whl.metadata (22 kB)
Collecting cython>=0.29 (from breezy==3.4.0.dev0)
  Using cached Cython-3.0.8-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (3.2 kB)
Requirement already satisfied: ruff in /usr/local/lib/python3.11/dist-packages (from breezy==3.4.0.dev0) (0.2.2)
Collecting docutils (from breezy==3.4.0.dev0)
  Downloading docutils-0.20.1-py3-none-any.whl.metadata (2.8 kB)
Requirement already satisfied: setuptools in ./lib/python3.11/site-packages (from breezy==3.4.0.dev0) (68.1.2)
Collecting sphinx (from breezy==3.4.0.dev0)
  Downloading sphinx-7.2.6-py3-none-any.whl.metadata (5.9 kB)
Collecting sphinx-epytext (from breezy==3.4.0.dev0)
  Downloading sphinx-epytext-0.0.4.tar.gz (3.6 kB)
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Collecting fastimport (from breezy==3.4.0.dev0)
  Downloading fastimport-0.9.14.tar.gz (41 kB)
     ━━━...

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

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

Collecting setuptools-gettext
  Downloading setuptools_gettext-0.1.11-py3-none-any.whl.metadata (1.9 kB)
Requirement already satisfied: setuptools>=60.8 in ./lib/python3.11/site-packages (from setuptools-gettext) (68.1.2)
Downloading setuptools_gettext-0.1.11-py3-none-any.whl (13 kB)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.11
Obtaining file:///tmp/tarmac/branch.6x_as0h0
  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.4.0.dev0) (5.0.8)
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (0.2)
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (0.2.13)
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (0.0.8)
Requirement already satisfied: dulwich>=0.21.6 in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (0.21.6)
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (1.26.18)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (6.0.1)
Collecting testtools>=0.9.5 (from breezy==3.4.0.dev0)
  Downloading testtools-2.7.1-py3-none-any.whl.metadata (5.3 kB)
Collecting testscenarios (from breezy==3.4.0.dev0)
  Downloading testscenarios-0.5.0-py2.py3-none-any.whl (21 kB)
Collecting python-subunit (from breezy==3.4.0.dev0)
  Downloading python_subunit-1.4.4-py3-none-any.whl.metadata (22 kB)
Collecting cython>=0.29 (from breezy==3.4.0.dev0)
  Using cached Cython-3.0.8-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (3.2 kB)
Requirement already satisfied: ruff in /usr/local/lib/python3.11/dist-packages (from breezy==3.4.0.dev0) (0.2.2)
Collecting docutils (from breezy==3.4.0.dev0)
  Downloading docutils-0.20.1-py3-none-any.whl.metadata (2.8 kB)
Requirement already satisfied: setuptools in ./lib/python3.11/site-packages (from breezy==3.4.0.dev0) (68.1.2)
Collecting sphinx (from breezy==3.4.0.dev0)
  Downloading sphinx-7.2.6-py3-none-any.whl.metadata (5.9 kB)
Collecting sphinx-epytext (from breezy==3.4.0.dev0)
  Downloading sphinx-epytext-0.0.4.tar.gz (3.6 kB)
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Collecting fastimport (from breezy==3.4.0.dev0)
  Downloading fastimport-0.9.14.tar.gz (41 kB)
     ━━━...

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

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

Collecting setuptools-gettext
  Downloading setuptools_gettext-0.1.11-py3-none-any.whl.metadata (1.9 kB)
Requirement already satisfied: setuptools>=60.8 in ./lib/python3.11/site-packages (from setuptools-gettext) (68.1.2)
Downloading setuptools_gettext-0.1.11-py3-none-any.whl (13 kB)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.11
Obtaining file:///tmp/tarmac/branch.nky9u_7g
  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.4.0.dev0) (5.0.8)
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (0.2)
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (0.2.13)
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (0.0.8)
Requirement already satisfied: dulwich>=0.21.6 in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (0.21.6)
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (1.26.18)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (6.0.1)
Collecting testtools>=0.9.5 (from breezy==3.4.0.dev0)
  Downloading testtools-2.7.1-py3-none-any.whl.metadata (5.3 kB)
Collecting testscenarios (from breezy==3.4.0.dev0)
  Downloading testscenarios-0.5.0-py2.py3-none-any.whl.metadata (12 kB)
Collecting python-subunit (from breezy==3.4.0.dev0)
  Downloading python_subunit-1.4.4-py3-none-any.whl.metadata (22 kB)
Collecting cython>=0.29 (from breezy==3.4.0.dev0)
  Using cached Cython-3.0.9-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (3.2 kB)
Requirement already satisfied: ruff in /usr/local/lib/python3.11/dist-packages (from breezy==3.4.0.dev0) (0.3.4)
Requirement already satisfied: types-paramiko in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (3.3)
Requirement already satisfied: types-PyYAML in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (6.0)
Collecting docutils (from breezy==3.4.0.dev0)
  Downloading docutils-0.20.1-py3-none-any.whl.metadata (2.8 kB)
Requirement already satisfied: setuptools in ./lib/python3.11/site-packages (from breezy==3.4.0.dev0) (68.1.2)
Collecting sphinx (from breezy==3.4.0.dev0)
  Downloading sphinx-7.2.6-py3-none-any.whl.metadata (5.9 kB)
Collecting sphinx-epytext (from breezy==3.4.0.dev0)
  Downloading sphinx-epyt...

Unmerged revisions

7910. By Jelmer Vernooij on 2024-02-18

Merge lp:brz

7909. By Jelmer Vernooij on 2024-01-06

Fix clippy

7908. By Jelmer Vernooij on 2023-12-31

Merge trunk

7907. By Jelmer Vernooij on 2023-11-29

Install apt from git

7906. By Jelmer Vernooij on 2023-11-28

Install python3-apt

7905. By Jelmer Vernooij on 2023-11-17

Merge truk:

7904. By Jelmer Vernooij on 2023-11-09

Fix tests

7903. By Jelmer Vernooij on 2023-11-09

Another round of type fixes

7902. By Jelmer Vernooij on 2023-11-09

Fix typing

7901. By Jelmer Vernooij on 2023-11-09

Fix up bp.debian; apply ruff fixes

=== modified file '.github/workflows/pythonpackage.yml'
--- .github/workflows/pythonpackage.yml	2023-09-29 22:34:48 +0000
+++ .github/workflows/pythonpackage.yml	2024-02-18 23:22:42 +0000
@@ -45,7 +45,8 @@
           python -m pip install --upgrade pip
           python -m pip install -U pip "setuptools>=60" setuptools-gettext cython setuptools-rust
           python -m pip install -U pip coverage codecov cython testscenarios git+https://github.com/dulwich/dulwich
-          python -m pip install ".[dev,paramiko,doc,launchpad,git,fastimport]"
+          python -m pip install git+https://salsa.debian.org/apt-team/python-apt
+          python -m pip install ".[dev,paramiko,doc,launchpad,git,fastimport,debian]"
       - name: Install dependencies (linux/pip)
         run: |
           sudo apt install libgpgme-dev

=== modified file 'Cargo.lock'
--- Cargo.lock	2024-01-27 13:58:35 +0000
+++ Cargo.lock	2024-02-18 23:22:42 +0000
@@ -198,6 +198,14 @@
 ]
 
 [[package]]
+name = "breezy-debian"
+version = "2.8.78"
+dependencies = [
+ "debian-changelog",
+ "debian-control",
+]
+
+[[package]]
 name = "breezy-git"
 version = "3.4.0"
 dependencies = [
@@ -289,9 +297,9 @@
 
 [[package]]
 name = "bumpalo"
-version = "3.14.0"
+version = "3.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
+checksum = "d32a994c2b3ca201d9b263612a374263f05e7adde37c4707f693dcd375076d1f"
 
 [[package]]
 name = "byteorder"
@@ -316,13 +324,15 @@
 
 [[package]]
 name = "chrono"
-version = "0.4.33"
+version = "0.4.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb"
+checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
+ "js-sys",
  "num-traits",
+ "wasm-bindgen",
  "windows-targets 0.52.0",
 ]
 
@@ -344,6 +354,12 @@
 checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
 
 [[package]]
+name = "countme"
+version = "3.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636"
+
+[[package]]
 name = "cpufeatures"
 version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -354,9 +370,9 @@
 
 [[package]]
 name = "crc32fast"
-version = "1.3.2"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
 dependencies = [
  "cfg-if",
 ]
@@ -372,6 +388,54 @@
 ]
 
 [[package]]
+name = "deb822-lossless"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2419c03e447e68c58bb4b2b0fe61833104821791fbada165d235aa36510430ea"
+dependencies = [
+ "regex",
+ "rowan",
+ "serde",
+]
+
+[[package]]
+name = "debian-changelog"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf0fbdc5e8c585c4c35454d1fad4a1cf1f5cbae4c55071f4ae80fbb65662ac0b"
+dependencies = [
+ "chrono",
+ "debversion",
+ "lazy-regex",
+ "log",
+ "rowan",
+ "textwrap",
+ "whoami",
+]
+
+[[package]]
+name = "debian-control"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6cec8b5ba6189640ab127f182d35e98959b7ed90b6953bf7d71e0b45a9127321"
+dependencies = [
+ "deb822-lossless",
+ "debversion",
+ "regex",
+ "rowan",
+ "url",
+]
+
+[[package]]
+name = "debversion"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e65a0a572fa10f34b89addac251b7c8f40266606ee5847d769ab8db4d56ca11b"
+dependencies = [
+ "lazy-regex",
+]
+
+[[package]]
 name = "digest"
 version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -566,9 +630,9 @@
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.4"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f"
+checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd"
 
 [[package]]
 name = "hostname"
@@ -583,9 +647,9 @@
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.59"
+version = "0.1.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539"
+checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -616,9 +680,9 @@
 
 [[package]]
 name = "indexmap"
-version = "2.1.0"
+version = "2.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
+checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -644,9 +708,9 @@
 
 [[package]]
 name = "js-sys"
-version = "0.3.67"
+version = "0.3.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1"
+checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -671,7 +735,7 @@
  "proc-macro2",
  "quote",
  "regex",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
@@ -682,9 +746,9 @@
 
 [[package]]
 name = "libc"
-version = "0.2.152"
+version = "0.2.153"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
 [[package]]
 name = "libredox"
@@ -745,9 +809,9 @@
 
 [[package]]
 name = "lru"
-version = "0.12.1"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2994eeba8ed550fd9b47a0b38f0242bc3344e496483c6180b69139cc2fa5d1d7"
+checksum = "db2c024b41519440580066ba82aab04092b333e09066a5eb86c7c4890df31f22"
 dependencies = [
  "hashbrown",
 ]
@@ -801,9 +865,9 @@
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
 dependencies = [
  "adler",
 ]
@@ -821,9 +885,9 @@
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
 dependencies = [
  "autocfg",
 ]
@@ -952,9 +1016,9 @@
 
 [[package]]
 name = "pkg-config"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
 [[package]]
 name = "ppv-lite86"
@@ -1027,7 +1091,7 @@
  "proc-macro2",
  "pyo3-macros-backend",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
@@ -1039,7 +1103,7 @@
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
@@ -1137,16 +1201,35 @@
 checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
 
 [[package]]
+name = "rowan"
+version = "0.15.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a58fa8a7ccff2aec4f39cc45bf5f985cec7125ab271cf681c279fd00192b49"
+dependencies = [
+ "countme",
+ "hashbrown",
+ "memoffset",
+ "rustc-hash",
+ "text-size",
+]
+
+[[package]]
 name = "rustc-demangle"
 version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
 [[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
 name = "rustix"
-version = "0.38.30"
+version = "0.38.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca"
+checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
 dependencies = [
  "bitflags 2.4.2",
  "errno",
@@ -1193,14 +1276,14 @@
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
 name = "serde_yaml"
-version = "0.9.30"
+version = "0.9.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1bf28c79a99f70ee1f1d83d10c875d2e70618417fda01ad1785e027579d9d38"
+checksum = "adf8a49373e98a4c5f0ceb5d05aa7c648d75f63774981ed95b7c7443bbd50c6e"
 dependencies = [
  "indexmap",
  "itoa",
@@ -1254,9 +1337,9 @@
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "915aea9e586f80826ee59f8453c1101f9d1c4b3964cd2460185ee8e299ada496"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1289,13 +1372,12 @@
 
 [[package]]
 name = "tempfile"
-version = "3.9.0"
+version = "3.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa"
+checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67"
 dependencies = [
  "cfg-if",
  "fastrand",
- "redox_syscall",
  "rustix",
  "windows-sys 0.52.0",
 ]
@@ -1322,10 +1404,16 @@
 ]
 
 [[package]]
+name = "text-size"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233"
+
+[[package]]
 name = "textwrap"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
+checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
 dependencies = [
  "smawk",
  "unicode-linebreak",
@@ -1334,22 +1422,22 @@
 
 [[package]]
 name = "thiserror"
-version = "1.0.56"
+version = "1.0.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
+checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.56"
+version = "1.0.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
+checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
@@ -1480,9 +1568,9 @@
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.90"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406"
+checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -1490,24 +1578,24 @@
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.90"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd"
+checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.90"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999"
+checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -1515,22 +1603,22 @@
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.90"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7"
+checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.90"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b"
+checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838"
 
 [[package]]
 name = "whoami"
@@ -1751,7 +1839,7 @@
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]

=== modified file 'breezy/bugtracker.py'
--- breezy/bugtracker.py	2023-11-07 10:54:10 +0000
+++ breezy/bugtracker.py	2024-02-18 23:22:42 +0000
@@ -322,6 +322,8 @@
     :return: iterator over (url, status) tuples
     """
     for line in bug_lines:
+        if not line:
+            continue
         try:
             url, status = line.split(None, 2)
         except ValueError as exc:

=== modified file 'breezy/commands.py'
--- breezy/commands.py	2023-11-16 15:15:02 +0000
+++ breezy/commands.py	2024-02-18 23:22:42 +0000
@@ -26,7 +26,7 @@
 import contextlib
 import os
 import sys
-from typing import List, Optional, Union
+from typing import List, Optional
 
 from . import i18n, option, trace
 from .lazy_import import lazy_import
@@ -489,7 +489,7 @@
 
     aliases: List[str] = []
     takes_args: List[str] = []
-    takes_options: List[Union[str, option.Option]] = []
+    takes_options: list[str | option.Option] = []
     encoding_type: str = "strict"
     invoked_as: Optional[str] = None
     l10n: bool = True

=== renamed file 'breezy/git/bzr-receive-pack' => 'breezy/git/bzr_receive_pack.py'
--- breezy/git/bzr-receive-pack	2023-01-31 01:05:40 +0000
+++ breezy/git/bzr_receive_pack.py	2024-02-18 23:22:42 +0000
@@ -1,5 +1,21 @@
 #!/usr/bin/env python3
 
+# Copyright (C) 2010 Jelmer Vernooij <[e-mail]>
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
 import os
 import sys
 
@@ -10,9 +26,11 @@
 import breezy.git
 from breezy.git.server import BzrBackend
 
-if len(sys.argv) < 2:
-    print("usage: %s <git-dir>" % os.path.basename(sys.argv[0]))
-    sys.exit(1)
-
-backend = BzrBackend(breezy.transport.get_transport("/"))
-sys.exit(serve_command(ReceivePackHandler, backend=backend))
+
+def main():
+    if len(sys.argv) < 2:
+        print("usage: %s <git-dir>" % os.path.basename(sys.argv[0]))
+        sys.exit(1)
+
+    backend = BzrBackend(breezy.transport.get_transport("/"))
+    sys.exit(serve_command(ReceivePackHandler, backend=backend))

=== renamed file 'breezy/git/bzr-upload-pack' => 'breezy/git/bzr_upload_pack.py'
--- breezy/git/bzr-upload-pack	2023-01-31 01:05:40 +0000
+++ breezy/git/bzr_upload_pack.py	2024-02-18 23:22:42 +0000
@@ -1,5 +1,21 @@
 #!/usr/bin/env python3
 
+# Copyright (C) 2010 Jelmer Vernooij <[e-mail]>
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
 import os
 import sys
 
@@ -10,9 +26,11 @@
 import breezy.git
 from breezy.git.server import BzrBackend
 
-if len(sys.argv) < 2:
-    print("usage: %s <git-dir>" % os.path.basename(sys.argv[0]))
-    sys.exit(1)
-
-backend = BzrBackend(breezy.transport.get_transport("/"))
-sys.exit(serve_command(UploadPackHandler, backend=backend))
+
+def main():
+    if len(sys.argv) < 2:
+        print("usage: %s <git-dir>" % os.path.basename(sys.argv[0]))
+        sys.exit(1)
+
+    backend = BzrBackend(breezy.transport.get_transport("/"))
+    sys.exit(serve_command(UploadPackHandler, backend=backend))

=== renamed file 'breezy/git/git-remote-bzr' => 'breezy/git/git_remote_bzr.py'
--- breezy/git/git-remote-bzr	2023-01-31 01:05:40 +0000
+++ breezy/git/git_remote_bzr.py	2024-02-18 23:22:42 +0000
@@ -28,6 +28,7 @@
 def handle_sigint(signal, frame):
     sys.exit(0)
 
+
 signal.signal(signal.SIGINT, handle_sigint)
 
 import breezy
@@ -38,18 +39,20 @@
 
 load_plugins()
 
-from breezy.git.git_remote_helper import (RemoteHelper, open_local_dir,
-                                          open_remote_dir)
+from breezy.git.git_remote_helper import RemoteHelper, open_local_dir, open_remote_dir
 from breezy.trace import warning
 
-parser = optparse.OptionParser()
-(opts, args) = parser.parse_args()
-(shortname, url) = args
-
-warning(
-    'git-remote-bzr is experimental and has not been optimized for '
-    'performance. Use \'brz fast-export\' and \'git fast-import\' for '
-    'large repositories.')
-
-helper = RemoteHelper(open_local_dir(), shortname, open_remote_dir(url))
-helper.process(sys.stdin.buffer, sys.stdout.buffer)
+
+def main():
+    parser = optparse.OptionParser()
+    (opts, args) = parser.parse_args()
+    (shortname, url) = args
+
+    warning(
+        "git-remote-bzr is experimental and has not been optimized for "
+        "performance. Use 'brz fast-export' and 'git fast-import' for "
+        "large repositories."
+    )
+
+    helper = RemoteHelper(open_local_dir(), shortname, open_remote_dir(url))
+    helper.process(sys.stdin.buffer, sys.stdout.buffer)

=== modified file 'breezy/merge.py'
--- breezy/merge.py	2023-11-16 15:15:02 +0000
+++ breezy/merge.py	2024-02-18 23:22:42 +0000
@@ -16,7 +16,7 @@
 
 import contextlib
 import tempfile
-from typing import Type
+from typing import Optional, Type
 
 from .lazy_import import lazy_import
 
@@ -177,7 +177,7 @@
     """
 
     name_prefix: str
-    default_files = None
+    default_files: Optional[list[str]] = None
 
     def __init__(self, merger):
         super().__init__(merger)

=== added directory 'breezy/plugins/debian'
=== added file 'breezy/plugins/debian/Dockerfile.deb-auto-backport'
--- breezy/plugins/debian/Dockerfile.deb-auto-backport	1970-01-01 00:00:00 +0000
+++ breezy/plugins/debian/Dockerfile.deb-auto-backport	2024-02-18 23:22:42 +0000
@@ -0,0 +1,7 @@
+FROM debian:sid-slim
+RUN apt -y update && apt install -y git dctrl-tools
+COPY . /code
+RUN apt satisfy -y "$(grep-dctrl -n -w -s Build-Depends '' /code/debian/control)"
+ENV PYTHONPATH=/code
+VOLUME /data
+ENTRYPOINT ["/code/scripts/deb-auto-backport", "-d", "/data"]

=== added file 'breezy/plugins/debian/Dockerfile.deb-import-uncommitted'
--- breezy/plugins/debian/Dockerfile.deb-import-uncommitted	1970-01-01 00:00:00 +0000
+++ breezy/plugins/debian/Dockerfile.deb-import-uncommitted	2024-02-18 23:22:42 +0000
@@ -0,0 +1,7 @@
+FROM debian:sid-slim
+RUN apt -y update && apt install -y git dctrl-tools
+COPY . /code
+RUN apt satisfy -y "$(grep-dctrl -n -w -s Build-Depends '' /code/debian/control)"
+ENV PYTHONPATH=/code
+VOLUME /data
+ENTRYPOINT ["/code/scripts/deb-import-uncommitted", "-d", "/data"]

=== added file 'breezy/plugins/debian/Dockerfile.deb-move-orphaned'
--- breezy/plugins/debian/Dockerfile.deb-move-orphaned	1970-01-01 00:00:00 +0000
+++ breezy/plugins/debian/Dockerfile.deb-move-orphaned	2024-02-18 23:22:42 +0000
@@ -0,0 +1,7 @@
+FROM debian:sid-slim
+RUN apt -y update && apt install -y git dctrl-tools
+COPY . /code
+RUN apt satisfy -y "$(grep-dctrl -n -w -s Build-Depends '' /code/debian/control)"
+ENV PYTHONPATH=/code
+VOLUME /data
+ENTRYPOINT ["/code/scripts/deb-move-orphaned", "-d", "/data"]

=== added file 'breezy/plugins/debian/Dockerfile.deb-new-upstream'
--- breezy/plugins/debian/Dockerfile.deb-new-upstream	1970-01-01 00:00:00 +0000
+++ breezy/plugins/debian/Dockerfile.deb-new-upstream	2024-02-18 23:22:42 +0000
@@ -0,0 +1,7 @@
+FROM debian:sid-slim
+RUN apt -y update && apt install -y git dctrl-tools
+COPY . /code
+RUN apt satisfy -y "$(grep-dctrl -n -w -s Build-Depends '' /code/debian/control)"
+ENV PYTHONPATH=/code
+VOLUME /data
+ENTRYPOINT ["/code/scripts/deb-new-upstream", "-d", "/data"]

=== added file 'breezy/plugins/debian/Makefile'
--- breezy/plugins/debian/Makefile	1970-01-01 00:00:00 +0000
+++ breezy/plugins/debian/Makefile	2024-02-18 23:22:42 +0000
@@ -0,0 +1,46 @@
+BRZ ?= $(shell which brz)
+BRZ_OPTIONS ?= -Derror
+SETUP ?= $(PYTHON) ./setup.py
+TESTS ?= "^breezy.plugins.debian." "^unittest"
+
+all: update-pot
+
+.PHONY: update-pot po/breezy-debian.pot
+update-pot: po/breezy-debian.pot
+
+TRANSLATABLE_PYFILES:=$(shell find . -name '*.py' \
+		| grep -v 'tests/' \
+		)
+
+po/breezy-debian.pot: $(PYFILES) $(DOCFILES)
+	BRZ_PLUGINS_AT=builddeb@$(shell pwd) $(BRZ) export-pot \
+          --plugin=builddeb > po/breezy-debian.pot
+	echo $(TRANSLATABLE_PYFILES) | xargs \
+	  xgettext --package-name "breezy-debian" \
+	  --msgid-bugs-address "<[e-mail]>" \
+	  --copyright-holder "Canonical Ltd. <[e-mail]>" \
+	  --from-code ISO-8859-1 --sort-by-file --join --add-comments=i18n: \
+	  -d breezy-debian -p po -o breezy-debian.pot
+
+check:: testsuite
+
+testsuite:
+	BRZ_PLUGINS_AT=debian@$(shell pwd) $(BRZ) $(BRZ_OPTIONS) selftest $(TEST_OPTIONS) $(TESTS)
+
+check:: flake8
+
+flake8:
+	flake8 . scripts/deb-*
+
+mypy:
+	BRZ_PLUGINS_AT=debian@$(shell pwd) mypy -p breezy.plugins.debian
+
+docker:
+	buildah build -t ghcr.io/breezy-team/deb-new-upstream:latest -f Dockerfile.deb-new-upstream .
+	buildah push ghcr.io/breezy-team/deb-new-upstream:latest
+	buildah build -t ghcr.io/breezy-team/deb-auto-backport:latest -f Dockerfile.deb-auto-backport .
+	buildah push ghcr.io/breezy-team/deb-auto-backport:latest
+	buildah build -t ghcr.io/breezy-team/deb-move-orphaned:latest -f Dockerfile.deb-move-orphaned .
+	buildah push ghcr.io/breezy-team/deb-move-orphaned:latest
+	buildah build -t ghcr.io/breezy-team/deb-import-uncommitted:latest -f Dockerfile.deb-import-uncommitted .
+	buildah push ghcr.io/breezy-team/deb-import-uncommitted:latest

=== added file 'breezy/plugins/debian/README.rst'
--- breezy/plugins/debian/README.rst	1970-01-01 00:00:00 +0000
+++ breezy/plugins/debian/README.rst	2024-02-18 23:22:42 +0000
@@ -0,0 +1,342 @@
+brz-debian
+==========
+
+Overview
+--------
+
+This is brz-debian, a plugin for `Breezy`_ that allows you to build `Debian`_
+packages from a Breezy compatible branch, like a Git repository or a Bazaar
+branch.
+
+.. _Breezy: https://www.breezy-vcs.org/
+.. _Debian: http://www.debian.org/
+
+Note that there is a user manual available at
+/usr/share/doc/brz-debian/user_manual/index.html that gives more
+information than this file.
+
+Installation
+------------
+
+This plugin requires `python-debian`_ and Breezy.
+
+.. _python-debian: http://bzr.debian.org/pkg-python-debian/trunk/
+
+It also requires the ``dpkg-dev`` package to be installed (for the
+``dpkg-mergechangelogs`` tool)::
+
+  apt install dpkg-dev
+
+This plugin can be installed in two ways. As you are probably using a Debian
+system you can probably just use the Debian packages. The other way is to
+branch it in to ``~/.breezy/plugins/debian``, i.e::
+
+  brz branch https://code.breezy-vcs.org/breezy-debian/trunk/ \
+    ~/.config/breezy/plugins/debian
+
+This will give you a ``brz builddeb`` command (alias ``bd``).
+
+Help for this plugin can be found by running ``brz help builddeb``.
+
+There is also a script named ``brz-buildpackage`` provided in /usr/bin
+that provides access to the tool as well. It is just a wrapper script that
+calls ``brz builddeb`` with the arguments you provide, so the rest of the
+documentation applies equally well to using this script. Probably the only
+difference is that help will be got with ``brz-buildpackage ---help``
+(as ``brz builddeb --help`` also works and does the same as
+``brz help builddeb``). The script is provided for two reasons, the first
+is similarity to the other ``-buildpackage`` systems, and the second is so
+that the Debian package can provide the ``brz-buildpackage`` package, and
+so make it easier for people to find the package.
+
+Configuration
+-------------
+
+There are also configuration files that can be used, these are, in the order
+that values will be used if found::
+
+  * .bzr-builddeb/local.conf (in the package directory)
+  * ~/.bazaar/builddeb.conf
+  * .bzr-builddeb/default.conf (in the package directory)
+
+The last of these should be used for values that will be used by all users of
+the package, for instance 'merge = True'. The others are for the user to add
+or override settings that are specific to them, either globally or per package.
+
+There is one complication to this however. As arbitrary commands can be
+specified for some of the options there is a potential security hole. This
+is closed by only taking these options from the configuration file in your
+home directory, which can't be changed by another committer to the branch.
+I apologise if this breaks your setup, and if you can't work around it please
+talk to me to try to find an approach that satisfies you and does not open
+any security holes.
+
+These files must start with::
+
+  [BUILDDEB]
+
+Configuration Options
+~~~~~~~~~~~~~~~~~~~~~
+
+The following options are read from the configuration files. Most can also be
+used as command line arguments by prepending ``--`` to the names and not using
+the ``\=`` symbol. There are a few exceptions to this that are noted in the
+descriptions.
+
+Directories
+###########
+
+These change the directories that the plugin uses for various things.
+
+  * ``build-dir = path``
+
+    The directory in which the build takes place. (Defaults to
+    ``../build-area`` relative to the branch).
+
+  * ``result-dir = path``
+
+    The directory the resulting files will be placed in. (Defaults to ``..``)
+
+  * ``orig-dir = path``
+
+    The directory to search for the ``.orig.tar.gz`` when not in native mode.
+    (Defaults to ``..`` relative to the branch).
+
+Modes
+#####
+
+These change the way in which the plugin operates. They can be set depending
+on the type of package you are building.
+
+  * ``merge = True``
+
+    Turns on merge mode. This is where only the ``debian/`` directory is
+    versioned. It uses and ``orig.tar.gz`` for the upstream and combines the
+    two before building. It works with both the ``debian/`` directory in the
+    branch, or the contents of ``debian/`` (e.g. ``rules``, ``control``)
+    directly in the top level directory of the branch. (Defaults to ``False``).
+
+  * ``native = True``
+
+    If you want to build a native package from a branch then turn on this
+    option. It will stop the plugin from looking for an ``orig.tar.gz`` and
+    build a native package instead. This has no effect if merge mode is on,
+    as I don't think it makes any sense to version the ``debian/`` separately
+    for a native package. If you disagree let me know.
+
+  * ``split = True``
+
+    This takes a package from a branch that includes both the upstream source
+    and the ``debian/`` dir and creates a non-native package from it by
+    creating an ``orig.tar.gz`` from the code outside of ``debian/``. This
+    is probably most useful if you are bot upstream and Debian maintainer
+    of a non-native package. This has no effect if ``merge`` or ``native``
+    are true, the former is for use when you don't version the full source,
+    the second for when you don't need an ``orig.tar.gz`` so they make no sense
+    to be used together.
+
+  * ``export-upstream = path``
+
+    This option takes a path (remote or local) to a brz branch that contains
+    the upstream code. If this is set then the plugin will export the code
+    from that branch to create the ``.orig.tar.gz``. This option only has any
+    effect if ``merge`` is set.
+
+  * ``export-upstream-revision = revision``
+
+    This sets the revision that the upstream code will be branched at. It takes
+    the same revision spec as the normal --revision parameter. Use it to
+    associate an upstream version number with a particular revision of the
+    upstream code. This has no effect if ``export-upstream`` is not set.
+
+Builders
+########
+
+These configure the commands that are used to build the package in different
+situations.
+
+  * ``builder = command``
+
+    The command to use to build the package. Defaults to ``debuild``).
+    Will only be read from the file in your home directory.
+
+  * ``quick-builder = command``
+
+    The command used to build the package if the ``--quick`` option is used.
+    (Defaults to ``fakeroot debian/rules binary``). Will only be read from
+    the file in your home directory.
+
+The idea is that certain options can be set in ``.bzr-builddeb/default.conf``
+that apply to the package on all systems, or that there is a default that is
+wanted that differs from the default provided. ``merge = True`` is a perfect
+example of this.
+
+Then the user can override this locally if they want for all of their packages
+(they prefer ``builder = pdebuild``), so they can set this in
+``~/.bazaar/builddeb.conf``. They can override it for the package if they want
+(e.g. they have a different location for upstream tarballs of a package if
+they are involved with upstream as well, so they set ``orig_dir =
+/home/.../releases/``), this can be done in ``.bzr-builddeb/local.conf``).
+
+Creating a package
+------------------
+
+Below are instructions for creating a package. These instructions differ
+depending on whether you want to use merge mode or not.
+
+First the common start create a directory to hold your work. This is not
+absolutely necessary, but as you still get all the power of brz when using
+this plugin, so you might want to branch etc. and so this will be useful
+later on::
+
+  $ mkdir path/to/project
+
+If you are going to be using branches then the following is a good optimisation
+you can use::
+
+  $ brz init-repo --trees path/to/project
+
+Now create your global config file if you want to change something like the
+builder in use, or have a global result directory or similar::
+
+  $ echo "[BUILDDEB]" > ~/.bazaar/builddeb.conf
+  $ $EDITOR ~/.bazaar/builddeb.conf
+
+and any options that you want.
+
+I will describe creating a new project, but for existing projects you can
+copy the code over and call ``brz init`` then continue in the same way.
+
+I will also describe the setup that conforms to the default options for
+directories. If you wish to use a different layout set up the options to
+your liking and tweak the commands below as necessary.
+
+Using merge mode
+~~~~~~~~~~~~~~~~
+
+Merge mode is when only the ``debian/`` directory of the package is versioned,
+with the upstream version of the code living elsewhere. It allows for clear
+separation of the Debian specific changes from the upstream code.
+
+First copy the ``.orig.tar.gz`` file for the current version in to the parent
+directory. If you do not have the upstream tarball for the current version,
+but you do have a ``watch`` file detailing where it can be found then the
+plugin will automatically retrieve the tarballs as they are needed.
+
+Now create the branch for the ``debian/`` directory::
+
+  $ brz init project
+
+Now you can either create a ``project/debian/`` directory for all the files,
+or add them in the ``project`` directory.
+
+Now tell bzr-builddeb that this is a merge mode project::
+
+  $ cd project/
+  $ mkdir .bzr-builddeb/
+  $ echo -e "[BUILDDEB]\nmerge = True" > .bzr-builddeb/default.conf
+
+Now you are ready to create the project. Create the usual files, and edit them
+to your satisfaction. When you have the files run::
+
+  $ brz add
+  $ brz ci
+
+from the root of the project branch.
+
+You are now ready to build the project. See below for instructions on doing
+this.
+
+Non-merge mode
+~~~~~~~~~~~~~~
+
+This is a little simpler to set up. Create the branch for the project::
+
+  $ cd path/to/project
+  $ brz init project
+
+Now add all the project files to the branch, and add the to bzr::
+
+  $ cd project
+  $ brz add
+  $ brz ci
+
+There are two options when you want to build a Debian package, whether
+it is a native package or not. Most packages are non-native so I will describe
+that first.
+
+To create a non-native package you need an upstream tarball to build against.
+Set the ``orig-dir`` variable to the directory containing the tarball that
+you want to use and the plugin will pick it up and you will have a non-native
+package. If you do not have the upstream tarball corresponding to the version
+of the package you are trying to build, but you have a ``watch`` file
+detailing where it can be found then it will be automatically retrieved when
+needed.
+
+However sometimes you might be upstream of a package as well as Debian
+maintainer, but it is not a native package. In that case you may version
+the whole source including ``debian/``, but not want to have to manually
+make a tarball without the ``debian/`` directory. In that case see the
+``split`` variable. If you set that then the plugin will create you an
+appropriately named orig.tar.gz of everything outside of ``debian/``.
+
+If you want to have a native package you don't need to worry about
+``orig-dir``, but instead set ``native = True`` in the
+``.bzr-builddeb/default.conf`` file (make sure it starts with ``[BUILDDEB]``
+if you create it).
+
+Now you are ready to build using the plugin.
+
+Building a Package
+------------------
+
+Once your package is set up then building it is easy. Run the following
+command from the top-level of the project branch, after checking in all
+changes::
+
+  $ brz bd
+
+If you used the default options this should build the package and leave the
+resulting files in ``../build-area``.
+
+Note that most of the options can be used as parameters to this command as well
+by prefixing their name with ``--``. So you can do for example::
+
+  $ brz bd --builder pdebuild
+
+to change from what is in the configuration files. Note that there is currently
+no way to set the binary options to false if they are set to true in the
+configuration files. It would be possible to allow this, but it would bloat
+the code and the help listings quite a lot, so I will only it if asked to.
+
+Tips
+----
+
+If you have a slow builder defined in your configuration (for instance
+``pdebuild``, you can bypass this by using the ``--quick`` option. This uses
+whatever the ``quick_builder`` option is (defaults to ``fakeroot debian/rules
+binary``).
+
+If you are running in merge mode, and you have a large upstream tarball, and
+you do not want to unpack it at every build you can speed things up even more.
+This involves reusing the tarball each build, so saving the need to unpack it.
+To do this run::
+
+  $ brz bd --export-only
+
+once to create a build-dir to use. (``-e`` is the short option for this). Then
+on the next builds you can use the ``--reuse`` and ``--dont-purge`` options to
+keep using this build directory. **N.B. This may cause build problems,
+especially if files are removed**, it is advisable to run a build without
+``--reuse`` after removing any files.
+
+Workflow
+--------
+
+brz-debian is designed to fit in with the workflow that brz encourages. It
+is designed as a plugin, so that it just becomes one more ``brz`` command that
+you run while working on the package.
+
+It also works fine with the frequent branching approach of brz, so that you
+can branch to test something new for the package, or for a bug fix, and then
+merge it back in to your main branch when it is done.

=== added file 'breezy/plugins/debian/__init__.py'
--- breezy/plugins/debian/__init__.py	1970-01-01 00:00:00 +0000
+++ breezy/plugins/debian/__init__.py	2024-02-18 23:22:42 +0000
@@ -0,0 +1,271 @@
+#    __init__.py -- The plugin for bzr
+#    Copyright (C) 2005 Jamie Wilkinson <[e-mail]>
+#                  2006, 2007 James Westby <[e-mail]>
+#                  2007 Reinhard Tartler <[e-mail]>
+#                  2008 Canonical Ltd.
+#
+#    This file is part of brz-debian.
+#
+#    brz-debian is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    brz-debian is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with brz-debian; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+
+"""manage versioned Debian packages."""
+
+import os
+
+import breezy  # noqa: F401
+
+from ... import trace
+from ...commands import plugin_cmds
+from ...directory_service import (
+    AliasDirectory,
+    directories,
+)
+from ...hooks import install_lazy_named_hook
+from ...i18n import load_plugin_translations
+from ...revisionspec import revspec_registry
+from ...tag import tag_sort_methods
+from .info import (  # noqa: F401
+    brz_plugin_version as version_info,
+)
+
+translation = load_plugin_translations("brz-debian")
+gettext = translation.gettext
+
+
+commands = {
+    "builddeb_do": ["bd-do"],
+    "builddeb": ["bd", "debuild"],
+    "get_orig_source": [],
+    "dep3_patch": [],
+    "import_dsc": [],
+    "import_upstream": [],
+    "merge_upstream": ["mu"],
+    "debrelease": [],
+}
+
+for command, aliases in commands.items():
+    plugin_cmds.register_lazy("cmd_" + command, aliases, __name__ + ".cmds")
+
+
+def global_conf():
+    from ...bedding import config_dir
+
+    return os.path.join(config_dir(), "builddeb.conf")
+
+
+default_build_dir = "../build-area"
+default_orig_dir = ".."
+default_result_dir = ".."
+
+
+directories.register_lazy(
+    "apt:",
+    __name__ + ".directory",
+    "AptDirectory",
+    "Directory that uses Vcs-* control fields in apt to look up branches",
+)
+directories.register_lazy(
+    "dgit:",
+    __name__ + ".directory",
+    "DgitDirectory",
+    "Directory that uses Debian Dgit control fields to look up branches",
+)
+directories.register_lazy(
+    "vcs:",
+    __name__ + ".directory",
+    "VcsDirectory",
+    "Directory that uses local Debian Vcs-* control fields to look up " "branches",
+)
+
+AliasDirectory.branch_aliases.register_lazy(
+    "upstream",
+    __name__ + ".directory",
+    "upstream_branch_alias",
+    help="upstream branch (for packaging branches)",
+)
+
+tag_sort_methods.register_lazy(
+    "debversion", __name__ + ".tagging", "sort_debversion", "Sort like Debian versions."
+)
+
+revspec_registry.register_lazy(
+    "package:", __name__ + ".revspec", "RevisionSpec_package"
+)
+revspec_registry.register_lazy(
+    "upstream:", __name__ + ".revspec", "RevisionSpec_upstream"
+)
+
+
+def debian_changelog_commit_message(commit, start_message):
+    if start_message is not None:
+        return start_message
+    cl_path = "debian/changelog"
+    if not commit.work_tree.has_filename(cl_path):
+        return start_message
+    if not commit.work_tree.is_versioned(cl_path):
+        return start_message
+    if cl_path in commit.exclude:
+        return start_message
+    if commit.specific_files and cl_path not in commit.specific_files:
+        return start_message
+    from .changelog import changelog_changes
+
+    changes = changelog_changes(
+        commit.work_tree, commit.work_tree.basis_tree(), cl_path
+    )
+    if not changes:
+        return start_message
+
+    from .util import strip_changelog_message
+
+    changes = strip_changelog_message(changes)
+
+    return "".join(changes)
+
+
+def debian_changelog_commit(commit, start_message):
+    """Hooked into breezy.msgeditor set_commit_message.
+    Set the commit message from debian/changelog and set any LP: #1234 to bug
+    fixed tags.
+    """
+    from .util import find_bugs_fixed
+
+    changes = debian_changelog_commit_message(commit, start_message)
+    if changes is None:
+        return None
+
+    bugs_fixed = find_bugs_fixed([changes], commit.work_tree.branch)
+    commit.builder._revprops["bugs"] = "\n".join(bugs_fixed)
+
+    return changes
+
+
+def changelog_merge_hook_factory(merger):
+    from . import merge_changelog
+
+    return merge_changelog.ChangeLogFileMerge(merger)
+
+
+def tree_debian_tag_name(tree, branch, subpath="", vendor=None):
+    from .config import BUILD_TYPE_MERGE
+    from .import_dsc import DistributionBranch, DistributionBranchSet
+    from .util import (
+        MissingChangelogError,
+        debuild_config,
+        find_changelog,
+        suite_to_distribution,
+    )
+
+    config = debuild_config(tree, subpath=subpath)
+    try:
+        (changelog, top_level) = find_changelog(
+            tree, subpath=subpath, merge=(config.build_type == BUILD_TYPE_MERGE)
+        )
+    except MissingChangelogError:
+        # Not a debian package
+        return None
+    if changelog.distributions == "UNRELEASED":
+        # The changelog still targets 'UNRELEASED', so apparently hasn't been
+        # uploaded. XXX: Give a warning of some sort here?
+        return None
+    if vendor is None:
+        vendor = suite_to_distribution(changelog.distributions)
+        # TODO(jelmer): Default to local vendor?
+    db = DistributionBranch(branch, None)
+    dbs = DistributionBranchSet()
+    dbs.add_branch(db)
+    return db.tag_name(changelog.version, vendor)
+
+
+def debian_tag_name(branch, revid):
+    subpath = ""
+    t = branch.repository.revision_tree(revid)
+    return tree_debian_tag_name(t, branch, subpath, vendor=None)
+
+
+def pre_merge_fix_ancestry(merger):
+    from ...workingtree import WorkingTree
+    from .config import BUILD_TYPE_NATIVE
+    from .merge_package import fix_ancestry_as_needed
+    from .util import debuild_config
+
+    if not isinstance(merger.this_tree, WorkingTree):
+        return
+    if getattr(merger, "other_branch", None) is None:
+        return
+    # This only works for packages that live in the root. That seems fine,
+    # though?
+    if not merger.this_tree.is_versioned(
+        "debian/changelog"
+    ) or not merger.other_tree.is_versioned("debian/changelog"):
+        return
+    this_config = debuild_config(merger.this_tree, "")
+    other_config = debuild_config(merger.other_tree, "")
+    if not (
+        this_config.build_type == BUILD_TYPE_NATIVE
+        or other_config.build_type == BUILD_TYPE_NATIVE
+    ):
+        from .upstream import PackageVersionNotPresent
+
+        try:
+            fix_ancestry_as_needed(
+                merger.this_tree,
+                merger.other_branch,
+                source_revid=merger.other_tree.get_revision_id(),
+            )
+        except PackageVersionNotPresent as e:
+            trace.warning(
+                gettext(
+                    "Not attempting to fix packaging branch ancestry, "
+                    "missing pristine tar data for version %s."
+                ),
+                e.version,
+            )
+
+
+install_lazy_named_hook(
+    "breezy.msgeditor",
+    "hooks",
+    "commit_message_template",
+    debian_changelog_commit_message,
+    "Use changes documented in debian/changelog to suggest " "the commit message",
+)
+install_lazy_named_hook(
+    "breezy.merge",
+    "Merger.hooks",
+    "merge_file_content",
+    changelog_merge_hook_factory,
+    "Debian Changelog file merge",
+)
+install_lazy_named_hook(
+    "breezy.branch",
+    "Branch.hooks",
+    "automatic_tag_name",
+    debian_tag_name,
+    "Automatically determine tag names from Debian version",
+)
+install_lazy_named_hook(
+    "breezy.merge",
+    "Merger.hooks",
+    "pre_merge_fix_ancestry",
+    pre_merge_fix_ancestry,
+    "Debian ancestry fixing",
+)
+
+
+def load_tests(loader, basic_tests, pattern):
+    basic_tests.addTest(loader.loadTestsFromModuleNames([__name__ + ".tests"]))
+    return basic_tests

=== added file 'breezy/plugins/debian/apt_repo.py'
--- breezy/plugins/debian/apt_repo.py	1970-01-01 00:00:00 +0000
+++ breezy/plugins/debian/apt_repo.py	2024-02-18 23:22:42 +0000
@@ -0,0 +1,280 @@
+#!/usr/bin/python3
+# Copyright (C) 2018 Jelmer Vernooij <[e-mail]>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+import errno
+import os
+import pwd
+import shutil
+import subprocess
+import tempfile
+from threading import Semaphore
+from typing import Optional
+
+from debian.deb822 import Deb822, Dsc
+
+from breezy.errors import DependencyNotPresent
+
+
+class NoAptSources(Exception):
+    """No apt sources were configured."""
+
+
+class AptSourceError(Exception):
+    """An error occured while running 'apt source'."""
+
+    def __init__(self, reason):
+        self.reason = reason
+
+
+def _convert_apt_pkg_error(e):
+    if "28: No space left on device":
+        return OSError(errno.ENOSPC, str(e))
+    return e
+
+
+class Apt:
+    def __enter__(self):
+        raise NotImplementedError(self.__enter__)
+
+    def __exit__(self, exc_tp, exc_val, exc_tb):
+        raise NotImplementedError(self.__exit__)
+
+    def iter_source_by_name(self, source_name):
+        for source in self.iter_sources():
+            if source["Package"] == source_name:
+                yield source
+
+    def iter_sources(self):
+        raise NotImplementedError(self.iter_sources)
+
+    def iter_binaries(self):
+        raise NotImplementedError(self.iter_binaries)
+
+    def iter_binary_by_name(self, binary_name):
+        for binary in self.iter_binaries():
+            if binary["Package"] == binary_name:
+                yield binary
+
+    def retrieve_orig(self, source_name, target_directory, orig_version=None):
+        raise NotImplementedError(self.retrieve_orig)
+
+    def retrieve_source(self, source_name, target_directory, source_version=None):
+        raise NotImplementedError(self.retrieve_source)
+
+
+_apt_semaphore = Semaphore()
+
+
+class LocalApt(Apt):
+    def __init__(self, rootdir=None):
+        self.apt_pkg = None
+        self._rootdir = rootdir
+
+    def __repr__(self):
+        return f"{type(self).__name__}({self._rootdir!r})"
+
+    def __enter__(self):
+        try:
+            import apt_pkg
+        except ImportError as e:
+            raise DependencyNotPresent("apt_pkg", e) from e
+        import apt
+
+        self.apt_pkg = apt_pkg
+        self.apt_pkg.init()
+        try:
+            self.cache = apt.Cache(rootdir=self._rootdir)
+        except apt_pkg.Error as e:
+            raise _convert_apt_pkg_error(e) from e
+        return self
+
+    def _set_dir(self):
+        if self._rootdir is not None:
+            self.apt_pkg.config.set("Dir", self._rootdir)
+        else:
+            self.apt_pkg.config.set("Dir", "/")
+
+    def __exit__(self, exc_tp, exc_val, exc_tb):
+        return False
+
+    def iter_sources(self):
+        with _apt_semaphore:
+            self._set_dir()
+            try:
+                sources = self.apt_pkg.SourceRecords()
+            except SystemError as e:
+                raise NoAptSources() from e
+
+            sources.restart()
+            while sources.step():
+                yield Dsc(sources.record)
+
+    def iter_source_by_name(self, source_name):
+        with _apt_semaphore:
+            self._set_dir()
+            try:
+                sources = self.apt_pkg.SourceRecords()
+            except SystemError as e:
+                raise NoAptSources() from e
+
+            sources.restart()
+            while sources.lookup(source_name):
+                yield Dsc(sources.record)
+
+    def iter_binaries(self):
+        with _apt_semaphore:
+            self._set_dir()
+
+            for pkg in self.cache:
+                for version in pkg.versions:
+                    yield Deb822(version._records.record)
+
+    def iter_binary_by_name(self, binary_name):
+        with _apt_semaphore:
+            self._set_dir()
+
+            try:
+                pkg = self.cache[binary_name]
+            except KeyError:
+                pass
+            else:
+                for version in pkg.versions:
+                    yield Deb822(version._records.record)
+
+    def retrieve_source(
+        self, package_name, target, source_version=None, tar_only=False
+    ):
+        self._run_apt_source(package_name, target, source_version, tar_only=tar_only)
+
+    def _get_command(self, package, version_str=None, tar_only=False):
+        args = ["apt", "source", "-d"]
+        if self._rootdir is not None:
+            args.append("-oDir=%s" % self._rootdir)
+        if tar_only:
+            args.append("--tar-only")
+        args.extend(
+            [
+                "-y",
+                "--only-source",
+                (f"{package}={version_str}") if version_str is not None else package,
+            ]
+        )
+        return args
+
+    def _run_apt_source(
+        self,
+        package: str,
+        target_dir,
+        version_str: Optional[str] = None,
+        tar_only: bool = False,
+    ):
+        command = self._get_command(package, version_str, tar_only=tar_only)
+        try:
+            subprocess.run(command, cwd=target_dir, capture_output=True, check=True)
+        except subprocess.CalledProcessError as e:
+            stderr = e.stderr.splitlines()
+            if stderr[-1] == (
+                b"E: You must put some 'source' URIs in your sources.list"
+            ):
+                raise NoAptSources() from e
+            CS = b"\x1b[1;31mE: \x1b[0m"
+            CE = b"\x1b[0m"
+            if stderr[-1] == (
+                CS + b"You must put some 'deb-src' URIs in your sources.list" + CE
+            ):
+                raise NoAptSources() from e
+            if stderr[-1].startswith(b"E: "):
+                raise AptSourceError(stderr[-1][3:].decode()) from e
+            if stderr[-1].startswith(CS):
+                raise AptSourceError(stderr[-1][len(CS) : -len(CE)].decode()) from e
+            raise AptSourceError(
+                [line.decode("utf-8", "surrogateescape") for line in stderr]
+            ) from e
+
+
+class RemoteApt(LocalApt):
+    def __init__(self, mirror_uri, distribution=None, components=None, key_path=None):
+        super().__init__()
+        self.mirror_uri = mirror_uri
+        self.distribution = distribution
+        self.components = components
+        self.key_path = key_path
+        self._rootdir = None
+
+    def __repr__(self):
+        return "{}({!r}, distribution={!r}, components={!r}, key_path={!r})".format(
+            type(self).__name__,
+            self.mirror_uri,
+            self.distribution,
+            self.components,
+            self.key_path,
+        )
+
+    def __enter__(self):
+        self._rootdir = tempfile.mkdtemp()
+        aptdir = os.path.join(self._rootdir, "etc", "apt")
+        os.makedirs(aptdir)
+        if self.key_path:
+            tag = "[signed-by=%s]" % self.key_path
+        else:
+            tag = "[trusted=yes]"
+        with open(os.path.join(aptdir, "sources.list"), "w") as f:
+            f.write(
+                "deb {} {} {} {}\n".format(
+                    tag, self.mirror_uri, self.distribution, " ".join(self.components)
+                )
+            )
+            f.write(
+                "deb-src {} {} {} {}\n".format(
+                    tag, self.mirror_uri, self.distribution, " ".join(self.components)
+                )
+            )
+        try:
+            import apt
+        except ImportError as e:
+            raise DependencyNotPresent("apt", e) from e
+        try:
+            import apt_pkg
+        except ImportError as e:
+            raise DependencyNotPresent("apt_pkg", e) from e
+        self.apt_pkg = apt_pkg
+        self.apt_pkg.init()
+        try:
+            self.cache = apt.Cache(rootdir=self._rootdir)
+        except apt_pkg.Error as e:
+            raise _convert_apt_pkg_error(e) from e
+        self._set_dir()
+        self.cache.update()
+        return self
+
+    def _set_dir(self):
+        try:
+            username = pwd.getpwuid(os.getuid()).pw_name
+        except KeyError:
+            pass
+        else:
+            self.apt_pkg.config.set("APT::Sandbox::User", username)
+        self.apt_pkg.config.set("Dir", self._rootdir)
+
+    def __exit__(self, exc_tp, exc_val, exc_tb):
+        shutil.rmtree(self._rootdir)
+        return False
+
+    @classmethod
+    def from_string(cls, text, key_path=None):
+        (mirror_uri, distribution, rest) = text.split(" ", 2)
+        return cls(mirror_uri, distribution, rest.split(), key_path=key_path)

=== added file 'breezy/plugins/debian/builder.py'
--- breezy/plugins/debian/builder.py	1970-01-01 00:00:00 +0000
+++ breezy/plugins/debian/builder.py	2024-02-18 23:22:42 +0000
@@ -0,0 +1,142 @@
+#    builder.py -- Classes for building packages
+#    Copyright (C) 2006, 2007 James Westby <[e-mail]>
+#
+#    This file is part of breezy-debian.
+#
+#    bzr-builddeb is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    bzr-builddeb is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with bzr-builddeb; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+
+import os
+import shutil
+import subprocess
+import tempfile
+
+from ...errors import BzrError
+from ...trace import note
+from .hooks import run_hook
+from .util import (
+    dget_changes,
+    find_changes_files,
+    get_parent_dir,
+    subprocess_setup,
+)
+
+
+class ChangesFileMissing(BzrError):
+    _fmt = "Missing changes file."
+
+
+class NoSourceDirError(BzrError):
+    _fmt = (
+        "There is no existing source directory to use. Use "
+        "--export-only or --dont-purge to get one that can be used"
+    )
+
+
+class BuildFailedError(BzrError):
+    _fmt = "The build failed."
+
+
+class DebBuild:
+    """The object that does the building work."""
+
+    def __init__(self, distiller, target_dir, builder, use_existing=False):
+        """Create a builder.
+
+        :param distiller: the SourceDistiller that will get the source to
+            build.
+        :param target_dir: the directory in which to do all the work.
+        :param builder: the build command to use.
+        :param use_existing: whether to re-use the target_dir if it exists.
+        """
+        self.distiller = distiller
+        self.target_dir = target_dir
+        self.builder = builder
+        self.use_existing = use_existing
+
+    def prepare(self):
+        """Do any preparatory steps that should be run before the build.
+
+        It checks that everything is well, and that some needed dirs are
+        created.
+        """
+        parent_dir = get_parent_dir(self.target_dir)
+        if parent_dir != "" and not os.path.exists(parent_dir):
+            os.makedirs(parent_dir)
+        if os.path.exists(self.target_dir):
+            if not self.use_existing:
+                note("Purging the build dir: %s", self.target_dir)
+                shutil.rmtree(self.target_dir)
+            else:
+                note("Not purging build dir as requested: %s", self.target_dir)
+        else:
+            if self.use_existing:
+                raise NoSourceDirError
+
+    def export(self):
+        self.distiller.distill(self.target_dir)
+
+    def before_build(self):
+        subprocess.check_call(
+            ["dpkg-source", "--before-build", self.target_dir],  # noqa: S607
+            preexec_fn=subprocess_setup,
+        )
+
+    def after_build(self):
+        subprocess.check_call(
+            ["dpkg-source", "--after-build", self.target_dir],  # noqa: S607
+            preexec_fn=subprocess_setup,
+        )
+
+    def build(self):
+        """This builds the package using the supplied command."""
+        note("Building the package in %s, using %s", self.target_dir, self.builder)
+        proc = subprocess.Popen(
+            self.builder, shell=True, cwd=self.target_dir, preexec_fn=subprocess_setup
+        )
+        proc.wait()
+        if proc.returncode != 0:
+            raise BuildFailedError
+
+    def clean(self):
+        """This removes the build directory."""
+        note("Cleaning build dir: %s", self.target_dir)
+        shutil.rmtree(self.target_dir)
+
+
+def do_build(
+    package_name, version, distiller, local_tree, config, build_command, target_dir=None
+):
+    """Actually run a build."""
+    with tempfile.TemporaryDirectory() as bd:
+        build_source_dir = os.path.join(
+            bd, package_name + "-" + version.upstream_version
+        )
+        builder = DebBuild(
+            distiller, build_source_dir, build_command, use_existing=False
+        )
+        builder.prepare()
+        run_hook(local_tree, "pre-export", config)
+        builder.export()
+        run_hook(local_tree, "pre-build", config, wd=build_source_dir)
+        builder.build()
+        run_hook(local_tree, "post-build", config, wd=build_source_dir)
+        if target_dir is not None:
+            ret = {}
+            for kind, entry in find_changes_files(bd, package_name, version):
+                ret[kind] = dget_changes(entry.path, target_dir)
+            if not ret:
+                raise ChangesFileMissing()
+            return ret

=== added file 'breezy/plugins/debian/byov.conf'
--- breezy/plugins/debian/byov.conf	1970-01-01 00:00:00 +0000
+++ breezy/plugins/debian/byov.conf	2024-02-18 23:22:42 +0000
@@ -0,0 +1,21 @@
+# Use lxd containers by default
+vm.class = lxd
+# Start with an up to date system by default
+vm.update = True
+# External sources dependencies, packages are not recent enough
+dulwich.clone = (git clone git://jelmer.uk/dulwich ../dulwich.git)
+dulwich.install = (cd ../dulwich.git && ./setup.py install --user)
+dulwich3.install = (cd ../dulwich.git && python3 ./setup.py install --user)
+
+[brz-plugin-debian]
+vm.release = xenial
+brz.build_deps = gcc, debhelper, python, python-all-dev, python3-all-dev, python-configobj, python3-configobj, python-docutils, python3-docutils, python-paramiko, python3-paramiko, python-subunit, python3-subunit, python-testtools, python3-testtools, subunit, cython, cython3, python-fastimport, python-dulwich
+debian.build_deps = python-debian, python-apt, dpkg-dev, fakeroot, devscripts, patchutils, pristine-tar, quilt, python-lzma, libalgorithm-merge-perl, python-yaml, python-distro-info, python3-distro-info, python3-apt, python3-yaml, python3-debian
+vm.packages = {brz.build_deps}, {debian.build_deps}, {debian.test_deps}, bzr, python-debian, python-junitxml
+brz.branch = (bzr branch lp:brz ../brz-trunk)
+brz.make = (cd ../brz-trunk && make)
+byoci.setup.command = ({dulwich.clone} && {dulwich.install} && {brz.branch} && {brz.make})
+byoci.tests.command = bash -o pipefail -c "bzr log -l2 && (BRZ_PLUGINS_AT=debian@`pwd` BRZ_PLUGIN_PATH=-site:-user python2 ../brz-trunk/brz selftest -v  --parallel=fork --subunit2 | subunit2junitxml -o ../results.xml -f | subunit2pyunit)"
+[brz-plugin-debian-py3]
+byoci.setup.command = ({dulwich.clone} && {dulwich3.install} && {brz.branch} && {brz.make})
+byoci.tests.command = bash -o pipefail -c "bzr log -l2 && (BRZ_PLUGINS_AT=debian@`pwd` BRZ_PLUGIN_PATH=-site:-user python3 ../brz-trunk/brz selftest -v  --parallel=fork --subunit2 | subunit2junitxml -o ../results.xml -f | subunit2pyunit)"

=== added file 'breezy/plugins/debian/bzrtools_import.py'
--- breezy/plugins/debian/bzrtools_import.py	1970-01-01 00:00:00 +0000
+++ breezy/plugins/debian/bzrtools_import.py	2024-02-18 23:22:42 +0000
@@ -0,0 +1,241 @@
+# This file is a modified copy of bzrtools' upstream_import.py, last changed in
+# bzrtools 1.14.0.
+
+"""Import upstream source into a branch."""
+
+import tarfile
+from contextlib import ExitStack
+from io import BytesIO
+
+from ...bzr import generate_ids
+from ...errors import BzrError
+from ...osutils import (
+    basename,
+    file_iterator,
+    is_inside_any,
+    normpath,
+    splitpath,
+)
+from ...trace import warning
+from ...transform import resolve_conflicts
+from ...upstream_import import (
+    DirWrapper,
+    add_implied_parents,
+    common_directory,
+    do_directory,
+    names_of_files,
+)
+from ...workingtree import WorkingTree
+
+
+class UnknownType(BzrError):
+    _fmt = 'Cannot extract "%(path)s" from archive as it is an unknown type.'
+
+    def __init__(self, path):
+        BzrError.__init__(self, path=path)
+
+
+files_to_ignore = {".shelf", ".bzr", ".bzr.backup", ".bzrtags", ".bzr-builddeb"}
+
+
+def should_ignore(relative_path: str) -> bool:
+    parts = splitpath(relative_path)
+    if not parts:
+        return False
+    for part in parts:
+        if part in files_to_ignore:
+            return True
+        if part.endswith(",v"):
+            return True
+    return False
+
+
+def import_dir(
+    tree: WorkingTree, dir: str, file_ids_from=None, target_tree=None, exclude=None
+):
+    dir_input = BytesIO(dir.encode("utf-8"))
+    dir_input.seek(0)
+    dir_file = DirWrapper(dir_input)
+    if file_ids_from is None:
+        file_ids_from = []
+    with ExitStack() as es:
+        for other_tree in file_ids_from:
+            es.enter_context(other_tree.lock_read())
+        return _import_archive(
+            tree,
+            dir_file,  # type: ignore
+            file_ids_from,
+            target_tree=target_tree,
+            exclude=exclude,  # type: ignore
+        )
+
+
+def _get_paths_to_process(
+    archive_file: tarfile.TarFile, prefix, implied_parents, exclude=None
+):
+    to_process = set()
+    for member in archive_file.getmembers():  # type: ignore
+        if member.type == "g":
+            # type 'g' is a header
+            continue
+        relative_path = member.name
+        relative_path = normpath(relative_path)
+        relative_path = relative_path.lstrip("/")
+        if prefix is not None:
+            relative_path = relative_path[len(prefix) + 1 :]
+            relative_path = relative_path.rstrip("/")
+        if relative_path == "" or relative_path == ".":
+            continue
+        if should_ignore(relative_path):
+            continue
+        if exclude and is_inside_any(exclude, relative_path):
+            continue
+        add_implied_parents(implied_parents, relative_path)
+        to_process.add((relative_path, member))
+    return to_process
+
+
+def _import_archive(
+    tree: WorkingTree,
+    archive_file: tarfile.TarFile,
+    file_ids_from,
+    target_tree=None,
+    exclude=None,
+):
+    prefix = common_directory(names_of_files(archive_file))
+    with tree.transform() as tt:
+        removed = set()
+        for path, entry in tree.iter_entries_by_dir():
+            if entry.parent_id is None:
+                continue
+            trans_id = tt.trans_id_tree_path(path)
+            tt.delete_contents(trans_id)
+            removed.add(path)
+
+        added = set()
+        implied_parents: set[str] = set()
+        seen = set()
+        to_process = _get_paths_to_process(
+            archive_file, prefix, implied_parents, exclude=exclude
+        )
+        renames = {}
+
+        if not tree.supports_setting_file_ids():
+            file_ids_from = []
+
+        # First we find the renames
+        other_trees = file_ids_from[:]
+        if target_tree is not None and tree.supports_setting_file_ids():
+            other_trees.insert(0, target_tree)
+        for other_tree in other_trees:
+            for relative_path, _member in to_process:
+                trans_id = tt.trans_id_tree_path(relative_path)
+                existing_file_id = tt.tree_file_id(trans_id)
+                target_id = other_tree.path2id(relative_path)
+                if (
+                    target_id is not None
+                    and target_id != existing_file_id
+                    and target_id not in renames
+                ):
+                    renames[target_id] = relative_path
+
+        # The we do the work
+        for relative_path, member in to_process:
+            trans_id = tt.trans_id_tree_path(relative_path)
+            added.add(relative_path.rstrip("/"))
+            # To handle renames, we need to not use the preserved file id,
+            # rather we need to lookup the file id in target_tree, if there is
+            # one. If there isn't, we should use the one in the current tree,
+            # and failing that we will allocate one. In this importer we want
+            # the target_tree to be authoritative about id2path, which is why
+            # we consult it first.
+            if tree.supports_setting_file_ids():
+                existing_file_id = tt.tree_file_id(trans_id)
+                # If we find an id that we know we are going to assign to
+                # different path as it has been renamed in one of the
+                # file_ids_from trees then we ignore the one in this tree.
+                if existing_file_id in renames:
+                    if relative_path != renames[existing_file_id]:
+                        existing_file_id = None
+                found_file_id = None
+                if target_tree is not None:
+                    found_file_id = target_tree.path2id(relative_path)
+                    if found_file_id in renames:
+                        if renames[found_file_id] != relative_path:
+                            found_file_id = None
+                if found_file_id is None and existing_file_id is None:
+                    for other_tree in file_ids_from:
+                        found_file_id = other_tree.path2id(relative_path)
+                        if found_file_id is not None:
+                            if found_file_id in renames:
+                                if renames[found_file_id] != relative_path:
+                                    found_file_id = None
+                                    continue
+                            break
+                if found_file_id is not None and found_file_id != existing_file_id:
+                    # Found a specific file id in one of the source trees
+                    tt.version_file(trans_id=trans_id, file_id=found_file_id)
+                    if existing_file_id is not None:
+                        # We need to remove the existing file so it can be
+                        # replaced by the file (and file id) from the
+                        # file_ids_from tree.
+                        tt.delete_versioned(trans_id)
+                    trans_id = tt.trans_id_file_id(found_file_id)
+                if not found_file_id and not existing_file_id:
+                    # No file_id in any of the source trees and no file id in
+                    # the base tree.
+                    name = basename(member.name.rstrip("/"))
+                    file_id = generate_ids.gen_file_id(name)
+                    tt.version_file(file_id=file_id, trans_id=trans_id)
+            else:
+                tt.version_file(trans_id=trans_id)
+
+            path = tree.abspath(relative_path)
+            if member.name in seen:
+                if tt.final_kind(trans_id) == "file":
+                    tt.set_executability(None, trans_id)
+                tt.cancel_creation(trans_id)
+            seen.add(member.name)
+            if member.isreg():
+                tt.create_file(
+                    file_iterator(archive_file.extractfile(member)), trans_id
+                )
+                executable = (member.mode & 0o111) != 0
+                tt.set_executability(executable, trans_id)
+            elif member.isdir():
+                do_directory(tt, trans_id, tree, relative_path, path)
+            elif member.issym():
+                tt.create_symlink(member.linkname, trans_id)
+            else:
+                raise UnknownType(relative_path)
+
+        for relative_path in implied_parents.difference(added):
+            if relative_path == "":
+                continue
+            trans_id = tt.trans_id_tree_path(relative_path)
+            path = tree.abspath(relative_path)
+            do_directory(tt, trans_id, tree, relative_path, path)
+            if tt.tree_file_id(trans_id) is None:
+                found = False
+                for other_tree in file_ids_from:
+                    with other_tree.lock_read():
+                        if other_tree.has_filename(relative_path):
+                            file_id = other_tree.path2id(relative_path)
+                            if file_id is not None:
+                                tt.version_file(trans_id=trans_id, file_id=file_id)
+                                found = True
+                                break
+                if not found:
+                    # Should this really use the trans_id as the
+                    # file_id?
+                    tt.version_file(trans_id=trans_id, file_id=trans_id)
+            added.add(relative_path)
+
+        for path in removed.difference(added):
+            tt.unversion_file(tt.trans_id_tree_path(path))
+
+        conflicts = tt.cook_conflicts(resolve_conflicts(tt))
+
+        for conflict in conflicts:
+            warning("%s", conflict)
+        tt.apply()

=== added file 'breezy/plugins/debian/changelog.py'
--- breezy/plugins/debian/changelog.py	1970-01-01 00:00:00 +0000
+++ breezy/plugins/debian/changelog.py	2024-02-18 23:22:42 +0000
@@ -0,0 +1,124 @@
+#    __init__.py -- The plugin for bzr
+#    Copyright (C) 2009-2018 Jelmer Vernooij <[e-mail]
+#
+#    This file is part of brz-debian.
+#
+#    brz-debian is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    brz-debian is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with brz-debian; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+
+import posixpath
+from typing import Optional
+
+from debian.changelog import Changelog
+from debmutate.changelog import new_changelog_entries, strip_changelog_message
+
+from breezy.errors import BzrError
+from breezy.tree import Tree
+
+from . import tree_debian_tag_name
+
+
+class UnreleasedChanges(BzrError):
+    _fmt = "%(path)s says it's UNRELEASED."
+
+    def __init__(self, path):
+        BzrError.__init__(self)
+        self.path = path
+
+
+def changelog_changes(
+    tree: Tree, basis_tree: Tree, cl_path: str = "debian/changelog"
+) -> Optional[list[str]]:
+    changes = []
+    for change in tree.iter_changes(basis_tree, specific_files=[cl_path]):
+        paths = change.path
+        changed_content = change.changed_content
+        versioned = change.versioned
+        kind = change.kind
+        # Content not changed
+        if not changed_content:
+            return None
+        # Not versioned in new tree
+        if not versioned[1]:
+            return None
+        # Not a file in one tree
+        if kind[0] != "file" or kind[1] != "file":
+            return None
+
+        old_text = basis_tree.get_file_lines(paths[0])
+        new_text = tree.get_file_lines(paths[1])
+        changes.extend(new_changelog_entries(old_text, new_text))
+    return changes
+
+
+def changelog_commit_message(
+    tree: Tree, basis_tree: Tree, path: str = "debian/changelog"
+) -> Optional[str]:
+    changes = changelog_changes(tree, basis_tree, path)
+    if not changes:
+        return None
+
+    return "".join(strip_changelog_message(changes))
+
+
+def debcommit(
+    tree, committer=None, subpath="", paths=None, reporter=None, message=None
+):
+    """Create a git commit with message based on the new entries in changelog.
+
+    Args:
+      tree: Tree to commit in
+      committer: Optional committer identity
+      subpath: subpath to commit in
+      paths: specifics paths to commit, if any
+      reporter: CommitReporter to use
+      message: Override commit message
+    Returns:
+      Created revision id
+    """
+    if message is None:
+        message = changelog_commit_message(
+            tree, tree.basis_tree(), path=posixpath.join(subpath, "debian/changelog")
+        )
+    if paths:
+        specific_files = [posixpath.join(subpath, p) for p in paths]
+    elif subpath:
+        specific_files = [subpath]
+    else:
+        specific_files = None
+    return tree.commit(
+        committer=committer,
+        message=message,
+        specific_files=specific_files,
+        reporter=reporter,
+    )
+
+
+def debcommit_release(tree, committer=None, subpath="", message=None, vendor=None):
+    cl_path = posixpath.join(subpath, "debian/changelog")
+    if message is None or vendor is None:
+        cl = Changelog(tree.get_file(cl_path), max_blocks=1)
+        if message is None:
+            message = f"releasing package {cl[0].package} version {cl[0].version}"
+        if vendor is None:
+            from .util import suite_to_distribution
+
+            vendor = suite_to_distribution(cl[0].distributions)
+    tag_name = tree_debian_tag_name(tree, tree.branch, subpath=subpath, vendor=vendor)
+    if tag_name is None:
+        raise UnreleasedChanges(cl_path)
+    revid = tree.commit(committer=committer, message=message)
+    tree.branch.tags.set_tag(tag_name, revid)
+    return tag_name

=== added file 'breezy/plugins/debian/cmds.py'
--- breezy/plugins/debian/cmds.py	1970-01-01 00:00:00 +0000
+++ breezy/plugins/debian/cmds.py	2024-02-18 23:22:42 +0000
@@ -0,0 +1,2021 @@
+#    __init__.py -- The plugin for bzr
+#    Copyright (C) 2005 Jamie Wilkinson <[e-mail]>
+#                  2006, 2007 James Westby <[e-mail]>
+#                  2007 Reinhard Tartler <[e-mail]>
+#                  2008-2011 Canonical Ltd.
+#
+#    This file is part of breezy-debian.
+#
+#    bzr-builddeb is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    bzr-builddeb is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with bzr-builddeb; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+
+import os
+import shutil
+import tempfile
+from typing import Callable, Optional
+
+from ... import (
+    urlutils,
+)
+from ...branch import Branch
+from ...commands import Command
+from ...controldir import (
+    ControlDir,
+    NoColocatedBranchSupport,
+)
+from ...errors import (
+    BzrCommandError,
+    NotBranchError,
+    NotLocalUrl,
+    NoWorkingTree,
+)
+from ...option import Option
+from ...trace import mutter, note, warning
+from ...transport import (
+    FileExists,
+    NoSuchFile,
+    get_transport,
+)
+from ...workingtree import WorkingTree
+from . import (
+    default_build_dir,
+    default_orig_dir,
+    default_result_dir,
+    gettext,
+)
+from .config import (
+    BUILD_TYPE_MERGE,
+    BUILD_TYPE_NATIVE,
+    BUILD_TYPE_SPLIT,
+)
+from .util import (
+    debuild_config,
+)
+
+dont_purge_opt = Option(
+    "dont-purge", help="Don't purge the build directory after building."
+)
+result_opt = Option(
+    "result-dir",
+    help="Directory in which to place the resulting package files.",
+    type=str,
+    argname="DIRECTORY",
+)
+builder_opt = Option(
+    "builder", help="Command to build the package.", type=str, argname="BUILDER"
+)
+merge_opt = Option(
+    "merge", help="Merge the debian part of the source in to the upstream tarball."
+)
+split_opt = Option(
+    "split", help="Automatically create an .orig.tar.gz from a full source branch."
+)
+build_dir_opt = Option("build-dir", help="The dir to use for building.", type=str)
+orig_dir_opt = Option(
+    "orig-dir",
+    help="Directory containing the .orig.tar.gz files. For use when only "
+    "debian/ is versioned.",
+    type=str,
+    argname="DIRECTORY",
+)
+native_opt = Option("native", help="Build a native package.")
+export_upstream_opt = Option(
+    "export-upstream",
+    help="Create the .orig.tar.gz from specified bzr branch before building.",
+    type=str,
+    argname="BRANCH",
+)
+export_upstream_revision_opt = Option(
+    "export-upstream-revision",
+    help="Select the upstream revision that will be exported.",
+    type=str,
+    argname="REVISION",
+)
+apt_repository_opts = [
+    Option("apt-repository", help="Apt repository to attempt to fetch from", type=str),
+    Option(
+        "apt-repository-key", help="Apt repository key to use for validation", type=str
+    ),
+]
+
+
+class StrictBuildFailed(BzrCommandError):
+    _fmt = (
+        "Build refused because there are unknown files in the tree. "
+        "To list all known files, run 'bzr unknowns'."
+    )
+
+
+def _check_tree(tree, subpath, strict=False):
+    if strict:
+        for _unknown in tree.unknowns():
+            raise StrictBuildFailed()
+
+    if len(tree.conflicts()) > 0:
+        raise BzrCommandError(
+            "There are conflicts in the working tree. "
+            "You must resolve these before building."
+        )
+
+
+def _check_uncommitted(tree, subpath):
+    if tree.changes_from(tree.basis_tree()).has_changed():
+        raise BzrCommandError(
+            gettext(
+                "There are uncommitted "
+                "changes in the working tree. You must commit "
+                "before using this command"
+            )
+        )
+
+
+def _get_changelog_info(
+    tree, subpath, last_version=None, package=None, distribution=None
+):
+    from .util import (
+        MissingChangelogError,
+        find_changelog,
+        find_last_distribution,
+        lookup_distribution,
+    )
+
+    DEFAULT_FALLBACK_DISTRIBUTION = "debian"
+    current_version = last_version
+    try:
+        (changelog, top_level) = find_changelog(
+            tree, subpath, merge=False, max_blocks=2
+        )
+    except MissingChangelogError:
+        top_level = False
+        changelog = None
+        if distribution is None:
+            distribution = DEFAULT_FALLBACK_DISTRIBUTION
+            note(
+                gettext(
+                    "No distribution specified, and no changelog, " "assuming '%s'"
+                ),
+                distribution,
+            )
+    else:
+        if last_version is None:
+            current_version = changelog.version.upstream_version
+        if package is None:
+            package = changelog.package
+        if distribution is None:
+            distribution = find_last_distribution(changelog)
+            if distribution is not None:
+                note(gettext("Using distribution %s") % distribution)
+            else:
+                distribution = DEFAULT_FALLBACK_DISTRIBUTION
+                note(
+                    gettext(
+                        "No distribution specified, and no previous "
+                        "distribution in changelog. Assuming '%s'"
+                    ),
+                    distribution,
+                )
+    distribution = distribution.lower()
+    distribution_name = lookup_distribution(distribution)
+    if distribution_name is None:
+        raise BzrCommandError(gettext("Unknown target distribution: %s") % distribution)
+    return (
+        current_version,
+        package,
+        distribution,
+        distribution_name,
+        changelog,
+        top_level,
+    )
+
+
+def _get_upstream_branch_source(
+    export_upstream,
+    export_upstream_revision,
+    config,
+    version,
+    other_repository=None,
+    guess_upstream_url=None,
+):
+    if export_upstream is None and config.upstream_branch:
+        export_upstream = config.upstream_branch
+    if export_upstream is None:
+        if guess_upstream_url is None:
+            return None
+        export_upstream = guess_upstream_url
+    from .upstream.branch import (
+        LazyUpstreamBranchSource,
+    )
+
+    upstream_revision_map = {}
+    if export_upstream_revision:
+        upstream_revision_map[version] = export_upstream_revision
+    return LazyUpstreamBranchSource(
+        export_upstream,
+        config=config,
+        upstream_revision_map=upstream_revision_map,
+        other_repository=other_repository,
+    )
+
+
+def _get_upstream_sources(
+    local_tree,
+    subpath,
+    packaging_branch,
+    build_type,
+    config,
+    upstream_version,
+    top_level,
+    export_upstream=None,
+    export_upstream_revision=None,
+    trust_package=True,
+    guess_upstream_branch_url=False,
+    apt=None,
+    skip_signatures=False,
+):
+    from .upstream import (
+        AptSource,
+        DirectoryScanSource,
+        SelfSplitSource,
+    )
+    from .upstream.pristinetar import (
+        get_pristine_tar_source,
+    )
+    from .upstream.uscan import (
+        NoWatchFile,
+        UScanSource,
+    )
+
+    yield AptSource(apt=apt)
+    yield get_pristine_tar_source(local_tree, packaging_branch)
+    try:
+        yield UScanSource.from_tree(
+            local_tree, subpath, top_level, skip_signatures=skip_signatures
+        )
+    except NoWatchFile:
+        pass
+
+    if guess_upstream_branch_url:
+        try:
+            from upstream_ontologist.guess import (
+                guess_upstream_metadata,
+            )
+        except ModuleNotFoundError:
+            guess_upstream_url = None
+        else:
+
+            def guess_upstream_url():
+                guessed_upstream_metadata = guess_upstream_metadata(
+                    local_tree.abspath(subpath),
+                    trust_package=trust_package,
+                    net_access=True,
+                    consult_external_directory=False,
+                )
+                return guessed_upstream_metadata.get("Repository")
+    else:
+        guess_upstream_url = None
+
+    upstream_branch_source = _get_upstream_branch_source(
+        export_upstream,
+        export_upstream_revision,
+        config,
+        upstream_version,
+        other_repository=packaging_branch.repository,
+        guess_upstream_url=guess_upstream_url,
+    )
+    if upstream_branch_source:
+        yield upstream_branch_source
+
+    if build_type == BUILD_TYPE_SPLIT:
+        yield SelfSplitSource(local_tree)
+
+    yield DirectoryScanSource("..")
+
+
+def _get_distiller(
+    tree,
+    subpath,
+    packaging_branch,
+    changelog,
+    build_type,
+    config,
+    contains_upstream_source=True,
+    top_level=False,
+    orig_dir=default_orig_dir,
+    use_existing=False,
+    export_upstream=None,
+    export_upstream_revision=None,
+    guess_upstream_branch_url=False,
+    apt=None,
+    skip_signatures=False,
+):
+    from .source_distiller import (
+        DebcargoDistiller,
+        FullSourceDistiller,
+        MergeModeDistiller,
+        NativeSourceDistiller,
+    )
+    from .upstream import (
+        UpstreamProvider,
+    )
+    from .util import (
+        guess_build_type,
+    )
+
+    if build_type is None:
+        build_type = config.build_type
+    if build_type is None:
+        build_type = guess_build_type(
+            tree, changelog.version, subpath, contains_upstream_source
+        )
+
+    note(gettext("Building package in %s mode") % build_type)
+
+    upstream_sources = list(
+        _get_upstream_sources(
+            tree,
+            subpath,
+            packaging_branch,
+            build_type=build_type,
+            config=config,
+            upstream_version=changelog.version.upstream_version,
+            top_level=top_level,
+            export_upstream=export_upstream,
+            export_upstream_revision=export_upstream_revision,
+            guess_upstream_branch_url=guess_upstream_branch_url,
+            apt=apt,
+            skip_signatures=skip_signatures,
+        )
+    )
+
+    upstream_provider = UpstreamProvider(
+        changelog.package,
+        changelog.version.upstream_version,
+        orig_dir,
+        upstream_sources,
+    )
+
+    # Turn this into a build type?
+    if tree.has_filename(os.path.join(subpath, "debian/debcargo.toml")):
+        return DebcargoDistiller(
+            tree, subpath, top_level=top_level, use_existing=use_existing
+        )
+    if build_type == BUILD_TYPE_MERGE:
+        return MergeModeDistiller(
+            tree,
+            subpath,
+            upstream_provider,
+            top_level=top_level,
+            use_existing=use_existing,
+        )
+    elif build_type == BUILD_TYPE_NATIVE:
+        return NativeSourceDistiller(tree, subpath, use_existing=use_existing)
+    else:
+        return FullSourceDistiller(
+            tree, subpath, upstream_provider, use_existing=use_existing
+        )
+
+
+class cmd_builddeb(Command):
+    """Builds a Debian package from a branch.
+
+    If BRANCH is specified it is assumed that the branch you wish to build is
+    located there. If it is not specified then the current directory is used.
+
+    By default, if a working tree is found, it is used to build. Otherwise the
+    last committed revision found in the branch is used. To force building the
+    last committed revision use --revision -1. You can also specify any other
+    revision with the --revision option.
+
+    If you only wish to export the package, and not build it (especially useful
+    for merge mode), use --export-only.
+
+    To leave the build directory when the build is completed use --dont-purge.
+
+    Specify the command to use when building using the --builder option, by
+    default "debuild" is used. It can be overriden by setting the "builder"
+    variable in you configuration. You can specify extra options to build with
+    by adding them to the end of the command, after using "--" to indicate the
+    end of the options to builddeb itself. The builder that you specify must
+    accept the options you provide at the end of its command line.
+
+    You can also specify directories to use for different things. --build-dir
+    is the directory to build the packages beneath, which defaults to
+    '../build-area'. '--orig-dir' specifies the directory that contains the
+    .orig.tar.gz files , which defaults to '..'. '--result-dir' specifies where
+    the resulting package files should be placed, which defaults to '..'.
+    --result-dir will have problems if you use a build command that places
+    the results in a different directory.
+
+    The --reuse option will be useful if you are in merge mode, and the
+    upstream tarball is very large. It attempts to reuse a build directory from
+    an earlier build. It will fail if one doesn't exist, but you can create one
+    by using --export-only.
+
+    --quick allows you to define a quick-builder in your configuration files,
+    which will be used when this option is passed. It defaults to 'fakeroot
+    debian/rules binary'. It is overriden if --builder is passed. Using this
+    and --reuse allows for fast rebuilds.
+    """
+
+    export_only_opt = Option(
+        "export-only", help="Export only, don't build.", short_name="e"
+    )
+    use_existing_opt = Option("use-existing", help="Use an existing build directory.")
+    quick_opt = Option(
+        "quick",
+        help="Quickly build the package, uses "
+        'quick-builder, which defaults to "fakeroot '
+        'debian/rules binary".',
+    )
+    reuse_opt = Option(
+        "reuse",
+        help="Try to avoid exporting too much on each "
+        "build. Only works in merge mode; it saves unpacking "
+        "the upstream tarball each time. Implies --dont-purge "
+        "and --use-existing.",
+    )
+    source_opt = Option("source", help="Build a source package.", short_name="S")
+    strict_opt = Option(
+        "strict",
+        help="Refuse to build if there are unknown files in"
+        " the working tree, --no-strict disables the check.",
+    )
+    package_merge_opt = Option(
+        "package-merge",
+        help="Build using the "
+        "appropriate -v and -sa options for merging in the changes from "
+        "another source.",
+    )
+    guess_upstream_branch_url_opt = Option(
+        "guess-upstream-branch-url",
+        help=("Guess upstream branch URL if unknown " "(requires upstream-ontologist)"),
+    )
+    takes_args = ["branch_or_build_options*"]
+    aliases = ["bd", "debuild"]
+    takes_options = [  # type: ignore
+        export_only_opt,
+        dont_purge_opt,
+        use_existing_opt,
+        result_opt,
+        builder_opt,
+        merge_opt,
+        build_dir_opt,
+        orig_dir_opt,
+        split_opt,
+        export_upstream_opt,
+        export_upstream_revision_opt,
+        quick_opt,
+        reuse_opt,
+        native_opt,
+        source_opt,
+        "revision",
+        strict_opt,
+        package_merge_opt,
+        guess_upstream_branch_url_opt,
+    ] + apt_repository_opts
+
+    def _get_tree_and_branch(self, location):
+        if location is None:
+            location = "."
+        transport = get_transport(location)
+        try:
+            transport.local_abspath(".")
+        except NotLocalUrl:
+            is_local = False
+        else:
+            is_local = True
+        controldir, relpath = ControlDir.open_containing_from_transport(transport)
+        tree, branch = controldir._get_tree_branch()
+        return tree, branch, is_local, controldir.user_url, relpath
+
+    def _get_build_tree(self, revision, tree, branch):
+        if revision is None and tree is not None:
+            note(gettext("Building using working tree"))
+        else:
+            if revision is None:
+                revid = branch.last_revision()
+            elif len(revision) == 1:
+                revid = revision[0].in_history(branch).rev_id
+            else:
+                raise BzrCommandError(
+                    gettext(
+                        "bzr builddeb --revision takes exactly one "
+                        "revision specifier."
+                    )
+                )
+            note(gettext("Building branch from revision %s"), revid)
+            tree = branch.repository.revision_tree(revid)
+        return tree
+
+    def _build_type(self, merge, native, split):
+        if merge:
+            return BUILD_TYPE_MERGE
+        if native:
+            return BUILD_TYPE_NATIVE
+        if split:
+            return BUILD_TYPE_SPLIT
+        return None
+
+    def _get_build_command(self, config, builder, quick, build_options):
+        if builder is None:
+            if quick:
+                builder = config.quick_builder
+                if builder is None:
+                    builder = "fakeroot debian/rules binary"
+            else:
+                builder = config.builder
+                if builder is None:
+                    builder = "debuild"
+        if build_options:
+            builder += " " + " ".join(build_options)
+        return builder
+
+    def _get_dirs(self, config, location, is_local, result_dir, build_dir, orig_dir):
+        def _get_dir(supplied, if_local, if_not):
+            if supplied is None:
+                if is_local:
+                    supplied = if_local
+                else:
+                    supplied = if_not
+            if supplied is not None:
+                if is_local:
+                    supplied = os.path.join(
+                        urlutils.local_path_from_url(location), supplied
+                    )
+                    supplied = os.path.realpath(supplied)
+            return supplied
+
+        result_dir = _get_dir(result_dir, config.result_dir, config.user_result_dir)
+        build_dir = _get_dir(
+            build_dir,
+            config.build_dir or default_build_dir,
+            config.user_build_dir or "build-area",
+        )
+        orig_dir = _get_dir(
+            orig_dir,
+            config.orig_dir or default_orig_dir,
+            config.user_orig_dir or "build-area",
+        )
+        return result_dir, build_dir, orig_dir
+
+    def _branch_and_build_options(self, branch_or_build_options_list, source=False):
+        branch = None
+        build_options = []
+        source_opt = False
+        if branch_or_build_options_list is not None:
+            for opt in branch_or_build_options_list:
+                if opt.startswith("-") or branch is not None:
+                    build_options.append(opt)
+                    if opt == "-S" or opt == "--source":
+                        source_opt = True
+                else:
+                    branch = opt
+        if source and not source_opt:
+            build_options.append("-S")
+        if source_opt:
+            source = True
+        return branch, build_options, source
+
+    def run(
+        self,
+        branch_or_build_options_list=None,
+        verbose=False,
+        export_only=False,
+        dont_purge=False,
+        use_existing=False,
+        result_dir=None,
+        builder=None,
+        merge=None,
+        build_dir=None,
+        export_upstream=None,
+        export_upstream_revision=None,
+        orig_dir=None,
+        split=None,
+        quick=False,
+        reuse=False,
+        native=None,
+        source=False,
+        revision=None,
+        package_merge=None,
+        strict=False,
+        guess_upstream_branch_url=False,
+        apt_repository=None,
+        apt_repository_key=None,
+    ):
+        from debian.changelog import ChangelogParseError
+
+        from .builder import DebBuild
+        from .config import UpstreamMetadataSyntaxError
+        from .hooks import run_hook
+        from .source_distiller import DebcargoError
+        from .util import (
+            NoPreviousUpload,
+            dget_changes,
+            find_changelog,
+            find_changes_files,
+            find_previous_upload,
+            tree_contains_upstream_source,
+        )
+
+        location, build_options, source = self._branch_and_build_options(
+            branch_or_build_options_list, source
+        )
+        tree, branch, is_local, location, subpath = self._get_tree_and_branch(location)
+        tree = self._get_build_tree(revision, tree, branch)
+        _check_tree(tree, subpath, strict=strict)
+
+        if apt_repository is not None:
+            from .apt_repo import RemoteApt
+
+            apt = RemoteApt.from_string(apt_repository, apt_repository_key)
+        else:
+            apt = None
+
+        with tree.lock_read():
+            try:
+                config = debuild_config(tree, subpath)
+            except UpstreamMetadataSyntaxError as e:
+                raise BzrCommandError(
+                    gettext("Unable to parse upstream metadata file %s: %s")
+                    % (e.path, e.error)
+                ) from e
+            if reuse:
+                note(gettext("Reusing existing build dir"))
+                dont_purge = True
+                use_existing = True
+            build_type = self._build_type(merge, native, split)
+
+            contains_upstream_source = tree_contains_upstream_source(tree, subpath)
+            try:
+                (changelog, top_level) = find_changelog(
+                    tree, subpath, merge=not contains_upstream_source
+                )
+            except ChangelogParseError as e:
+                raise BzrCommandError(
+                    gettext("Unable to parse changelog: %s") % e
+                ) from e
+
+            if package_merge:
+                try:
+                    prev_version = find_previous_upload(
+                        tree, subpath, not contains_upstream_source
+                    )
+                except NoPreviousUpload:
+                    prev_version = None
+                if prev_version is None:
+                    build_options.extend(["-sa", "-v0"])
+                else:
+                    build_options.append("-v%s" % str(prev_version))
+                    if (
+                        prev_version.upstream_version
+                        != changelog.version.upstream_version
+                        or prev_version.epoch != changelog.version.epoch
+                    ):
+                        build_options.append("-sa")
+            build_cmd = self._get_build_command(config, builder, quick, build_options)
+            result_dir, build_dir, orig_dir = self._get_dirs(
+                config, location or ".", is_local, result_dir, build_dir, orig_dir
+            )
+
+            distiller = _get_distiller(
+                tree,
+                subpath,
+                branch,
+                build_type=build_type,
+                config=config,
+                changelog=changelog,
+                contains_upstream_source=contains_upstream_source,
+                orig_dir=orig_dir,
+                use_existing=use_existing,
+                top_level=top_level,
+                export_upstream=export_upstream,
+                export_upstream_revision=export_upstream_revision,
+                guess_upstream_branch_url=guess_upstream_branch_url,
+                apt=apt,
+            )
+
+            build_source_dir = os.path.join(
+                build_dir,
+                f"{changelog.package}-{changelog.version.upstream_version}",
+            )
+
+            builder = DebBuild(
+                distiller, build_source_dir, build_cmd, use_existing=use_existing
+            )
+            builder.prepare()
+            run_hook(tree, "pre-export", config)
+            try:
+                builder.export()
+            except DebcargoError as e:
+                raise BzrCommandError(str(e)) from e
+            if not export_only:
+                run_hook(tree, "pre-build", config, wd=build_source_dir)
+                builder.build()
+                run_hook(tree, "post-build", config, wd=build_source_dir)
+                if not dont_purge:
+                    builder.clean()
+                changes_paths = []
+                for _kind, entry in find_changes_files(
+                    build_dir, changelog.package, changelog.version
+                ):
+                    changes_paths.append(entry.path)
+                if not changes_paths:
+                    if result_dir is not None:
+                        raise BzrCommandError(
+                            "Could not find the .changes "
+                            "file from the build: %s" % build_dir
+                        )
+                    return
+                if is_local:
+                    target_dir = result_dir or default_result_dir
+                    target_dir = os.path.join(
+                        urlutils.local_path_from_url(location), target_dir
+                    )
+                else:
+                    target_dir = "."
+                if not os.path.exists(target_dir):
+                    os.makedirs(target_dir)
+                for changes_path in changes_paths:
+                    dget_changes(changes_path, target_dir)
+
+
+class cmd_get_orig_source(Command):
+    """Gets the upstream tar file for the packaging branch."""
+
+    directory_opt = Option(
+        "directory",
+        help="Directory from which to retrieve the packaging data",
+        short_name="d",
+        type=str,
+    )
+
+    takes_options = [directory_opt] + apt_repository_opts  # type: ignore
+    takes_args = ["version?"]
+
+    def run(
+        self, directory=".", version=None, apt_repository=None, apt_repository_key=None
+    ):
+        from .upstream import (
+            AptSource,
+            UpstreamProvider,
+        )
+        from .upstream.pristinetar import (
+            get_pristine_tar_source,
+        )
+        from .upstream.uscan import (
+            NoWatchFile,
+            UScanSource,
+        )
+        from .util import (
+            find_changelog,
+        )
+
+        tree, subpath = WorkingTree.open_containing(directory)
+        config = debuild_config(tree, subpath)
+
+        (changelog, larstiq) = find_changelog(tree, subpath, merge=True)
+        orig_dir = config.orig_dir
+        if orig_dir is None:
+            orig_dir = default_orig_dir
+
+        if version is None:
+            version = changelog.version.upstream_version
+
+        if apt_repository is not None:
+            from .apt_repo import RemoteApt
+
+            apt = RemoteApt.from_string(apt_repository, apt_repository_key)
+        else:
+            apt = None
+
+        upstream_sources = [get_pristine_tar_source(tree, tree.branch), AptSource(apt)]
+        try:
+            uscan_source = UScanSource.from_tree(tree, subpath, larstiq)
+        except NoWatchFile:
+            pass
+        else:
+            upstream_sources.append(uscan_source)
+
+        upstream_provider = UpstreamProvider(
+            changelog.package, str(version), orig_dir, upstream_sources
+        )
+
+        result = upstream_provider.provide(orig_dir)
+        for tar, _component in result:
+            note(gettext("Tar now in %s") % tar)
+
+
+class cmd_merge_upstream(Command):
+    """Merges a new upstream version into the current branch.
+
+    Takes a new upstream version and merges it in to your branch, so that your
+    packaging changes are applied to the new version.
+
+    You must supply the source to import from, and in some cases
+    the version number of the new release. The source can be a .tar.gz, .tar,
+    .tar.bz2, .tar.xz, .tgz or .zip archive, a directory or a branch. The
+    source may also be a remote file described by a URL.
+
+    In most situations the version can be guessed from the upstream source.
+    If the upstream version can not be guessed or if it is guessed
+    incorrectly then the version number can be specified with --version.
+
+    The distribution this version is targetted at can be specified with
+    --distribution. This will be used to guess the version number suffix
+    that you want, but you can always correct it in the resulting
+    debian/changelog.
+
+    If there is no debian changelog in the branch to retrieve the package
+    name from then you must pass the --package option. If this version
+    will change the name of the source package then you can use this option
+    to set the new name.
+
+    examples::
+
+        bzr merge-upstream --version 0.2 \
+            http://example.org/releases/scruff-0.2.tar.gz
+
+    If you are merging a branch as well as the tarball then you can
+    specify the branch after the tarball, along with -r to specify the
+    revision of that branch to take::
+
+        bzr merge-upstream --version 0.2 \
+            http://example.org/releases/scruff-0.2.tar.gz \
+            http://scruff.org/bzr/scruff.dev -r tag:0.2
+
+    If there is no upstream release tarball, and you want bzr-builddeb to
+    create the tarball for you::
+
+        bzr merge-upstream --version 0.2 http://scruff.org/bzr/scruff.dev
+
+    Note that the created tarball is just the same as the contents of
+    the branch at the specified revision. If you wish to have something
+    different, for instance the results of running "make dist", then you
+    should create the tarball first, and pass it to the command as in
+    the second example.
+    """
+
+    takes_args = ["location?", "upstream_branch?"]
+    aliases = ["mu"]
+
+    package_opt = Option("package", help="The name of the source package.", type=str)
+    version_opt = Option(
+        "version",
+        help="The upstream version number of this release, for example " '"0.2".',
+        type=str,
+    )
+    distribution_opt = Option(
+        "distribution",
+        help="The distribution that " "this release is targetted at.",
+        type=str,
+    )
+    directory_opt = Option(
+        "directory", help="Working tree into which to merge.", short_name="d", type=str
+    )
+    last_version_opt = Option(
+        "last-version",
+        help="The full version of the last time " "upstream was merged.",
+        type=str,
+    )
+    force_opt = Option(
+        "force", help=("Force a merge even if the upstream branch " "has not changed.")
+    )
+    snapshot_opt = Option(
+        "snapshot",
+        help="Merge a snapshot from the "
+        "upstream branch rather than a new upstream release.",
+    )
+
+    release_opt = Option("release", help="Merge a release from the upstream branch.")
+
+    force_pristine_tar_opt = Option(
+        "force-pristine-tar",
+        help=(
+            "Force the use of pristine-tar, even if no " "pristine-tar branch exists"
+        ),
+    )
+
+    dist_command_opt = Option(
+        "dist-command",
+        type=str,
+        help="Command to run for creating an upstream tarball from a " "VCS snapshot.",
+    )
+
+    guess_upstream_branch_url_opt = Option(
+        "guess-upstream-branch-url",
+        help=("Guess upstream branch URL if unknown " "(requires upstream-ontologist)"),
+    )
+
+    takes_options = [
+        package_opt,
+        version_opt,
+        distribution_opt,
+        directory_opt,
+        last_version_opt,
+        force_opt,
+        "revision",
+        "merge-type",
+        snapshot_opt,
+        force_pristine_tar_opt,
+        dist_command_opt,
+        guess_upstream_branch_url_opt,
+        release_opt,
+        Option(
+            "skip-signatures",
+            help=("Allow signatures for e.g. upstream tarball " "to be missing"),
+        ),
+    ]
+
+    def run(
+        self,
+        location: Optional[str] = None,
+        upstream_branch: Optional[str] = None,
+        version: Optional[str] = None,
+        distribution: Optional[str] = None,
+        package: Optional[str] = None,
+        directory: str = ".",
+        revision=None,
+        merge_type=None,
+        last_version: Optional[str] = None,
+        force: Optional[bool] = None,
+        snapshot: Optional[bool] = None,
+        release: Optional[bool] = None,
+        force_pristine_tar: bool = False,
+        dist_command: Optional[str] = None,
+        guess_upstream_branch_url: bool = False,
+        skip_signatures: bool = False,
+    ):
+        from debian.changelog import Version
+
+        from .hooks import run_hook
+        from .merge_upstream import (
+            changelog_add_new_version,
+            do_merge,
+            get_tarballs,
+        )
+        from .upstream import (
+            PackageVersionNotPresent,
+            TarfileSource,
+        )
+        from .upstream.branch import (
+            PreviousVersionTagMissing,
+            UpstreamBranchSource,
+            run_dist_command,
+        )
+        from .upstream.uscan import (
+            NoWatchFile,
+            UScanSource,
+        )
+        from .util import (
+            detect_version_kind,
+            get_files_excluded,
+            guess_build_type,
+            tree_contains_upstream_source,
+        )
+
+        tree, subpath = WorkingTree.open_containing(directory)
+        with tree.lock_write():
+            _check_uncommitted(tree, subpath)
+            config = debuild_config(tree, subpath)
+            (
+                current_version,
+                package,
+                distribution,
+                distribution_name,
+                changelog,
+                top_level,
+            ) = _get_changelog_info(tree, subpath, last_version, package, distribution)
+            if package is None:
+                raise BzrCommandError(
+                    "You did not specify --package, and "
+                    "there is no changelog from which to determine the "
+                    "package name, which is needed to know the name to "
+                    "give the .orig.tar.gz. Please specify --package."
+                )
+
+            if snapshot is None and release is None:
+                if current_version is not None:
+                    version_kind = detect_version_kind(current_version)
+                else:
+                    version_kind = None
+            elif snapshot is not None and release is not None:
+                raise BzrCommandError("--release and --snapshot are incompatible")
+            elif snapshot:
+                version_kind = "snapshot"
+            elif release:
+                version_kind = "release"
+
+            if version_kind is None:
+                version_kind = "release"
+
+            try:
+                files_excluded = get_files_excluded(tree, subpath, top_level)
+            except NoSuchFile as e:
+                mutter("Copyright file not found: %s", e)
+                files_excluded = []
+            contains_upstream_source = tree_contains_upstream_source(tree, subpath)
+            if changelog is None:
+                changelog_version = None
+            else:
+                changelog_version = changelog.version
+            build_type = config.build_type
+            if build_type is None:
+                build_type = guess_build_type(
+                    tree, changelog_version, subpath, contains_upstream_source
+                )
+            need_upstream_tarball = build_type != BUILD_TYPE_MERGE
+            if build_type == BUILD_TYPE_NATIVE:
+                raise BzrCommandError(
+                    gettext("Merge upstream in native mode is not supported.")
+                )
+
+            if upstream_branch is not None:
+                upstream_branch = Branch.open(upstream_branch)
+            elif location is not None and not os.path.isfile(location):
+                try:
+                    upstream_branch = Branch.open(location)
+                except NotBranchError:
+                    upstream_branch = None
+            elif upstream_branch is None and config.upstream_branch is not None:
+                note(
+                    gettext("Using upstream branch %s (from configuration)"),
+                    config.upstream_branch,
+                )
+                upstream_branch = Branch.open(config.upstream_branch)
+            elif upstream_branch is None and guess_upstream_branch_url:
+                try:
+                    from upstream_ontologist.guess import (
+                        guess_upstream_metadata,
+                    )
+                except ModuleNotFoundError:
+                    warning(
+                        "upstream-ontologist not available, "
+                        "not guess upstream branch URL"
+                    )
+                    upstream_branch = None
+                else:
+                    guessed_upstream_metadata = guess_upstream_metadata(
+                        tree.abspath(subpath),
+                        trust_package=False,
+                        net_access=True,
+                        consult_external_directory=False,
+                    )
+                    guessed_repo = guessed_upstream_metadata.get("Repository")
+                    if guessed_repo:
+                        note(
+                            "Opening upstream-ontologist provided branch %s",
+                            guessed_repo,
+                        )
+                        upstream_branch = Branch.open(guessed_repo)
+                    else:
+                        upstream_branch = None
+
+            create_dist: Optional[Callable[[str, str, str, str, str], str]]
+            if dist_command:
+
+                def create_dist(tree, package, version, target_dir, subpath=""):
+                    return run_dist_command(
+                        tree,
+                        package,
+                        version,
+                        target_dir,
+                        dist_command,
+                        subpath=subpath,
+                    )
+            else:
+                create_dist = None
+
+            if upstream_branch is not None:
+                upstream_branch_source = UpstreamBranchSource.from_branch(
+                    upstream_branch,
+                    config=config,
+                    local_dir=tree.controldir,
+                    create_dist=create_dist,
+                    version_kind=version_kind,
+                )
+            else:
+                upstream_branch_source = None
+
+            if location is not None:
+                try:
+                    primary_upstream_source = UpstreamBranchSource.from_branch(
+                        Branch.open(location),
+                        config=config,
+                        local_dir=tree.controldir,
+                        create_dist=create_dist,
+                        version_kind=version_kind,
+                    )
+                except NotBranchError:
+                    primary_upstream_source = TarfileSource(location, version)
+            else:
+                if snapshot:
+                    if upstream_branch_source is None:
+                        raise BzrCommandError(
+                            gettext("--snapshot requires an upstream branch source")
+                        )
+                    primary_upstream_source = upstream_branch_source
+                else:
+                    try:
+                        primary_upstream_source = UScanSource.from_tree(
+                            tree, subpath, top_level, skip_signatures=skip_signatures
+                        )
+                    except NoWatchFile as e:
+                        if upstream_branch_source is None:
+                            raise BzrCommandError(
+                                gettext(
+                                    "no upstream source location known; "
+                                    "add watch file or specify "
+                                    "upstream repository?"
+                                )
+                            ) from e
+                        primary_upstream_source = upstream_branch_source
+
+            if revision is not None:
+                if upstream_branch is None:
+                    raise BzrCommandError(
+                        gettext(
+                            "--revision can only be "
+                            "used with a valid upstream branch"
+                        )
+                    )
+                if len(revision) > 1:
+                    raise BzrCommandError(
+                        gettext("merge-upstream takes only a single --revision")
+                    )
+                upstream_revspec = revision[0]
+                upstream_revisions = {
+                    None: (upstream_revspec.as_revision_id(upstream_branch), subpath)
+                }
+            else:
+                upstream_revisions = None
+
+            if version is None and upstream_revisions is not None:
+                # Look up the version from the upstream revision
+                unmangled_version, version = upstream_branch_source.get_version(
+                    package, current_version, upstream_revisions[None][0]
+                )
+            elif version is None and primary_upstream_source is not None:
+                unmangled_version, version = primary_upstream_source.get_latest_version(
+                    package, current_version
+                )
+            if version is None:
+                if upstream_branch_source is not None:
+                    raise BzrCommandError(
+                        gettext(
+                            "You must specify "
+                            "the version number using --version or specify "
+                            "--snapshot to merge a snapshot from the upstream "
+                            "branch."
+                        )
+                    )
+                else:
+                    raise BzrCommandError(
+                        gettext(
+                            "You must specify the " "version number using --version."
+                        )
+                    )
+            note(gettext("Using version string %s."), version)
+            # Look up the revision id from the version string
+            if upstream_revisions is None and upstream_branch_source is not None:
+                try:
+                    upstream_revisions = upstream_branch_source.version_as_revisions(
+                        package, version
+                    )
+                except PackageVersionNotPresent as e:
+                    raise BzrCommandError(
+                        "Version {} can not be found in upstream branch {!r}. "
+                        "Specify the revision manually using --revision or "
+                        "adjust 'export-upstream-revision' in the "
+                        "configuration.".format(version, upstream_branch_source)
+                    ) from e
+            if need_upstream_tarball:
+                target_dir = self.enter_context(tempfile.TemporaryDirectory())
+                try:
+                    locations = primary_upstream_source.fetch_tarballs(
+                        package, version, target_dir, components=[None]
+                    )
+                except PackageVersionNotPresent:
+                    if upstream_revisions is not None:
+                        locations = upstream_branch_source.fetch_tarballs(
+                            package,
+                            version,
+                            target_dir,
+                            components=[None],
+                            revisions=upstream_revisions,
+                        )
+                    else:
+                        raise
+                orig_dir = config.orig_dir or default_orig_dir
+                try:
+                    tarball_filenames = get_tarballs(
+                        orig_dir, tree, package, version, locations
+                    )
+                except FileExists as e:
+                    raise BzrCommandError(
+                        "The target file %s already exists, and is either "
+                        "different to the new upstream tarball, or they "
+                        "are of different formats. Either delete the target "
+                        "file, or use it as the argument to import." % e.path
+                    ) from e
+                try:
+                    conflicts, imported_revids = do_merge(
+                        tree,
+                        tarball_filenames,
+                        package,
+                        version,
+                        current_version,
+                        upstream_branch,
+                        upstream_revisions,
+                        merge_type,
+                        force=force,
+                        force_pristine_tar=force_pristine_tar,
+                        files_excluded=files_excluded,
+                    )
+                except PreviousVersionTagMissing as e:
+                    raise BzrCommandError(str(e)) from e
+            if current_version is not None and Version(current_version) >= Version(
+                version
+            ):
+                raise BzrCommandError(
+                    gettext("Upstream version %s has already been merged.") % version
+                )
+            changelog_add_new_version(
+                tree, subpath, version, distribution_name, changelog, package
+            )
+            run_hook(tree, "merge-upstream", config)
+        if not need_upstream_tarball:
+            note(
+                gettext(
+                    "An entry for the new upstream version has been "
+                    "added to the changelog."
+                )
+            )
+        else:
+            note(gettext("The new upstream version has been imported."))
+            if conflicts:
+                note(
+                    gettext(
+                        "You should now resolve the conflicts, review "
+                        "the changes, and then commit."
+                    )
+                )
+            else:
+                note(gettext("You should now review the changes and " "then commit."))
+
+
+class cmd_import_dsc(Command):
+    """Import a series of source packages.
+
+    Provide a number of source packages (.dsc files), and they will
+    be imported to create a branch with history that reflects those
+    packages.
+
+    The first argument is the distribution that these source packages
+    were uploaded to, one of "debian" or "ubuntu". It can also
+    be the target distribution from the changelog, e.g. "unstable",
+    which will be resolved to the correct distribution.
+
+    You can also specify a file (possibly remote) that contains a
+    list of source packages (.dsc files) to import using the --file
+    option. Each line is taken to be a URI or path to import. The
+    sources specified in the file are used in addition to those
+    specified on the command line.
+
+    If you have an existing branch containing packaging and you want to
+    import a .dsc from an upload done from outside the version control
+    system you can use this command.
+    """
+
+    takes_args = ["files*"]
+
+    filename_opt = Option(
+        "file",
+        help="File containing URIs of source " "packages to import.",
+        type=str,
+        short_name="F",
+    )
+
+    takes_options = [filename_opt]
+
+    def import_many(self, db, files_list, orig_target):
+        from .import_dsc import (
+            DscCache,
+            DscComp,
+        )
+        from .util import (
+            open_file_via_transport,
+        )
+
+        cache = DscCache()
+        files_list.sort(key=DscComp(cache).key)
+        if not os.path.exists(orig_target):
+            os.makedirs(orig_target)
+        for dscname in files_list:
+            dsc = cache.get_dsc(dscname)
+
+            def get_dsc_part(from_transport, filename):
+                from_f = open_file_via_transport(filename, from_transport)
+                contents = from_f.read()
+                with open(os.path.join(orig_target, filename), "wb") as to_f:
+                    to_f.write(contents)
+
+            base, filename = urlutils.split(dscname)
+            from_transport = cache.get_transport(dscname)
+            get_dsc_part(from_transport, filename)
+            for file_details in dsc["files"]:
+                name = file_details["name"]
+                get_dsc_part(from_transport, name)
+            db.import_package(os.path.join(orig_target, filename))
+
+    def run(self, files_list, file=None):
+        from .import_dsc import (
+            DistributionBranch,
+            DistributionBranchSet,
+        )
+        from .util import (
+            MissingChangelogError,
+            find_changelog,
+            open_file,
+        )
+
+        try:
+            tree, subpath = WorkingTree.open_containing(".")
+        except NotBranchError as e:
+            raise BzrCommandError(
+                gettext("There is no tree to import the packages in to")
+            ) from e
+        with tree.lock_write():
+            _check_uncommitted(tree, subpath)
+            if files_list is None:
+                files_list = []
+            if file is not None:
+                if isinstance(file, str):
+                    file = file.encode("utf-8")
+                sources_file = open_file(file)
+                for line in sources_file:
+                    line = line.strip()
+                    if len(line) > 0:
+                        files_list.append(line)
+            if len(files_list) < 1:
+                raise BzrCommandError(
+                    gettext(
+                        "You must give the location of "
+                        "at least one source package to install, or use the "
+                        "--file option."
+                    )
+                )
+            config = debuild_config(tree, subpath)
+            if config.build_type == BUILD_TYPE_MERGE:
+                raise BzrCommandError(
+                    gettext("import-dsc in merge mode is not yet supported.")
+                )
+            orig_target = os.path.join(tree.basedir, default_orig_dir)
+            db = DistributionBranch(tree.branch, tree.branch, tree=tree)
+            dbs = DistributionBranchSet()
+            dbs.add_branch(db)
+            try:
+                (changelog, top_level) = find_changelog(tree, subpath, merge=False)
+                last_version = changelog.version
+            except MissingChangelogError:
+                last_version = None
+            with tempfile.TemporaryDirectory(
+                dir=os.path.join(tree.basedir, "..")
+            ) as tempdir:
+                if last_version is not None:
+                    if not db.pristine_upstream_source.has_version(
+                        changelog.package, last_version.upstream_version
+                    ):
+                        raise BzrCommandError(
+                            gettext(
+                                "Unable to find the tag "
+                                "for the previous upstream version (%(version)s) "
+                                "in the branch. Consider importing it via "
+                                "import-upstream. If it is already present in the "
+                                "branch please make sure it is tagged as %(tag)r."
+                            )
+                            % {
+                                "version": last_version,
+                                "tag": db.pristine_upstream_source.tag_name(
+                                    last_version.upstream_version
+                                ),
+                            }
+                        )
+                    upstream_tips = db.pristine_upstream_source.version_as_revisions(
+                        changelog.package, last_version.upstream_version
+                    )
+                    db.extract_upstream_tree(upstream_tips, tempdir)
+                else:
+                    db.create_empty_upstream_tree(tempdir)
+                self.import_many(db, files_list, orig_target)
+
+
+class cmd_import_upstream(Command):
+    """Imports an upstream tarball.
+
+    This will import an upstream tarball in to your branch, but not modify the
+    working tree. Use merge-upstream if you wish to directly merge the new
+    upstream version in to your tree.
+
+    The imported revision can be accessed using the tag name that will be
+    reported at the end of a successful operation. The revision will include
+    the pristine-tar data that will allow other commands to recreate the
+    tarball when needed.
+
+    For instance::
+
+        $ bzr import-upstream 1.2.3 ../package_1.2.3.orig.tar.gz
+
+    If upstream is packaged in bzr, you should provide the upstream branch
+    whose tip commit is the closest match to the tarball::
+
+        $ bzr import-upstream 1.2.3 ../package_1.2.3.orig.tar.gz ../upstream
+
+    After doing this, commands that assume there is an upstream tarball, like
+    'bzr builddeb' will be able to recreate the one provided at import-upstream
+    time, meaning that you don't need to distribute the tarball in addition to
+    the branch.
+
+    If you want to manually merge with the imported upstream, you can do::
+
+        $ bzr merge . -r tag:upstream-1.2.3
+
+    The imported revision will have file ids taken from your branch, the
+    upstream branch, or previous tarball imports as necessary. In addition
+    the parents of the new revision will be the previous upstream tarball
+    import and the tip of the upstream branch if you supply one.
+    """
+
+    takes_options = [
+        "revision",
+        Option(
+            "force-pristine-tar",
+            help=(
+                "Force creation of a new "
+                "pristine-tar branch, even if one does not exist."
+            ),
+        ),
+    ]
+
+    takes_args = ["version", "location", "upstream_branch?"]
+
+    def run(
+        self,
+        version,
+        location,
+        upstream_branch=None,
+        revision=None,
+        force_pristine_tar=False,
+    ):
+        from debian.changelog import Version
+
+        from .import_dsc import (
+            DistributionBranch,
+            DistributionBranchSet,
+        )
+        from .util import (
+            md5sum_filename,
+        )
+
+        # TODO: search for similarity etc.
+        branch, subpath = Branch.open_containing(".")
+        if upstream_branch is None:
+            upstream = None
+            upstream_subpath = ""
+        else:
+            upstream, upstream_subpath = Branch.open_containing(upstream_branch)
+        self.add_cleanup(branch.lock_write().unlock)
+        tempdir = self.enter_context(
+            tempfile.TemporaryDirectory(
+                dir=branch.controldir.root_transport.clone("..").local_abspath(".")
+            )
+        )
+        db = DistributionBranch(branch, pristine_upstream_branch=branch)
+        if db.pristine_upstream_source.has_version(None, version):
+            raise BzrCommandError(gettext("Version %s is already present.") % version)
+        tagged_versions = {}
+        for tversion, tcomponents in db.pristine_upstream_source.iter_versions():
+            tagged_versions[Version(tversion)] = tcomponents
+        tag_order = sorted(tagged_versions.keys())
+        if tag_order:
+            base_revisions = tagged_versions[tag_order[-1]]
+        else:
+            base_revisions = {}
+        if base_revisions:
+            if upstream is not None:
+                # See bug lp:309682
+                for parent in base_revisions.values():
+                    upstream.repository.fetch(branch.repository, parent)
+            db.extract_upstream_tree(
+                {comp: (revid, subpath) for comp, revid in base_revisions.items()},
+                tempdir,
+            )
+            parents = {}
+            for name, base_revid in base_revisions.items():
+                parents[name] = [(base_revid, subpath)]
+        else:
+            parents = {}
+            db.create_empty_upstream_tree(tempdir)
+        tree = db.branch.basis_tree()
+        tree.lock_read()
+        dbs = DistributionBranchSet()
+        dbs.add_branch(db)
+        if revision is None:
+            upstream_revid = None
+        elif len(revision) == 1:
+            upstream_revid = revision[0].in_history(upstream).rev_id
+        else:
+            raise BzrCommandError(
+                gettext(
+                    "bzr import-upstream --revision takes exactly"
+                    " one revision specifier."
+                )
+            )
+        tarballs = [(location, None, md5sum_filename(location))]
+        for (
+            component,
+            tag_name,
+            _revid,
+            _pristine_tar_imported,
+            _subpath,
+        ) in db.import_upstream_tarballs(
+            tarballs,
+            None,
+            version,
+            parents,
+            upstream_branch=upstream,
+            upstream_revisions={None: (upstream_revid, upstream_subpath)},
+            force_pristine_tar=force_pristine_tar,
+        ):
+            if component is None:
+                self.outf.write(
+                    gettext("Imported %(location)s as tag:%(tag)s.\n")
+                    % {"location": location, "tag": tag_name}
+                )
+            else:
+                self.outf.write(
+                    gettext("Imported %(location)s (%(component)s) as tag:%(tag)s.\n")
+                    % {"location": location, "component": component, "tag": tag_name}
+                )
+
+
+class cmd_builddeb_do(Command):
+    """Run a command in an exported package, copying the result back.
+
+    For a merge mode package the full source is not available, making some
+    operations difficult. This command allows you to run any command in an
+    exported source directory, copying the resulting debian/ directory back
+    to your branch if the command is successful.
+
+    For instance:
+
+      bzr builddeb-do
+
+    will run a shell in the unpacked source. Any changes you make in the
+    ``debian/`` directory (and only those made in that directory) will be
+    copied back to the branch. If you exit with a non-zero exit code (e.g.
+    "exit 1"), then the changes will not be copied back.
+
+    You can also specify single commands to be run, e.g.
+
+      bzr builddeb-do "dpatch-edit-patch 01-fix-build"
+
+    Note that only the first argument is used as the command, and so the above
+    example had to be quoted.
+    """
+
+    takes_args = ["command*"]
+    takes_options = [  # type: ignore
+        Option("no-preparation", help="Don't apply/unapply patches."),
+    ] + apt_repository_opts
+    aliases = ["bd-do"]
+
+    def run(
+        self,
+        command_list=None,
+        no_preparation=False,
+        apt_repository=None,
+        apt_repository_key=None,
+    ):
+        import subprocess
+
+        from .builder import (
+            BuildFailedError,
+            DebBuild,
+        )
+        from .hooks import run_hook
+        from .source_distiller import (
+            MergeModeDistiller,
+        )
+        from .upstream import (
+            AptSource,
+            UpstreamProvider,
+        )
+        from .upstream.pristinetar import (
+            get_pristine_tar_source,
+        )
+        from .upstream.uscan import (
+            UScanSource,
+        )
+        from .util import (
+            find_changelog,
+            guess_build_type,
+            tree_contains_upstream_source,
+        )
+
+        t, subpath = WorkingTree.open_containing(".")
+        self.add_cleanup(t.lock_read().unlock)
+        config = debuild_config(t, subpath)
+        (changelog, top_level) = find_changelog(t, subpath, merge=False, max_blocks=2)
+
+        contains_upstream_source = tree_contains_upstream_source(t, subpath)
+        if changelog is None:
+            changelog_version = None
+        else:
+            changelog_version = changelog.version
+        build_type = config.build_type
+        if build_type is None:
+            build_type = guess_build_type(
+                t, changelog_version, subpath, contains_upstream_source
+            )
+
+        if build_type != BUILD_TYPE_MERGE:
+            raise BzrCommandError(
+                gettext(
+                    "This command only works for merge "
+                    "mode packages. See /usr/share/doc/bzr-builddeb"
+                    "/user_manual/merge.html for more information."
+                )
+            )
+
+        give_instruction = False
+        if command_list is None:
+            try:
+                command_list = [os.environ["SHELL"]]
+            except KeyError:
+                command_list = ["/bin/sh"]
+            give_instruction = True
+        build_dir = config.build_dir
+        if build_dir is None:
+            build_dir = default_build_dir
+        orig_dir = config.orig_dir
+        if orig_dir is None:
+            orig_dir = default_orig_dir
+
+        if apt_repository is not None:
+            from .apt_repo import RemoteApt
+
+            apt = RemoteApt.from_string(apt_repository, apt_repository_key)
+        else:
+            apt = None
+
+        upstream_provider = UpstreamProvider(
+            changelog.package,
+            changelog.version.upstream_version,
+            orig_dir,
+            [
+                get_pristine_tar_source(t, t.branch),
+                AptSource(apt=apt),
+                UScanSource(t, subpath, top_level),
+            ],
+        )
+
+        distiller = MergeModeDistiller(
+            t, subpath, upstream_provider, top_level=top_level
+        )
+
+        build_source_dir = os.path.join(
+            build_dir, changelog.package + "-" + changelog.version.upstream_version
+        )
+
+        command = " ".join(command_list)
+
+        builder = DebBuild(distiller, build_source_dir, command)
+        builder.prepare()
+        run_hook(t, "pre-export", config)
+        builder.export()
+        note(gettext('Running "%s" in the exported directory.') % (command))
+        if give_instruction:
+            note(
+                gettext(
+                    "If you want to cancel your changes then exit "
+                    'with a non-zero exit code, e.g. run "exit 1".'
+                )
+            )
+        if not no_preparation:
+            builder.before_build()
+        try:
+            builder.build()
+        except BuildFailedError as e:
+            raise BzrCommandError(
+                gettext("Not updating the working tree as the command failed.")
+            ) from e
+        finally:
+            if not no_preparation:
+                try:
+                    builder.after_build()
+                except subprocess.CalledProcessError as e:
+                    raise BzrCommandError(
+                        gettext("After build processing failed. Aborting.")
+                    ) from e
+        note(gettext("Copying debian/ back"))
+        if top_level:
+            destination = ""
+        else:
+            destination = "debian/"
+        destination = os.path.join(t.basedir, destination)
+        source_debian = os.path.join(build_source_dir, "debian")
+        for filename in os.listdir(source_debian):
+            proc = subprocess.Popen(
+                f'cp -apf "{os.path.join(source_debian, filename)}" "{destination}"',
+                shell=True,
+            )
+            proc.wait()
+            if proc.returncode != 0:
+                raise BzrCommandError(gettext("Copying back debian/ failed"))
+        builder.clean()
+        note(
+            gettext(
+                "If any files were added or removed you should run "
+                '"bzr add" or "bzr rm" as appropriate.'
+            )
+        )
+
+
+class cmd_dep3_patch(Command):
+    r"""Format the changes in a branch as a DEP-3 patch.
+
+    This will generate a patch file containing as much information
+    specified by DEP-3 (http://dep.debian.net/deps/dep3/) as possible.
+
+    The patch will contain all changes that are not merged into
+    the current branch (either that in the current working directory
+    or specified by --directory) but are present and committed
+    in the branch at the specified location.
+
+    To generate the "Status" header, this command will check the
+    upstream branch to verify if the change has made it upstream,
+    unless --no-upstream-check was specified.
+
+    examples::
+
+        bzr dep3-patch lp:~user/project/feature-branch > \\
+                debian/patches/01_feature
+    """
+
+    takes_args = ["location?"]
+
+    directory_opt = Option(
+        "directory",
+        help="Packaging tree for which to generate patch.",
+        short_name="d",
+        type=str,
+    )
+
+    no_upstream_check_opt = Option(
+        "no-upstream-check", help="Don't check whether patch has been merged upstream."
+    )
+
+    takes_options = [directory_opt, "revision", "change", no_upstream_check_opt]
+
+    def run(self, location=".", directory=".", revision=None, no_upstream_check=False):
+        from .dep3 import (
+            describe_origin,
+            determine_applied_upstream,
+            determine_forwarded,
+            gather_bugs_and_authors,
+            write_dep3_patch,
+        )
+
+        (packaging_tree, packaging_branch) = ControlDir.open_containing_tree_or_branch(
+            directory
+        )[:2]
+        self.add_cleanup(packaging_branch.lock_read().unlock)
+        tree, branch = ControlDir.open_containing_tree_or_branch(location)[:2]
+        self.add_cleanup(branch.lock_read().unlock)
+        if revision is not None and len(revision) >= 1:
+            revision_id = revision[-1].as_revision_id(branch)
+        else:
+            revision_id = None
+        if revision_id is None:
+            revision_id = branch.last_revision()
+        graph = branch.repository.get_graph(packaging_branch.repository)
+        if revision is not None and len(revision) == 2:
+            base_revid = revision[0].as_revision_id(branch)
+        else:
+            base_revid = graph.find_unique_lca(
+                revision_id, packaging_branch.last_revision()
+            )
+        interesting_revision_ids = graph.find_unique_ancestors(
+            revision_id, [base_revid]
+        )
+        if len(interesting_revision_ids) == 0:
+            raise BzrCommandError(gettext("No unmerged revisions"))
+        (bugs, authors, last_update) = gather_bugs_and_authors(
+            branch.repository, interesting_revision_ids
+        )
+        config = branch.get_config()
+        description = config.get_user_option("description")
+        if description is None:
+            # if there's just one revision in the mainline history, use
+            # that revisions commits message
+            lhs_history = graph.iter_lefthand_ancestry(revision_id, [base_revid])
+            rev = branch.repository.get_revision(next(lhs_history))
+            try:
+                next(lhs_history)
+            except StopIteration:
+                description = rev.message
+        origin = describe_origin(branch, revision_id)
+        if packaging_tree is None:
+            packaging_tree = packaging_branch.basis_tree()
+        builddeb_config = debuild_config(packaging_tree, "")
+        if not no_upstream_check and builddeb_config.upstream_branch:
+            upstream_branch = Branch.open(builddeb_config.upstream_branch)
+            applied_upstream = determine_applied_upstream(
+                upstream_branch, branch, revision_id
+            )
+            forwarded = determine_forwarded(upstream_branch, branch, revision_id)
+        else:
+            applied_upstream = None
+            forwarded = None
+        write_dep3_patch(
+            self.outf,
+            branch,
+            base_revid,
+            revision_id,
+            bugs=bugs,
+            authors=authors,
+            origin=origin,
+            forwarded=forwarded,
+            applied_upstream=applied_upstream,
+            description=description,
+            last_update=last_update,
+        )
+
+
+class LocalTree:
+    def __init__(self, branch):
+        self.branch = branch
+        self._td = None
+
+    def __enter__(self):
+        try:
+            return self.branch.controldir.open_workingtree()
+        except (NoWorkingTree, NotLocalUrl):
+            pass
+        # Remote, inaccessible
+        self._td = tempfile.mkdtemp()
+        to_dir = self.branch.controldir.sprout(
+            get_transport(self._td).base,
+            None,
+            create_tree_if_local=True,
+            source_branch=self.branch,
+        )
+        try:
+            pristine_tar_branch = self.branch.controldir.open_branch(
+                name="pristine-tar"
+            )
+        except (NotBranchError, NoColocatedBranchSupport):
+            pass
+        else:
+            pristine_tar_branch.push(to_dir.create_branch("pristine-tar"))
+        return to_dir.open_workingtree()
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        if self._td is not None:
+            shutil.rmtree(self._td)
+        return False
+
+
+def _build_helper(
+    local_tree,
+    subpath,
+    packaging_branch,
+    target_dir,
+    builder,
+    guess_upstream_branch_url=False,
+    apt=None,
+):
+    # TODO(jelmer): Integrate this with cmd_builddeb
+    from .builder import (
+        do_build,
+    )
+    from .util import (
+        find_changelog,
+        tree_contains_upstream_source,
+    )
+
+    (changelog, top_level) = find_changelog(
+        local_tree, subpath, merge=False, max_blocks=2
+    )
+
+    config = debuild_config(local_tree, subpath)
+    contains_upstream_source = tree_contains_upstream_source(local_tree, subpath)
+
+    distiller = _get_distiller(
+        local_tree,
+        subpath,
+        packaging_branch,
+        build_type=None,
+        config=config,
+        changelog=changelog,
+        contains_upstream_source=contains_upstream_source,
+        top_level=top_level,
+        guess_upstream_branch_url=guess_upstream_branch_url,
+        apt=apt,
+    )
+
+    return do_build(
+        changelog.package,
+        changelog.version,
+        distiller,
+        local_tree,
+        config,
+        builder,
+        target_dir,
+    )
+
+
+DEFAULT_BUILDER = "sbuild --source --source-only-changes --no-clean-source"
+
+
+class cmd_debrelease(Command):
+    """Release a new version of a package.
+
+    This will update the latest distribution in the changelog,
+    build the package and upload.
+
+    Location can be remote.
+    """
+
+    strict_opt = Option(
+        "strict",
+        help="Refuse to build if there are unknown files in"
+        " the working tree, --no-strict disables the check.",
+    )
+
+    takes_args = ["location?"]
+    takes_options = [  # type: ignore
+        strict_opt,
+        Option("skip-upload", help="Skip upload."),
+        builder_opt,
+    ] + apt_repository_opts
+
+    def run(
+        self,
+        location=".",
+        strict=True,
+        skip_upload=False,
+        builder=DEFAULT_BUILDER,
+        apt_repository=None,
+        apt_repository_key=None,
+    ):
+        from .release import SuccessReleaseMarker
+        from .util import (
+            dput_changes,
+        )
+
+        branch, subpath = Branch.open_containing(location)
+
+        if apt_repository is not None:
+            from .apt_repo import RemoteApt
+
+            apt = RemoteApt.from_string(apt_repository, apt_repository_key)
+        else:
+            apt = None
+
+        # preserve whatever source format we have.
+        # TODO(jelmer): Use the local tree if there is one, but check it's
+        # clean.
+        with LocalTree(branch) as local_tree:
+            _check_tree(local_tree, subpath, strict)
+            with tempfile.TemporaryDirectory() as td:
+                with SuccessReleaseMarker(local_tree, subpath):
+                    changes_files = _build_helper(
+                        local_tree,
+                        subpath,
+                        local_tree.branch,
+                        target_dir=(td if not skip_upload else None),
+                        builder=builder,
+                        apt=apt,
+                    )
+                if not skip_upload:
+                    try:
+                        source_path = changes_files["source"]
+                    except KeyError as e:
+                        raise BzrCommandError(
+                            "No source package was created by build command"
+                        ) from e
+                    dput_changes(source_path)
+            local_tree.branch.push(branch)

=== added file 'breezy/plugins/debian/config.py'
--- breezy/plugins/debian/config.py	1970-01-01 00:00:00 +0000
+++ breezy/plugins/debian/config.py	2024-02-18 23:22:42 +0000
@@ -0,0 +1,406 @@
+#    config.py -- Configuration of bzr-builddeb from files
+#    Copyright (C) 2006 James Westby <[e-mail]>
+#
+#    This file is part of breezy-debian.
+#
+#    bzr-builddeb is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    bzr-builddeb is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with bzr-builddeb; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+
+import yaml
+
+from breezy.transport import NoSuchFile
+
+from ...config import (
+    ConfigObj,
+    TreeConfig,
+    configobj,
+)
+from ...errors import BzrError
+from ...trace import mutter, warning
+
+BUILD_TYPE_NORMAL = "normal"
+BUILD_TYPE_NATIVE = "native"
+BUILD_TYPE_MERGE = "merge"
+BUILD_TYPE_SPLIT = "split"
+
+
+class SvnBuildPackageMappedConfig:
+    """Config object that provides a bzr-builddeb configuration
+    based on a svn-buildpackage configuration.
+    """
+
+    def __init__(self, bp_config):
+        self.bp_config = bp_config
+
+    def get_option(self, option, section=None):
+        """Retrieve the contents of an option, mapped from the equivalent
+        svn-buildpackage option.
+        """
+        if section == "BUILDDEB":
+            if option == "merge":
+                return self.bp_config.get_merge_with_upstream()
+            elif option == "orig-dir":
+                return self.bp_config.get("origDir")
+            elif option == "build-dir":
+                return self.bp_config.get("buildArea")
+        return None
+
+
+class UpstreamMetadataSyntaxError(BzrError):
+    """There is a syntax error in the debian/upstream/metadata file."""
+
+    _fmt = "Unable to parse upstream metadata file %(path)s: %(error)s"
+
+    def __init__(self, path, error):
+        self.path = path
+        self.error = error
+
+
+class UpstreamMetadataConfig:
+    """Config object that represents debian/upstream/metadata."""
+
+    filename = "debian/upstream/metadata"
+
+    def __init__(self, text):
+        try:
+            self.metadata = yaml.safe_load(text)
+        except yaml.composer.ComposerError as e:
+            all_metadata = [x for x in yaml.safe_load_all(text) if x is not None]
+            if len(all_metadata) != 1:
+                raise UpstreamMetadataSyntaxError(
+                    "debian/upstream/metadata", Exception("multiple documents found")
+                ) from e
+            warning("ignoring empty extra documents in debian/upstream/metadata")
+            self.metadata = all_metadata[0]
+        except (
+            yaml.scanner.ScannerError,
+            yaml.parser.ParserError,
+        ) as e:
+            raise UpstreamMetadataSyntaxError("debian/upstream/metadata", e) from e
+        if isinstance(self.metadata, str):
+            raise UpstreamMetadataSyntaxError(
+                "debian/upstream/metadata", TypeError(self.metadata)
+            )
+        if isinstance(self.metadata, list):
+            raise UpstreamMetadataSyntaxError(
+                "debian/upstream/metadata", TypeError(self.metadata)
+            )
+
+    def get_value(self, section, option):
+        if section == "BUILDDEB":
+            if option == "upstream-branch":
+                return self.metadata.get("Repository")
+            if option == "export-upstream-revision":
+                tag_prefix = self.metadata.get("Repository-Tag-Prefix")
+                if tag_prefix is not None:
+                    return "tag:" + tag_prefix + "$UPSTREAM_VERSION"
+        raise KeyError
+
+    def __getitem__(self, key):
+        return self.get_value(key, "BUILDDEB")
+
+    def get_bool(self, section, option):
+        raise KeyError
+
+    def as_bool(self, option):
+        raise KeyError
+
+
+class DebBuildConfig:
+    """Holds the configuration settings for builddeb. These are taken from
+    a hierarchy of config files. .bzr-builddeb/local.conf then
+    debian/bzr-builddeb.conf.local,
+    ~/.bazaar/builddeb.conf, debian/bzr-builddeb.conf,
+    finally .bzr-builddeb/default.conf. The value is
+    taken from the first file in which it is specified.
+    """
+
+    section = "BUILDDEB"
+
+    def __init__(self, files, branch=None, tree=None):
+        """Creates a config to read from config files in a hierarchy.
+
+        Pass it a list of tuples (file, secure) where file is the location of a
+        config file (that doesn't have to exist, and trusted is True or false,
+        and states whether the file can be trusted for sensitive values.
+
+        The value will be returned from the first in the list that has it,
+        unless that key is marked as needing a trusted file and the file isn't
+        trusted.
+
+        If branch is not None then it will be used in preference to all others.
+        It will not be considered trusted.
+
+        The sample files used in this test are included in the builddeb source
+        tree.
+
+        >>> import os
+        >>> import breezy.plugins.debian
+        >>> d = os.path.dirname(breezy.plugins.debian.__file__) + '/'
+        >>> c = DebBuildConfig([
+        ...      (d + 'local.conf', False),
+        ...      (d + 'user.conf', True),
+        ...      (d + 'default.conf', False)])
+        >>> print(c.orig_dir)
+        None
+        >>> print(c.merge)
+        True
+        >>> print(c.build_dir)
+        defaultbuild
+        >>> print(c.result_dir)
+        userresult
+        >>> print(c.builder)
+        userbuild
+        """
+        self._config_files = []
+        for input in files:
+            try:
+                config = ConfigObj(input[0])
+            except configobj.ParseError as e:
+                if len(input) > 2:
+                    content = input[2]
+                else:
+                    content = input[0]
+                warning("There was an error parsing '%s': %s", content, e.msg)
+                continue
+            if len(input) > 2:
+                config.filename = input[2]
+            self._config_files.append((config, input[1]))
+        if branch is not None:
+            self._branch_config = TreeConfig(branch)
+        else:
+            self._branch_config = None
+        self._tree_config = None
+        if tree is not None:
+            try:
+                # Imported here, since not everybody will have bzr-svn
+                # installed
+                from ..svn.config import (
+                    NoSubversionBuildPackageConfig,
+                    SubversionBuildPackageConfig,
+                )
+
+                try:
+                    self._tree_config = SvnBuildPackageMappedConfig(
+                        SubversionBuildPackageConfig(tree)
+                    )
+                except NoSubversionBuildPackageConfig:
+                    pass  # Not a svn tree
+            except ImportError:
+                pass  # No svn, apparently
+            try:
+                try:
+                    upstream_metadata_text = tree.get_file_text(
+                        UpstreamMetadataConfig.filename
+                    )
+                except IsADirectoryError:
+                    upstream_metadata_text = tree.get_file_text("debian/upstream")
+            except NoSuchFile:
+                pass
+            else:
+                try:
+                    self._config_files.append(
+                        (UpstreamMetadataConfig(upstream_metadata_text), False)
+                    )
+                except UpstreamMetadataSyntaxError as e:
+                    warning("Ignoring upstream metadata due to %s", e)
+        self.user_config = None
+
+    def set_user_config(self, user_conf):
+        if user_conf is not None:
+            self.user_config = ConfigObj(user_conf)
+
+    def _user_config_value(self, key):
+        if self.user_config is not None:
+            try:
+                return self.user_config.get_value(self.section, key)
+            except KeyError:
+                pass
+        return None
+
+    def _get_opt(self, config, key, section=None):
+        """Returns the value for key from config, of None if it is not defined
+        in the file.
+        """
+        if section is None:
+            section = self.section
+        try:
+            return config.get_value(section, key)
+        except KeyError:
+            pass
+        if config.filename is not None:
+            try:
+                config[key]
+                warning(
+                    "'{}' defines a value for '{}', but it is not in a '{}' "
+                    "section, so it is ignored".format(config.filename, key, section)
+                )
+            except KeyError:
+                pass
+        return None
+
+    def _get_best_opt(self, key, trusted=False, section=None):
+        """Returns the value for key, obeying precedence.
+
+        Returns the value for the key from the first file in which it is
+        defined, or None if none of the files define it.
+
+        If trusted is True then the the value will only be taken from a file
+        marked as trusted.
+
+        """
+        if section is None:
+            section = self.section
+        if not trusted:
+            if self._branch_config is not None:
+                value = self._branch_config.get_option(key, section=self.section)
+                if value is not None:
+                    mutter("Using %s for %s, taken from the branch", value, key)
+                    return value
+            if self._tree_config is not None:
+                value = self._tree_config.get_option(key, section=self.section)
+                if value is not None:
+                    mutter("Using %s for %s, taken from the tree", value, key)
+                    return value
+        for config_file in self._config_files:
+            if not trusted or config_file[1]:
+                value = self._get_opt(config_file[0], key, section=section)
+                if value is not None:
+                    mutter(
+                        "Using %s for %s, taken from %s",
+                        value,
+                        key,
+                        config_file[0].filename,
+                    )
+                    return value
+        return None
+
+    def get_hook(self, hook_name):
+        return self._get_best_opt(hook_name, section="HOOKS")
+
+    def _get_bool(self, config, key):
+        try:
+            return True, config.get_bool("BUILDDEB", key)
+        except KeyError:
+            pass
+        if config.filename is not None:
+            try:
+                config.as_bool(key)
+                warning(
+                    "'{}' defines a value for '{}', but it is not in a "
+                    "'BUILDDEB' section, so it is ignored".format(config.filename, key)
+                )
+            except KeyError:
+                pass
+        return False, False
+
+    def _get_best_bool(self, key, trusted=False, default=False):
+        """Returns the value of key, obeying precedence.
+
+        Returns the value for the key from the first file in which it is
+        defined, or default if none of the files define it.
+
+        If trusted is True then the the value will only be taken from a file
+        marked as trusted.
+
+        """
+        if not trusted:
+            if self._branch_config is not None:
+                value = self._branch_config.get_option(key, section=self.section)
+                if value is not None:
+                    mutter("Using %s for %s, taken from the branch", value, key)
+                    return value
+            if self._tree_config is not None:
+                value = self._tree_config.get_option(key, section=self.section)
+                if value is not None:
+                    mutter("Using %s for %s, taken from the tree", value, key)
+                    return value
+        for config_file in self._config_files:
+            if not trusted or config_file[1]:
+                (found, value) = self._get_bool(config_file[0], key)
+                if found:
+                    mutter(
+                        "Using %s for %s, taken from %s",
+                        str(value),
+                        key,
+                        config_file[0].filename,
+                    )
+                    return value
+        return default
+
+    @staticmethod
+    def _opt_property(name: str, help=None, trusted=False) -> property:
+        return property(
+            lambda self: self._get_best_opt(name, trusted), None, None, help
+        )
+
+    @staticmethod
+    def _bool_property(name, help=None, trusted=False, default=False) -> property:
+        return property(
+            lambda self: self._get_best_bool(name, trusted, default), None, None, help
+        )
+
+    build_dir = _opt_property("build-dir", "The dir to build in")
+
+    user_build_dir = property(lambda self: self._user_config_value("build-dir"))
+
+    orig_dir = _opt_property("orig-dir", "The dir to get upstream tarballs from")
+
+    user_orig_dir = property(lambda self: self._user_config_value("orig-dir"))
+
+    builder = _opt_property("builder", "The command to build with", True)
+
+    result_dir = _opt_property("result-dir", "The dir to put the results in")
+
+    user_result_dir = property(lambda self: self._user_config_value("result-dir"))
+
+    merge = _bool_property("merge", "Run in merge mode")
+
+    @property
+    def build_type(self):
+        if self.merge:
+            return BUILD_TYPE_MERGE
+        elif self.native:
+            return BUILD_TYPE_NATIVE
+        elif self.split:
+            return BUILD_TYPE_SPLIT
+        else:
+            return None
+
+    quick_builder = _opt_property(
+        "quick-builder", "A quick command to build with", True
+    )
+
+    native = _bool_property("native", "Build a native package")
+
+    split = _bool_property("split", "Split a full source package")
+
+    upstream_branch = _opt_property(
+        "upstream-branch", "The upstream branch to merge from"
+    )
+
+    export_upstream_revision = _opt_property(
+        "export-upstream-revision", "The revision of the upstream source to use."
+    )
+
+
+def _test():
+    import doctest
+
+    doctest.testmod()
+
+
+if __name__ == "__main__":
+    _test()

=== added file 'breezy/plugins/debian/default.conf'
--- breezy/plugins/debian/default.conf	1970-01-01 00:00:00 +0000
+++ breezy/plugins/debian/default.conf	2024-02-18 23:22:42 +0000
@@ -0,0 +1,6 @@
+[BUILDDEB]
+builder = defaultexport
+result-dir = defaultresult
+build-dir = defaultbuild
+merge = True
+

=== added file 'breezy/plugins/debian/dep3.py'
--- breezy/plugins/debian/dep3.py	1970-01-01 00:00:00 +0000
+++ breezy/plugins/debian/dep3.py	2024-02-18 23:22:42 +0000
@@ -0,0 +1,255 @@
+#    dep3.py -- DEP-3 compatible patch formatting
+#    Copyright (C) 2011 Canonical Ltd.
+#
+#    This file is part of bzr-builddeb.
+#
+#    bzr-builddeb is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    bzr-builddeb is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with bzr-builddeb; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+
+"""DEP-3 style patch formatting."""
+
+import time
+from email.message import Message
+from io import BytesIO
+
+from breezy.foreign import foreign_vcs_registry
+
+from ... import (
+    diff,
+    errors,
+)
+
+
+def write_dep3_bug_line(message, bug_url, status):
+    """Write a DEP-3 compatible line with a bug link.
+
+    :param message: Message object to udpate
+    :param bug_url: Bug URL
+    :param status: Bug status (e.g. "fixed")
+    """
+    # For the moment, we only care about fixed bugs
+    if status != "fixed":
+        return
+    if bug_url.startswith("http://bugs.debian.org/"):
+        message.add_header("Bug-Debian", bug_url)
+    else:
+        # FIXME: Filter out Ubuntu bugs on Launchpad
+        message.add_header("Bug", bug_url)
+
+
+def write_dep3_patch_header(
+    f,
+    description=None,
+    origin=None,
+    forwarded=None,
+    bugs=None,
+    authors=None,
+    revision_id=None,
+    last_update=None,
+    applied_upstream=None,
+):
+    """Write a DEP3 patch header.
+
+    :param f: File-like object to write to
+    :param description: Description of the patch
+    :param origin: Single line describing the origin of the patch
+    :param forwarded: Single line describing whether and how the patch was
+        forwarded
+    :param bugs: Set of bugs fixed in this patch
+    :param authors: Authors of the patch
+    :param revision_id: Relevant bzr revision id
+    :param last_update: Last update timestamp
+    :param applied_upstream: If the patch is applied upstream,
+        an informal string describing where it was merged
+    """
+    header = Message()
+    if description is not None:
+        description = description.strip("\n")
+        description = description.replace("\n\n", "\n.\n")
+        description = description.replace("\n", "\n ")
+        header["Description"] = description
+    if origin is not None:
+        header.add_header("Origin", origin)
+    if forwarded is not None:
+        header.add_header("Forwarded", forwarded)
+    if authors is not None:
+        for author in authors:
+            header.add_header("Author", author)
+    if bugs is not None:
+        for bug_url, status in bugs:
+            write_dep3_bug_line(header, bug_url, status)
+    if last_update is not None:
+        header.add_header(
+            "Last-Update", time.strftime("%Y-%m-%d", time.gmtime(last_update))
+        )
+    if applied_upstream is not None:
+        header.add_header("Applied-Upstream", applied_upstream)
+    if revision_id is not None:
+        try:
+            (foreign_revid, mapping) = foreign_vcs_registry.parse_revision_id(
+                revision_id
+            )
+        except errors.InvalidRevisionId:
+            header.add_header("X-Bzr-Revision-Id", revision_id.decode("utf-8"))
+        else:
+            if mapping.vcs.abbreviation == "git":
+                header.add_header("X-Git-Commit", foreign_revid.decode("utf-8"))
+    f.write(str(header))
+
+
+def gather_bugs_and_authors(repository, interesting_revision_ids):
+    """Gather bug and author information from revisions.
+
+    :param interesting_revision_ids: Iterable of revision ids to check
+    :return: Tuple of bugs, authors and highest found commit timestamp
+    """
+    authors = set()
+    bugs = set()
+    last_update = -0.0
+    for rev in repository.get_revisions(interesting_revision_ids):
+        last_update = max(rev.timestamp, last_update)
+        authors.update(rev.get_apparent_authors())
+        from breezy.revision import iter_bugs
+
+        extra_bugs = iter_bugs(rev)
+        bugs.update(extra_bugs)
+    if last_update == -0.0:
+        last_update = None
+    return (bugs, authors, last_update)
+
+
+def determine_applied_upstream(upstream_branch, feature_branch, feature_revid=None):
+    """Check if a particular revision has been merged upstream.
+
+    :param upstream_branch: Upstream branch object
+    :param feature_branch: Feature branch
+    :param feature_revid: Revision id in feature branch to check,
+        defaults to feature_branch tip.
+    :return: String that can be used for Applied-Upstream field
+    """
+    if feature_revid is None:
+        feature_revid = feature_branch.last_revision()
+    upstream_graph = feature_branch.repository.get_graph(upstream_branch.repository)
+    merger = upstream_graph.find_lefthand_merger(
+        feature_revid, upstream_branch.last_revision()
+    )
+    if merger is not None:
+        try:
+            (foreign_revid, mapping) = foreign_vcs_registry.parse_revision_id(merger)
+        except errors.InvalidRevisionId:
+            pass
+        else:
+            if mapping.vcs.abbreviation == "git":
+                return "merged in commit {}".format(foreign_revid.decode("ascii")[:7])
+        return "merged in revision {}".format(
+            ".".join(
+                str(x) for x in upstream_branch.revision_id_to_dotted_revno(merger)
+            )
+        )
+    else:
+        return "no"
+
+
+def determine_forwarded(upstream_branch, feature_branch, feature_revid):
+    """See if a branch has been forwarded to upstream.
+
+    :param upstream_branch: Upstream branch object
+    :param feature_branch: Feature branch
+    :param feature_revid: Revision id in feature branch to check
+    :return: String that can be used for Applied-Upstream field
+    """
+    # FIXME: Check for Launchpad merge proposals from feature_branch (or its
+    # public_branch) to upstream_branch
+
+    # Are there any other ways to see that a patch has been forwarded upstream?
+    return None
+
+
+def describe_origin(branch, revid):
+    """Describe a tree for use in the origin field.
+
+    :param branch: Branch to retrieve the revision from
+    :param revid: Revision id
+    """
+    public_branch_url = branch.get_public_branch()
+    if public_branch_url is not None:
+        try:
+            (foreign_revid, mapping) = foreign_vcs_registry.parse_revision_id(revid)
+        except errors.InvalidRevisionId:
+            pass
+        else:
+            if mapping.vcs.abbreviation == "git":
+                return "commit, {}, commit: {}".format(
+                    public_branch_url, foreign_revid.decode("ascii")[:7]
+                )
+        return "commit, {}, revision: {}".format(
+            public_branch_url,
+            ".".join(str(x) for x in branch.revision_id_to_dotted_revno(revid)),
+        )
+    else:
+        try:
+            (foreign_revid, mapping) = foreign_vcs_registry.parse_revision_id(revid)
+        except errors.InvalidRevisionId:
+            pass
+        else:
+            if mapping.vcs.abbreviation == "git":
+                return "commit: {}".format(foreign_revid.decode("ascii")[:7])
+        return "commit, revision id: %s" % revid.decode("utf-8")
+
+
+def write_dep3_patch(
+    f,
+    branch,
+    base_revid,
+    target_revid,
+    description=None,
+    origin=None,
+    forwarded=None,
+    applied_upstream=None,
+    bugs=None,
+    authors=None,
+    last_update=None,
+):
+    """Write a DEP-3 compliant patch.
+
+    :param f: File-like object to write to
+    :param repository: Repository to retrieve revisions from
+    :param base_revid: Base revision id
+    :param target_revid: Target revision id
+    :param description: Optional description
+    :param forwarded: Optional information on if/how the patch was forwarded
+    :param applied_upstream: Optional information on how whether the patch
+        was merged upstream
+    :param bugs: Sequence of bug reports related to this patch
+    :param authors: Sequence of authors of this patch
+    :param last_update: Timestamp for last time this patch was updated
+    """
+    write_dep3_patch_header(
+        f,
+        bugs=bugs,
+        authors=authors,
+        last_update=last_update,
+        description=description,
+        revision_id=target_revid,
+        origin=origin,
+        applied_upstream=applied_upstream,
+        forwarded=forwarded,
+    )
+    old_tree = branch.repository.revision_tree(base_revid)
+    new_tree = branch.repository.revision_tree(target_revid)
+    bf = BytesIO()
+    diff.show_diff_trees(old_tree, new_tree, bf, old_label="old/", new_label="new/")
+    # TODO(jelmer)
+    f.write(bf.getvalue().decode("utf-8"))

=== added file 'breezy/plugins/debian/directory.py'
--- breezy/plugins/debian/directory.py	1970-01-01 00:00:00 +0000
+++ breezy/plugins/debian/directory.py	2024-02-18 23:22:42 +0000
@@ -0,0 +1,266 @@
+#    directory.py -- Directory service that uses Debian Vcs-* fields
+#    Copyright (C) 2008 Jelmer Vernooij <[e-mail]>
+#
+#    This file is part of bzr-builddeb.
+#
+#    bzr-builddeb is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    bzr-builddeb is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with bzr-builddeb; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+
+from debian.changelog import Version
+from debian.deb822 import Deb822
+from debmutate.vcs import source_package_vcs, split_vcs_url
+
+from ... import urlutils
+from ...directory_service import directories
+from ...errors import DependencyNotPresent
+from ...trace import note, warning
+
+
+def fixup_broken_git_url(url):
+    """Attempt to fix up broken Git URLs.
+
+    A common misspelling is to add an extra ":" after the hostname
+    """
+    (scheme, netloc, path, params, query, fragment) = urlutils.urlparse.urlparse(
+        url, allow_fragments=False
+    )
+    if "@" in netloc:
+        credentials, host = netloc.rsplit("@", 1)
+    else:
+        credentials = None
+        host = netloc
+
+    if ":" in host and not (host[0] == "[" and host[-1] == "]"):
+        # there *is* port
+        host, port = host.rsplit(":", 1)
+        if not port or port.isdigit():
+            return url
+    else:
+        port = None
+
+    if host in ("salsa.debian.org", "github.com"):