/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 send.py

Simplify send code a bit.

Show diffs side-by-side

added added

removed removed

Lines of Context:
send.py
25
25
from bzrlib import (
26
26
    branch as _mod_branch,
27
27
    diff as _mod_diff,
28
 
    errors,
 
28
    merge_directive,
29
29
    osutils,
30
30
    revision as _mod_revision,
31
31
    )
32
32
 
33
 
try:
34
 
    from bzrlib.merge_directive import BaseMergeDirective
35
 
except ImportError:
36
 
    from bzrlib.merge_directive import (
37
 
        _BaseMergeDirective as BaseMergeDirective,
38
 
        )
39
 
 
40
33
from bzrlib.plugins.git import (
41
34
    version_info as bzr_git_version_info,
42
35
    )
74
67
                return path.encode(self.path_encoding, "replace")
75
68
        def get_file_mode(tree, path, kind, executable):
76
69
            if path is None:
77
 
                return 0
 
70
                return None
78
71
            return object_mode(kind, executable)
79
72
        def get_blob(present, tree, file_id):
80
 
            if present:
 
73
            if present is not None:
81
74
                return Blob.from_string(tree.get_file(file_id).read())
82
75
            else:
83
76
                return None
88
81
            # is, missing) in both trees are skipped as well.
89
82
            if parent == (None, None) or kind == (None, None):
90
83
                continue
91
 
            path_encoded = (get_encoded_path(paths[0]),
 
84
            path_encoded = (get_encoded_path(paths[0]), 
92
85
                            get_encoded_path(paths[1]))
93
 
            present = ((kind[0] not in (None, 'directory')),
94
 
                       (kind[1] not in (None, 'directory')))
95
 
            if not present[0] and not present[1]:
96
 
                continue
 
86
            present = ((kind[0] is not None and versioned[0]),
 
87
                       (kind[1] is not None and versioned[1]))
97
88
            contents = (get_blob(present[0], trees[0], file_id),
98
89
                        get_blob(present[1], trees[1], file_id))
99
90
            renamed = (parent[0], name[0]) != (parent[1], name[1])
100
 
            mode = (get_file_mode(trees[0], path_encoded[0],
101
 
                                  kind[0], executable[0]),
102
 
                    get_file_mode(trees[1], path_encoded[1],
 
91
            mode = (get_file_mode(trees[0], path_encoded[0], 
 
92
                                  kind[0], executable[0]), 
 
93
                    get_file_mode(trees[1], path_encoded[1], 
103
94
                                  kind[1], executable[1]))
104
 
            write_blob_diff(self.to_file,
105
 
                (path_encoded[0], mode[0], contents[0]),
 
95
            write_blob_diff(self.to_file, 
 
96
                (path_encoded[0], mode[0], contents[0]), 
106
97
                (path_encoded[1], mode[1], contents[1]))
107
98
            has_changes |= (changed_content or renamed)
108
99
        return has_changes
109
100
 
110
101
 
111
 
class GitMergeDirective(BaseMergeDirective):
112
 
 
113
 
    multiple_output_files = True
114
 
 
115
 
    def __init__(self, revision_id, testament_sha1, time, timezone,
116
 
                 target_branch, source_branch=None, message=None,
117
 
                 patches=None):
118
 
        super(GitMergeDirective, self).__init__(revision_id=revision_id,
119
 
            testament_sha1=testament_sha1, time=time, timezone=timezone,
120
 
            target_branch=target_branch, patch=None,
121
 
            source_branch=source_branch, message=message, bundle=None)
122
 
        self.patches = patches
 
102
class GitMergeDirective(merge_directive._BaseMergeDirective):
123
103
 
124
104
    def to_lines(self):
125
105
        return self.patch.splitlines(True)
126
106
 
127
 
    def to_files(self):
128
 
        return self.patches
129
 
 
130
107
    @classmethod
131
108
    def _generate_commit(cls, repository, revision_id, num, total):
132
109
        s = StringIO()
140
117
        tree_1 = repository.revision_tree(lhs_parent)
141
118
        tree_2 = repository.revision_tree(revision_id)
142
119
        contents = StringIO()
143
 
        differ = GitDiffTree.from_trees_options(tree_1, tree_2,
 
120
        differ = GitDiffTree.from_trees_options(tree_1, tree_2, 
144
121
                contents, 'utf8', None, 'a/', 'b/', None)
145
122
        differ.show_diff(None, None)
146
 
        write_commit_patch(s, commit, contents.getvalue(), (num, total),
 
123
        write_commit_patch(s, commit, contents.getvalue(), (num, total), 
147
124
                           version_tail)
148
 
        summary = "%04d-%s.patch" % (num, get_summary(commit).rstrip("."))
 
125
        summary = "%04d-%s" % (num, get_summary(commit))
149
126
        return summary, s.getvalue()
150
127
 
151
128
    @classmethod
162
139
            todo = graph.find_difference(submit_revision_id, revision_id)[1]
163
140
            total = len(todo)
164
141
            for i, revid in enumerate(graph.iter_topo_order(todo)):
165
 
                patches.append(cls._generate_commit(repository, revid, i+1,
166
 
                    total))
 
142
                patches.append(cls._generate_commit(repository, revid, i+1, 
 
143
                                                    total))
167
144
        finally:
168
145
            submit_branch.unlock()
169
 
        return cls(revision_id, None, time, timezone,
170
 
            target_branch=target_branch, source_branch=public_branch,
171
 
            message=message, patches=patches)
172
 
 
173
 
 
174
 
def send_git(branch, revision_id, submit_branch, public_branch, no_patch,
175
 
             no_bundle, message, base_revision_id):
176
 
    if no_patch:
177
 
        raise errors.BzrCommandError("no patch not supported for git-am style patches")
178
 
    if no_bundle:
179
 
        raise errors.BzrCommandError("no bundle not supported for git-am style patches")
 
146
        return cls(revision_id, None, time, timezone, target_branch, 
 
147
            "".join([patch for (summary, patch) in patches]), 
 
148
            None, public_branch, message)
 
149
 
 
150
 
 
151
def send_git(branch, revision_id, submit_branch, public_branch,
 
152
              no_patch, no_bundle, message, base_revision_id):
180
153
    return GitMergeDirective.from_objects(
181
154
        branch.repository, revision_id, time.time(),
182
155
        osutils.local_time_offset(), submit_branch,