/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
0.200.614 by Jelmer Vernooij
Add docstring.
21
"""Support in "bzr send" for git-am style patches."""
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
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
26
from ... import __version__ as bzr_version
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
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
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 . import (
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
38
    version_info as bzr_git_version_info,
39
    )
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
40
from .mapping import (
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
41
    object_mode,
42
    )
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
43
from .object_store import (
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
44
    get_object_store,
45
    )
46
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
47
from io import BytesIO
0.200.625 by Jelmer Vernooij
Include dulwich version in version tail.
48
from dulwich import (
49
    __version__ as dulwich_version,
50
    )
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
51
from dulwich.objects import (
52
    Blob,
53
    )
54
55
0.200.625 by Jelmer Vernooij
Include dulwich version in version tail.
56
version_tail = "bzr %s, bzr-git %d.%d.%d, dulwich %d.%d.%d" % (
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
57
    (bzr_version, ) + bzr_git_version_info[:3] + dulwich_version[:3])
0.200.623 by Jelmer Vernooij
Use more dulwich functions for writing patches.
58
59
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
60
class GitDiffTree(_mod_diff.DiffTree):
61
    """Provides a text representation between two trees, formatted for svn."""
62
63
    def _show_diff(self, specific_files, extra_trees):
0.200.624 by Jelmer Vernooij
Move more code to dulwich.
64
        from dulwich.patch import write_blob_diff
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
65
        iterator = self.new_tree.iter_changes(self.old_tree,
0.200.623 by Jelmer Vernooij
Use more dulwich functions for writing patches.
66
            specific_files=specific_files, extra_trees=extra_trees,
67
            require_versioned=True)
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
68
        has_changes = 0
69
        def get_encoded_path(path):
70
            if path is not None:
71
                return path.encode(self.path_encoding, "replace")
0.200.626 by Jelmer Vernooij
Simplify send code a bit.
72
        def get_file_mode(tree, path, kind, executable):
73
            if path is None:
0.200.738 by Jelmer Vernooij
Properly ignore directories when creating bundles, deal with new files.
74
                return 0
0.200.626 by Jelmer Vernooij
Simplify send code a bit.
75
            return object_mode(kind, executable)
0.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
76
        def get_blob(present, tree, path):
0.200.738 by Jelmer Vernooij
Properly ignore directories when creating bundles, deal with new files.
77
            if present:
0.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
78
                return Blob.from_string(tree.get_file(path).read())
0.200.626 by Jelmer Vernooij
Simplify send code a bit.
79
            else:
80
                return None
81
        trees = (self.old_tree, self.new_tree)
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
82
        for (file_id, paths, changed_content, versioned, parent, name, kind,
83
             executable) in iterator:
84
            # The root does not get diffed, and items with no known kind (that
85
            # is, missing) in both trees are skipped as well.
86
            if parent == (None, None) or kind == (None, None):
87
                continue
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
88
            path_encoded = (get_encoded_path(paths[0]),
0.200.626 by Jelmer Vernooij
Simplify send code a bit.
89
                            get_encoded_path(paths[1]))
0.200.738 by Jelmer Vernooij
Properly ignore directories when creating bundles, deal with new files.
90
            present = ((kind[0] not in (None, 'directory')),
91
                       (kind[1] not in (None, 'directory')))
92
            if not present[0] and not present[1]:
93
                continue
0.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
94
            contents = (get_blob(present[0], trees[0], paths[0]),
95
                        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".
96
            renamed = (parent[0], name[0]) != (parent[1], name[1])
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
97
            mode = (get_file_mode(trees[0], path_encoded[0],
98
                                  kind[0], executable[0]),
99
                    get_file_mode(trees[1], path_encoded[1],
0.200.626 by Jelmer Vernooij
Simplify send code a bit.
100
                                  kind[1], executable[1]))
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
101
            write_blob_diff(self.to_file,
102
                (path_encoded[0], mode[0], contents[0]),
0.200.626 by Jelmer Vernooij
Simplify send code a bit.
103
                (path_encoded[1], mode[1], contents[1]))
104
            has_changes |= (changed_content or renamed)
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
105
        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.
106
107
0.200.1607 by Jelmer Vernooij
Cope with slashes in commit messages.
108
def generate_patch_filename(num, summary):
109
    return "%04d-%s.patch" % (num, summary.replace("/", "_").rstrip("."))
110
111
0.200.740 by Jelmer Vernooij
Implement to_files() for git merge directives.
112
class GitMergeDirective(BaseMergeDirective):
113
114
    multiple_output_files = True
115
116
    def __init__(self, revision_id, testament_sha1, time, timezone,
117
                 target_branch, source_branch=None, message=None,
0.200.1545 by Jelmer Vernooij
Some more test fixes.
118
                 patches=None, local_target_branch=None):
0.200.740 by Jelmer Vernooij
Implement to_files() for git merge directives.
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,
0.200.1545 by Jelmer Vernooij
Some more test fixes.
122
            source_branch=source_branch, message=message,
123
            bundle=None)
