/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 send.py

  • Committer: Robert Collins
  • Date: 2010-05-06 07:48:22 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506074822-0bsgf2j4h8jx0xkk
Added ``bzrlib.tests.matchers`` as a place to put matchers, along with
our first in-tree matcher. See the module docstring for details.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
send.py
1
 
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
2
 
 
3
 
# Based on the original from bzr-svn:
4
 
# Copyright (C) 2009 Lukas Lalinsky <lalinsky@gmail.com>
5
 
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
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
 
 
21
 
"""Support in "bzr send" for git-am style patches."""
22
 
 
23
 
import time
24
 
import bzrlib
25
 
from bzrlib import (
26
 
    branch as _mod_branch,
27
 
    diff as _mod_diff,
28
 
    errors,
29
 
    merge_directive,
30
 
    osutils,
31
 
    revision as _mod_revision,
32
 
    )
33
 
 
34
 
from bzrlib.plugins.git import (
35
 
    version_info as bzr_git_version_info,
36
 
    )
37
 
from bzrlib.plugins.git.mapping import (
38
 
    object_mode,
39
 
    )
40
 
from bzrlib.plugins.git.object_store import (
41
 
    get_object_store,
42
 
    )
43
 
 
44
 
from cStringIO import StringIO
45
 
from dulwich import (
46
 
    __version__ as dulwich_version,
47
 
    )
48
 
from dulwich.objects import (
49
 
    Blob,
50
 
    )
51
 
 
52
 
 
53
 
version_tail = "bzr %s, bzr-git %d.%d.%d, dulwich %d.%d.%d" % (
54
 
    (bzrlib.__version__, ) + bzr_git_version_info[:3] + dulwich_version[:3])
55
 
 
56
 
 
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):
61
 
        from dulwich.patch import write_blob_diff
62
 
        iterator = self.new_tree.iter_changes(self.old_tree,
63
 
            specific_files=specific_files, extra_trees=extra_trees,
64
 
            require_versioned=True)
65
 
        has_changes = 0
66
 
        def get_encoded_path(path):
67
 
            if path is not None:
68
 
                return path.encode(self.path_encoding, "replace")
69
 
        def get_file_mode(tree, path, kind, executable):
70
 
            if path is None:
71
 
                return None
72
 
            return object_mode(kind, executable)
73
 
        def get_blob(present, tree, file_id):
74
 
            if present is not None:
75
 
                return Blob.from_string(tree.get_file(file_id).read())
76
 
            else:
77
 
                return None
78
 
        trees = (self.old_tree, self.new_tree)
79
 
        for (file_id, paths, changed_content, versioned, parent, name, kind,
80
 
             executable) in iterator:
81
 
            # The root does not get diffed, and items with no known kind (that
82
 
            # is, missing) in both trees are skipped as well.
83
 
            if parent == (None, None) or kind == (None, None):
84
 
                continue
85
 
            path_encoded = (get_encoded_path(paths[0]), 
86
 
                            get_encoded_path(paths[1]))
87
 
            present = ((kind[0] is not None and versioned[0]),
88
 
                       (kind[1] is not None and versioned[1]))
89
 
            contents = (get_blob(present[0], trees[0], file_id),
90
 
                        get_blob(present[1], trees[1], file_id))
91
 
            renamed = (parent[0], name[0]) != (parent[1], name[1])
92
 
            mode = (get_file_mode(trees[0], path_encoded[0], 
93
 
                                  kind[0], executable[0]), 
94
 
                    get_file_mode(trees[1], path_encoded[1], 
95
 
                                  kind[1], executable[1]))
96
 
            write_blob_diff(self.to_file, 
97
 
                (path_encoded[0], mode[0], contents[0]), 
98
 
                (path_encoded[1], mode[1], contents[1]))
99
 
            has_changes |= (changed_content or renamed)
100
 
        return has_changes
101
 
 
102
 
 
103
 
class GitMergeDirective(merge_directive._BaseMergeDirective):
104
 
 
105
 
    def to_lines(self):
106
 
        return self.patch.splitlines(True)
107
 
 
108
 
    @classmethod
109
 
    def _generate_commit(cls, repository, revision_id, num, total):
110
 
        s = StringIO()
111
 
        store = get_object_store(repository)
112
 
        commit = store[store._lookup_revision_sha1(revision_id)]
113
 
        from dulwich.patch import write_commit_patch, get_summary
114
 
        try:
115
 
            lhs_parent = repository.get_revision(revision_id).parent_ids[0]
116
 
        except IndexError:
117
 
            lhs_parent = _mod_revision.NULL_REVISION
118
 
        tree_1 = repository.revision_tree(lhs_parent)
119
 
        tree_2 = repository.revision_tree(revision_id)
120
 
        contents = StringIO()
121
 
        differ = GitDiffTree.from_trees_options(tree_1, tree_2, 
122
 
                contents, 'utf8', None, 'a/', 'b/', None)
123
 
        differ.show_diff(None, None)
124
 
        write_commit_patch(s, commit, contents.getvalue(), (num, total), 
125
 
                           version_tail)
126
 
        summary = "%04d-%s" % (num, get_summary(commit))
127
 
        return summary, s.getvalue()
128
 
 
129
 
    @classmethod
130
 
    def from_objects(cls, repository, revision_id, time, timezone,
131
 
                     target_branch, local_target_branch=None,
132
 
                     public_branch=None, message=None):
133
 
        patches = []
134
 
        submit_branch = _mod_branch.Branch.open(target_branch)
135
 
        submit_branch.lock_read()
136
 
        try:
137
 
            submit_revision_id = submit_branch.last_revision()
138
 
            repository.fetch(submit_branch.repository, submit_revision_id)
139
 
            graph = repository.get_graph()
140
 
            todo = graph.find_difference(submit_revision_id, revision_id)[1]
141
 
            total = len(todo)
142
 
            for i, revid in enumerate(graph.iter_topo_order(todo)):
143
 
                patches.append(cls._generate_commit(repository, revid, i+1, 
144
 
                                                    total))
145
 
        finally:
146
 
            submit_branch.unlock()
147
 
        return cls(revision_id, None, time, timezone, target_branch, 
148
 
            "".join([patch for (summary, patch) in patches]), 
149
 
            None, public_branch, message)
150
 
 
151
 
 
152
 
def send_git(branch, revision_id, submit_branch, public_branch, no_patch, 
153
 
             no_bundle, message, base_revision_id):
154
 
    if no_patch:
155
 
        raise errors.BzrCommandError("no patch not supported for git-am style patches")
156
 
    if no_bundle:
157
 
        raise errors.BzrCommandError("no bundle not supported for git-am style patches")
158
 
    return GitMergeDirective.from_objects(
159
 
        branch.repository, revision_id, time.time(),
160
 
        osutils.local_time_offset(), submit_branch,
161
 
        public_branch=public_branch, message=message)