/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: Jelmer Vernooij
  • Date: 2018-09-30 00:33:53 UTC
  • mto: This revision was merged to the branch mainline in revision 7134.
  • Revision ID: jelmer@jelmer.uk-20180930003353-2z5sugalbxfxfiru
When opening working trees with .git files, open the right control transport.

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 "bzr send" for git-am style patches."""
 
22
 
 
23
from __future__ import absolute_import
 
24
 
 
25
import time
 
26
from .. import __version__ as bzr_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 . import (
 
38
    version_info as bzr_git_version_info,
 
39
    )
 
40
from .mapping import (
 
41
    object_mode,
 
42
    )
 
43
from .object_store import (
 
44
    get_object_store,
 
45
    )
 
46
 
 
47
from io import BytesIO
 
48
from dulwich import (
 
49
    __version__ as dulwich_version,
 
50
    )
 
51
from dulwich.objects import (
 
52
    Blob,
 
53
    )
 
54
 
 
55
 
 
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])
 
58
 
 
59
 
 
60
class GitDiffTree(_mod_diff.DiffTree):
 
61
    """Provides a text representation between two trees, formatted for svn."""
 
62
 
 
63
    def _show_diff(self, specific_files, extra_trees):
 
64
        from dulwich.patch import write_blob_diff
 
65
        iterator = self.new_tree.iter_changes(self.old_tree,
 
66
            specific_files=specific_files, extra_trees=extra_trees,
 
67
            require_versioned=True)
 
68
        has_changes = 0
 
69
        def get_encoded_path(path):
 
70
            if path is not None:
 
71
                return path.encode(self.path_encoding, "replace")
 
72
        def get_file_mode(tree, path, kind, executable):
 
73
            if path is None:
 
74
                return 0
 
75
            return object_mode(kind, executable)
 
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 (file_id, paths, changed_content, versioned, parent, name, kind,
 
84
             executable) in iterator:
 
85
            # The root does not get diffed, and items with no known kind (that
 
86
            # is, missing) in both trees are skipped as well.
 
87
            if parent == (None, None) or kind == (None, None):
 
88
                continue
 
89
            path_encoded = (get_encoded_path(paths[0]),
 
90
                            get_encoded_path(paths[1]))
 
91
            present = ((kind[0] not in (None, 'directory')),
 
92
                       (kind[1] not in (None, 'directory')))
 
93
            if not present[0] and not present[1]:
 
94
                continue
 
95
            contents = (get_blob(present[0], trees[0], paths[0]),
 
96
                        get_blob(present[1], trees[1], paths[1]))
 
97
            renamed = (parent[0], name[0]) != (parent[1], name[1])
 
98
            mode = (get_file_mode(trees[0], path_encoded[0],
 
99
                                  kind[0], executable[0]),
 
100
                    get_file_mode(trees[1], path_encoded[1],
 
101
                                  kind[1], executable[1]))
 
102
            write_blob_diff(self.to_file,
 
103
                (path_encoded[0], mode[0], contents[0]),
 
104
                (path_encoded[1], mode[1], contents[1]))
 
105
            has_changes |= (changed_content or renamed)
 
106
        return has_changes
 
107
 
 
108
 
 
109
def generate_patch_filename(num, summary):
 
110
    return "%04d-%s.patch" % (num, summary.replace("/", "_").rstrip("."))
 
111
 
 
112
 
 
113
class GitMergeDirective(BaseMergeDirective):
 
114
 
 
115
    multiple_output_files = True
 
116
 
 
117
    def __init__(self, revision_id, testament_sha1, time, timezone,
 
118
                 target_branch, source_branch=None, message=None,
 
119
                 patches=None, local_target_branch=None):
 
120
        super(GitMergeDirective, self).__init__(revision_id=revision_id,
 
121
            testament_sha1=testament_sha1, time=time, timezone=timezone,
 
122
            target_branch=target_branch, patch=None,
 
123
            source_branch=source_branch, message=message,
 
124
            bundle=None)
 
125
        self.patches = patches
 
126
 
 
127
    def to_lines(self):
 
128
        return self.patch.splitlines(True)
 
129
 
 
130
    def to_files(self):
 
131
        return self.patches
 
132
 
 
133
    @classmethod
 
134
    def _generate_commit(cls, repository, revision_id, num, total):
 
135
        s = BytesIO()
 
136
        store = get_object_store(repository)
 
137
        with store.lock_read():
 
138
            commit = store[store._lookup_revision_sha1(revision_id)]
 
139
        from dulwich.patch import write_commit_patch, get_summary
 
140
        try:
 
141
            lhs_parent = repository.get_revision(revision_id).parent_ids[0]
 
142
        except IndexError:
 
143
            lhs_parent = _mod_revision.NULL_REVISION
 
144
        tree_1 = repository.revision_tree(lhs_parent)
 
145
        tree_2 = repository.revision_tree(revision_id)
 
146
        contents = BytesIO()
 
147
        differ = GitDiffTree.from_trees_options(tree_1, tree_2,
 
148
                contents, 'utf8', None, 'a/', 'b/', None)
 
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, no_bundle, message, base_revision_id, local_target_branch=None):
 
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")
 
180
    return GitMergeDirective.from_objects(
 
181
        branch.repository, revision_id, time.time(),
 
182
        osutils.local_time_offset(), submit_branch,
 
183
        public_branch=public_branch, message=message,
 
184
        local_target_branch=local_target_branch)