Breezy

Merge lp:~gz/brz/unmapped_extra into lp:brz

  1. unmapped_extra
  2. Merge into trunk
Proposed by Martin Packman
Status: Merged
Approved by: Martin Packman
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~gz/brz/unmapped_extra
Merge into: lp:brz
Diff against target: 118 lines (+9/-10)
6 files modified
breezy/btree_index.py (+1/-2)
breezy/groupcompress.py (+3/-1)
breezy/log.py (+1/-2)
breezy/plugins/changelog_merge/changelog_merge.py (+0/-2)
breezy/repofmt/knitpack_repo.py (+3/-2)
breezy/versionedfile.py (+1/-1)
To merge this branch: bzr merge lp:~gz/brz/unmapped_extra
Reviewer Review Type Date Requested Status
Martin Packman Approve
Review via email: mp+324580@code.launchpad.net

This proposal supersedes a proposal from 2017-05-25.

Commit message

Followup change from using future_builtins to importing via sixish

Description of the change

Bot cunningly didn't land unapproved changes from unmapped branch. But I wanted these changes. :)

Updated proposal avoiding criss-cross merge conflict.

To post a comment you must log in.
Revision history for this message
Martin Packman (gz) wrote : Posted in a previous version of this proposal

Self approving as simple tweaks.

review: Approve
Revision history for this message
The Breezy Bot (the-breezy-bot) wrote : Posted in a previous version of this proposal

Running landing tests failed
http://10.242.247.184:8080/job/brz-dev/8/

Revision history for this message
Martin Packman (gz) wrote :

Trying again.

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

Running landing tests failed
http://10.242.247.184:8080/job/brz-dev/10/

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

Running landing tests failed
http://10.242.247.184:8080/job/brz-dev/11/

Revision history for this message
Martin Packman (gz) wrote :

Had misresolved a conflict in versionedfile, now fixed.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'breezy/btree_index.py'
--- breezy/btree_index.py 2017-05-24 19:44:00 +0000
+++ breezy/btree_index.py 2017-05-25 21:59:40 +0000
@@ -19,8 +19,6 @@
1919
20from __future__ import absolute_import20from __future__ import absolute_import
2121
22from future_builtins import map
23
24from .lazy_import import lazy_import22from .lazy_import import lazy_import
25lazy_import(globals(), """23lazy_import(globals(), """
26import bisect24import bisect
@@ -44,6 +42,7 @@
44from .index import _OPTION_NODE_REFS, _OPTION_KEY_ELEMENTS, _OPTION_LEN42from .index import _OPTION_NODE_REFS, _OPTION_KEY_ELEMENTS, _OPTION_LEN
45from .sixish import (43from .sixish import (
46 BytesIO,44 BytesIO,
45 map,
47 )46 )
4847
4948
5049
=== modified file 'breezy/groupcompress.py'
--- breezy/groupcompress.py 2017-05-24 19:44:00 +0000
+++ breezy/groupcompress.py 2017-05-25 21:59:40 +0000
@@ -18,7 +18,6 @@
1818
19from __future__ import absolute_import19from __future__ import absolute_import
2020
21from future_builtins import map
22import time21import time
23import zlib22import zlib
2423
@@ -43,6 +42,9 @@
4342
44from .btree_index import BTreeBuilder43from .btree_index import BTreeBuilder
45from .lru_cache import LRUSizeCache44from .lru_cache import LRUSizeCache
45from .sixish import (
46 map,
47 )
46from .versionedfile import (48from .versionedfile import (
47 _KeyRefs,49 _KeyRefs,
48 adapter_registry,50 adapter_registry,
4951
=== modified file 'breezy/log.py'
--- breezy/log.py 2017-05-24 20:47:30 +0000
+++ breezy/log.py 2017-05-25 21:59:40 +0000
@@ -51,7 +51,6 @@
5151
52import codecs52import codecs
53import itertools53import itertools
54from future_builtins import zip
55import re54import re
56import sys55import sys
57from warnings import (56from warnings import (
@@ -88,7 +87,7 @@
88 )87 )
89from breezy.sixish import (88from breezy.sixish import (
90 BytesIO,89 BytesIO,
91 PY3,90 zip,
92 )91 )
9392
9493
9594
=== modified file 'breezy/plugins/changelog_merge/changelog_merge.py'
--- breezy/plugins/changelog_merge/changelog_merge.py 2017-05-24 19:44:00 +0000
+++ breezy/plugins/changelog_merge/changelog_merge.py 2017-05-25 21:59:40 +0000
@@ -18,8 +18,6 @@
1818
19from __future__ import absolute_import19from __future__ import absolute_import
2020
21from future_builtins import map
22
23import difflib21import difflib
2422
25from ... import (23from ... import (
2624
=== modified file 'breezy/repofmt/knitpack_repo.py'
--- breezy/repofmt/knitpack_repo.py 2017-05-24 16:21:50 +0000
+++ breezy/repofmt/knitpack_repo.py 2017-05-25 21:59:40 +0000
@@ -18,8 +18,6 @@
1818
19from __future__ import absolute_import19from __future__ import absolute_import
2020
21from future_builtins import zip
22
23from ..lazy_import import lazy_import21from ..lazy_import import lazy_import
24lazy_import(globals(), """22lazy_import(globals(), """
25import time23import time
@@ -69,6 +67,9 @@
69 PackRootCommitBuilder,67 PackRootCommitBuilder,
70 RepositoryPackCollection,68 RepositoryPackCollection,
71 )69 )
70from ..sixish import (
71 zip
72 )
72from ..vf_repository import (73from ..vf_repository import (
73 StreamSource,74 StreamSource,
74 )75 )
7576
=== modified file 'breezy/versionedfile.py'
--- breezy/versionedfile.py 2017-05-24 19:44:00 +0000
+++ breezy/versionedfile.py 2017-05-25 21:59:40 +0000
@@ -19,7 +19,6 @@
19from __future__ import absolute_import19from __future__ import absolute_import
2020
21from copy import copy21from copy import copy
22from future_builtins import zip
23import itertools22import itertools
24import os23import os
25import struct24import struct
@@ -45,6 +44,7 @@
45from .registry import Registry44from .registry import Registry
46from .sixish import (45from .sixish import (
47 BytesIO,46 BytesIO,
47 zip,
48 )48 )
49from .textmerge import TextMerge49from .textmerge import TextMerge
5050

Subscribers

People subscribed via source and target branches