/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

  • Committer: Jelmer Vernooij
  • Date: 2018-05-19 13:16:11 UTC
  • mto: (6968.4.3 git-archive)
  • mto: This revision was merged to the branch mainline in revision 6972.
  • Revision ID: jelmer@jelmer.uk-20180519131611-l9h9ud41j7qg1m03
Move tar/zip to breezy.archive.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/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
21
"""Support in "bzr send" for git-am style patches."""
22
22
 
 
23
from __future__ import absolute_import
 
24
 
23
25
import time
24
 
import bzrlib
25
 
from bzrlib import (
 
26
from ... import __version__ as bzr_version
 
27
from ... import (
26
28
    branch as _mod_branch,
27
29
    diff as _mod_diff,
28
30
    errors,
30
32
    revision as _mod_revision,
31
33
    )
32
34
 
33
 
try:
34
 
    from bzrlib.merge_directive import BaseMergeDirective
35
 
except ImportError:
36
 
    from bzrlib.merge_directive import (
37
 
        _BaseMergeDirective as BaseMergeDirective,
38
 
        )
 
35
from ...merge_directive import BaseMergeDirective
39
36
 
40
 
from bzrlib.plugins.git import (
 
37
from . import (
41
38
    version_info as bzr_git_version_info,
42
39
    )
43
 
from bzrlib.plugins.git.mapping import (
 
40
from .mapping import (
44
41
    object_mode,
45
42
    )
46
 
from bzrlib.plugins.git.object_store import (
 
43
from .object_store import (
47
44
    get_object_store,
48
45
    )
49
46
 
50
 
from cStringIO import StringIO
 
47
from io import BytesIO
51
48
from dulwich import (
52
49
    __version__ as dulwich_version,
53
50
    )
57
54
 
58
55
 
59
56
version_tail = "bzr %s, bzr-git %d.%d.%d, dulwich %d.%d.%d" % (
60
 
    (bzrlib.__version__, ) + bzr_git_version_info[:3] + dulwich_version[:3])
 
57
    (bzr_version, ) + bzr_git_version_info[:3] + dulwich_version[:3])
61
58
 
62
59
 
63
60
class GitDiffTree(_mod_diff.DiffTree):
76
73
            if path is None:
77
74
                return 0
78
75
            return object_mode(kind, executable)
79
 
        def get_blob(present, tree, file_id):
 
76
        def get_blob(present, tree, path):
80
77
            if present:
81
 
                return Blob.from_string(tree.get_file(file_id).read())
 
78
                return Blob.from_string(tree.get_file(path).read())
82
79
            else:
83
80
                return None
84
81
        trees = (self.old_tree, self.new_tree)
94
91
                       (kind[1] not in (None, 'directory')))
95
92
            if not present[0] and not present[1]:
96
93
                continue
97
 
            contents = (get_blob(present[0], trees[0], file_id),
98
 
                        get_blob(present[1], trees[1], file_id))
 
94
            contents = (get_blob(present[0], trees[0], paths[0]),
 
95
                        get_blob(present[1], trees[1], paths[1]))
99
96
            renamed = (parent[0], name[0]) != (parent[1], name[1])
100
97
            mode = (get_file_mode(trees[0], path_encoded[0],
101
98
                                  kind[0], executable[0]),
108
105
        return has_changes
109
106
 
110
107
 
 
108
def generate_patch_filename(num, summary):
 
109
    return "%04d-%s.patch" % (num, summary.replace("/", "_").rstrip("."))
 
110
 
 
111
 
111
112
class GitMergeDirective(BaseMergeDirective):
112
113
 
113
114
    multiple_output_files = True
114
115
 
115
116
    def __init__(self, revision_id, testament_sha1, time, timezone,
116
117
                 target_branch, source_branch=None, message=None,
117
 
                 patches=None):
 
118
                 patches=None, local_target_branch=None):
118
119
        super(GitMergeDirective, self).__init__(revision_id=revision_id,
119
120
            testament_sha1=testament_sha1, time=time, timezone=timezone,
120
121
            target_branch=target_branch, patch=None,
121
 
            source_branch=source_branch, message=message, bundle=None)
 
122
            source_branch=source_branch, message=message,
 
123
            bundle=None)
122
124
        self.patches = patches
123
125
 
124
126
    def to_lines(self):
129
131
 
130
132
    @classmethod
131
133
    def _generate_commit(cls, repository, revision_id, num, total):
132
 
        s = StringIO()
 
134
        s = BytesIO()
133
135
        store = get_object_store(repository)
134
 
        commit = store[store._lookup_revision_sha1(revision_id)]
 
136
        with store.lock_read():
 
137
            commit = store[store._lookup_revision_sha1(revision_id)]
135
138
        from dulwich.patch import write_commit_patch, get_summary
136
139
        try:
137
140
            lhs_parent = repository.get_revision(revision_id).parent_ids[0]
139
142
            lhs_parent = _mod_revision.NULL_REVISION
140
143
        tree_1 = repository.revision_tree(lhs_parent)
141
144
        tree_2 = repository.revision_tree(revision_id)
142
 
        contents = StringIO()
 
145
        contents = BytesIO()
143
146
        differ = GitDiffTree.from_trees_options(tree_1, tree_2,
144
147
                contents, 'utf8', None, 'a/', 'b/', None)
145
148
        differ.show_diff(None, None)
146
149
        write_commit_patch(s, commit, contents.getvalue(), (num, total),
147
150
                           version_tail)
148
 
        summary = "%04d-%s.patch" % (num, get_summary(commit).rstrip("."))
 
151
        summary = generate_patch_filename(num, get_summary(commit))
149
152
        return summary, s.getvalue()
150
153
 
151
154
    @classmethod
154
157
                     public_branch=None, message=None):
155
158
        patches = []
156
159
        submit_branch = _mod_branch.Branch.open(target_branch)
157
 
        submit_branch.lock_read()
158
 
        try:
 
160
        with submit_branch.lock_read():
159
161
            submit_revision_id = submit_branch.last_revision()
160
162
            repository.fetch(submit_branch.repository, submit_revision_id)
161
163
            graph = repository.get_graph()
164
166
            for i, revid in enumerate(graph.iter_topo_order(todo)):
165
167
                patches.append(cls._generate_commit(repository, revid, i+1,
166
168
                    total))
167
 
        finally:
168
 
            submit_branch.unlock()
169
169
        return cls(revision_id, None, time, timezone,
170
170
            target_branch=target_branch, source_branch=public_branch,
171
171
            message=message, patches=patches)
172
172
 
173
173
 
174
 
def send_git(branch, revision_id, submit_branch, public_branch, no_patch,
175
 
             no_bundle, message, base_revision_id):
 
174
def send_git(branch, revision_id, submit_branch, public_branch, no_patch, no_bundle, message, base_revision_id, local_target_branch=None):
176
175
    if no_patch:
177
176
        raise errors.BzrCommandError("no patch not supported for git-am style patches")
178
177
    if no_bundle:
180
179
    return GitMergeDirective.from_objects(
181
180
        branch.repository, revision_id, time.time(),
182
181
        osutils.local_time_offset(), submit_branch,
183
 
        public_branch=public_branch, message=message)
 
182
        public_branch=public_branch, message=message,
 
183
        local_target_branch=local_target_branch)