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

Proposed by Martin Packman
Status: Superseded
Proposed branch: lp:~gz/brz/unmapped
Merge into: lp:brz
Diff against target: 93 lines (+12/-4) (has conflicts)
5 files modified
breezy/btree_index.py (+1/-0)
breezy/groupcompress.py (+3/-0)
breezy/log.py (+1/-2)
breezy/repofmt/knitpack_repo.py (+3/-2)
breezy/versionedfile.py (+4/-0)
Text conflict in breezy/versionedfile.py
To merge this branch: bzr merge lp:~gz/brz/unmapped
Reviewer Review Type Date Requested Status
Martin Packman Approve
Review via email: mp+324579@code.launchpad.net

This proposal has been superseded by 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. :)

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

Self approving as simple tweaks.

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/8/

Unmerged revisions

6636. By Martin Packman

Remove direct future_builtins map imports

6635. By Martin Packman

Merge updates from izip branch

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/btree_index.py'
2--- breezy/btree_index.py 2017-05-24 19:44:00 +0000
3+++ breezy/btree_index.py 2017-05-25 00:22:07 +0000
4@@ -44,6 +44,7 @@
5 from .index import _OPTION_NODE_REFS, _OPTION_KEY_ELEMENTS, _OPTION_LEN
6 from .sixish import (
7 BytesIO,
8+ map,
9 )
10
11
12
13=== modified file 'breezy/groupcompress.py'
14--- breezy/groupcompress.py 2017-05-24 19:44:00 +0000
15+++ breezy/groupcompress.py 2017-05-25 00:22:07 +0000
16@@ -43,6 +43,9 @@
17
18 from .btree_index import BTreeBuilder
19 from .lru_cache import LRUSizeCache
20+from .sixish import (
21+ map,
22+ )
23 from .versionedfile import (
24 _KeyRefs,
25 adapter_registry,
26
27=== modified file 'breezy/log.py'
28--- breezy/log.py 2017-05-24 16:21:50 +0000
29+++ breezy/log.py 2017-05-25 00:22:07 +0000
30@@ -51,7 +51,6 @@
31
32 import codecs
33 import itertools
34-from future_builtins import zip
35 import re
36 import sys
37 from warnings import (
38@@ -88,7 +87,7 @@
39 )
40 from breezy.sixish import (
41 BytesIO,
42- PY3,
43+ zip,
44 )
45
46
47
48=== modified file 'breezy/plugins/changelog_merge/changelog_merge.py'
49=== modified file 'breezy/repofmt/knitpack_repo.py'
50--- breezy/repofmt/knitpack_repo.py 2017-05-24 16:21:50 +0000
51+++ breezy/repofmt/knitpack_repo.py 2017-05-25 00:22:07 +0000
52@@ -18,8 +18,6 @@
53
54 from __future__ import absolute_import
55
56-from future_builtins import zip
57-
58 from ..lazy_import import lazy_import
59 lazy_import(globals(), """
60 import time
61@@ -69,6 +67,9 @@
62 PackRootCommitBuilder,
63 RepositoryPackCollection,
64 )
65+from ..sixish import (
66+ zip
67+ )
68 from ..vf_repository import (
69 StreamSource,
70 )
71
72=== modified file 'breezy/versionedfile.py'
73--- breezy/versionedfile.py 2017-05-24 19:44:00 +0000
74+++ breezy/versionedfile.py 2017-05-25 00:22:07 +0000
75@@ -19,8 +19,11 @@
76 from __future__ import absolute_import
77
78 from copy import copy
79+<<<<<<< TREE
80 from future_builtins import zip
81 import itertools
82+=======
83+>>>>>>> MERGE-SOURCE
84 import os
85 import struct
86 from zlib import adler32
87@@ -45,6 +48,7 @@
88 from .registry import Registry
89 from .sixish import (
90 BytesIO,
91+ zip,
92 )
93 from .textmerge import TextMerge
94

Subscribers

People subscribed via source and target branches