← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branchbuilder.py

  • Committer: John Arbash Meinel
  • Date: 2009-03-06 20:42:40 UTC
  • mto: This revision was merged to the branch mainline in revision 4088.
  • Revision ID: john@arbash-meinel.com-20090306204240-mzjavv31z3gu1x7i
Fix a small bug in setup.py when an extension fails to build

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branchbuilder.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""Utility for create branches with particular contents."""
18
18
 
56
56
        a series in progress, it should be None.
57
57
    """
58
58
 
59
 
    def __init__(self, transport=None, format=None, branch=None):
 
59
    def __init__(self, transport, format=None):
60
60
        """Construct a BranchBuilder on transport.
61
61
 
62
62
        :param transport: The transport the branch should be created on.
64
64
            it will be created.
65
65
        :param format: Either a BzrDirFormat, or the name of a format in the
66
66
            bzrdir format registry for the branch to be built.
67
 
        :param branch: An already constructed branch to use.  This param is
68
 
            mutually exclusive with the transport and format params.
69
67
        """
70
 
        if branch is not None:
71
 
            if format is not None:
72
 
                raise AssertionError(
73
 
                    "branch and format kwargs are mutually exclusive")
74
 
            if transport is not None:
75
 
                raise AssertionError(
76
 
                    "branch and transport kwargs are mutually exclusive")
77
 
            self._branch = branch
78
 
        else:
79
 
            if not transport.has('.'):
80
 
                transport.mkdir('.')
81
 
            if format is None:
82
 
                format = 'default'
83
 
            if isinstance(format, str):
84
 
                format = bzrdir.format_registry.make_bzrdir(format)
85
 
            self._branch = bzrdir.BzrDir.create_branch_convenience(
86
 
                transport.base, format=format, force_new_tree=False)
 
68
        if not transport.has('.'):
 
69
            transport.mkdir('.')
 
70
        if format is None:
 
71
            format = 'default'
 
72
        if isinstance(format, str):
 
73
            format = bzrdir.format_registry.make_bzrdir(format)
 
74
        self._branch = bzrdir.BzrDir.create_branch_convenience(transport.base,
 
75
            format=format, force_new_tree=False)
87
76
        self._tree = None
88
77
 
89
78
    def build_commit(self, **commit_kwargs):
111
100
            reporter=reporter,
112
101
            **kwargs)
113
102
 
114
 
    def _move_branch_pointer(self, new_revision_id,
115
 
        allow_leftmost_as_ghost=False):
 
103
    def _move_branch_pointer(self, new_revision_id):
116
104
        """Point self._branch to a different revision id."""
117
105
        self._branch.lock_write()
118
106
        try:
119
107
            # We don't seem to have a simple set_last_revision(), so we
120
108
            # implement it here.
121
109
            cur_revno, cur_revision_id = self._branch.last_revision_info()
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
 
110
            g = self._branch.repository.get_graph()
 
111
            new_revno = g.find_distance_to_null(new_revision_id,
 
112
                                                [(cur_revision_id, cur_revno)])
 
113
            self._branch.set_last_revision_info(new_revno, new_revision_id)
131
114
        finally:
132
115
            self._branch.unlock()
133
116
        if self._tree is not None:
161
144
        self._tree = None
162
145
 
163
146
    def build_snapshot(self, revision_id, parent_ids, actions,
164
 
        message=None, timestamp=None, allow_leftmost_as_ghost=False,
165
 
        committer=None, timezone=None):
 
147
                       message=None, timestamp=None):
166
148
        """Build a commit, shaped in a specific way.
167
149
 
168
150
        :param revision_id: The handle for the new commit, can be None
177
159
            commit message will be written.
178
160
        :param timestamp: If non-None, set the timestamp of the commit to this
179
161
            value.
180
 
        :param timezone: An optional timezone for timestamp.
181
 
        :param committer: An optional username to use for commit
182
 
        :param allow_leftmost_as_ghost: True if the leftmost parent should be
183
 
            permitted to be a ghost.
184
162
        :return: The revision_id of the new commit
185
163
        """
186
164
        if parent_ids is not None:
187
165
            base_id = parent_ids[0]
188
166
            if base_id != self._branch.last_revision():
189
 
                self._move_branch_pointer(base_id,
190
 
                    allow_leftmost_as_ghost=allow_leftmost_as_ghost)
 
167
                self._move_branch_pointer(base_id)
191
168
 
192
169
        if self._tree is not None:
193
170
            tree = self._tree
196
173
        tree.lock_write()
197
174
        try:
198
175
            if parent_ids is not None:
199
 
                tree.set_parent_ids(parent_ids,
200
 
                    allow_leftmost_as_ghost=allow_leftmost_as_ghost)
 
176
                tree.set_parent_ids(parent_ids)
201
177
            # Unfortunately, MemoryTree.add(directory) just creates an
202
178
            # inventory entry. And the only public function to create a
203
179
            # directory is MemoryTree.mkdir() which creates the directory, but
244
220
            for file_id, content in new_contents.iteritems():
245
221
                tree.put_file_bytes_non_atomic(file_id, content)
246
222
            return self._do_commit(tree, message=message, rev_id=revision_id,
247
 
                timestamp=timestamp, timezone=timezone, committer=committer)
 
223
                timestamp=timestamp)
248
224
        finally:
249
225
            tree.unlock()
250
226