0.200.740 by Jelmer Vernooij
Implement to_files() for git merge directives.
124
        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.
125
126
    def to_lines(self):
127
        return self.patch.splitlines(True)
128
0.200.740 by Jelmer Vernooij
Implement to_files() for git merge directives.
129
    def to_files(self):
130
        return self.patches
131
0.238.1 by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn.
132
    @classmethod
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
133
    def _generate_commit(cls, repository, revision_id, num, total):
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
134
        s = BytesIO()
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
135
        store = get_object_store(repository)
0.200.1788 by Jelmer Vernooij
Use context managers.
136
        with store.lock_read():
0.200.1212 by Jelmer Vernooij
Support read locking object stores.
137
            commit = store[store._lookup_revision_sha1(revision_id)]
0.200.623 by Jelmer Vernooij
Use more dulwich functions for writing patches.
138
        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".
139
        try:
140
            lhs_parent = repository.get_revision(revision_id).parent_ids[0]
141
        except IndexError:
142
            lhs_parent = _mod_revision.NULL_REVISION
143
        tree_1 = repository.revision_tree(lhs_parent)
144
        tree_2 = repository.revision_tree(revision_id)
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
145
        contents = BytesIO()
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
146
        differ = GitDiffTree.from_trees_options(tree_1, tree_2,
0.200.623 by Jelmer Vernooij
Use more dulwich functions for writing patches.
147
                contents, 'utf8', None, 'a/', 'b/', None)
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
148
        differ.show_diff(None, None)
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
149
        write_commit_patch(s, commit, contents.getvalue(), (num, total),
0.200.623 by Jelmer Vernooij
Use more dulwich functions for writing patches.
150
                           version_tail)
0.200.1607 by Jelmer Vernooij
Cope with slashes in commit messages.
151
        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".
152
        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.
153
154
    @classmethod
155
    def from_objects(cls, repository, revision_id, time, timezone,
156
                     target_branch, local_target_branch=None,
157
                     public_branch=None, message=None):
0.238.8 by Jelmer Vernooij
include all revisions (even though they're serialized atm).
158
        patches = []
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_branch = _mod_branch.Branch.open(target_branch)
0.200.1788 by Jelmer Vernooij
Use context managers.
160
        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.
161
            submit_revision_id = submit_branch.last_revision()
162
            repository.fetch(submit_branch.repository, submit_revision_id)
0.238.8 by Jelmer Vernooij
include all revisions (even though they're serialized atm).
163
            graph = repository.get_graph()
164
            todo = graph.find_difference(submit_revision_id, revision_id)[1]
165
            total = len(todo)
166
            for i, revid in enumerate(graph.iter_topo_order(todo)):
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
167
                patches.append(cls._generate_commit(repository, revid, i+1,
0.200.740 by Jelmer Vernooij
Implement to_files() for git merge directives.
168
                    total))
169
        return cls(revision_id, None, time, timezone,
170
            target_branch=target_branch, source_branch=public_branch,
171
            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.
172
173
0.200.1545 by Jelmer Vernooij
Some more test fixes.
174
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.
175
    if no_patch:
176
        raise errors.BzrCommandError("no patch not supported for git-am style patches")
177
    if no_bundle:
178
        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.
179
    return GitMergeDirective.from_objects(
180
        branch.repository, revision_id, time.time(),
181
        osutils.local_time_offset(), submit_branch,
0.200.1545 by Jelmer Vernooij
Some more test fixes.
182
        public_branch=public_branch, message=message,
183
        local_target_branch=local_target_branch)