/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

  • Committer: Breezy landing bot
  • Author(s): Colin Watson
  • Date: 2020-11-16 21:47:08 UTC
  • mfrom: (7521.1.1 remove-lp-workaround)
  • Revision ID: breezy.the.bot@gmail.com-20201116214708-jos209mgxi41oy15
Remove breezy.git workaround for bazaar.launchpad.net.

Merged from https://code.launchpad.net/~cjwatson/brz/remove-lp-workaround/+merge/393710

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
import time
 
24
from .. import __version__ as brz_version
 
25
from .. import (
 
26
    branch as _mod_branch,
 
27
    diff as _mod_diff,
 
28
    errors,
 
29
    osutils,
 
30
    revision as _mod_revision,
 
31
    )
 
32
 
 
33
from ..merge_directive import BaseMergeDirective
 
34
 
 
35
from .mapping import (
 
36
    object_mode,
 
37
    )
 
38
from .object_store import (
 
39
    get_object_store,
 
40
    )
 
41
 
 
42
from io import BytesIO
 
43
from dulwich import (
 
44
    __version__ as dulwich_version,
 
45
    )
 
46
from dulwich.objects import (
 
47
    Blob,
 
48
    )
 
49
 
 
50
 
 
51
version_tail = "Breezy %s, dulwich %d.%d.%d" % (
 
52
    (brz_version, ) + dulwich_version[:3])
 
53
 
 
54
 
 
55
class GitDiffTree(_mod_diff.DiffTree):
 
56
    """Provides a text representation between two trees, formatted for svn."""
 
57
 
 
58
    def _show_diff(self, specific_files, extra_trees):
 
59
        from dulwich.patch import write_blob_diff
 
60
        iterator = self.new_tree.iter_changes(
 
61
            self.old_tree, specific_files=specific_files,
 
62
            extra_trees=extra_trees, require_versioned=True)
 
63
        has_changes = 0
 
64
 
 
65
        def get_encoded_path(path):
 
66
            if path is not None:
 
67
                return path.encode(self.path_encoding, "replace")
 
68
 
 
69
        def get_file_mode(tree, path, kind, executable):
 
70
            if path is None:
 
71
                return 0
 
72
            return object_mode(kind, executable)
 
73
 
 
74
        def get_blob(present, tree, path):
 
75
            if present:
 
76
                with tree.get_file(path) as f:
 
77
                    return Blob.from_string(f.read())
 
78
            else:
 
79
                return None
 
80
        trees = (self.old_tree, self.new_tree)
 
81
        for change in iterator:
 
82
            # The root does not get diffed, and items with no known kind (that
 
83
            # is, missing) in both trees are skipped as well.
 
84
            if change.parent_id == (None, None) or change.kind == (None, None):
 
85
                continue
 
86
            path_encoded = (get_encoded_path(change.path[0]),
 
87
                            get_encoded_path(change.path[1]))
 
88
            present = ((change.kind[0] not in (None, 'directory')),
 
89
                       (change.kind[1] not in (None, 'directory')))
 
90
            if not present[0] and not present[1]:
 
91
                continue
 
92
            contents = (get_blob(present[0], trees[0], change.path[0]),
 
93
                        get_blob(present[1], trees[1], change.path[1]))
 
94
            renamed = (change.parent_id[0], change.name[0]) != (change.parent_id[1], change.name[1])
 
95
            mode = (get_file_mode(trees[0], path_encoded[0],
 
96
                                  change.kind[0], change.executable[0]),
 
97
                    get_file_mode(trees[1], path_encoded[1],
 
98
                                  change.kind[1], change.executable[1]))
 
99
            write_blob_diff(self.to_file,
 
100
                            (path_encoded[0], mode[0], contents[0]),
 
101
                            (path_encoded[1], mode[1], contents[1]))
 
102
            has_changes |= (change.changed_content or renamed)
 
103
        return has_changes
 
104
 
 
105
 
 
106
def generate_patch_filename(num, summary):
 
