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
24
branch as _mod_branch,
28
revision as _mod_revision,
31
from bzrlib.plugins.git import (
32
version_info as bzr_git_version_info,
34
from bzrlib.plugins.git.mapping import (
37
from bzrlib.plugins.git.object_store import (
41
from cStringIO import StringIO
42
from dulwich.objects import (
47
class GitDiffTree(_mod_diff.DiffTree):
48
"""Provides a text representation between two trees, formatted for svn."""
50
def __init__(self, old_tree, new_tree, to_file, path_encoding='utf-8',
51
diff_text=None, extra_factories=None):
52
super(GitDiffTree, self).__init__(old_tree, new_tree, to_file, path_encoding,
53
diff_text, extra_factories)
55
def _write_file_mode(self, old_mode, new_mode):
56
if old_mode == new_mode:
58
if new_mode is not None:
59
if old_mode is not None:
60
self.to_file.write("old file mode %o\n" % old_mode)
61
self.to_file.write("new file mode %o\n" % new_mode)
63
self.to_file.write("deleted file mode %o\n" % old_mode)
65
def _get_rev(self, contents):
69
return Blob.from_string("".join(contents)).id[:7]
71
def _write_contents_diff(self, old_path, old_mode, old_contents, new_path, new_mode, new_contents):
73
old_path = "/dev/null"
75
old_path = "a/%s" % old_path
77
new_path = "/dev/null"
79
new_path = "b/%s" % new_path
80
self.to_file.write("diff --git %s %s\n" % (old_path, new_path))
81
self._write_file_mode(old_mode, new_mode)
82
old_rev = self._get_rev(old_contents)
83
new_rev = self._get_rev(new_contents)
84
self.to_file.write("index %s..%s %o\n" % (old_rev, new_rev, new_mode))
85
_mod_diff.internal_diff(old_path, old_contents,
86
new_path, new_contents,
89
def _get_file_mode(self, tree, path, kind, executable):
92
return object_mode(kind, executable)
94
def _show_diff(self, specific_files, extra_trees):
95
iterator = self.new_tree.iter_changes(self.old_tree,
96
specific_files=specific_files,
97
extra_trees=extra_trees,
98
require_versioned=True)
100
def get_encoded_path(path):
102
return path.encode(self.path_encoding, "replace")
103
for (file_id, paths, changed_content, versioned, parent, name, kind,
104
executable) in iterator:
105
# The root does not get diffed, and items with no known kind (that
106
# is, missing) in both trees are skipped as well.
107
if parent == (None, None) or kind == (None, None):
109
oldpath, newpath = paths
110
oldpath_encoded = get_encoded_path(paths[0])
111
newpath_encoded = get_encoded_path(paths[1])
112
old_present = (kind[0] is not None and versioned[0])
113
if old_present is not None:
114
old_contents = self.old_tree.get_file(file_id).readlines()
117
new_present = (kind[1] is not None and versioned[1])
118
if new_present is not None:
119
new_contents = self.new_tree.get_file(file_id).readlines()
122
renamed = (parent[0], name[0]) != (parent[1], name[1])
123
old_mode = self._get_file_mode(self.old_tree, oldpath_encoded, kind[0], executable[0])
124
new_mode = self._get_file_mode(self.new_tree, newpath_encoded, kind[1], executable[1])
126
self._write_contents_diff(oldpath_encoded, old_mode, old_contents,
127
newpath_encoded, new_mode, new_contents)
129
has_changes = (changed_content or renamed)
134
class GitMergeDirective(merge_directive._BaseMergeDirective):
137
return self.patch.splitlines(True)
140
def _generate_commit(cls, repository, revision_id, num, total):
142
store = get_object_store(repository)
143
commit = store[store._lookup_revision_sha1(revision_id)]
144
s.write("From %s %s\n" % (commit.id, time.ctime(commit.commit_time)))
145
s.write("From: %s\n" % commit.author)
146
s.write("Date: %s\n" % time.strftime("%a, %d %b %Y %H:%M:%S %Z"))
147
s.write("Subject: [PATCH %d/%d] %s\n" % (num, total, commit.message))
150
s.write("TODO: Print diffstat\n")
153
lhs_parent = repository.get_revision(revision_id).parent_ids[0]
155
lhs_parent = _mod_revision.NULL_REVISION
156
tree_1 = repository.revision_tree(lhs_parent)
157
tree_2 = repository.revision_tree(revision_id)
158
differ = GitDiffTree.from_trees_options(tree_1, tree_2, s, 'utf8', None,
160
differ.show_diff(None, None)
162
s.write("bzr %s, bzr-git %d.%d.%d\n" % ((bzrlib.__version__, ) + bzr_git_version_info[:3]))
163
summary = "%04d-%s" % (num, commit.message.splitlines()[0].replace(" ", "-"))
164
return summary, s.getvalue()
167
def from_objects(cls, repository, revision_id, time, timezone,
168
target_branch, local_target_branch=None,
169
public_branch=None, message=None):
171
submit_branch = _mod_branch.Branch.open(target_branch)
172
submit_branch.lock_read()
174
submit_revision_id = submit_branch.last_revision()
175
repository.fetch(submit_branch.repository, submit_revision_id)
176
graph = repository.get_graph()
177
todo = graph.find_difference(submit_revision_id, revision_id)[1]
179
for i, revid in enumerate(graph.iter_topo_order(todo)):
180
patches.append(cls._generate_commit(repository, revid, i+1, total))
182
submit_branch.unlock()
183
return cls(revision_id, None, time, timezone, target_branch,
184
"".join([patch for (summary, patch) in patches]), None, public_branch, message)
187
def send_git(branch, revision_id, submit_branch, public_branch,
188
no_patch, no_bundle, message, base_revision_id):
189
return GitMergeDirective.from_objects(
190
branch.repository, revision_id, time.time(),
191
osutils.local_time_offset(), submit_branch,
192
public_branch=public_branch, message=message)
added
removed
send.py
