1
=== modified file 'byov.conf'
2
--- byov.conf	2018-10-10 22:35:39 +0000
3
+++ byov.conf	2020-11-28 13:33:24 +0000
4
@@ -3,19 +3,22 @@
5
3
# Start with an up to date system by default
3
# Start with an up to date system by default
6
4
vm.update = True
4
vm.update = True
7
5
# External sources dependencies, packages are not recent enough
5
# External sources dependencies, packages are not recent enough
11
6
dulwich.clone = (git clone git://jelmer.uk/dulwich ../dulwich.git)
6
dulwich.clone = (git clone git://jelmer.uk/dulwich -b 0.19 ../dulwich-0.19.git)
12
7
dulwich.install = (cd ../dulwich.git && ./setup.py install --user)
7
dulwich.clone3 = (git clone git://jelmer.uk/dulwich ../dulwich.git)
13
8
dulwich3.install = (cd ../dulwich.git && python3 ./setup.py install --user)
8
dulwich.install = (cd ../dulwich-0.19.git && ./setup.py install --user)
14
9
dulwich.install3 = (cd ../dulwich.git && python3 ./setup.py install --user)
15
10
cython.install = (pip install cython)
16
11
cython.install3 = (pip3 install cython)
17
12
patiencediff.install = (pip install patiencediff)
18
13
patiencediff3.install = (pip3 install patiencediff)
19
14
debmutate3.install = (pip3 install debmutate)
20
9
15
21
10
[brz-plugin-debian]
16
[brz-plugin-debian]
24
11
vm.release = xenial
17
vm.release = fossa
25
12
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
18
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, python-fastimport, python-dulwich, python3-setuptools, python-setuptools, python-pip, python3-pip
26
13
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
19
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
27
14
vm.packages = {brz.build_deps}, {debian.build_deps}, {debian.test_deps}, bzr, python-debian, python-junitxml
20
vm.packages = {brz.build_deps}, {debian.build_deps}, {debian.test_deps}, bzr, python-debian, python-junitxml
29
15
brz.branch = (bzr branch lp:brz ../brz-trunk)
21
brz.branch = (bzr branch lp:brz/3.1 ../brz-trunk)
30
16
brz.make = (cd ../brz-trunk && make)
22
brz.make = (cd ../brz-trunk && make)
35
17
byoci.setup.command = ({dulwich.clone} && {dulwich.install} && {brz.branch} && {brz.make})
23
byoci.setup.command = ({dulwich.clone} && {dulwich.install} && {dulwich.clone3} && {dulwich.install3} && {cython.install} && {cython.install3} && {patiencediff.install} && {patiencediff3.install} && {debmutate3.install} && {brz.branch} && {brz.make})
32
18
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)"
33
19
[brz-plugin-debian-py3]
34
20
byoci.setup.command = ({dulwich.clone} && {dulwich3.install} && {brz.branch} && {brz.make})
36
21
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)"
24
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)"
37
22
25
38
=== modified file 'bzrtools_import.py'
39
--- bzrtools_import.py	2020-11-21 03:31:58 +0000
40
+++ bzrtools_import.py	2020-11-28 13:33:24 +0000
41
@@ -5,11 +5,7 @@
42
5
5
43
6
from __future__ import absolute_import
6
from __future__ import absolute_import
44
7
7
45
8
import errno
46
9
import os
47
10
from io import BytesIO
8
from io import BytesIO
48
11
import tarfile
49
12
from typing import BinaryIO, Optional
50
13
9
51
14
from ...upstream_import import (
10
from ...upstream_import import (
52
15
    add_implied_parents,
11
    add_implied_parents,
53
@@ -36,8 +32,6 @@
54
36
from ...trace import warning
32
from ...trace import warning
55
37
from ...tree import Tree
33
from ...tree import Tree
56
38
from ...transform import resolve_conflicts
34
from ...transform import resolve_conflicts
57
39
from ...transport import get_transport
58
40
from ...workingtree import WorkingTree
59
41
35
60
42
36
61
43
class UnknownType(BzrError):
37
class UnknownType(BzrError):
62
@@ -80,7 +74,7 @@
63
80
74
64
81
75
65
82
def _get_paths_to_process(
76
def _get_paths_to_process(
67
83
        archive_file: str, prefix: Optional[str],
77
        archive_file: str, prefix,
68
84
        implied_parents, exclude=None):
78
        implied_parents, exclude=None):
69
85
    to_process = set()
79
    to_process = set()
70
86
    for member in archive_file.getmembers():
80
    for member in archive_file.getmembers():
71
@@ -106,7 +100,7 @@
72
106
100
73
107
def _import_archive(
101
def _import_archive(
74
108
        tree: Tree, archive_file: str, file_ids_from,
102
        tree: Tree, archive_file: str, file_ids_from,
76
109
        target_tree: Optional[Tree] = None, exclude=None):
103
        target_tree = None, exclude=None):
77
110
    prefix = common_directory(names_of_files(archive_file))
104
    prefix = common_directory(names_of_files(archive_file))
78
111
    try:
105
    try:
79
112
        transform = tree.transform
106
        transform = tree.transform
80
113
107
81
=== modified file 'cmds.py'
82
--- cmds.py	2020-11-21 03:31:58 +0000
83
+++ cmds.py	2020-11-28 13:33:24 +0000
84
@@ -26,7 +26,6 @@
85
26
import os
26
import os
86
27
import shutil
27
import shutil
87
28
import tempfile
28
import tempfile
88
29
from typing import Optional
89
30
29
90
31
from ... import (
30
from ... import (
91
32
    urlutils,
31
    urlutils,
92
@@ -760,15 +759,15 @@
93
760
                    'merge had completed failed. Add the new changelog '
759
                    'merge had completed failed. Add the new changelog '
94
761
                    'entry yourself, review the merge, and then commit.')
760
                    'entry yourself, review the merge, and then commit.')
95
762
761
105
763
    def run(self, location: Optional[str] = None,
762
    def run(self, location=None,
106
764
            upstream_branch: Optional[str] = None,
763
            upstream_branch=None,
107
765
            version: Optional[str] = None,
764
            version=None,
108
766
            distribution: Optional[str] = None, package: Optional[str] = None,
765
            distribution=None, package=None,
109
767
            directory: str = ".", revision=None, merge_type=None,
766
            directory=".", revision=None, merge_type=None,
110
768
            last_version: Optional[str] = None,
767
            last_version=None,
111
769
            force: Optional[bool] = None, snapshot: bool = False,
768
            force=None, snapshot=False,
112
770
            launchpad: bool = False, force_pristine_tar: bool = False,
769
            launchpad=False, force_pristine_tar=False,
113
771
            dist_command: Optional[str] = None):
770
            dist_command=None):
114
772
        from debian.changelog import Version
771
        from debian.changelog import Version
115
773
772
116
774
        from .hooks import run_hook
773
        from .hooks import run_hook
Status:	Needs review
Proposed branch:	lp:~jelmer/brz-debian/setup
Merge into:	lp:brz-debian
Diff against target:	116 lines (+24/-28) 3 files modified byov.conf (+13/-10) bzrtools_import.py (+2/-8) cmds.py (+9/-10)
To merge this branch:	bzr merge lp:~jelmer/brz-debian/setup
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Jelmer Vernooij			Approve on 2020-11-28
Review via email: mp+394601@code.launchpad.net