/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

Add custom InterTree for use between git revision trees.

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
    )
48
41
    )
49
42
 
50
43
from cStringIO import StringIO
51
 
from dulwich import (
52
 
    __version__ as dulwich_version,
53
 
    )
54
44
from dulwich.objects import (
55
45
    Blob,
56
46
    )
57
47
 
58
48
 
59
 
version_tail = "bzr %s, bzr-git %d.%d.%d, dulwich %d.%d.%d" % (
60
 
    (bzrlib.__version__, ) + bzr_git_version_info[:3] + dulwich_version[:3])
61
 
 
62
 
 
63
49
class GitDiffTree(_mod_diff.DiffTree):
64
50
    """Provides a text representation between two trees, formatted for svn."""
65
51
 
 
52
    def __init__(self, old_tree, new_tree, to_file, path_encoding='utf-8',
 
53
                 diff_text=None, extra_factories=None):
 
54
        super(GitDiffTree, self).__init__(old_tree, new_tree, to_file, path_encoding,
 
55
            diff_text, extra_factories)
 
56
 
 
57
    def _write_file_mode(self, old_mode, new_mode):
 
58
        if old_mode == new_mode:
 
59
            return
 
60
        if new_mode is not None:
 
61
            if old_mode is not None:
 
62
                self.to_file.write("old file mode %o\n" % old_mode)
 
63
            self.to_file.write("new file mode %o\n" % new_mode) 
 
64
        else:
 
65
            self.to_file.write("deleted file mode %o\n" % old_mode)
 
66
 
 
67
    def _get_rev(self, contents):
 
68
        if contents is None:
 
69
            return "0" * 7
 
70
        else:
 
71
            return Blob.from_string("".join(contents)).id[:7]
 
72
 
 
73
    def _write_contents_diff(self, old_path, old_mode, old_contents, new_path, new_mode, new_contents):
 
74
        if old_path is None:
 
75
            old_path = "/dev/null"
 
76
        else:
 
77
            old_path = "a/%s" % old_path
 
78
        if new_path is None:
 
79
            new_path = "/dev/null"
 
80
        else:
 
81
            new_path = "b/%s" % new_path
 
82
        self.to_file.write("diff --git %s %s\n" % (old_path, new_path))
 
83
        self._write_file_mode(old_mode, new_mode)
 
84
        old_rev = self._get_rev(old_contents)
 
85
        new_rev = self._get_rev(new_contents)
 
86
        self.to_file.write("index %s..%s %o\n" % (old_rev, new_rev, new_mode))
 
87
        _mod_diff.internal_diff(old_path, old_contents,
 
88
                                new_path, new_contents,
 
89
                                self.to_file)
 
90
 
 
91
    def _get_file_mode(self, tree, path, kind, executable):
 
92
        if path is None:
 
93
            return None
 
94
        return object_mode(kind, executable)
 
95
 
66
96
    def _show_diff(self, specific_files, extra_trees):
67
 
        from dulwich.patch import write_blob_diff
68
97
        iterator = self.new_tree.iter_changes(self.old_tree,
69
 
            specific_files=specific_files, extra_trees=extra_trees,
70
 
            require_versioned=True)
 
98
                                               specific_files=specific_files,
 
99
                                               extra_trees=extra_trees,
 
100
                                               require_versioned=True)
71
101
        has_changes = 0
72
102
        def get_encoded_path(path):
73
103
            if path is not None:
74
104
                return path.encode(self.path_encoding, "replace")
75
 
        def get_file_mode(tree, path, kind, executable):
76
 
            if path is None:
77
 
                return 0
78
 
            return object_mode(kind, executable)
79
 
        def get_blob(present, tree, file_id):
80
 
            if present:
81
 
                return Blob.from_string(tree.get_file(file_id).read())
82
 
            else:
83
 
                return None
84
 
        trees = (self.old_tree, self.new_tree)
85
105
        for (file_id, paths, changed_content, versioned, parent, name, kind,
86
106
             executable) in iterator:
87
107
            # The root does not get diffed, and items with no known kind (that
88
108
            # is, missing) in both trees are skipped as well.
89
109
            if parent == (None, None) or kind == (None, None):
90
110
                continue
91
 
            path_encoded = (get_encoded_path(paths[0]),
92
 
                            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
97
 
            contents = (get_blob(present[0], trees[0], file_id),
98
 
                        get_blob(present[1], trees[1], file_id))
 
111
            oldpath, newpath = paths
 
112
            oldpath_encoded = get_encoded_path(paths[0])
 
113
            newpath_encoded = get_encoded_path(paths[1])
 
114
            old_present = (kind[0] is not None and versioned[0])
 
115
            if old_present is not None:
 
116
                old_contents = self.old_tree.get_file(file_id).readlines()
 
117
            else:
 
118
                old_contents = None
 
119
            new_present = (kind[1] is not None and versioned[1])
 
120
            if new_present is not None:
 
121
                new_contents = self.new_tree.get_file(file_id).readlines()
 
122
            else:
 
123
                new_contents = None
99
124
            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],
