1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
|
# This file is a modified copy of bzrtools' upstream_import.py, last changed in
# bzrtools 1.14.0.
"""Import upstream source into a branch"""
from contextlib import ExitStack
from io import BytesIO
from ...upstream_import import (
add_implied_parents,
common_directory,
do_directory,
names_of_files,
DirWrapper,
)
from ...bzr import generate_ids
from ...errors import BzrError
from ...osutils import (
file_iterator,
basename,
splitpath,
normpath,
is_inside_any,
)
from ...trace import warning
from ...tree import Tree
from ...transform import resolve_conflicts
class UnknownType(BzrError):
_fmt = 'Cannot extract "%(path)s" from archive as it is an unknown type.'
def __init__(self, path):
BzrError.__init__(self, path=path)
files_to_ignore = {
'.shelf', '.bzr', '.bzr.backup', '.bzrtags',
'.bzr-builddeb'}
def should_ignore(relative_path: str) -> bool:
parts = splitpath(relative_path)
if not parts:
return False
for part in parts:
if part in files_to_ignore:
return True
if part.endswith(',v'):
return True
def import_dir(
tree: Tree, dir: str, file_ids_from=None, target_tree=None,
exclude=None):
dir_input = BytesIO(dir.encode('utf-8'))
dir_input.seek(0)
dir_file = DirWrapper(dir_input)
if file_ids_from is None:
file_ids_from = []
with ExitStack() as es:
for other_tree in file_ids_from:
es.enter_context(other_tree.lock_read())
return _import_archive(
tree, dir_file, file_ids_from, target_tree=target_tree,
exclude=exclude)
def _get_paths_to_process(
archive_file: str, prefix,
implied_parents, exclude=None):
to_process = set()
for member in archive_file.getmembers():
if member.type == 'g':
# type 'g' is a header
continue
relative_path = member.name
relative_path = normpath(relative_path)
relative_path = relative_path.lstrip('/')
if prefix is not None:
relative_path = relative_path[len(prefix)+1:]
relative_path = relative_path.rstrip('/')
if relative_path == '' or relative_path == '.':
continue
if should_ignore(relative_path):
continue
if exclude and is_inside_any(exclude, relative_path):
continue
add_implied_parents(implied_parents, relative_path)
to_process.add((relative_path, member))
return to_process
def _import_archive(
tree: Tree, archive_file: str, file_ids_from,
target_tree=None, exclude=None):
prefix = common_directory(names_of_files(archive_file))
with tree.transform() as tt:
removed = set()
for path, entry in tree.iter_entries_by_dir():
if entry.parent_id is None:
continue
trans_id = tt.trans_id_tree_path(path)
tt.delete_contents(trans_id)
removed.add(path)
added = set()
implied_parents = set()
seen = set()
to_process = _get_paths_to_process(
archive_file, prefix, implied_parents, exclude=exclude)
renames = {}
if not tree.supports_setting_file_ids():
file_ids_from = []
# First we find the renames
other_trees = file_ids_from[:]
if target_tree is not None and tree.supports_setting_file_ids():
other_trees.insert(0, target_tree)
for other_tree in other_trees:
for relative_path, member in to_process:
trans_id = tt.trans_id_tree_path(relative_path)
existing_file_id = tt.tree_file_id(trans_id)
target_id = other_tree.path2id(relative_path)
if (target_id is not None
and target_id != existing_file_id
and target_id not in renames):
renames[target_id] = relative_path
# The we do the work
for relative_path, member in to_process:
trans_id = tt.trans_id_tree_path(relative_path)
added.add(relative_path.rstrip('/'))
# To handle renames, we need to not use the preserved file id,
# rather we need to lookup the file id in target_tree, if there is
# one. If there isn't, we should use the one in the current tree,
# and failing that we will allocate one. In this importer we want
# the target_tree to be authoritative about id2path, which is why
# we consult it first.
if tree.supports_setting_file_ids():
existing_file_id = tt.tree_file_id(trans_id)
# If we find an id that we know we are going to assign to
# different path as it has been renamed in one of the
# file_ids_from trees then we ignore the one in this tree.
if existing_file_id in renames:
if relative_path != renames[existing_file_id]:
existing_file_id = None
found_file_id = None
if target_tree is not None:
found_file_id = target_tree.path2id(relative_path)
if found_file_id in renames:
if renames[found_file_id] != relative_path:
found_file_id = None
if found_file_id is None and existing_file_id is None:
for other_tree in file_ids_from:
found_file_id = other_tree.path2id(relative_path)
if found_file_id is not None:
if found_file_id in renames:
if renames[found_file_id] != relative_path:
found_file_id = None
continue
break
if (found_file_id is not None
and found_file_id != existing_file_id):
# Found a specific file id in one of the source trees
tt.version_file(trans_id=trans_id, file_id=found_file_id)
if existing_file_id is not None:
# We need to remove the existing file so it can be
# replaced by the file (and file id) from the
# file_ids_from tree.
tt.delete_versioned(trans_id)
trans_id = tt.trans_id_file_id(found_file_id)
if not found_file_id and not existing_file_id:
# No file_id in any of the source trees and no file id in
# the base tree.
name = basename(member.name.rstrip('/'))
file_id = generate_ids.gen_file_id(name)
tt.version_file(file_id=file_id, trans_id=trans_id)
else:
tt.version_file(trans_id=trans_id)
path = tree.abspath(relative_path)
if member.name in seen:
if tt.final_kind(trans_id) == 'file':
tt.set_executability(None, trans_id)
tt.cancel_creation(trans_id)
seen.add(member.name)
if member.isreg():
tt.create_file(file_iterator(archive_file.extractfile(member)),
trans_id)
executable = (member.mode & 0o111) != 0
tt.set_executability(executable, trans_id)
elif member.isdir():
do_directory(tt, trans_id, tree, relative_path, path)
elif member.issym():
tt.create_symlink(member.linkname, trans_id)
else:
raise UnknownType(relative_path)
for relative_path in implied_parents.difference(added):
if relative_path == "":
continue
trans_id = tt.trans_id_tree_path(relative_path)
path = tree.abspath(relative_path)
do_directory(tt, trans_id, tree, relative_path, path)
if tt.tree_file_id(trans_id) is None:
found = False
for other_tree in file_ids_from:
with other_tree.lock_read():
if other_tree.has_filename(relative_path):
file_id = other_tree.path2id(relative_path)
if file_id is not None:
tt.version_file(
trans_id=trans_id, file_id=file_id)
found = True
break
if not found:
# Should this really use the trans_id as the
# file_id?
tt.version_file(trans_id=trans_id, file_id=trans_id)
added.add(relative_path)
for path in removed.difference(added):
tt.unversion_file(tt.trans_id_tree_path(path))
conflicts = tt.cook_conflicts(resolve_conflicts(tt))
for conflict in conflicts:
warning('%s', conflict)
tt.apply()
|
