/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

Use more dulwich functions for writing patches.

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])
 
49
version_tail = "bzr %s, bzr-git %d.%d.%d" % (
 
50
    (bzrlib.__version__, ) + bzr_git_version_info[:3])
61
51
 
62
52
 
63
53
class GitDiffTree(_mod_diff.DiffTree):
64
54
    """Provides a text representation between two trees, formatted for svn."""
65
55
 
 
56
    def __init__(self, old_tree, new_tree, to_file, path_encoding='utf-8',
 
57
                 diff_text=None, extra_factories=None):
 
58
        super(GitDiffTree, self).__init__(old_tree, new_tree, to_file,
 
59
            path_encoding, diff_text, extra_factories)
 
60
 
 
61
    def _write_contents_diff(self, old_path, old_mode, old_contents, new_path,
 
62
                             new_mode, new_contents):
 
63
        from dulwich.patch import _blob_id, write_diff_file_header
 
64
        old_rev = _blob_id(old_contents)
 
65
        new_rev = _blob_id(new_contents)
 
66
        write_diff_file_header(self.to_file, 
 
67
            (old_path, old_mode, old_rev), (new_path, new_mode, new_rev))
 
68
        _mod_diff.internal_diff(old_path, old_contents,
 
69
                                new_path, new_contents,
 
70
                                self.to_file)
 
71
 
 
72
    def _get_file_mode(self, tree, path, kind, executable):
 
73
        if path is None:
 
74
            return None
 
75
        return object_mode(kind, executable)
 
76
 
66
77
    def _show_diff(self, specific_files, extra_trees):
67
 
        from dulwich.patch import write_blob_diff
68
78
        iterator = self.new_tree.iter_changes(self.old_tree,
69
79
            specific_files=specific_files, extra_trees=extra_trees,
70
80
            require_versioned=True)
72
82
        def get_encoded_path(path):
73
83
            if path is not None:
74
84
                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
85
        for (file_id, paths, changed_content, versioned, parent, name, kind,
86
86
             executable) in iterator:
87
87
            # The root does not get diffed, and items with no known kind (that
88
88
            # is, missing) in both trees are skipped as well.
89
89
            if parent == (None, None) or kind == (None, None):
90
90
                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))
 
91
            oldpath, newpath = paths
 
92
            oldpath_encoded = get_encoded_path(paths[0])
 
93
            newpath_encoded = get_encoded_path(paths[1])
 
94
            old_present = (kind[0] is not None and versioned[0])
 
95
            if old_present is not None:
 
96
                old_contents = self.old_tree.get_file(file_id).readlines()
 
97
            else:
 
98
                old_contents = None
 
99
            new_present = (kind[1] is not None and versioned[1])
 
100
            if new_present is not None:
 
101
                new_contents = self.new_tree.get_file(file_id).readlines()
 
102
            else:
 
103
                new_contents = None
99
104
            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)
 
105
            old_mode = self._get_file_mode(self.old_tree, oldpath_encoded, 
 
106
                                           kind[0], executable[0])
 
107
            new_mode = self._get_file_mode(self.new_tree, newpath_encoded,
 
108
                                           kind[1], executable[1])
 
109
            self._write_contents_diff(oldpath_encoded, old_mode, old_contents, 
 
110
                                      newpath_encoded, new_mode, new_contents)
 
111
            has_changes = (changed_content or renamed)
108
112
        return has_changes
109
113
 
110
114
 
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
 
115
class GitMergeDirective(merge_directive._BaseMergeDirective):
123
116
 
124
117
    def to_lines(self):
125
118
        return self.patch.splitlines(True)
126
119
 
127
 
    def to_files(self):
128
 
        return self.patches
129
 
 
130
120
    @classmethod
131
121
    def _generate_commit(cls, repository, revision_id, num, total):
132
122
        s = StringIO()
140
130
        tree_1 = repository.revision_tree(lhs_parent)
141
131
        tree_2 = repository.revision_tree(revision_id)
142
132
        contents = StringIO()
143
 
        differ = GitDiffTree.from_trees_options(tree_1, tree_2,
 
133
        differ = GitDiffTree.from_trees_options(tree_1, tree_2, 
144
134
                contents, 'utf8', None, 'a/', 'b/', None)
145
135
        differ.show_diff(None, None)
146
 
        write_commit_patch(s, commit, contents.getvalue(), (num, total),
 
136
        write_commit_patch(s, commit, contents.getvalue(), (num, total), 
147
137
                           version_tail)
148
 
        summary = "%04d-%s.patch" % (num, get_summary(commit).rstrip("."))
 
138
        summary = "%04d-%s" % (num, get_summary(commit))
149
139
        return summary, s.getvalue()
150
140
 
151
141
    @classmethod
162
152
            todo = graph.find_difference(submit_revision_id, revision_id)[1]
163
153
            total = len(todo)
164
154
            for i, revid in enumerate(graph.iter_topo_order(todo)):
165
 
                patches.append(cls._generate_commit(repository, revid, i+1,
166
 
                    total))
 
155
                patches.append(cls._generate_commit(repository, revid, i+1, 
 
156
                                                    total))
167
157
        finally:
168
158
            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")
 
159
        return cls(revision_id, None, time, timezone, target_branch, 
 
160
            "".join([patch for (summary, patch) in patches]), 
 
161
            None, public_branch, message)
 
162
 
 
163
 
 
164
def send_git(branch, revision_id, submit_branch, public_branch,
 
165
              no_patch, no_bundle, message, base_revision_id):
180
166
    return GitMergeDirective.from_objects(
181
167
        branch.repository, revision_id, time.time(),
182
168
        osutils.local_time_offset(), submit_branch,