/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/branchbuilder.py

  • Committer: Robert Collins
  • Date: 2010-05-06 11:08:10 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506110810-h3j07fh5gmw54s25
Cleaner matcher matching revised unlocking protocol.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branchbuilder.py
103
103
        finally:
104
104
            tree.unlock()
105
105
 
106
 
    def _do_commit(self, tree, message=None, **kwargs):
 
106
    def _do_commit(self, tree, message=None, message_callback=None, **kwargs):
107
107
        reporter = commit.NullCommitReporter()
108
 
        if message is None:
 
108
        if message is None and message_callback is None:
109
109
            message = u'commit %d' % (self._branch.revno() + 1,)
110
 
        return tree.commit(message,
 
110
        return tree.commit(message, message_callback=message_callback,
111
111
            reporter=reporter,
112
112
            **kwargs)
113
113
 
114
 
    def _move_branch_pointer(self, new_revision_id):
 
114
    def _move_branch_pointer(self, new_revision_id,
 
115
        allow_leftmost_as_ghost=False):
115
116
        """Point self._branch to a different revision id."""
116
117
        self._branch.lock_write()
117
118
        try:
118
119
            # We don't seem to have a simple set_last_revision(), so we
119
120
            # implement it here.
120
121
            cur_revno, cur_revision_id = self._branch.last_revision_info()
121
 
            g = self._branch.repository.get_graph()
122
 
            new_revno = g.find_distance_to_null(new_revision_id,
123
 
                                                [(cur_revision_id, cur_revno)])
124
 
            self._branch.set_last_revision_info(new_revno, new_revision_id)
 
122
            try:
 
123
                g = self._branch.repository.get_graph()
 
124
                new_revno = g.find_distance_to_null(new_revision_id,
 
125
                    [(cur_revision_id, cur_revno)])
 
126
                self._branch.set_last_revision_info(new_revno, new_revision_id)
 
127
            except errors.GhostRevisionsHaveNoRevno:
 
128
                if not allow_leftmost_as_ghost:
 
129
                    raise
 
130
                new_revno = 1
125
131
        finally:
126
132
            self._branch.unlock()
127
133
        if self._tree is not None:
155
161
        self._tree = None
156
162
 
157
163
    def build_snapshot(self, revision_id, parent_ids, actions,
158
 
                       message=None, timestamp=None):
 
164
        message=None, timestamp=None, allow_leftmost_as_ghost=False,
 
165
        committer=None, timezone=None, message_callback=None):
159
166
        """Build a commit, shaped in a specific way.
160
167
 
161
168
        :param revision_id: The handle for the new commit, can be None
168
175
            ('rename', ('orig-path', 'new-path'))
169
176
        :param message: An optional commit message, if not supplied, a default
170
177
            commit message will be written.
 
178
        :param message_callback: A message callback to use for the commit, as
 
179
            per mutabletree.commit.
171
180
        :param timestamp: If non-None, set the timestamp of the commit to this
172
181
            value.
 
182
        :param timezone: An optional timezone for timestamp.
 
183
        :param committer: An optional username to use for commit
 
184
        :param allow_leftmost_as_ghost: True if the leftmost parent should be
 
185
            permitted to be a ghost.
173
186
        :return: The revision_id of the new commit
174
187
        """
175
188
        if parent_ids is not None:
176
189
            base_id = parent_ids[0]
177
190
            if base_id != self._branch.last_revision():
178
 
                self._move_branch_pointer(base_id)
 
191
                self._move_branch_pointer(base_id,
 
192
                    allow_leftmost_as_ghost=allow_leftmost_as_ghost)
179
193
 
180
194
        if self._tree is not None:
181
195
            tree = self._tree
184
198
        tree.lock_write()
185
199
        try:
186
200
            if parent_ids is not None:
187
 
                tree.set_parent_ids(parent_ids)
 
201
                tree.set_parent_ids(parent_ids,
 
202
                    allow_leftmost_as_ghost=allow_leftmost_as_ghost)
188
203
            # Unfortunately, MemoryTree.add(directory) just creates an
189
204
            # inventory entry. And the only public function to create a
190
205
            # directory is MemoryTree.mkdir() which creates the directory, but
231
246
            for file_id, content in new_contents.iteritems():
232
247
                tree.put_file_bytes_non_atomic(file_id, content)
233
248
            return self._do_commit(tree, message=message, rev_id=revision_id,
234
 
                timestamp=timestamp)
 
249
                timestamp=timestamp, timezone=timezone, committer=committer,
 
250
                message_callback=message_callback)
235
251
        finally:
236
252
            tree.unlock()
237
253