/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
44
from dulwich.objects import (
45
    Blob,
46
    )
47
48
49
class GitDiffTree(_mod_diff.DiffTree):
50
    """Provides a text representation between two trees, formatted for svn."""
51
52
    def __init__(self, old_tree, new_tree, to_file, path_encoding='utf-8',
53
                 diff_text=None, extra_factories=None):
54
        super(GitDiffTree, self).__init__(old_tree, new_tree, to_file, path_encoding,
55
            diff_text, extra_factories)
56
57
    def _write_file_mode(self, old_mode, new_mode):
58
        if old_mode == new_mode:
59
            return
60
        if new_mode is not None:
61
            if old_mode is not None:
62
                self.to_file.write("old file mode %o\n" % old_mode)
63
            self.to_file.write("new file mode %o\n" % new_mode) 
64
        else:
65
            self.to_file.write("deleted file mode %o\n" % old_mode)
66
67
    def _get_rev(self, contents):
68
        if contents is None:
69
            return "0" * 7
70
        else:
71
            return Blob.from_string("".join(contents)).id[:7]
72
73
    def _write_contents_diff(self, old_path, old_mode, old_contents, new_path, new_mode, new_contents):
74
        if old_path is None:
75
            old_path = "/dev/null"
76
        else:
77
            old_path = "a/%s" % old_path
78
        if new_path is None:
79
            new_path = "/dev/null"
80
        else:
81
            new_path = "b/%s" % new_path
82
        self.to_file.write("diff --git %s %s\n" % (old_path, new_path))
83
        self._write_file_mode(old_mode, new_mode)
84
        old_rev = self._get_rev(old_contents)
85
        new_rev = self._get_rev(new_contents)
86
        self.to_file.write("index %s..%s %o\n" % (old_rev, new_rev, new_mode))
87
        _mod_diff.internal_diff(old_path, old_contents,
88
                                new_path, new_contents,
89
                                self.to_file)
90
91
    def _get_file_mode(self, tree, path, kind, executable):
92
        if path is None:
93
            return None
94
        return object_mode(kind, executable)
95
96
    def _show_diff(self, specific_files, extra_trees):
97
        iterator = self.new_tree.iter_changes(self.old_tree,
98
                                               specific_files=specific_files,
99
                                               extra_trees=extra_trees,
100
                                               require_versioned=True)
101
        has_changes = 0
102
        def get_encoded_path(path):
103
            if path is not None:
104
                return path.encode(self.path_encoding, "replace")
105
        for (file_id, paths, changed_content, versioned, parent, name, kind,
106
             executable) in iterator:
107
            # The root does not get diffed, and items with no known kind (that
108
            # is, missing) in both trees are skipped as well.
109
            if parent == (None, None) or kind == (None, None):
110
                continue
111
            oldpath, newpath = paths
112
            oldpath_encoded = get_encoded_path(paths[0])
113
            newpath_encoded = get_encoded_path(paths[1])
114
            old_present = (kind[0] is not None and versioned[0])
115
            if old_present is not None:
116
                old_contents = self.old_tree.get_file(file_id).readlines()
117
            else:
118
                old_contents = None
119
            new_present = (kind[1] is not None and versioned[1])
120
            if new_present is not None:
121
                new_contents = self.new_tree.get_file(file_id).readlines()
122
            else:
123
                new_contents = None
124
            renamed = (parent[0], name[0]) != (parent[1], name[1])
125
            old_mode = self._get_file_mode(self.old_tree, oldpath_encoded, kind[0], executable[0])
126
            new_mode = self._get_file_mode(self.new_tree, newpath_encoded, kind[1], executable[1])
127
128
            self._write_contents_diff(oldpath_encoded, old_mode, old_contents, 
129
                                      newpath_encoded, new_mode, new_contents)
130
131
            has_changes = (changed_content or renamed)
132
133
        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.
134
135
136
class GitMergeDirective(merge_directive._BaseMergeDirective):
137
138
    def to_lines(self):
139
        return self.patch.splitlines(True)
140
141
    @classmethod
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
142
    def _generate_commit(cls, repository, revision_id, num, total):
143
        s = StringIO()
144
        store = get_object_store(repository)
145
        commit = store[store._lookup_revision_sha1(revision_id)]
146
        s.write("From %s %s\n" % (commit.id, time.ctime(commit.commit_time)))
147
        s.write("From: %s\n" % commit.author)
148
        s.write("Date: %s\n" % time.strftime("%a, %d %b %Y %H:%M:%S %Z"))
149
        s.write("Subject: [PATCH %d/%d] %s\n" % (num, total, commit.message))
150
        s.write("\n")
151
        s.write("---\n")
152
        s.write("TODO: Print diffstat\n")
153
        s.write("\n")
154
        try:
155
            lhs_parent = repository.get_revision(revision_id).parent_ids[0]
156
        except IndexError:
157
            lhs_parent = _mod_revision.NULL_REVISION
158
        tree_1 = repository.revision_tree(lhs_parent)
159
        tree_2 = repository.revision_tree(revision_id)
160
        differ = GitDiffTree.from_trees_options(tree_1, tree_2, s, 'utf8', None,
161
            'a/', 'b/', None)
162
        differ.show_diff(None, None)
163
        s.write("-- \n")
164
        s.write("bzr %s, bzr-git %d.%d.%d\n" % ((bzrlib.__version__, ) + bzr_git_version_info[:3]))
165
        summary = "%04d-%s" % (num, commit.message.splitlines()[0].replace(" ", "-"))
166
        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.
167
168
    @classmethod
169
    def from_objects(cls, repository, revision_id, time, timezone,
170
                     target_branch, local_target_branch=None,
171
                     public_branch=None, message=None):
0.238.8 by Jelmer Vernooij
include all revisions (even though they're serialized atm).
172
        patches = []
0.238.1 by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn.
173
        submit_branch = _mod_branch.Branch.open(target_branch)
174
        submit_branch.lock_read()
175
        try:
176
            submit_revision_id = submit_branch.last_revision()
177
            repository.fetch(submit_branch.repository, submit_revision_id)
0.238.8 by Jelmer Vernooij
include all revisions (even though they're serialized atm).
178
            graph = repository.get_graph()
179
            todo = graph.find_difference(submit_revision_id, revision_id)[1]
180
            total = len(todo)
181
            for i, revid in enumerate(graph.iter_topo_order(todo)):
182
                patches.append(cls._generate_commit(repository, revid, i+1, total))
0.238.1 by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn.
183
        finally:
184
            submit_branch.unlock()
185
        return cls(revision_id, None, time, timezone, target_branch,
0.238.8 by Jelmer Vernooij
include all revisions (even though they're serialized atm).
186
            "".join([patch for (summary, patch) in patches]), 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.
187
188
0.238.3 by Jelmer Vernooij
Remove svn references, prefer git send format when submitting changes against a git branch.
189
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.
190
              no_patch, no_bundle, message, base_revision_id):
191
    return GitMergeDirective.from_objects(
192
        branch.repository, revision_id, time.time(),
193
        osutils.local_time_offset(), submit_branch,
194
        public_branch=public_branch, message=message)