/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-06-14 17:59:16 UTC
  • mto: This revision was merged to the branch mainline in revision 7065.
  • Revision ID: jelmer@jelmer.uk-20180614175916-a2e2xh5k533guq1x
Move breezy.plugins.git to breezy.git.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/send.py
18
18
# along with this program; if not, write to the Free Software
19
19
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20
20
 
21
 
"""Support in "brz send" for git-am style patches."""
 
21
"""Support in "bzr send" for git-am style patches."""
 
22
 
 
23
from __future__ import absolute_import
22
24
 
23
25
import time
24
 
from .. import __version__ as brz_version
 
26
from .. import __version__ as bzr_version
25
27
from .. import (
26
28
    branch as _mod_branch,
27
29
    diff as _mod_diff,
32
34
 
33
35
from ..merge_directive import BaseMergeDirective
34
36
 
 
37
from . import (
 
38
    version_info as bzr_git_version_info,
 
39
    )
35
40
from .mapping import (
36
41
    object_mode,
37
42
    )
48
53
    )
49
54
 
50
55
 
51
 
version_tail = "Breezy %s, dulwich %d.%d.%d" % (
52
 
    (brz_version, ) + dulwich_version[:3])
 
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])
53
58
 
54
59
 
55
60
class GitDiffTree(_mod_diff.DiffTree):
57
62
 
58
63
    def _show_diff(self, specific_files, extra_trees):
59
64
        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)
 
65
        iterator = self.new_tree.iter_changes(self.old_tree,
 
66
            specific_files=specific_files, extra_trees=extra_trees,
 
67
            require_versioned=True)
63
68
        has_changes = 0
64
 
 
65
69
        def get_encoded_path(path):
66
70
            if path is not None:
67
71
                return path.encode(self.path_encoding, "replace")
68
 
 
69
72
        def get_file_mode(tree, path, kind, executable):
70
73
            if path is None:
71
74
                return 0
72
75
            return object_mode(kind, executable)
73
 
 
74
76
        def get_blob(present, tree, path):
75
77
            if present:
76
 
                with tree.get_file(path) as f:
77
 
                    return Blob.from_string(f.read())
 
78
                return Blob.from_string(tree.get_file(path).read())
78
79
            else:
79
80
                return None
80
81
        trees = (self.old_tree, self.new_tree)
81
 
        for change in iterator:
 
82
        for (file_id, paths, changed_content, versioned, parent, name, kind,
 
83
             executable) in iterator:
82
84
            # The root does not get diffed, and items with no known kind (that
83
85
            # is, missing) in both trees are skipped as well.
84
 
            if change.parent_id == (None, None) or change.kind == (None, None):
 
86
            if parent == (None, None) or kind == (None, None):
85
87
                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')))
 
88
            path_encoded = (get_encoded_path(paths[0]),
 
89
                            get_encoded_path(paths[1]))
 
90
            present = ((kind[0] not in (None, 'directory')),
 
91
                       (kind[1] not in (None, 'directory')))
90
92
            if not present[0] and not present[1]:
91
93
                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])
 
94
            contents = (get_blob(present[0], trees[0], paths[0]),
 
95
                        get_blob(present[1], trees[1], paths[1]))
 
96
            renamed = (parent[0], name[0]) != (parent[1], name[1])
95
97
            mode = (get_file_mode(trees[0], path_encoded[0],
96
 
                                  change.kind[0], change.executable[0]),
 
98
                                  kind[0], executable[0]),
97
99
                    get_file_mode(trees[1], path_encoded[1],
98
 
                                  change.kind[1], change.executable[1]))
 
100
                                  kind[1], executable[1]))
99
101
            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)
 
102
                (path_encoded[0], mode[0], contents[0]),
 
103
                (path_encoded[1], mode[1], contents[1]))
 
104
            has_changes |= (changed_content or renamed)
103
105
        return has_changes
104
106
 
105
107
 
114
116
    def __init__(self, revision_id, testament_sha1, time, timezone,
115
117
                 target_branch, source_branch=None, message=None,
116
118
                 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)
 
119
        super(GitMergeDirective, self).__init__(revision_id=revision_id,
 
120
            testament_sha1=testament_sha1, time=time, timezone=timezone,
 
121
            target_branch=target_branch, patch=None,
 
122
            source_branch=source_branch, message=message,
 
123
            bundle=None)
121
124
        self.patches = patches
122
125
 
123
126
    def to_lines(self):
124
127
        return self.patch.splitlines(True)
125
128
 
126
129
    def to_files(self):
127
 
        return ((summary, patch.splitlines(True)) for (summary, patch) in self.patches)
 
130
        return self.patches
128
131
 
129
132
    @classmethod
130
 
    def _generate_commit(cls, repository, revision_id, num, total,
131
 
                         context=_mod_diff.DEFAULT_CONTEXT_AMOUNT):
 
133
    def _generate_commit(cls, repository, revision_id, num, total):
132
134
        s = BytesIO()
133
135
        store = get_object_store(repository)
134
136
        with store.lock_read():
135
 
            commit = store[repository.lookup_bzr_revision_id(revision_id)[0]]
 
137
            commit = store[store._lookup_revision_sha1(revision_id)]
136
138
        from dulwich.patch import write_commit_patch, get_summary
137
139
        try:
138
140
            lhs_parent = repository.get_revision(revision_id).parent_ids[0]
141
143
        tree_1 = repository.revision_tree(lhs_parent)
142
144
        tree_2 = repository.revision_tree(revision_id)
143
145
        contents = BytesIO()
144
 
        differ = GitDiffTree.from_trees_options(
145
 
            tree_1, tree_2, contents, 'utf8', None, 'a/', 'b/', None,
146
 
            context_lines=context)
 
146
        differ = GitDiffTree.from_trees_options(tree_1, tree_2,
 
147
                contents, 'utf8', None, 'a/', 'b/', None)
147
148
        differ.show_diff(None, None)
148
149
        write_commit_patch(s, commit, contents.getvalue(), (num, total),
149
150
                           version_tail)
163
164
            todo = graph.find_difference(submit_revision_id, revision_id)[1]
164
165
            total = len(todo)
165
166
            for i, revid in enumerate(graph.iter_topo_order(todo)):
166
 
                patches.append(cls._generate_commit(repository, revid, i + 1,
167
 
                                                    total))
 
167
                patches.append(cls._generate_commit(repository, revid, i+1,
 
168
                    total))
168
169
        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):
 
170
            target_branch=target_branch, source_branch=public_branch,
 
171
            message=message, patches=patches)
 
172
 
 
173
 
 
174
def send_git(branch, revision_id, submit_branch, public_branch, no_patch, no_bundle, message, base_revision_id, local_target_branch=None):
175
175
    if no_patch:
176
 
        raise errors.CommandError(
177
 
            "no patch not supported for git-am style patches")
 
176
        raise errors.BzrCommandError("no patch not supported for git-am style patches")
178
177
    if no_bundle:
179
 
        raise errors.CommandError(
180
 
            "no bundle not supported for git-am style patches")
 
178
        raise errors.BzrCommandError("no bundle not supported for git-am style patches")
181
179
    return GitMergeDirective.from_objects(
182
180
        branch.repository, revision_id, time.time(),
183
181
        osutils.local_time_offset(), submit_branch,