/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-06-03 23:48:08 UTC
  • mfrom: (7316 work)
  • mto: This revision was merged to the branch mainline in revision 7328.
  • Revision ID: jelmer@jelmer.uk-20190603234808-15yk5c7054tj8e2b
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/send.py
80
80
            else:
81
81
                return None
82
82
        trees = (self.old_tree, self.new_tree)
83
 
        for change in iterator:
 
83
        for (file_id, paths, changed_content, versioned, parent, name, kind,
 
84
             executable) in iterator:
84
85
            # The root does not get diffed, and items with no known kind (that
85
86
            # is, missing) in both trees are skipped as well.
86
 
            if change.parent_id == (None, None) or change.kind == (None, None):
 
87
            if parent == (None, None) or kind == (None, None):
87
88
                continue
88
 
            path_encoded = (get_encoded_path(change.path[0]),
89
 
                            get_encoded_path(change.path[1]))
90
 
            present = ((change.kind[0] not in (None, 'directory')),
91
 
                       (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')))
92
93
            if not present[0] and not present[1]:
93
94
                continue
94
 
            contents = (get_blob(present[0], trees[0], change.path[0]),
95
 
                        get_blob(present[1], trees[1], change.path[1]))
96
 
            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])
97
98
            mode = (get_file_mode(trees[0], path_encoded[0],
98
 
                                  change.kind[0], change.executable[0]),
 
99
                                  kind[0], executable[0]),
99
100
                    get_file_mode(trees[1], path_encoded[1],
100
 
                                  change.kind[1], change.executable[1]))
 
101
                                  kind[1], executable[1]))
101
102
            write_blob_diff(self.to_file,
102
103
                            (path_encoded[0], mode[0], contents[0]),
103
104
                            (path_encoded[1], mode[1], contents[1]))
104
 
            has_changes |= (change.changed_content or renamed)
 
105
            has_changes |= (changed_content or renamed)
105
106
        return has_changes
106
107
 
107
108
 
126
127
        return self.patch.splitlines(True)
127
128
 
128
129
    def to_files(self):
129
 
        return ((summary, patch.splitlines(True)) for (summary, patch) in self.patches)
 
130
        return self.patches
130
131
 
131
132
    @classmethod
132
 
    def _generate_commit(cls, repository, revision_id, num, total,
133
 
                         context=_mod_diff.DEFAULT_CONTEXT_AMOUNT):
 
133
    def _generate_commit(cls, repository, revision_id, num, total):
134
134
        s = BytesIO()
135
135
        store = get_object_store(repository)
136
136
        with store.lock_read():
137
 
            commit = store[repository.lookup_bzr_revision_id(revision_id)[0]]
 
137
            commit = store[store._lookup_revision_sha1(revision_id)]
138
138
        from dulwich.patch import write_commit_patch, get_summary
139
139
        try:
140
140
            lhs_parent = repository.get_revision(revision_id).parent_ids[0]
144
144
        tree_2 = repository.revision_tree(revision_id)
145
145
        contents = BytesIO()
146
146
        differ = GitDiffTree.from_trees_options(
147
 
            tree_1, tree_2, contents, 'utf8', None, 'a/', 'b/', None,
148
 
            context_lines=context)
 
147
            tree_1, tree_2, contents, 'utf8', None, 'a/', 'b/', None)
149
148
        differ.show_diff(None, None)
150
149
        write_commit_patch(s, commit, contents.getvalue(), (num, total),
151
150
                           version_tail)