103
 
                                  kind[1], executable[1]))
104
 
            write_blob_diff(self.to_file,
105
 
                (path_encoded[0], mode[0], contents[0]),
106
 
                (path_encoded[1], mode[1], contents[1]))
107
 
            has_changes |= (changed_content or renamed)
 
125
            old_mode = self._get_file_mode(self.old_tree, oldpath_encoded, kind[0], executable[0])
 
126
            new_mode = self._get_file_mode(self.new_tree, newpath_encoded, kind[1], executable[1])
 
127
 
 
128
            self._write_contents_diff(oldpath_encoded, old_mode, old_contents, 
 
129
                                      newpath_encoded, new_mode, new_contents)
 
130
 
 
131
            has_changes = (changed_content or renamed)
 
132
 
108
133
        return has_changes
109
134
 
110
135
 
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
 
136
class GitMergeDirective(merge_directive._BaseMergeDirective):
123
137
 
124
138
    def to_lines(self):
125
139
        return self.patch.splitlines(True)
126
140
 
127
 
    def to_files(self):
128
 
        return self.patches
129
 
 
130
141
    @classmethod
131
142
    def _generate_commit(cls, repository, revision_id, num, total):
132
143
        s = StringIO()
133
144
        store = get_object_store(repository)
134
145
        commit = store[store._lookup_revision_sha1(revision_id)]
135
 
        from dulwich.patch import write_commit_patch, get_summary
 
146
        s.write("From %s %s\n" % (commit.id, time.ctime(commit.commit_time)))
 
147
        s.write("From: %s\n" % commit.author)
 
148
        s.write("Date: %s\n" % time.strftime("%a, %d %b %Y %H:%M:%S %Z"))
 
149
        s.write("Subject: [PATCH %d/%d] %s\n" % (num, total, commit.message))
 
150
        s.write("\n")
 
151
        s.write("---\n")
 
152
        s.write("TODO: Print diffstat\n")
 
153
        s.write("\n")
136
154
        try:
137
155
            lhs_parent = repository.get_revision(revision_id).parent_ids[0]
138
156
        except IndexError:
139
157
            lhs_parent = _mod_revision.NULL_REVISION
140
158
        tree_1 = repository.revision_tree(lhs_parent)
141
159
        tree_2 = repository.revision_tree(revision_id)
142
 
        contents = StringIO()
143
 
        differ = GitDiffTree.from_trees_options(tree_1, tree_2,
144
 
                contents, 'utf8', None, 'a/', 'b/', None)
 
160
        differ = GitDiffTree.from_trees_options(tree_1, tree_2, s, 'utf8', None,
 
161
            'a/', 'b/', None)
145
162
        differ.show_diff(None, None)
146
 
        write_commit_patch(s, commit, contents.getvalue(), (num, total),
147
 
                           version_tail)
148
 
        summary = "%04d-%s.patch" % (num, get_summary(commit).rstrip("."))
 
163
        s.write("-- \n")
 
164
        s.write("bzr %s, bzr-git %d.%d.%d\n" % ((bzrlib.__version__, ) + bzr_git_version_info[:3]))
 
165
        summary = "%04d-%s" % (num, commit.message.splitlines()[0].replace(" ", "-"))
149
166
        return summary, s.getvalue()
150
167
 
151
168
    @classmethod
162
179
            todo = graph.find_difference(submit_revision_id, revision_id)[1]
163
180
            total = len(todo)
164
181
            for i, revid in enumerate(graph.iter_topo_order(todo)):
165
 
                patches.append(cls._generate_commit(repository, revid, i+1,
166
 
                    total))
 
182
                patches.append(cls._generate_commit(repository, revid, i+1, total))
167
183
        finally:
168
184
            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")
 
185
        return cls(revision_id, None, time, timezone, target_branch,
 
186
            "".join([patch for (summary, patch) in patches]), None, public_branch, message)
 
187
 
 
188
 
 
189
def send_git(branch, revision_id, submit_branch, public_branch,
 
190
              no_patch, no_bundle, message, base_revision_id):
180
191
    return GitMergeDirective.from_objects(
181
192
        branch.repository, revision_id, time.time(),
182
193
        osutils.local_time_offset(), submit_branch,