bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
4070.5.1
by Martin Pool
BranchBuilder now takes a timestamp for commits |
1 |
# Copyright (C) 2007, 2008, 2009 Canonical Ltd
|
2466.7.3
by Robert Collins
Create bzrlib.branchbuilder. |
2 |
#
|
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.
|
|
7 |
#
|
|
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.
|
|
12 |
#
|
|
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
|
2466.7.3
by Robert Collins
Create bzrlib.branchbuilder. |
16 |
|
6379.6.7
by Jelmer Vernooij
Move importing from future until after doc string, otherwise the doc string will disappear. |
17 |
"""Utility for create branches with particular contents."""
|
18 |
||
6379.6.1
by Jelmer Vernooij
Import absolute_import in a few places. |
19 |
from __future__ import absolute_import |
20 |
||
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
21 |
from . import ( |
6207.3.3
by jelmer at samba
Fix tests and the like. |
22 |
controldir, |
3825.3.2
by Martin Pool
Correct example of branchbuilder and change to a doctest, and refactor |
23 |
commit, |
24 |
errors, |
|
5540.1.1
by Gary van der Merwe
Make ``BranchBuilder.build_snapshot`` accept parent_ids == ['null:']. |
25 |
revision, |
3825.3.2
by Martin Pool
Correct example of branchbuilder and change to a doctest, and refactor |
26 |
)
|
2466.7.3
by Robert Collins
Create bzrlib.branchbuilder. |
27 |
|
28 |
||
29 |
class BranchBuilder(object): |
|
3825.3.2
by Martin Pool
Correct example of branchbuilder and change to a doctest, and refactor |
30 |
r"""A BranchBuilder aids creating Branches with particular shapes. |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
31 |
|
2466.7.7
by Robert Collins
Document basic usage. |
32 |
The expected way to use BranchBuilder is to construct a
|
33 |
BranchBuilder on the transport you want your branch on, and then call
|
|
34 |
appropriate build_ methods on it to get the shape of history you want.
|
|
35 |
||
3567.4.18
by John Arbash Meinel
Apply the review changes from Martin to the exact patch he approved. |
36 |
This is meant as a helper for the test suite, not as a general class for
|
37 |
real data.
|
|
38 |
||
2466.7.7
by Robert Collins
Document basic usage. |
39 |
For instance:
|
3825.3.2
by Martin Pool
Correct example of branchbuilder and change to a doctest, and refactor |
40 |
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
41 |
>>> from breezy.transport.memory import MemoryTransport
|
3825.3.2
by Martin Pool
Correct example of branchbuilder and change to a doctest, and refactor |
42 |
>>> builder = BranchBuilder(MemoryTransport("memory:///"))
|
43 |
>>> builder.start_series()
|
|
6816.2.1
by Jelmer Vernooij
Migrate some build_snapshot code over to having revision_id as keyword argument. |
44 |
>>> builder.build_snapshot(None, [
|
6855.4.1
by Jelmer Vernooij
Yet more bees. |
45 |
... ('add', ('', b'root-id', 'directory', '')),
|
7027.3.3
by Jelmer Vernooij
Add some more bees; support writing both bytes and unicode strings in build_tree_contents. |
46 |
... ('add', ('filename', b'f-id', 'file', b'content\n'))],
|
6855.4.1
by Jelmer Vernooij
Yet more bees. |
47 |
... revision_id=b'rev-id')
|
7479.2.1
by Jelmer Vernooij
Drop python2 support. |
48 |
b'rev-id'
|
6973.13.2
by Jelmer Vernooij
Fix some more tests. |
49 |
>>> builder.build_snapshot([b'rev-id'],
|
7142.1.1
by Jelmer Vernooij
Improve documentation for BranchBuilder. |
50 |
... [('modify', ('filename', b'new-content\n'))],
|
6855.4.1
by Jelmer Vernooij
Yet more bees. |
51 |
... revision_id=b'rev2-id')
|
7479.2.1
by Jelmer Vernooij
Drop python2 support. |
52 |
b'rev2-id'
|
3825.3.2
by Martin Pool
Correct example of branchbuilder and change to a doctest, and refactor |
53 |
>>> builder.finish_series()
|
54 |
>>> branch = builder.get_branch()
|
|
3567.4.18
by John Arbash Meinel
Apply the review changes from Martin to the exact patch he approved. |
55 |
|
56 |
:ivar _tree: This is a private member which is not meant to be modified by
|
|
57 |
users of this class. While a 'series' is in progress, it should hold a
|
|
58 |
MemoryTree with the contents of the last commit (ready to be modified
|
|
59 |
by the next build_snapshot command) with a held write lock. Outside of
|
|
60 |
a series in progress, it should be None.
|
|
2466.7.7
by Robert Collins
Document basic usage. |
61 |
"""
|
2466.7.3
by Robert Collins
Create bzrlib.branchbuilder. |
62 |
|
4476.3.59
by Andrew Bennetts
Undo changes that aren't needed anymore. |
63 |
def __init__(self, transport=None, format=None, branch=None): |
2466.7.5
by Robert Collins
Better docstring for BranchBuilder.__init__. |
64 |
"""Construct a BranchBuilder on transport. |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
65 |
|
2466.7.5
by Robert Collins
Better docstring for BranchBuilder.__init__. |
66 |
:param transport: The transport the branch should be created on.
|
67 |
If the path of the transport does not exist but its parent does
|
|
68 |
it will be created.
|
|
3567.4.18
by John Arbash Meinel
Apply the review changes from Martin to the exact patch he approved. |
69 |
:param format: Either a BzrDirFormat, or the name of a format in the
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
70 |
controldir format registry for the branch to be built.
|
4257.3.8
by Andrew Bennetts
Fix TestCase.make_branch_builder to make a branch in the specified format. Also add an interrepo test scenario for KnitPack1 -> KnitPack6RichRoot, which fails. |
71 |
:param branch: An already constructed branch to use. This param is
|
72 |
mutually exclusive with the transport and format params.
|
|
2466.7.5
by Robert Collins
Better docstring for BranchBuilder.__init__. |
73 |
"""
|
4257.3.8
by Andrew Bennetts
Fix TestCase.make_branch_builder to make a branch in the specified format. Also add an interrepo test scenario for KnitPack1 -> KnitPack6RichRoot, which fails. |
74 |
if branch is not None: |
75 |
if format is not None: |
|
76 |
raise AssertionError( |
|
77 |
"branch and format kwargs are mutually exclusive") |
|
78 |
if transport is not None: |
|
79 |
raise AssertionError( |
|
80 |
"branch and transport kwargs are mutually exclusive") |
|
81 |
self._branch = branch |
|
82 |
else: |
|
83 |
if not transport.has('.'): |
|
84 |
transport.mkdir('.') |
|
85 |
if format is None: |
|
86 |
format = 'default' |
|
87 |
if isinstance(format, str): |
|
6653.6.5
by Jelmer Vernooij
Rename make_bzrdir to make_controldir. |
88 |
format = controldir.format_registry.make_controldir(format) |
6207.3.3
by jelmer at samba
Fix tests and the like. |
89 |
self._branch = controldir.ControlDir.create_branch_convenience( |
4257.3.8
by Andrew Bennetts
Fix TestCase.make_branch_builder to make a branch in the specified format. Also add an interrepo test scenario for KnitPack1 -> KnitPack6RichRoot, which fails. |
90 |
transport.base, format=format, force_new_tree=False) |
3567.4.17
by John Arbash Meinel
Add the ability to define a series of commits, which allows us to hold open the locks. |
91 |
self._tree = None |
2466.7.4
by Robert Collins
Add BranchBuilder.get_branch(). |
92 |
|
6225.1.1
by Jelmer Vernooij
Add parent_ids argument to BranchBuilder.build_commit. |
93 |
def build_commit(self, parent_ids=None, allow_leftmost_as_ghost=False, |
94 |
**commit_kwargs): |
|
4070.5.1
by Martin Pool
BranchBuilder now takes a timestamp for commits |
95 |
"""Build a commit on the branch. |
4070.4.12
by Martin Pool
Kill trailing whitespace |
96 |
|
4070.5.1
by Martin Pool
BranchBuilder now takes a timestamp for commits |
97 |
This makes a commit with no real file content for when you only want
|
98 |
to look at the revision graph structure.
|
|
99 |
||
100 |
:param commit_kwargs: Arguments to pass through to commit, such as
|
|
101 |
timestamp.
|
|
102 |
"""
|
|
6225.1.1
by Jelmer Vernooij
Add parent_ids argument to BranchBuilder.build_commit. |
103 |
if parent_ids is not None: |
104 |
if len(parent_ids) == 0: |
|
105 |
base_id = revision.NULL_REVISION |
|
106 |
else: |
|
107 |
base_id = parent_ids[0] |
|
108 |
if base_id != self._branch.last_revision(): |
|
7143.15.1
by Jelmer Vernooij
Fix style issues. |
109 |
self._move_branch_pointer( |
110 |
base_id, allow_leftmost_as_ghost=allow_leftmost_as_ghost) |
|
6883.8.1
by Jelmer Vernooij
Add Branch.create_memorytree. |
111 |
tree = self._branch.create_memorytree() |
6969.3.1
by Jelmer Vernooij
Use context managers. |
112 |
with tree.lock_write(): |
6225.1.1
by Jelmer Vernooij
Add parent_ids argument to BranchBuilder.build_commit. |
113 |
if parent_ids is not None: |
7143.15.1
by Jelmer Vernooij
Fix style issues. |
114 |
tree.set_parent_ids( |
115 |
parent_ids, |
|
6225.1.1
by Jelmer Vernooij
Add parent_ids argument to BranchBuilder.build_commit. |
116 |
allow_leftmost_as_ghost=allow_leftmost_as_ghost) |
2466.7.9
by Robert Collins
Return the commited revision id from BranchBuilder.build_commit to save later instrospection. |
117 |
tree.add('') |
4070.5.1
by Martin Pool
BranchBuilder now takes a timestamp for commits |
118 |
return self._do_commit(tree, **commit_kwargs) |
2466.7.6
by Robert Collins
Add BranchBuilder.build_commit. |
119 |
|
5060.1.1
by Robert Collins
``bzrlib.branchbuilder.BranchBuilder.build_snapshot`` now accepts a |
120 |
def _do_commit(self, tree, message=None, message_callback=None, **kwargs): |
3825.3.2
by Martin Pool
Correct example of branchbuilder and change to a doctest, and refactor |
121 |
reporter = commit.NullCommitReporter() |
5060.1.1
by Robert Collins
``bzrlib.branchbuilder.BranchBuilder.build_snapshot`` now accepts a |
122 |
if message is None and message_callback is None: |
3825.3.2
by Martin Pool
Correct example of branchbuilder and change to a doctest, and refactor |
123 |
message = u'commit %d' % (self._branch.revno() + 1,) |
5060.1.1
by Robert Collins
``bzrlib.branchbuilder.BranchBuilder.build_snapshot`` now accepts a |
124 |
return tree.commit(message, message_callback=message_callback, |
7143.15.1
by Jelmer Vernooij
Fix style issues. |
125 |
reporter=reporter, **kwargs) |
3825.3.2
by Martin Pool
Correct example of branchbuilder and change to a doctest, and refactor |
126 |
|
4324.3.1
by Robert Collins
When adding rich root data follow the standard revision graph rules, so it does not create 'inconstent parents'. |
127 |
def _move_branch_pointer(self, new_revision_id, |
7143.15.1
by Jelmer Vernooij
Fix style issues. |
128 |
allow_leftmost_as_ghost=False): |
3567.4.10
by John Arbash Meinel
Clean up the build_snapshot api a bit. |
129 |
"""Point self._branch to a different revision id.""" |
6969.3.1
by Jelmer Vernooij
Use context managers. |
130 |
with self._branch.lock_write(): |
3567.4.10
by John Arbash Meinel
Clean up the build_snapshot api a bit. |
131 |
# We don't seem to have a simple set_last_revision(), so we
|
132 |
# implement it here.
|
|
133 |
cur_revno, cur_revision_id = self._branch.last_revision_info() |
|
4324.3.1
by Robert Collins
When adding rich root data follow the standard revision graph rules, so it does not create 'inconstent parents'. |
134 |
try: |
135 |
g = self._branch.repository.get_graph() |
|
7143.15.1
by Jelmer Vernooij
Fix style issues. |
136 |
new_revno = g.find_distance_to_null( |
137 |
new_revision_id, [(cur_revision_id, cur_revno)]) |
|
4324.3.1
by Robert Collins
When adding rich root data follow the standard revision graph rules, so it does not create 'inconstent parents'. |
138 |
self._branch.set_last_revision_info(new_revno, new_revision_id) |
139 |
except errors.GhostRevisionsHaveNoRevno: |
|
140 |
if not allow_leftmost_as_ghost: |
|
141 |
raise
|
|
142 |
new_revno = 1 |
|
3567.4.17
by John Arbash Meinel
Add the ability to define a series of commits, which allows us to hold open the locks. |
143 |
if self._tree is not None: |
144 |
# We are currently processing a series, but when switching branch
|
|
145 |
# pointers, it is easiest to just create a new memory tree.
|
|
146 |
# That way we are sure to have the right files-on-disk
|
|
147 |
# We are cheating a little bit here, and locking the new tree
|
|
148 |
# before the old tree is unlocked. But that way the branch stays
|
|
149 |
# locked throughout.
|
|
6883.8.1
by Jelmer Vernooij
Add Branch.create_memorytree. |
150 |
new_tree = self._branch.create_memorytree() |
3567.4.17
by John Arbash Meinel
Add the ability to define a series of commits, which allows us to hold open the locks. |
151 |
new_tree.lock_write() |
152 |
self._tree.unlock() |
|
153 |
self._tree = new_tree |
|
154 |
||
155 |
def start_series(self): |
|
156 |
"""We will be creating a series of commits. |
|
157 |
||
158 |
This allows us to hold open the locks while we are processing.
|
|
159 |
||
160 |
Make sure to call 'finish_series' when you are done.
|
|
161 |
"""
|
|
3567.4.18
by John Arbash Meinel
Apply the review changes from Martin to the exact patch he approved. |
162 |
if self._tree is not None: |
163 |
raise AssertionError('You cannot start a new series while a' |
|
164 |
' series is already going.') |
|
6883.8.1
by Jelmer Vernooij
Add Branch.create_memorytree. |
165 |
self._tree = self._branch.create_memorytree() |
3567.4.17
by John Arbash Meinel
Add the ability to define a series of commits, which allows us to hold open the locks. |
166 |
self._tree.lock_write() |
167 |
||
168 |
def finish_series(self): |
|
169 |
"""Call this after start_series to unlock the various objects.""" |
|
170 |
self._tree.unlock() |
|
171 |
self._tree = None |
|
3567.4.10
by John Arbash Meinel
Clean up the build_snapshot api a bit. |
172 |
|
6816.2.1
by Jelmer Vernooij
Migrate some build_snapshot code over to having revision_id as keyword argument. |
173 |
def build_snapshot(self, parent_ids, actions, message=None, timestamp=None, |
7143.15.1
by Jelmer Vernooij
Fix style issues. |
174 |
allow_leftmost_as_ghost=False, committer=None, |
175 |
timezone=None, message_callback=None, revision_id=None): |
|
3567.4.10
by John Arbash Meinel
Clean up the build_snapshot api a bit. |
176 |
"""Build a commit, shaped in a specific way. |
177 |
||
6008.2.5
by Andrew Bennetts
Rename 'checkpoint' to 'flush', add some unit tests and more comments. |
178 |
Most of the actions are self-explanatory. 'flush' is special action to
|
179 |
break a series of actions into discrete steps so that complex changes
|
|
180 |
(such as unversioning a file-id and re-adding it with a different kind)
|
|
181 |
can be expressed in a way that will clearly work.
|
|
182 |
||
3567.4.10
by John Arbash Meinel
Clean up the build_snapshot api a bit. |
183 |
:param parent_ids: A list of parent_ids to use for the commit.
|
184 |
It can be None, which indicates to use the last commit.
|
|
185 |
:param actions: A list of actions to perform. Supported actions are:
|
|
7027.3.3
by Jelmer Vernooij
Add some more bees; support writing both bytes and unicode strings in build_tree_contents. |
186 |
('add', ('path', b'file-id', 'kind', b'content' or None))
|
187 |
('modify', ('path', b'new-content'))
|
|
6883.22.1
by Jelmer Vernooij
Take paths in BranchBuilder. |
188 |
('unversion', 'path')
|
3567.5.2
by John Arbash Meinel
'rename' is a supported action. |
189 |
('rename', ('orig-path', 'new-path'))
|
6008.2.5
by Andrew Bennetts
Rename 'checkpoint' to 'flush', add some unit tests and more comments. |
190 |
('flush', None)
|
3567.4.15
by John Arbash Meinel
Allow setting the commit message. |
191 |
:param message: An optional commit message, if not supplied, a default
|
192 |
commit message will be written.
|
|
5060.1.1
by Robert Collins
``bzrlib.branchbuilder.BranchBuilder.build_snapshot`` now accepts a |
193 |
:param message_callback: A message callback to use for the commit, as
|
194 |
per mutabletree.commit.
|
|
4070.4.12
by Martin Pool
Kill trailing whitespace |
195 |
:param timestamp: If non-None, set the timestamp of the commit to this
|
4070.5.1
by Martin Pool
BranchBuilder now takes a timestamp for commits |
196 |
value.
|
4523.2.1
by Vincent Ladeuil
Fix TZ-dependent tests. |
197 |
:param timezone: An optional timezone for timestamp.
|
4454.3.24
by John Arbash Meinel
update BranchBuilder to support 'committer' |
198 |
:param committer: An optional username to use for commit
|
4324.3.1
by Robert Collins
When adding rich root data follow the standard revision graph rules, so it does not create 'inconstent parents'. |
199 |
:param allow_leftmost_as_ghost: True if the leftmost parent should be
|
200 |
permitted to be a ghost.
|
|
6816.2.1
by Jelmer Vernooij
Migrate some build_snapshot code over to having revision_id as keyword argument. |
201 |
:param revision_id: The handle for the new commit, can be None
|
3567.4.18
by John Arbash Meinel
Apply the review changes from Martin to the exact patch he approved. |
202 |
:return: The revision_id of the new commit
|
3567.4.10
by John Arbash Meinel
Clean up the build_snapshot api a bit. |
203 |
"""
|
3567.4.8
by John Arbash Meinel
Add the ability to force a basis for a revision. |
204 |
if parent_ids is not None: |
5540.2.1
by Gary van der Merwe
Allow for BranchBuilder.build_snapshot to accept parent_ids = [], rather than ['null:']. |
205 |
if len(parent_ids) == 0: |
206 |
base_id = revision.NULL_REVISION |
|
207 |
else: |
|
208 |
base_id = parent_ids[0] |
|
3567.4.10
by John Arbash Meinel
Clean up the build_snapshot api a bit. |
209 |
if base_id != self._branch.last_revision(): |
7143.15.1
by Jelmer Vernooij
Fix style issues. |
210 |
self._move_branch_pointer( |
211 |
base_id, allow_leftmost_as_ghost=allow_leftmost_as_ghost) |
|
3567.4.10
by John Arbash Meinel
Clean up the build_snapshot api a bit. |
212 |
|
3567.4.17
by John Arbash Meinel
Add the ability to define a series of commits, which allows us to hold open the locks. |
213 |
if self._tree is not None: |
214 |
tree = self._tree |
|
215 |
else: |
|
6883.8.1
by Jelmer Vernooij
Add Branch.create_memorytree. |
216 |
tree = self._branch.create_memorytree() |
6883.22.12
by Jelmer Vernooij
Fix test failure. |
217 |
with tree.lock_write(): |
5540.2.1
by Gary van der Merwe
Allow for BranchBuilder.build_snapshot to accept parent_ids = [], rather than ['null:']. |
218 |
if parent_ids is not None: |
7143.15.1
by Jelmer Vernooij
Fix style issues. |
219 |
tree.set_parent_ids( |
220 |
parent_ids, |
|
4324.3.1
by Robert Collins
When adding rich root data follow the standard revision graph rules, so it does not create 'inconstent parents'. |
221 |
allow_leftmost_as_ghost=allow_leftmost_as_ghost) |
3567.4.7
by John Arbash Meinel
Revert back to using MemoryTree.mkdir() rather than creating the directory during add(). |
222 |
# Unfortunately, MemoryTree.add(directory) just creates an
|
223 |
# inventory entry. And the only public function to create a
|
|
224 |
# directory is MemoryTree.mkdir() which creates the directory, but
|
|
225 |
# also always adds it. So we have to use a multi-pass setup.
|
|
6008.2.5
by Andrew Bennetts
Rename 'checkpoint' to 'flush', add some unit tests and more comments. |
226 |
pending = _PendingActions() |
3567.4.1
by John Arbash Meinel
Initial work to have BranchBuilder allow us to do tree-shape work. |
227 |
for action, info in actions: |
228 |
if action == 'add': |
|
229 |
path, file_id, kind, content = info |
|
3567.4.7
by John Arbash Meinel
Revert back to using MemoryTree.mkdir() rather than creating the directory during add(). |
230 |
if kind == 'directory': |
6008.2.5
by Andrew Bennetts
Rename 'checkpoint' to 'flush', add some unit tests and more comments. |
231 |
pending.to_add_directories.append((path, file_id)) |
3567.4.7
by John Arbash Meinel
Revert back to using MemoryTree.mkdir() rather than creating the directory during add(). |
232 |
else: |
6008.2.5
by Andrew Bennetts
Rename 'checkpoint' to 'flush', add some unit tests and more comments. |
233 |
pending.to_add_files.append(path) |
234 |
pending.to_add_file_ids.append(file_id) |
|
235 |
pending.to_add_kinds.append(kind) |
|
3567.4.7
by John Arbash Meinel
Revert back to using MemoryTree.mkdir() rather than creating the directory during add(). |
236 |
if content is not None: |
6883.22.1
by Jelmer Vernooij
Take paths in BranchBuilder. |
237 |
pending.new_contents[path] = content |
3567.4.3
by John Arbash Meinel
Add an action for modifying an existing file |
238 |
elif action == 'modify': |
6883.22.1
by Jelmer Vernooij
Take paths in BranchBuilder. |
239 |
path, content = info |
240 |
pending.new_contents[path] = content |
|
3567.4.4
by John Arbash Meinel
Add the ability to 'unversion' files, and handle unknown actions. |
241 |
elif action == 'unversion': |
6883.22.1
by Jelmer Vernooij
Take paths in BranchBuilder. |
242 |
pending.to_unversion_paths.add(info) |
3567.5.1
by John Arbash Meinel
Implement rename_one on MemoryTree, and expose that in the Branch Builder |
243 |
elif action == 'rename': |
244 |
from_relpath, to_relpath = info |
|
6008.2.5
by Andrew Bennetts
Rename 'checkpoint' to 'flush', add some unit tests and more comments. |
245 |
pending.to_rename.append((from_relpath, to_relpath)) |
246 |
elif action == 'flush': |
|
247 |
self._flush_pending(tree, pending) |
|
248 |
pending = _PendingActions() |
|
3567.4.4
by John Arbash Meinel
Add the ability to 'unversion' files, and handle unknown actions. |
249 |
else: |
3567.4.18
by John Arbash Meinel
Apply the review changes from Martin to the exact patch he approved. |
250 |
raise ValueError('Unknown build action: "%s"' % (action,)) |
6008.2.5
by Andrew Bennetts
Rename 'checkpoint' to 'flush', add some unit tests and more comments. |
251 |
self._flush_pending(tree, pending) |
7143.15.1
by Jelmer Vernooij
Fix style issues. |
252 |
return self._do_commit( |
253 |
tree, message=message, rev_id=revision_id, |
|
5060.1.1
by Robert Collins
``bzrlib.branchbuilder.BranchBuilder.build_snapshot`` now accepts a |
254 |
timestamp=timestamp, timezone=timezone, committer=committer, |
255 |
message_callback=message_callback) |
|
3567.4.1
by John Arbash Meinel
Initial work to have BranchBuilder allow us to do tree-shape work. |
256 |
|
6008.2.5
by Andrew Bennetts
Rename 'checkpoint' to 'flush', add some unit tests and more comments. |
257 |
def _flush_pending(self, tree, pending): |
7143.15.1
by Jelmer Vernooij
Fix style issues. |
258 |
"""Flush the pending actions in 'pending', i.e. apply them to tree.""" |
6008.2.5
by Andrew Bennetts
Rename 'checkpoint' to 'flush', add some unit tests and more comments. |
259 |
for path, file_id in pending.to_add_directories: |
6008.2.4
by Andrew Bennetts
Add ('checkpoint', None) action to BranchBuilder.build_snapshot to allow complex set of adds/deletes/renames to work without reinventing TreeTransform. |
260 |
if path == '': |
7143.15.1
by Jelmer Vernooij
Fix style issues. |
261 |
if tree.has_filename(path) \ |
262 |
and path in pending.to_unversion_paths: |
|
6008.2.4
by Andrew Bennetts
Add ('checkpoint', None) action to BranchBuilder.build_snapshot to allow complex set of adds/deletes/renames to work without reinventing TreeTransform. |
263 |
# We're overwriting this path, no need to unversion
|
6883.22.1
by Jelmer Vernooij
Take paths in BranchBuilder. |
264 |
pending.to_unversion_paths.discard(path) |
6008.2.4
by Andrew Bennetts
Add ('checkpoint', None) action to BranchBuilder.build_snapshot to allow complex set of adds/deletes/renames to work without reinventing TreeTransform. |
265 |
# Special case, because the path already exists
|
266 |
tree.add([path], [file_id], ['directory']) |
|
267 |
else: |
|
268 |
tree.mkdir(path, file_id) |
|
6008.2.5
by Andrew Bennetts
Rename 'checkpoint' to 'flush', add some unit tests and more comments. |
269 |
for from_relpath, to_relpath in pending.to_rename: |
6008.2.4
by Andrew Bennetts
Add ('checkpoint', None) action to BranchBuilder.build_snapshot to allow complex set of adds/deletes/renames to work without reinventing TreeTransform. |
270 |
tree.rename_one(from_relpath, to_relpath) |
6883.22.1
by Jelmer Vernooij
Take paths in BranchBuilder. |
271 |
if pending.to_unversion_paths: |
272 |
tree.unversion(pending.to_unversion_paths) |
|
7143.15.1
by Jelmer Vernooij
Fix style issues. |
273 |
tree.add(pending.to_add_files, pending.to_add_file_ids, |
274 |
pending.to_add_kinds) |
|
7479.2.1
by Jelmer Vernooij
Drop python2 support. |
275 |
for path, content in pending.new_contents.items(): |
6883.22.1
by Jelmer Vernooij
Take paths in BranchBuilder. |
276 |
tree.put_file_bytes_non_atomic(path, content) |
6008.2.4
by Andrew Bennetts
Add ('checkpoint', None) action to BranchBuilder.build_snapshot to allow complex set of adds/deletes/renames to work without reinventing TreeTransform. |
277 |
|
2466.7.4
by Robert Collins
Add BranchBuilder.get_branch(). |
278 |
def get_branch(self): |
279 |
"""Return the branch created by the builder.""" |
|
280 |
return self._branch |
|
6008.2.4
by Andrew Bennetts
Add ('checkpoint', None) action to BranchBuilder.build_snapshot to allow complex set of adds/deletes/renames to work without reinventing TreeTransform. |
281 |
|
282 |
||
6008.2.5
by Andrew Bennetts
Rename 'checkpoint' to 'flush', add some unit tests and more comments. |
283 |
class _PendingActions(object): |
284 |
"""Pending actions for build_snapshot to take. |
|
285 |
||
286 |
This is just a simple class to hold a bunch of the intermediate state of
|
|
287 |
build_snapshot in single object.
|
|
288 |
"""
|
|
6008.2.4
by Andrew Bennetts
Add ('checkpoint', None) action to BranchBuilder.build_snapshot to allow complex set of adds/deletes/renames to work without reinventing TreeTransform. |
289 |
|
290 |
def __init__(self): |
|
291 |
self.to_add_directories = [] |
|
292 |
self.to_add_files = [] |
|
293 |
self.to_add_file_ids = [] |
|
294 |
self.to_add_kinds = [] |
|
295 |
self.new_contents = {} |
|
6883.22.1
by Jelmer Vernooij
Take paths in BranchBuilder. |
296 |
self.to_unversion_paths = set() |
6008.2.4
by Andrew Bennetts
Add ('checkpoint', None) action to BranchBuilder.build_snapshot to allow complex set of adds/deletes/renames to work without reinventing TreeTransform. |
297 |
self.to_rename = [] |