/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

Merge in the BranchBuilder updates, which brings in a newer bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branchbuilder.py
47
47
            transport.mkdir('.')
48
48
        if format is None:
49
49
            format = 'default'
 
50
        if isinstance(format, str):
 
51
            format = bzrdir.format_registry.make_bzrdir(format)
50
52
        self._branch = bzrdir.BzrDir.create_branch_convenience(transport.base,
51
 
            format=bzrdir.format_registry.make_bzrdir(format))
 
53
            format=format, force_new_tree=False)
52
54
 
53
55
    def build_commit(self):
54
56
        """Build a commit on the branch."""
60
62
        finally:
61
63
            tree.unlock()
62
64
 
 
65
    def _move_branch_pointer(self, new_revision_id):
 
66
        """Point self._branch to a different revision id."""
 
67
        self._branch.lock_write()
 
68
        try:
 
69
            # We don't seem to have a simple set_last_revision(), so we
 
70
            # implement it here.
 
71
            cur_revno, cur_revision_id = self._branch.last_revision_info()
 
72
            g = self._branch.repository.get_graph()
 
73
            new_revno = g.find_distance_to_null(new_revision_id,
 
74
                                                [(cur_revision_id, cur_revno)])
 
75
            self._branch.set_last_revision_info(new_revno, new_revision_id)
 
76
        finally:
 
77
            self._branch.unlock()
 
78
 
 
79
    def build_snapshot(self, revision_id, parent_ids, actions,
 
80
                       message=None):
 
81
        """Build a commit, shaped in a specific way.
 
82
 
 
83
        :param revision_id: The handle for the new commit, can be None
 
84
        :param parent_ids: A list of parent_ids to use for the commit.
 
85
            It can be None, which indicates to use the last commit.
 
86
        :param actions: A list of actions to perform. Supported actions are:
 
87
            ('add', ('path', 'file-id', 'kind', 'content' or None))
 
88
            ('modify', ('file-id', 'new-content'))
 
89
            ('unversion', 'file-id')
 
90
            # not supported yet: ('rename', ('orig-path', 'new-path'))
 
91
        :param message: An optional commit message, if not supplied, a default
 
92
            commit message will be written.
 
93
        ;return: The revision_id of the new commit
 
94
        """
 
95
        if parent_ids is not None:
 
96
            base_id = parent_ids[0]
 
97
            if base_id != self._branch.last_revision():
 
98
                self._move_branch_pointer(base_id)
 
99
 
 
100
        tree = memorytree.MemoryTree.create_on_branch(self._branch)
 
101
        tree.lock_write()
 
102
        try:
 
103
            if parent_ids is not None:
 
104
                tree.set_parent_ids(parent_ids)
 
105
            # Unfortunately, MemoryTree.add(directory) just creates an
 
106
            # inventory entry. And the only public function to create a
 
107
            # directory is MemoryTree.mkdir() which creates the directory, but
 
108
            # also always adds it. So we have to use a multi-pass setup.
 
109
            to_add_directories = []
 
110
            to_add_files = []
 
111
            to_add_file_ids = []
 
112
            to_add_kinds = []
 
113
            new_contents = {}
 
114
            to_unversion_ids = []
 
115
            # TODO: MemoryTree doesn't support rename() or
 
116
            #       apply_inventory_delta, so we'll postpone allowing renames
 
117
            #       for now
 
118
            # to_rename = []
 
119
            for action, info in actions:
 
120
                if action == 'add':
 
121
                    path, file_id, kind, content = info
 
122
                    if kind == 'directory':
 
123
                        to_add_directories.append((path, file_id))
 
124
                    else:
 
125
                        to_add_files.append(path)
 
126
                        to_add_file_ids.append(file_id)
 
127
                        to_add_kinds.append(kind)
 
128
                        if content is not None:
 
129
                            new_contents[file_id] = content
 
130
                elif action == 'modify':
 
131
                    file_id, content = info
 
132
                    new_contents[file_id] = content
 
133
                elif action == 'unversion':
 
134
                    to_unversion_ids.append(info)
 
135
                else:
 
136
                    raise errors.UnknownBuildAction(action)
 
137
            if to_unversion_ids:
 
138
                tree.unversion(to_unversion_ids)
 
139
            for path, file_id in to_add_directories:
 
140
                if path == '':
 
141
                    # Special case, because the path already exists
 
142
                    tree.add([path], [file_id], ['directory'])
 
143
                else:
 
144
                    tree.mkdir(path, file_id)
 
145
            tree.add(to_add_files, to_add_file_ids, to_add_kinds)
 
146
            for file_id, content in new_contents.iteritems():
 
147
                tree.put_file_bytes_non_atomic(file_id, content)
 
148
 
 
149
            if message is None:
 
150
                message = u'commit %d' % (self._branch.revno() + 1,)
 
151
            return tree.commit(message, rev_id=revision_id)
 
152
        finally:
 
153
            tree.unlock()
 
154
 
63
155
    def get_branch(self):
64
156
        """Return the branch created by the builder."""
65
157
        return self._branch