/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

More work on roundtrip push support.

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
 
    merge_directive,
 
28
    errors,
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
 
33
40
from bzrlib.plugins.git import (
34
41
    version_info as bzr_git_version_info,
35
42
    )
41
48
    )
42
49
 
43
50
from cStringIO import StringIO
 
51
from dulwich import (
 
52
    __version__ as dulwich_version,
 
53
    )
44
54
from dulwich.objects import (
45
55
    Blob,
46
56
    )
47
57
 
48
58
 
 
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
 
49
63
class GitDiffTree(_mod_diff.DiffTree):
50
64
    """Provides a text representation between two trees, formatted for svn."""
51
65
 
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
 
 
96
66
    def _show_diff(self, specific_files, extra_trees):
 
67
        from dulwich.patch import write_blob_diff
97
68
        iterator = self.new_tree.iter_changes(self.old_tree,
98
 
                                               specific_files=specific_files,
99
 
                                               extra_trees=extra_trees,
100
 
                                               require_versioned=True)
 
69
            specific_files=specific_files, extra_trees=extra_trees,
 
70
            require_versioned=True)
101
71
        has_changes = 0
102
72
        def get_encoded_path(path):
103
73
            if path is not None:
104
74
                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)
105
85
        for (file_id, paths, changed_content, versioned, parent, name, kind,
106
86
             executable) in iterator:
107
87
            # The root does not get diffed, and items with no known kind (that
108
88
            # is, missing) in both trees are skipped as well.
109
89
            if parent == (None, None) or kind == (None, None):
110
90
                continue
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
 
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))
124
99
            renamed = (parent[0], name[0]) != (parent[1], name[1])
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
 
 
 
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)
133
108
        return has_changes
134
109
 
135
110
 
136
 
class GitMergeDirective(merge_directive._BaseMergeDirective):
 
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
137
123
 
138
124
    def to_lines(self):
139
125
        return self.patch.splitlines(True)
140
126
 
 
127
    def to_files(self):
 
128
        return self.patches
 
129
 
141
130
    @classmethod
142
131
    def _generate_commit(cls, repository, revision_id, num, total):
143
132
        s = StringIO()
144
133
        store = get_object_store(repository)
145
134
        commit = store[store._lookup_revision_sha1(revision_id)]
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")
 
135
        from dulwich.patch import write_commit_patch, get_summary
154
136
        try:
155
137
            lhs_parent = repository.get_revision(revision_id).parent_ids[0]
156
138
        except IndexError:
157
139
            lhs_parent = _mod_revision.NULL_REVISION
158
140
        tree_1 = repository.revision_tree(lhs_parent)
159
141
        tree_2 = repository.revision_tree(revision_id)
160
 
        differ = GitDiffTree.from_trees_options(tree_1, tree_2, s, 'utf8', None,
161
 
            'a/', 'b/', None)
 
142
        contents = StringIO()
 
143
        differ = GitDiffTree.from_trees_options(tree_1, tree_2,
 
144
                contents, 'utf8', None, 'a/', 'b/', None)
162
145
        differ.show_diff(None, None)
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(" ", "-"))
 
146
        write_commit_patch(s, commit, contents.getvalue(), (num, total),
 
147
                           version_tail)
 
148
        summary = "%04d-%s.patch" % (num, get_summary(commit).rstrip("."))
166
149
        return summary, s.getvalue()
167
150
 
168
151
    @classmethod
179
162
            todo = graph.find_difference(submit_revision_id, revision_id)[1]
180
163
            total = len(todo)
181
164
            for i, revid in enumerate(graph.iter_topo_order(todo)):
182
 
                patches.append(cls._generate_commit(repository, revid, i+1, total))
 
165
                patches.append(cls._generate_commit(repository, revid, i+1,
 
166
                    total))
183
167
        finally:
184
168
            submit_branch.unlock()
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):
 
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")
191
180
    return GitMergeDirective.from_objects(
192
181
        branch.repository, revision_id, time.time(),
193
182
        osutils.local_time_offset(), submit_branch,