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

Merge test-run support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/send.py
18
18
# along with this program; if not, write to the Free Software
19
19
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20
20
 
21
 
"""Support in "brz send" for git-am style patches."""
 
21
"""Support in "bzr send" for git-am style patches."""
22
22
 
23
23
from __future__ import absolute_import
24
24
 
25
25
import time
26
 
from .. import __version__ as brz_version
27
 
from .. import (
 
26
from ... import __version__ as bzr_version
 
27
from ... import (
28
28
    branch as _mod_branch,
29
29
    diff as _mod_diff,
30
30
    errors,
32
32
    revision as _mod_revision,
33
33
    )
34
34
 
35
 
from ..merge_directive import BaseMergeDirective
 
35
from ...merge_directive import BaseMergeDirective
36
36
 
 
37
from . import (
 
38
    version_info as bzr_git_version_info,
 
39
    )
37
40
from .mapping import (
38
41
    object_mode,
39
42
    )
50
53
    )
51
54
 
52
55
 
53
 
version_tail = "Breezy %s, dulwich %d.%d.%d" % (
54
 
    (brz_version, ) + dulwich_version[:3])
 
56
version_tail = "bzr %s, bzr-git %d.%d.%d, dulwich %d.%d.%d" % (
 
57
    (bzr_version, ) + bzr_git_version_info[:3] + dulwich_version[:3])
55
58
 
56
59
 
57
60
class GitDiffTree(_mod_diff.DiffTree):
59
62
 
60
63
    def _show_diff(self, specific_files, extra_trees):
61
64
        from dulwich.patch import write_blob_diff
62
 
        iterator = self.new_tree.iter_changes(
63
 
            self.old_tree, specific_files=specific_files,
64
 
            extra_trees=extra_trees, require_versioned=True)
 
65
        iterator = self.new_tree.iter_changes(self.old_tree,
 
66
            specific_files=specific_files, extra_trees=extra_trees,
 
67
            require_versioned=True)
65
68
        has_changes = 0
66
 
 
67
69
        def get_encoded_path(path):
68
70
            if path is not None:
69
71
                return path.encode(self.path_encoding, "replace")
70
 
 
71
72
        def get_file_mode(tree, path, kind, executable):
72
73
            if path is None:
73
74
                return 0
74
75
            return object_mode(kind, executable)
75
 
 
76
76
        def get_blob(present, tree, path):
77
77
            if present:
78
 
                with tree.get_file(path) as f:
79
 
                    return Blob.from_string(f.read())
 
78
                return Blob.from_string(tree.get_file(path).read())
80
79
            else:
81
80
                return None
82
81
        trees = (self.old_tree, self.new_tree)
83
 
        for change in iterator:
 
82
        for (file_id, paths, changed_content, versioned, parent, name, kind,
 
83
             executable) in iterator:
84
84
            # The root does not get diffed, and items with no known kind (that
85
85
            # is, missing) in both trees are skipped as well.
86
 
            if change.parent_id == (None, None) or change.kind == (None, None):
 
86
            if parent == (None, None) or kind == (None, None):
87
87
                continue
88
 
            path_encoded = (get_encoded_path(change.path[0]),
89
 
                            get_encoded_path(change.path[1]))
90
 
            present = ((change.kind[0] not in (None, 'directory')),
91
 
                       (change.kind[1] not in (None, 'directory')))
 
88
            path_encoded = (get_encoded_path(paths[0]),
 
89
                            get_encoded_path(paths[1]))
 
90
            present = ((kind[0] not in (None, 'directory')),
 
91
                       (kind[1] not in (None, 'directory')))
92
92
            if not present[0] and not present[1]:
93
93
                continue
94
 
            contents = (get_blob(present[0], trees[0], change.path[0]),
95
 
                        get_blob(present[1], trees[1], change.path[1]))
96
 
            renamed = (change.parent_id[0], change.name[0]) != (change.parent_id[1], change.name[1])
 
94
            contents = (get_blob(present[0], trees[0], paths[0]),
 
95
                        get_blob(present[1], trees[1], paths[1]))
 
96
            renamed = (parent[0], name[0]) != (parent[1], name[1])
97
97
            mode = (get_file_mode(trees[0], path_encoded[0],
98
 
                                  change.kind[0], change.executable[0]),
 
98
                                  kind[0], executable[0]),
99
99
                    get_file_mode(trees[1], path_encoded[1],
100
 
                                  change.kind[1], change.executable[1]))
 
