/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: 2020-06-23 01:02:30 UTC
  • mfrom: (7490.40.27 work)
  • mto: This revision was merged to the branch mainline in revision 7517.
  • Revision ID: jelmer@jelmer.uk-20200623010230-62nnywznmb76h6ut
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

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