/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: 2019-03-05 07:32:38 UTC
  • mto: (7290.1.21 work)
  • mto: This revision was merged to the branch mainline in revision 7311.
  • Revision ID: jelmer@jelmer.uk-20190305073238-zlqn981opwnqsmzi
Add appveyor configuration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/send.py
20
20
 
21
21
"""Support in "brz send" for git-am style patches."""
22
22
 
 
23
from __future__ import absolute_import
 
24
 
23
25
import time
24
26
from .. import __version__ as brz_version
25
27
from .. import (
78
80
            else:
79
81
                return None
80
82
        trees = (self.old_tree, self.new_tree)
81
 
        for change in iterator:
 
83
        for (file_id, paths, changed_content, versioned, parent, name, kind,
 
84
             executable) in iterator:
82
85
            # The root does not get diffed, and items with no known kind (that
83
86
            # is, missing) in both trees are skipped as well.
84
 
            if change.parent_id == (None, None) or change.kind == (None, None):
 
87
            if parent == (None, None) or kind == (None, None):
85
88
                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')))
 
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')))
90
93
            if not present[0] and not present[1]:
91
94
                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
            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])
95
98
            mode = (get_file_mode(trees[0], path_encoded[0],
96
 
                                  change.kind[0], change.executable[0]),
 
99
                                  kind[0], executable[0]),
97
100
                    get_file_mode(trees[1], path_encoded[1],
98
 
                                  change.kind[1], change.executable[1]))
 
101
                                  kind[1], executable[1]))
99
102
            write_blob_diff(self.to_file,
100
103
                            (path_encoded[0], mode[0], contents[0]),
101
104
                            (path_encoded[1], mode[1], contents[1]))
102
 
            has_changes |= (change.changed_content or renamed)
 
105
            has_changes |= (changed_content or renamed)
103
106
        return has_changes
104
107
 
105
108
 
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]
142
144
        tree_2 = repository.revision_tree(revision_id)
143
145
        contents = BytesIO()
144
146
        differ = GitDiffTree.from_trees_options(
145
 
            tree_1, tree_2, contents, 'utf8', None, 'a/', 'b/', None,
146
 
            context_lines=context)
 
147
            tree_1, tree_2, 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)
173
174
def send_git(branch, revision_id, submit_branch, public_branch, no_patch,
174
175
             no_bundle, message, base_revision_id, local_target_branch=None):
175
176
    if no_patch:
176
 
        raise errors.CommandError(
 
177
        raise errors.BzrCommandError(
177
178
            "no patch not supported for git-am style patches")
178
179
    if no_bundle:
179
 
        raise errors.CommandError(
 
180
        raise errors.BzrCommandError(
180
181
            "no bundle not supported for git-am style patches")
181
182
    return GitMergeDirective.from_objects(
182
183
        branch.repository, revision_id, time.time(),