99
95
:param commit_kwargs: Arguments to pass through to commit, such as
102
if parent_ids is not None:
103
if len(parent_ids) == 0:
104
base_id = revision.NULL_REVISION
106
base_id = parent_ids[0]
107
if base_id != self._branch.last_revision():
108
self._move_branch_pointer(base_id,
109
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
110
98
tree = memorytree.MemoryTree.create_on_branch(self._branch)
113
if parent_ids is not None:
114
tree.set_parent_ids(parent_ids,
115
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
117
102
return self._do_commit(tree, **commit_kwargs)
121
def _do_commit(self, tree, message=None, message_callback=None, **kwargs):
106
def _do_commit(self, tree, message=None, **kwargs):
122
107
reporter = commit.NullCommitReporter()
123
if message is None and message_callback is None:
124
109
message = u'commit %d' % (self._branch.revno() + 1,)
125
return tree.commit(message, message_callback=message_callback,
110
return tree.commit(message,
126
111
reporter=reporter,
176
161
self._tree = None
178
163
def build_snapshot(self, revision_id, parent_ids, actions,
179
message=None, timestamp=None, allow_leftmost_as_ghost=False,
180
committer=None, timezone=None, message_callback=None):
164
message=None, timestamp=None, allow_leftmost_as_ghost=False):
181
165
"""Build a commit, shaped in a specific way.
183
Most of the actions are self-explanatory. 'flush' is special action to
184
break a series of actions into discrete steps so that complex changes
185
(such as unversioning a file-id and re-adding it with a different kind)
186
can be expressed in a way that will clearly work.
188
167
:param revision_id: The handle for the new commit, can be None
189
168
:param parent_ids: A list of parent_ids to use for the commit.
190
169
It can be None, which indicates to use the last commit.
193
172
('modify', ('file-id', 'new-content'))
194
173
('unversion', 'file-id')
195
174
('rename', ('orig-path', 'new-path'))
197
175
:param message: An optional commit message, if not supplied, a default
198
176
commit message will be written.
199
:param message_callback: A message callback to use for the commit, as
200
per mutabletree.commit.
201
177
:param timestamp: If non-None, set the timestamp of the commit to this
203
:param timezone: An optional timezone for timestamp.
204
:param committer: An optional username to use for commit
205
179
:param allow_leftmost_as_ghost: True if the leftmost parent should be
206
180
permitted to be a ghost.
207
181
:return: The revision_id of the new commit
209
183
if parent_ids is not None:
210
if len(parent_ids) == 0:
211
base_id = revision.NULL_REVISION
213
base_id = parent_ids[0]
184
base_id = parent_ids[0]
214
185
if base_id != self._branch.last_revision():
215
186
self._move_branch_pointer(base_id,
216
187
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
228
199
# inventory entry. And the only public function to create a
229
200
# directory is MemoryTree.mkdir() which creates the directory, but
230
201
# also always adds it. So we have to use a multi-pass setup.
231
pending = _PendingActions()
202
to_add_directories = []
207
to_unversion_ids = []
232
209
for action, info in actions:
233
210
if action == 'add':
234
211
path, file_id, kind, content = info
235
212
if kind == 'directory':
236
pending.to_add_directories.append((path, file_id))
213
to_add_directories.append((path, file_id))
238
pending.to_add_files.append(path)
239
pending.to_add_file_ids.append(file_id)
240
pending.to_add_kinds.append(kind)
215
to_add_files.append(path)
216
to_add_file_ids.append(file_id)
217
to_add_kinds.append(kind)
241
218
if content is not None:
242
pending.new_contents[file_id] = content
219
new_contents[file_id] = content
243
220
elif action == 'modify':
244
221
file_id, content = info
245
pending.new_contents[file_id] = content
222
new_contents[file_id] = content
246
223
elif action == 'unversion':
247
pending.to_unversion_ids.add(info)
224
to_unversion_ids.append(info)
248
225
elif action == 'rename':
249
226
from_relpath, to_relpath = info
250
pending.to_rename.append((from_relpath, to_relpath))
251
elif action == 'flush':
252
self._flush_pending(tree, pending)
253
pending = _PendingActions()
227
to_rename.append((from_relpath, to_relpath))
255
229
raise ValueError('Unknown build action: "%s"' % (action,))
256
self._flush_pending(tree, pending)
231
tree.unversion(to_unversion_ids)
232
for path, file_id in to_add_directories:
234
# Special case, because the path already exists
235
tree.add([path], [file_id], ['directory'])
237
tree.mkdir(path, file_id)
238
for from_relpath, to_relpath in to_rename:
239
tree.rename_one(from_relpath, to_relpath)
240
tree.add(to_add_files, to_add_file_ids, to_add_kinds)
241
for file_id, content in new_contents.iteritems():
242
tree.put_file_bytes_non_atomic(file_id, content)
257
243
return self._do_commit(tree, message=message, rev_id=revision_id,
258
timestamp=timestamp, timezone=timezone, committer=committer,
259
message_callback=message_callback)
263
def _flush_pending(self, tree, pending):
264
"""Flush the pending actions in 'pending', i.e. apply them to 'tree'."""
265
for path, file_id in pending.to_add_directories:
267
old_id = tree.path2id(path)
268
if old_id is not None and old_id in pending.to_unversion_ids:
269
# We're overwriting this path, no need to unversion
270
pending.to_unversion_ids.discard(old_id)
271
# Special case, because the path already exists
272
tree.add([path], [file_id], ['directory'])
274
tree.mkdir(path, file_id)
275
for from_relpath, to_relpath in pending.to_rename:
276
tree.rename_one(from_relpath, to_relpath)
277
if pending.to_unversion_ids:
278
tree.unversion(pending.to_unversion_ids)
279
tree.add(pending.to_add_files, pending.to_add_file_ids, pending.to_add_kinds)
280
for file_id, content in pending.new_contents.iteritems():
281
tree.put_file_bytes_non_atomic(file_id, content)
283
248
def get_branch(self):
284
249
"""Return the branch created by the builder."""
285
250
return self._branch
288
class _PendingActions(object):
289
"""Pending actions for build_snapshot to take.
291
This is just a simple class to hold a bunch of the intermediate state of
292
build_snapshot in single object.
296
self.to_add_directories = []
297
self.to_add_files = []
298
self.to_add_file_ids = []
299
self.to_add_kinds = []
300
self.new_contents = {}
301
self.to_unversion_ids = set()