Merge lp://qastaging/~jelmer/brz/move-timestamp into lp://qastaging/brz/3.3

Proposed by Jelmer Vernooij
Status: Needs review
Proposed branch: lp://qastaging/~jelmer/brz/move-timestamp
Merge into: lp://qastaging/brz/3.3
Diff against target: 596 lines (+174/-168)
13 files modified
breezy/builtins.py (+1/-1)
breezy/bzr/bundle/bundle_data.py (+4/-2)
breezy/bzr/bundle/serializer/__init__.py (+0/-2)
breezy/bzr/bundle/serializer/v08.py (+3/-3)
breezy/bzr/tests/__init__.py (+1/-0)
breezy/bzr/tests/test_timestamp.py (+1/-82)
breezy/bzr/timestamp.py (+15/-69)
breezy/diff.py (+2/-2)
breezy/merge_directive.py (+4/-3)
breezy/patches.py (+54/-0)
breezy/tests/__init__.py (+1/-2)
breezy/tests/test_patches.py (+86/-0)
breezy/tests/test_selftest.py (+2/-2)
To merge this branch: bzr merge lp://qastaging/~jelmer/brz/move-timestamp
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+435131@code.qastaging.launchpad.net

Commit message

Move timestamp to breezy.bzr.

Description of the change

Move timestamp to breezy.bzr.

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

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

Collecting setuptools-gettext
  Downloading setuptools_gettext-0.1.1-py3-none-any.whl (10 kB)
Requirement already satisfied: setuptools>=46.1 in ./lib/python3.11/site-packages (from setuptools-gettext) (65.6.3)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.1
Obtaining file:///tmp/tarmac/branch.nag7lty4
  Installing build dependencies: started
  Installing build dependencies: finished with status 'done'
  Checking if build backend supports build_editable: started
  Checking if build backend supports build_editable: finished with status 'done'
  Getting requirements to build editable: started
  Getting requirements to build editable: finished with status 'done'
  Preparing editable metadata (pyproject.toml): started
  Preparing editable metadata (pyproject.toml): finished with status 'done'
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (1.26.12)
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (0.0.8)
Requirement already satisfied: configobj in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (5.1.0.dev0)
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (0.2.3)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (6.0)
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (0.0.12)
Requirement already satisfied: dulwich>=0.20.46 in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (0.20.50)
Requirement already satisfied: launchpadlib>=1.6.3 in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (1.10.17)
Collecting fastimport
  Downloading fastimport-0.9.14.tar.gz (41 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 41.8/41.8 kB 1.2 MB/s eta 0:00:00
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Collecting python-subunit
  Downloading python_subunit-1.4.2-py3-none-any.whl (106 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 106.8/106.8 kB 3.4 MB/s eta 0:00:00
Collecting testtools
  Downloading testtools-2.5.0-py3-none-any.whl (181 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 182.0/182.0 kB 6.3 MB/s eta 0:00:00
Collecting testscenarios
  Downloading testscenarios-0.5.0-py2.py3-none-any.whl (21 kB)
Requirement already satisfied: flake8 in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (5.0.4)
Requirement already satisfied: paramiko in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (2.12.0)
Requirement already satisfied: gpg in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (1.18.0)
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 sphinx
  Downloading sphinx-6.0.0-py3-none-any.whl (3.0 MB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 3.0/3.0 MB 10.1 MB/s eta...

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

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

Collecting setuptools-gettext
  Downloading setuptools_gettext-0.1.1-py3-none-any.whl (10 kB)
Requirement already satisfied: setuptools>=46.1 in ./lib/python3.11/site-packages (from setuptools-gettext) (65.6.3)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.1
Obtaining file:///tmp/tarmac/branch.3lgeg95e
  Installing build dependencies: started
  Installing build dependencies: finished with status 'done'
  Checking if build backend supports build_editable: started
  Checking if build backend supports build_editable: finished with status 'done'
  Getting requirements to build editable: started
  Getting requirements to build editable: finished with status 'done'
  Preparing editable metadata (pyproject.toml): started
  Preparing editable metadata (pyproject.toml): finished with status 'done'
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (1.26.12)
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (0.0.8)
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (0.0.12)
Requirement already satisfied: configobj in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (5.1.0.dev0)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (6.0)
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (0.2.3)
Requirement already satisfied: dulwich>=0.20.46 in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (0.20.50)
Requirement already satisfied: launchpadlib>=1.6.3 in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (1.10.17)
Requirement already satisfied: paramiko in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (2.12.0)
Requirement already satisfied: flake8 in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (5.0.4)
Collecting testscenarios
  Downloading testscenarios-0.5.0-py2.py3-none-any.whl (21 kB)
Collecting testtools
  Downloading testtools-2.5.0-py3-none-any.whl (181 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 182.0/182.0 kB 6.5 MB/s eta 0:00:00
Collecting python-subunit
  Downloading python_subunit-1.4.2-py3-none-any.whl (106 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 106.8/106.8 kB 4.6 MB/s eta 0:00:00
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: gpg in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (1.18.0)
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 docutils
  Downloading docutils-0.19-py3-none-any.whl (570 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 570.5/570.5 kB 8.8 MB/...

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

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

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

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

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

Collecting setuptools-gettext
  Downloading setuptools_gettext-0.1.1-py3-none-any.whl (10 kB)
Requirement already satisfied: setuptools>=46.1 in ./lib/python3.11/site-packages (from setuptools-gettext) (65.6.3)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.1
Obtaining file:///tmp/tarmac/branch.nweo36iw
  Installing build dependencies: started
  Installing build dependencies: finished with status 'done'
  Checking if build backend supports build_editable: started
  Checking if build backend supports build_editable: finished with status 'done'
  Getting requirements to build editable: started
  Getting requirements to build editable: finished with status 'done'
  Preparing editable metadata (pyproject.toml): started
  Preparing editable metadata (pyproject.toml): finished with status 'done'
Requirement already satisfied: dulwich>=0.20.47 in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (0.20.50)
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (0.0.8)
Requirement already satisfied: configobj in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (5.1.0.dev0)
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (1.26.12)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (6.0)
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (0.0.12)
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (0.2.3)
Requirement already satisfied: paramiko in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (2.12.0)
Collecting sphinx
  Downloading sphinx-6.0.0-py3-none-any.whl (3.0 MB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 3.0/3.0 MB 9.5 MB/s eta 0:00:00
Collecting docutils
  Downloading docutils-0.19-py3-none-any.whl (570 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 570.5/570.5 kB 9.2 MB/s eta 0:00:00
Requirement already satisfied: setuptools in ./lib/python3.11/site-packages (from breezy==3.3.2.dev0) (65.6.3)
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 3.4 MB/s eta 0:00:00
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Requirement already satisfied: gpg in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (1.18.0)
Collecting testtools
  Downloading testtools-2.5.0-py3-none-any.whl (181 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 182.0/182.0 kB 7.7 MB/s eta 0:00:00
Requirement already satisfied: flake8 in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (5.0.4)
Collecting testscenarios
  Downloading testscenarios-0.5.0-py2.py3-none-any.whl (21 kB)
Collecting pyth...

Unmerged revisions

7769. By Jelmer Vernooij

Move patch date functions.

7768. By Jelmer Vernooij

Fix imports.

7767. By Jelmer Vernooij

Fix typing.

7766. By Jelmer Vernooij

Move timestamp to breezy.bzr.

Preview Diff

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

Subscribers

People subscribed via source and target branches