| Server IP : 217.160.0.36 / Your IP : 216.73.216.190 Web Server : Apache System : Linux info 3.0 #1337 SMP Tue Jan 01 00:00:00 CEST 2000 all GNU/Linux User : u90690018 ( 2806576) PHP Version : 8.4.27 Disable Function : NONE MySQL : OFF | cURL : ON | WGET : ON | Perl : ON | Python : OFF | Sudo : OFF | Pkexec : OFF Directory : /kunden/proc/thread-self/root/proc/self/root/lib/python3/dist-packages/breezy/git/ |
Upload File : |
# Copyright (C) 2009-2018 Jelmer Vernooij <jelmer@jelmer.uk>
# Based on the original from bzr-svn:
# Copyright (C) 2009 Lukas Lalinsky <lalinsky@gmail.com>
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
"""Support in "brz send" for git-am style patches."""
import time
from io import BytesIO
from dulwich import __version__ as dulwich_version
from dulwich.objects import Blob
from .. import __version__ as brz_version
from .. import branch as _mod_branch
from .. import diff as _mod_diff
from .. import errors, osutils
from .. import revision as _mod_revision
from ..merge_directive import BaseMergeDirective
from .mapping import object_mode
from .object_store import get_object_store
version_tail = "Breezy %s, dulwich %d.%d.%d" % ((brz_version,) + dulwich_version[:3])
class GitDiffTree(_mod_diff.DiffTree):
"""Provides a text representation between two trees, formatted for svn."""
def _show_diff(self, specific_files, extra_trees):
from dulwich.patch import write_blob_diff
iterator = self.new_tree.iter_changes(
self.old_tree,
specific_files=specific_files,
extra_trees=extra_trees,
require_versioned=True,
)
has_changes = 0
def get_encoded_path(path):
if path is not None:
return path.encode(self.path_encoding, "replace")
def get_file_mode(tree, path, kind, executable):
if path is None:
return 0
return object_mode(kind, executable)
def get_blob(present, tree, path):
if present:
with tree.get_file(path) as f:
return Blob.from_string(f.read())
else:
return None
trees = (self.old_tree, self.new_tree)
for change in iterator:
# The root does not get diffed, and items with no known kind (that
# is, missing) in both trees are skipped as well.
if change.parent_id == (None, None) or change.kind == (None, None):
continue
path_encoded = (
get_encoded_path(change.path[0]),
get_encoded_path(change.path[1]),
)
present = (
(change.kind[0] not in (None, "directory")),
(change.kind[1] not in (None, "directory")),
)
if not present[0] and not present[1]:
continue
contents = (
get_blob(present[0], trees[0], change.path[0]),
get_blob(present[1], trees[1], change.path[1]),
)
renamed = (change.parent_id[0], change.name[0]) != (
change.parent_id[1],
change.name[1],
)
mode = (
get_file_mode(
trees[0], path_encoded[0], change.kind[0], change.executable[0]
),
get_file_mode(
trees[1], path_encoded[1], change.kind[1], change.executable[1]
),
)
write_blob_diff(
self.to_file,
(path_encoded[0], mode[0], contents[0]),
(path_encoded[1], mode[1], contents[1]),
)
has_changes |= change.changed_content or renamed
return has_changes
def generate_patch_filename(num, summary):
return "%04d-%s.patch" % (num, summary.replace("/", "_").rstrip("."))
class GitMergeDirective(BaseMergeDirective):
multiple_output_files = True
def __init__(
self,
revision_id,
testament_sha1,
time,
timezone,
target_branch,
source_branch=None,
message=None,
patches=None,
local_target_branch=None,
):
super().__init__(
revision_id=revision_id,
testament_sha1=testament_sha1,
time=time,
timezone=timezone,
target_branch=target_branch,
patch=None,
source_branch=source_branch,
message=message,
bundle=None,
)
self.patches = patches
def to_lines(self):
return self.patch.splitlines(True)
def to_files(self):
return ((summary, patch.splitlines(True)) for (summary, patch) in self.patches)
@classmethod
def _generate_commit(
cls,
repository,
revision_id,
num,
total,
context=_mod_diff.DEFAULT_CONTEXT_AMOUNT,
):
s = BytesIO()
store = get_object_store(repository)
with store.lock_read():
commit = store[repository.lookup_bzr_revision_id(revision_id)[0]]
from dulwich.patch import get_summary, write_commit_patch
try:
lhs_parent = repository.get_revision(revision_id).parent_ids[0]
except IndexError:
lhs_parent = _mod_revision.NULL_REVISION
tree_1 = repository.revision_tree(lhs_parent)
tree_2 = repository.revision_tree(revision_id)
contents = BytesIO()
differ = GitDiffTree.from_trees_options(
tree_1,
tree_2,
contents,
"utf8",
None,
"a/",
"b/",
None,
context_lines=context,
)
differ.show_diff(None, None)
write_commit_patch(s, commit, contents.getvalue(), (num, total), version_tail)
summary = generate_patch_filename(num, get_summary(commit))
return summary, s.getvalue()
@classmethod
def from_objects(
cls,
repository,
revision_id,
time,
timezone,
target_branch,
local_target_branch=None,
public_branch=None,
message=None,
):
patches = []
submit_branch = _mod_branch.Branch.open(target_branch)
with submit_branch.lock_read():
submit_revision_id = submit_branch.last_revision()
repository.fetch(submit_branch.repository, submit_revision_id)
graph = repository.get_graph()
todo = graph.find_difference(submit_revision_id, revision_id)[1]
total = len(todo)
for i, revid in enumerate(graph.iter_topo_order(todo)):
patches.append(cls._generate_commit(repository, revid, i + 1, total))
return cls(
revision_id,
None,
time,
timezone,
target_branch=target_branch,
source_branch=public_branch,
message=message,
patches=patches,
)
def send_git(
branch,
revision_id,
submit_branch,
public_branch,
no_patch,
no_bundle,
message,
base_revision_id,
local_target_branch=None,
):
if no_patch:
raise errors.CommandError("no patch not supported for git-am style patches")
if no_bundle:
raise errors.CommandError("no bundle not supported for git-am style patches")
return GitMergeDirective.from_objects(
branch.repository,
revision_id,
time.time(),
osutils.local_time_offset(),
submit_branch,
public_branch=public_branch,
message=message,
local_target_branch=local_target_branch,
)