100
                                  kind[1], executable[1]))
101
101
            write_blob_diff(self.to_file,
102
 
                            (path_encoded[0], mode[0], contents[0]),
103
 
                            (path_encoded[1], mode[1], contents[1]))
104
 
            has_changes |= (change.changed_content or renamed)
 
102
                (path_encoded[0], mode[0], contents[0]),
 
103
                (path_encoded[1], mode[1], contents[1]))
 
104
            has_changes |= (changed_content or renamed)
105
105
        return has_changes
106
106
 
107
107
 
116
116
    def __init__(self, revision_id, testament_sha1, time, timezone,
117
117
                 target_branch, source_branch=None, message=None,
118
118
                 patches=None, local_target_branch=None):
119
 
        super(GitMergeDirective, self).__init__(
120
 
            revision_id=revision_id, testament_sha1=testament_sha1, time=time,
121
 
            timezone=timezone, target_branch=target_branch, patch=None,
122
 
            source_branch=source_branch, message=message, bundle=None)
 
119
        super(GitMergeDirective, self).__init__(revision_id=revision_id,
 
120
            testament_sha1=testament_sha1, time=time, timezone=timezone,
 
121
            target_branch=target_branch, patch=None,
 
122
            source_branch=source_branch, message=message,
 
123
            bundle=None)
123
124
        self.patches = patches
124
125
 
125
126
    def to_lines(self):
126
127
        return self.patch.splitlines(True)
127
128
 
128
129
    def to_files(self):
129
 
        return ((summary, patch.splitlines(True)) for (summary, patch) in self.patches)
 
130
        return self.patches
130
131
 
131
132
    @classmethod
132
 
    def _generate_commit(cls, repository, revision_id, num, total,
133
 
                         context=_mod_diff.DEFAULT_CONTEXT_AMOUNT):
 
133
    def _generate_commit(cls, repository, revision_id, num, total):
134
134
        s = BytesIO()
135
135
        store = get_object_store(repository)
136
136
        with store.lock_read():
137
 
            commit = store[repository.lookup_bzr_revision_id(revision_id)[0]]
 
137
            commit = store[store._lookup_revision_sha1(revision_id)]
138
138
        from dulwich.patch import write_commit_patch, get_summary
139
139
        try:
140
140
            lhs_parent = repository.get_revision(revision_id).parent_ids[0]
143
143
        tree_1 = repository.revision_tree(lhs_parent)
144
144
        tree_2 = repository.revision_tree(revision_id)
145
145
        contents = BytesIO()
146
 
        differ = GitDiffTree.from_trees_options(
147
 
            tree_1, tree_2, contents, 'utf8', None, 'a/', 'b/', None,
148
 
            context_lines=context)
 
146
        differ = GitDiffTree.from_trees_options(tree_1, tree_2,
 
147
                contents, 'utf8', None, 'a/', 'b/', None)
149
148
        differ.show_diff(None, None)
150
149
        write_commit_patch(s, commit, contents.getvalue(), (num, total),
151
150
                           version_tail)
165
164
            todo = graph.find_difference(submit_revision_id, revision_id)[1]
166
165
            total = len(todo)
167
166
            for i, revid in enumerate(graph.iter_topo_order(todo)):
168
 
                patches.append(cls._generate_commit(repository, revid, i + 1,
169
 
                                                    total))
 
167
                patches.append(cls._generate_commit(repository, revid, i+1,
 
168
                    total))
170
169
        return cls(revision_id, None, time, timezone,
171
 
                   target_branch=target_branch, source_branch=public_branch,
172
 
                   message=message, patches=patches)
173
 
 
174
 
 
175
 
def send_git(branch, revision_id, submit_branch, public_branch, no_patch,
176
 
             no_bundle, message, base_revision_id, local_target_branch=None):
 
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, no_bundle, message, base_revision_id, local_target_branch=None):
177
175
    if no_patch:
178
 
        raise errors.BzrCommandError(
179
 
            "no patch not supported for git-am style patches")
 
176
        raise errors.BzrCommandError("no patch not supported for git-am style patches")
180
177
    if no_bundle:
181
 
        raise errors.BzrCommandError(
182
 
            "no bundle not supported for git-am style patches")
 
178
        raise errors.BzrCommandError("no bundle not supported for git-am style patches")
183
179
    return GitMergeDirective.from_objects(
184
180
        branch.repository, revision_id, time.time(),
185
181
        osutils.local_time_offset(), submit_branch,