/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: Gustav Hartvigsson
  • Date: 2021-01-09 21:36:27 UTC
  • Revision ID: gustav.hartvigsson@gmail.com-20210109213627-h1xwcutzy9m7a99b
Added 'Case Preserving Working Tree Use Cases' from Canonical Wiki

* Addod a page from the Canonical Bazaar wiki
  with information on the scmeatics of case
  perserving filesystems an a case insensitive
  filesystem works.
  
  * Needs re-work, but this will do as it is the
    same inforamoton as what was on the linked
    page in the currint documentation.

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
 
 
25
23
import time
26
24
from .. import __version__ as brz_version
27
25
from .. import (
80
78
            else:
81
79
                return None
82
80
        trees = (self.old_tree, self.new_tree)
83
 
        for (file_id, paths, changed_content, versioned, parent, name, kind,
84
 
             executable) in iterator:
 
81
        for change in iterator:
85
82
            # The root does not get diffed, and items with no known kind (that
86
83
            # is, missing) in both trees are skipped as well.
87
 
            if parent == (None, None) or kind == (None, None):
 
84
            if change.parent_id == (None, None) or change.kind == (None, None):
88
85
                continue
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')))
 
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')))
93
90
            if not present[0] and not present[1]:
94
91
                continue
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])
 
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])
98
95
            mode = (get_file_mode(trees[0], path_encoded[0],
99
 
                                  kind[0], executable[0]),
 
96
                                  change.kind[0], change.executable[0]),
100
97
                    get_file_mode(trees[1], path_encoded[1],
101
 
                                  kind[1], executable[1]))
 
98
                                  change.kind[1], change.executable[1]))
102
99
            write_blob_diff(self.to_file,
103
100
                            (path_encoded[0], mode[0], contents[0]),
104
101
                            (path_encoded[1], mode[1], contents[1]))
105
 
            has_changes |= (changed_content or renamed)
 
102
            has_changes |= (change.changed_content or renamed)
106
103
        return has_changes
107
104
 
108
105
 
127
124
        return self.patch.splitlines(True)
128
125
 
129
126
    def to_files(self):
130
 
        return self.patches
 
127
        return ((summary, patch.splitlines(True)) for (summary, patch) in self.patches)
131
128
 
132
129
    @classmethod
133
 
    def _generate_commit(cls, repository, revision_id, num, total):
 
130
    def _generate_commit(cls, repository, revision_id, num, total,
 
131
                         context=_mod_diff.DEFAULT_CONTEXT_AMOUNT):
134
132
        s = BytesIO()
135
133
        store = get_object_store(repository)
136
134
        with store.lock_read():
137
 
            commit = store[store._lookup_revision_sha1(revision_id)]
 
135
            commit = store[repository.lookup_bzr_revision_id(revision_id)[0]]
138
136
        from dulwich.patch import write_commit_patch, get_summary
139
137
        try:
140
138
            lhs_parent = repository.get_revision(revision_id).parent_ids[0]
144
142
        tree_2 = repository.revision_tree(revision_id)
145
143
        contents = BytesIO()
146
144
        differ = GitDiffTree.from_trees_options(
147
 
            tree_1, tree_2, contents, 'utf8', None, 'a/', 'b/', None)
 
145
            tree_1, tree_2, contents, 'utf8', None, 'a/', 'b/', None,
 
146
            context_lines=context)
148
147
        differ.show_diff(None, None)
149
148
        write_commit_patch(s, commit, contents.getvalue(), (num, total),
150
149
                           version_tail)
174
173
def send_git(branch, revision_id, submit_branch, public_branch, no_patch,
175
174
             no_bundle, message, base_revision_id, local_target_branch=None):
176
175
    if no_patch:
177
 
        raise errors.BzrCommandError(
 
176
        raise errors.CommandError(
178
177
            "no patch not supported for git-am style patches")
179
178
    if no_bundle:
180
 
        raise errors.BzrCommandError(
 
179
        raise errors.CommandError(
181
180
            "no bundle not supported for git-am style patches")
182
181
    return GitMergeDirective.from_objects(
183
182
        branch.repository, revision_id, time.time(),