5557.1.9
by John Arbash Meinel
Pull the rest of the commit group management into insert_stream instead of |
1 |
# Copyright (C) 2005-2011 Canonical Ltd
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
2 |
#
|
1185.65.1
by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch |
3 |
# This program is free software; you can redistribute it and/or modify
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
7 |
#
|
1185.65.1
by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch |
8 |
# This program is distributed in the hope that it will be useful,
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
12 |
#
|
1185.65.1
by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch |
13 |
# You should have received a copy of the GNU General Public License
|
14 |
# along with this program; if not, write to the Free Software
|
|
4183.7.1
by Sabin Iacob
update FSF mailing address |
15 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
1185.65.10
by Robert Collins
Rename Controlfiles to LockableFiles. |
16 |
|
6379.6.3
by Jelmer Vernooij
Use absolute_import. |
17 |
from __future__ import absolute_import |
18 |
||
1996.3.4
by John Arbash Meinel
lazy_import bzrlib/repository.py |
19 |
from bzrlib.lazy_import import lazy_import |
20 |
lazy_import(globals(), """ |
|
5852.1.5
by Andrew Bennetts, Jelmer Vernooij
Support limit= for fetching between Bazaar branches. |
21 |
import itertools
|
1740.3.7
by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder. |
22 |
import time
|
1996.3.4
by John Arbash Meinel
lazy_import bzrlib/repository.py |
23 |
|
1910.2.22
by Aaron Bentley
Make commits preserve root entry data |
24 |
from bzrlib import (
|
4840.2.7
by Vincent Ladeuil
Move the _warn_if_deprecated call from repo.__init__ to |
25 |
config,
|
5363.2.10
by Jelmer Vernooij
base ControlDir on ControlComponent. |
26 |
controldir,
|
2745.1.1
by Robert Collins
Add a number of -Devil checkpoints. |
27 |
debug,
|
2116.4.1
by John Arbash Meinel
Update file and revision id generators. |
28 |
generate_ids,
|
1996.3.4
by John Arbash Meinel
lazy_import bzrlib/repository.py |
29 |
graph,
|
30 |
lockable_files,
|
|
31 |
lockdir,
|
|
1910.2.22
by Aaron Bentley
Make commits preserve root entry data |
32 |
osutils,
|
1996.3.4
by John Arbash Meinel
lazy_import bzrlib/repository.py |
33 |
revision as _mod_revision,
|
5815.4.4
by Jelmer Vernooij
Remove unused imports. |
34 |
testament as _mod_testament,
|
2988.1.3
by Robert Collins
Add a new repositoy method _generate_text_key_index for use by reconcile/check. |
35 |
tsort,
|
5971.1.4
by Jonathan Riddell
tidy up repository and gpg.py |
36 |
gpg,
|
1996.3.4
by John Arbash Meinel
lazy_import bzrlib/repository.py |
37 |
)
|
2520.4.54
by Aaron Bentley
Hang a create_bundle method off repository |
38 |
from bzrlib.bundle import serializer
|
6138.3.4
by Jonathan Riddell
add gettext() to uses of trace.note() |
39 |
from bzrlib.i18n import gettext
|
1996.3.4
by John Arbash Meinel
lazy_import bzrlib/repository.py |
40 |
""") |
41 |
||
5200.3.7
by Robert Collins
Merge trunk - resolve conflicts. |
42 |
from bzrlib import ( |
6213.1.35
by Jelmer Vernooij
Simplify importing of bzrdir. |
43 |
bzrdir, |
5200.3.7
by Robert Collins
Merge trunk - resolve conflicts. |
44 |
errors, |
45 |
registry, |
|
5539.2.10
by Andrew Bennetts
s/NotInOtherForRev/NotInOtherForRevs/, and allow passing multiple revision_ids to search_missing_revision_ids. |
46 |
symbol_versioning, |
5195.3.18
by Parth Malwankar
merged in changes from trunk. |
47 |
ui, |
5200.3.7
by Robert Collins
Merge trunk - resolve conflicts. |
48 |
)
|
4634.85.10
by Andrew Bennetts
Change test_unlock_in_write_group to expect a log_exception_quietly rather than a raise. |
49 |
from bzrlib.decorators import needs_read_lock, needs_write_lock, only_raises |
1563.2.12
by Robert Collins
Checkpointing: created InterObject to factor out common inter object worker code, added InterVersionedFile and tests to allow making join work between any versionedfile. |
50 |
from bzrlib.inter import InterObject |
5200.3.6
by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review. |
51 |
from bzrlib.lock import _RelockDebugMixin, LogicalLockResult |
3825.4.1
by Andrew Bennetts
Add suppress_errors to abort_write_group. |
52 |
from bzrlib.trace import ( |
53 |
log_exception_quietly, note, mutter, mutter_callsite, warning) |
|
1185.70.3
by Martin Pool
Various updates to make storage branch mergeable: |
54 |
|
1185.65.1
by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch |
55 |
|
1904.2.5
by Martin Pool
Fix format warning inside test suite and add test |
56 |
# Old formats display a warning, but only once
|
57 |
_deprecation_warning_done = False |
|
58 |
||
59 |
||
5199.1.1
by Andrew Bennetts
Allow repositories to support refresh_data during a write group. |
60 |
class IsInWriteGroupError(errors.InternalBzrError): |
61 |
||
62 |
_fmt = "May not refresh_data of repo %(repo)s while in a write group." |
|
63 |
||
64 |
def __init__(self, repo): |
|
65 |
errors.InternalBzrError.__init__(self, repo=repo) |
|
66 |
||
67 |
||
2592.3.135
by Robert Collins
Do not create many transient knit objects, saving 4% on commit. |
68 |
class CommitBuilder(object): |
69 |
"""Provides an interface to build up a commit.
|
|
70 |
||
3879.2.3
by John Arbash Meinel
Hide the .basis_delta variable, and require callers to use .get_basis_delta() |
71 |
This allows describing a tree to be committed without needing to
|
2592.3.135
by Robert Collins
Do not create many transient knit objects, saving 4% on commit. |
72 |
know the internals of the format of the repository.
|
73 |
"""
|
|
3879.2.3
by John Arbash Meinel
Hide the .basis_delta variable, and require callers to use .get_basis_delta() |
74 |
|
2592.3.135
by Robert Collins
Do not create many transient knit objects, saving 4% on commit. |
75 |
# all clients should supply tree roots.
|
76 |
record_root_entry = True |
|
5815.4.2
by Jelmer Vernooij
split out versionedfile-specific stuff from commitbuilder. |
77 |
# whether this commit builder supports the record_entry_contents interface
|
78 |
supports_record_entry_contents = False |
|
6217.5.1
by Jelmer Vernooij
Add CommitBuilder.updates_branch. |
79 |
# whether this commit builder will automatically update the branch that is
|
80 |
# being committed to
|
|
81 |
updates_branch = False |
|
2592.3.135
by Robert Collins
Do not create many transient knit objects, saving 4% on commit. |
82 |
|
6351.3.2
by Jelmer Vernooij
Convert some gpg options to config stacks. |
83 |
def __init__(self, repository, parents, config_stack, timestamp=None, |
2979.2.2
by Robert Collins
Per-file graph heads detection during commit for pack repositories. |
84 |
timezone=None, committer=None, revprops=None, |
5777.6.1
by Jelmer Vernooij
Add --lossy option to 'bzr commit'. |
85 |
revision_id=None, lossy=False): |
2592.3.135
by Robert Collins
Do not create many transient knit objects, saving 4% on commit. |
86 |
"""Initiate a CommitBuilder.
|
87 |
||
88 |
:param repository: Repository to commit to.
|
|
89 |
:param parents: Revision ids of the parents of the new revision.
|
|
90 |
:param timestamp: Optional timestamp recorded for commit.
|
|
91 |
:param timezone: Optional timezone for timestamp.
|
|
92 |
:param committer: Optional committer to set for commit.
|
|
93 |
:param revprops: Optional dictionary of revision properties.
|
|
94 |
:param revision_id: Optional revision id.
|
|
5777.6.1
by Jelmer Vernooij
Add --lossy option to 'bzr commit'. |
95 |
:param lossy: Whether to discard data that can not be natively
|
96 |
represented, when pushing to a foreign VCS
|
|
2592.3.135
by Robert Collins
Do not create many transient knit objects, saving 4% on commit. |
97 |
"""
|
6351.3.2
by Jelmer Vernooij
Convert some gpg options to config stacks. |
98 |
self._config_stack = config_stack |
5777.6.6
by Jelmer Vernooij
Add lossy tests. |
99 |
self._lossy = lossy |
2592.3.135
by Robert Collins
Do not create many transient knit objects, saving 4% on commit. |
100 |
|
101 |
if committer is None: |
|
6351.3.2
by Jelmer Vernooij
Convert some gpg options to config stacks. |
102 |
self._committer = self._config_stack.get('email') |
5485.4.2
by Martin
Move guard to CommitBuilder.__init__ and test to bt.per_repository |
103 |
elif not isinstance(committer, unicode): |
104 |
self._committer = committer.decode() # throw if non-ascii |
|
2592.3.135
by Robert Collins
Do not create many transient knit objects, saving 4% on commit. |
105 |
else: |
106 |
self._committer = committer |
|
107 |
||
2858.2.1
by Martin Pool
Remove most calls to safe_file_id and safe_revision_id. |
108 |
self._new_revision_id = revision_id |
2592.3.135
by Robert Collins
Do not create many transient knit objects, saving 4% on commit. |
109 |
self.parents = parents |
110 |
self.repository = repository |
|
111 |
||
112 |
self._revprops = {} |
|
113 |
if revprops is not None: |
|
3831.1.1
by John Arbash Meinel
Before allowing commit to succeed, verify the texts will be 'safe'. |
114 |
self._validate_revprops(revprops) |
2592.3.135
by Robert Collins
Do not create many transient knit objects, saving 4% on commit. |
115 |
self._revprops.update(revprops) |
116 |
||
117 |
if timestamp is None: |
|
118 |
timestamp = time.time() |
|
119 |
# Restrict resolution to 1ms
|
|
120 |
self._timestamp = round(timestamp, 3) |
|
121 |
||
122 |
if timezone is None: |
|
123 |
self._timezone = osutils.local_time_offset() |
|
124 |
else: |
|
125 |
self._timezone = int(timezone) |
|
126 |
||
127 |
self._generate_revision_if_needed() |
|
3775.2.7
by Robert Collins
CommitBuilder handles no-change commits to roots properly with record_iter_changes. |
128 |
|
3775.2.9
by Robert Collins
CommitBuilder handles deletes via record_iter_entries. |
129 |
def any_changes(self): |
3775.2.7
by Robert Collins
CommitBuilder handles no-change commits to roots properly with record_iter_changes. |
130 |
"""Return True if any entries were changed.
|
5815.4.2
by Jelmer Vernooij
split out versionedfile-specific stuff from commitbuilder. |
131 |
|
3775.2.7
by Robert Collins
CommitBuilder handles no-change commits to roots properly with record_iter_changes. |
132 |
This includes merge-only changes. It is the core for the --unchanged
|
133 |
detection in commit.
|
|
134 |
||
135 |
:return: True if any changes have occured.
|
|
136 |
"""
|
|
5815.4.2
by Jelmer Vernooij
split out versionedfile-specific stuff from commitbuilder. |
137 |
raise NotImplementedError(self.any_changes) |
2592.3.135
by Robert Collins
Do not create many transient knit objects, saving 4% on commit. |
138 |
|
3831.1.1
by John Arbash Meinel
Before allowing commit to succeed, verify the texts will be 'safe'. |
139 |
def _validate_unicode_text(self, text, context): |
140 |
"""Verify things like commit messages don't have bogus characters."""
|
|
141 |
if '\r' in text: |
|
142 |
raise ValueError('Invalid value for %s: %r' % (context, text)) |
|
143 |
||
144 |
def _validate_revprops(self, revprops): |
|
145 |
for key, value in revprops.iteritems(): |
|
146 |
# We know that the XML serializers do not round trip '\r'
|
|
147 |
# correctly, so refuse to accept them
|
|
3831.1.5
by John Arbash Meinel
It seems we have some direct tests that don't use strings and expect a value error as well. |
148 |
if not isinstance(value, basestring): |
149 |
raise ValueError('revision property (%s) is not a valid' |
|
150 |
' (unicode) string: %r' % (key, value)) |
|
3831.1.1
by John Arbash Meinel
Before allowing commit to succeed, verify the texts will be 'safe'. |
151 |
self._validate_unicode_text(value, |
152 |
'revision property (%s)' % (key,)) |
|
153 |
||
2592.3.135
by Robert Collins
Do not create many transient knit objects, saving 4% on commit. |
154 |
def commit(self, message): |
155 |
"""Make the actual commit.
|
|
156 |
||
157 |
:return: The revision id of the recorded revision.
|
|
158 |
"""
|
|
5815.4.2
by Jelmer Vernooij
split out versionedfile-specific stuff from commitbuilder. |
159 |
raise NotImplementedError(self.commit) |
2592.3.135
by Robert Collins
Do not create many transient knit objects, saving 4% on commit. |
160 |
|
161 |
def abort(self): |
|
162 |
"""Abort the commit that is being built.
|
|
163 |
"""
|
|
5815.4.2
by Jelmer Vernooij
split out versionedfile-specific stuff from commitbuilder. |
164 |
raise NotImplementedError(self.abort) |
2592.3.135
by Robert Collins
Do not create many transient knit objects, saving 4% on commit. |
165 |
|
166 |
def revision_tree(self): |
|
167 |
"""Return the tree that was just committed.
|
|
168 |
||
5793.2.2
by Jelmer Vernooij
Split inventory-specific code out of RevisionTree into InventoryRevisionTree. |
169 |
After calling commit() this can be called to get a
|
5815.4.1
by Jelmer Vernooij
Split versionedfile-specific stuff out into VersionedFileRepository. |
170 |
RevisionTree representing the newly committed tree. This is
|
5793.2.2
by Jelmer Vernooij
Split inventory-specific code out of RevisionTree into InventoryRevisionTree. |
171 |
preferred to calling Repository.revision_tree() because that may
|
172 |
require deserializing the inventory, while we already have a copy in
|
|
2592.3.135
by Robert Collins
Do not create many transient knit objects, saving 4% on commit. |
173 |
memory.
|
174 |
"""
|
|
5815.4.2
by Jelmer Vernooij
split out versionedfile-specific stuff from commitbuilder. |
175 |
raise NotImplementedError(self.revision_tree) |
2592.3.135
by Robert Collins
Do not create many transient knit objects, saving 4% on commit. |
176 |
|
177 |
def finish_inventory(self): |
|
3775.2.4
by Robert Collins
Start on a CommitBuilder.record_iter_changes method. |
178 |
"""Tell the builder that the inventory is finished.
|
3735.2.163
by John Arbash Meinel
Merge bzr.dev 4187, and revert the change to fix refcycle issues. |
179 |
|
3775.2.4
by Robert Collins
Start on a CommitBuilder.record_iter_changes method. |
180 |
:return: The inventory id in the repository, which can be used with
|
181 |
repository.get_inventory.
|
|
182 |
"""
|
|
5815.4.2
by Jelmer Vernooij
split out versionedfile-specific stuff from commitbuilder. |
183 |
raise NotImplementedError(self.finish_inventory) |
2592.3.135
by Robert Collins
Do not create many transient knit objects, saving 4% on commit. |
184 |
|
185 |
def _gen_revision_id(self): |
|
186 |
"""Return new revision-id."""
|
|
5050.18.1
by Aaron Bentley
CommitBuilder user committer, not username in revision-id. |
187 |
return generate_ids.gen_revision_id(self._committer, self._timestamp) |
2592.3.135
by Robert Collins
Do not create many transient knit objects, saving 4% on commit. |
188 |
|
189 |
def _generate_revision_if_needed(self): |
|
190 |
"""Create a revision id if None was supplied.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
191 |
|
2592.3.135
by Robert Collins
Do not create many transient knit objects, saving 4% on commit. |
192 |
If the repository can not support user-specified revision ids
|
193 |
they should override this function and raise CannotSetRevisionId
|
|
194 |
if _new_revision_id is not None.
|
|
195 |
||
196 |
:raises: CannotSetRevisionId
|
|
197 |
"""
|
|
198 |
if self._new_revision_id is None: |
|
199 |
self._new_revision_id = self._gen_revision_id() |
|
200 |
self.random_revid = True |
|
201 |
else: |
|
202 |
self.random_revid = False |
|
203 |
||
3879.2.3
by John Arbash Meinel
Hide the .basis_delta variable, and require callers to use .get_basis_delta() |
204 |
def will_record_deletes(self): |
3775.2.2
by Robert Collins
Teach CommitBuilder to accumulate inventory deltas. |
205 |
"""Tell the commit builder that deletes are being notified.
|
206 |
||
207 |
This enables the accumulation of an inventory delta; for the resulting
|
|
3879.2.3
by John Arbash Meinel
Hide the .basis_delta variable, and require callers to use .get_basis_delta() |
208 |
commit to be valid, deletes against the basis MUST be recorded via
|
3775.2.2
by Robert Collins
Teach CommitBuilder to accumulate inventory deltas. |
209 |
builder.record_delete().
|
210 |
"""
|
|
5815.4.2
by Jelmer Vernooij
split out versionedfile-specific stuff from commitbuilder. |
211 |
raise NotImplementedError(self.will_record_deletes) |
212 |
||
213 |
def record_iter_changes(self, tree, basis_revision_id, iter_changes): |
|
3775.2.4
by Robert Collins
Start on a CommitBuilder.record_iter_changes method. |
214 |
"""Record a new tree via iter_changes.
|
215 |
||
3775.2.9
by Robert Collins
CommitBuilder handles deletes via record_iter_entries. |
216 |
:param tree: The tree to obtain text contents from for changed objects.
|
3775.2.4
by Robert Collins
Start on a CommitBuilder.record_iter_changes method. |
217 |
:param basis_revision_id: The revision id of the tree the iter_changes
|
3775.2.29
by Robert Collins
Updates to the form of add_inventory_by_delta that landed in trunk. |
218 |
has been generated against. Currently assumed to be the same
|
219 |
as self.parents[0] - if it is not, errors may occur.
|
|
220 |
:param iter_changes: An iter_changes iterator with the changes to apply
|
|
4183.5.5
by Robert Collins
Enable record_iter_changes for cases where it can work. |
221 |
to basis_revision_id. The iterator must not include any items with
|
222 |
a current kind of None - missing items must be either filtered out
|
|
223 |
or errored-on beefore record_iter_changes sees the item.
|
|
4183.5.4
by Robert Collins
Turn record_iter_changes into a generator to emit file system hashes. |
224 |
:return: A generator of (file_id, relpath, fs_hash) tuples for use with
|
225 |
tree._observed_sha1.
|
|
3775.2.4
by Robert Collins
Start on a CommitBuilder.record_iter_changes method. |
226 |
"""
|
5815.4.2
by Jelmer Vernooij
split out versionedfile-specific stuff from commitbuilder. |
227 |
raise NotImplementedError(self.record_iter_changes) |
3775.2.7
by Robert Collins
CommitBuilder handles no-change commits to roots properly with record_iter_changes. |
228 |
|
2592.3.135
by Robert Collins
Do not create many transient knit objects, saving 4% on commit. |
229 |
|
5200.3.6
by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review. |
230 |
class RepositoryWriteLockResult(LogicalLockResult): |
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
231 |
"""The result of write locking a repository.
|
232 |
||
233 |
:ivar repository_token: The token obtained from the underlying lock, or
|
|
234 |
None.
|
|
235 |
:ivar unlock: A callable which will unlock the lock.
|
|
236 |
"""
|
|
237 |
||
238 |
def __init__(self, unlock, repository_token): |
|
5200.3.6
by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review. |
239 |
LogicalLockResult.__init__(self, unlock) |
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
240 |
self.repository_token = repository_token |
241 |
||
5200.3.6
by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review. |
242 |
def __repr__(self): |
5200.3.5
by Robert Collins
Add __str__ to the new helper classes. |
243 |
return "RepositoryWriteLockResult(%s, %s)" % (self.repository_token, |
244 |
self.unlock) |
|
245 |
||
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
246 |
|
2220.2.3
by Martin Pool
Add tag: revision namespace. |
247 |
######################################################################
|
248 |
# Repositories
|
|
249 |
||
4509.3.21
by Martin Pool
Add new RepositoryBase class, shared by RemoteRepository |
250 |
|
5363.2.10
by Jelmer Vernooij
base ControlDir on ControlComponent. |
251 |
class Repository(_RelockDebugMixin, controldir.ControlComponent): |
1185.70.3
by Martin Pool
Various updates to make storage branch mergeable: |
252 |
"""Repository holding history for one or more branches.
|
253 |
||
254 |
The repository holds and retrieves historical information including
|
|
255 |
revisions and file history. It's normally accessed only by the Branch,
|
|
256 |
which views a particular line of development through that history.
|
|
257 |
||
5815.4.1
by Jelmer Vernooij
Split versionedfile-specific stuff out into VersionedFileRepository. |
258 |
See VersionedFileRepository in bzrlib.vf_repository for the
|
259 |
base class for most Bazaar repositories.
|
|
1185.70.3
by Martin Pool
Various updates to make storage branch mergeable: |
260 |
"""
|
1185.65.17
by Robert Collins
Merge from integration, mode-changes are broken. |
261 |
|
3825.4.1
by Andrew Bennetts
Add suppress_errors to abort_write_group. |
262 |
def abort_write_group(self, suppress_errors=False): |
2617.6.2
by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit. |
263 |
"""Commit the contents accrued within the current write group.
|
264 |
||
3825.4.6
by Andrew Bennetts
Document the suppress_errors flag in the docstring. |
265 |
:param suppress_errors: if true, abort_write_group will catch and log
|
266 |
unexpected errors that happen during the abort, rather than
|
|
267 |
allowing them to propagate. Defaults to False.
|
|
268 |
||
2617.6.2
by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit. |
269 |
:seealso: start_write_group.
|
270 |
"""
|
|
271 |
if self._write_group is not self.get_transaction(): |
|
272 |
# has an unlock or relock occured ?
|
|
4476.3.16
by Andrew Bennetts
Only make inv deltas against bases we've already sent, and other tweaks. |
273 |
if suppress_errors: |
274 |
mutter( |
|
275 |
'(suppressed) mismatched lock context and write group. %r, %r', |
|
276 |
self._write_group, self.get_transaction()) |
|
277 |
return
|
|
3735.2.9
by Robert Collins
Get a working chk_map using inventory implementation bootstrapped. |
278 |
raise errors.BzrError( |
279 |
'mismatched lock context and write group. %r, %r' % |
|
280 |
(self._write_group, self.get_transaction())) |
|
3825.4.1
by Andrew Bennetts
Add suppress_errors to abort_write_group. |
281 |
try: |
282 |
self._abort_write_group() |
|
283 |
except Exception, exc: |
|
284 |
self._write_group = None |
|
285 |
if not suppress_errors: |
|
286 |
raise
|
|
287 |
mutter('abort_write_group failed') |
|
288 |
log_exception_quietly() |
|
6138.3.4
by Jonathan Riddell
add gettext() to uses of trace.note() |
289 |
note(gettext('bzr: ERROR (ignored): %s'), exc) |
2617.6.2
by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit. |
290 |
self._write_group = None |
291 |
||
292 |
def _abort_write_group(self): |
|
293 |
"""Template method for per-repository write group cleanup.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
294 |
|
295 |
This is called during abort before the write group is considered to be
|
|
2617.6.2
by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit. |
296 |
finished and should cleanup any internal state accrued during the write
|
297 |
group. There is no requirement that data handed to the repository be
|
|
298 |
*not* made available - this is not a rollback - but neither should any
|
|
299 |
attempt be made to ensure that data added is fully commited. Abort is
|
|
300 |
invoked when an error has occured so futher disk or network operations
|
|
301 |
may not be possible or may error and if possible should not be
|
|
302 |
attempted.
|
|
303 |
"""
|
|
304 |
||
3221.12.1
by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches. |
305 |
def add_fallback_repository(self, repository): |
306 |
"""Add a repository to use for looking up data not held locally.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
307 |
|
3221.12.1
by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches. |
308 |
:param repository: A repository.
|
309 |
"""
|
|
5815.4.1
by Jelmer Vernooij
Split versionedfile-specific stuff out into VersionedFileRepository. |
310 |
raise NotImplementedError(self.add_fallback_repository) |
3221.12.1
by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches. |
311 |
|
3582.1.7
by Martin Pool
add_fallback_repository gives more detail on incompatibilities |
312 |
def _check_fallback_repository(self, repository): |
3221.12.4
by Robert Collins
Implement basic repository supporting external references. |
313 |
"""Check that this repository can fallback to repository safely.
|
3582.1.7
by Martin Pool
add_fallback_repository gives more detail on incompatibilities |
314 |
|
315 |
Raise an error if not.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
316 |
|
3221.12.4
by Robert Collins
Implement basic repository supporting external references. |
317 |
:param repository: A repository to fallback to.
|
318 |
"""
|
|
3582.1.7
by Martin Pool
add_fallback_repository gives more detail on incompatibilities |
319 |
return InterRepository._assert_same_model(self, repository) |
3221.12.4
by Robert Collins
Implement basic repository supporting external references. |
320 |
|
1732.2.4
by Martin Pool
Split check into Branch.check and Repository.check |
321 |
def all_revision_ids(self): |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
322 |
"""Returns a list of all the revision ids in the repository.
|
1732.2.4
by Martin Pool
Split check into Branch.check and Repository.check |
323 |
|
3221.12.1
by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches. |
324 |
This is conceptually deprecated because code should generally work on
|
325 |
the graph reachable from a particular revision, and ignore any other
|
|
326 |
revisions that might be present. There is no direct replacement
|
|
327 |
method.
|
|
1732.2.4
by Martin Pool
Split check into Branch.check and Repository.check |
328 |
"""
|
2592.3.114
by Robert Collins
More evil mutterings. |
329 |
if 'evil' in debug.debug_flags: |
2850.3.1
by Robert Collins
Move various weave specific code out of the base Repository class to weaverepo.py. |
330 |
mutter_callsite(2, "all_revision_ids is linear with history.") |
3221.12.4
by Robert Collins
Implement basic repository supporting external references. |
331 |
return self._all_revision_ids() |
1732.2.4
by Martin Pool
Split check into Branch.check and Repository.check |
332 |
|
333 |
def _all_revision_ids(self): |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
334 |
"""Returns a list of all the revision ids in the repository.
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
335 |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
336 |
These are in as much topological order as the underlying store can
|
2850.3.1
by Robert Collins
Move various weave specific code out of the base Repository class to weaverepo.py. |
337 |
present.
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
338 |
"""
|
2850.3.1
by Robert Collins
Move various weave specific code out of the base Repository class to weaverepo.py. |
339 |
raise NotImplementedError(self._all_revision_ids) |
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
340 |
|
1687.1.7
by Robert Collins
Teach Repository about break_lock. |
341 |
def break_lock(self): |
342 |
"""Break a lock if one is present from another instance.
|
|
343 |
||
344 |
Uses the ui factory to ask for confirmation if the lock may be from
|
|
345 |
an active process.
|
|
346 |
"""
|
|
347 |
self.control_files.break_lock() |
|
348 |
||
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
349 |
@staticmethod
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
350 |
def create(controldir): |
351 |
"""Construct the current default format repository in controldir."""
|
|
352 |
return RepositoryFormat.get_default_format().initialize(controldir) |
|
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
353 |
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
354 |
def __init__(self, _format, controldir, control_files): |
1556.1.3
by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids |
355 |
"""instantiate a Repository.
|
356 |
||
357 |
:param _format: The format of the repository on disk.
|
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
358 |
:param controldir: The ControlDir of the repository.
|
5815.4.1
by Jelmer Vernooij
Split versionedfile-specific stuff out into VersionedFileRepository. |
359 |
:param control_files: Control files to use for locking, etc.
|
1556.1.3
by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids |
360 |
"""
|
5158.6.4
by Martin Pool
Repository implements ControlComponent too |
361 |
# In the future we will have a single api for all stores for
|
362 |
# getting file texts, inventories and revisions, then
|
|
363 |
# this construct will accept instances of those things.
|
|
1608.2.1
by Martin Pool
[merge] Storage filename escaping |
364 |
super(Repository, self).__init__() |
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
365 |
self._format = _format |
1556.1.3
by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids |
366 |
# the following are part of the public API for Repository:
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
367 |
self.bzrdir = controldir |
1556.1.3
by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids |
368 |
self.control_files = control_files |
2671.4.2
by Robert Collins
Review feedback. |
369 |
# for tests
|
2617.6.1
by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group`` |
370 |
self._write_group = None |
3221.12.1
by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches. |
371 |
# Additional places to query for data.
|
372 |
self._fallback_repositories = [] |
|
1185.65.1
by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch |
373 |
|
5158.6.4
by Martin Pool
Repository implements ControlComponent too |
374 |
@property
|
375 |
def user_transport(self): |
|
376 |
return self.bzrdir.user_transport |
|
377 |
||
378 |
@property
|
|
379 |
def control_transport(self): |
|
380 |
return self._transport |
|
381 |
||
1668.1.3
by Martin Pool
[patch] use the correct transaction when committing snapshot (Malone: #43959) |
382 |
def __repr__(self): |
4509.3.7
by Martin Pool
Show fallbacks in Repository repr |
383 |
if self._fallback_repositories: |
384 |
return '%s(%r, fallback_repositories=%r)' % ( |
|
385 |
self.__class__.__name__, |
|
386 |
self.base, |
|
387 |
self._fallback_repositories) |
|
388 |
else: |
|
389 |
return '%s(%r)' % (self.__class__.__name__, |
|
390 |
self.base) |
|
1668.1.3
by Martin Pool
[patch] use the correct transaction when committing snapshot (Malone: #43959) |
391 |
|
4509.3.37
by Martin Pool
Remove RepositoryBase; make _has_same_location private |
392 |
def _has_same_fallbacks(self, other_repo): |
393 |
"""Returns true if the repositories have the same fallbacks."""
|
|
394 |
my_fb = self._fallback_repositories |
|
395 |
other_fb = other_repo._fallback_repositories |
|
396 |
if len(my_fb) != len(other_fb): |
|
397 |
return False |
|
398 |
for f, g in zip(my_fb, other_fb): |
|
399 |
if not f.has_same_location(g): |
|
400 |
return False |
|
401 |
return True |
|
402 |
||
2671.1.4
by Andrew Bennetts
Rename is_same_repository to has_same_location, thanks Aaron! |
403 |
def has_same_location(self, other): |
2671.1.3
by Andrew Bennetts
Remove Repository.__eq__/__ne__ methods, replace with is_same_repository method. |
404 |
"""Returns a boolean indicating if this repository is at the same
|
405 |
location as another repository.
|
|
406 |
||
407 |
This might return False even when two repository objects are accessing
|
|
408 |
the same physical repository via different URLs.
|
|
409 |
"""
|
|
2592.3.162
by Robert Collins
Remove some arbitrary differences from bzr.dev. |
410 |
if self.__class__ is not other.__class__: |
411 |
return False |
|
6155.1.1
by Jelmer Vernooij
Allow repositories to not have a control_files attribute. |
412 |
return (self.control_url == other.control_url) |
2671.1.1
by Andrew Bennetts
Add support for comparing Repositories with == and != operators. |
413 |
|
2617.6.1
by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group`` |
414 |
def is_in_write_group(self): |
415 |
"""Return True if there is an open write group.
|
|
416 |
||
417 |
:seealso: start_write_group.
|
|
418 |
"""
|
|
419 |
return self._write_group is not None |
|
420 |
||
1694.2.6
by Martin Pool
[merge] bzr.dev |
421 |
def is_locked(self): |
422 |
return self.control_files.is_locked() |
|
423 |
||
2592.3.188
by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency. |
424 |
def is_write_locked(self): |
425 |
"""Return True if this object is write locked."""
|
|
426 |
return self.is_locked() and self.control_files._lock_mode == 'w' |
|
427 |
||
2018.5.75
by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place. |
428 |
def lock_write(self, token=None): |
429 |
"""Lock this repository for writing.
|
|
2617.6.8
by Robert Collins
Review feedback and documentation. |
430 |
|
431 |
This causes caching within the repository obejct to start accumlating
|
|
432 |
data during reads, and allows a 'write_group' to be obtained. Write
|
|
433 |
groups must be used for actual data insertion.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
434 |
|
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
435 |
A token should be passed in if you know that you have locked the object
|
436 |
some other way, and need to synchronise this object's state with that
|
|
437 |
fact.
|
|
438 |
||
439 |
XXX: this docstring is duplicated in many places, e.g. lockable_files.py
|
|
440 |
||
2018.5.75
by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place. |
441 |
:param token: if this is already locked, then lock_write will fail
|
442 |
unless the token matches the existing lock.
|
|
443 |
:returns: a token if this instance supports tokens, otherwise None.
|
|
444 |
:raises TokenLockingNotSupported: when a token is given but this
|
|
445 |
instance doesn't support using token locks.
|
|
446 |
:raises MismatchedToken: if the specified token doesn't match the token
|
|
447 |
of the existing lock.
|
|
2617.6.8
by Robert Collins
Review feedback and documentation. |
448 |
:seealso: start_write_group.
|
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
449 |
:return: A RepositoryWriteLockResult.
|
2018.5.75
by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place. |
450 |
"""
|
4145.1.2
by Robert Collins
Add a refresh_data method on Repository allowing cleaner handling of insertions into RemoteRepository objects with _real_repository instances. |
451 |
locked = self.is_locked() |
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
452 |
token = self.control_files.lock_write(token=token) |
4145.1.2
by Robert Collins
Add a refresh_data method on Repository allowing cleaner handling of insertions into RemoteRepository objects with _real_repository instances. |
453 |
if not locked: |
4840.2.7
by Vincent Ladeuil
Move the _warn_if_deprecated call from repo.__init__ to |
454 |
self._warn_if_deprecated() |
4731.1.5
by Andrew Bennetts
Fix typo. |
455 |
self._note_lock('w') |
4379.2.1
by John Arbash Meinel
Change the fallback repository code to only lock/unlock on transition. |
456 |
for repo in self._fallback_repositories: |
457 |
# Writes don't affect fallback repos
|
|
458 |
repo.lock_read() |
|
4145.1.2
by Robert Collins
Add a refresh_data method on Repository allowing cleaner handling of insertions into RemoteRepository objects with _real_repository instances. |
459 |
self._refresh_data() |
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
460 |
return RepositoryWriteLockResult(self.unlock, token) |
1185.65.1
by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch |
461 |
|
462 |
def lock_read(self): |
|
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
463 |
"""Lock the repository for read operations.
|
464 |
||
465 |
:return: An object with an unlock method which will release the lock
|
|
466 |
obtained.
|
|
467 |
"""
|
|
4145.1.2
by Robert Collins
Add a refresh_data method on Repository allowing cleaner handling of insertions into RemoteRepository objects with _real_repository instances. |
468 |
locked = self.is_locked() |
1553.5.55
by Martin Pool
[revert] broken changes |
469 |
self.control_files.lock_read() |
4145.1.2
by Robert Collins
Add a refresh_data method on Repository allowing cleaner handling of insertions into RemoteRepository objects with _real_repository instances. |
470 |
if not locked: |
4840.2.7
by Vincent Ladeuil
Move the _warn_if_deprecated call from repo.__init__ to |
471 |
self._warn_if_deprecated() |
4731.1.5
by Andrew Bennetts
Fix typo. |
472 |
self._note_lock('r') |
4379.2.1
by John Arbash Meinel
Change the fallback repository code to only lock/unlock on transition. |
473 |
for repo in self._fallback_repositories: |
474 |
repo.lock_read() |
|
4145.1.2
by Robert Collins
Add a refresh_data method on Repository allowing cleaner handling of insertions into RemoteRepository objects with _real_repository instances. |
475 |
self._refresh_data() |
5200.3.6
by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review. |
476 |
return LogicalLockResult(self.unlock) |
1185.65.1
by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch |
477 |
|
1694.2.6
by Martin Pool
[merge] bzr.dev |
478 |
def get_physical_lock_status(self): |
479 |
return self.control_files.get_physical_lock_status() |
|
1624.3.36
by Olaf Conradi
Rename is_transport_locked() to get_physical_lock_status() as the |
480 |
|
2018.5.75
by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place. |
481 |
def leave_lock_in_place(self): |
482 |
"""Tell this repository not to release the physical lock when this
|
|
483 |
object is unlocked.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
484 |
|
2018.5.76
by Andrew Bennetts
Testing that repository.{dont_,}leave_lock_in_place raises NotImplementedError if lock_write returns None. |
485 |
If lock_write doesn't return a token, then this method is not supported.
|
2018.5.75
by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place. |
486 |
"""
|
487 |
self.control_files.leave_in_place() |
|
488 |
||
489 |
def dont_leave_lock_in_place(self): |
|
490 |
"""Tell this repository to release the physical lock when this
|
|
491 |
object is unlocked, even if it didn't originally acquire it.
|
|
2018.5.76
by Andrew Bennetts
Testing that repository.{dont_,}leave_lock_in_place raises NotImplementedError if lock_write returns None. |
492 |
|
493 |
If lock_write doesn't return a token, then this method is not supported.
|
|
2018.5.75
by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place. |
494 |
"""
|
495 |
self.control_files.dont_leave_in_place() |
|
496 |
||
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
497 |
@needs_read_lock
|
2258.1.2
by Robert Collins
New version of gather_stats which gathers aggregate data too. |
498 |
def gather_stats(self, revid=None, committers=None): |
2258.1.1
by Robert Collins
Move info branch statistics gathering into the repository to allow smart server optimisation (Robert Collins). |
499 |
"""Gather statistics from a revision id.
|
500 |
||
2258.1.2
by Robert Collins
New version of gather_stats which gathers aggregate data too. |
501 |
:param revid: The revision id to gather statistics from, if None, then
|
502 |
no revision specific statistics are gathered.
|
|
2258.1.1
by Robert Collins
Move info branch statistics gathering into the repository to allow smart server optimisation (Robert Collins). |
503 |
:param committers: Optional parameter controlling whether to grab
|
2258.1.2
by Robert Collins
New version of gather_stats which gathers aggregate data too. |
504 |
a count of committers from the revision specific statistics.
|
2258.1.1
by Robert Collins
Move info branch statistics gathering into the repository to allow smart server optimisation (Robert Collins). |
505 |
:return: A dictionary of statistics. Currently this contains:
|
506 |
committers: The number of committers if requested.
|
|
507 |
firstrev: A tuple with timestamp, timezone for the penultimate left
|
|
508 |
most ancestor of revid, if revid is not the NULL_REVISION.
|
|
509 |
latestrev: A tuple with timestamp, timezone for revid, if revid is
|
|
510 |
not the NULL_REVISION.
|
|
2258.1.2
by Robert Collins
New version of gather_stats which gathers aggregate data too. |
511 |
revisions: The total revision count in the repository.
|
512 |
size: An estimate disk size of the repository in bytes.
|
|
2258.1.1
by Robert Collins
Move info branch statistics gathering into the repository to allow smart server optimisation (Robert Collins). |
513 |
"""
|
514 |
result = {} |
|
2258.1.2
by Robert Collins
New version of gather_stats which gathers aggregate data too. |
515 |
if revid and committers: |
2258.1.1
by Robert Collins
Move info branch statistics gathering into the repository to allow smart server optimisation (Robert Collins). |
516 |
result['committers'] = 0 |
2258.1.2
by Robert Collins
New version of gather_stats which gathers aggregate data too. |
517 |
if revid and revid != _mod_revision.NULL_REVISION: |
5972.3.14
by Jelmer Vernooij
Use iter_ancestry in gather_stats. |
518 |
graph = self.get_graph() |
2258.1.2
by Robert Collins
New version of gather_stats which gathers aggregate data too. |
519 |
if committers: |
520 |
all_committers = set() |
|
5972.3.14
by Jelmer Vernooij
Use iter_ancestry in gather_stats. |
521 |
revisions = [r for (r, p) in graph.iter_ancestry([revid]) |
522 |
if r != _mod_revision.NULL_REVISION] |
|
523 |
last_revision = None |
|
2258.1.2
by Robert Collins
New version of gather_stats which gathers aggregate data too. |
524 |
if not committers: |
525 |
# ignore the revisions in the middle - just grab first and last
|
|
526 |
revisions = revisions[0], revisions[-1] |
|
527 |
for revision in self.get_revisions(revisions): |
|
5972.3.14
by Jelmer Vernooij
Use iter_ancestry in gather_stats. |
528 |
if not last_revision: |
529 |
last_revision = revision |
|
2258.1.2
by Robert Collins
New version of gather_stats which gathers aggregate data too. |
530 |
if committers: |
531 |
all_committers.add(revision.committer) |
|
5972.3.14
by Jelmer Vernooij
Use iter_ancestry in gather_stats. |
532 |
first_revision = revision |
2258.1.2
by Robert Collins
New version of gather_stats which gathers aggregate data too. |
533 |
if committers: |
534 |
result['committers'] = len(all_committers) |
|
535 |
result['firstrev'] = (first_revision.timestamp, |
|
536 |
first_revision.timezone) |
|
537 |
result['latestrev'] = (last_revision.timestamp, |
|
538 |
last_revision.timezone) |
|
2258.1.1
by Robert Collins
Move info branch statistics gathering into the repository to allow smart server optimisation (Robert Collins). |
539 |
return result |
540 |
||
3140.1.2
by Aaron Bentley
Add ability to find branches inside repositories |
541 |
def find_branches(self, using=False): |
542 |
"""Find branches underneath this repository.
|
|
543 |
||
3140.1.7
by Aaron Bentley
Update docs |
544 |
This will include branches inside other branches.
|
545 |
||
3140.1.2
by Aaron Bentley
Add ability to find branches inside repositories |
546 |
:param using: If True, list only branches using this repository.
|
547 |
"""
|
|
3140.1.9
by Aaron Bentley
Optimize find_branches for standalone repositories |
548 |
if using and not self.is_shared(): |
4997.1.2
by Jelmer Vernooij
Use list_branches rather than open_branch in find_branches. |
549 |
return self.bzrdir.list_branches() |
3140.1.2
by Aaron Bentley
Add ability to find branches inside repositories |
550 |
class Evaluator(object): |
551 |
||
552 |
def __init__(self): |
|
553 |
self.first_call = True |
|
554 |
||
6207.3.3
by jelmer at samba
Fix tests and the like. |
555 |
def __call__(self, controldir): |
556 |
# On the first call, the parameter is always the controldir
|
|
3140.1.2
by Aaron Bentley
Add ability to find branches inside repositories |
557 |
# containing the current repo.
|
558 |
if not self.first_call: |
|
559 |
try: |
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
560 |
repository = controldir.open_repository() |
3140.1.2
by Aaron Bentley
Add ability to find branches inside repositories |
561 |
except errors.NoRepositoryPresent: |
562 |
pass
|
|
563 |
else: |
|
4997.1.2
by Jelmer Vernooij
Use list_branches rather than open_branch in find_branches. |
564 |
return False, ([], repository) |
3140.1.2
by Aaron Bentley
Add ability to find branches inside repositories |
565 |
self.first_call = False |
6207.3.3
by jelmer at samba
Fix tests and the like. |
566 |
value = (controldir.list_branches(), None) |
3140.1.2
by Aaron Bentley
Add ability to find branches inside repositories |
567 |
return True, value |
568 |
||
4997.1.2
by Jelmer Vernooij
Use list_branches rather than open_branch in find_branches. |
569 |
ret = [] |
6207.3.3
by jelmer at samba
Fix tests and the like. |
570 |
for branches, repository in controldir.ControlDir.find_bzrdirs( |
5158.6.10
by Martin Pool
Update more code to use user_transport when it should |
571 |
self.user_transport, evaluate=Evaluator()): |
4997.1.2
by Jelmer Vernooij
Use list_branches rather than open_branch in find_branches. |
572 |
if branches is not None: |
573 |
ret.extend(branches) |
|
3140.1.2
by Aaron Bentley
Add ability to find branches inside repositories |
574 |
if not using and repository is not None: |
4997.1.2
by Jelmer Vernooij
Use list_branches rather than open_branch in find_branches. |
575 |
ret.extend(repository.find_branches()) |
576 |
return ret |
|
3140.1.2
by Aaron Bentley
Add ability to find branches inside repositories |
577 |
|
2258.1.1
by Robert Collins
Move info branch statistics gathering into the repository to allow smart server optimisation (Robert Collins). |
578 |
@needs_read_lock
|
5539.2.10
by Andrew Bennetts
s/NotInOtherForRev/NotInOtherForRevs/, and allow passing multiple revision_ids to search_missing_revision_ids. |
579 |
def search_missing_revision_ids(self, other, |
580 |
revision_id=symbol_versioning.DEPRECATED_PARAMETER, |
|
5852.1.5
by Andrew Bennetts, Jelmer Vernooij
Support limit= for fetching between Bazaar branches. |
581 |
find_ghosts=True, revision_ids=None, if_present_ids=None, |
582 |
limit=None): |
|
3184.1.8
by Robert Collins
* ``InterRepository.missing_revision_ids`` is now deprecated in favour of |
583 |
"""Return the revision ids that other has that this does not.
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
584 |
|
3184.1.8
by Robert Collins
* ``InterRepository.missing_revision_ids`` is now deprecated in favour of |
585 |
These are returned in topological order.
|
586 |
||
587 |
revision_id: only return revision ids included by revision_id.
|
|
588 |
"""
|
|
5539.2.10
by Andrew Bennetts
s/NotInOtherForRev/NotInOtherForRevs/, and allow passing multiple revision_ids to search_missing_revision_ids. |
589 |
if symbol_versioning.deprecated_passed(revision_id): |
590 |
symbol_versioning.warn( |
|
591 |
'search_missing_revision_ids(revision_id=...) was '
|
|
5536.3.3
by Andrew Bennetts
Merge lp:bzr. |
592 |
'deprecated in 2.4. Use revision_ids=[...] instead.', |
5539.2.10
by Andrew Bennetts
s/NotInOtherForRev/NotInOtherForRevs/, and allow passing multiple revision_ids to search_missing_revision_ids. |
593 |
DeprecationWarning, stacklevel=3) |
594 |
if revision_ids is not None: |
|
595 |
raise AssertionError( |
|
596 |
'revision_ids is mutually exclusive with revision_id') |
|
597 |
if revision_id is not None: |
|
598 |
revision_ids = [revision_id] |
|
3184.1.8
by Robert Collins
* ``InterRepository.missing_revision_ids`` is now deprecated in favour of |
599 |
return InterRepository.get(other, self).search_missing_revision_ids( |
5535.3.31
by Andrew Bennetts
Cope with tags that reference missing revisions. |
600 |
find_ghosts=find_ghosts, revision_ids=revision_ids, |
5852.1.5
by Andrew Bennetts, Jelmer Vernooij
Support limit= for fetching between Bazaar branches. |
601 |
if_present_ids=if_present_ids, limit=limit) |
3184.1.8
by Robert Collins
* ``InterRepository.missing_revision_ids`` is now deprecated in favour of |
602 |
|
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
603 |
@staticmethod
|
604 |
def open(base): |
|
605 |
"""Open the repository rooted at base.
|
|
606 |
||
607 |
For instance, if the repository is at URL/.bzr/repository,
|
|
608 |
Repository.open(URL) -> a Repository instance.
|
|
609 |
"""
|
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
610 |
control = controldir.ControlDir.open(base) |
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
611 |
return control.open_repository() |
612 |
||
2387.1.1
by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins) |
613 |
def copy_content_into(self, destination, revision_id=None): |
1534.6.6
by Robert Collins
Move find_repository to bzrdir, its not quite ideal there but its simpler and until someone chooses to vary the search by branch type its completely sufficient. |
614 |
"""Make a complete copy of the content in self into destination.
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
615 |
|
616 |
This is a destructive operation! Do not use it on existing
|
|
1534.6.6
by Robert Collins
Move find_repository to bzrdir, its not quite ideal there but its simpler and until someone chooses to vary the search by branch type its completely sufficient. |
617 |
repositories.
|
618 |
"""
|
|
2387.1.1
by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins) |
619 |
return InterRepository.get(self, destination).copy_content(revision_id) |
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
620 |
|
2617.6.2
by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit. |
621 |
def commit_write_group(self): |
622 |
"""Commit the contents accrued within the current write group.
|
|
2617.6.1
by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group`` |
623 |
|
624 |
:seealso: start_write_group.
|
|
4476.3.70
by Andrew Bennetts
Review tweaks. |
625 |
|
626 |
:return: it may return an opaque hint that can be passed to 'pack'.
|
|
2617.6.1
by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group`` |
627 |
"""
|
628 |
if self._write_group is not self.get_transaction(): |
|
629 |
# has an unlock or relock occured ?
|
|
2592.3.38
by Robert Collins
All experimental format tests passing again. |
630 |
raise errors.BzrError('mismatched lock context %r and ' |
631 |
'write group %r.' % |
|
632 |
(self.get_transaction(), self._write_group)) |
|
4431.3.7
by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts. |
633 |
result = self._commit_write_group() |
2617.6.1
by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group`` |
634 |
self._write_group = None |
4431.3.7
by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts. |
635 |
return result |
2617.6.1
by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group`` |
636 |
|
2617.6.2
by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit. |
637 |
def _commit_write_group(self): |
638 |
"""Template method for per-repository write group cleanup.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
639 |
|
640 |
This is called before the write group is considered to be
|
|
2617.6.2
by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit. |
641 |
finished and should ensure that all data handed to the repository
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
642 |
for writing during the write group is safely committed (to the
|
2617.6.2
by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit. |
643 |
extent possible considering file system caching etc).
|
644 |
"""
|
|
645 |
||
4002.1.1
by Andrew Bennetts
Implement suspend_write_group/resume_write_group. |
646 |
def suspend_write_group(self): |
6280.7.1
by Jelmer Vernooij
Implement RemoteRepository side of write group HPSS methods. |
647 |
"""Suspend a write group.
|
648 |
||
649 |
:raise UnsuspendableWriteGroup: If the write group can not be
|
|
650 |
suspended.
|
|
651 |
:return: List of tokens
|
|
652 |
"""
|
|
4002.1.1
by Andrew Bennetts
Implement suspend_write_group/resume_write_group. |
653 |
raise errors.UnsuspendableWriteGroup(self) |
654 |
||
4145.1.2
by Robert Collins
Add a refresh_data method on Repository allowing cleaner handling of insertions into RemoteRepository objects with _real_repository instances. |
655 |
def refresh_data(self): |
5199.1.3
by Andrew Bennetts
Use Robert's text for the refresh_data docstring. |
656 |
"""Re-read any data needed to synchronise with disk.
|
4145.1.2
by Robert Collins
Add a refresh_data method on Repository allowing cleaner handling of insertions into RemoteRepository objects with _real_repository instances. |
657 |
|
658 |
This method is intended to be called after another repository instance
|
|
659 |
(such as one used by a smart server) has inserted data into the
|
|
5199.1.3
by Andrew Bennetts
Use Robert's text for the refresh_data docstring. |
660 |
repository. On all repositories this will work outside of write groups.
|
661 |
Some repository formats (pack and newer for bzrlib native formats)
|
|
662 |
support refresh_data inside write groups. If called inside a write
|
|
663 |
group on a repository that does not support refreshing in a write group
|
|
664 |
IsInWriteGroupError will be raised.
|
|
4145.1.2
by Robert Collins
Add a refresh_data method on Repository allowing cleaner handling of insertions into RemoteRepository objects with _real_repository instances. |
665 |
"""
|
666 |
self._refresh_data() |
|
667 |
||
4002.1.1
by Andrew Bennetts
Implement suspend_write_group/resume_write_group. |
668 |
def resume_write_group(self, tokens): |
669 |
if not self.is_write_locked(): |
|
670 |
raise errors.NotWriteLocked(self) |
|
671 |
if self._write_group: |
|
672 |
raise errors.BzrError('already in a write group') |
|
673 |
self._resume_write_group(tokens) |
|
674 |
# so we can detect unlock/relock - the write group is now entered.
|
|
675 |
self._write_group = self.get_transaction() |
|
4032.1.1
by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts. |
676 |
|
4002.1.1
by Andrew Bennetts
Implement suspend_write_group/resume_write_group. |
677 |
def _resume_write_group(self, tokens): |
678 |
raise errors.UnsuspendableWriteGroup(self) |
|
679 |
||
6341.1.1
by Jelmer Vernooij
Make fetch_spec specific to bzr format repositories. |
680 |
def fetch(self, source, revision_id=None, find_ghosts=False): |
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
681 |
"""Fetch the content required to construct revision_id from source.
|
682 |
||
6341.1.1
by Jelmer Vernooij
Make fetch_spec specific to bzr format repositories. |
683 |
If revision_id is None, then all content is copied.
|
4070.9.14
by Andrew Bennetts
Tweaks requested by Robert's review. |
684 |
|
4145.1.1
by Robert Collins
Explicitly prevent fetching while the target repository is in a write group. |
685 |
fetch() may not be used when the repository is in a write group -
|
686 |
either finish the current write group before using fetch, or use
|
|
687 |
fetch before starting the write group.
|
|
688 |
||
2949.1.1
by Robert Collins
Change Repository.fetch to provide a find_ghosts parameter which triggers ghost filling. |
689 |
:param find_ghosts: Find and copy revisions in the source that are
|
690 |
ghosts in the target (and not reachable directly by walking out to
|
|
691 |
the first-present revision in target from revision_id).
|
|
4070.9.14
by Andrew Bennetts
Tweaks requested by Robert's review. |
692 |
:param revision_id: If specified, all the content needed for this
|
693 |
revision ID will be copied to the target. Fetch will determine for
|
|
694 |
itself which content needs to be copied.
|
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
695 |
"""
|
4145.1.1
by Robert Collins
Explicitly prevent fetching while the target repository is in a write group. |
696 |
if self.is_in_write_group(): |
4145.1.3
by Robert Collins
NEWS conflicts. |
697 |
raise errors.InternalBzrError( |
698 |
"May not fetch while in a write group.") |
|
2592.3.115
by Robert Collins
Move same repository check up to Repository.fetch to allow all fetch implementations to benefit. |
699 |
# fast path same-url fetch operations
|
4509.3.20
by Martin Pool
Repository.fetch also considers fallbacks in deciding whether to fetch |
700 |
# TODO: lift out to somewhere common with RemoteRepository
|
5243.1.2
by Martin
Point launchpad links in comments at production server rather than edge |
701 |
# <https://bugs.launchpad.net/bzr/+bug/401646>
|
4509.3.32
by Martin Pool
Split out RepositoryBase.has_same_fallbacks |
702 |
if (self.has_same_location(source) |
4509.3.37
by Martin Pool
Remove RepositoryBase; make _has_same_location private |
703 |
and self._has_same_fallbacks(source)): |
2592.3.115
by Robert Collins
Move same repository check up to Repository.fetch to allow all fetch implementations to benefit. |
704 |
# check that last_revision is in 'from' and then return a
|
705 |
# no-operation.
|
|
706 |
if (revision_id is not None and |
|
707 |
not _mod_revision.is_null(revision_id)): |
|
708 |
self.get_revision(revision_id) |
|
709 |
return 0, [] |
|
2323.8.3
by Aaron Bentley
Reduce scope of try/except, update NEWS |
710 |
inter = InterRepository.get(source, self) |
6341.1.1
by Jelmer Vernooij
Make fetch_spec specific to bzr format repositories. |
711 |
return inter.fetch(revision_id=revision_id, find_ghosts=find_ghosts) |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
712 |
|
2520.4.54
by Aaron Bentley
Hang a create_bundle method off repository |
713 |
def create_bundle(self, target, base, fileobj, format=None): |
714 |
return serializer.write_bundle(self, target, base, fileobj, format) |
|
715 |
||
6351.3.2
by Jelmer Vernooij
Convert some gpg options to config stacks. |
716 |
def get_commit_builder(self, branch, parents, config_stack, timestamp=None, |
2803.2.1
by Robert Collins
* CommitBuilder now advertises itself as requiring the root entry to be |
717 |
timezone=None, committer=None, revprops=None, |
5777.6.1
by Jelmer Vernooij
Add --lossy option to 'bzr commit'. |
718 |
revision_id=None, lossy=False): |
1740.3.7
by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder. |
719 |
"""Obtain a CommitBuilder for this repository.
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
720 |
|
1740.3.7
by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder. |
721 |
:param branch: Branch to commit to.
|
722 |
:param parents: Revision ids of the parents of the new revision.
|
|
6351.3.2
by Jelmer Vernooij
Convert some gpg options to config stacks. |
723 |
:param config_stack: Configuration stack to use.
|
1740.3.7
by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder. |
724 |
:param timestamp: Optional timestamp recorded for commit.
|
725 |
:param timezone: Optional timezone for timestamp.
|
|
726 |
:param committer: Optional committer to set for commit.
|
|
727 |
:param revprops: Optional dictionary of revision properties.
|
|
728 |
:param revision_id: Optional revision id.
|
|
5777.6.1
by Jelmer Vernooij
Add --lossy option to 'bzr commit'. |
729 |
:param lossy: Whether to discard data that can not be natively
|
730 |
represented, when pushing to a foreign VCS
|
|
1740.3.7
by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder. |
731 |
"""
|
5815.4.2
by Jelmer Vernooij
split out versionedfile-specific stuff from commitbuilder. |
732 |
raise NotImplementedError(self.get_commit_builder) |
1740.3.1
by Jelmer Vernooij
Introduce and use CommitBuilder objects. |
733 |
|
4634.85.10
by Andrew Bennetts
Change test_unlock_in_write_group to expect a log_exception_quietly rather than a raise. |
734 |
@only_raises(errors.LockNotHeld, errors.LockBroken) |
1185.65.1
by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch |
735 |
def unlock(self): |
2617.6.1
by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group`` |
736 |
if (self.control_files._lock_count == 1 and |
737 |
self.control_files._lock_mode == 'w'): |
|
738 |
if self._write_group is not None: |
|
2592.3.244
by Martin Pool
unlock while in a write group now aborts the write group, unlocks, and errors. |
739 |
self.abort_write_group() |
740 |
self.control_files.unlock() |
|
2617.6.1
by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group`` |
741 |
raise errors.BzrError( |
742 |
'Must end write groups before releasing write locks.') |
|
1185.65.1
by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch |
743 |
self.control_files.unlock() |
3882.6.23
by John Arbash Meinel
Change the XMLSerializer.read_inventory_from_string api. |
744 |
if self.control_files._lock_count == 0: |
4379.2.1
by John Arbash Meinel
Change the fallback repository code to only lock/unlock on transition. |
745 |
for repo in self._fallback_repositories: |
746 |
repo.unlock() |
|
1185.65.1
by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch |
747 |
|
1185.65.27
by Robert Collins
Tweak storage towards mergability. |
748 |
@needs_read_lock
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
749 |
def clone(self, controldir, revision_id=None): |
750 |
"""Clone this repository into controldir using the current format.
|
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
751 |
|
752 |
Currently no check is made that the format of this repository and
|
|
753 |
the bzrdir format are compatible. FIXME RBC 20060201.
|
|
2241.1.4
by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo. |
754 |
|
755 |
:return: The newly created destination repository.
|
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
756 |
"""
|
2440.1.1
by Martin Pool
Add new Repository.sprout, |
757 |
# TODO: deprecate after 0.16; cloning this with all its settings is
|
758 |
# probably not very useful -- mbp 20070423
|
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
759 |
dest_repo = self._create_sprouting_repo( |
760 |
controldir, shared=self.is_shared()) |
|
2440.1.1
by Martin Pool
Add new Repository.sprout, |
761 |
self.copy_content_into(dest_repo, revision_id) |
762 |
return dest_repo |
|
763 |
||
2617.6.1
by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group`` |
764 |
def start_write_group(self): |
765 |
"""Start a write group in the repository.
|
|
766 |
||
767 |
Write groups are used by repositories which do not have a 1:1 mapping
|
|
768 |
between file ids and backend store to manage the insertion of data from
|
|
769 |
both fetch and commit operations.
|
|
770 |
||
2617.6.2
by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit. |
771 |
A write lock is required around the start_write_group/commit_write_group
|
2617.6.1
by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group`` |
772 |
for the support of lock-requiring repository formats.
|
2617.6.8
by Robert Collins
Review feedback and documentation. |
773 |
|
774 |
One can only insert data into a repository inside a write group.
|
|
775 |
||
2617.6.6
by Robert Collins
Some review feedback. |
776 |
:return: None.
|
2617.6.1
by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group`` |
777 |
"""
|
2592.3.188
by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency. |
778 |
if not self.is_write_locked(): |
2617.6.1
by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group`` |
779 |
raise errors.NotWriteLocked(self) |
780 |
if self._write_group: |
|
781 |
raise errors.BzrError('already in a write group') |
|
2617.6.2
by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit. |
782 |
self._start_write_group() |
783 |
# so we can detect unlock/relock - the write group is now entered.
|
|
2617.6.1
by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group`` |
784 |
self._write_group = self.get_transaction() |
785 |
||
2617.6.2
by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit. |
786 |
def _start_write_group(self): |
787 |
"""Template method for per-repository write group startup.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
788 |
|
789 |
This is called before the write group is considered to be
|
|
2617.6.2
by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit. |
790 |
entered.
|
791 |
"""
|
|
792 |
||
2440.1.1
by Martin Pool
Add new Repository.sprout, |
793 |
@needs_read_lock
|
794 |
def sprout(self, to_bzrdir, revision_id=None): |
|
795 |
"""Create a descendent repository for new development.
|
|
796 |
||
797 |
Unlike clone, this does not copy the settings of the repository.
|
|
798 |
"""
|
|
799 |
dest_repo = self._create_sprouting_repo(to_bzrdir, shared=False) |
|
800 |
dest_repo.fetch(self, revision_id=revision_id) |
|
801 |
return dest_repo |
|
802 |
||
803 |
def _create_sprouting_repo(self, a_bzrdir, shared): |
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
804 |
if not isinstance(a_bzrdir._format, self.bzrdir._format.__class__): |
805 |
# use target default format.
|
|
2241.1.4
by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo. |
806 |
dest_repo = a_bzrdir.create_repository() |
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
807 |
else: |
2241.1.4
by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo. |
808 |
# Most control formats need the repository to be specifically
|
809 |
# created, but on some old all-in-one formats it's not needed
|
|
810 |
try: |
|
2440.1.1
by Martin Pool
Add new Repository.sprout, |
811 |
dest_repo = self._format.initialize(a_bzrdir, shared=shared) |
2241.1.4
by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo. |
812 |
except errors.UninitializableFormat: |
813 |
dest_repo = a_bzrdir.open_repository() |
|
814 |
return dest_repo |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
815 |
|
1563.2.22
by Robert Collins
Move responsibility for repository.has_revision into RevisionStore |
816 |
@needs_read_lock
|
1185.65.1
by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch |
817 |
def has_revision(self, revision_id): |
1563.2.22
by Robert Collins
Move responsibility for repository.has_revision into RevisionStore |
818 |
"""True if this repository has a copy of the revision."""
|
3172.3.1
by Robert Collins
Repository has a new method ``has_revisions`` which signals the presence |
819 |
return revision_id in self.has_revisions((revision_id,)) |
820 |
||
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
821 |
@needs_read_lock
|
3172.3.1
by Robert Collins
Repository has a new method ``has_revisions`` which signals the presence |
822 |
def has_revisions(self, revision_ids): |
823 |
"""Probe to find out the presence of multiple revisions.
|
|
824 |
||
825 |
:param revision_ids: An iterable of revision_ids.
|
|
826 |
:return: A set of the revision_ids that were present.
|
|
827 |
"""
|
|
5815.4.1
by Jelmer Vernooij
Split versionedfile-specific stuff out into VersionedFileRepository. |
828 |
raise NotImplementedError(self.has_revisions) |
1185.65.1
by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch |
829 |
|
1185.65.27
by Robert Collins
Tweak storage towards mergability. |
830 |
@needs_read_lock
|
2850.3.1
by Robert Collins
Move various weave specific code out of the base Repository class to weaverepo.py. |
831 |
def get_revision(self, revision_id): |
832 |
"""Return the Revision object for a named revision."""
|
|
833 |
return self.get_revisions([revision_id])[0] |
|
834 |
||
1570.1.13
by Robert Collins
Check for incorrect revision parentage in the weave during revision access. |
835 |
def get_revision_reconcile(self, revision_id): |
836 |
"""'reconcile' helper routine that allows access to a revision always.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
837 |
|
1570.1.13
by Robert Collins
Check for incorrect revision parentage in the weave during revision access. |
838 |
This variant of get_revision does not cross check the weave graph
|
839 |
against the revision one as get_revision does: but it should only
|
|
840 |
be used by reconcile, or reconcile-alike commands that are correcting
|
|
841 |
or testing the revision graph.
|
|
842 |
"""
|
|
5815.4.1
by Jelmer Vernooij
Split versionedfile-specific stuff out into VersionedFileRepository. |
843 |
raise NotImplementedError(self.get_revision_reconcile) |
2249.5.13
by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids. |
844 |
|
1756.1.2
by Aaron Bentley
Show logs using get_revisions |
845 |
def get_revisions(self, revision_ids): |
4332.3.16
by Robert Collins
Refactor Repository._find_inconsistent_revision_parents and Repository.get_revisions to a new Repository._iter_revisions which is kinder on memory without needing code duplication. |
846 |
"""Get many revisions at once.
|
847 |
|
|
848 |
Repositories that need to check data on every revision read should
|
|
849 |
subclass this method.
|
|
850 |
"""
|
|
5815.4.1
by Jelmer Vernooij
Split versionedfile-specific stuff out into VersionedFileRepository. |
851 |
raise NotImplementedError(self.get_revisions) |
1185.65.1
by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch |
852 |
|
4137.3.2
by Ian Clatworthy
Repository.get_deltas_for_revisions() now supports file-id filtering |
853 |
def get_deltas_for_revisions(self, revisions, specific_fileids=None): |
1756.3.19
by Aaron Bentley
Documentation and cleanups |
854 |
"""Produce a generator of revision deltas.
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
855 |
|
1756.3.19
by Aaron Bentley
Documentation and cleanups |
856 |
Note that the input is a sequence of REVISIONS, not revision_ids.
|
857 |
Trees will be held in memory until the generator exits.
|
|
858 |
Each delta is relative to the revision's lefthand predecessor.
|
|
4137.3.2
by Ian Clatworthy
Repository.get_deltas_for_revisions() now supports file-id filtering |
859 |
|
860 |
:param specific_fileids: if not None, the result is filtered
|
|
861 |
so that only those file-ids, their parents and their
|
|
862 |
children are included.
|
|
1756.3.19
by Aaron Bentley
Documentation and cleanups |
863 |
"""
|
4137.3.2
by Ian Clatworthy
Repository.get_deltas_for_revisions() now supports file-id filtering |
864 |
# Get the revision-ids of interest
|
1756.3.3
by Aaron Bentley
More refactoring, introduce revision_trees. |
865 |
required_trees = set() |
866 |
for revision in revisions: |
|
867 |
required_trees.add(revision.revision_id) |
|
868 |
required_trees.update(revision.parent_ids[:1]) |
|
4137.3.2
by Ian Clatworthy
Repository.get_deltas_for_revisions() now supports file-id filtering |
869 |
|
870 |
# Get the matching filtered trees. Note that it's more
|
|
871 |
# efficient to pass filtered trees to changes_from() rather
|
|
872 |
# than doing the filtering afterwards. changes_from() could
|
|
873 |
# arguably do the filtering itself but it's path-based, not
|
|
874 |
# file-id based, so filtering before or afterwards is
|
|
875 |
# currently easier.
|
|
876 |
if specific_fileids is None: |
|
877 |
trees = dict((t.get_revision_id(), t) for |
|
878 |
t in self.revision_trees(required_trees)) |
|
879 |
else: |
|
880 |
trees = dict((t.get_revision_id(), t) for |
|
881 |
t in self._filtered_revision_trees(required_trees, |
|
882 |
specific_fileids)) |
|
883 |
||
884 |
# Calculate the deltas
|
|
1756.3.3
by Aaron Bentley
More refactoring, introduce revision_trees. |
885 |
for revision in revisions: |
886 |
if not revision.parent_ids: |
|
3668.5.1
by Jelmer Vernooij
Use NULL_REVISION rather than None for Repository.revision_tree(). |
887 |
old_tree = self.revision_tree(_mod_revision.NULL_REVISION) |
1756.3.3
by Aaron Bentley
More refactoring, introduce revision_trees. |
888 |
else: |
889 |
old_tree = trees[revision.parent_ids[0]] |
|
1852.10.3
by Robert Collins
Remove all uses of compare_trees and replace with Tree.changes_from throughout bzrlib. |
890 |
yield trees[revision.revision_id].changes_from(old_tree) |
1756.3.3
by Aaron Bentley
More refactoring, introduce revision_trees. |
891 |
|
1756.3.19
by Aaron Bentley
Documentation and cleanups |
892 |
@needs_read_lock
|
4137.3.2
by Ian Clatworthy
Repository.get_deltas_for_revisions() now supports file-id filtering |
893 |
def get_revision_delta(self, revision_id, specific_fileids=None): |
1744.2.2
by Johan Rydberg
Add get_revision_delta to Repository; and make Branch.get_revision_delta use it. |
894 |
"""Return the delta for one revision.
|
895 |
||
896 |
The delta is relative to the left-hand predecessor of the
|
|
897 |
revision.
|
|
4137.3.2
by Ian Clatworthy
Repository.get_deltas_for_revisions() now supports file-id filtering |
898 |
|
899 |
:param specific_fileids: if not None, the result is filtered
|
|
900 |
so that only those file-ids, their parents and their
|
|
901 |
children are included.
|
|
1744.2.2
by Johan Rydberg
Add get_revision_delta to Repository; and make Branch.get_revision_delta use it. |
902 |
"""
|
1756.3.3
by Aaron Bentley
More refactoring, introduce revision_trees. |
903 |
r = self.get_revision(revision_id) |
4137.3.2
by Ian Clatworthy
Repository.get_deltas_for_revisions() now supports file-id filtering |
904 |
return list(self.get_deltas_for_revisions([r], |
905 |
specific_fileids=specific_fileids))[0] |
|
1744.2.2
by Johan Rydberg
Add get_revision_delta to Repository; and make Branch.get_revision_delta use it. |
906 |
|
1185.65.1
by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch |
907 |
@needs_write_lock
|
908 |
def store_revision_signature(self, gpg_strategy, plaintext, revision_id): |
|
1563.2.29
by Robert Collins
Remove all but fetch references to repository.revision_store. |
909 |
signature = gpg_strategy.sign(plaintext) |
2996.2.4
by Aaron Bentley
Rename function to add_signature_text |
910 |
self.add_signature_text(revision_id, signature) |
2996.2.3
by Aaron Bentley
Add tests for install_revisions and add_signature |
911 |
|
2996.2.4
by Aaron Bentley
Rename function to add_signature_text |
912 |
def add_signature_text(self, revision_id, signature): |
5815.4.1
by Jelmer Vernooij
Split versionedfile-specific stuff out into VersionedFileRepository. |
913 |
"""Store a signature text for a revision.
|
914 |
||
915 |
:param revision_id: Revision id of the revision
|
|
916 |
:param signature: Signature text.
|
|
917 |
"""
|
|
918 |
raise NotImplementedError(self.add_signature_text) |
|
2592.3.110
by Robert Collins
Filter out texts and signatures not referenced by the revisions being copied during pack to pack fetching. |
919 |
|
4360.4.10
by John Arbash Meinel
Remove some of the code duplication. |
920 |
def _find_parent_ids_of_revisions(self, revision_ids): |
921 |
"""Find all parent ids that are mentioned in the revision graph.
|
|
922 |
||
923 |
:return: set of revisions that are parents of revision_ids which are
|
|
924 |
not part of revision_ids themselves
|
|
925 |
"""
|
|
926 |
parent_map = self.get_parent_map(revision_ids) |
|
4360.4.12
by John Arbash Meinel
Work out some issues with revision_ids vs revision_keys. |
927 |
parent_ids = set() |
928 |
map(parent_ids.update, parent_map.itervalues()) |
|
929 |
parent_ids.difference_update(revision_ids) |
|
930 |
parent_ids.discard(_mod_revision.NULL_REVISION) |
|
931 |
return parent_ids |
|
932 |
||
2708.1.7
by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes |
933 |
def iter_files_bytes(self, desired_files): |
2708.1.9
by Aaron Bentley
Clean-up docs and imports |
934 |
"""Iterate through file versions.
|
935 |
||
2708.1.10
by Aaron Bentley
Update docstrings |
936 |
Files will not necessarily be returned in the order they occur in
|
937 |
desired_files. No specific order is guaranteed.
|
|
938 |
||
2708.1.9
by Aaron Bentley
Clean-up docs and imports |
939 |
Yields pairs of identifier, bytes_iterator. identifier is an opaque
|
2708.1.10
by Aaron Bentley
Update docstrings |
940 |
value supplied by the caller as part of desired_files. It should
|
941 |
uniquely identify the file version in the caller's context. (Examples:
|
|
942 |
an index number or a TreeTransform trans_id.)
|
|
943 |
||
2708.1.9
by Aaron Bentley
Clean-up docs and imports |
944 |
:param desired_files: a list of (file_id, revision_id, identifier)
|
2708.1.10
by Aaron Bentley
Update docstrings |
945 |
triples
|
2708.1.9
by Aaron Bentley
Clean-up docs and imports |
946 |
"""
|
5815.4.1
by Jelmer Vernooij
Split versionedfile-specific stuff out into VersionedFileRepository. |
947 |
raise NotImplementedError(self.iter_files_bytes) |
1185.65.1
by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch |
948 |
|
4419.2.5
by Andrew Bennetts
Add Repository.get_rev_id_for_revno, and use it both as the _ensure_real fallback and as the server-side implementation. |
949 |
def get_rev_id_for_revno(self, revno, known_pair): |
950 |
"""Return the revision id of a revno, given a later (revno, revid)
|
|
951 |
pair in the same history.
|
|
952 |
||
953 |
:return: if found (True, revid). If the available history ran out
|
|
954 |
before reaching the revno, then this returns
|
|
955 |
(False, (closest_revno, closest_revid)).
|
|
956 |
"""
|
|
957 |
known_revno, known_revid = known_pair |
|
958 |
partial_history = [known_revid] |
|
959 |
distance_from_known = known_revno - revno |
|
960 |
if distance_from_known < 0: |
|
961 |
raise ValueError( |
|
962 |
'requested revno (%d) is later than given known revno (%d)' |
|
963 |
% (revno, known_revno)) |
|
964 |
try: |
|
4419.2.9
by Andrew Bennetts
Add per_repository_reference test for get_rev_id_for_revno, fix the bugs it revealed. |
965 |
_iter_for_revno( |
966 |
self, partial_history, stop_index=distance_from_known) |
|
4419.2.5
by Andrew Bennetts
Add Repository.get_rev_id_for_revno, and use it both as the _ensure_real fallback and as the server-side implementation. |
967 |
except errors.RevisionNotPresent, err: |
4419.2.6
by Andrew Bennetts
Add tests for server-side logic, and fix the bugs exposed by those tests. |
968 |
if err.revision_id == known_revid: |
969 |
# The start revision (known_revid) wasn't found.
|
|
970 |
raise
|
|
971 |
# This is a stacked repository with no fallbacks, or a there's a
|
|
972 |
# left-hand ghost. Either way, even though the revision named in
|
|
973 |
# the error isn't in this repo, we know it's the next step in this
|
|
974 |
# left-hand history.
|
|
4419.2.5
by Andrew Bennetts
Add Repository.get_rev_id_for_revno, and use it both as the _ensure_real fallback and as the server-side implementation. |
975 |
partial_history.append(err.revision_id) |
4419.2.6
by Andrew Bennetts
Add tests for server-side logic, and fix the bugs exposed by those tests. |
976 |
if len(partial_history) <= distance_from_known: |
977 |
# Didn't find enough history to get a revid for the revno.
|
|
978 |
earliest_revno = known_revno - len(partial_history) + 1 |
|
4419.2.5
by Andrew Bennetts
Add Repository.get_rev_id_for_revno, and use it both as the _ensure_real fallback and as the server-side implementation. |
979 |
return (False, (earliest_revno, partial_history[-1])) |
4419.2.6
by Andrew Bennetts
Add tests for server-side logic, and fix the bugs exposed by those tests. |
980 |
if len(partial_history) - 1 > distance_from_known: |
4419.2.5
by Andrew Bennetts
Add Repository.get_rev_id_for_revno, and use it both as the _ensure_real fallback and as the server-side implementation. |
981 |
raise AssertionError('_iter_for_revno returned too much history') |
982 |
return (True, partial_history[-1]) |
|
983 |
||
1534.6.3
by Robert Collins
find_repository sufficiently robust. |
984 |
def is_shared(self): |
985 |
"""Return True if this repository is flagged as a shared repository."""
|
|
1596.2.12
by Robert Collins
Merge and make Knit Repository use the revision store for all possible queries. |
986 |
raise NotImplementedError(self.is_shared) |
1534.6.3
by Robert Collins
find_repository sufficiently robust. |
987 |
|
1594.2.7
by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc. |
988 |
@needs_write_lock
|
1692.1.1
by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow |
989 |
def reconcile(self, other=None, thorough=False): |
1594.2.7
by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc. |
990 |
"""Reconcile this repository."""
|
991 |
from bzrlib.reconcile import RepoReconciler |
|
1692.1.1
by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow |
992 |
reconciler = RepoReconciler(self, thorough=thorough) |
1594.2.7
by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc. |
993 |
reconciler.reconcile() |
994 |
return reconciler |
|
2440.1.1
by Martin Pool
Add new Repository.sprout, |
995 |
|
2617.6.2
by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit. |
996 |
def _refresh_data(self): |
997 |
"""Helper called from lock_* to ensure coherency with disk.
|
|
998 |
||
999 |
The default implementation does nothing; it is however possible
|
|
1000 |
for repositories to maintain loaded indices across multiple locks
|
|
1001 |
by checking inside their implementation of this method to see
|
|
1002 |
whether their indices are still valid. This depends of course on
|
|
4145.1.2
by Robert Collins
Add a refresh_data method on Repository allowing cleaner handling of insertions into RemoteRepository objects with _real_repository instances. |
1003 |
the disk format being validatable in this manner. This method is
|
1004 |
also called by the refresh_data() public interface to cause a refresh
|
|
1005 |
to occur while in a write lock so that data inserted by a smart server
|
|
1006 |
push operation is visible on the client's instance of the physical
|
|
1007 |
repository.
|
|
2617.6.2
by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit. |
1008 |
"""
|
1009 |
||
1534.6.3
by Robert Collins
find_repository sufficiently robust. |
1010 |
@needs_read_lock
|
1185.65.1
by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch |
1011 |
def revision_tree(self, revision_id): |
1012 |
"""Return Tree for a revision on this branch.
|
|
1013 |
||
3668.5.2
by Jelmer Vernooij
Fix docstring. |
1014 |
`revision_id` may be NULL_REVISION for the empty tree revision.
|
1852.5.1
by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree. |
1015 |
"""
|
5815.4.1
by Jelmer Vernooij
Split versionedfile-specific stuff out into VersionedFileRepository. |
1016 |
raise NotImplementedError(self.revision_tree) |
1185.65.1
by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch |
1017 |
|
1756.3.3
by Aaron Bentley
More refactoring, introduce revision_trees. |
1018 |
def revision_trees(self, revision_ids): |
4137.3.2
by Ian Clatworthy
Repository.get_deltas_for_revisions() now supports file-id filtering |
1019 |
"""Return Trees for revisions in this repository.
|
1756.3.3
by Aaron Bentley
More refactoring, introduce revision_trees. |
1020 |
|
4137.3.2
by Ian Clatworthy
Repository.get_deltas_for_revisions() now supports file-id filtering |
1021 |
:param revision_ids: a sequence of revision-ids;
|
1022 |
a revision-id may not be None or 'null:'
|
|
1023 |
"""
|
|
5815.4.1
by Jelmer Vernooij
Split versionedfile-specific stuff out into VersionedFileRepository. |
1024 |
raise NotImplementedError(self.revision_trees) |
4137.3.2
by Ian Clatworthy
Repository.get_deltas_for_revisions() now supports file-id filtering |
1025 |
|
5108.1.1
by Parth Malwankar
initial support for 'pack --clean-obsolete-packs'. tested only manually. |
1026 |
def pack(self, hint=None, clean_obsolete_packs=False): |
2604.2.1
by Robert Collins
(robertc) Introduce a pack command. |
1027 |
"""Compress the data within the repository.
|
1028 |
||
1029 |
This operation only makes sense for some repository types. For other
|
|
1030 |
types it should be a no-op that just returns.
|
|
1031 |
||
1032 |
This stub method does not require a lock, but subclasses should use
|
|
5448.2.1
by Martin
Fix some "its" vs. "it's" spelling confusion in bzrlib code... also, ahem, a name in the NEWS file |
1033 |
@needs_write_lock as this is a long running call it's reasonable to
|
2604.2.1
by Robert Collins
(robertc) Introduce a pack command. |
1034 |
implicitly lock for the user.
|
4431.3.7
by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts. |
1035 |
|
1036 |
:param hint: If not supplied, the whole repository is packed.
|
|
1037 |
If supplied, the repository may use the hint parameter as a
|
|
1038 |
hint for the parts of the repository to pack. A hint can be
|
|
1039 |
obtained from the result of commit_write_group(). Out of
|
|
1040 |
date hints are simply ignored, because concurrent operations
|
|
1041 |
can obsolete them rapidly.
|
|
5108.1.1
by Parth Malwankar
initial support for 'pack --clean-obsolete-packs'. tested only manually. |
1042 |
|
1043 |
:param clean_obsolete_packs: Clean obsolete packs immediately after
|
|
1044 |
the pack operation.
|
|
2604.2.1
by Robert Collins
(robertc) Introduce a pack command. |
1045 |
"""
|
1046 |
||
1185.65.1
by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch |
1047 |
def get_transaction(self): |
1048 |
return self.control_files.get_transaction() |
|
1049 |
||
3517.4.17
by Martin Pool
Redo base Repository.get_parent_map to use .revisions graph |
1050 |
def get_parent_map(self, revision_ids): |
4379.3.3
by Gary van der Merwe
Rename and add doc string for StackedParentsProvider. |
1051 |
"""See graph.StackedParentsProvider.get_parent_map"""
|
5815.4.1
by Jelmer Vernooij
Split versionedfile-specific stuff out into VersionedFileRepository. |
1052 |
raise NotImplementedError(self.get_parent_map) |
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
1053 |
|
5816.8.1
by Andrew Bennetts
Be a little more clever about constructing a parents provider for stacked repositories, so that get_parent_map with local-stacked-on-remote doesn't use HPSS VFS calls. |
1054 |
def _get_parent_map_no_fallbacks(self, revision_ids): |
1055 |
"""Same as Repository.get_parent_map except doesn't query fallbacks."""
|
|
1056 |
# revisions index works in keys; this just works in revisions
|
|
1057 |
# therefore wrap and unwrap
|
|
1058 |
query_keys = [] |
|
1059 |
result = {} |
|
1060 |
for revision_id in revision_ids: |
|
1061 |
if revision_id == _mod_revision.NULL_REVISION: |
|
1062 |
result[revision_id] = () |
|
1063 |
elif revision_id is None: |
|
1064 |
raise ValueError('get_parent_map(None) is not valid') |
|
1065 |
else: |
|
1066 |
query_keys.append((revision_id ,)) |
|
1067 |
vf = self.revisions.without_fallbacks() |
|
1068 |
for ((revision_id,), parent_keys) in \ |
|
1069 |
vf.get_parent_map(query_keys).iteritems(): |
|
1070 |
if parent_keys: |
|
1071 |
result[revision_id] = tuple([parent_revid |
|
1072 |
for (parent_revid,) in parent_keys]) |
|
1073 |
else: |
|
1074 |
result[revision_id] = (_mod_revision.NULL_REVISION,) |
|
1075 |
return result |
|
1076 |
||
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
1077 |
def _make_parents_provider(self): |
5816.8.1
by Andrew Bennetts
Be a little more clever about constructing a parents provider for stacked repositories, so that get_parent_map with local-stacked-on-remote doesn't use HPSS VFS calls. |
1078 |
if not self._format.supports_external_lookups: |
1079 |
return self |
|
5816.8.3
by Andrew Bennetts
Add test for calling add_fallback_repository after _make_parents_provider, and make it work. |
1080 |
return graph.StackedParentsProvider(_LazyListJoin( |
1081 |
[self._make_parents_provider_unstacked()], |
|
1082 |
self._fallback_repositories)) |
|
5816.8.1
by Andrew Bennetts
Be a little more clever about constructing a parents provider for stacked repositories, so that get_parent_map with local-stacked-on-remote doesn't use HPSS VFS calls. |
1083 |
|
5816.8.3
by Andrew Bennetts
Add test for calling add_fallback_repository after _make_parents_provider, and make it work. |
1084 |
def _make_parents_provider_unstacked(self): |
5816.8.1
by Andrew Bennetts
Be a little more clever about constructing a parents provider for stacked repositories, so that get_parent_map with local-stacked-on-remote doesn't use HPSS VFS calls. |
1085 |
return graph.CallableToParentsProviderAdapter( |
1086 |
self._get_parent_map_no_fallbacks) |
|
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
1087 |
|
4913.4.2
by Jelmer Vernooij
Add Repository.get_known_graph_ancestry. |
1088 |
@needs_read_lock
|
1089 |
def get_known_graph_ancestry(self, revision_ids): |
|
1090 |
"""Return the known graph for a set of revision ids and their ancestors.
|
|
1091 |
"""
|
|
5815.4.1
by Jelmer Vernooij
Split versionedfile-specific stuff out into VersionedFileRepository. |
1092 |
raise NotImplementedError(self.get_known_graph_ancestry) |
4913.4.2
by Jelmer Vernooij
Add Repository.get_known_graph_ancestry. |
1093 |
|
5815.5.8
by Jelmer Vernooij
Use traditional (fileid, revision) entries in file graph. |
1094 |
def get_file_graph(self): |
1095 |
"""Return the graph walker for files."""
|
|
5815.5.3
by Jelmer Vernooij
Add basic test for per file graph. |
1096 |
raise NotImplementedError(self.get_file_graph) |
5815.5.1
by Jelmer Vernooij
Add Repository.get_file_graph. |
1097 |
|
2490.2.21
by Aaron Bentley
Rename graph to deprecated_graph |
1098 |
def get_graph(self, other_repository=None): |
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
1099 |
"""Return the graph walker for this repository format"""
|
1100 |
parents_provider = self._make_parents_provider() |
|
2490.2.14
by Aaron Bentley
Avoid StackedParentsProvider when underlying repos match |
1101 |
if (other_repository is not None and |
3211.3.1
by Jelmer Vernooij
Use convenience function to check whether two repository handles are referring to the same repository. |
1102 |
not self.has_same_location(other_repository)): |
4379.3.3
by Gary van der Merwe
Rename and add doc string for StackedParentsProvider. |
1103 |
parents_provider = graph.StackedParentsProvider( |
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
1104 |
[parents_provider, other_repository._make_parents_provider()]) |
2490.2.22
by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher |
1105 |
return graph.Graph(parents_provider) |
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
1106 |
|
1185.65.27
by Robert Collins
Tweak storage towards mergability. |
1107 |
@needs_write_lock
|
1534.6.5
by Robert Collins
Cloning of repos preserves shared and make-working-tree attributes. |
1108 |
def set_make_working_trees(self, new_value): |
1109 |
"""Set the policy flag for making working trees when creating branches.
|
|
1110 |
||
1111 |
This only applies to branches that use this repository.
|
|
1112 |
||
1113 |
The default is 'True'.
|
|
1114 |
:param new_value: True to restore the default, False to disable making
|
|
1115 |
working trees.
|
|
1116 |
"""
|
|
1596.2.12
by Robert Collins
Merge and make Knit Repository use the revision store for all possible queries. |
1117 |
raise NotImplementedError(self.set_make_working_trees) |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1118 |
|
1534.6.5
by Robert Collins
Cloning of repos preserves shared and make-working-tree attributes. |
1119 |
def make_working_trees(self): |
1120 |
"""Returns the policy for making working trees on new branches."""
|
|
1596.2.12
by Robert Collins
Merge and make Knit Repository use the revision store for all possible queries. |
1121 |
raise NotImplementedError(self.make_working_trees) |
1534.6.5
by Robert Collins
Cloning of repos preserves shared and make-working-tree attributes. |
1122 |
|
1123 |
@needs_write_lock
|
|
1185.65.1
by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch |
1124 |
def sign_revision(self, revision_id, gpg_strategy): |
5815.4.4
by Jelmer Vernooij
Remove unused imports. |
1125 |
testament = _mod_testament.Testament.from_revision(self, revision_id) |
1126 |
plaintext = testament.as_short_text() |
|
1185.65.1
by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch |
1127 |
self.store_revision_signature(gpg_strategy, plaintext, revision_id) |
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
1128 |
|
5971.1.45
by Jonathan Riddell
use read lock instead of write lock |
1129 |
@needs_read_lock
|
6257.3.1
by Jelmer Vernooij
Support verifying remote signatures. |
1130 |
def verify_revision_signature(self, revision_id, gpg_strategy): |
5971.1.7
by Jonathan Riddell
add method docs |
1131 |
"""Verify the signature on a revision.
|
6491.1.4
by Jelmer Vernooij
Deprecate GPGStrategy.do_verifications. |
1132 |
|
5971.1.7
by Jonathan Riddell
add method docs |
1133 |
:param revision_id: the revision to verify
|
1134 |
:gpg_strategy: the GPGStrategy object to used
|
|
6491.1.4
by Jelmer Vernooij
Deprecate GPGStrategy.do_verifications. |
1135 |
|
5971.1.7
by Jonathan Riddell
add method docs |
1136 |
:return: gpg.SIGNATURE_VALID or a failed SIGNATURE_ value
|
1137 |
"""
|
|
5971.1.2
by Jonathan Riddell
give result to user |
1138 |
if not self.has_signature_for_revision_id(revision_id): |
5971.1.20
by Jonathan Riddell
add verbose for bad signatures too |
1139 |
return gpg.SIGNATURE_NOT_SIGNED, None |
5971.1.1
by Jonathan Riddell
add a verify command |
1140 |
signature = self.get_signature_text(revision_id) |
5971.1.30
by Jonathan Riddell
check the testament actually matches the commit when validating |
1141 |
|
1142 |
testament = _mod_testament.Testament.from_revision(self, revision_id) |
|
1143 |
plaintext = testament.as_short_text() |
|
1144 |
||
1145 |
return gpg_strategy.verify(signature, plaintext) |
|
5971.1.1
by Jonathan Riddell
add a verify command |
1146 |
|
6491.1.4
by Jelmer Vernooij
Deprecate GPGStrategy.do_verifications. |
1147 |
@needs_read_lock
|
1148 |
def verify_revision_signatures(self, revision_ids, gpg_strategy): |
|
1149 |
"""Verify revision signatures for a number of revisions.
|
|
1150 |
||
1151 |
:param revision_id: the revision to verify
|
|
1152 |
:gpg_strategy: the GPGStrategy object to used
|
|
6491.1.5
by Jelmer Vernooij
Add Repository.verify_revision_signatures. |
1153 |
:return: Iterator over tuples with revision id, result and keys
|
6491.1.4
by Jelmer Vernooij
Deprecate GPGStrategy.do_verifications. |
1154 |
"""
|
6491.1.5
by Jelmer Vernooij
Add Repository.verify_revision_signatures. |
1155 |
for revid in revision_ids: |
6491.1.6
by Jelmer Vernooij
Fix test. |
1156 |
(result, key) = self.verify_revision_signature(revid, gpg_strategy) |
6491.1.5
by Jelmer Vernooij
Add Repository.verify_revision_signatures. |
1157 |
yield revid, result, key |
6491.1.4
by Jelmer Vernooij
Deprecate GPGStrategy.do_verifications. |
1158 |
|
1563.2.29
by Robert Collins
Remove all but fetch references to repository.revision_store. |
1159 |
def has_signature_for_revision_id(self, revision_id): |
1160 |
"""Query for a revision signature for revision_id in the repository."""
|
|
5815.4.1
by Jelmer Vernooij
Split versionedfile-specific stuff out into VersionedFileRepository. |
1161 |
raise NotImplementedError(self.has_signature_for_revision_id) |
1563.2.29
by Robert Collins
Remove all but fetch references to repository.revision_store. |
1162 |
|
1563.2.31
by Robert Collins
Convert Knit repositories to use knits. |
1163 |
def get_signature_text(self, revision_id): |
1164 |
"""Return the text for a signature."""
|
|
5815.4.1
by Jelmer Vernooij
Split versionedfile-specific stuff out into VersionedFileRepository. |
1165 |
raise NotImplementedError(self.get_signature_text) |
1563.2.31
by Robert Collins
Convert Knit repositories to use knits. |
1166 |
|
4332.3.11
by Robert Collins
Move tree and back callbacks into the repository check core. |
1167 |
def check(self, revision_ids=None, callback_refs=None, check_repo=True): |
1732.2.4
by Martin Pool
Split check into Branch.check and Repository.check |
1168 |
"""Check consistency of all history of given revision_ids.
|
1169 |
||
1170 |
Different repository implementations should override _check().
|
|
1171 |
||
1172 |
:param revision_ids: A non-empty list of revision_ids whose ancestry
|
|
1173 |
will be checked. Typically the last revision_id of a branch.
|
|
4332.3.11
by Robert Collins
Move tree and back callbacks into the repository check core. |
1174 |
:param callback_refs: A dict of check-refs to resolve and callback
|
1175 |
the check/_check method on the items listed as wanting the ref.
|
|
1176 |
see bzrlib.check.
|
|
1177 |
:param check_repo: If False do not check the repository contents, just
|
|
1178 |
calculate the data callback_refs requires and call them back.
|
|
1732.2.4
by Martin Pool
Split check into Branch.check and Repository.check |
1179 |
"""
|
5850.1.6
by Jelmer Vernooij
Reintroduce double indirection, raise NotImplementedError from _check rather than |
1180 |
return self._check(revision_ids=revision_ids, callback_refs=callback_refs, |
1181 |
check_repo=check_repo) |
|
1182 |
||
1183 |
def _check(self, revision_ids=None, callback_refs=None, check_repo=True): |
|
1184 |
raise NotImplementedError(self.check) |
|
1732.2.4
by Martin Pool
Split check into Branch.check and Repository.check |
1185 |
|
4840.2.7
by Vincent Ladeuil
Move the _warn_if_deprecated call from repo.__init__ to |
1186 |
def _warn_if_deprecated(self, branch=None): |
5675.2.1
by Jelmer Vernooij
Add RepositoryFormat.is_deprecated(). This removes the need for |
1187 |
if not self._format.is_deprecated(): |
1188 |
return
|
|
1904.2.5
by Martin Pool
Fix format warning inside test suite and add test |
1189 |
global _deprecation_warning_done |
1190 |
if _deprecation_warning_done: |
|
1191 |
return
|
|
4840.2.7
by Vincent Ladeuil
Move the _warn_if_deprecated call from repo.__init__ to |
1192 |
try: |
1193 |
if branch is None: |
|
6449.1.1
by Jelmer Vernooij
Convert 'suppress_warnings' option to config stacks. |
1194 |
conf = config.GlobalStack() |
4840.2.7
by Vincent Ladeuil
Move the _warn_if_deprecated call from repo.__init__ to |
1195 |
else: |
6449.1.1
by Jelmer Vernooij
Convert 'suppress_warnings' option to config stacks. |
1196 |
conf = branch.get_config_stack() |
1197 |
if 'format_deprecation' in conf.get('suppress_warnings'): |
|
4840.2.7
by Vincent Ladeuil
Move the _warn_if_deprecated call from repo.__init__ to |
1198 |
return
|
1199 |
warning("Format %s for %s is deprecated -" |
|
1200 |
" please use 'bzr upgrade' to get better performance"
|
|
1201 |
% (self._format, self.bzrdir.transport.base)) |
|
1202 |
finally: |
|
1203 |
_deprecation_warning_done = True |
|
1904.2.3
by Martin Pool
Give a warning on access to old repository formats |
1204 |
|
1910.2.63
by Aaron Bentley
Add supports_rich_root member to repository |
1205 |
def supports_rich_root(self): |
1206 |
return self._format.rich_root_data |
|
1207 |
||
2150.2.2
by Robert Collins
Change the commit builder selected-revision-id test to use a unicode revision id where possible, leading to stricter testing of the hypothetical unicode revision id support in bzr. |
1208 |
def _check_ascii_revisionid(self, revision_id, method): |
1209 |
"""Private helper for ascii-only repositories."""
|
|
1210 |
# weave repositories refuse to store revisionids that are non-ascii.
|
|
1211 |
if revision_id is not None: |
|
1212 |
# weaves require ascii revision ids.
|
|
1213 |
if isinstance(revision_id, unicode): |
|
1214 |
try: |
|
1215 |
revision_id.encode('ascii') |
|
1216 |
except UnicodeEncodeError: |
|
1217 |
raise errors.NonAsciiRevisionId(method, self) |
|
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
1218 |
else: |
1219 |
try: |
|
1220 |
revision_id.decode('ascii') |
|
1221 |
except UnicodeDecodeError: |
|
1222 |
raise errors.NonAsciiRevisionId(method, self) |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1223 |
|
1185.82.84
by Aaron Bentley
Moved stuff around |
1224 |
|
1556.1.3
by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids |
1225 |
class MetaDirRepository(Repository): |
3407.2.13
by Martin Pool
Remove indirection through control_files to get transports |
1226 |
"""Repositories in the new meta-dir layout.
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1227 |
|
3407.2.13
by Martin Pool
Remove indirection through control_files to get transports |
1228 |
:ivar _transport: Transport for access to repository control files,
|
1229 |
typically pointing to .bzr/repository.
|
|
1230 |
"""
|
|
1556.1.3
by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids |
1231 |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1232 |
def __init__(self, _format, a_bzrdir, control_files): |
1233 |
super(MetaDirRepository, self).__init__(_format, a_bzrdir, control_files) |
|
3407.2.3
by Martin Pool
Branch and Repository use their own ._transport rather than going through .control_files |
1234 |
self._transport = control_files._transport |
1556.1.3
by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids |
1235 |
|
1596.2.12
by Robert Collins
Merge and make Knit Repository use the revision store for all possible queries. |
1236 |
def is_shared(self): |
1237 |
"""Return True if this repository is flagged as a shared repository."""
|
|
3407.2.3
by Martin Pool
Branch and Repository use their own ._transport rather than going through .control_files |
1238 |
return self._transport.has('shared-storage') |
1596.2.12
by Robert Collins
Merge and make Knit Repository use the revision store for all possible queries. |
1239 |
|
1240 |
@needs_write_lock
|
|
1241 |
def set_make_working_trees(self, new_value): |
|
1242 |
"""Set the policy flag for making working trees when creating branches.
|
|
1243 |
||
1244 |
This only applies to branches that use this repository.
|
|
1245 |
||
1246 |
The default is 'True'.
|
|
1247 |
:param new_value: True to restore the default, False to disable making
|
|
1248 |
working trees.
|
|
1249 |
"""
|
|
1250 |
if new_value: |
|
1251 |
try: |
|
3407.2.3
by Martin Pool
Branch and Repository use their own ._transport rather than going through .control_files |
1252 |
self._transport.delete('no-working-trees') |
1596.2.12
by Robert Collins
Merge and make Knit Repository use the revision store for all possible queries. |
1253 |
except errors.NoSuchFile: |
1254 |
pass
|
|
1255 |
else: |
|
3407.2.5
by Martin Pool
Deprecate LockableFiles.put_utf8 |
1256 |
self._transport.put_bytes('no-working-trees', '', |
3407.2.18
by Martin Pool
BzrDir takes responsibility for default file/dir modes |
1257 |
mode=self.bzrdir._get_file_mode()) |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1258 |
|
1596.2.12
by Robert Collins
Merge and make Knit Repository use the revision store for all possible queries. |
1259 |
def make_working_trees(self): |
1260 |
"""Returns the policy for making working trees on new branches."""
|
|
3407.2.3
by Martin Pool
Branch and Repository use their own ._transport rather than going through .control_files |
1261 |
return not self._transport.has('no-working-trees') |
1596.2.12
by Robert Collins
Merge and make Knit Repository use the revision store for all possible queries. |
1262 |
|
6213.1.58
by Jelmer Vernooij
Use update_feature_flags everywhere. |
1263 |
@needs_write_lock
|
1264 |
def update_feature_flags(self, updated_flags): |
|
1265 |
"""Update the feature flags for this branch.
|
|
1266 |
||
1267 |
:param updated_flags: Dictionary mapping feature names to necessities
|
|
1268 |
A necessity can be None to indicate the feature should be removed
|
|
1269 |
"""
|
|
6213.1.60
by Jelmer Vernooij
Fix typo. |
1270 |
self._format._update_feature_flags(updated_flags) |
6213.1.58
by Jelmer Vernooij
Use update_feature_flags everywhere. |
1271 |
self.control_transport.put_bytes('format', self._format.as_string()) |
1272 |
||
1556.1.3
by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids |
1273 |
|
5669.3.9
by Jelmer Vernooij
Consistent naming. |
1274 |
class RepositoryFormatRegistry(controldir.ControlComponentFormatRegistry): |
5651.3.1
by Jelmer Vernooij
Add RepositoryFormatRegistry. |
1275 |
"""Repository format registry."""
|
1276 |
||
1277 |
def get_default(self): |
|
1278 |
"""Return the current default format."""
|
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
1279 |
return controldir.format_registry.make_bzrdir('default').repository_format |
5651.3.1
by Jelmer Vernooij
Add RepositoryFormatRegistry. |
1280 |
|
1281 |
||
4032.3.1
by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls. |
1282 |
network_format_registry = registry.FormatRegistry() |
3990.5.3
by Robert Collins
Docs and polish on RepositoryFormat.network_name. |
1283 |
"""Registry of formats indexed by their network name.
|
1284 |
||
1285 |
The network name for a repository format is an identifier that can be used when
|
|
1286 |
referring to formats with smart server operations. See
|
|
1287 |
RepositoryFormat.network_name() for more detail.
|
|
1288 |
"""
|
|
3990.5.1
by Andrew Bennetts
Add network_name() to RepositoryFormat. |
1289 |
|
1290 |
||
5651.3.1
by Jelmer Vernooij
Add RepositoryFormatRegistry. |
1291 |
format_registry = RepositoryFormatRegistry(network_format_registry) |
3990.5.3
by Robert Collins
Docs and polish on RepositoryFormat.network_name. |
1292 |
"""Registry of formats, indexed by their BzrDirMetaFormat format string.
|
2241.1.11
by Martin Pool
Get rid of RepositoryFormat*_instance objects. Instead the format |
1293 |
|
1294 |
This can contain either format instances themselves, or classes/factories that
|
|
1295 |
can be called to obtain one.
|
|
1296 |
"""
|
|
2241.1.2
by Martin Pool
change to using external Repository format registry |
1297 |
|
2220.2.3
by Martin Pool
Add tag: revision namespace. |
1298 |
|
1299 |
#####################################################################
|
|
1300 |
# Repository Formats
|
|
1910.2.46
by Aaron Bentley
Whitespace fix |
1301 |
|
5669.3.10
by Jelmer Vernooij
Use ControlComponentFormat. |
1302 |
class RepositoryFormat(controldir.ControlComponentFormat): |
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
1303 |
"""A repository format.
|
1304 |
||
3990.5.3
by Robert Collins
Docs and polish on RepositoryFormat.network_name. |
1305 |
Formats provide four things:
|
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
1306 |
* An initialization routine to construct repository data on disk.
|
3990.5.3
by Robert Collins
Docs and polish on RepositoryFormat.network_name. |
1307 |
* a optional format string which is used when the BzrDir supports
|
1308 |
versioned children.
|
|
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
1309 |
* an open routine which returns a Repository instance.
|
3990.5.3
by Robert Collins
Docs and polish on RepositoryFormat.network_name. |
1310 |
* A network name for referring to the format in smart server RPC
|
1311 |
methods.
|
|
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
1312 |
|
2889.1.2
by Robert Collins
Review feedback. |
1313 |
There is one and only one Format subclass for each on-disk format. But
|
1314 |
there can be one Repository subclass that is used for several different
|
|
1315 |
formats. The _format attribute on a Repository instance can be used to
|
|
1316 |
determine the disk format.
|
|
2889.1.1
by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into |
1317 |
|
3990.5.3
by Robert Collins
Docs and polish on RepositoryFormat.network_name. |
1318 |
Formats are placed in a registry by their format string for reference
|
1319 |
during opening. These should be subclasses of RepositoryFormat for
|
|
1320 |
consistency.
|
|
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
1321 |
|
1322 |
Once a format is deprecated, just deprecate the initialize and open
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1323 |
methods on the format class. Do not deprecate the object, as the
|
4031.3.1
by Frank Aspell
Fixing various typos |
1324 |
object may be created even when a repository instance hasn't been
|
3990.5.3
by Robert Collins
Docs and polish on RepositoryFormat.network_name. |
1325 |
created.
|
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
1326 |
|
1327 |
Common instance attributes:
|
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
1328 |
_matchingbzrdir - the controldir format that the repository format was
|
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
1329 |
originally written to work with. This can be used if manually
|
1330 |
constructing a bzrdir and repository, or more commonly for test suite
|
|
3128.1.3
by Vincent Ladeuil
Since we are there s/parameteris.*/parameteriz&/. |
1331 |
parameterization.
|
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
1332 |
"""
|
1333 |
||
2949.1.2
by Robert Collins
* Fetch with pack repositories will no longer read the entire history graph. |
1334 |
# Set to True or False in derived classes. True indicates that the format
|
1335 |
# supports ghosts gracefully.
|
|
1336 |
supports_ghosts = None |
|
3221.3.1
by Robert Collins
* Repository formats have a new supported-feature attribute |
1337 |
# Can this repository be given external locations to lookup additional
|
1338 |
# data. Set to True or False in derived classes.
|
|
1339 |
supports_external_lookups = None |
|
3735.2.1
by Robert Collins
Add the concept of CHK lookups to Repository. |
1340 |
# Does this format support CHK bytestring lookups. Set to True or False in
|
1341 |
# derived classes.
|
|
1342 |
supports_chks = None |
|
4053.1.4
by Robert Collins
Move the fetch control attributes from Repository to RepositoryFormat. |
1343 |
# Should fetch trigger a reconcile after the fetch? Only needed for
|
1344 |
# some repository formats that can suffer internal inconsistencies.
|
|
1345 |
_fetch_reconcile = False |
|
4183.5.1
by Robert Collins
Add RepositoryFormat.fast_deltas to signal fast delta creation. |
1346 |
# Does this format have < O(tree_size) delta generation. Used to hint what
|
1347 |
# code path for commit, amongst other things.
|
|
1348 |
fast_deltas = None |
|
4431.3.7
by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts. |
1349 |
# Does doing a pack operation compress data? Useful for the pack UI command
|
1350 |
# (so if there is one pack, the operation can still proceed because it may
|
|
1351 |
# help), and for fetching when data won't have come from the same
|
|
1352 |
# compressor.
|
|
1353 |
pack_compresses = False |
|
5815.4.1
by Jelmer Vernooij
Split versionedfile-specific stuff out into VersionedFileRepository. |
1354 |
# Does the repository storage understand references to trees?
|
4606.4.1
by Robert Collins
Prepare test_repository's inter_repository tests for 2a. |
1355 |
supports_tree_reference = None |
4988.9.1
by Jelmer Vernooij
Add experimental flag to RepositoryFormat. |
1356 |
# Is the format experimental ?
|
1357 |
experimental = False |
|
5815.4.5
by Jelmer Vernooij
Use MetaDirVersionedFileRepositoryFormat (a Soyuz worthy name). |
1358 |
# Does this repository format escape funky characters, or does it create
|
1359 |
# files with similar names as the versioned files in its contents on disk
|
|
1360 |
# ?
|
|
5684.2.1
by Jelmer Vernooij
Add bzrlib.tests.per_repository_vf. |
1361 |
supports_funky_characters = None |
5674.1.1
by Jelmer Vernooij
Add supports_leave_lock flag to BranchFormat and RepositoryFormat. |
1362 |
# Does this repository format support leaving locks?
|
5684.2.1
by Jelmer Vernooij
Add bzrlib.tests.per_repository_vf. |
1363 |
supports_leaving_lock = None |
1364 |
# Does this format support the full VersionedFiles interface?
|
|
1365 |
supports_full_versioned_files = None |
|
5751.2.1
by Jelmer Vernooij
Add RepositoryFormat.supports_revision_signatures. |
1366 |
# Does this format support signing revision signatures?
|
1367 |
supports_revision_signatures = True |
|
5766.1.1
by Jelmer Vernooij
Make revision-graph-can-have-wrong-parents a repository format attribute rather than a repository method. |
1368 |
# Can the revision graph have incorrect parents?
|
1369 |
revision_graph_can_have_wrong_parents = None |
|
5815.4.19
by Jelmer Vernooij
Fix test failures. |
1370 |
# Does this format support rich root data?
|
1371 |
rich_root_data = None |
|
5993.3.2
by Jelmer Vernooij
Add Repository.supports_versioned_directories. |
1372 |
# Does this format support explicitly versioned directories?
|
1373 |
supports_versioned_directories = None |
|
6145.2.1
by Jelmer Vernooij
Add RepositoryFormat.supports_nesting_repositories. |
1374 |
# Can other repositories be nested into one of this format?
|
1375 |
supports_nesting_repositories = None |
|
6217.4.2
by Jelmer Vernooij
s/invisible/unreferenced. |
1376 |
# Is it possible for revisions to be present without being referenced
|
6217.4.1
by Jelmer Vernooij
Add RepositoryFormat.supports_invisible_revisions. |
1377 |
# somewhere ?
|
6217.4.2
by Jelmer Vernooij
s/invisible/unreferenced. |
1378 |
supports_unreferenced_revisions = None |
2949.1.2
by Robert Collins
* Fetch with pack repositories will no longer read the entire history graph. |
1379 |
|
4634.144.4
by Martin Pool
Show network name in RemoteRepositoryFormat repr |
1380 |
def __repr__(self): |
1381 |
return "%s()" % self.__class__.__name__ |
|
1904.2.3
by Martin Pool
Give a warning on access to old repository formats |
1382 |
|
2241.1.11
by Martin Pool
Get rid of RepositoryFormat*_instance objects. Instead the format |
1383 |
def __eq__(self, other): |
1384 |
# format objects are generally stateless
|
|
1385 |
return isinstance(other, self.__class__) |
|
1386 |
||
2100.3.35
by Aaron Bentley
equality operations on bzrdir |
1387 |
def __ne__(self, other): |
2100.3.31
by Aaron Bentley
Merged bzr.dev (17 tests failing) |
1388 |
return not self == other |
1389 |
||
1624.3.19
by Olaf Conradi
New call get_format_description to give a user-friendly description of a |
1390 |
def get_format_description(self): |
1759.2.1
by Jelmer Vernooij
Fix some types (found using aspell). |
1391 |
"""Return the short description for this format."""
|
1624.3.19
by Olaf Conradi
New call get_format_description to give a user-friendly description of a |
1392 |
raise NotImplementedError(self.get_format_description) |
1393 |
||
6207.3.3
by jelmer at samba
Fix tests and the like. |
1394 |
def initialize(self, controldir, shared=False): |
1395 |
"""Initialize a repository of this format in controldir.
|
|
1534.6.1
by Robert Collins
allow API creation of shared repositories |
1396 |
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
1397 |
:param controldir: The controldir to put the new repository in it.
|
1534.6.1
by Robert Collins
allow API creation of shared repositories |
1398 |
:param shared: The repository should be initialized as a sharable one.
|
1752.2.52
by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories. |
1399 |
:returns: The new repository object.
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1400 |
|
1534.6.1
by Robert Collins
allow API creation of shared repositories |
1401 |
This may raise UninitializableFormat if shared repository are not
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
1402 |
compatible the controldir.
|
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
1403 |
"""
|
1752.2.52
by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories. |
1404 |
raise NotImplementedError(self.initialize) |
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
1405 |
|
1406 |
def is_supported(self): |
|
1407 |
"""Is this format supported?
|
|
1408 |
||
1409 |
Supported formats must be initializable and openable.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1410 |
Unsupported formats may not support initialization or committing or
|
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
1411 |
some other features depending on the reason for not being supported.
|
1412 |
"""
|
|
1413 |
return True |
|
1414 |
||
5675.2.1
by Jelmer Vernooij
Add RepositoryFormat.is_deprecated(). This removes the need for |
1415 |
def is_deprecated(self): |
1416 |
"""Is this format deprecated?
|
|
1417 |
||
1418 |
Deprecated formats may trigger a user-visible warning recommending
|
|
1419 |
the user to upgrade. They are still fully supported.
|
|
1420 |
"""
|
|
1421 |
return False |
|
1422 |
||
3990.5.3
by Robert Collins
Docs and polish on RepositoryFormat.network_name. |
1423 |
def network_name(self): |
1424 |
"""A simple byte string uniquely identifying this format for RPC calls.
|
|
1425 |
||
1426 |
MetaDir repository formats use their disk format string to identify the
|
|
1427 |
repository over the wire. All in one formats such as bzr < 0.8, and
|
|
1428 |
foreign formats like svn/git and hg should use some marker which is
|
|
1429 |
unique and immutable.
|
|
1430 |
"""
|
|
1431 |
raise NotImplementedError(self.network_name) |
|
1432 |
||
1910.2.12
by Aaron Bentley
Implement knit repo format 2 |
1433 |
def check_conversion_target(self, target_format): |
4608.1.4
by Martin Pool
Move copy\&pasted check_conversion_target into RepositoryFormat base class |
1434 |
if self.rich_root_data and not target_format.rich_root_data: |
1435 |
raise errors.BadConversionTarget( |
|
1436 |
'Does not support rich root data.', target_format, |
|
1437 |
from_format=self) |
|
1438 |
if (self.supports_tree_reference and |
|
1439 |
not getattr(target_format, 'supports_tree_reference', False)): |
|
1440 |
raise errors.BadConversionTarget( |
|
1441 |
'Does not support nested trees', target_format, |
|
1442 |
from_format=self) |
|
1910.2.12
by Aaron Bentley
Implement knit repo format 2 |
1443 |
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
1444 |
def open(self, controldir, _found=False): |
1445 |
"""Return an instance of this format for a controldir.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1446 |
|
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
1447 |
_found is a private parameter, do not use it.
|
1448 |
"""
|
|
1556.1.3
by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids |
1449 |
raise NotImplementedError(self.open) |
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
1450 |
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
1451 |
def _run_post_repo_init_hooks(self, repository, controldir, shared): |
1452 |
from bzrlib.controldir import ControlDir, RepoInitHookParams |
|
1453 |
hooks = ControlDir.hooks['post_repo_init'] |
|
5107.3.1
by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init', |
1454 |
if not hooks: |
1455 |
return
|
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
1456 |
params = RepoInitHookParams(repository, self, controldir, shared) |
5107.3.1
by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init', |
1457 |
for hook in hooks: |
1458 |
hook(params) |
|
1459 |
||
1556.1.3
by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids |
1460 |
|
6213.1.30
by Jelmer Vernooij
Add BzrFormat. |
1461 |
class RepositoryFormatMetaDir(bzrdir.BzrFormat, RepositoryFormat): |
1759.2.1
by Jelmer Vernooij
Fix some types (found using aspell). |
1462 |
"""Common base class for the new repositories using the metadir layout."""
|
1556.1.3
by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids |
1463 |
|
1910.2.14
by Aaron Bentley
Fail when trying to use interrepository on Knit2 and Knit1 |
1464 |
rich_root_data = False |
2323.5.17
by Martin Pool
Add supports_tree_reference to all repo formats (robert) |
1465 |
supports_tree_reference = False |
3221.3.1
by Robert Collins
* Repository formats have a new supported-feature attribute |
1466 |
supports_external_lookups = False |
5674.1.1
by Jelmer Vernooij
Add supports_leave_lock flag to BranchFormat and RepositoryFormat. |
1467 |
supports_leaving_lock = True |
6145.2.2
by Jelmer Vernooij
Set supports_nesting_repositories. |
1468 |
supports_nesting_repositories = True |
3845.1.1
by John Arbash Meinel
Ensure that RepositoryFormat._matchingbzrdir.repository_format matches. |
1469 |
|
1470 |
@property
|
|
1471 |
def _matchingbzrdir(self): |
|
1472 |
matching = bzrdir.BzrDirMetaFormat1() |
|
1473 |
matching.repository_format = self |
|
1474 |
return matching |
|
1910.2.14
by Aaron Bentley
Fail when trying to use interrepository on Knit2 and Knit1 |
1475 |
|
1556.1.4
by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same. |
1476 |
def __init__(self): |
6213.1.24
by Jelmer Vernooij
More refactoring. |
1477 |
RepositoryFormat.__init__(self) |
6213.1.30
by Jelmer Vernooij
Add BzrFormat. |
1478 |
bzrdir.BzrFormat.__init__(self) |
1556.1.4
by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same. |
1479 |
|
1556.1.3
by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids |
1480 |
def _create_control_files(self, a_bzrdir): |
1481 |
"""Create the required files and the initial control_files object."""
|
|
1759.2.2
by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron. |
1482 |
# FIXME: RBC 20060125 don't peek under the covers
|
1534.4.47
by Robert Collins
Split out repository into .bzr/repository |
1483 |
# NB: no need to escape relative paths that are url safe.
|
1484 |
repository_transport = a_bzrdir.get_repository_transport(self) |
|
1996.3.4
by John Arbash Meinel
lazy_import bzrlib/repository.py |
1485 |
control_files = lockable_files.LockableFiles(repository_transport, |
1486 |
'lock', lockdir.LockDir) |
|
1553.5.61
by Martin Pool
Locks protecting LockableFiles must now be explicitly created before use. |
1487 |
control_files.create_lock() |
1556.1.3
by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids |
1488 |
return control_files |
1489 |
||
1490 |
def _upload_blank_content(self, a_bzrdir, dirs, files, utf8_files, shared): |
|
1491 |
"""Upload the initial blank content."""
|
|
1492 |
control_files = self._create_control_files(a_bzrdir) |
|
1534.4.47
by Robert Collins
Split out repository into .bzr/repository |
1493 |
control_files.lock_write() |
3407.2.4
by Martin Pool
Small cleanups to initial creation of repository files |
1494 |
transport = control_files._transport |
1495 |
if shared == True: |
|
1496 |
utf8_files += [('shared-storage', '')] |
|
1534.4.47
by Robert Collins
Split out repository into .bzr/repository |
1497 |
try: |
3407.2.18
by Martin Pool
BzrDir takes responsibility for default file/dir modes |
1498 |
transport.mkdir_multi(dirs, mode=a_bzrdir._get_dir_mode()) |
3407.2.4
by Martin Pool
Small cleanups to initial creation of repository files |
1499 |
for (filename, content_stream) in files: |
1500 |
transport.put_file(filename, content_stream, |
|
3407.2.18
by Martin Pool
BzrDir takes responsibility for default file/dir modes |
1501 |
mode=a_bzrdir._get_file_mode()) |
3407.2.4
by Martin Pool
Small cleanups to initial creation of repository files |
1502 |
for (filename, content_bytes) in utf8_files: |
1503 |
transport.put_bytes_non_atomic(filename, content_bytes, |
|
3407.2.18
by Martin Pool
BzrDir takes responsibility for default file/dir modes |
1504 |
mode=a_bzrdir._get_file_mode()) |
1534.4.47
by Robert Collins
Split out repository into .bzr/repository |
1505 |
finally: |
1506 |
control_files.unlock() |
|
1556.1.3
by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids |
1507 |
|
6213.1.16
by Jelmer Vernooij
Feature support in repository. |
1508 |
@classmethod
|
1509 |
def find_format(klass, a_bzrdir): |
|
1510 |
"""Return the format for the repository object in a_bzrdir.
|
|
1511 |
||
1512 |
This is used by bzr native formats that have a "format" file in
|
|
1513 |
the repository. Other methods may be used by different types of
|
|
1514 |
control directory.
|
|
1515 |
"""
|
|
1516 |
try: |
|
1517 |
transport = a_bzrdir.get_repository_transport(None) |
|
1518 |
format_string = transport.get_bytes("format") |
|
1519 |
except errors.NoSuchFile: |
|
1520 |
raise errors.NoRepositoryPresent(a_bzrdir) |
|
6213.1.24
by Jelmer Vernooij
More refactoring. |
1521 |
return klass._find_format(format_registry, 'repository', format_string) |
6213.1.20
by Jelmer Vernooij
Fix __eq__. |
1522 |
|
6213.1.34
by Jelmer Vernooij
Fix remaining test. |
1523 |
def check_support_status(self, allow_unsupported, recommend_upgrade=True, |
1524 |
basedir=None): |
|
1525 |
RepositoryFormat.check_support_status(self, |
|
1526 |
allow_unsupported=allow_unsupported, recommend_upgrade=recommend_upgrade, |
|
1527 |
basedir=basedir) |
|
1528 |
bzrdir.BzrFormat.check_support_status(self, allow_unsupported=allow_unsupported, |
|
1529 |
recommend_upgrade=recommend_upgrade, basedir=basedir) |
|
1530 |
||
3990.5.1
by Andrew Bennetts
Add network_name() to RepositoryFormat. |
1531 |
|
1532 |
# formats which have no format string are not discoverable or independently
|
|
4032.1.1
by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts. |
1533 |
# creatable on disk, so are not registered in format_registry. They're
|
5582.10.1
by Jelmer Vernooij
Move weave formats into bzrlib.plugins.weave_fmt. |
1534 |
# all in bzrlib.repofmt.knitreponow. When an instance of one of these is
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
1535 |
# needed, it's constructed directly by the ControlDir. Non-native formats where
|
2241.1.11
by Martin Pool
Get rid of RepositoryFormat*_instance objects. Instead the format |
1536 |
# the repository is not separately opened are similar.
|
1537 |
||
2241.1.4
by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo. |
1538 |
format_registry.register_lazy( |
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
1539 |
'Bazaar-NG Knit Repository Format 1', |
1540 |
'bzrlib.repofmt.knitrepo', |
|
2241.1.11
by Martin Pool
Get rid of RepositoryFormat*_instance objects. Instead the format |
1541 |
'RepositoryFormatKnit1', |
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
1542 |
)
|
1543 |
||
2241.1.5
by Martin Pool
Move KnitFormat2 into repofmt |
1544 |
format_registry.register_lazy( |
2255.2.230
by Robert Collins
Update tree format signatures to mention introducing bzr version. |
1545 |
'Bazaar Knit Repository Format 3 (bzr 0.15)\n', |
2100.3.31
by Aaron Bentley
Merged bzr.dev (17 tests failing) |
1546 |
'bzrlib.repofmt.knitrepo', |
1547 |
'RepositoryFormatKnit3', |
|
1548 |
)
|
|
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
1549 |
|
2996.2.1
by Aaron Bentley
Add KnitRepositoryFormat4 |
1550 |
format_registry.register_lazy( |
1551 |
'Bazaar Knit Repository Format 4 (bzr 1.0)\n', |
|
1552 |
'bzrlib.repofmt.knitrepo', |
|
1553 |
'RepositoryFormatKnit4', |
|
1554 |
)
|
|
1555 |
||
2939.2.1
by Ian Clatworthy
use 'knitpack' naming instead of 'experimental' for pack formats |
1556 |
# Pack-based formats. There is one format for pre-subtrees, and one for
|
1557 |
# post-subtrees to allow ease of testing.
|
|
3152.2.1
by Robert Collins
* A new repository format 'development' has been added. This format will |
1558 |
# NOTE: These are experimental in 0.92. Stable in 1.0 and above
|
2592.3.22
by Robert Collins
Add new experimental repository formats. |
1559 |
format_registry.register_lazy( |
2939.2.6
by Ian Clatworthy
more review feedback from lifeless and poolie |
1560 |
'Bazaar pack repository format 1 (needs bzr 0.92)\n', |
5757.1.2
by Jelmer Vernooij
Add separate file for knit pack repository formats. |
1561 |
'bzrlib.repofmt.knitpack_repo', |
2592.3.224
by Martin Pool
Rename GraphKnitRepository etc to KnitPackRepository |
1562 |
'RepositoryFormatKnitPack1', |
2592.3.22
by Robert Collins
Add new experimental repository formats. |
1563 |
)
|
1564 |
format_registry.register_lazy( |
|
2939.2.6
by Ian Clatworthy
more review feedback from lifeless and poolie |
1565 |
'Bazaar pack repository format 1 with subtree support (needs bzr 0.92)\n', |
5757.1.2
by Jelmer Vernooij
Add separate file for knit pack repository formats. |
1566 |
'bzrlib.repofmt.knitpack_repo', |
2592.3.224
by Martin Pool
Rename GraphKnitRepository etc to KnitPackRepository |
1567 |
'RepositoryFormatKnitPack3', |
2592.3.22
by Robert Collins
Add new experimental repository formats. |
1568 |
)
|
2996.2.11
by Aaron Bentley
Implement rich-root-pack format ( #164639) |
1569 |
format_registry.register_lazy( |
1570 |
'Bazaar pack repository format 1 with rich root (needs bzr 1.0)\n', |
|
5757.1.2
by Jelmer Vernooij
Add separate file for knit pack repository formats. |
1571 |
'bzrlib.repofmt.knitpack_repo', |
2996.2.11
by Aaron Bentley
Implement rich-root-pack format ( #164639) |
1572 |
'RepositoryFormatKnitPack4', |
1573 |
)
|
|
3549.1.5
by Martin Pool
Add stable format names for stacked branches |
1574 |
format_registry.register_lazy( |
1575 |
'Bazaar RepositoryFormatKnitPack5 (bzr 1.6)\n', |
|
5757.1.2
by Jelmer Vernooij
Add separate file for knit pack repository formats. |
1576 |
'bzrlib.repofmt.knitpack_repo', |
3549.1.5
by Martin Pool
Add stable format names for stacked branches |
1577 |
'RepositoryFormatKnitPack5', |
1578 |
)
|
|
1579 |
format_registry.register_lazy( |
|
3606.10.1
by John Arbash Meinel
Create a new --1.6-rich-root, deprecate the old one. |
1580 |
'Bazaar RepositoryFormatKnitPack5RichRoot (bzr 1.6.1)\n', |
5757.1.2
by Jelmer Vernooij
Add separate file for knit pack repository formats. |
1581 |
'bzrlib.repofmt.knitpack_repo', |
3606.10.1
by John Arbash Meinel
Create a new --1.6-rich-root, deprecate the old one. |
1582 |
'RepositoryFormatKnitPack5RichRoot', |
1583 |
)
|
|
1584 |
format_registry.register_lazy( |
|
3549.1.6
by Martin Pool
Change stacked-subtree to stacked-rich-root |
1585 |
'Bazaar RepositoryFormatKnitPack5RichRoot (bzr 1.6)\n', |
5757.1.2
by Jelmer Vernooij
Add separate file for knit pack repository formats. |
1586 |
'bzrlib.repofmt.knitpack_repo', |
3606.10.1
by John Arbash Meinel
Create a new --1.6-rich-root, deprecate the old one. |
1587 |
'RepositoryFormatKnitPack5RichRootBroken', |
3549.1.5
by Martin Pool
Add stable format names for stacked branches |
1588 |
)
|
3805.3.1
by John Arbash Meinel
Add repository 1.9 format, and update the documentation. |
1589 |
format_registry.register_lazy( |
1590 |
'Bazaar RepositoryFormatKnitPack6 (bzr 1.9)\n', |
|
5757.1.2
by Jelmer Vernooij
Add separate file for knit pack repository formats. |
1591 |
'bzrlib.repofmt.knitpack_repo', |
3805.3.1
by John Arbash Meinel
Add repository 1.9 format, and update the documentation. |
1592 |
'RepositoryFormatKnitPack6', |
1593 |
)
|
|
1594 |
format_registry.register_lazy( |
|
1595 |
'Bazaar RepositoryFormatKnitPack6RichRoot (bzr 1.9)\n', |
|
5757.1.2
by Jelmer Vernooij
Add separate file for knit pack repository formats. |
1596 |
'bzrlib.repofmt.knitpack_repo', |
3805.3.1
by John Arbash Meinel
Add repository 1.9 format, and update the documentation. |
1597 |
'RepositoryFormatKnitPack6RichRoot', |
1598 |
)
|
|
5546.1.1
by Andrew Bennetts
Remove RepositoryFormatCHK1 and RepositoryFormatCHK2. |
1599 |
format_registry.register_lazy( |
1600 |
'Bazaar repository format 2a (needs bzr 1.16 or later)\n', |
|
1601 |
'bzrlib.repofmt.groupcompress_repo', |
|
1602 |
'RepositoryFormat2a', |
|
1603 |
)
|
|
3549.1.5
by Martin Pool
Add stable format names for stacked branches |
1604 |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1605 |
# Development formats.
|
5546.1.1
by Andrew Bennetts
Remove RepositoryFormatCHK1 and RepositoryFormatCHK2. |
1606 |
# Check their docstrings to see if/when they are obsolete.
|
3735.1.1
by Robert Collins
Add development2 formats using BTree indices. |
1607 |
format_registry.register_lazy( |
1608 |
("Bazaar development format 2 with subtree support " |
|
1609 |
"(needs bzr.dev from before 1.8)\n"), |
|
5757.1.2
by Jelmer Vernooij
Add separate file for knit pack repository formats. |
1610 |
'bzrlib.repofmt.knitpack_repo', |
3735.1.1
by Robert Collins
Add development2 formats using BTree indices. |
1611 |
'RepositoryFormatPackDevelopment2Subtree', |
1612 |
)
|
|
5389.1.1
by Jelmer Vernooij
Add development8-subtree. |
1613 |
format_registry.register_lazy( |
1614 |
'Bazaar development format 8\n', |
|
1615 |
'bzrlib.repofmt.groupcompress_repo', |
|
1616 |
'RepositoryFormat2aSubtree', |
|
1617 |
)
|
|
4290.1.7
by Jelmer Vernooij
Add development7-rich-root format that uses the RIO Serializer. |
1618 |
|
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
1619 |
|
1563.2.12
by Robert Collins
Checkpointing: created InterObject to factor out common inter object worker code, added InterVersionedFile and tests to allow making join work between any versionedfile. |
1620 |
class InterRepository(InterObject): |
1534.1.27
by Robert Collins
Start InterRepository with InterRepository.get. |
1621 |
"""This class represents operations taking place between two repositories.
|
1622 |
||
1534.1.33
by Robert Collins
Move copy_content_into into InterRepository and InterWeaveRepo, and disable the default codepath test as we have optimised paths for all current combinations. |
1623 |
Its instances have methods like copy_content and fetch, and contain
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1624 |
references to the source and target repositories these operations can be
|
1534.1.27
by Robert Collins
Start InterRepository with InterRepository.get. |
1625 |
carried out on.
|
1626 |
||
1627 |
Often we will provide convenience methods on 'repository' which carry out
|
|
1628 |
operations with another repository - they will always forward to
|
|
1629 |
InterRepository.get(other).method_name(parameters).
|
|
1630 |
"""
|
|
1631 |
||
1910.2.15
by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list |
1632 |
_optimisers = [] |
1534.1.28
by Robert Collins
Allow for optimised InterRepository selection. |
1633 |
"""The available optimised InterRepository types."""
|
1634 |
||
4060.1.3
by Robert Collins
Implement the separate source component for fetch - repository.StreamSource. |
1635 |
@needs_write_lock
|
2387.1.1
by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins) |
1636 |
def copy_content(self, revision_id=None): |
4060.1.3
by Robert Collins
Implement the separate source component for fetch - repository.StreamSource. |
1637 |
"""Make a complete copy of the content in self into destination.
|
1638 |
||
1639 |
This is a destructive operation! Do not use it on existing
|
|
1640 |
repositories.
|
|
1641 |
||
1642 |
:param revision_id: Only copy the content needed to construct
|
|
1643 |
revision_id and its parents.
|
|
1644 |
"""
|
|
1645 |
try: |
|
1646 |
self.target.set_make_working_trees(self.source.make_working_trees()) |
|
1647 |
except NotImplementedError: |
|
1648 |
pass
|
|
1649 |
self.target.fetch(self.source, revision_id=revision_id) |
|
1910.2.15
by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list |
1650 |
|
4110.2.23
by Martin Pool
blackbox hpss test should check repository was remotely locked |
1651 |
@needs_write_lock
|
6341.1.1
by Jelmer Vernooij
Make fetch_spec specific to bzr format repositories. |
1652 |
def fetch(self, revision_id=None, find_ghosts=False): |
1534.1.31
by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo. |
1653 |
"""Fetch the content required to construct revision_id.
|
1654 |
||
1910.7.17
by Andrew Bennetts
Various cosmetic changes. |
1655 |
The content is copied from self.source to self.target.
|
1534.1.31
by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo. |
1656 |
|
1657 |
:param revision_id: if None all content is copied, if NULL_REVISION no
|
|
1658 |
content is copied.
|
|
4065.1.1
by Robert Collins
Change the return value of fetch() to None. |
1659 |
:return: None.
|
1534.1.31
by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo. |
1660 |
"""
|
5863.4.1
by Jelmer Vernooij
Move interrepository implementation to vf_repository. |
1661 |
raise NotImplementedError(self.fetch) |
3808.1.4
by John Arbash Meinel
make _walk_to_common responsible for stopping ancestors |
1662 |
|
3184.1.8
by Robert Collins
* ``InterRepository.missing_revision_ids`` is now deprecated in favour of |
1663 |
@needs_read_lock
|
5539.2.10
by Andrew Bennetts
s/NotInOtherForRev/NotInOtherForRevs/, and allow passing multiple revision_ids to search_missing_revision_ids. |
1664 |
def search_missing_revision_ids(self, |
1665 |
revision_id=symbol_versioning.DEPRECATED_PARAMETER, |
|
5852.1.5
by Andrew Bennetts, Jelmer Vernooij
Support limit= for fetching between Bazaar branches. |
1666 |
find_ghosts=True, revision_ids=None, if_present_ids=None, |
1667 |
limit=None): |
|
3184.1.8
by Robert Collins
* ``InterRepository.missing_revision_ids`` is now deprecated in favour of |
1668 |
"""Return the revision ids that source has that target does not.
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1669 |
|
3184.1.8
by Robert Collins
* ``InterRepository.missing_revision_ids`` is now deprecated in favour of |
1670 |
:param revision_id: only return revision ids included by this
|
5535.3.31
by Andrew Bennetts
Cope with tags that reference missing revisions. |
1671 |
revision_id.
|
1672 |
:param revision_ids: return revision ids included by these
|
|
1673 |
revision_ids. NoSuchRevision will be raised if any of these
|
|
1674 |
revisions are not present.
|
|
1675 |
:param if_present_ids: like revision_ids, but will not cause
|
|
1676 |
NoSuchRevision if any of these are absent, instead they will simply
|
|
1677 |
not be in the result. This is useful for e.g. finding revisions
|
|
1678 |
to fetch for tags, which may reference absent revisions.
|
|
3184.1.8
by Robert Collins
* ``InterRepository.missing_revision_ids`` is now deprecated in favour of |
1679 |
:param find_ghosts: If True find missing revisions in deep history
|
1680 |
rather than just finding the surface difference.
|
|
5852.1.5
by Andrew Bennetts, Jelmer Vernooij
Support limit= for fetching between Bazaar branches. |
1681 |
:param limit: Maximum number of revisions to return, topologically
|
1682 |
ordered
|
|
3184.1.8
by Robert Collins
* ``InterRepository.missing_revision_ids`` is now deprecated in favour of |
1683 |
:return: A bzrlib.graph.SearchResult.
|
1684 |
"""
|
|
5863.4.1
by Jelmer Vernooij
Move interrepository implementation to vf_repository. |
1685 |
raise NotImplementedError(self.search_missing_revision_ids) |
5539.2.10
by Andrew Bennetts
s/NotInOtherForRev/NotInOtherForRevs/, and allow passing multiple revision_ids to search_missing_revision_ids. |
1686 |
|
2592.3.28
by Robert Collins
Make InterKnitOptimiser be used between any same-model knit repository. |
1687 |
@staticmethod
|
1688 |
def _same_model(source, target): |
|
3582.1.2
by Martin Pool
Default InterRepository.fetch raises IncompatibleRepositories |
1689 |
"""True if source and target have the same data representation.
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1690 |
|
3582.1.2
by Martin Pool
Default InterRepository.fetch raises IncompatibleRepositories |
1691 |
Note: this is always called on the base class; overriding it in a
|
1692 |
subclass will have no effect.
|
|
1693 |
"""
|
|
1694 |
try: |
|
1695 |
InterRepository._assert_same_model(source, target) |
|
1696 |
return True |
|
1697 |
except errors.IncompatibleRepositories, e: |
|
1698 |
return False |
|
1699 |
||
1700 |
@staticmethod
|
|
1701 |
def _assert_same_model(source, target): |
|
1702 |
"""Raise an exception if two repositories do not use the same model.
|
|
1703 |
"""
|
|
2592.3.28
by Robert Collins
Make InterKnitOptimiser be used between any same-model knit repository. |
1704 |
if source.supports_rich_root() != target.supports_rich_root(): |
3582.1.2
by Martin Pool
Default InterRepository.fetch raises IncompatibleRepositories |
1705 |
raise errors.IncompatibleRepositories(source, target, |
1706 |
"different rich-root support") |
|
2592.3.28
by Robert Collins
Make InterKnitOptimiser be used between any same-model knit repository. |
1707 |
if source._serializer != target._serializer: |
3582.1.2
by Martin Pool
Default InterRepository.fetch raises IncompatibleRepositories |
1708 |
raise errors.IncompatibleRepositories(source, target, |
1709 |
"different serializers") |
|
2592.3.28
by Robert Collins
Make InterKnitOptimiser be used between any same-model knit repository. |
1710 |
|
1910.2.15
by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list |
1711 |
|
1556.1.4
by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same. |
1712 |
class CopyConverter(object): |
1713 |
"""A repository conversion tool which just performs a copy of the content.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1714 |
|
1556.1.4
by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same. |
1715 |
This is slow but quite reliable.
|
1716 |
"""
|
|
1717 |
||
1718 |
def __init__(self, target_format): |
|
1719 |
"""Create a CopyConverter.
|
|
1720 |
||
1721 |
:param target_format: The format the resulting repository should be.
|
|
1722 |
"""
|
|
1723 |
self.target_format = target_format |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1724 |
|
1556.1.4
by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same. |
1725 |
def convert(self, repo, pb): |
1726 |
"""Perform the conversion of to_convert, giving feedback via pb.
|
|
1727 |
||
1728 |
:param to_convert: The disk object to convert.
|
|
1729 |
:param pb: a progress bar to use for progress information.
|
|
1730 |
"""
|
|
4961.2.14
by Martin Pool
Further pb cleanups |
1731 |
pb = ui.ui_factory.nested_progress_bar() |
1556.1.4
by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same. |
1732 |
self.count = 0 |
1596.2.22
by Robert Collins
Fetch changes to use new pb. |
1733 |
self.total = 4 |
1556.1.4
by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same. |
1734 |
# this is only useful with metadir layouts - separated repo content.
|
1735 |
# trigger an assertion if not such
|
|
1736 |
repo._format.get_format_string() |
|
1737 |
self.repo_dir = repo.bzrdir |
|
6138.3.4
by Jonathan Riddell
add gettext() to uses of trace.note() |
1738 |
pb.update(gettext('Moving repository to repository.backup')) |
1556.1.4
by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same. |
1739 |
self.repo_dir.transport.move('repository', 'repository.backup') |
1740 |
backup_transport = self.repo_dir.transport.clone('repository.backup') |
|
1910.2.12
by Aaron Bentley
Implement knit repo format 2 |
1741 |
repo._format.check_conversion_target(self.target_format) |
1556.1.4
by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same. |
1742 |
self.source_repo = repo._format.open(self.repo_dir, |
1743 |
_found=True, |
|
1744 |
_override_transport=backup_transport) |
|
6138.3.4
by Jonathan Riddell
add gettext() to uses of trace.note() |
1745 |
pb.update(gettext('Creating new repository')) |
1556.1.4
by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same. |
1746 |
converted = self.target_format.initialize(self.repo_dir, |
1747 |
self.source_repo.is_shared()) |
|
1748 |
converted.lock_write() |
|
1749 |
try: |
|
6138.3.4
by Jonathan Riddell
add gettext() to uses of trace.note() |
1750 |
pb.update(gettext('Copying content')) |
1556.1.4
by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same. |
1751 |
self.source_repo.copy_content_into(converted) |
1752 |
finally: |
|
1753 |
converted.unlock() |
|
6138.3.4
by Jonathan Riddell
add gettext() to uses of trace.note() |
1754 |
pb.update(gettext('Deleting old repository content')) |
1556.1.4
by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same. |
1755 |
self.repo_dir.transport.delete_tree('repository.backup') |
6138.3.4
by Jonathan Riddell
add gettext() to uses of trace.note() |
1756 |
ui.ui_factory.note(gettext('repository converted')) |
4961.2.14
by Martin Pool
Further pb cleanups |
1757 |
pb.finished() |
1596.1.1
by Martin Pool
Use simple xml unescaping rather than importing xml.sax |
1758 |
|
1759 |
||
3287.6.8
by Robert Collins
Reduce code duplication as per review. |
1760 |
def _strip_NULL_ghosts(revision_graph): |
1761 |
"""Also don't use this. more compatibility code for unmigrated clients."""
|
|
1762 |
# Filter ghosts, and null:
|
|
1763 |
if _mod_revision.NULL_REVISION in revision_graph: |
|
1764 |
del revision_graph[_mod_revision.NULL_REVISION] |
|
1765 |
for key, parents in revision_graph.items(): |
|
1766 |
revision_graph[key] = tuple(parent for parent in parents if parent |
|
1767 |
in revision_graph) |
|
1768 |
return revision_graph |
|
4022.1.1
by Robert Collins
Refactoring of fetch to have a sender and sink component enabling splitting the logic over a network stream. (Robert Collins, Andrew Bennetts) |
1769 |
|
1770 |
||
4419.2.3
by Andrew Bennetts
Refactor _extend_partial_history into a standalone function that can be used without a branch. |
1771 |
def _iter_for_revno(repo, partial_history_cache, stop_index=None, |
1772 |
stop_revision=None): |
|
1773 |
"""Extend the partial history to include a given index
|
|
1774 |
||
1775 |
If a stop_index is supplied, stop when that index has been reached.
|
|
1776 |
If a stop_revision is supplied, stop when that revision is
|
|
1777 |
encountered. Otherwise, stop when the beginning of history is
|
|
1778 |
reached.
|
|
1779 |
||
1780 |
:param stop_index: The index which should be present. When it is
|
|
1781 |
present, history extension will stop.
|
|
1782 |
:param stop_revision: The revision id which should be present. When
|
|
1783 |
it is encountered, history extension will stop.
|
|
1784 |
"""
|
|
1785 |
start_revision = partial_history_cache[-1] |
|
5972.2.1
by Jelmer Vernooij
Deprecate Repository.iter_reverse_revision_history. |
1786 |
graph = repo.get_graph() |
1787 |
iterator = graph.iter_lefthand_ancestry(start_revision, |
|
1788 |
(_mod_revision.NULL_REVISION,)) |
|
4419.2.3
by Andrew Bennetts
Refactor _extend_partial_history into a standalone function that can be used without a branch. |
1789 |
try: |
5972.2.1
by Jelmer Vernooij
Deprecate Repository.iter_reverse_revision_history. |
1790 |
# skip the last revision in the list
|
4419.2.14
by Andrew Bennetts
Fix bug when partial_history == [stop_revision] |
1791 |
iterator.next() |
4419.2.3
by Andrew Bennetts
Refactor _extend_partial_history into a standalone function that can be used without a branch. |
1792 |
while True: |
1793 |
if (stop_index is not None and |
|
1794 |
len(partial_history_cache) > stop_index): |
|
1795 |
break
|
|
4419.2.14
by Andrew Bennetts
Fix bug when partial_history == [stop_revision] |
1796 |
if partial_history_cache[-1] == stop_revision: |
1797 |
break
|
|
4419.2.3
by Andrew Bennetts
Refactor _extend_partial_history into a standalone function that can be used without a branch. |
1798 |
revision_id = iterator.next() |
1799 |
partial_history_cache.append(revision_id) |
|
1800 |
except StopIteration: |
|
1801 |
# No more history
|
|
1802 |
return
|
|
5816.8.1
by Andrew Bennetts
Be a little more clever about constructing a parents provider for stacked repositories, so that get_parent_map with local-stacked-on-remote doesn't use HPSS VFS calls. |
1803 |
|
1804 |
||
5816.8.3
by Andrew Bennetts
Add test for calling add_fallback_repository after _make_parents_provider, and make it work. |
1805 |
class _LazyListJoin(object): |
1806 |
"""An iterable yielding the contents of many lists as one list.
|
|
5816.8.1
by Andrew Bennetts
Be a little more clever about constructing a parents provider for stacked repositories, so that get_parent_map with local-stacked-on-remote doesn't use HPSS VFS calls. |
1807 |
|
5816.8.3
by Andrew Bennetts
Add test for calling add_fallback_repository after _make_parents_provider, and make it work. |
1808 |
Each iterator made from this will reflect the current contents of the lists
|
1809 |
at the time the iterator is made.
|
|
5816.8.1
by Andrew Bennetts
Be a little more clever about constructing a parents provider for stacked repositories, so that get_parent_map with local-stacked-on-remote doesn't use HPSS VFS calls. |
1810 |
|
5816.8.3
by Andrew Bennetts
Add test for calling add_fallback_repository after _make_parents_provider, and make it work. |
1811 |
This is used by Repository's _make_parents_provider implementation so that
|
1812 |
it is safe to do::
|
|
5816.8.1
by Andrew Bennetts
Be a little more clever about constructing a parents provider for stacked repositories, so that get_parent_map with local-stacked-on-remote doesn't use HPSS VFS calls. |
1813 |
|
5816.8.3
by Andrew Bennetts
Add test for calling add_fallback_repository after _make_parents_provider, and make it work. |
1814 |
pp = repo._make_parents_provider() # uses a list of fallback repos
|
1815 |
pp.add_fallback_repository(other_repo) # appends to that list
|
|
5816.8.1
by Andrew Bennetts
Be a little more clever about constructing a parents provider for stacked repositories, so that get_parent_map with local-stacked-on-remote doesn't use HPSS VFS calls. |
1816 |
result = pp.get_parent_map(...)
|
1817 |
# The result will include revs from other_repo
|
|
1818 |
"""
|
|
1819 |
||
5816.8.3
by Andrew Bennetts
Add test for calling add_fallback_repository after _make_parents_provider, and make it work. |
1820 |
def __init__(self, *list_parts): |
1821 |
self.list_parts = list_parts |
|
5816.8.1
by Andrew Bennetts
Be a little more clever about constructing a parents provider for stacked repositories, so that get_parent_map with local-stacked-on-remote doesn't use HPSS VFS calls. |
1822 |
|
1823 |
def __iter__(self): |
|
5816.8.3
by Andrew Bennetts
Add test for calling add_fallback_repository after _make_parents_provider, and make it work. |
1824 |
full_list = [] |
1825 |
for list_part in self.list_parts: |
|
1826 |
full_list.extend(list_part) |
|
1827 |
return iter(full_list) |
|
6015.20.1
by John Arbash Meinel
Add a __repr__ to _LazyListJoin to make it easier to debug. |
1828 |
|
1829 |
def __repr__(self): |
|
1830 |
return "%s.%s(%s)" % (self.__module__, self.__class__.__name__, |
|
1831 |
self.list_parts) |