← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branchbuilder.py

  • Committer: Johan Walles
  • Date: 2009-05-07 05:08:46 UTC
  • mfrom: (4342 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4343.
  • Revision ID: johan.walles@gmail.com-20090507050846-nkwvcyauf1eh653q
Merge from upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branchbuilder.py
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):
159
165
        """Build a commit, shaped in a specific way.
160
166
 
161
167
        :param revision_id: The handle for the new commit, can be None
170
176
            commit message will be written.
171
177
        :param timestamp: If non-None, set the timestamp of the commit to this
172
178
            value.
 
179
        :param allow_leftmost_as_ghost: True if the leftmost parent should be
 
180
            permitted to be a ghost.
173
181
        :return: The revision_id of the new commit
174
182
        """
175
183
        if parent_ids is not None:
176
184
            base_id = parent_ids[0]
177
185
            if base_id != self._branch.last_revision():
178
 
                self._move_branch_pointer(base_id)
 
186
                self._move_branch_pointer(base_id,
 
187
                    allow_leftmost_as_ghost=allow_leftmost_as_ghost)
179
188
 
180
189
        if self._tree is not None:
181
190
            tree = self._tree
184
193
        tree.lock_write()
185
194
        try:
186
195
            if parent_ids is not None:
187
 
                tree.set_parent_ids(parent_ids)
 
196
                tree.set_parent_ids(parent_ids,
 
197
                    allow_leftmost_as_ghost=allow_leftmost_as_ghost)
188
198
            # Unfortunately, MemoryTree.add(directory) just creates an
189
199
            # inventory entry. And the only public function to create a
190
200
            # directory is MemoryTree.mkdir() which creates the directory, but