Merge lp:~mbp/bzr/715000-more-fallbacks into lp:bzr
- 715000-more-fallbacks
- Merge into bzr.dev
Status: | Superseded |
---|---|
Proposed branch: | lp:~mbp/bzr/715000-more-fallbacks |
Merge into: | lp:bzr |
Prerequisite: | lp:bzr/2.2 |
Diff against target: |
417 lines (+98/-111) 8 files modified
bzr (+0/-4) bzrlib/__init__.py (+0/-4) bzrlib/groupcompress.py (+5/-5) bzrlib/knit.py (+13/-13) bzrlib/tests/per_repository_reference/test_graph.py (+1/-1) bzrlib/versionedfile.py (+6/-5) doc/en/release-notes/bzr-2.2.txt (+73/-3) doc/en/release-notes/bzr-2.3.txt (+0/-76) |
To merge this branch: | bzr merge lp:~mbp/bzr/715000-more-fallbacks |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
bzr-core | Pending | ||
Review via email: mp+49027@code.launchpad.net |
This proposal supersedes a proposal from 2011-02-09.
This proposal has been superseded by a proposal from 2011-02-09.
Commit message
Description of the change
follow-through from bug 715000: rename _fallback_vfs to _immediate_
John A Meinel (jameinel) wrote : Posted in a previous version of this proposal | # |
John A Meinel (jameinel) wrote : Posted in a previous version of this proposal | # |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 2/9/2011 2:09 AM, Martin Pool wrote:
> Martin Pool has proposed merging lp:~mbp/bzr/715000-more-fallbacks into lp:bzr/2.2.
>
> Requested reviews:
> bzr-core (bzr-core)
>
> For more details, see:
> https:/
>
> follow-through from bug 715000: rename _fallback_vfs to _immediate_
I don't really like changing the name of things in a stable series. Do
you feel this is really necessary?
review: needs_information
John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://
iEYEARECAAYFAk1
1UMAoKDzNFENu71
=F4wU
-----END PGP SIGNATURE-----
Preview Diff
1 | === modified file 'bzr' | |||
2 | --- bzr 2011-02-09 08:12:22 +0000 | |||
3 | +++ bzr 2011-02-08 13:56:49 +0000 | |||
4 | @@ -23,11 +23,7 @@ | |||
5 | 23 | import warnings | 23 | import warnings |
6 | 24 | 24 | ||
7 | 25 | # update this on each release | 25 | # update this on each release |
8 | 26 | <<<<<<< TREE | ||
9 | 27 | _script_version = (2, 4, 0) | 26 | _script_version = (2, 4, 0) |
10 | 28 | ======= | ||
11 | 29 | _script_version = (2, 2, 5) | ||
12 | 30 | >>>>>>> MERGE-SOURCE | ||
13 | 31 | 27 | ||
14 | 32 | try: | 28 | try: |
15 | 33 | version_info = sys.version_info | 29 | version_info = sys.version_info |
16 | 34 | 30 | ||
17 | === modified file 'bzrlib/__init__.py' | |||
18 | --- bzrlib/__init__.py 2011-02-09 08:12:22 +0000 | |||
19 | +++ bzrlib/__init__.py 2011-02-08 13:56:49 +0000 | |||
20 | @@ -52,11 +52,7 @@ | |||
21 | 52 | # Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a | 52 | # Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a |
22 | 53 | # releaselevel of 'dev' for unreleased under-development code. | 53 | # releaselevel of 'dev' for unreleased under-development code. |
23 | 54 | 54 | ||
24 | 55 | <<<<<<< TREE | ||
25 | 56 | version_info = (2, 4, 0, 'dev', 1) | 55 | version_info = (2, 4, 0, 'dev', 1) |
26 | 57 | ======= | ||
27 | 58 | version_info = (2, 2, 5, 'dev', 0) | ||
28 | 59 | >>>>>>> MERGE-SOURCE | ||
29 | 60 | 56 | ||
30 | 61 | # API compatibility version | 57 | # API compatibility version |
31 | 62 | api_minimum_version = (2, 4, 0) | 58 | api_minimum_version = (2, 4, 0) |
32 | 63 | 59 | ||
33 | === modified file 'bzrlib/groupcompress.py' | |||
34 | --- bzrlib/groupcompress.py 2011-02-09 08:12:22 +0000 | |||
35 | +++ bzrlib/groupcompress.py 2011-02-09 08:12:22 +0000 | |||
36 | @@ -1186,7 +1186,7 @@ | |||
37 | 1186 | _unadded_refs = {} | 1186 | _unadded_refs = {} |
38 | 1187 | self._unadded_refs = _unadded_refs | 1187 | self._unadded_refs = _unadded_refs |
39 | 1188 | self._group_cache = LRUSizeCache(max_size=50*1024*1024) | 1188 | self._group_cache = LRUSizeCache(max_size=50*1024*1024) |
41 | 1189 | self._fallback_vfs = [] | 1189 | self._immediate_fallbacks = [] |
42 | 1190 | 1190 | ||
43 | 1191 | def without_fallbacks(self): | 1191 | def without_fallbacks(self): |
44 | 1192 | """Return a clone of this object without any fallbacks configured.""" | 1192 | """Return a clone of this object without any fallbacks configured.""" |
45 | @@ -1266,7 +1266,7 @@ | |||
46 | 1266 | 1266 | ||
47 | 1267 | :param a_versioned_files: A VersionedFiles object. | 1267 | :param a_versioned_files: A VersionedFiles object. |
48 | 1268 | """ | 1268 | """ |
50 | 1269 | self._fallback_vfs.append(a_versioned_files) | 1269 | self._immediate_fallbacks.append(a_versioned_files) |
51 | 1270 | 1270 | ||
52 | 1271 | def annotate(self, key): | 1271 | def annotate(self, key): |
53 | 1272 | """See VersionedFiles.annotate.""" | 1272 | """See VersionedFiles.annotate.""" |
54 | @@ -1342,7 +1342,7 @@ | |||
55 | 1342 | and so on. | 1342 | and so on. |
56 | 1343 | """ | 1343 | """ |
57 | 1344 | result = {} | 1344 | result = {} |
59 | 1345 | sources = [self._index] + self._fallback_vfs | 1345 | sources = [self._index] + self._immediate_fallbacks |
60 | 1346 | source_results = [] | 1346 | source_results = [] |
61 | 1347 | missing = set(keys) | 1347 | missing = set(keys) |
62 | 1348 | for source in sources: | 1348 | for source in sources: |
63 | @@ -1449,7 +1449,7 @@ | |||
64 | 1449 | parent_map = {} | 1449 | parent_map = {} |
65 | 1450 | key_to_source_map = {} | 1450 | key_to_source_map = {} |
66 | 1451 | source_results = [] | 1451 | source_results = [] |
68 | 1452 | for source in self._fallback_vfs: | 1452 | for source in self._immediate_fallbacks: |
69 | 1453 | if not missing: | 1453 | if not missing: |
70 | 1454 | break | 1454 | break |
71 | 1455 | source_parents = source.get_parent_map(missing) | 1455 | source_parents = source.get_parent_map(missing) |
72 | @@ -1832,7 +1832,7 @@ | |||
73 | 1832 | """See VersionedFiles.keys.""" | 1832 | """See VersionedFiles.keys.""" |
74 | 1833 | if 'evil' in debug.debug_flags: | 1833 | if 'evil' in debug.debug_flags: |
75 | 1834 | trace.mutter_callsite(2, "keys scales with size of history") | 1834 | trace.mutter_callsite(2, "keys scales with size of history") |
77 | 1835 | sources = [self._index] + self._fallback_vfs | 1835 | sources = [self._index] + self._immediate_fallbacks |
78 | 1836 | result = set() | 1836 | result = set() |
79 | 1837 | for source in sources: | 1837 | for source in sources: |
80 | 1838 | result.update(source.keys()) | 1838 | result.update(source.keys()) |
81 | 1839 | 1839 | ||
82 | === modified file 'bzrlib/knit.py' | |||
83 | --- bzrlib/knit.py 2011-02-09 08:12:22 +0000 | |||
84 | +++ bzrlib/knit.py 2011-02-09 08:12:22 +0000 | |||
85 | @@ -883,7 +883,7 @@ | |||
86 | 883 | self._factory = KnitAnnotateFactory() | 883 | self._factory = KnitAnnotateFactory() |
87 | 884 | else: | 884 | else: |
88 | 885 | self._factory = KnitPlainFactory() | 885 | self._factory = KnitPlainFactory() |
90 | 886 | self._fallback_vfs = [] | 886 | self._immediate_fallbacks = [] |
91 | 887 | self._reload_func = reload_func | 887 | self._reload_func = reload_func |
92 | 888 | 888 | ||
93 | 889 | def __repr__(self): | 889 | def __repr__(self): |
94 | @@ -897,7 +897,7 @@ | |||
95 | 897 | 897 | ||
96 | 898 | :param a_versioned_files: A VersionedFiles object. | 898 | :param a_versioned_files: A VersionedFiles object. |
97 | 899 | """ | 899 | """ |
99 | 900 | self._fallback_vfs.append(a_versioned_files) | 900 | self._immediate_fallbacks.append(a_versioned_files) |
100 | 901 | 901 | ||
101 | 902 | def add_lines(self, key, parents, lines, parent_texts=None, | 902 | def add_lines(self, key, parents, lines, parent_texts=None, |
102 | 903 | left_matching_blocks=None, nostore_sha=None, random_id=False, | 903 | left_matching_blocks=None, nostore_sha=None, random_id=False, |
103 | @@ -1070,7 +1070,7 @@ | |||
104 | 1070 | raise errors.KnitCorrupt(self, | 1070 | raise errors.KnitCorrupt(self, |
105 | 1071 | "Missing basis parent %s for %s" % ( | 1071 | "Missing basis parent %s for %s" % ( |
106 | 1072 | compression_parent, key)) | 1072 | compression_parent, key)) |
108 | 1073 | for fallback_vfs in self._fallback_vfs: | 1073 | for fallback_vfs in self._immediate_fallbacks: |
109 | 1074 | fallback_vfs.check() | 1074 | fallback_vfs.check() |
110 | 1075 | 1075 | ||
111 | 1076 | def _check_add(self, key, lines, random_id, check_content): | 1076 | def _check_add(self, key, lines, random_id, check_content): |
112 | @@ -1226,7 +1226,7 @@ | |||
113 | 1226 | and so on. | 1226 | and so on. |
114 | 1227 | """ | 1227 | """ |
115 | 1228 | result = {} | 1228 | result = {} |
117 | 1229 | sources = [self._index] + self._fallback_vfs | 1229 | sources = [self._index] + self._immediate_fallbacks |
118 | 1230 | source_results = [] | 1230 | source_results = [] |
119 | 1231 | missing = set(keys) | 1231 | missing = set(keys) |
120 | 1232 | for source in sources: | 1232 | for source in sources: |
121 | @@ -1526,7 +1526,7 @@ | |||
122 | 1526 | yield KnitContentFactory(key, global_map[key], | 1526 | yield KnitContentFactory(key, global_map[key], |
123 | 1527 | record_details, None, raw_data, self._factory.annotated, None) | 1527 | record_details, None, raw_data, self._factory.annotated, None) |
124 | 1528 | else: | 1528 | else: |
126 | 1529 | vf = self._fallback_vfs[parent_maps.index(source) - 1] | 1529 | vf = self._immediate_fallbacks[parent_maps.index(source) - 1] |
127 | 1530 | for record in vf.get_record_stream(keys, ordering, | 1530 | for record in vf.get_record_stream(keys, ordering, |
128 | 1531 | include_delta_closure): | 1531 | include_delta_closure): |
129 | 1532 | yield record | 1532 | yield record |
130 | @@ -1542,7 +1542,7 @@ | |||
131 | 1542 | # record entry 2 is the 'digest'. | 1542 | # record entry 2 is the 'digest'. |
132 | 1543 | result[key] = details[2] | 1543 | result[key] = details[2] |
133 | 1544 | missing.difference_update(set(result)) | 1544 | missing.difference_update(set(result)) |
135 | 1545 | for source in self._fallback_vfs: | 1545 | for source in self._immediate_fallbacks: |
136 | 1546 | if not missing: | 1546 | if not missing: |
137 | 1547 | break | 1547 | break |
138 | 1548 | new_result = source.get_sha1s(missing) | 1548 | new_result = source.get_sha1s(missing) |
139 | @@ -1619,7 +1619,7 @@ | |||
140 | 1619 | raise RevisionNotPresent([record.key], self) | 1619 | raise RevisionNotPresent([record.key], self) |
141 | 1620 | elif ((record.storage_kind in knit_types) | 1620 | elif ((record.storage_kind in knit_types) |
142 | 1621 | and (compression_parent is None | 1621 | and (compression_parent is None |
144 | 1622 | or not self._fallback_vfs | 1622 | or not self._immediate_fallbacks |
145 | 1623 | or self._index.has_key(compression_parent) | 1623 | or self._index.has_key(compression_parent) |
146 | 1624 | or not self.has_key(compression_parent))): | 1624 | or not self.has_key(compression_parent))): |
147 | 1625 | # we can insert the knit record literally if either it has no | 1625 | # we can insert the knit record literally if either it has no |
148 | @@ -1797,11 +1797,11 @@ | |||
149 | 1797 | # vfs, and hope to find them there. Note that if the keys are found | 1797 | # vfs, and hope to find them there. Note that if the keys are found |
150 | 1798 | # but had no changes or no content, the fallback may not return | 1798 | # but had no changes or no content, the fallback may not return |
151 | 1799 | # anything. | 1799 | # anything. |
153 | 1800 | if keys and not self._fallback_vfs: | 1800 | if keys and not self._immediate_fallbacks: |
154 | 1801 | # XXX: strictly the second parameter is meant to be the file id | 1801 | # XXX: strictly the second parameter is meant to be the file id |
155 | 1802 | # but it's not easily accessible here. | 1802 | # but it's not easily accessible here. |
156 | 1803 | raise RevisionNotPresent(keys, repr(self)) | 1803 | raise RevisionNotPresent(keys, repr(self)) |
158 | 1804 | for source in self._fallback_vfs: | 1804 | for source in self._immediate_fallbacks: |
159 | 1805 | if not keys: | 1805 | if not keys: |
160 | 1806 | break | 1806 | break |
161 | 1807 | source_keys = set() | 1807 | source_keys = set() |
162 | @@ -2016,7 +2016,7 @@ | |||
163 | 2016 | """See VersionedFiles.keys.""" | 2016 | """See VersionedFiles.keys.""" |
164 | 2017 | if 'evil' in debug.debug_flags: | 2017 | if 'evil' in debug.debug_flags: |
165 | 2018 | trace.mutter_callsite(2, "keys scales with size of history") | 2018 | trace.mutter_callsite(2, "keys scales with size of history") |
167 | 2019 | sources = [self._index] + self._fallback_vfs | 2019 | sources = [self._index] + self._immediate_fallbacks |
168 | 2020 | result = set() | 2020 | result = set() |
169 | 2021 | for source in sources: | 2021 | for source in sources: |
170 | 2022 | result.update(source.keys()) | 2022 | result.update(source.keys()) |
171 | @@ -2062,7 +2062,7 @@ | |||
172 | 2062 | 2062 | ||
173 | 2063 | missing_keys = set(nonlocal_keys) | 2063 | missing_keys = set(nonlocal_keys) |
174 | 2064 | # Read from remote versioned file instances and provide to our caller. | 2064 | # Read from remote versioned file instances and provide to our caller. |
176 | 2065 | for source in self.vf._fallback_vfs: | 2065 | for source in self.vf._immediate_fallbacks: |
177 | 2066 | if not missing_keys: | 2066 | if not missing_keys: |
178 | 2067 | break | 2067 | break |
179 | 2068 | # Loop over fallback repositories asking them for texts - ignore | 2068 | # Loop over fallback repositories asking them for texts - ignore |
180 | @@ -3521,8 +3521,8 @@ | |||
181 | 3521 | return records, ann_keys | 3521 | return records, ann_keys |
182 | 3522 | 3522 | ||
183 | 3523 | def _get_needed_texts(self, key, pb=None): | 3523 | def _get_needed_texts(self, key, pb=None): |
186 | 3524 | # if True or len(self._vf._fallback_vfs) > 0: | 3524 | # if True or len(self._vf._immediate_fallbacks) > 0: |
187 | 3525 | if len(self._vf._fallback_vfs) > 0: | 3525 | if len(self._vf._immediate_fallbacks) > 0: |
188 | 3526 | # If we have fallbacks, go to the generic path | 3526 | # If we have fallbacks, go to the generic path |
189 | 3527 | for v in annotate.Annotator._get_needed_texts(self, key, pb=pb): | 3527 | for v in annotate.Annotator._get_needed_texts(self, key, pb=pb): |
190 | 3528 | yield v | 3528 | yield v |
191 | 3529 | 3529 | ||
192 | === modified file 'bzrlib/tests/per_repository_reference/test_graph.py' | |||
193 | --- bzrlib/tests/per_repository_reference/test_graph.py 2011-02-09 08:12:22 +0000 | |||
194 | +++ bzrlib/tests/per_repository_reference/test_graph.py 2011-02-09 08:12:22 +0000 | |||
195 | @@ -29,7 +29,7 @@ | |||
196 | 29 | See <https://bugs.launchpad.net/bugs/715000>. | 29 | See <https://bugs.launchpad.net/bugs/715000>. |
197 | 30 | """ | 30 | """ |
198 | 31 | branch_a, branch_b, branch_c, revid_1 = self.make_double_stacked_branches() | 31 | branch_a, branch_b, branch_c, revid_1 = self.make_double_stacked_branches() |
200 | 32 | for br in [branch_c]: | 32 | for br in [branch_a, branch_b, branch_c]: |
201 | 33 | self.assertEquals( | 33 | self.assertEquals( |
202 | 34 | [revid_1], | 34 | [revid_1], |
203 | 35 | br.repository.get_known_graph_ancestry([revid_1]).topo_sort()) | 35 | br.repository.get_known_graph_ancestry([revid_1]).topo_sort()) |
204 | 36 | 36 | ||
205 | === modified file 'bzrlib/versionedfile.py' | |||
206 | --- bzrlib/versionedfile.py 2011-02-09 08:12:22 +0000 | |||
207 | +++ bzrlib/versionedfile.py 2011-02-09 08:12:22 +0000 | |||
208 | @@ -1,7 +1,4 @@ | |||
213 | 1 | # Copyright (C) 2006-2010 Canonical Ltd | 1 | # Copyright (C) 2006-2011 Canonical Ltd |
210 | 2 | # | ||
211 | 3 | # Authors: | ||
212 | 4 | # Johan Rydberg <jrydberg@gnu.org> | ||
214 | 5 | # | 2 | # |
215 | 6 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
216 | 7 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
217 | @@ -930,6 +927,10 @@ | |||
218 | 930 | 927 | ||
219 | 931 | The use of tuples allows a single code base to support several different | 928 | The use of tuples allows a single code base to support several different |
220 | 932 | uses with only the mapping logic changing from instance to instance. | 929 | uses with only the mapping logic changing from instance to instance. |
221 | 930 | |||
222 | 931 | :ivar _immediate_fallbacks: For subclasses that support stacking, | ||
223 | 932 | this is a list of other VersionedFiles immediately underneath this | ||
224 | 933 | one. They may in turn each have further fallbacks. | ||
225 | 933 | """ | 934 | """ |
226 | 934 | 935 | ||
227 | 935 | def add_lines(self, key, parents, lines, parent_texts=None, | 936 | def add_lines(self, key, parents, lines, parent_texts=None, |
228 | @@ -1201,7 +1202,7 @@ | |||
229 | 1201 | at open time because they may change after the objects are opened. | 1202 | at open time because they may change after the objects are opened. |
230 | 1202 | """ | 1203 | """ |
231 | 1203 | all_fallbacks = [] | 1204 | all_fallbacks = [] |
233 | 1204 | for a_vfs in self._fallback_vfs: | 1205 | for a_vfs in self._immediate_fallbacks: |
234 | 1205 | all_fallbacks.append(a_vfs) | 1206 | all_fallbacks.append(a_vfs) |
235 | 1206 | all_fallbacks.extend(a_vfs._transitive_fallbacks()) | 1207 | all_fallbacks.extend(a_vfs._transitive_fallbacks()) |
236 | 1207 | return all_fallbacks | 1208 | return all_fallbacks |
237 | 1208 | 1209 | ||
238 | === modified file 'doc/en/release-notes/bzr-2.2.txt' | |||
239 | --- doc/en/release-notes/bzr-2.2.txt 2011-02-04 14:10:48 +0000 | |||
240 | +++ doc/en/release-notes/bzr-2.2.txt 2011-02-09 08:12:22 +0000 | |||
241 | @@ -2,9 +2,79 @@ | |||
242 | 2 | Bazaar Release Notes | 2 | Bazaar Release Notes |
243 | 3 | #################### | 3 | #################### |
244 | 4 | 4 | ||
248 | 5 | .. toctree:: | 5 | .. contents:: List of Releases |
249 | 6 | :maxdepth: 1 | 6 | :depth: 1 |
250 | 7 | 7 | ||
251 | 8 | bzr 2.2.5 | ||
252 | 9 | ######### | ||
253 | 10 | |||
254 | 11 | :Codename: Suggestions welcome | ||
255 | 12 | :2.2.5: NOT RELEASED YET | ||
256 | 13 | |||
257 | 14 | Compatibility Breaks | ||
258 | 15 | ******************** | ||
259 | 16 | |||
260 | 17 | New Features | ||
261 | 18 | ************ | ||
262 | 19 | |||
263 | 20 | Bug Fixes | ||
264 | 21 | ********* | ||
265 | 22 | |||
266 | 23 | * Correctly handle ``bzr log`` and `get_known_graph_ancestry` on a | ||
267 | 24 | doubly-stacked branch. | ||
268 | 25 | (James Westby, Martin Pool, #715000) | ||
269 | 26 | |||
270 | 27 | Improvements | ||
271 | 28 | ************ | ||
272 | 29 | |||
273 | 30 | Documentation | ||
274 | 31 | ************* | ||
275 | 32 | |||
276 | 33 | API Changes | ||
277 | 34 | *********** | ||
278 | 35 | |||
279 | 36 | Internals | ||
280 | 37 | ********* | ||
281 | 38 | |||
282 | 39 | Testing | ||
283 | 40 | ******* | ||
284 | 41 | |||
285 | 42 | |||
286 | 43 | bzr 2.2.4 | ||
287 | 44 | ######### | ||
288 | 45 | |||
289 | 46 | :2.2.4: 2011-02-04 | ||
290 | 47 | |||
291 | 48 | This is a bugfix release. Only one bug has been fixed, a regression from 2.2.3 | ||
292 | 49 | involving only certain operations with launchpad. Upgrading is recommended for | ||
293 | 50 | all users on earlier 2.2 releases. | ||
294 | 51 | |||
295 | 52 | Bug Fixes | ||
296 | 53 | ********* | ||
297 | 54 | |||
298 | 55 | * Fix communications with the Launchpad web service when using | ||
299 | 56 | launchpadlib >= 1.5.5. This was a latent bug in bzr's communication | ||
300 | 57 | with Launchpad's production instance, which only became a problem when | ||
301 | 58 | the default instance was switched from edge to production in bzr 2.2.3. | ||
302 | 59 | (Max Bowsher, #707075) | ||
303 | 60 | |||
304 | 61 | |||
305 | 62 | bzr 2.2.3 | ||
306 | 63 | ######### | ||
307 | 64 | |||
308 | 65 | :2.2.3: 2011-01-20 | ||
309 | 66 | |||
310 | 67 | This is a bugfix release. Upgrading is recommended for all users | ||
311 | 68 | on earlier 2.2 releases. | ||
312 | 69 | |||
313 | 70 | Compatibility Breaks | ||
314 | 71 | ******************** | ||
315 | 72 | |||
316 | 73 | * Launchpad has announced that the ``edge.launchpad.net`` instance is | ||
317 | 74 | deprecated and may be shut down in the future | ||
318 | 75 | <http://blog.launchpad.net/general/edge-is-deprecated>. Bazaar has therefore | ||
319 | 76 | been updated in this release to talk to the main (``launchpad.net``) servers, | ||
320 | 77 | rather than the ``edge`` ones. (Vincent Ladeuil, #583667) | ||
321 | 8 | bzr 2.2.4 | 78 | bzr 2.2.4 |
322 | 9 | ######### | 79 | ######### |
323 | 10 | 80 | ||
324 | 11 | 81 | ||
325 | === modified file 'doc/en/release-notes/bzr-2.3.txt' | |||
326 | --- doc/en/release-notes/bzr-2.3.txt 2011-02-09 08:12:22 +0000 | |||
327 | +++ doc/en/release-notes/bzr-2.3.txt 2011-02-08 13:56:49 +0000 | |||
328 | @@ -2,7 +2,6 @@ | |||
329 | 2 | Bazaar Release Notes | 2 | Bazaar Release Notes |
330 | 3 | #################### | 3 | #################### |
331 | 4 | 4 | ||
332 | 5 | <<<<<<< TREE | ||
333 | 6 | .. toctree:: | 5 | .. toctree:: |
334 | 7 | :maxdepth: 1 | 6 | :maxdepth: 1 |
335 | 8 | 7 | ||
336 | @@ -15,81 +14,6 @@ | |||
337 | 15 | ***************************** | 14 | ***************************** |
338 | 16 | 15 | ||
339 | 17 | .. These may require users to change the way they use Bazaar. | 16 | .. These may require users to change the way they use Bazaar. |
340 | 18 | ======= | ||
341 | 19 | .. contents:: List of Releases | ||
342 | 20 | :depth: 1 | ||
343 | 21 | |||
344 | 22 | bzr 2.2.5 | ||
345 | 23 | ######### | ||
346 | 24 | |||
347 | 25 | :Codename: Suggestions welcome | ||
348 | 26 | :2.2.5: NOT RELEASED YET | ||
349 | 27 | |||
350 | 28 | Compatibility Breaks | ||
351 | 29 | ******************** | ||
352 | 30 | |||
353 | 31 | New Features | ||
354 | 32 | ************ | ||
355 | 33 | |||
356 | 34 | Bug Fixes | ||
357 | 35 | ********* | ||
358 | 36 | |||
359 | 37 | * Correctly handle ``bzr log`` and `get_known_graph_ancestry` on a | ||
360 | 38 | doubly-stacked branch. | ||
361 | 39 | (James Westby, Martin Pool, #715000) | ||
362 | 40 | |||
363 | 41 | Improvements | ||
364 | 42 | ************ | ||
365 | 43 | |||
366 | 44 | Documentation | ||
367 | 45 | ************* | ||
368 | 46 | |||
369 | 47 | API Changes | ||
370 | 48 | *********** | ||
371 | 49 | |||
372 | 50 | Internals | ||
373 | 51 | ********* | ||
374 | 52 | |||
375 | 53 | Testing | ||
376 | 54 | ******* | ||
377 | 55 | |||
378 | 56 | |||
379 | 57 | bzr 2.2.4 | ||
380 | 58 | ######### | ||
381 | 59 | |||
382 | 60 | :2.2.4: 2011-02-04 | ||
383 | 61 | |||
384 | 62 | This is a bugfix release. Only one bug has been fixed, a regression from 2.2.3 | ||
385 | 63 | involving only certain operations with launchpad. Upgrading is recommended for | ||
386 | 64 | all users on earlier 2.2 releases. | ||
387 | 65 | |||
388 | 66 | Bug Fixes | ||
389 | 67 | ********* | ||
390 | 68 | |||
391 | 69 | * Fix communications with the Launchpad web service when using | ||
392 | 70 | launchpadlib >= 1.5.5. This was a latent bug in bzr's communication | ||
393 | 71 | with Launchpad's production instance, which only became a problem when | ||
394 | 72 | the default instance was switched from edge to production in bzr 2.2.3. | ||
395 | 73 | (Max Bowsher, #707075) | ||
396 | 74 | |||
397 | 75 | |||
398 | 76 | bzr 2.2.3 | ||
399 | 77 | ######### | ||
400 | 78 | |||
401 | 79 | :2.2.3: 2011-01-20 | ||
402 | 80 | |||
403 | 81 | This is a bugfix release. Upgrading is recommended for all users | ||
404 | 82 | on earlier 2.2 releases. | ||
405 | 83 | |||
406 | 84 | Compatibility Breaks | ||
407 | 85 | ******************** | ||
408 | 86 | |||
409 | 87 | * Launchpad has announced that the ``edge.launchpad.net`` instance is | ||
410 | 88 | deprecated and may be shut down in the future | ||
411 | 89 | <http://blog.launchpad.net/general/edge-is-deprecated>. Bazaar has therefore | ||
412 | 90 | been updated in this release to talk to the main (``launchpad.net``) servers, | ||
413 | 91 | rather than the ``edge`` ones. (Vincent Ladeuil, #583667) | ||
414 | 92 | >>>>>>> MERGE-SOURCE | ||
415 | 93 | 17 | ||
416 | 94 | New Features | 18 | New Features |
417 | 95 | ************ | 19 | ************ |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 2/9/2011 2:08 AM, Martin Pool wrote: /code.launchpad .net/~mbp/ bzr/715000- more-fallbacks/ +merge/ 49025 fallbacks to make it clear it's not the whole stack.
> Martin Pool has proposed merging lp:~mbp/bzr/715000-more-fallbacks into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
>
> For more details, see:
> https:/
>
> follow-through from bug 715000: rename _fallback_vfs to _immediate_
I'm ok with the change, but I would make it "_immediate_ fallback_ vfs" to fallback_ repositories" .
distinguish it from "_immediate_
Mostly to be easily greppable.
I don't personally find it better, mostly because the added length
doesn't add much. It seems a simple
:ivar _fallback_vfs: Immediate fallbacks, note this is not transitive
Could be a better way to go.
John enigmail. mozdev. org/
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://
iEYEARECAAYFAk1 St0oACgkQJdeBCY SNAAOLHQCg0Yj/ BsMKAzL4Sr5OhGQ bxBoZ yOfdMjxhNnjLFiY vdnY9+ansx
9FMAnj/
=LcsQ
-----END PGP SIGNATURE-----