/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

Cope with tuples in refs dictionary.

Show diffs side-by-side

added added

removed removed

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