bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.358.2
by Jelmer Vernooij
Refresh copyright headers, add my email. |
1 |
# Copyright (C) 2009-2018 Jelmer Vernooij <jelmer@jelmer.uk>
|
0.238.1
by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn. |
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.
|
|
0.359.1
by Jelmer Vernooij
Fix headers to make brz GPL checker happy. |
11 |
#
|
0.238.1
by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn. |
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.
|
|
0.359.1
by Jelmer Vernooij
Fix headers to make brz GPL checker happy. |
16 |
#
|
0.238.1
by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn. |
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
|
|
0.358.1
by Jelmer Vernooij
Fix FSF address. |
19 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
0.238.1
by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn. |
20 |
|
7143.7.1
by Jelmer Vernooij
Simplify brz-git, drop imports. |
21 |
"""Support in "brz send" for git-am style patches."""
|
0.200.614
by Jelmer Vernooij
Add docstring. |
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 |
7143.7.1
by Jelmer Vernooij
Simplify brz-git, drop imports. |
24 |
from .. import __version__ as brz_version |
6986.2.1
by Jelmer Vernooij
Move breezy.plugins.git to breezy.git. |
25 |
from .. import ( |
0.238.1
by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn. |
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.200.628
by Jelmer Vernooij
Raise about impossible arguments in send --format=git. |
28 |
errors, |
0.238.1
by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn. |
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 |
||
6986.2.1
by Jelmer Vernooij
Move breezy.plugins.git to breezy.git. |
33 |
from ..merge_directive import BaseMergeDirective |
0.200.740
by Jelmer Vernooij
Implement to_files() for git merge directives. |
34 |
|
0.200.1641
by Jelmer Vernooij
Use relative imports where possible. |
35 |
from .mapping import ( |
0.238.6
by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git". |
36 |
object_mode, |
37 |
)
|
|
0.200.1641
by Jelmer Vernooij
Use relative imports where possible. |
38 |
from .object_store import ( |
0.238.6
by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git". |
39 |
get_object_store, |
40 |
)
|
|
41 |
||
6964.2.1
by Jelmer Vernooij
Initial work to support brz-git on python3. |
42 |
from io import BytesIO |
0.200.625
by Jelmer Vernooij
Include dulwich version in version tail. |
43 |
from dulwich import ( |
44 |
__version__ as dulwich_version, |
|
45 |
)
|
|
0.238.6
by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git". |
46 |
from dulwich.objects import ( |
47 |
Blob, |
|
48 |
)
|
|
49 |
||
50 |
||
7143.7.1
by Jelmer Vernooij
Simplify brz-git, drop imports. |
51 |
version_tail = "Breezy %s, dulwich %d.%d.%d" % ( |
52 |
(brz_version, ) + dulwich_version[:3]) |
|
0.200.623
by Jelmer Vernooij
Use more dulwich functions for writing patches. |
53 |
|
54 |
||
0.238.6
by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git". |
55 |
class GitDiffTree(_mod_diff.DiffTree): |
56 |
"""Provides a text representation between two trees, formatted for svn.""" |
|
57 |
||
58 |
def _show_diff(self, specific_files, extra_trees): |
|
0.200.624
by Jelmer Vernooij
Move more code to dulwich. |
59 |
from dulwich.patch import write_blob_diff |
7143.15.3
by Jelmer Vernooij
Fix pep8 issues in breezy.git. |
60 |
iterator = self.new_tree.iter_changes( |
61 |
self.old_tree, specific_files=specific_files, |
|
62 |
extra_trees=extra_trees, require_versioned=True) |
|
0.238.6
by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git". |
63 |
has_changes = 0 |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
64 |
|
0.238.6
by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git". |
65 |
def get_encoded_path(path): |
66 |
if path is not None: |
|
67 |
return path.encode(self.path_encoding, "replace") |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
68 |
|
0.200.626
by Jelmer Vernooij
Simplify send code a bit. |
69 |
def get_file_mode(tree, path, kind, executable): |
70 |
if path is None: |
|
0.200.738
by Jelmer Vernooij
Properly ignore directories when creating bundles, deal with new files. |
71 |
return 0 |
0.200.626
by Jelmer Vernooij
Simplify send code a bit. |
72 |
return object_mode(kind, executable) |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
73 |
|
0.285.1
by Jelmer Vernooij
Swap arguments for tree methods. |
74 |
def get_blob(present, tree, path): |
0.200.738
by Jelmer Vernooij
Properly ignore directories when creating bundles, deal with new files. |
75 |
if present: |
7027.4.11
by Jelmer Vernooij
Fix some tests that fail with -Werror. |
76 |
with tree.get_file(path) as f: |
77 |
return Blob.from_string(f.read()) |
|
0.200.626
by Jelmer Vernooij
Simplify send code a bit. |
78 |
else: |
79 |
return None |
|
80 |
trees = (self.old_tree, self.new_tree) |
|
7358.16.1
by Jelmer Vernooij
Don't make TreeChange tuple-like objects anymore, so we can add and remove attributes as necessary. |
81 |
for change in iterator: |
0.238.6
by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git". |
82 |
# The root does not get diffed, and items with no known kind (that
|
83 |
# is, missing) in both trees are skipped as well.
|
|
7358.16.1
by Jelmer Vernooij
Don't make TreeChange tuple-like objects anymore, so we can add and remove attributes as necessary. |
84 |
if change.parent_id == (None, None) or change.kind == (None, None): |
0.238.6
by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git". |
85 |
continue
|
7358.16.1
by Jelmer Vernooij
Don't make TreeChange tuple-like objects anymore, so we can add and remove attributes as necessary. |
86 |
path_encoded = (get_encoded_path(change.path[0]), |
87 |
get_encoded_path(change.path[1])) |
|
88 |
present = ((change.kind[0] not in (None, 'directory')), |
|
89 |
(change.kind[1] not in (None, 'directory'))) |
|
0.200.738
by Jelmer Vernooij
Properly ignore directories when creating bundles, deal with new files. |
90 |
if not present[0] and not present[1]: |
91 |
continue
|
|
7358.16.1
by Jelmer Vernooij
Don't make TreeChange tuple-like objects anymore, so we can add and remove attributes as necessary. |
92 |
contents = (get_blob(present[0], trees[0], change.path[0]), |
93 |
get_blob(present[1], trees[1], change.path[1])) |
|
94 |
renamed = (change.parent_id[0], change.name[0]) != (change.parent_id[1], change.name[1]) |
|
0.200.695
by Jelmer Vernooij
Clean up trailing whitespace. |
95 |
mode = (get_file_mode(trees[0], path_encoded[0], |
7358.16.1
by Jelmer Vernooij
Don't make TreeChange tuple-like objects anymore, so we can add and remove attributes as necessary. |
96 |
change.kind[0], change.executable[0]), |
0.200.695
by Jelmer Vernooij
Clean up trailing whitespace. |
97 |
get_file_mode(trees[1], path_encoded[1], |
7358.16.1
by Jelmer Vernooij
Don't make TreeChange tuple-like objects anymore, so we can add and remove attributes as necessary. |
98 |
change.kind[1], change.executable[1])) |
0.200.695
by Jelmer Vernooij
Clean up trailing whitespace. |
99 |
write_blob_diff(self.to_file, |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
100 |
(path_encoded[0], mode[0], contents[0]), |
101 |
(path_encoded[1], mode[1], contents[1])) |
|
7358.16.1
by Jelmer Vernooij
Don't make TreeChange tuple-like objects anymore, so we can add and remove attributes as necessary. |
102 |
has_changes |= (change.changed_content or renamed) |
0.238.6
by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git". |
103 |
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. |
104 |
|
105 |
||
0.200.1607
by Jelmer Vernooij
Cope with slashes in commit messages. |
106 |
def generate_patch_filename(num, summary): |
107 |
return "%04d-%s.patch" % (num, summary.replace("/", "_").rstrip(".")) |
|
108 |
||
109 |
||
0.200.740
by Jelmer Vernooij
Implement to_files() for git merge directives. |
110 |
class GitMergeDirective(BaseMergeDirective): |
111 |
||
112 |
multiple_output_files = True |
|
113 |
||
114 |
def __init__(self, revision_id, testament_sha1, time, timezone, |
|
115 |
target_branch, source_branch=None, message=None, |
|
0.200.1545
by Jelmer Vernooij
Some more test fixes. |
116 |
patches=None, local_target_branch=None): |
7143.15.3
by Jelmer Vernooij
Fix pep8 issues in breezy.git. |
117 |
super(GitMergeDirective, self).__init__( |
118 |
revision_id=revision_id, testament_sha1=testament_sha1, time=time, |
|
119 |
timezone=timezone, target_branch=target_branch, patch=None, |
|
120 |
source_branch=source_branch, message=message, bundle=None) |
|
0.200.740
by Jelmer Vernooij
Implement to_files() for git merge directives. |
121 |
self.patches = patches |
0.238.1
by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn. |
122 |
|
123 |
def to_lines(self): |
|
124 |
return self.patch.splitlines(True) |
|
125 |
||
0.200.740
by Jelmer Vernooij
Implement to_files() for git merge directives. |
126 |
def to_files(self): |
7406.1.1
by Jelmer Vernooij
Fix send with git. |
127 |
return ((summary, patch.splitlines(True)) for (summary, patch) in self.patches) |
0.200.740
by Jelmer Vernooij
Implement to_files() for git merge directives. |
128 |
|
0.238.1
by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn. |
129 |
@classmethod
|
7406.1.1
by Jelmer Vernooij
Fix send with git. |
130 |
def _generate_commit(cls, repository, revision_id, num, total, |
131 |
context=_mod_diff.DEFAULT_CONTEXT_AMOUNT): |
|
6964.2.1
by Jelmer Vernooij
Initial work to support brz-git on python3. |
132 |
s = BytesIO() |
0.238.6
by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git". |
133 |
store = get_object_store(repository) |
0.200.1788
by Jelmer Vernooij
Use context managers. |
134 |
with store.lock_read(): |
7406.1.1
by Jelmer Vernooij
Fix send with git. |
135 |
commit = store[repository.lookup_bzr_revision_id(revision_id)[0]] |
0.200.623
by Jelmer Vernooij
Use more dulwich functions for writing patches. |
136 |
from dulwich.patch import write_commit_patch, get_summary |
0.238.6
by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git". |
137 |
try: |
138 |
lhs_parent = repository.get_revision(revision_id).parent_ids[0] |
|
139 |
except IndexError: |
|
140 |
lhs_parent = _mod_revision.NULL_REVISION |
|
141 |
tree_1 = repository.revision_tree(lhs_parent) |
|
142 |
tree_2 = repository.revision_tree(revision_id) |
|
6964.2.1
by Jelmer Vernooij
Initial work to support brz-git on python3. |
143 |
contents = BytesIO() |
7143.15.3
by Jelmer Vernooij
Fix pep8 issues in breezy.git. |
144 |
differ = GitDiffTree.from_trees_options( |
7406.1.1
by Jelmer Vernooij
Fix send with git. |
145 |
tree_1, tree_2, contents, 'utf8', None, 'a/', 'b/', None, |
146 |
context_lines=context) |
|
0.238.6
by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git". |
147 |
differ.show_diff(None, None) |
0.200.695
by Jelmer Vernooij
Clean up trailing whitespace. |
148 |
write_commit_patch(s, commit, contents.getvalue(), (num, total), |
0.200.623
by Jelmer Vernooij
Use more dulwich functions for writing patches. |
149 |
version_tail) |
0.200.1607
by Jelmer Vernooij
Cope with slashes in commit messages. |
150 |
summary = generate_patch_filename(num, get_summary(commit)) |
0.238.6
by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git". |
151 |
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. |
152 |
|
153 |
@classmethod
|
|
154 |
def from_objects(cls, repository, revision_id, time, timezone, |
|
155 |
target_branch, local_target_branch=None, |
|
156 |
public_branch=None, message=None): |
|
0.238.8
by Jelmer Vernooij
include all revisions (even though they're serialized atm). |
157 |
patches = [] |
0.238.1
by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn. |
158 |
submit_branch = _mod_branch.Branch.open(target_branch) |
0.200.1788
by Jelmer Vernooij
Use context managers. |
159 |
with submit_branch.lock_read(): |
0.238.1
by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn. |
160 |
submit_revision_id = submit_branch.last_revision() |
161 |
repository.fetch(submit_branch.repository, submit_revision_id) |
|
0.238.8
by Jelmer Vernooij
include all revisions (even though they're serialized atm). |
162 |
graph = repository.get_graph() |
163 |
todo = graph.find_difference(submit_revision_id, revision_id)[1] |
|
164 |
total = len(todo) |
|
165 |
for i, revid in enumerate(graph.iter_topo_order(todo)): |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
166 |
patches.append(cls._generate_commit(repository, revid, i + 1, |
167 |
total)) |
|
0.200.740
by Jelmer Vernooij
Implement to_files() for git merge directives. |
168 |
return cls(revision_id, None, time, timezone, |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
169 |
target_branch=target_branch, source_branch=public_branch, |
170 |
message=message, patches=patches) |
|
0.238.1
by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn. |
171 |
|
172 |
||
7143.15.3
by Jelmer Vernooij
Fix pep8 issues in breezy.git. |
173 |
def send_git(branch, revision_id, submit_branch, public_branch, no_patch, |
174 |
no_bundle, message, base_revision_id, local_target_branch=None): |
|
0.200.628
by Jelmer Vernooij
Raise about impossible arguments in send --format=git. |
175 |
if no_patch: |
7490.61.1
by Jelmer Vernooij
Rename BzrCommandError to CommandError. |
176 |
raise errors.CommandError( |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
177 |
"no patch not supported for git-am style patches") |
0.200.628
by Jelmer Vernooij
Raise about impossible arguments in send --format=git. |
178 |
if no_bundle: |
7490.61.1
by Jelmer Vernooij
Rename BzrCommandError to CommandError. |
179 |
raise errors.CommandError( |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
180 |
"no bundle not supported for git-am style patches") |
0.238.1
by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn. |
181 |
return GitMergeDirective.from_objects( |
182 |
branch.repository, revision_id, time.time(), |
|
183 |
osutils.local_time_offset(), submit_branch, |
|
0.200.1545
by Jelmer Vernooij
Some more test fixes. |
184 |
public_branch=public_branch, message=message, |
185 |
local_target_branch=local_target_branch) |