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) 2008-2018 Jelmer Vernooij <jelmer@jelmer.uk>
|
0.200.90
by Jelmer Vernooij
Basic support for opening working trees. |
2 |
#
|
3 |
# This program is free software; you can redistribute it and/or modify
|
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
7 |
#
|
|
8 |
# This program is distributed in the hope that it will be useful,
|
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
12 |
#
|
|
13 |
# You should have received a copy of the GNU General Public License
|
|
14 |
# along with this program; if not, write to the Free Software
|
|
0.358.1
by Jelmer Vernooij
Fix FSF address. |
15 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
0.200.90
by Jelmer Vernooij
Basic support for opening working trees. |
16 |
|
0.200.381
by Jelmer Vernooij
Support working trees properly, status and ls. |
17 |
|
0.200.90
by Jelmer Vernooij
Basic support for opening working trees. |
18 |
"""An adapter between a Git index and a Bazaar Working Tree"""
|
19 |
||
0.200.1594
by Jelmer Vernooij
Use absolute_import everywhere. |
20 |
from __future__ import absolute_import |
0.200.381
by Jelmer Vernooij
Support working trees properly, status and ls. |
21 |
|
0.200.1731
by Jelmer Vernooij
Add support for checking untracked changes. |
22 |
import itertools |
0.200.1210
by Jelmer Vernooij
Implement GitWorkingTree._walkdirs. |
23 |
from collections import defaultdict |
0.239.4
by Jelmer Vernooij
Cope with nonexistent files and directories in get_file_sha1. |
24 |
import errno |
0.200.1655
by Jelmer Vernooij
Basic support for git ignores. |
25 |
from dulwich.ignore import ( |
0.200.1658
by Jelmer Vernooij
Fix handling of ignores - return patterns that matched. |
26 |
IgnoreFilterManager, |
0.200.1655
by Jelmer Vernooij
Basic support for git ignores. |
27 |
)
|
0.415.2
by Jelmer Vernooij
Write index manually. |
28 |
from dulwich.file import GitFile, FileLocked |
0.200.1096
by Jelmer Vernooij
Implement GitWorkingTreeFormat.initialize. |
29 |
from dulwich.index import ( |
30 |
Index, |
|
0.415.2
by Jelmer Vernooij
Write index manually. |
31 |
SHA1Writer, |
0.371.1
by Jelmer Vernooij
Implement WorkingTree.reset_state(). |
32 |
build_index_from_tree, |
0.200.1531
by Jelmer Vernooij
Don't trust index contents - verify against file timestamps. |
33 |
changes_from_tree, |
0.391.6
by Jelmer Vernooij
Directly call index_entry_from_path. |
34 |
index_entry_from_path, |
0.200.1531
by Jelmer Vernooij
Don't trust index contents - verify against file timestamps. |
35 |
index_entry_from_stat, |
0.391.5
by Jelmer Vernooij
Use iter_fresh_entries directly. |
36 |
iter_fresh_entries, |
0.369.1
by Jelmer Vernooij
Implement conflict handling. |
37 |
FLAG_STAGEMASK, |
0.429.10
by Jelmer Vernooij
use new read_submodule_head from dulwich. |
38 |
read_submodule_head, |
0.373.1
by Jelmer Vernooij
Fix WorkingTree.reset_state(). |
39 |
validate_path, |
0.415.2
by Jelmer Vernooij
Write index manually. |
40 |
write_index_dict, |
0.200.1096
by Jelmer Vernooij
Implement GitWorkingTreeFormat.initialize. |
41 |
)
|
0.200.1202
by Jelmer Vernooij
Implement has_or_had_id. |
42 |
from dulwich.object_store import ( |
43 |
tree_lookup_path, |
|
44 |
)
|
|
0.200.383
by Jelmer Vernooij
Simplify, support rewriting index based on inventory. |
45 |
from dulwich.objects import ( |
46 |
Blob, |
|
0.357.1
by Jelmer Vernooij
Fix some remove tests. |
47 |
Tree, |
0.200.1538
by Jelmer Vernooij
More work on tree-reference support. |
48 |
S_IFGITLINK, |
0.373.1
by Jelmer Vernooij
Fix WorkingTree.reset_state(). |
49 |
S_ISGITLINK, |
0.429.5
by Jelmer Vernooij
Fix tree_content_summary test. |
50 |
ZERO_SHA, |
51 |
)
|
|
52 |
from dulwich.repo import ( |
|
53 |
NotGitRepository, |
|
54 |
Repo as GitRepo, |
|
55 |
)
|
|
0.200.90
by Jelmer Vernooij
Basic support for opening working trees. |
56 |
import os |
0.264.10
by Jelmer Vernooij
Yield inventory entries. |
57 |
import posixpath |
0.200.1655
by Jelmer Vernooij
Basic support for git ignores. |
58 |
import re |
0.200.384
by Jelmer Vernooij
Fix reading of inventory from index. |
59 |
import stat |
0.200.1215
by Jelmer Vernooij
Implement GitWorkingTree.remove. |
60 |
import sys |
0.200.90
by Jelmer Vernooij
Basic support for opening working trees. |
61 |
|
0.200.1641
by Jelmer Vernooij
Use relative imports where possible. |
62 |
from ... import ( |
0.369.1
by Jelmer Vernooij
Implement conflict handling. |
63 |
conflicts as _mod_conflicts, |
0.200.382
by Jelmer Vernooij
Support flushing index. |
64 |
errors, |
0.200.1752
by Jelmer Vernooij
Don't traverse nested trees in WorkingTree.smart_add. |
65 |
controldir as _mod_controldir, |
0.200.1655
by Jelmer Vernooij
Basic support for git ignores. |
66 |
globbing, |
0.200.409
by Jelmer Vernooij
Support parsing .gitignore. |
67 |
ignores, |
0.200.1476
by Jelmer Vernooij
Cope with working tree refactoring. |
68 |
lock, |
0.380.1
by Jelmer Vernooij
Implement WorkingTree.pull. |
69 |
merge, |
0.200.381
by Jelmer Vernooij
Support working trees properly, status and ls. |
70 |
osutils, |
0.200.1720
by Jelmer Vernooij
Fix handling of pending merges. |
71 |
revision as _mod_revision, |
0.200.1215
by Jelmer Vernooij
Implement GitWorkingTree.remove. |
72 |
trace, |
0.200.1752
by Jelmer Vernooij
Don't traverse nested trees in WorkingTree.smart_add. |
73 |
transport as _mod_transport, |
0.200.519
by Jelmer Vernooij
Move imports down, might not be available in older bzr-git versions. |
74 |
tree, |
0.200.90
by Jelmer Vernooij
Basic support for opening working trees. |
75 |
workingtree, |
76 |
)
|
|
0.383.1
by Jelmer Vernooij
Fix a bunch of locking issues. |
77 |
from ...decorators import ( |
78 |
only_raises, |
|
79 |
)
|
|
0.200.1648
by Jelmer Vernooij
Fix compatibility with newer versions of breezy. |
80 |
from ...bzr import ( |
81 |
inventory, |
|
82 |
)
|
|
0.200.1680
by Jelmer Vernooij
Fix repo locks. |
83 |
from ...mutabletree import ( |
0.429.2
by Jelmer Vernooij
Some more work on submodule support. |
84 |
BadReferenceTarget, |
0.200.1680
by Jelmer Vernooij
Fix repo locks. |
85 |
MutableTree, |
86 |
)
|
|
0.200.1641
by Jelmer Vernooij
Use relative imports where possible. |
87 |
|
88 |
||
89 |
from .dir import ( |
|
0.200.1096
by Jelmer Vernooij
Implement GitWorkingTreeFormat.initialize. |
90 |
LocalGitDir, |
91 |
)
|
|
0.200.1641
by Jelmer Vernooij
Use relative imports where possible. |
92 |
from .tree import ( |
0.360.1
by Jelmer Vernooij
Implement GitMemoryTree. |
93 |
MutableGitIndexTree, |
0.200.617
by Jelmer Vernooij
Add custom InterTree for use between git revision trees. |
94 |
)
|
0.200.1641
by Jelmer Vernooij
Use relative imports where possible. |
95 |
from .mapping import ( |
0.200.971
by Chadrik
Fix 'bzr status' after 'bzr add' in native git working trees. |
96 |
GitFileIdMap, |
0.264.10
by Jelmer Vernooij
Yield inventory entries. |
97 |
mode_kind, |
0.200.971
by Chadrik
Fix 'bzr status' after 'bzr add' in native git working trees. |
98 |
)
|
0.200.90
by Jelmer Vernooij
Basic support for opening working trees. |
99 |
|
0.200.409
by Jelmer Vernooij
Support parsing .gitignore. |
100 |
IGNORE_FILENAME = ".gitignore" |
101 |
||
102 |
||
0.360.1
by Jelmer Vernooij
Implement GitMemoryTree. |
103 |
class GitWorkingTree(MutableGitIndexTree,workingtree.WorkingTree): |
0.200.90
by Jelmer Vernooij
Basic support for opening working trees. |
104 |
"""A Git working tree.""" |
105 |
||
0.415.3
by Jelmer Vernooij
Open index on demand. |
106 |
def __init__(self, controldir, repo, branch): |
0.360.1
by Jelmer Vernooij
Implement GitMemoryTree. |
107 |
MutableGitIndexTree.__init__(self) |
0.200.1741
by Jelmer Vernooij
Fix opentree tests. |
108 |
basedir = controldir.root_transport.local_abspath('.') |
109 |
self.basedir = osutils.realpath(basedir) |
|
0.200.1648
by Jelmer Vernooij
Fix compatibility with newer versions of breezy. |
110 |
self.controldir = controldir |
0.200.90
by Jelmer Vernooij
Basic support for opening working trees. |
111 |
self.repository = repo |
0.200.1205
by Jelmer Vernooij
Implement GitWorkingTree.stored_kind. |
112 |
self.store = self.repository._git.object_store |
0.200.384
by Jelmer Vernooij
Fix reading of inventory from index. |
113 |
self.mapping = self.repository.get_mapping() |
0.200.90
by Jelmer Vernooij
Basic support for opening working trees. |
114 |
self._branch = branch |
0.200.1648
by Jelmer Vernooij
Fix compatibility with newer versions of breezy. |
115 |
self._transport = controldir.transport |
0.200.90
by Jelmer Vernooij
Basic support for opening working trees. |
116 |
self._format = GitWorkingTreeFormat() |
0.415.3
by Jelmer Vernooij
Open index on demand. |
117 |
self.index = None |
0.415.4
by Jelmer Vernooij
proper locking on index. |
118 |
self._index_file = None |
0.200.239
by Jelmer Vernooij
Provide views. |
119 |
self.views = self._make_views() |
0.200.1173
by Jelmer Vernooij
Provide GitWorkingTree._rules_searcher. |
120 |
self._rules_searcher = None |
0.200.381
by Jelmer Vernooij
Support working trees properly, status and ls. |
121 |
self._detect_case_handling() |
0.200.1202
by Jelmer Vernooij
Implement has_or_had_id. |
122 |
self._reset_data() |
0.200.1476
by Jelmer Vernooij
Cope with working tree refactoring. |
123 |
|
0.200.1650
by Jelmer Vernooij
Implement GitWorkingTree.supports_tree_reference. |
124 |
def supports_tree_reference(self): |
0.429.2
by Jelmer Vernooij
Some more work on submodule support. |
125 |
return True |
0.200.1650
by Jelmer Vernooij
Implement GitWorkingTree.supports_tree_reference. |
126 |
|
0.349.1
by Jelmer Vernooij
Support supports_rename_tracking method. |
127 |
def supports_rename_tracking(self): |
128 |
return False |
|
129 |
||
0.415.3
by Jelmer Vernooij
Open index on demand. |
130 |
def _read_index(self): |
131 |
self.index = Index(self.control_transport.local_abspath('index')) |
|
132 |
self._index_dirty = False |
|
133 |
||
0.200.1476
by Jelmer Vernooij
Cope with working tree refactoring. |
134 |
def lock_read(self): |
135 |
"""Lock the repository for read operations. |
|
136 |
||
0.200.1646
by Jelmer Vernooij
Rename bzrlib to breezy. |
137 |
:return: A breezy.lock.LogicalLockResult.
|
0.200.1476
by Jelmer Vernooij
Cope with working tree refactoring. |
138 |
"""
|
139 |
if not self._lock_mode: |
|
140 |
self._lock_mode = 'r' |
|
141 |
self._lock_count = 1 |
|
0.415.3
by Jelmer Vernooij
Open index on demand. |
142 |
self._read_index() |
0.200.1476
by Jelmer Vernooij
Cope with working tree refactoring. |
143 |
else: |
144 |
self._lock_count += 1 |
|
145 |
self.branch.lock_read() |
|
146 |
return lock.LogicalLockResult(self.unlock) |
|
147 |
||
0.383.1
by Jelmer Vernooij
Fix a bunch of locking issues. |
148 |
def _lock_write_tree(self): |
149 |
# TODO(jelmer): Actually create index.lock
|
|
150 |
if not self._lock_mode: |
|
151 |
self._lock_mode = 'w' |
|
152 |
self._lock_count = 1 |
|
0.415.4
by Jelmer Vernooij
proper locking on index. |
153 |
try: |
0.415.5
by Jelmer Vernooij
Don't flush, just wait for unlock. |
154 |
self._index_file = GitFile(self.control_transport.local_abspath('index'), 'wb') |
0.415.4
by Jelmer Vernooij
proper locking on index. |
155 |
except FileLocked: |
156 |
raise errors.LockContention('index') |
|
0.415.3
by Jelmer Vernooij
Open index on demand. |
157 |
self._read_index() |
0.383.1
by Jelmer Vernooij
Fix a bunch of locking issues. |
158 |
elif self._lock_mode == 'r': |
159 |
raise errors.ReadOnlyError(self) |
|
160 |
else: |
|
161 |
self._lock_count +=1 |
|
162 |
||
0.200.1477
by Jelmer Vernooij
Implement GitWorkingTree.lock_tree_write. |
163 |
def lock_tree_write(self): |
164 |
self.branch.lock_read() |
|
0.383.1
by Jelmer Vernooij
Fix a bunch of locking issues. |
165 |
try: |
166 |
self._lock_write_tree() |
|
167 |
return lock.LogicalLockResult(self.unlock) |
|
168 |
except: |
|
169 |
self.branch.unlock() |
|
170 |
raise
|
|
0.200.1477
by Jelmer Vernooij
Implement GitWorkingTree.lock_tree_write. |
171 |
|
0.200.1476
by Jelmer Vernooij
Cope with working tree refactoring. |
172 |
def lock_write(self, token=None): |
173 |
self.branch.lock_write() |
|
0.383.1
by Jelmer Vernooij
Fix a bunch of locking issues. |
174 |
try: |
175 |
self._lock_write_tree() |
|
176 |
return lock.LogicalLockResult(self.unlock) |
|
177 |
except: |
|
178 |
self.branch.unlock() |
|
179 |
raise
|
|
0.200.1476
by Jelmer Vernooij
Cope with working tree refactoring. |
180 |
|
181 |
def is_locked(self): |
|
182 |
return self._lock_count >= 1 |
|
183 |
||
184 |
def get_physical_lock_status(self): |
|
185 |
return False |
|
186 |
||
0.415.4
by Jelmer Vernooij
proper locking on index. |
187 |
def break_lock(self): |
188 |
try: |
|
189 |
self.control_transport.delete('index.lock') |
|
190 |
except errors.NoSuchFile: |
|
191 |
pass
|
|
192 |
self.branch.break_lock() |
|
193 |
||
0.383.1
by Jelmer Vernooij
Fix a bunch of locking issues. |
194 |
@only_raises(errors.LockNotHeld, errors.LockBroken) |
0.200.1476
by Jelmer Vernooij
Cope with working tree refactoring. |
195 |
def unlock(self): |
196 |
if not self._lock_count: |
|
197 |
return lock.cant_unlock_not_held(self) |
|
0.383.1
by Jelmer Vernooij
Fix a bunch of locking issues. |
198 |
try: |
199 |
self._cleanup() |
|
200 |
self._lock_count -= 1 |
|
201 |
if self._lock_count > 0: |
|
202 |
return
|
|
0.415.4
by Jelmer Vernooij
proper locking on index. |
203 |
if self._index_file is not None: |
204 |
if self._index_dirty: |
|
205 |
self._flush(self._index_file) |
|
206 |
self._index_file.close() |
|
207 |
else: |
|
0.415.5
by Jelmer Vernooij
Don't flush, just wait for unlock. |
208 |
# Somebody else already wrote the index file
|
209 |
# by calling .flush()
|
|
210 |
self._index_file.abort() |
|
0.415.4
by Jelmer Vernooij
proper locking on index. |
211 |
self._index_file = None |
0.383.1
by Jelmer Vernooij
Fix a bunch of locking issues. |
212 |
self._lock_mode = None |
0.415.3
by Jelmer Vernooij
Open index on demand. |
213 |
self.index = None |
0.383.1
by Jelmer Vernooij
Fix a bunch of locking issues. |
214 |
finally: |
215 |
self.branch.unlock() |
|
0.200.1658
by Jelmer Vernooij
Fix handling of ignores - return patterns that matched. |
216 |
|
0.360.1
by Jelmer Vernooij
Implement GitMemoryTree. |
217 |
def _cleanup(self): |
218 |
pass
|
|
219 |
||
0.200.1322
by Jelmer Vernooij
Add case detection. |
220 |
def _detect_case_handling(self): |
221 |
try: |
|
222 |
self._transport.stat(".git/cOnFiG") |
|
223 |
except errors.NoSuchFile: |
|
224 |
self.case_sensitive = True |
|
225 |
else: |
|
226 |
self.case_sensitive = False |
|
227 |
||
0.200.1315
by Jelmer Vernooij
Implement WorkingTree.merge_modified. |
228 |
def merge_modified(self): |
229 |
return {} |
|
230 |
||
0.200.1696
by Jelmer Vernooij
Fix set_merge_modified. |
231 |
def set_merge_modified(self, modified_hashes): |
0.298.1
by Jelmer Vernooij
mark GitWorkngTree.set_merge_modified as unsupported. |
232 |
raise errors.UnsupportedOperation(self.set_merge_modified, self) |
0.200.1690
by Jelmer Vernooij
Implement WorkingTree.set_merge_modified. |
233 |
|
0.200.1220
by Jelmer Vernooij
Support set_parent_trees. |
234 |
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False): |
235 |
self.set_parent_ids([p for p, t in parents_list]) |
|
236 |
||
0.305.1
by Jelmer Vernooij
Reset RHS parents after commit. |
237 |
def _set_merges_from_parent_ids(self, rhs_parent_ids): |
0.200.1779
by Jelmer Vernooij
Actually store git revision ids rather than bzr revision ids. |
238 |
try: |
0.305.1
by Jelmer Vernooij
Reset RHS parents after commit. |
239 |
merges = [self.branch.lookup_bzr_revision_id(revid)[0] for revid in rhs_parent_ids] |
0.200.1779
by Jelmer Vernooij
Actually store git revision ids rather than bzr revision ids. |
240 |
except errors.NoSuchRevision as e: |
241 |
raise errors.GhostRevisionUnusableHere(e.revision) |
|
0.304.1
by Jelmer Vernooij
Delete MERGE_HEAD if there are no parent ids. |
242 |
if merges: |
243 |
self.control_transport.put_bytes('MERGE_HEAD', '\n'.join(merges), |
|
244 |
mode=self.controldir._get_file_mode()) |
|
245 |
else: |
|
246 |
try: |
|
247 |
self.control_transport.delete('MERGE_HEAD') |
|
248 |
except errors.NoSuchFile: |
|
249 |
pass
|
|
0.200.1720
by Jelmer Vernooij
Fix handling of pending merges. |
250 |
|
251 |
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False): |
|
252 |
"""Set the parent ids to revision_ids. |
|
253 |
||
254 |
See also set_parent_trees. This api will try to retrieve the tree data
|
|
255 |
for each element of revision_ids from the trees repository. If you have
|
|
256 |
tree data already available, it is more efficient to use
|
|
257 |
set_parent_trees rather than set_parent_ids. set_parent_ids is however
|
|
258 |
an easier API to use.
|
|
259 |
||
260 |
:param revision_ids: The revision_ids to set as the parent ids of this
|
|
261 |
working tree. Any of these may be ghosts.
|
|
262 |
"""
|
|
263 |
with self.lock_tree_write(): |
|
264 |
self._check_parents_for_ghosts(revision_ids, |
|
265 |
allow_leftmost_as_ghost=allow_leftmost_as_ghost) |
|
266 |
for revision_id in revision_ids: |
|
267 |
_mod_revision.check_not_reserved_id(revision_id) |
|
268 |
||
269 |
revision_ids = self._filter_parent_ids_by_ancestry(revision_ids) |
|
270 |
||
271 |
if len(revision_ids) > 0: |
|
272 |
self.set_last_revision(revision_ids[0]) |
|
273 |
else: |
|
274 |
self.set_last_revision(_mod_revision.NULL_REVISION) |
|
275 |
||
0.305.1
by Jelmer Vernooij
Reset RHS parents after commit. |
276 |
self._set_merges_from_parent_ids(revision_ids[1:]) |
0.200.1720
by Jelmer Vernooij
Fix handling of pending merges. |
277 |
|
278 |
def get_parent_ids(self): |
|
279 |
"""See Tree.get_parent_ids. |
|
280 |
||
281 |
This implementation reads the pending merges list and last_revision
|
|
282 |
value and uses that to decide what the parents list should be.
|
|
283 |
"""
|
|
284 |
last_rev = _mod_revision.ensure_null(self._last_revision()) |
|
285 |
if _mod_revision.NULL_REVISION == last_rev: |
|
286 |
parents = [] |
|
287 |
else: |
|
288 |
parents = [last_rev] |
|
289 |
try: |
|
290 |
merges_bytes = self.control_transport.get_bytes('MERGE_HEAD') |
|
291 |
except errors.NoSuchFile: |
|
292 |
pass
|
|
293 |
else: |
|
294 |
for l in osutils.split_lines(merges_bytes): |
|
295 |
revision_id = l.rstrip('\n') |
|
0.200.1779
by Jelmer Vernooij
Actually store git revision ids rather than bzr revision ids. |
296 |
parents.append(self.branch.lookup_foreign_revision_id(revision_id)) |
0.200.1720
by Jelmer Vernooij
Fix handling of pending merges. |
297 |
return parents |
298 |
||
0.200.1243
by Jelmer Vernooij
Implement WorkingTree.check_state. |
299 |
def check_state(self): |
300 |
"""Check that the working state is/isn't valid.""" |
|
301 |
pass
|
|
302 |
||
0.200.1215
by Jelmer Vernooij
Implement GitWorkingTree.remove. |
303 |
def remove(self, files, verbose=False, to_file=None, keep_files=True, |
304 |
force=False): |
|
305 |
"""Remove nominated files from the working tree metadata. |
|
306 |
||
307 |
:param files: File paths relative to the basedir.
|
|
308 |
:param keep_files: If true, the files will also be kept.
|
|
309 |
:param force: Delete files and directories, even if they are changed
|
|
310 |
and even if the directories are not empty.
|
|
311 |
"""
|
|
312 |
if isinstance(files, basestring): |
|
313 |
files = [files] |
|
314 |
||
315 |
if to_file is None: |
|
316 |
to_file = sys.stdout |
|
317 |
||
318 |
def backup(file_to_backup): |
|
319 |
abs_path = self.abspath(file_to_backup) |
|
0.200.1648
by Jelmer Vernooij
Fix compatibility with newer versions of breezy. |
320 |
backup_name = self.controldir._available_backup_name(file_to_backup) |
0.200.1215
by Jelmer Vernooij
Implement GitWorkingTree.remove. |
321 |
osutils.rename(abs_path, self.abspath(backup_name)) |
322 |
return "removed %s (but kept a copy: %s)" % ( |
|
323 |
file_to_backup, backup_name) |
|
324 |
||
0.357.1
by Jelmer Vernooij
Fix some remove tests. |
325 |
# Sort needed to first handle directory content before the directory
|
326 |
files_to_backup = [] |
|
327 |
||
0.357.2
by Jelmer Vernooij
Fix more remove tests. |
328 |
all_files = set() |
329 |
||
330 |
def recurse_directory_to_add_files(directory): |
|
331 |
# Recurse directory and add all files
|
|
332 |
# so we can check if they have changed.
|
|
333 |
for parent_info, file_infos in self.walkdirs(directory): |
|
334 |
for relpath, basename, kind, lstat, fileid, kind in file_infos: |
|
335 |
# Is it versioned or ignored?
|
|
336 |
if self.is_versioned(relpath): |
|
337 |
# Add nested content for deletion.
|
|
338 |
all_files.add(relpath) |
|
339 |
else: |
|
340 |
# Files which are not versioned
|
|
341 |
# should be treated as unknown.
|
|
342 |
files_to_backup.append(relpath) |
|
343 |
||
0.200.1675
by Jelmer Vernooij
Remove uses of decorators. |
344 |
with self.lock_tree_write(): |
0.357.2
by Jelmer Vernooij
Fix more remove tests. |
345 |
for filepath in files: |
346 |
# Get file name into canonical form.
|
|
347 |
abspath = self.abspath(filepath) |
|
348 |
filepath = self.relpath(abspath) |
|
349 |
||
350 |
if filepath: |
|
351 |
all_files.add(filepath) |
|
352 |
recurse_directory_to_add_files(filepath) |
|
353 |
||
354 |
files = list(all_files) |
|
355 |
||
356 |
if len(files) == 0: |
|
357 |
return # nothing to do |
|
358 |
||
359 |
# Sort needed to first handle directory content before the directory
|
|
360 |
files.sort(reverse=True) |
|
361 |
||
0.357.1
by Jelmer Vernooij
Fix some remove tests. |
362 |
# Bail out if we are going to delete files we shouldn't
|
363 |
if not keep_files and not force: |
|
364 |
for (file_id, path, content_change, versioned, parent_id, name, |
|
365 |
kind, executable) in self.iter_changes(self.basis_tree(), |
|
366 |
include_unchanged=True, require_versioned=False, |
|
367 |
want_unversioned=True, specific_files=files): |
|
368 |
if versioned[0] == False: |
|
369 |
# The record is unknown or newly added
|
|
370 |
files_to_backup.append(path[1]) |
|
0.357.2
by Jelmer Vernooij
Fix more remove tests. |
371 |
files_to_backup.extend(osutils.parent_directories(path[1])) |
0.357.1
by Jelmer Vernooij
Fix some remove tests. |
372 |
elif (content_change and (kind[1] is not None) and |
373 |
osutils.is_inside_any(files, path[1])): |
|
374 |
# Versioned and changed, but not deleted, and still
|
|
375 |
# in one of the dirs to be deleted.
|
|
376 |
files_to_backup.append(path[1]) |
|
0.357.2
by Jelmer Vernooij
Fix more remove tests. |
377 |
files_to_backup.extend(osutils.parent_directories(path[1])) |
378 |
||
0.200.1675
by Jelmer Vernooij
Remove uses of decorators. |
379 |
for f in files: |
0.200.1735
by Jelmer Vernooij
Fix remove tests. |
380 |
if f == '': |
381 |
continue
|
|
0.357.1
by Jelmer Vernooij
Fix some remove tests. |
382 |
|
383 |
try: |
|
384 |
kind = self.kind(f) |
|
385 |
except errors.NoSuchFile: |
|
386 |
kind = None |
|
387 |
||
388 |
abs_path = self.abspath(f) |
|
389 |
if verbose: |
|
390 |
# having removed it, it must be either ignored or unknown
|
|
391 |
if self.is_ignored(f): |
|
392 |
new_status = 'I' |
|
393 |
else: |
|
394 |
new_status = '?' |
|
395 |
kind_ch = osutils.kind_marker(kind) |
|
396 |
to_file.write(new_status + ' ' + f + kind_ch + '\n') |
|
397 |
if kind is None: |
|
398 |
message = "%s does not exist" % (f, ) |
|
0.200.1675
by Jelmer Vernooij
Remove uses of decorators. |
399 |
else: |
0.357.1
by Jelmer Vernooij
Fix some remove tests. |
400 |
if not keep_files: |
401 |
if f in files_to_backup and not force: |
|
0.357.2
by Jelmer Vernooij
Fix more remove tests. |
402 |
message = backup(f) |
0.200.1675
by Jelmer Vernooij
Remove uses of decorators. |
403 |
else: |
0.357.1
by Jelmer Vernooij
Fix some remove tests. |
404 |
if kind == 'directory': |
405 |
osutils.rmtree(abs_path) |
|
406 |
else: |
|
0.200.1675
by Jelmer Vernooij
Remove uses of decorators. |
407 |
osutils.delete_any(abs_path) |
0.357.2
by Jelmer Vernooij
Fix more remove tests. |
408 |
message = "deleted %s" % (f,) |
409 |
else: |
|
410 |
message = "removed %s" % (f,) |
|
0.357.1
by Jelmer Vernooij
Fix some remove tests. |
411 |
self._unversion_path(f) |
0.200.1215
by Jelmer Vernooij
Implement GitWorkingTree.remove. |
412 |
|
0.200.1675
by Jelmer Vernooij
Remove uses of decorators. |
413 |
# print only one message (if any) per file.
|
414 |
if message is not None: |
|
415 |
trace.note(message) |
|
0.357.1
by Jelmer Vernooij
Fix some remove tests. |
416 |
self._versioned_dirs = None |
0.200.1192
by Jelmer Vernooij
Implement path2id. |
417 |
|
0.200.1240
by Jelmer Vernooij
Implement GitWorkingTree.smart_add. |
418 |
def smart_add(self, file_list, recurse=True, action=None, save=True): |
0.200.1771
by Jelmer Vernooij
Fix implicit tree unicode add test. |
419 |
if not file_list: |
420 |
file_list = [u'.'] |
|
0.200.1781
by Jelmer Vernooij
Support expanding symlinks. |
421 |
|
422 |
# expand any symlinks in the directory part, while leaving the
|
|
423 |
# filename alone
|
|
424 |
# only expanding if symlinks are supported avoids windows path bugs
|
|
425 |
if osutils.has_symlinks(): |
|
426 |
file_list = list(map(osutils.normalizepath, file_list)) |
|
427 |
||
0.369.1
by Jelmer Vernooij
Implement conflict handling. |
428 |
conflicts_related = set() |
429 |
for c in self.conflicts(): |
|
430 |
conflicts_related.update(c.associated_filenames()) |
|
431 |
||
0.200.1240
by Jelmer Vernooij
Implement GitWorkingTree.smart_add. |
432 |
added = [] |
433 |
ignored = {} |
|
434 |
user_dirs = [] |
|
0.200.1733
by Jelmer Vernooij
Support handling of custom ids in smart_add. |
435 |
def call_action(filepath, kind): |
436 |
if action is not None: |
|
437 |
parent_path = posixpath.dirname(filepath) |
|
438 |
parent_id = self.path2id(parent_path) |
|
439 |
parent_ie = self._get_dir_ie(parent_path, parent_id) |
|
440 |
file_id = action(self, parent_ie, filepath, kind) |
|
441 |
if file_id is not None: |
|
442 |
raise workingtree.SettingFileIdUnsupported() |
|
443 |
||
0.200.1675
by Jelmer Vernooij
Remove uses of decorators. |
444 |
with self.lock_tree_write(): |
445 |
for filepath in osutils.canonical_relpaths(self.basedir, file_list): |
|
0.352.1
by Jelmer Vernooij
Check for normalization during add. |
446 |
filepath, can_access = osutils.normalized_filename(filepath) |
447 |
if not can_access: |
|
448 |
raise errors.InvalidNormalization(filepath) |
|
449 |
||
0.200.1675
by Jelmer Vernooij
Remove uses of decorators. |
450 |
abspath = self.abspath(filepath) |
0.200.1240
by Jelmer Vernooij
Implement GitWorkingTree.smart_add. |
451 |
kind = osutils.file_kind(abspath) |
0.200.1675
by Jelmer Vernooij
Remove uses of decorators. |
452 |
if kind in ("file", "symlink"): |
0.429.2
by Jelmer Vernooij
Some more work on submodule support. |
453 |
(index, subpath) = self._lookup_index(filepath.encode('utf-8')) |
454 |
if subpath in index: |
|
0.369.2
by Jelmer Vernooij
Fix tests. |
455 |
# Already present
|
456 |
continue
|
|
0.200.1733
by Jelmer Vernooij
Support handling of custom ids in smart_add. |
457 |
call_action(filepath, kind) |
0.200.1308
by Jelmer Vernooij
Write index to disk after adding files. |
458 |
if save: |
0.200.1675
by Jelmer Vernooij
Remove uses of decorators. |
459 |
self._index_add_entry(filepath, kind) |
460 |
added.append(filepath) |
|
461 |
elif kind == "directory": |
|
0.429.2
by Jelmer Vernooij
Some more work on submodule support. |
462 |
(index, subpath) = self._lookup_index(filepath.encode('utf-8')) |
463 |
if subpath not in index: |
|
0.369.2
by Jelmer Vernooij
Fix tests. |
464 |
call_action(filepath, kind) |
0.200.1675
by Jelmer Vernooij
Remove uses of decorators. |
465 |
if recurse: |
466 |
user_dirs.append(filepath) |
|
467 |
else: |
|
468 |
raise errors.BadFileKindError(filename=abspath, kind=kind) |
|
469 |
for user_dir in user_dirs: |
|
470 |
abs_user_dir = self.abspath(user_dir) |
|
0.200.1752
by Jelmer Vernooij
Don't traverse nested trees in WorkingTree.smart_add. |
471 |
if user_dir != '': |
472 |
try: |
|
473 |
transport = _mod_transport.get_transport_from_path(abs_user_dir) |
|
474 |
_mod_controldir.ControlDirFormat.find_format(transport) |
|
475 |
subtree = True |
|
476 |
except errors.NotBranchError: |
|
477 |
subtree = False |
|
478 |
except errors.UnsupportedFormatError: |
|
479 |
subtree = False |
|
480 |
else: |
|
481 |
subtree = False |
|
482 |
if subtree: |
|
0.200.1769
by Jelmer Vernooij
Raise proper error when encountering nested trees. |
483 |
trace.warning('skipping nested tree %r', abs_user_dir) |
0.200.1752
by Jelmer Vernooij
Don't traverse nested trees in WorkingTree.smart_add. |
484 |
continue
|
485 |
||
0.200.1675
by Jelmer Vernooij
Remove uses of decorators. |
486 |
for name in os.listdir(abs_user_dir): |
487 |
subp = os.path.join(user_dir, name) |
|
488 |
if self.is_control_filename(subp) or self.mapping.is_special_file(subp): |
|
489 |
continue
|
|
490 |
ignore_glob = self.is_ignored(subp) |
|
491 |
if ignore_glob is not None: |
|
492 |
ignored.setdefault(ignore_glob, []).append(subp) |
|
493 |
continue
|
|
494 |
abspath = self.abspath(subp) |
|
495 |
kind = osutils.file_kind(abspath) |
|
496 |
if kind == "directory": |
|
497 |
user_dirs.append(subp) |
|
498 |
else: |
|
0.369.2
by Jelmer Vernooij
Fix tests. |
499 |
if subp in self.index: |
500 |
# Already present
|
|
501 |
continue
|
|
0.369.3
by Jelmer Vernooij
Fix another conflict test. |
502 |
if subp in conflicts_related: |
503 |
continue
|
|
0.200.1733
by Jelmer Vernooij
Support handling of custom ids in smart_add. |
504 |
call_action(filepath, kind) |
0.200.1675
by Jelmer Vernooij
Remove uses of decorators. |
505 |
if save: |
506 |
self._index_add_entry(subp, kind) |
|
0.200.1751
by Jelmer Vernooij
Fix smart_add return value. |
507 |
added.append(subp) |
0.200.1675
by Jelmer Vernooij
Remove uses of decorators. |
508 |
return added, ignored |
0.200.1240
by Jelmer Vernooij
Implement GitWorkingTree.smart_add. |
509 |
|
0.200.1712
by Jelmer Vernooij
Add file_id prefix. |
510 |
def has_filename(self, filename): |
511 |
return osutils.lexists(self.abspath(filename)) |
|
512 |
||
0.200.1766
by Jelmer Vernooij
Fix another list_files test, integrate is_versioned. |
513 |
def _iter_files_recursive(self, from_dir=None, include_dirs=False): |
0.200.1328
by Jelmer Vernooij
More test fixes. |
514 |
if from_dir is None: |
0.379.1
by Jelmer Vernooij
Improve unicode handling in GitWorkingTree. |
515 |
from_dir = u"" |
0.341.1
by Jelmer Vernooij
Fix BadFilenameEncoding raising during WorkingTree.extras. |
516 |
for (dirpath, dirnames, filenames) in os.walk(self.abspath(from_dir).encode(osutils._fs_enc)): |
7018.3.2
by Jelmer Vernooij
Fix some git tests. |
517 |
dir_relpath = dirpath[len(self.basedir):].strip(b"/") |
518 |
if self.controldir.is_control_filename(dir_relpath.decode(osutils._fs_enc)): |
|
0.200.605
by Jelmer Vernooij
Ignore directories in WorkingTree.extras(). |
519 |
continue
|
0.200.1766
by Jelmer Vernooij
Fix another list_files test, integrate is_versioned. |
520 |
for name in list(dirnames): |
7018.3.10
by Jelmer Vernooij
Consistent return values in PreviewTree.list_files. |
521 |
if self.controldir.is_control_filename(name.decode(osutils._fs_enc)): |
0.200.1766
by Jelmer Vernooij
Fix another list_files test, integrate is_versioned. |
522 |
dirnames.remove(name) |
523 |
continue
|
|
524 |
relpath = os.path.join(dir_relpath, name) |
|
525 |
if include_dirs: |
|
0.341.1
by Jelmer Vernooij
Fix BadFilenameEncoding raising during WorkingTree.extras. |
526 |
try: |
527 |
yield relpath.decode(osutils._fs_enc) |
|
0.379.1
by Jelmer Vernooij
Improve unicode handling in GitWorkingTree. |
528 |
except UnicodeDecodeError: |
0.341.1
by Jelmer Vernooij
Fix BadFilenameEncoding raising during WorkingTree.extras. |
529 |
raise errors.BadFilenameEncoding( |
530 |
relpath, osutils._fs_enc) |
|
0.200.1766
by Jelmer Vernooij
Fix another list_files test, integrate is_versioned. |
531 |
if not self._has_dir(relpath): |
532 |
dirnames.remove(name) |
|
533 |
for name in filenames: |
|
534 |
if not self.mapping.is_special_file(name): |
|
0.341.1
by Jelmer Vernooij
Fix BadFilenameEncoding raising during WorkingTree.extras. |
535 |
yp = os.path.join(dir_relpath, name) |
536 |
try: |
|
537 |
yield yp.decode(osutils._fs_enc) |
|
538 |
except UnicodeDecodeError: |
|
539 |
raise errors.BadFilenameEncoding( |
|
540 |
yp, osutils._fs_enc) |
|
0.200.1327
by Jelmer Vernooij
Factor out all file browsing in extras. |
541 |
|
542 |
def extras(self): |
|
543 |
"""Yield all unversioned files in this WorkingTree. |
|
544 |
"""
|
|
0.200.1676
by Jelmer Vernooij
Fix typo. |
545 |
with self.lock_read(): |
0.429.11
by Jelmer Vernooij
Merge trunk. |
546 |
index_paths = set([p.decode('utf-8') for p, i in self._recurse_index_entries()]) |
547 |
all_paths = set(self._iter_files_recursive(include_dirs=True)) |
|
548 |
for p in (all_paths - index_paths): |
|
7018.3.2
by Jelmer Vernooij
Fix some git tests. |
549 |
if not self._has_dir(p.encode('utf-8')): |
0.379.1
by Jelmer Vernooij
Improve unicode handling in GitWorkingTree. |
550 |
yield p |
0.200.605
by Jelmer Vernooij
Ignore directories in WorkingTree.extras(). |
551 |
|
0.429.17
by Jelmer Vernooij
Fix some more tests. |
552 |
def _gather_kinds(self, files, kinds): |
553 |
"""See MutableTree._gather_kinds.""" |
|
554 |
with self.lock_tree_write(): |
|
555 |
for pos, f in enumerate(files): |
|
556 |
if kinds[pos] is None: |
|
557 |
fullpath = osutils.normpath(self.abspath(f)) |
|
558 |
try: |
|
559 |
kind = osutils.file_kind(fullpath) |
|
560 |
except OSError as e: |
|
561 |
if e.errno == errno.ENOENT: |
|
562 |
raise errors.NoSuchFile(fullpath) |
|
563 |
if kind == 'directory' and f != '' and os.path.exists(os.path.join(fullpath, '.git')): |
|
564 |
kind = 'tree-reference' |
|
565 |
kinds[pos] = kind |
|
566 |
||
0.200.382
by Jelmer Vernooij
Support flushing index. |
567 |
def flush(self): |
0.287.6
by Jelmer Vernooij
Fix some more tests. |
568 |
if self._lock_mode != 'w': |
569 |
raise errors.NotWriteLocked(self) |
|
0.415.5
by Jelmer Vernooij
Don't flush, just wait for unlock. |
570 |
# TODO(jelmer): This shouldn't be writing in-place, but index.lock is
|
571 |
# already in use and GitFile doesn't allow overriding the lock file name :(
|
|
0.415.4
by Jelmer Vernooij
proper locking on index. |
572 |
f = open(self.control_transport.local_abspath('index'), 'wb') |
573 |
# Note that _flush will close the file
|
|
574 |
self._flush(f) |
|
575 |
||
576 |
def _flush(self, f): |
|
577 |
try: |
|
578 |
shaf = SHA1Writer(f) |
|
579 |
write_index_dict(shaf, self.index) |
|
580 |
shaf.close() |
|
581 |
except: |
|
582 |
f.abort() |
|
583 |
raise
|
|
584 |
self._index_dirty = False |
|
0.200.382
by Jelmer Vernooij
Support flushing index. |
585 |
|
0.200.1202
by Jelmer Vernooij
Implement has_or_had_id. |
586 |
def has_or_had_id(self, file_id): |
587 |
if self.has_id(file_id): |
|
588 |
return True |
|
589 |
if self.had_id(file_id): |
|
590 |
return True |
|
591 |
return False |
|
592 |
||
593 |
def had_id(self, file_id): |
|
7018.3.2
by Jelmer Vernooij
Fix some git tests. |
594 |
path = self._basis_fileid_map.lookup_path(file_id) |
0.200.1202
by Jelmer Vernooij
Implement has_or_had_id. |
595 |
try: |
596 |
head = self.repository._git.head() |
|
597 |
except KeyError: |
|
598 |
# Assume no if basis is not accessible
|
|
599 |
return False |
|
0.336.2
by Jelmer Vernooij
Don't use ZERO_SHA outside of remote communication to indicate empty history. |
600 |
try: |
601 |
root_tree = self.store[head].tree |
|
602 |
except KeyError: |
|
0.200.1205
by Jelmer Vernooij
Implement GitWorkingTree.stored_kind. |
603 |
return False |
0.200.1202
by Jelmer Vernooij
Implement has_or_had_id. |
604 |
try: |
605 |
tree_lookup_path(self.store.__getitem__, root_tree, path) |
|
606 |
except KeyError: |
|
607 |
return False |
|
608 |
else: |
|
609 |
return True |
|
610 |
||
0.285.1
by Jelmer Vernooij
Swap arguments for tree methods. |
611 |
def get_file_mtime(self, path, file_id=None): |
0.200.1200
by Jelmer Vernooij
Support GitWorkingTree.get_file_mtime. |
612 |
"""See Tree.get_file_mtime.""" |
0.285.1
by Jelmer Vernooij
Swap arguments for tree methods. |
613 |
try: |
0.360.1
by Jelmer Vernooij
Implement GitMemoryTree. |
614 |
return self._lstat(path).st_mtime |
6964.2.1
by Jelmer Vernooij
Initial work to support brz-git on python3. |
615 |
except OSError as e: |
616 |
(num, msg) = e |
|
0.285.1
by Jelmer Vernooij
Swap arguments for tree methods. |
617 |
if num == errno.ENOENT: |
618 |
raise errors.NoSuchFile(path) |
|
619 |
raise
|
|
0.200.1200
by Jelmer Vernooij
Support GitWorkingTree.get_file_mtime. |
620 |
|
0.200.1655
by Jelmer Vernooij
Basic support for git ignores. |
621 |
def is_ignored(self, filename): |
622 |
r"""Check whether the filename matches an ignore pattern. |
|
623 |
||
624 |
If the file is ignored, returns the pattern which caused it to
|
|
625 |
be ignored, otherwise None. So this can simply be used as a
|
|
626 |
boolean if desired."""
|
|
627 |
if getattr(self, '_global_ignoreglobster', None) is None: |
|
628 |
ignore_globs = set() |
|
629 |
ignore_globs.update(ignores.get_runtime_ignores()) |
|
630 |
ignore_globs.update(ignores.get_user_ignores()) |
|
631 |
self._global_ignoreglobster = globbing.ExceptionGlobster(ignore_globs) |
|
0.200.1656
by Jelmer Vernooij
Report proper patterns, ignore files. |
632 |
match = self._global_ignoreglobster.match(filename) |
633 |
if match is not None: |
|
634 |
return match |
|
0.200.1716
by Jelmer Vernooij
Fix some more tests. |
635 |
try: |
636 |
if self.kind(filename) == 'directory': |
|
637 |
filename += b'/' |
|
638 |
except errors.NoSuchFile: |
|
639 |
pass
|
|
640 |
filename = filename.lstrip(b'/') |
|
0.200.1658
by Jelmer Vernooij
Fix handling of ignores - return patterns that matched. |
641 |
ignore_manager = self._get_ignore_manager() |
642 |
ps = list(ignore_manager.find_matching(filename)) |
|
643 |
if not ps: |
|
644 |
return None |
|
645 |
if not ps[-1].is_exclude: |
|
646 |
return None |
|
647 |
return bytes(ps[-1]) |
|
648 |
||
649 |
def _get_ignore_manager(self): |
|
650 |
ignoremanager = getattr(self, '_ignoremanager', None) |
|
651 |
if ignoremanager is not None: |
|
652 |
return ignoremanager |
|
653 |
||
654 |
ignore_manager = IgnoreFilterManager.from_repo(self.repository._git) |
|
655 |
self._ignoremanager = ignore_manager |
|
656 |
return ignore_manager |
|
0.200.409
by Jelmer Vernooij
Support parsing .gitignore. |
657 |
|
0.200.1716
by Jelmer Vernooij
Fix some more tests. |
658 |
def _flush_ignore_list_cache(self): |
659 |
self._ignoremanager = None |
|
660 |
||
0.200.508
by Jelmer Vernooij
Skip inventory caching bits. |
661 |
def set_last_revision(self, revid): |
0.200.1720
by Jelmer Vernooij
Fix handling of pending merges. |
662 |
if _mod_revision.is_null(revid): |
663 |
self.branch.set_last_revision_info(0, revid) |
|
664 |
return False |
|
665 |
_mod_revision.check_not_reserved_id(revid) |
|
666 |
try: |
|
667 |
self.branch.generate_revision_history(revid) |
|
668 |
except errors.NoSuchRevision: |
|
669 |
raise errors.GhostRevisionUnusableHere(revid) |
|
0.200.508
by Jelmer Vernooij
Skip inventory caching bits. |
670 |
|
0.200.379
by Jelmer Vernooij
Re-enable working tree support. |
671 |
def _reset_data(self): |
0.248.3
by Jelmer Vernooij
Handle working trees without valid HEAD branch. |
672 |
try: |
673 |
head = self.repository._git.head() |
|
0.336.2
by Jelmer Vernooij
Don't use ZERO_SHA outside of remote communication to indicate empty history. |
674 |
except KeyError: |
0.200.1202
by Jelmer Vernooij
Implement has_or_had_id. |
675 |
self._basis_fileid_map = GitFileIdMap({}, self.mapping) |
0.200.948
by Jelmer Vernooij
Cope with empty inventories. |
676 |
else: |
0.336.2
by Jelmer Vernooij
Don't use ZERO_SHA outside of remote communication to indicate empty history. |
677 |
self._basis_fileid_map = self.mapping.get_fileid_map( |
678 |
self.store.__getitem__, self.store[head].tree) |
|
0.371.1
by Jelmer Vernooij
Implement WorkingTree.reset_state(). |
679 |
self._fileid_map = self._basis_fileid_map.copy() |
0.200.379
by Jelmer Vernooij
Re-enable working tree support. |
680 |
|
0.285.1
by Jelmer Vernooij
Swap arguments for tree methods. |
681 |
def get_file_verifier(self, path, file_id=None, stat_value=None): |
0.200.1675
by Jelmer Vernooij
Remove uses of decorators. |
682 |
with self.lock_read(): |
0.429.2
by Jelmer Vernooij
Some more work on submodule support. |
683 |
(index, subpath) = self._lookup_index(path.encode('utf-8')) |
0.200.1675
by Jelmer Vernooij
Remove uses of decorators. |
684 |
try: |
0.429.2
by Jelmer Vernooij
Some more work on submodule support. |
685 |
return ("GIT", index[subpath].sha) |
0.200.1675
by Jelmer Vernooij
Remove uses of decorators. |
686 |
except KeyError: |
687 |
if self._has_dir(path): |
|
688 |
return ("GIT", None) |
|
0.285.1
by Jelmer Vernooij
Swap arguments for tree methods. |
689 |
raise errors.NoSuchFile(path) |
0.200.1302
by Jelmer Vernooij
Significantly improve performance of WorkingTree.extras(). |
690 |
|
0.285.1
by Jelmer Vernooij
Swap arguments for tree methods. |
691 |
def get_file_sha1(self, path, file_id=None, stat_value=None): |
0.200.1675
by Jelmer Vernooij
Remove uses of decorators. |
692 |
with self.lock_read(): |
0.200.1772
by Jelmer Vernooij
Fix handling of unversioned file in get_file_sha1. |
693 |
if not self.is_versioned(path): |
694 |
raise errors.NoSuchFile(path) |
|
695 |
abspath = self.abspath(path) |
|
0.200.1675
by Jelmer Vernooij
Remove uses of decorators. |
696 |
try: |
697 |
return osutils.sha_file_by_name(abspath) |
|
6964.2.1
by Jelmer Vernooij
Initial work to support brz-git on python3. |
698 |
except OSError as e: |
699 |
(num, msg) = e |
|
0.200.1675
by Jelmer Vernooij
Remove uses of decorators. |
700 |
if num in (errno.EISDIR, errno.ENOENT): |
0.200.1772
by Jelmer Vernooij
Fix handling of unversioned file in get_file_sha1. |
701 |
return None |
0.200.1675
by Jelmer Vernooij
Remove uses of decorators. |
702 |
raise
|
0.200.90
by Jelmer Vernooij
Basic support for opening working trees. |
703 |
|
0.200.610
by Jelmer Vernooij
Support retrieving basis tree properly. |
704 |
def revision_tree(self, revid): |
705 |
return self.repository.revision_tree(revid) |
|
706 |
||
0.264.11
by Jelmer Vernooij
Completer implementation of iter_entries_by_dir and list_files. |
707 |
def _is_executable_from_path_and_stat_from_stat(self, path, stat_result): |
708 |
mode = stat_result.st_mode |
|
709 |
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode) |
|
710 |
||
0.318.1
by Jelmer Vernooij
Fix executable test. |
711 |
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result): |
712 |
return self.basis_tree().is_executable(path) |
|
713 |
||
0.285.1
by Jelmer Vernooij
Swap arguments for tree methods. |
714 |
def stored_kind(self, path, file_id=None): |
0.200.1675
by Jelmer Vernooij
Remove uses of decorators. |
715 |
with self.lock_read(): |
7018.3.2
by Jelmer Vernooij
Fix some git tests. |
716 |
encoded_path = path.encode('utf-8') |
717 |
(index, subpath) = self._lookup_index(encoded_path) |
|
0.200.1675
by Jelmer Vernooij
Remove uses of decorators. |
718 |
try: |
0.429.2
by Jelmer Vernooij
Some more work on submodule support. |
719 |
return mode_kind(index[subpath].mode) |
0.200.1675
by Jelmer Vernooij
Remove uses of decorators. |
720 |
except KeyError: |
721 |
# Maybe it's a directory?
|
|
7018.3.2
by Jelmer Vernooij
Fix some git tests. |
722 |
if self._has_dir(encoded_path): |
0.200.1675
by Jelmer Vernooij
Remove uses of decorators. |
723 |
return "directory" |
0.285.1
by Jelmer Vernooij
Swap arguments for tree methods. |
724 |
raise errors.NoSuchFile(path) |
0.200.1205
by Jelmer Vernooij
Implement GitWorkingTree.stored_kind. |
725 |
|
0.360.1
by Jelmer Vernooij
Implement GitMemoryTree. |
726 |
def _lstat(self, path): |
727 |
return os.lstat(self.abspath(path)) |
|
728 |
||
6973.1.1
by Jelmer Vernooij
Make InterIndexGitTree suitable for use with MemoryGitTree. |
729 |
def _live_entry(self, path): |
730 |
return index_entry_from_path(self.abspath(path.decode('utf-8')).encode(osutils._fs_enc)) |
|
731 |
||
0.285.1
by Jelmer Vernooij
Swap arguments for tree methods. |
732 |
def is_executable(self, path, file_id=None): |
0.379.1
by Jelmer Vernooij
Improve unicode handling in GitWorkingTree. |
733 |
with self.lock_read(): |
734 |
if getattr(self, "_supports_executable", osutils.supports_executable)(): |
|
735 |
mode = self._lstat(path).st_mode |
|
736 |
else: |
|
0.429.2
by Jelmer Vernooij
Some more work on submodule support. |
737 |
(index, subpath) = self._lookup_index(path.encode('utf-8')) |
0.379.1
by Jelmer Vernooij
Improve unicode handling in GitWorkingTree. |
738 |
try: |
0.429.2
by Jelmer Vernooij
Some more work on submodule support. |
739 |
mode = index[subpath].mode |
0.379.1
by Jelmer Vernooij
Improve unicode handling in GitWorkingTree. |
740 |
except KeyError: |
741 |
mode = 0 |
|
742 |
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode) |
|
0.264.11
by Jelmer Vernooij
Completer implementation of iter_entries_by_dir and list_files. |
743 |
|
0.200.1539
by Jelmer Vernooij
Cope with new is_executable. |
744 |
def _is_executable_from_path_and_stat(self, path, stat_result): |
745 |
if getattr(self, "_supports_executable", osutils.supports_executable)(): |
|
746 |
return self._is_executable_from_path_and_stat_from_stat(path, stat_result) |
|
747 |
else: |
|
748 |
return self._is_executable_from_path_and_stat_from_basis(path, stat_result) |
|
0.264.11
by Jelmer Vernooij
Completer implementation of iter_entries_by_dir and list_files. |
749 |
|
0.264.10
by Jelmer Vernooij
Yield inventory entries. |
750 |
def list_files(self, include_root=False, from_dir=None, recursive=True): |
0.200.1321
by Jelmer Vernooij
More fixes for compatibility with bzr.dev testsuite. |
751 |
if from_dir is None: |
0.379.1
by Jelmer Vernooij
Improve unicode handling in GitWorkingTree. |
752 |
from_dir = u"" |
0.264.11
by Jelmer Vernooij
Completer implementation of iter_entries_by_dir and list_files. |
753 |
dir_ids = {} |
0.200.1767
by Jelmer Vernooij
Fix references to Tree*. |
754 |
fk_entries = {'directory': tree.TreeDirectory, |
755 |
'file': tree.TreeFile, |
|
0.429.5
by Jelmer Vernooij
Fix tree_content_summary test. |
756 |
'symlink': tree.TreeLink, |
0.429.8
by Jelmer Vernooij
Fix class name. |
757 |
'tree-reference': tree.TreeReference} |
0.200.1675
by Jelmer Vernooij
Remove uses of decorators. |
758 |
with self.lock_read(): |
759 |
root_ie = self._get_dir_ie(u"", None) |
|
760 |
if include_root and not from_dir: |
|
761 |
yield "", "V", root_ie.kind, root_ie.file_id, root_ie |
|
762 |
dir_ids[u""] = root_ie.file_id |
|
763 |
if recursive: |
|
0.200.1766
by Jelmer Vernooij
Fix another list_files test, integrate is_versioned. |
764 |
path_iterator = sorted(self._iter_files_recursive(from_dir, include_dirs=True)) |
0.200.1675
by Jelmer Vernooij
Remove uses of decorators. |
765 |
else: |
0.379.1
by Jelmer Vernooij
Improve unicode handling in GitWorkingTree. |
766 |
path_iterator = sorted([os.path.join(from_dir, name.decode(osutils._fs_enc)) for name in |
7018.3.10
by Jelmer Vernooij
Consistent return values in PreviewTree.list_files. |
767 |
os.listdir(self.abspath(from_dir).encode(osutils._fs_enc)) |
768 |
if not self.controldir.is_control_filename(name.decode(osutils._fs_enc)) |
|
769 |
and not self.mapping.is_special_file(name.decode(osutils._fs_enc))]) |
|
0.200.1675
by Jelmer Vernooij
Remove uses of decorators. |
770 |
for path in path_iterator: |
771 |
try: |
|
0.429.2
by Jelmer Vernooij
Some more work on submodule support. |
772 |
encoded_path = path.encode("utf-8") |
0.379.1
by Jelmer Vernooij
Improve unicode handling in GitWorkingTree. |
773 |
except UnicodeEncodeError: |
774 |
raise errors.BadFilenameEncoding( |
|
775 |
path, osutils._fs_enc) |
|
0.429.2
by Jelmer Vernooij
Some more work on submodule support. |
776 |
(index, index_path) = self._lookup_index(encoded_path) |
0.379.1
by Jelmer Vernooij
Improve unicode handling in GitWorkingTree. |
777 |
try: |
0.429.2
by Jelmer Vernooij
Some more work on submodule support. |
778 |
value = index[index_path] |
0.200.1675
by Jelmer Vernooij
Remove uses of decorators. |
779 |
except KeyError: |
780 |
value = None |
|
0.429.5
by Jelmer Vernooij
Fix tree_content_summary test. |
781 |
kind = self.kind(path) |
0.200.1675
by Jelmer Vernooij
Remove uses of decorators. |
782 |
parent, name = posixpath.split(path) |
783 |
for dir_path, dir_ie in self._add_missing_parent_ids(parent, dir_ids): |
|
0.200.1766
by Jelmer Vernooij
Fix another list_files test, integrate is_versioned. |
784 |
pass
|
0.429.5
by Jelmer Vernooij
Fix tree_content_summary test. |
785 |
if kind in ('directory', 'tree-reference'): |
0.200.1766
by Jelmer Vernooij
Fix another list_files test, integrate is_versioned. |
786 |
if path != from_dir: |
7018.3.2
by Jelmer Vernooij
Fix some git tests. |
787 |
if self._has_dir(encoded_path): |
0.200.1766
by Jelmer Vernooij
Fix another list_files test, integrate is_versioned. |
788 |
ie = self._get_dir_ie(path, self.path2id(path)) |
789 |
status = "V" |
|
790 |
file_id = ie.file_id |
|
791 |
elif self.is_ignored(path): |
|
792 |
status = "I" |
|
793 |
ie = fk_entries[kind]() |
|
794 |
file_id = None |
|
795 |
else: |
|
796 |
status = "?" |
|
797 |
ie = fk_entries[kind]() |
|
798 |
file_id = None |
|
799 |
yield posixpath.relpath(path, from_dir), status, kind, file_id, ie |
|
800 |
continue
|
|
0.200.1675
by Jelmer Vernooij
Remove uses of decorators. |
801 |
if value is not None: |
802 |
ie = self._get_file_ie(name, path, value, dir_ids[parent]) |
|
0.200.1766
by Jelmer Vernooij
Fix another list_files test, integrate is_versioned. |
803 |
yield posixpath.relpath(path, from_dir), "V", ie.kind, ie.file_id, ie |
0.200.1675
by Jelmer Vernooij
Remove uses of decorators. |
804 |
else: |
805 |
ie = fk_entries[kind]() |
|
0.200.1766
by Jelmer Vernooij
Fix another list_files test, integrate is_versioned. |
806 |
yield posixpath.relpath(path, from_dir), ("I" if self.is_ignored(path) else "?"), kind, None, ie |
0.264.10
by Jelmer Vernooij
Yield inventory entries. |
807 |
|
0.200.1206
by Jelmer Vernooij
Implement GitWorkingTree.all_file_ids. |
808 |
def all_file_ids(self): |
0.200.1675
by Jelmer Vernooij
Remove uses of decorators. |
809 |
with self.lock_read(): |
810 |
ids = {u"": self.path2id("")} |
|
811 |
for path in self.index: |
|
812 |
if self.mapping.is_special_file(path): |
|
813 |
continue
|
|
814 |
path = path.decode("utf-8") |
|
815 |
parent = posixpath.dirname(path).strip("/") |
|
816 |
for e in self._add_missing_parent_ids(parent, ids): |
|
817 |
pass
|
|
818 |
ids[path] = self.path2id(path) |
|
819 |
return set(ids.values()) |
|
0.200.1206
by Jelmer Vernooij
Implement GitWorkingTree.all_file_ids. |
820 |
|
0.200.1710
by Jelmer Vernooij
Regenerate xfail. |
821 |
def all_versioned_paths(self): |
822 |
with self.lock_read(): |
|
823 |
paths = {u""} |
|
824 |
for path in self.index: |
|
825 |
if self.mapping.is_special_file(path): |
|
826 |
continue
|
|
827 |
path = path.decode("utf-8") |
|
828 |
paths.add(path) |
|
829 |
while path != "": |
|
830 |
path = posixpath.dirname(path).strip("/") |
|
831 |
if path in paths: |
|
832 |
break
|
|
833 |
paths.add(path) |
|
834 |
return paths |
|
835 |
||
0.200.1716
by Jelmer Vernooij
Fix some more tests. |
836 |
def iter_child_entries(self, path, file_id=None): |
837 |
encoded_path = path.encode('utf-8') |
|
0.379.1
by Jelmer Vernooij
Improve unicode handling in GitWorkingTree. |
838 |
with self.lock_read(): |
839 |
parent_id = self.path2id(path) |
|
840 |
found_any = False |
|
841 |
seen_children = set() |
|
842 |
for item_path, value in self.index.iteritems(): |
|
843 |
if self.mapping.is_special_file(item_path): |
|
844 |
continue
|
|
845 |
if not osutils.is_inside(encoded_path, item_path): |
|
846 |
continue
|
|
847 |
found_any = True |
|
848 |
subpath = posixpath.relpath(item_path, encoded_path) |
|
849 |
if b'/' in subpath: |
|
850 |
dirname = subpath.split(b'/', 1)[0] |
|
851 |
file_ie = self._get_dir_ie(posixpath.join(path, dirname), parent_id) |
|
852 |
else: |
|
853 |
(parent, name) = posixpath.split(item_path) |
|
854 |
file_ie = self._get_file_ie( |
|
855 |
name.decode('utf-8'), |
|
856 |
item_path.decode('utf-8'), value, parent_id) |
|
857 |
yield file_ie |
|
858 |
if not found_any and path != u'': |
|
859 |
raise errors.NoSuchFile(path) |
|
0.200.1716
by Jelmer Vernooij
Fix some more tests. |
860 |
|
0.200.619
by Jelmer Vernooij
Provide dummy WorkingTree.conflicts() implementation rather than spending a lot of time not finding any conflicts. |
861 |
def conflicts(self): |
0.200.1675
by Jelmer Vernooij
Remove uses of decorators. |
862 |
with self.lock_read(): |
0.369.2
by Jelmer Vernooij
Fix tests. |
863 |
conflicts = _mod_conflicts.ConflictList() |
0.369.1
by Jelmer Vernooij
Implement conflict handling. |
864 |
for item_path, value in self.index.iteritems(): |
865 |
if value.flags & FLAG_STAGEMASK: |
|
866 |
conflicts.append(_mod_conflicts.TextConflict(item_path.decode('utf-8'))) |
|
867 |
return conflicts |
|
868 |
||
869 |
def set_conflicts(self, conflicts): |
|
870 |
by_path = set() |
|
871 |
for conflict in conflicts: |
|
872 |
if conflict.typestring in ('text conflict', 'contents conflict'): |
|
873 |
by_path.add(conflict.path.encode('utf-8')) |
|
874 |
else: |
|
875 |
raise errors.UnsupportedOperation(self.set_conflicts, self) |
|
876 |
with self.lock_tree_write(): |
|
877 |
for path in self.index: |
|
878 |
self._set_conflicted(path, path in by_path) |
|
879 |
||
880 |
def _set_conflicted(self, path, conflicted): |
|
881 |
trace.mutter('change conflict: %r -> %r', path, conflicted) |
|
882 |
value = self.index[path] |
|
0.415.1
by Jelmer Vernooij
Only write index when it's dirty. |
883 |
self._index_dirty = True |
0.369.1
by Jelmer Vernooij
Implement conflict handling. |
884 |
if conflicted: |
885 |
self.index[path] = (value[:9] + (value[9] | FLAG_STAGEMASK, )) |
|
886 |
else: |
|
887 |
self.index[path] = (value[:9] + (value[9] &~ FLAG_STAGEMASK, )) |
|
888 |
||
889 |
def add_conflicts(self, new_conflicts): |
|
890 |
with self.lock_tree_write(): |
|
891 |
for conflict in new_conflicts: |
|
892 |
if conflict.typestring in ('text conflict', 'contents conflict'): |
|
893 |
try: |
|
894 |
self._set_conflicted(conflict.path.encode('utf-8'), True) |
|
895 |
except KeyError: |
|
896 |
raise errors.UnsupportedOperation(self.add_conflicts, self) |
|
897 |
else: |
|
898 |
raise errors.UnsupportedOperation(self.add_conflicts, self) |
|
0.200.619
by Jelmer Vernooij
Provide dummy WorkingTree.conflicts() implementation rather than spending a lot of time not finding any conflicts. |
899 |
|
0.200.1705
by Jelmer Vernooij
Fix walkdirs. |
900 |
def walkdirs(self, prefix=""): |
0.324.1
by Jelmer Vernooij
initial work fixing walkdirs. |
901 |
"""Walk the directories of this tree. |
902 |
||
903 |
returns a generator which yields items in the form:
|
|
904 |
((curren_directory_path, fileid),
|
|
905 |
[(file1_path, file1_name, file1_kind, (lstat), file1_id,
|
|
906 |
file1_kind), ... ])
|
|
907 |
||
908 |
This API returns a generator, which is only valid during the current
|
|
909 |
tree transaction - within a single lock_read or lock_write duration.
|
|
910 |
||
911 |
If the tree is not locked, it may cause an error to be raised,
|
|
912 |
depending on the tree implementation.
|
|
913 |
"""
|
|
914 |
from bisect import bisect_left |
|
915 |
import operator |
|
916 |
disk_top = self.abspath(prefix) |
|
917 |
if disk_top.endswith('/'): |
|
918 |
disk_top = disk_top[:-1] |
|
919 |
top_strip_len = len(disk_top) + 1 |
|
920 |
inventory_iterator = self._walkdirs(prefix) |
|
921 |
disk_iterator = osutils.walkdirs(disk_top, prefix) |
|
922 |
try: |
|
923 |
current_disk = next(disk_iterator) |
|
924 |
disk_finished = False |
|
925 |
except OSError as e: |
|
926 |
if not (e.errno == errno.ENOENT or |
|
927 |
(sys.platform == 'win32' and e.errno == ERROR_PATH_NOT_FOUND)): |
|
928 |
raise
|
|
929 |
current_disk = None |
|
930 |
disk_finished = True |
|
931 |
try: |
|
932 |
current_inv = next(inventory_iterator) |
|
933 |
inv_finished = False |
|
934 |
except StopIteration: |
|
935 |
current_inv = None |
|
936 |
inv_finished = True |
|
937 |
while not inv_finished or not disk_finished: |
|
938 |
if current_disk: |
|
939 |
((cur_disk_dir_relpath, cur_disk_dir_path_from_top), |
|
940 |
cur_disk_dir_content) = current_disk |
|
941 |
else: |
|
942 |
((cur_disk_dir_relpath, cur_disk_dir_path_from_top), |
|
943 |
cur_disk_dir_content) = ((None, None), None) |
|
944 |
if not disk_finished: |
|
945 |
# strip out .bzr dirs
|
|
946 |
if (cur_disk_dir_path_from_top[top_strip_len:] == '' and |
|
947 |
len(cur_disk_dir_content) > 0): |
|
948 |
# osutils.walkdirs can be made nicer -
|
|
949 |
# yield the path-from-prefix rather than the pathjoined
|
|
950 |
# value.
|
|
951 |
bzrdir_loc = bisect_left(cur_disk_dir_content, |
|
952 |
('.git', '.git')) |
|
953 |
if (bzrdir_loc < len(cur_disk_dir_content) |
|
954 |
and self.controldir.is_control_filename( |
|
955 |
cur_disk_dir_content[bzrdir_loc][0])): |
|
956 |
# we dont yield the contents of, or, .bzr itself.
|
|
957 |
del cur_disk_dir_content[bzrdir_loc] |
|
958 |
if inv_finished: |
|
959 |
# everything is unknown
|
|
960 |
direction = 1 |
|
961 |
elif disk_finished: |
|
962 |
# everything is missing
|
|
963 |
direction = -1 |
|
964 |
else: |
|
965 |
direction = cmp(current_inv[0][0], cur_disk_dir_relpath) |
|
966 |
if direction > 0: |
|
967 |
# disk is before inventory - unknown
|
|
968 |
dirblock = [(relpath, basename, kind, stat, None, None) for |
|
969 |
relpath, basename, kind, stat, top_path in |
|
970 |
cur_disk_dir_content] |
|
971 |
yield (cur_disk_dir_relpath, None), dirblock |
|
972 |
try: |
|
973 |
current_disk = next(disk_iterator) |
|
974 |
except StopIteration: |
|
975 |
disk_finished = True |
|
976 |
elif direction < 0: |
|
977 |
# inventory is before disk - missing.
|
|
978 |
dirblock = [(relpath, basename, 'unknown', None, fileid, kind) |
|
979 |
for relpath, basename, dkind, stat, fileid, kind in |
|
980 |
current_inv[1]] |
|
981 |
yield (current_inv[0][0], current_inv[0][1]), dirblock |
|
982 |
try: |
|
983 |
current_inv = next(inventory_iterator) |
|
984 |
except StopIteration: |
|
985 |
inv_finished = True |
|
986 |
else: |
|
987 |
# versioned present directory
|
|
988 |
# merge the inventory and disk data together
|
|
989 |
dirblock = [] |
|
990 |
for relpath, subiterator in itertools.groupby(sorted( |
|
991 |
current_inv[1] + cur_disk_dir_content, |
|
992 |
key=operator.itemgetter(0)), operator.itemgetter(1)): |
|
993 |
path_elements = list(subiterator) |
|
994 |
if len(path_elements) == 2: |
|
995 |
inv_row, disk_row = path_elements |
|
996 |
# versioned, present file
|
|
997 |
dirblock.append((inv_row[0], |
|
998 |
inv_row[1], disk_row[2], |
|
999 |
disk_row[3], inv_row[4], |
|
1000 |
inv_row[5])) |
|
1001 |
elif len(path_elements[0]) == 5: |
|
1002 |
# unknown disk file
|
|
1003 |
dirblock.append((path_elements[0][0], |
|
1004 |
path_elements[0][1], path_elements[0][2], |
|
1005 |
path_elements[0][3], None, None)) |
|
1006 |
elif len(path_elements[0]) == 6: |
|
1007 |
# versioned, absent file.
|
|
1008 |
dirblock.append((path_elements[0][0], |
|
1009 |
path_elements[0][1], 'unknown', None, |
|
1010 |
path_elements[0][4], path_elements[0][5])) |
|
1011 |
else: |
|
1012 |
raise NotImplementedError('unreachable code') |
|
1013 |
yield current_inv[0], dirblock |
|
1014 |
try: |
|
1015 |
current_inv = next(inventory_iterator) |
|
1016 |
except StopIteration: |
|
1017 |
inv_finished = True |
|
1018 |
try: |
|
1019 |
current_disk = next(disk_iterator) |
|
1020 |
except StopIteration: |
|
1021 |
disk_finished = True |
|
1022 |
||
1023 |
def _walkdirs(self, prefix=""): |
|
0.200.1210
by Jelmer Vernooij
Implement GitWorkingTree._walkdirs. |
1024 |
if prefix != "": |
1025 |
prefix += "/" |
|
0.379.1
by Jelmer Vernooij
Improve unicode handling in GitWorkingTree. |
1026 |
prefix = prefix.encode('utf-8') |
0.353.1
by Jelmer Vernooij
Iterate over dirs in _walkdirs. |
1027 |
per_dir = defaultdict(set) |
0.325.2
by Jelmer Vernooij
Handle root in walkdirs. |
1028 |
if prefix == "": |
0.353.1
by Jelmer Vernooij
Iterate over dirs in _walkdirs. |
1029 |
per_dir[('', self.get_root_id())] = set() |
1030 |
def add_entry(path, kind): |
|
1031 |
if path == '' or not path.startswith(prefix): |
|
1032 |
return
|
|
0.200.1210
by Jelmer Vernooij
Implement GitWorkingTree._walkdirs. |
1033 |
(dirname, child_name) = posixpath.split(path) |
0.353.1
by Jelmer Vernooij
Iterate over dirs in _walkdirs. |
1034 |
add_entry(dirname, 'directory') |
0.200.1210
by Jelmer Vernooij
Implement GitWorkingTree._walkdirs. |
1035 |
dirname = dirname.decode("utf-8") |
1036 |
dir_file_id = self.path2id(dirname) |
|
0.361.2
by Jelmer Vernooij
Fix up assert. |
1037 |
if not isinstance(value, tuple) or len(value) != 10: |
0.361.1
by Jelmer Vernooij
Don't use assert. |
1038 |
raise ValueError(value) |
0.353.1
by Jelmer Vernooij
Iterate over dirs in _walkdirs. |
1039 |
per_dir[(dirname, dir_file_id)].add( |
0.200.1210
by Jelmer Vernooij
Implement GitWorkingTree._walkdirs. |
1040 |
(path.decode("utf-8"), child_name.decode("utf-8"), |
0.353.1
by Jelmer Vernooij
Iterate over dirs in _walkdirs. |
1041 |
kind, None, |
0.200.1210
by Jelmer Vernooij
Implement GitWorkingTree._walkdirs. |
1042 |
self.path2id(path.decode("utf-8")), |
0.353.1
by Jelmer Vernooij
Iterate over dirs in _walkdirs. |
1043 |
kind)) |
0.379.1
by Jelmer Vernooij
Improve unicode handling in GitWorkingTree. |
1044 |
with self.lock_read(): |
1045 |
for path, value in self.index.iteritems(): |
|
1046 |
if self.mapping.is_special_file(path): |
|
1047 |
continue
|
|
1048 |
if not path.startswith(prefix): |
|
1049 |
continue
|
|
1050 |
add_entry(path, mode_kind(value.mode)) |
|
6964.2.1
by Jelmer Vernooij
Initial work to support brz-git on python3. |
1051 |
return ((k, sorted(v)) for (k, v) in sorted(per_dir.items())) |
0.200.1542
by Jelmer Vernooij
Refactor iter_changes. |
1052 |
|
0.200.1677
by Jelmer Vernooij
Mark shelving as unsupported. |
1053 |
def get_shelf_manager(self): |
0.200.1729
by Jelmer Vernooij
ShelvingUnsupported doesn't take an argument. |
1054 |
raise workingtree.ShelvingUnsupported() |
0.200.1677
by Jelmer Vernooij
Mark shelving as unsupported. |
1055 |
|
0.200.1678
by Jelmer Vernooij
Fix tests. |
1056 |
def store_uncommitted(self): |
1057 |
raise errors.StoringUncommittedNotSupported(self) |
|
1058 |
||
0.200.1703
by Jelmer Vernooij
Implement apply_inventory_delta. |
1059 |
def apply_inventory_delta(self, changes): |
1060 |
for (old_path, new_path, file_id, ie) in changes: |
|
1061 |
if old_path is not None: |
|
0.429.25
by Jelmer Vernooij
Merge trunk. |
1062 |
(index, old_subpath) = self._lookup_index(old_path.encode('utf-8')) |
0.385.1
by Jelmer Vernooij
Use specific_files argument to Tree.iter_entries_by_dir. |
1063 |
try: |
0.429.25
by Jelmer Vernooij
Merge trunk. |
1064 |
self._index_del_entry(index, old_subpath) |
0.385.1
by Jelmer Vernooij
Use specific_files argument to Tree.iter_entries_by_dir. |
1065 |
except KeyError: |
1066 |
pass
|
|
1067 |
else: |
|
1068 |
self._versioned_dirs = None |
|
0.200.1703
by Jelmer Vernooij
Implement apply_inventory_delta. |
1069 |
if new_path is not None and ie.kind != 'directory': |
0.429.16
by Jelmer Vernooij
Look at reference_revision on ie. |
1070 |
if ie.kind == 'tree-reference': |
1071 |
self._index_add_entry( |
|
1072 |
new_path, ie.kind, |
|
1073 |
reference_revision=ie.reference_revision) |
|
1074 |
else: |
|
1075 |
self._index_add_entry(new_path, ie.kind) |
|
0.316.2
by Jelmer Vernooij
Flush after modifying index. |
1076 |
self.flush() |
0.200.1703
by Jelmer Vernooij
Implement apply_inventory_delta. |
1077 |
|
0.200.1756
by Jelmer Vernooij
Initial work on annotate support. |
1078 |
def annotate_iter(self, path, file_id=None, |
1079 |
default_revision=_mod_revision.CURRENT_REVISION): |
|
1080 |
"""See Tree.annotate_iter |
|
1081 |
||
1082 |
This implementation will use the basis tree implementation if possible.
|
|
1083 |
Lines not in the basis are attributed to CURRENT_REVISION
|
|
1084 |
||
1085 |
If there are pending merges, lines added by those merges will be
|
|
1086 |
incorrectly attributed to CURRENT_REVISION (but after committing, the
|
|
1087 |
attribution will be correct).
|
|
1088 |
"""
|
|
1089 |
with self.lock_read(): |
|
1090 |
maybe_file_parent_keys = [] |
|
1091 |
for parent_id in self.get_parent_ids(): |
|
1092 |
try: |
|
1093 |
parent_tree = self.revision_tree(parent_id) |
|
1094 |
except errors.NoSuchRevisionInTree: |
|
1095 |
parent_tree = self.branch.repository.revision_tree( |
|
1096 |
parent_id) |
|
1097 |
with parent_tree.lock_read(): |
|
1098 |
# TODO(jelmer): Use rename/copy tracker to find path name in parent
|
|
1099 |
parent_path = path |
|
1100 |
try: |
|
1101 |
kind = parent_tree.kind(parent_path) |
|
1102 |
except errors.NoSuchFile: |
|
1103 |
continue
|
|
1104 |
if kind != 'file': |
|
1105 |
# Note: this is slightly unnecessary, because symlinks and
|
|
1106 |
# directories have a "text" which is the empty text, and we
|
|
1107 |
# know that won't mess up annotations. But it seems cleaner
|
|
1108 |
continue
|
|
1109 |
parent_text_key = ( |
|
1110 |
parent_path, |
|
1111 |
parent_tree.get_file_revision(parent_path)) |
|
1112 |
if parent_text_key not in maybe_file_parent_keys: |
|
1113 |
maybe_file_parent_keys.append(parent_text_key) |
|
1114 |
graph = self.branch.repository.get_file_graph() |
|
1115 |
heads = graph.heads(maybe_file_parent_keys) |
|
1116 |
file_parent_keys = [] |
|
1117 |
for key in maybe_file_parent_keys: |
|
1118 |
if key in heads: |
|
1119 |
file_parent_keys.append(key) |
|
1120 |
||
1121 |
# Now we have the parents of this content
|
|
1122 |
from breezy.annotate import Annotator |
|
1123 |
from .annotate import AnnotateProvider |
|
1124 |
annotator = Annotator(AnnotateProvider( |
|
1125 |
self.branch.repository._file_change_scanner)) |
|
1126 |
text = self.get_file_text(path) |
|
1127 |
this_key = (path, default_revision) |
|
1128 |
annotator.add_special_text(this_key, file_parent_keys, text) |
|
1129 |
annotations = [(key[-1], line) |
|
1130 |
for key, line in annotator.annotate_flat(this_key)] |
|
1131 |
return annotations |
|
1132 |
||
0.360.4
by Jelmer Vernooij
Implement MemoryTree.rename_one, MemoryTree.mkdir. |
1133 |
def _rename_one(self, from_rel, to_rel): |
1134 |
os.rename(self.abspath(from_rel), self.abspath(to_rel)) |
|
1135 |
||
0.373.1
by Jelmer Vernooij
Fix WorkingTree.reset_state(). |
1136 |
def _build_checkout_with_index(self): |
1137 |
build_index_from_tree( |
|
1138 |
self.user_transport.local_abspath('.'), |
|
1139 |
self.control_transport.local_abspath("index"), |
|
1140 |
self.store, |
|
1141 |
None if self.branch.head is None else self.store[self.branch.head].tree) |
|
1142 |
||
0.371.1
by Jelmer Vernooij
Implement WorkingTree.reset_state(). |
1143 |
def reset_state(self, revision_ids=None): |
1144 |
"""Reset the state of the working tree. |
|
1145 |
||
1146 |
This does a hard-reset to a last-known-good state. This is a way to
|
|
1147 |
fix if something got corrupted (like the .git/index file)
|
|
1148 |
"""
|
|
1149 |
with self.lock_tree_write(): |
|
1150 |
if revision_ids is not None: |
|
1151 |
self.set_parent_ids(revision_ids) |
|
0.373.1
by Jelmer Vernooij
Fix WorkingTree.reset_state(). |
1152 |
self.index.clear() |
0.415.1
by Jelmer Vernooij
Only write index when it's dirty. |
1153 |
self._index_dirty = True |
0.373.1
by Jelmer Vernooij
Fix WorkingTree.reset_state(). |
1154 |
if self.branch.head is not None: |
1155 |
for entry in self.store.iter_tree_contents(self.store[self.branch.head].tree): |
|
1156 |
if not validate_path(entry.path): |
|
1157 |
continue
|
|
1158 |
||
1159 |
if S_ISGITLINK(entry.mode): |
|
1160 |
pass # TODO(jelmer): record and return submodule paths |
|
1161 |
else: |
|
1162 |
# Let's at least try to use the working tree file:
|
|
1163 |
try: |
|
1164 |
st = self._lstat(self.abspath(entry.path)) |
|
6964.2.1
by Jelmer Vernooij
Initial work to support brz-git on python3. |
1165 |
except OSError: |
0.373.1
by Jelmer Vernooij
Fix WorkingTree.reset_state(). |
1166 |
# But if it doesn't exist, we'll make something up.
|
1167 |
obj = self.store[entry.sha] |
|
1168 |
st = os.stat_result((entry.mode, 0, 0, 0, |
|
1169 |
0, 0, len(obj.as_raw_string()), 0, |
|
1170 |
0, 0)) |
|
0.429.2
by Jelmer Vernooij
Some more work on submodule support. |
1171 |
(index, subpath) = self._lookup_index(entry.path) |
1172 |
index[subpath] = index_entry_from_stat(st, entry.sha, 0) |
|
0.371.1
by Jelmer Vernooij
Implement WorkingTree.reset_state(). |
1173 |
|
0.380.1
by Jelmer Vernooij
Implement WorkingTree.pull. |
1174 |
def pull(self, source, overwrite=False, stop_revision=None, |
1175 |
change_reporter=None, possible_transports=None, local=False, |
|
1176 |
show_base=False): |
|
1177 |
with self.lock_write(), source.lock_read(): |
|
1178 |
old_revision = self.branch.last_revision() |
|
1179 |
basis_tree = self.basis_tree() |
|
1180 |
count = self.branch.pull(source, overwrite, stop_revision, |
|
1181 |
possible_transports=possible_transports, |
|
1182 |
local=local) |
|
1183 |
new_revision = self.branch.last_revision() |
|
1184 |
if new_revision != old_revision: |
|
1185 |
with basis_tree.lock_read(): |
|
1186 |
new_basis_tree = self.branch.basis_tree() |
|
1187 |
merge.merge_inner( |
|
1188 |
self.branch, |
|
1189 |
new_basis_tree, |
|
1190 |
basis_tree, |
|
1191 |
this_tree=self, |
|
1192 |
change_reporter=change_reporter, |
|
1193 |
show_base=show_base) |
|
1194 |
return count |
|
1195 |
||
0.429.2
by Jelmer Vernooij
Some more work on submodule support. |
1196 |
def add_reference(self, sub_tree): |
1197 |
"""Add a TreeReference to the tree, pointing at sub_tree. |
|
1198 |
||
1199 |
:param sub_tree: subtree to add.
|
|
1200 |
"""
|
|
1201 |
with self.lock_tree_write(): |
|
1202 |
try: |
|
1203 |
sub_tree_path = self.relpath(sub_tree.basedir) |
|
1204 |
except errors.PathNotChild: |
|
1205 |
raise BadReferenceTarget( |
|
1206 |
self, sub_tree, 'Target not inside tree.') |
|
1207 |
||
1208 |
self._add([sub_tree_path], [None], ['tree-reference']) |
|
1209 |
||
0.429.10
by Jelmer Vernooij
use new read_submodule_head from dulwich. |
1210 |
def _read_submodule_head(self, path): |
1211 |
return read_submodule_head(self.abspath(path)) |
|
1212 |
||
0.429.5
by Jelmer Vernooij
Fix tree_content_summary test. |
1213 |
def get_reference_revision(self, path, file_id=None): |
1214 |
hexsha = self._read_submodule_head(path) |
|
0.429.16
by Jelmer Vernooij
Look at reference_revision on ie. |
1215 |
if hexsha is None: |
1216 |
return _mod_revision.NULL_REVISION |
|
0.429.5
by Jelmer Vernooij
Fix tree_content_summary test. |
1217 |
return self.branch.lookup_foreign_revision_id(hexsha) |
1218 |
||
0.429.2
by Jelmer Vernooij
Some more work on submodule support. |
1219 |
def get_nested_tree(self, path, file_id=None): |
1220 |
return workingtree.WorkingTree.open(self.abspath(path)) |
|
1221 |
||
0.429.5
by Jelmer Vernooij
Fix tree_content_summary test. |
1222 |
def _directory_is_tree_reference(self, relpath): |
1223 |
# as a special case, if a directory contains control files then
|
|
1224 |
# it's a tree reference, except that the root of the tree is not
|
|
1225 |
return relpath and osutils.lexists(self.abspath(relpath) + u"/.git") |
|
1226 |
||
0.429.15
by Jelmer Vernooij
Autodetect tree-reference based on index. |
1227 |
def extract(self, sub_path, file_id=None, format=None): |
1228 |
"""Extract a subtree from this tree. |
|
1229 |
||
1230 |
A new branch will be created, relative to the path for this tree.
|
|
1231 |
"""
|
|
1232 |
def mkdirs(path): |
|
1233 |
segments = osutils.splitpath(path) |
|
1234 |
transport = self.branch.controldir.root_transport |
|
1235 |
for name in segments: |
|
1236 |
transport = transport.clone(name) |
|
1237 |
transport.ensure_base() |
|
1238 |
return transport |
|
1239 |
||
1240 |
with self.lock_tree_write(): |
|
1241 |
self.flush() |
|
1242 |
branch_transport = mkdirs(sub_path) |
|
1243 |
if format is None: |
|
1244 |
format = self.controldir.cloning_metadir() |
|
1245 |
branch_transport.ensure_base() |
|
1246 |
branch_bzrdir = format.initialize_on_transport(branch_transport) |
|
1247 |
try: |
|
1248 |
repo = branch_bzrdir.find_repository() |
|
1249 |
except errors.NoRepositoryPresent: |
|
1250 |
repo = branch_bzrdir.create_repository() |
|
1251 |
if not repo.supports_rich_root(): |
|
1252 |
raise errors.RootNotRich() |
|
1253 |
new_branch = branch_bzrdir.create_branch() |
|
1254 |
new_branch.pull(self.branch) |
|
1255 |
for parent_id in self.get_parent_ids(): |
|
1256 |
new_branch.fetch(self.branch, parent_id) |
|
1257 |
tree_transport = self.controldir.root_transport.clone(sub_path) |
|
1258 |
if tree_transport.base != branch_transport.base: |
|
1259 |
tree_bzrdir = format.initialize_on_transport(tree_transport) |
|
1260 |
tree_bzrdir.set_branch_reference(new_branch) |
|
1261 |
else: |
|
1262 |
tree_bzrdir = branch_bzrdir |
|
1263 |
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION) |
|
1264 |
wt.set_parent_ids(self.get_parent_ids()) |
|
1265 |
return wt |
|
1266 |
||
0.425.1
by Jelmer Vernooij
Add really basic check implementation. |
1267 |
def _get_check_refs(self): |
1268 |
"""Return the references needed to perform a check of this tree. |
|
1269 |
||
1270 |
The default implementation returns no refs, and is only suitable for
|
|
1271 |
trees that have no local caching and can commit on ghosts at any time.
|
|
1272 |
||
1273 |
:seealso: breezy.check for details about check_refs.
|
|
1274 |
"""
|
|
1275 |
return [] |
|
1276 |
||
0.428.1
by Jelmer Vernooij
Fix clone_preserves_content test. |
1277 |
def copy_content_into(self, tree, revision_id=None): |
1278 |
"""Copy the current content and user files of this tree into tree.""" |
|
1279 |
with self.lock_read(): |
|
1280 |
if revision_id is None: |
|
1281 |
merge.transform_tree(tree, self) |
|
1282 |
else: |
|
1283 |
# TODO now merge from tree.last_revision to revision (to
|
|
1284 |
# preserve user local changes)
|
|
1285 |
try: |
|
1286 |
other_tree = self.revision_tree(revision_id) |
|
1287 |
except errors.NoSuchRevision: |
|
1288 |
other_tree = self.branch.repository.revision_tree( |
|
1289 |
revision_id) |
|
1290 |
||
1291 |
merge.transform_tree(tree, other_tree) |
|
1292 |
if revision_id == _mod_revision.NULL_REVISION: |
|
1293 |
new_parents = [] |
|
1294 |
else: |
|
1295 |
new_parents = [revision_id] |
|
1296 |
tree.set_parent_ids(new_parents) |
|
1297 |
||
0.200.1308
by Jelmer Vernooij
Write index to disk after adding files. |
1298 |
|
0.200.90
by Jelmer Vernooij
Basic support for opening working trees. |
1299 |
class GitWorkingTreeFormat(workingtree.WorkingTreeFormat): |
1300 |
||
0.200.1206
by Jelmer Vernooij
Implement GitWorkingTree.all_file_ids. |
1301 |
_tree_class = GitWorkingTree |
1302 |
||
0.200.1295
by Jelmer Vernooij
Mark working trees as not supporting directories. |
1303 |
supports_versioned_directories = False |
1304 |
||
0.200.1661
by Jelmer Vernooij
Set supports_setting_file_ids to False. |
1305 |
supports_setting_file_ids = False |
1306 |
||
0.200.1677
by Jelmer Vernooij
Mark shelving as unsupported. |
1307 |
supports_store_uncommitted = False |
1308 |
||
0.200.1723
by Jelmer Vernooij
Set supports_leftmost_parent_id_as_ghost property. |
1309 |
supports_leftmost_parent_id_as_ghost = False |
1310 |
||
0.200.1779
by Jelmer Vernooij
Actually store git revision ids rather than bzr revision ids. |
1311 |
supports_righthand_parent_id_as_ghost = False |
1312 |
||
0.200.1768
by Jelmer Vernooij
Fix handling of normalized filenames. |
1313 |
requires_normalized_unicode_filenames = True |
1314 |
||
0.367.1
by Jelmer Vernooij
Set supports_merge_modified flag. |
1315 |
supports_merge_modified = False |
1316 |
||
0.200.656
by Jelmer Vernooij
Implement GitWorkingTreeFormat._matchingbzrdir. |
1317 |
@property
|
0.200.1665
by Jelmer Vernooij
Rename _matchingbzrdir to _matchingcnotroldir. |
1318 |
def _matchingcontroldir(self): |
0.200.1641
by Jelmer Vernooij
Use relative imports where possible. |
1319 |
from .dir import LocalGitControlDirFormat |
0.200.1013
by Jelmer Vernooij
More renames. |
1320 |
return LocalGitControlDirFormat() |
0.200.656
by Jelmer Vernooij
Implement GitWorkingTreeFormat._matchingbzrdir. |
1321 |
|
0.200.90
by Jelmer Vernooij
Basic support for opening working trees. |
1322 |
def get_format_description(self): |
1323 |
return "Git Working Tree" |
|
0.200.616
by Jelmer Vernooij
Provide custom intertree implementation for GitRevisionTree->GitWorkingTree. |
1324 |
|
0.200.1648
by Jelmer Vernooij
Fix compatibility with newer versions of breezy. |
1325 |
def initialize(self, a_controldir, revision_id=None, from_branch=None, |
0.200.1096
by Jelmer Vernooij
Implement GitWorkingTreeFormat.initialize. |
1326 |
accelerator_tree=None, hardlink=False): |
1327 |
"""See WorkingTreeFormat.initialize().""" |
|
0.200.1648
by Jelmer Vernooij
Fix compatibility with newer versions of breezy. |
1328 |
if not isinstance(a_controldir, LocalGitDir): |
1329 |
raise errors.IncompatibleFormat(self, a_controldir) |
|
0.388.2
by Jelmer Vernooij
Allow opening nascent branches when opening trees. |
1330 |
branch = a_controldir.open_branch(nascent_ok=True) |
0.308.1
by Jelmer Vernooij
Set revision id if specified to WorkingTreeFormat.initialize. |
1331 |
if revision_id is not None: |
1332 |
branch.set_last_revision(revision_id) |
|
0.200.1680
by Jelmer Vernooij
Fix repo locks. |
1333 |
wt = GitWorkingTree( |
0.415.3
by Jelmer Vernooij
Open index on demand. |
1334 |
a_controldir, a_controldir.open_repository(), branch) |
0.200.1680
by Jelmer Vernooij
Fix repo locks. |
1335 |
for hook in MutableTree.hooks['post_build_tree']: |
1336 |
hook(wt) |
|
1337 |
return wt |