/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.238.1 by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn.
1
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
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.
11
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.
16
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
19
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
20
0.200.614 by Jelmer Vernooij
Add docstring.
21
"""Support in "bzr send" for git-am style patches."""
22
0.238.1 by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn.
23
import time
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
24
import bzrlib
0.238.1 by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn.
25
from bzrlib import (
26
    branch as _mod_branch,
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
27
    diff as _mod_diff,
0.238.1 by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn.
28
    merge_directive,
29
    osutils,
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
30
    revision as _mod_revision,
31
    )
32
33
from bzrlib.plugins.git import (
34
    version_info as bzr_git_version_info,
35
    )
36
from bzrlib.plugins.git.mapping import (
37
    object_mode,
38
    )
39
from bzrlib.plugins.git.object_store import (
40
    get_object_store,
41
    )
42
43
from cStringIO import StringIO
0.200.625 by Jelmer Vernooij
Include dulwich version in version tail.
44
from dulwich import (
45
    __version__ as dulwich_version,
46
    )
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
47
from dulwich.objects import (
48
    Blob,
49
    )
50
51
0.200.625 by Jelmer Vernooij
Include dulwich version in version tail.
52
version_tail = "bzr %s, bzr-git %d.%d.%d, dulwich %d.%d.%d" % (
53
    (bzrlib.__version__, ) + bzr_git_version_info[:3] + dulwich_version[:3])
0.200.623 by Jelmer Vernooij
Use more dulwich functions for writing patches.
54
55
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
56
class GitDiffTree(_mod_diff.DiffTree):
57
    """Provides a text representation between two trees, formatted for svn."""
58
59
    def _show_diff(self, specific_files, extra_trees):
0.200.624 by Jelmer Vernooij
Move more code to dulwich.
60
        from dulwich.patch import write_blob_diff
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
61
        iterator = self.new_tree.iter_changes(self.old_tree,
0.200.623 by Jelmer Vernooij
Use more dulwich functions for writing patches.
62
            specific_files=specific_files, extra_trees=extra_trees,
63
            require_versioned=True)
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
64
        has_changes = 0
65
        def get_encoded_path(path):
66
            if path is not None:
67
                return path.encode(self.path_encoding, "replace")
0.200.626 by Jelmer Vernooij
Simplify send code a bit.
68
        def get_file_mode(tree, path, kind, executable):
69
            if path is None:
70
                return None
71
            return object_mode(kind, executable)
72
        def get_blob(present, tree, file_id):
73
            if present is not None:
74
                return Blob.from_string(tree.get_file(file_id).read())
75
            else:
76
                return None
77
        trees = (self.old_tree, self.new_tree)
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
78
        for (file_id, paths, changed_content, versioned, parent, name, kind,
79
             executable) in iterator:
80
            # The root does not get diffed, and items with no known kind (that
81
            # is, missing) in both trees are skipped as well.
82
            if parent == (None, None) or kind == (None, None):
83
                continue
0.200.626 by Jelmer Vernooij
Simplify send code a bit.
84
            path_encoded = (get_encoded_path(paths[0]), 
85
                            get_encoded_path(paths[1]))
86
            present = ((kind[0] is not None and versioned[0]),
87
                       (kind[1] is not None and versioned[1]))
88
            contents = (get_blob(present[0], trees[0], file_id),
89
                        get_blob(present[1], trees[1], file_id))
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
90
            renamed = (parent[0], name[0]) != (parent[1], name[1])
0.200.626 by Jelmer Vernooij
Simplify send code a bit.
91
            mode = (get_file_mode(trees[0], path_encoded[0], 
92
                                  kind[0], executable[0]), 
93
                    get_file_mode(trees[1], path_encoded[1], 
94
                                  kind[1], executable[1]))
0.200.624 by Jelmer Vernooij
Move more code to dulwich.
95
            write_blob_diff(self.to_file, 
0.200.626 by Jelmer Vernooij
Simplify send code a bit.
96
                (path_encoded[0], mode[0], contents[0]), 
97
                (path_encoded[1], mode[1], contents[1]))
98
            has_changes |= (changed_content or renamed)
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
99
        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.
100
101
102
class GitMergeDirective(merge_directive._BaseMergeDirective):
103
104
    def to_lines(self):
105
        return self.patch.splitlines(True)
106
107
    @classmethod
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
108
    def _generate_commit(cls, repository, revision_id, num, total):
109
        s = StringIO()
110
        store = get_object_store(repository)
111
        commit = store[store._lookup_revision_sha1(revision_id)]
0.200.623 by Jelmer Vernooij
Use more dulwich functions for writing patches.
112
        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".
113
        try:
114
            lhs_parent = repository.get_revision(revision_id).parent_ids[0]
115
        except IndexError:
116
            lhs_parent = _mod_revision.NULL_REVISION
117
        tree_1 = repository.revision_tree(lhs_parent)
118
        tree_2 = repository.revision_tree(revision_id)
0.200.623 by Jelmer Vernooij
Use more dulwich functions for writing patches.
119
        contents = StringIO()
120
        differ = GitDiffTree.from_trees_options(tree_1, tree_2, 
121
                contents, 'utf8', None, 'a/', 'b/', None)
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
122
        differ.show_diff(None, None)
0.200.623 by Jelmer Vernooij
Use more dulwich functions for writing patches.
123
        write_commit_patch(s, commit, contents.getvalue(), (num, total), 
124
                           version_tail)
125
        summary = "%04d-%s" % (num, get_summary(commit))
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
126
        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.
127
128
    @classmethod
129
    def from_objects(cls, repository, revision_id, time, timezone,
130
                     target_branch, local_target_branch=None,
131
                     public_branch=None, message=None):
0.238.8 by Jelmer Vernooij
include all revisions (even though they're serialized atm).
132
        patches = []
0.238.1 by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn.
133
        submit_branch = _mod_branch.Branch.open(target_branch)
134
        submit_branch.lock_read()
135
        try:
136
            submit_revision_id = submit_branch.last_revision()
137
            repository.fetch(submit_branch.repository, submit_revision_id)
0.238.8 by Jelmer Vernooij
include all revisions (even though they're serialized atm).
138
            graph = repository.get_graph()
139
            todo = graph.find_difference(submit_revision_id, revision_id)[1]
140
            total = len(todo)
141
            for i, revid in enumerate(graph.iter_topo_order(todo)):
0.200.623 by Jelmer Vernooij
Use more dulwich functions for writing patches.
142
                patches.append(cls._generate_commit(repository, revid, i+1, 
143
                                                    total))
0.238.1 by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn.
144
        finally:
145
            submit_branch.unlock()
0.200.623 by Jelmer Vernooij
Use more dulwich functions for writing patches.
146
        return cls(revision_id, None, time, timezone, target_branch, 
147
            "".join([patch for (summary, patch) in patches]), 
148
            None, public_branch, message)
0.238.1 by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn.
149
150
0.238.3 by Jelmer Vernooij
Remove svn references, prefer git send format when submitting changes against a git branch.
151
def send_git(branch, revision_id, submit_branch, public_branch,
0.238.1 by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn.
152
              no_patch, no_bundle, message, base_revision_id):
153
    return GitMergeDirective.from_objects(
154
        branch.repository, revision_id, time.time(),
155
        osutils.local_time_offset(), submit_branch,
156
        public_branch=public_branch, message=message)