107
    return "%04d-%s.patch" % (num, summary.replace("/", "_").rstrip("."))
 
108
 
 
109
 
 
110
class GitMergeDirective(BaseMergeDirective):
 
111
 
 
112
    multiple_output_files = True
 
113
 
 
114
    def __init__(self, revision_id, testament_sha1, time, timezone,
 
115
                 target_branch, source_branch=None, message=None,
 
116
                 patches=None, local_target_branch=None):
 
117
        super(GitMergeDirective, self).__init__(
 
118
            revision_id=revision_id, testament_sha1=testament_sha1, time=time,
 
119
            timezone=timezone, target_branch=target_branch, patch=None,
 
120
            source_branch=source_branch, message=message, bundle=None)
 
121
        self.patches = patches
 
122
 
 
123
    def to_lines(self):
 
124
        return self.patch.splitlines(True)
 
125
 
 
126
    def to_files(self):
 
127
        return ((summary, patch.splitlines(True)) for (summary, patch) in self.patches)
 
128
 
 
129
    @classmethod
 
130
    def _generate_commit(cls, repository, revision_id, num, total,
 
131
                         context=_mod_diff.DEFAULT_CONTEXT_AMOUNT):
 
132
        s = BytesIO()
 
133
        store = get_object_store(repository)
 
134
        with store.lock_read():
 
135
            commit = store[repository.lookup_bzr_revision_id(revision_id)[0]]
 
136
        from dulwich.patch import write_commit_patch, get_summary
 
137
        try:
 
138
            lhs_parent = repository.get_revision(revision_id).parent_ids[0]
 
139
        except IndexError:
 
140
            lhs_parent = _mod_revision.NULL_REVISION
 
141
        tree_1 = repository.revision_tree(lhs_parent)
 
142
        tree_2 = repository.revision_tree(revision_id)
 
143
        contents = BytesIO()
 
144
        differ = GitDiffTree.from_trees_options(
 
145
            tree_1, tree_2, contents, 'utf8', None, 'a/', 'b/', None,
 
146
            context_lines=context)
 
147
        differ.show_diff(None, None)
 
148
        write_commit_patch(s, commit, contents.getvalue(), (num, total),
 
149
                           version_tail)
 
150
        summary = generate_patch_filename(num, get_summary(commit))
 
151
        return summary, s.getvalue()
 
152
 
 
153
    @classmethod
 
154
    def from_objects(cls, repository, revision_id, time, timezone,
 
155
                     target_branch, local_target_branch=None,
 
156
                     public_branch=None, message=None):
 
157
        patches = []
 
158
        submit_branch = _mod_branch.Branch.open(target_branch)
 
159
        with submit_branch.lock_read():
 
160
            submit_revision_id = submit_branch.last_revision()
 
161
            repository.fetch(submit_branch.repository, submit_revision_id)
 
162
            graph = repository.get_graph()
 
163
            todo = graph.find_difference(submit_revision_id, revision_id)[1]
 
164
            total = len(todo)
 
165
            for i, revid in enumerate(graph.iter_topo_order(todo)):
 
166
                patches.append(cls._generate_commit(repository, revid, i + 1,
 
167
                                                    total))
 
168
        return cls(revision_id, None, time, timezone,
 
169
                   target_branch=target_branch, source_branch=public_branch,
 
170
                   message=message, patches=patches)
 
171
 
 
172
 
 
173
def send_git(branch, revision_id, submit_branch, public_branch, no_patch,
 
174
             no_bundle, message, base_revision_id, local_target_branch=None):
 
175
    if no_patch:
 
176
        raise errors.CommandError(
 
177
            "no patch not supported for git-am style patches")
 
178
    if no_bundle:
 
179
        raise errors.CommandError(
 
180
            "no bundle not supported for git-am style patches")
 
181
    return GitMergeDirective.from_objects(
 
182
        branch.repository, revision_id, time.time(),
 
183
        osutils.local_time_offset(), submit_branch,
 
184
        public_branch=public_branch, message=message,
 
185
        local_target_branch=local_target_branch)