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

[merge] robertc's integration, updated tests to check for retcode=3

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/send.py
1
 
# Copyright (C) 2009-2018 Jelmer Vernooij <jelmer@jelmer.uk>
2
 
 
3
 
# Based on the original from bzr-svn:
4
 
# Copyright (C) 2009 Lukas Lalinsky <lalinsky@gmail.com>
5
 
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
6
 
 
7
 
# This program is free software; you can redistribute it and/or modify
8
 
# it under the terms of the GNU General Public License as published by
9
 
# the Free Software Foundation; either version 2 of the License, or
10
 
# (at your option) any later version.
11
 
#
12
 
# This program is distributed in the hope that it will be useful,
13
 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
14
 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15
 
# GNU General Public License for more details.
16
 
#
17
 
# You should have received a copy of the GNU General Public License
18
 
# along with this program; if not, write to the Free Software
19
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20
 
 
21
 
"""Support in "brz send" for git-am style patches."""
22
 
 
23
 
from __future__ import absolute_import
24
 
 
25
 
import time
26
 
from .. import __version__ as brz_version
27
 
from .. import (
28
 
    branch as _mod_branch,
29
 
    diff as _mod_diff,
30
 
    errors,
31
 
    osutils,
32
 
    revision as _mod_revision,
33
 
    )
34
 
 
35
 
from ..merge_directive import BaseMergeDirective
36
 
 
37
 
from .mapping import (
38
 
    object_mode,
39
 
    )
40
 
from .object_store import (
41
 
    get_object_store,
42
 
    )
43
 
 
44
 
from io import BytesIO
45
 
from dulwich import (
46
 
    __version__ as dulwich_version,
47
 
    )
48
 
from dulwich.objects import (
49
 
    Blob,
50
 
    )
51
 
 
52
 
 
53
 
version_tail = "Breezy %s, dulwich %d.%d.%d" % (
54
 
    (brz_version, ) + dulwich_version[:3])
55
 
 
56
 
 
57
 
class GitDiffTree(_mod_diff.DiffTree):
58
 
    """Provides a text representation between two trees, formatted for svn."""
59
 
 
60
 
    def _show_diff(self, specific_files, extra_trees):
61
 
        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
 
        has_changes = 0
66
 
 
67
 
        def get_encoded_path(path):
68
 
            if path is not None:
69
 
                return path.encode(self.path_encoding, "replace")
70
 
 
71
 
        def get_file_mode(tree, path, kind, executable):
72
 
            if path is None:
73
 
                return 0
74
 
            return object_mode(kind, executable)
75
 
 
76
 
        def get_blob(present, tree, path):
77
 
            if present:
78
 
                with tree.get_file(path) as f:
79
 
                    return Blob.from_string(f.read())
80
 
            else:
81
 
                return None
82
 
        trees = (self.old_tree, self.new_tree)
83
 
        for change in iterator:
84
 
            # The root does not get diffed, and items with no known kind (that
85
 
            # is, missing) in both trees are skipped as well.
86
 
            if change.parent_id == (None, None) or change.kind == (None, None):
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')))
92
 
            if not present[0] and not present[1]:
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])
97
 
            mode = (get_file_mode(trees[0], path_encoded[0],
98
 
                                  change.kind[0], change.executable[0]),
99
 
                    get_file_mode(trees[1], path_encoded[1],
100
 
                                  change.kind[1], change.executable[1]))
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)
105
 
        return has_changes
106
 
 
107
 
 
108
 
def generate_patch_filename(num, summary):
109
 
    return "%04d-%s.patch" % (num, summary.replace("/", "_").rstrip("."))
110
 
 
111
 
 
112
 
class GitMergeDirective(BaseMergeDirective):
113
 
 
114
 
    multiple_output_files = True
115
 
 
116
 
    def __init__(self, revision_id, testament_sha1, time, timezone,
117
 
                 target_branch, source_branch=None, message=None,
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)
123
 
        self.patches = patches
124
 
 
125
 
    def to_lines(self):
126
 
        return self.patch.splitlines(True)
127
 
 
128
 
    def to_files(self):
129
 
        return ((summary, patch.splitlines(True)) for (summary, patch) in self.patches)
130
 
 
131
 
    @classmethod
132
 
    def _generate_commit(cls, repository, revision_id, num, total,
133
 
                         context=_mod_diff.DEFAULT_CONTEXT_AMOUNT):
134
 
        s = BytesIO()
135
 
        store = get_object_store(repository)
136
 
        with store.lock_read():
137
 
            commit = store[repository.lookup_bzr_revision_id(revision_id)[0]]
138
 
        from dulwich.patch import write_commit_patch, get_summary
139
 
        try:
140
 
            lhs_parent = repository.get_revision(revision_id).parent_ids[0]
141
 
        except IndexError:
142
 
            lhs_parent = _mod_revision.NULL_REVISION
143
 
        tree_1 = repository.revision_tree(lhs_parent)
144
 
        tree_2 = repository.revision_tree(revision_id)
145
 
        contents = BytesIO()
146
 
        differ = GitDiffTree.from_trees_options(
147
 
            tree_1, tree_2, contents, 'utf8', None, 'a/', 'b/', None,
148
 
            context_lines=context)
149
 
        differ.show_diff(None, None)
150
 
        write_commit_patch(s, commit, contents.getvalue(), (num, total),
151
 
                           version_tail)
152
 
        summary = generate_patch_filename(num, get_summary(commit))
153
 
        return summary, s.getvalue()
154
 
 
155
 
    @classmethod
156
 
    def from_objects(cls, repository, revision_id, time, timezone,
157
 
                     target_branch, local_target_branch=None,
158
 
                     public_branch=None, message=None):
159
 
        patches = []
160
 
        submit_branch = _mod_branch.Branch.open(target_branch)
161
 
        with submit_branch.lock_read():
162
 
            submit_revision_id = submit_branch.last_revision()
163
 
            repository.fetch(submit_branch.repository, submit_revision_id)
164
 
            graph = repository.get_graph()
165
 
            todo = graph.find_difference(submit_revision_id, revision_id)[1]
166
 
            total = len(todo)
167
 
            for i, revid in enumerate(graph.iter_topo_order(todo)):
168
 
                patches.append(cls._generate_commit(repository, revid, i + 1,
169
 
                                                    total))
170
 
        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):
177
 
    if no_patch:
178
 
        raise errors.BzrCommandError(
179
 
            "no patch not supported for git-am style patches")
180
 
    if no_bundle:
181
 
        raise errors.BzrCommandError(
182
 
            "no bundle not supported for git-am style patches")
183
 
    return GitMergeDirective.from_objects(
184
 
        branch.repository, revision_id, time.time(),
185
 
        osutils.local_time_offset(), submit_branch,
186
 
        public_branch=public_branch, message=message,
187
 
        local_target_branch=local_target_branch)