← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branchbuilder.py

  • Committer: Andrew Bennetts
  • Date: 2009-11-25 07:27:43 UTC
  • mto: This revision was merged to the branch mainline in revision 4825.
  • Revision ID: andrew.bennetts@canonical.com-20091125072743-v6sv4m2mkt9iyslp
https://launchpad.net/bugs/426662
Terminate SSHSubprocesses when no refs to them are left, in case .close is never called.

Show diffs side-by-side

added added

removed removed

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