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