/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.358.2 by Jelmer Vernooij
Refresh copyright headers, add my email.
1
# Copyright (C) 2009-2018 Jelmer Vernooij <jelmer@jelmer.uk>
0.238.1 by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn.
2
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
3
# Based on the original from bzr-svn:
0.238.1 by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn.
4
# Copyright (C) 2009 Lukas Lalinsky <lalinsky@gmail.com>
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
5
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
0.238.1 by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn.
6
7
# This program is free software; you can redistribute it and/or modify
8
# it under the terms of the GNU General Public License as published by
9
# the Free Software Foundation; either version 2 of the License, or
10
# (at your option) any later version.
0.359.1 by Jelmer Vernooij
Fix headers to make brz GPL checker happy.
11
#
0.238.1 by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn.
12
# This program is distributed in the hope that it will be useful,
13
# but WITHOUT ANY WARRANTY; without even the implied warranty of
14
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15
# GNU General Public License for more details.
0.359.1 by Jelmer Vernooij
Fix headers to make brz GPL checker happy.
16
#
0.238.1 by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn.
17
# You should have received a copy of the GNU General Public License
18
# along with this program; if not, write to the Free Software
0.358.1 by Jelmer Vernooij
Fix FSF address.
19
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
0.238.1 by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn.
20
7143.7.1 by Jelmer Vernooij
Simplify brz-git, drop imports.
21
"""Support in "brz send" for git-am style patches."""
0.200.614 by Jelmer Vernooij
Add docstring.
22
0.358.3 by Jelmer Vernooij
Enable absolute import.
23
from __future__ import absolute_import
24
0.238.1 by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn.
25
import time
7143.7.1 by Jelmer Vernooij
Simplify brz-git, drop imports.
26
from .. import __version__ as brz_version
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
27
from .. import (
0.238.1 by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn.
28
    branch as _mod_branch,
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
29
    diff as _mod_diff,
0.200.628 by Jelmer Vernooij
Raise about impossible arguments in send --format=git.
30
    errors,
0.238.1 by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn.
31
    osutils,
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
32
    revision as _mod_revision,
33
    )
34
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
35
from ..merge_directive import BaseMergeDirective
0.200.740 by Jelmer Vernooij
Implement to_files() for git merge directives.
36
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
37
from .mapping import (
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
38
    object_mode,
39
    )
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
40
from .object_store import (
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
41
    get_object_store,
42
    )
43
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
44
from io import BytesIO
0.200.625 by Jelmer Vernooij
Include dulwich version in version tail.
45
from dulwich import (
46
    __version__ as dulwich_version,
47
    )
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
48
from dulwich.objects import (
49
    Blob,
50
    )
51
52
7143.7.1 by Jelmer Vernooij
Simplify brz-git, drop imports.
53
version_tail = "Breezy %s, dulwich %d.%d.%d" % (
54
    (brz_version, ) + dulwich_version[:3])
0.200.623 by Jelmer Vernooij
Use more dulwich functions for writing patches.
55
56
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
57
class GitDiffTree(_mod_diff.DiffTree):
58
    """Provides a text representation between two trees, formatted for svn."""
59
60
    def _show_diff(self, specific_files, extra_trees):
0.200.624 by Jelmer Vernooij
Move more code to dulwich.
61
        from dulwich.patch import write_blob_diff
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
62
        iterator = self.new_tree.iter_changes(self.old_tree,
0.200.623 by Jelmer Vernooij
Use more dulwich functions for writing patches.
63
            specific_files=specific_files, extra_trees=extra_trees,
64
            require_versioned=True)
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
65
        has_changes = 0
66
        def get_encoded_path(path):
67
            if path is not None:
68
                return path.encode(self.path_encoding, "replace")
0.200.626 by Jelmer Vernooij
Simplify send code a bit.
69
        def get_file_mode(tree, path, kind, executable):
70
            if path is None:
0.200.738 by Jelmer Vernooij
Properly ignore directories when creating bundles, deal with new files.
71
                return 0
0.200.626 by Jelmer Vernooij
Simplify send code a bit.
72
            return object_mode(kind, executable)
0.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
73
        def get_blob(present, tree, path):
0.200.738 by Jelmer Vernooij
Properly ignore directories when creating bundles, deal with new files.
74
            if present:
7027.4.11 by Jelmer Vernooij
Fix some tests that fail with -Werror.
75
                with tree.get_file(path) as f:
76
                    return Blob.from_string(f.read())
0.200.626 by Jelmer Vernooij
Simplify send code a bit.
77
            else:
78
                return None
79
        trees = (self.old_tree, self.new_tree)
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
80
        for (file_id, paths, changed_content, versioned, parent, name, kind,
81
             executable) in iterator:
82
            # The root does not get diffed, and items with no known kind (that
83
            # is, missing) in both trees are skipped as well.
84
            if parent == (None, None) or kind == (None, None):
85
                continue
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
86
            path_encoded = (get_encoded_path(paths[0]),
0.200.626 by Jelmer Vernooij
Simplify send code a bit.
87
                            get_encoded_path(paths[1]))
0.200.738 by Jelmer Vernooij
Properly ignore directories when creating bundles, deal with new files.
88
            present = ((kind[0] not in (None, 'directory')),
89
                       (kind[1] not in (None, 'directory')))
90
            if not present[0] and not present[1]:
91
                continue
0.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
92
            contents = (get_blob(present[0], trees[0], paths[0]),
93
                        get_blob(present[1], trees[1], paths[1]))
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
94
            renamed = (parent[0], name[0]) != (parent[1], name[1])
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
95
            mode = (get_file_mode(trees[0], path_encoded[0],
96
                                  kind[0], executable[0]),
97
                    get_file_mode(trees[1], path_encoded[1],
0.200.626 by Jelmer Vernooij
Simplify send code a bit.
98
                                  kind[1], executable[1]))
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
99
            write_blob_diff(self.to_file,
100
                (path_encoded[0], mode[0], contents[0]),
0.200.626 by Jelmer Vernooij
Simplify send code a bit.
101
                (path_encoded[1], mode[1], contents[1]))
