1
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
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>
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.
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.
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
21
"""Support in "bzr send" for git-am style patches."""
26
branch as _mod_branch,
30
revision as _mod_revision,
33
from bzrlib.plugins.git import (
34
version_info as bzr_git_version_info,
36
from bzrlib.plugins.git.mapping import (
39
from bzrlib.plugins.git.object_store import (
43
from cStringIO import StringIO
44
from dulwich.objects import (
49
version_tail = "bzr %s, bzr-git %d.%d.%d" % (
50
(bzrlib.__version__, ) + bzr_git_version_info[:3])
53
class GitDiffTree(_mod_diff.DiffTree):
54
"""Provides a text representation between two trees, formatted for svn."""
56
def __init__(self, old_tree, new_tree, to_file, path_encoding='utf-8',
57
diff_text=None, extra_factories=None):
58
super(GitDiffTree, self).__init__(old_tree, new_tree, to_file,
59
path_encoding, diff_text, extra_factories)
61
def _write_contents_diff(self, old_path, old_mode, old_contents, new_path,
62
new_mode, new_contents):
63
from dulwich.patch import _blob_id, write_diff_file_header
64
old_rev = _blob_id(old_contents)
65
new_rev = _blob_id(new_contents)
66
write_diff_file_header(self.to_file,
67
(old_path, old_mode, old_rev), (new_path, new_mode, new_rev))
68
_mod_diff.internal_diff(old_path, old_contents,
69
new_path, new_contents,
72
def _get_file_mode(self, tree, path, kind, executable):
75
return object_mode(kind, executable)
77
def _show_diff(self, specific_files, extra_trees):
78
iterator = self.new_tree.iter_changes(self.old_tree,
79
specific_files=specific_files, extra_trees=extra_trees,
80
require_versioned=True)
82
def get_encoded_path(path):
84
return path.encode(self.path_encoding, "replace")
85
for (file_id, paths, changed_content, versioned, parent, name, kind,
86
executable) in iterator:
87
# The root does not get diffed, and items with no known kind (that
88
# is, missing) in both trees are skipped as well.
89
if parent == (None, None) or kind == (None, None):
91
oldpath, newpath = paths
92
oldpath_encoded = get_encoded_path(paths[0])
93
newpath_encoded = get_encoded_path(paths[1])
94
old_present = (kind[0] is not None and versioned[0])
95
if old_present is not None:
96
old_contents = self.old_tree.get_file(file_id).readlines()
99
new_present = (kind[1] is not None and versioned[1])
100
if new_present is not None:
101
new_contents = self.new_tree.get_file(file_id).readlines()
104
renamed = (parent[0], name[0]) != (parent[1], name[1])
105
old_mode = self._get_file_mode(self.old_tree, oldpath_encoded,
106
kind[0], executable[0])
107
new_mode = self._get_file_mode(self.new_tree, newpath_encoded,
108
kind[1], executable[1])
109
self._write_contents_diff(oldpath_encoded, old_mode, old_contents,
110
newpath_encoded, new_mode, new_contents)
111
has_changes = (changed_content or renamed)
115
class GitMergeDirective(merge_directive._BaseMergeDirective):
118
return self.patch.splitlines(True)
121
def _generate_commit(cls, repository, revision_id, num, total):
123
store = get_object_store(repository)
124
commit = store[store._lookup_revision_sha1(revision_id)]
125
from dulwich.patch import write_commit_patch, get_summary
127
lhs_parent = repository.get_revision(revision_id).parent_ids[0]
129
lhs_parent = _mod_revision.NULL_REVISION
130
tree_1 = repository.revision_tree(lhs_parent)
131
tree_2 = repository.revision_tree(revision_id)
132
contents = StringIO()
133
differ = GitDiffTree.from_trees_options(tree_1, tree_2,
134
contents, 'utf8', None, 'a/', 'b/', None)
135
differ.show_diff(None, None)
136
write_commit_patch(s, commit, contents.getvalue(), (num, total),
138
summary = "%04d-%s" % (num, get_summary(commit))
139
return summary, s.getvalue()
142
def from_objects(cls, repository, revision_id, time, timezone,
143
target_branch, local_target_branch=None,
144
public_branch=None, message=None):
146
submit_branch = _mod_branch.Branch.open(target_branch)
147
submit_branch.lock_read()
149
submit_revision_id = submit_branch.last_revision()
150
repository.fetch(submit_branch.repository, submit_revision_id)
151
graph = repository.get_graph()
152
todo = graph.find_difference(submit_revision_id, revision_id)[1]
154
for i, revid in enumerate(graph.iter_topo_order(todo)):
155
patches.append(cls._generate_commit(repository, revid, i+1,
158
submit_branch.unlock()
159
return cls(revision_id, None, time, timezone, target_branch,
160
"".join([patch for (summary, patch) in patches]),
161
None, public_branch, message)
164
def send_git(branch, revision_id, submit_branch, public_branch,
165
no_patch, no_bundle, message, base_revision_id):
166
return GitMergeDirective.from_objects(
167
branch.repository, revision_id, time.time(),
168
osutils.local_time_offset(), submit_branch,
169
public_branch=public_branch, message=message)
added
removed
send.py