102
            has_changes |= (changed_content or renamed)
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
103
        return has_changes
0.238.1 by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn.
104
105
0.200.1607 by Jelmer Vernooij
Cope with slashes in commit messages.
106
def generate_patch_filename(num, summary):
107
    return "%04d-%s.patch" % (num, summary.replace("/", "_").rstrip("."))
108
109
0.200.740 by Jelmer Vernooij
Implement to_files() for git merge directives.
110
class GitMergeDirective(BaseMergeDirective):
111
112
    multiple_output_files = True
113
114
    def __init__(self, revision_id, testament_sha1, time, timezone,
115
                 target_branch, source_branch=None, message=None,
0.200.1545 by Jelmer Vernooij
Some more test fixes.
116
                 patches=None, local_target_branch=None):
0.200.740 by Jelmer Vernooij
Implement to_files() for git merge directives.
117
        super(GitMergeDirective, self).__init__(revision_id=revision_id,
118
            testament_sha1=testament_sha1, time=time, timezone=timezone,
119
            target_branch=target_branch, patch=None,
0.200.1545 by Jelmer Vernooij
Some more test fixes.
120
            source_branch=source_branch, message=message,
121
            bundle=None)
0.200.740 by Jelmer Vernooij
Implement to_files() for git merge directives.
122
        self.patches = patches
0.238.1 by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn.
123
124
    def to_lines(self):
125
        return self.patch.splitlines(True)
126
0.200.740 by Jelmer Vernooij
Implement to_files() for git merge directives.
127
    def to_files(self):
128
        return self.patches
129
0.238.1 by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn.
130
    @classmethod
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
131
    def _generate_commit(cls, repository, revision_id, num, total):
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
132
        s = BytesIO()
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
133
        store = get_object_store(repository)
0.200.1788 by Jelmer Vernooij
Use context managers.
134
        with store.lock_read():
0.200.1212 by Jelmer Vernooij
Support read locking object stores.
135
            commit = store[store._lookup_revision_sha1(revision_id)]
0.200.623 by Jelmer Vernooij
Use more dulwich functions for writing patches.
136
        from dulwich.patch import write_commit_patch, get_summary
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
137
        try:
138
            lhs_parent = repository.get_revision(revision_id).parent_ids[0]
139
        except IndexError:
140
            lhs_parent = _mod_revision.NULL_REVISION
141
        tree_1 = repository.revision_tree(lhs_parent)
142
        tree_2 = repository.revision_tree(revision_id)
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
143
        contents = BytesIO()
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
144
        differ = GitDiffTree.from_trees_options(tree_1, tree_2,
0.200.623 by Jelmer Vernooij
Use more dulwich functions for writing patches.
145
                contents, 'utf8', None, 'a/', 'b/', None)
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
146
        differ.show_diff(None, None)
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
147
        write_commit_patch(s, commit, contents.getvalue(), (num, total),
0.200.623 by Jelmer Vernooij
Use more dulwich functions for writing patches.
148
                           version_tail)
0.200.1607 by Jelmer Vernooij
Cope with slashes in commit messages.
149
        summary = generate_patch_filename(num, get_summary(commit))
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
150
        return summary, s.getvalue()
0.238.1 by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn.
151
152
    @classmethod
153
    def from_objects(cls, repository, revision_id, time, timezone,
154
                     target_branch, local_target_branch=None,
155
                     public_branch=None, message=None):
0.238.8 by Jelmer Vernooij
include all revisions (even though they're serialized atm).
156
        patches = []
0.238.1 by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn.
157
        submit_branch = _mod_branch.Branch.open(target_branch)
0.200.1788 by Jelmer Vernooij
Use context managers.
158
        with submit_branch.lock_read():
0.238.1 by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn.
159
            submit_revision_id = submit_branch.last_revision()
160
            repository.fetch(submit_branch.repository, submit_revision_id)
0.238.8 by Jelmer Vernooij
include all revisions (even though they're serialized atm).
161
            graph = repository.get_graph()
162
            todo = graph.find_difference(submit_revision_id, revision_id)[1]
163
            total = len(todo)
164
            for i, revid in enumerate(graph.iter_topo_order(todo)):
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
165
                patches.append(cls._generate_commit(repository, revid, i+1,
0.200.740 by Jelmer Vernooij
Implement to_files() for git merge directives.
166
                    total))
167
        return cls(revision_id, None, time, timezone,
168
            target_branch=target_branch, source_branch=public_branch,
169
            message=message, patches=patches)
0.238.1 by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn.
170
171
0.200.1545 by Jelmer Vernooij
Some more test fixes.
172
def send_git(branch, revision_id, submit_branch, public_branch, no_patch, no_bundle, message, base_revision_id, local_target_branch=None):
0.200.628 by Jelmer Vernooij
Raise about impossible arguments in send --format=git.
173
    if no_patch:
174
        raise errors.BzrCommandError("no patch not supported for git-am style patches")
175
    if no_bundle:
176
        raise errors.BzrCommandError("no bundle not supported for git-am style patches")
0.238.1 by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn.
177
    return GitMergeDirective.from_objects(
178
        branch.repository, revision_id, time.time(),
179
        osutils.local_time_offset(), submit_branch,
0.200.1545 by Jelmer Vernooij
Some more test fixes.
180
        public_branch=public_branch, message=message,
181
        local_target_branch=local_target_branch)