bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
5630.2.2
by John Arbash Meinel
Start fleshing out the design. Something weird is causing my tests to all fail. |
1 |
# Copyright (C) 2005-2011 Canonical Ltd
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
2 |
#
|
|
453
by Martin Pool
- Split WorkingTree into its own file |
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.
|
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
7 |
#
|
|
453
by Martin Pool
- Split WorkingTree into its own file |
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.
|
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
12 |
#
|
|
453
by Martin Pool
- Split WorkingTree into its own file |
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
|
|
|
4183.7.1
by Sabin Iacob
update FSF mailing address |
15 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
453
by Martin Pool
- Split WorkingTree into its own file |
16 |
|
|
1185.16.72
by Martin Pool
[merge] from robert and fix up tests |
17 |
"""WorkingTree object and friends.
|
18 |
||
19 |
A WorkingTree represents the editable working copy of a branch.
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
20 |
Operations which represent the WorkingTree are also done here,
|
|
6672.2.6
by Jelmer Vernooij
Some cleanups. |
21 |
such as renaming or adding files.
|
|
1185.16.72
by Martin Pool
[merge] from robert and fix up tests |
22 |
|
23 |
At the moment every WorkingTree has its own branch. Remote
|
|
24 |
WorkingTrees aren't supported.
|
|
25 |
||
|
6681.2.4
by Jelmer Vernooij
More renames. |
26 |
To get a WorkingTree, call controldir.open_workingtree() or
|
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
27 |
WorkingTree.open(dir).
|
|
1185.16.72
by Martin Pool
[merge] from robert and fix up tests |
28 |
"""
|
29 |
||
|
6379.6.7
by Jelmer Vernooij
Move importing from future until after doc string, otherwise the doc string will disappear. |
30 |
from __future__ import absolute_import |
|
956
by Martin Pool
doc |
31 |
|
|
6621.22.2
by Martin
Use BytesIO or StringIO from bzrlib.sixish |
32 |
import errno |
|
1996.3.6
by John Arbash Meinel
Find a few places that weren't importing their dependencies. |
33 |
import os |
|
6621.22.2
by Martin
Use BytesIO or StringIO from bzrlib.sixish |
34 |
import re |
|
2423.2.1
by Alexander Belchenko
Fix for walkdirs in missing dir with Py2.4 @ win32 |
35 |
import sys |
|
1996.3.6
by John Arbash Meinel
Find a few places that weren't importing their dependencies. |
36 |
|
|
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
37 |
import breezy |
38 |
||
39 |
from .lazy_import import lazy_import |
|
|
1996.3.6
by John Arbash Meinel
Find a few places that weren't importing their dependencies. |
40 |
lazy_import(globals(), """ |
|
1852.15.7
by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs. |
41 |
from bisect import bisect_left
|
42 |
import itertools
|
|
43 |
import operator
|
|
|
1398
by Robert Collins
integrate in Gustavos x-bit patch |
44 |
import stat
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
45 |
|
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
46 |
from breezy import (
|
|
1731.2.17
by Aaron Bentley
Support extracting with checkouts |
47 |
branch,
|
|
1996.3.6
by John Arbash Meinel
Find a few places that weren't importing their dependencies. |
48 |
conflicts as _mod_conflicts,
|
|
5363.2.10
by Jelmer Vernooij
base ControlDir on ControlComponent. |
49 |
controldir,
|
|
1996.3.6
by John Arbash Meinel
Find a few places that weren't importing their dependencies. |
50 |
errors,
|
|
5745.3.2
by Jelmer Vernooij
Add filters to import tariff blacklist. |
51 |
filters as _mod_filters,
|
|
2116.4.1
by John Arbash Meinel
Update file and revision id generators. |
52 |
generate_ids,
|
|
1996.3.6
by John Arbash Meinel
Find a few places that weren't importing their dependencies. |
53 |
merge,
|
|
2598.5.1
by Aaron Bentley
Start eliminating the use of None to indicate null revision |
54 |
revision as _mod_revision,
|
|
6538.1.5
by Aaron Bentley
Implement WorkingTree.store_uncommitted. |
55 |
shelf,
|
|
1996.3.6
by John Arbash Meinel
Find a few places that weren't importing their dependencies. |
56 |
transform,
|
|
6653.3.9
by Jelmer Vernooij
Missing import. |
57 |
transport,
|
|
2323.6.2
by Martin Pool
Move responsibility for suggesting upgrades to ui object |
58 |
ui,
|
|
3586.1.3
by Ian Clatworthy
add views attribute to working trees |
59 |
views,
|
|
1731.2.17
by Aaron Bentley
Support extracting with checkouts |
60 |
)
|
|
1996.3.6
by John Arbash Meinel
Find a few places that weren't importing their dependencies. |
61 |
""") |
62 |
||
|
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
63 |
from . import ( |
|
6621.22.2
by Martin
Use BytesIO or StringIO from bzrlib.sixish |
64 |
osutils, |
|
6213.1.35
by Jelmer Vernooij
Simplify importing of bzrdir. |
65 |
)
|
|
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
66 |
from .decorators import needs_read_lock, needs_write_lock |
67 |
from .i18n import gettext |
|
68 |
from . import mutabletree |
|
69 |
from .mutabletree import needs_tree_write_lock |
|
|
6695.3.1
by Martin
Remove remaining uses of basestring from the codebase |
70 |
from .sixish import ( |
71 |
text_type, |
|
72 |
)
|
|
|
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
73 |
from .trace import mutter, note |
|
1996.3.6
by John Arbash Meinel
Find a few places that weren't importing their dependencies. |
74 |
|
75 |
||
|
2423.2.1
by Alexander Belchenko
Fix for walkdirs in missing dir with Py2.4 @ win32 |
76 |
ERROR_PATH_NOT_FOUND = 3 # WindowsError errno code, equivalent to ENOENT |
77 |
||
|
2116.4.1
by John Arbash Meinel
Update file and revision id generators. |
78 |
|
|
6741.1.1
by Jelmer Vernooij
Add WorkingTreeFormat.supports_setting_file_ids. |
79 |
class SettingFileIdUnsupported(errors.BzrError): |
80 |
||
81 |
_fmt = "This format does not support setting file ids.""" |
|
82 |
||
83 |
||
|
1399.1.2
by Robert Collins
push kind character creation into InventoryEntry and TreeEntry |
84 |
class TreeEntry(object): |
|
1759.2.1
by Jelmer Vernooij
Fix some types (found using aspell). |
85 |
"""An entry that implements the minimum interface used by commands. |
|
1399.1.2
by Robert Collins
push kind character creation into InventoryEntry and TreeEntry |
86 |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
87 |
This needs further inspection, it may be better to have
|
|
1399.1.2
by Robert Collins
push kind character creation into InventoryEntry and TreeEntry |
88 |
InventoryEntries without ids - though that seems wrong. For now,
|
89 |
this is a parallel hierarchy to InventoryEntry, and needs to become
|
|
90 |
one of several things: decorates to that hierarchy, children of, or
|
|
91 |
parents of it.
|
|
|
1399.1.3
by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes |
92 |
Another note is that these objects are currently only used when there is
|
93 |
no InventoryEntry available - i.e. for unversioned objects.
|
|
94 |
Perhaps they should be UnversionedEntry et al. ? - RBC 20051003
|
|
|
1399.1.2
by Robert Collins
push kind character creation into InventoryEntry and TreeEntry |
95 |
"""
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
96 |
|
|
1399.1.2
by Robert Collins
push kind character creation into InventoryEntry and TreeEntry |
97 |
def __eq__(self, other): |
98 |
# yes, this us ugly, TODO: best practice __eq__ style.
|
|
99 |
return (isinstance(other, TreeEntry) |
|
100 |
and other.__class__ == self.__class__) |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
101 |
|
|
1399.1.2
by Robert Collins
push kind character creation into InventoryEntry and TreeEntry |
102 |
def kind_character(self): |
103 |
return "???" |
|
104 |
||
105 |
||
106 |
class TreeDirectory(TreeEntry): |
|
107 |
"""See TreeEntry. This is a directory in a working tree.""" |
|
108 |
||
109 |
def __eq__(self, other): |
|
110 |
return (isinstance(other, TreeDirectory) |
|
111 |
and other.__class__ == self.__class__) |
|
112 |
||
113 |
def kind_character(self): |
|
114 |
return "/" |
|
115 |
||
116 |
||
117 |
class TreeFile(TreeEntry): |
|
118 |
"""See TreeEntry. This is a regular file in a working tree.""" |
|
119 |
||
120 |
def __eq__(self, other): |
|
121 |
return (isinstance(other, TreeFile) |
|
122 |
and other.__class__ == self.__class__) |
|
123 |
||
124 |
def kind_character(self): |
|
125 |
return '' |
|
126 |
||
127 |
||
128 |
class TreeLink(TreeEntry): |
|
129 |
"""See TreeEntry. This is a symlink in a working tree.""" |
|
130 |
||
131 |
def __eq__(self, other): |
|
132 |
return (isinstance(other, TreeLink) |
|
133 |
and other.__class__ == self.__class__) |
|
134 |
||
135 |
def kind_character(self): |
|
136 |
return '' |
|
137 |
||
138 |
||
|
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
139 |
class WorkingTree(mutabletree.MutableTree, |
|
5363.2.10
by Jelmer Vernooij
base ControlDir on ControlComponent. |
140 |
controldir.ControlComponent): |
|
453
by Martin Pool
- Split WorkingTree into its own file |
141 |
"""Working copy tree. |
142 |
||
|
5335.1.2
by Robert Collins
Add note that basedir is a unicode object as per John's review. |
143 |
:ivar basedir: The root of the tree on disk. This is a unicode path object
|
144 |
(as opposed to a URL).
|
|
|
453
by Martin Pool
- Split WorkingTree into its own file |
145 |
"""
|
|
1442.1.65
by Robert Collins
Branch.remove has been moved to WorkingTree. |
146 |
|
|
3586.1.3
by Ian Clatworthy
add views attribute to working trees |
147 |
# override this to set the strategy for storing views
|
148 |
def _make_views(self): |
|
149 |
return views.DisabledViews(self) |
|
150 |
||
|
1534.4.51
by Robert Collins
Test the disk layout of format3 working trees. |
151 |
def __init__(self, basedir='.', |
|
6630.1.1
by Jelmer Vernooij
Remove deprecated functionality. |
152 |
branch=None, |
|
1534.4.51
by Robert Collins
Test the disk layout of format3 working trees. |
153 |
_internal=False, |
|
6313.1.1
by Jelmer Vernooij
Move bzr-specific functionality to InventoryWorkingTree. |
154 |
_transport=None, |
|
1534.4.51
by Robert Collins
Test the disk layout of format3 working trees. |
155 |
_format=None, |
|
6681.2.4
by Jelmer Vernooij
More renames. |
156 |
_controldir=None): |
|
2367.2.1
by Robert Collins
Remove bzrlib 0.8 compatability where it was making the code unclear or messy. (Robert Collins) |
157 |
"""Construct a WorkingTree instance. This is not a public API. |
|
1457.1.1
by Robert Collins
rather than getting the branch inventory, WorkingTree can use the whole Branch, or make its own. |
158 |
|
|
2367.2.1
by Robert Collins
Remove bzrlib 0.8 compatability where it was making the code unclear or messy. (Robert Collins) |
159 |
:param branch: A branch to override probing for the branch.
|
|
1457.1.1
by Robert Collins
rather than getting the branch inventory, WorkingTree can use the whole Branch, or make its own. |
160 |
"""
|
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
161 |
self._format = _format |
|
6681.2.4
by Jelmer Vernooij
More renames. |
162 |
self.controldir = _controldir |
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
163 |
if not _internal: |
|
6681.2.4
by Jelmer Vernooij
More renames. |
164 |
raise errors.BzrError("Please use controldir.open_workingtree or " |
|
2367.2.1
by Robert Collins
Remove bzrlib 0.8 compatability where it was making the code unclear or messy. (Robert Collins) |
165 |
"WorkingTree.open() to obtain a WorkingTree.") |
|
6653.3.1
by Jelmer Vernooij
Move bzr-specific code to breezy.bzrworkingtree. |
166 |
basedir = osutils.safe_unicode(basedir) |
|
1534.5.3
by Robert Collins
Make format 4/5/6 branches share a single LockableFiles instance across wt/branch/repository. |
167 |
mutter("opening working tree %r", basedir) |
|
6630.1.1
by Jelmer Vernooij
Remove deprecated functionality. |
168 |
if branch is not None: |
|
6313.1.4
by Jelmer Vernooij
Fix tests. |
169 |
self._branch = branch |
170 |
else: |
|
|
6653.6.1
by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir. |
171 |
self._branch = self.controldir.open_branch() |
|
6653.3.1
by Jelmer Vernooij
Move bzr-specific code to breezy.bzrworkingtree. |
172 |
self.basedir = osutils.realpath(basedir) |
|
6313.1.1
by Jelmer Vernooij
Move bzr-specific functionality to InventoryWorkingTree. |
173 |
self._transport = _transport |
|
3398.1.24
by Ian Clatworthy
make iter_search_rules a tree method |
174 |
self._rules_searcher = None |
|
3586.1.3
by Ian Clatworthy
add views attribute to working trees |
175 |
self.views = self._make_views() |
|
3034.4.3
by Aaron Bentley
Add case-sensitivity handling to WorkingTree |
176 |
|
|
5158.6.5
by Martin Pool
Implement ControlComponent on WorkingTree |
177 |
@property
|
178 |
def user_transport(self): |
|
|
6653.6.1
by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir. |
179 |
return self.controldir.user_transport |
|
5158.6.5
by Martin Pool
Implement ControlComponent on WorkingTree |
180 |
|
181 |
@property
|
|
182 |
def control_transport(self): |
|
183 |
return self._transport |
|
184 |
||
|
5699.2.1
by Jelmer Vernooij
Move is_control_filename() from Tree to MutableTree. |
185 |
def is_control_filename(self, filename): |
186 |
"""True if filename is the name of a control file in this tree. |
|
187 |
||
188 |
:param filename: A filename within the tree. This is a relative path
|
|
|
5891.1.2
by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier. |
189 |
from the root of this tree.
|
|
5699.2.1
by Jelmer Vernooij
Move is_control_filename() from Tree to MutableTree. |
190 |
|
191 |
This is true IF and ONLY IF the filename is part of the meta data
|
|
192 |
that bzr controls in this tree. I.E. a random .bzr directory placed
|
|
193 |
on disk will not be a control file for this tree.
|
|
194 |
"""
|
|
|
6653.6.1
by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir. |
195 |
return self.controldir.is_control_filename(filename) |
|
5699.2.1
by Jelmer Vernooij
Move is_control_filename() from Tree to MutableTree. |
196 |
|
|
1681.1.1
by Robert Collins
Make WorkingTree.branch a read only property. (Robert Collins) |
197 |
branch = property( |
198 |
fget=lambda self: self._branch, |
|
199 |
doc="""The branch this WorkingTree is connected to. |
|
200 |
||
201 |
This cannot be set - it is reflective of the actual disk structure
|
|
202 |
the working tree has been constructed from.
|
|
203 |
""") |
|
204 |
||
|
6110.6.1
by Jelmer Vernooij
Add Tree.has_versioned_directories. |
205 |
def has_versioned_directories(self): |
206 |
"""See `Tree.has_versioned_directories`.""" |
|
207 |
return self._format.supports_versioned_directories |
|
208 |
||
|
6379.7.2
by Jelmer Vernooij
Deprecate supports_executable, move check to working tree. |
209 |
def _supports_executable(self): |
210 |
if sys.platform == 'win32': |
|
211 |
return False |
|
212 |
# FIXME: Ideally this should check the file system
|
|
213 |
return True |
|
214 |
||
|
1687.1.9
by Robert Collins
Teach WorkingTree about break-lock. |
215 |
def break_lock(self): |
216 |
"""Break a lock if one is present from another instance. |
|
217 |
||
218 |
Uses the ui factory to ask for confirmation if the lock may be from
|
|
219 |
an active process.
|
|
220 |
||
221 |
This will probe the repository for its lock as well.
|
|
222 |
"""
|
|
|
6313.1.1
by Jelmer Vernooij
Move bzr-specific functionality to InventoryWorkingTree. |
223 |
raise NotImplementedError(self.break_lock) |
|
1687.1.9
by Robert Collins
Teach WorkingTree about break-lock. |
224 |
|
|
2100.3.14
by Aaron Bentley
Test workingtree4 format, prevent use with old repos |
225 |
def requires_rich_root(self): |
226 |
return self._format.requires_rich_root |
|
227 |
||
|
2100.3.20
by Aaron Bentley
Implement tree comparison for tree references |
228 |
def supports_tree_reference(self): |
|
2255.2.232
by Robert Collins
Make WorkingTree4 report support for references based on the repositories capabilities. |
229 |
return False |
|
2100.3.20
by Aaron Bentley
Implement tree comparison for tree references |
230 |
|
|
3907.2.1
by Ian Clatworthy
WorkingTreeFormat5 supporting content filtering and views |
231 |
def supports_content_filtering(self): |
232 |
return self._format.supports_content_filtering() |
|
233 |
||
|
3586.1.3
by Ian Clatworthy
add views attribute to working trees |
234 |
def supports_views(self): |
235 |
return self.views.supports_views() |
|
236 |
||
|
6741.1.1
by Jelmer Vernooij
Add WorkingTreeFormat.supports_setting_file_ids. |
237 |
def supports_setting_file_ids(self): |
238 |
return self._format.supports_setting_file_ids |
|
239 |
||
|
6449.4.1
by Jelmer Vernooij
Add convenience method WorkingTree.get_config_stack(). |
240 |
def get_config_stack(self): |
|
6449.4.5
by Jelmer Vernooij
Review feedback from vila. |
241 |
"""Retrieve the config stack for this tree. |
242 |
||
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
243 |
:return: A ``breezy.config.Stack``
|
|
6449.4.5
by Jelmer Vernooij
Review feedback from vila. |
244 |
"""
|
245 |
# For the moment, just provide the branch config stack.
|
|
|
6449.4.1
by Jelmer Vernooij
Add convenience method WorkingTree.get_config_stack(). |
246 |
return self.branch.get_config_stack() |
247 |
||
|
1508.1.1
by Robert Collins
Provide a open_containing for WorkingTree. |
248 |
@staticmethod
|
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
249 |
def open(path=None, _unsupported=False): |
250 |
"""Open an existing working tree at path. |
|
251 |
||
252 |
"""
|
|
253 |
if path is None: |
|
|
3753.1.1
by John Arbash Meinel
Add some simple direct tests for WT.open and WT.open_containing. |
254 |
path = osutils.getcwd() |
|
6402.3.3
by Jelmer Vernooij
Simplify safe open a bit more. |
255 |
control = controldir.ControlDir.open(path, _unsupported=_unsupported) |
|
6402.1.1
by Jelmer Vernooij
Simplify probing. |
256 |
return control.open_workingtree(unsupported=_unsupported) |
|
3753.1.1
by John Arbash Meinel
Add some simple direct tests for WT.open and WT.open_containing. |
257 |
|
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
258 |
@staticmethod
|
|
1508.1.1
by Robert Collins
Provide a open_containing for WorkingTree. |
259 |
def open_containing(path=None): |
260 |
"""Open an existing working tree which has its root about path. |
|
|
3753.1.1
by John Arbash Meinel
Add some simple direct tests for WT.open and WT.open_containing. |
261 |
|
|
1508.1.1
by Robert Collins
Provide a open_containing for WorkingTree. |
262 |
This probes for a working tree at path and searches upwards from there.
|
263 |
||
264 |
Basically we keep looking up until we find the control directory or
|
|
265 |
run into /. If there isn't one, raises NotBranchError.
|
|
266 |
TODO: give this a new exception.
|
|
267 |
If there is one, it is returned, along with the unused portion of path.
|
|
|
1685.1.27
by John Arbash Meinel
BzrDir works in URLs, but WorkingTree works in unicode paths |
268 |
|
269 |
:return: The WorkingTree that contains 'path', and the rest of path
|
|
|
1508.1.1
by Robert Collins
Provide a open_containing for WorkingTree. |
270 |
"""
|
271 |
if path is None: |
|
|
1830.3.14
by John Arbash Meinel
WorkingTree.open_containing() was directly calling os.getcwdu(), which on mac returns the wrong normalization, and on win32 would have the wrong slashes |
272 |
path = osutils.getcwd() |
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
273 |
control, relpath = controldir.ControlDir.open_containing(path) |
|
1685.1.28
by John Arbash Meinel
Changing open_containing to always return a unicode path. |
274 |
return control.open_workingtree(), relpath |
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
275 |
|
276 |
@staticmethod
|
|
|
5521.1.1
by Vincent Ladeuil
Handle --directory when paths are also provided to shelve and restore. |
277 |
def open_containing_paths(file_list, default_directory=None, |
278 |
canonicalize=True, apply_view=True): |
|
|
5346.4.2
by Martin Pool
Move internal_tree_files and safe_relpath_files onto WorkingTree |
279 |
"""Open the WorkingTree that contains a set of paths. |
280 |
||
281 |
Fail if the paths given are not all in a single tree.
|
|
282 |
||
283 |
This is used for the many command-line interfaces that take a list of
|
|
284 |
any number of files and that require they all be in the same tree.
|
|
285 |
"""
|
|
|
5521.1.1
by Vincent Ladeuil
Handle --directory when paths are also provided to shelve and restore. |
286 |
if default_directory is None: |
287 |
default_directory = u'.' |
|
|
5346.4.2
by Martin Pool
Move internal_tree_files and safe_relpath_files onto WorkingTree |
288 |
# recommended replacement for builtins.internal_tree_files
|
289 |
if file_list is None or len(file_list) == 0: |
|
290 |
tree = WorkingTree.open_containing(default_directory)[0] |
|
|
5346.4.5
by Martin Pool
Deprecate and avoid internal_tree_files and tree_files. |
291 |
# XXX: doesn't really belong here, and seems to have the strange
|
292 |
# side effect of making it return a bunch of files, not the whole
|
|
293 |
# tree -- mbp 20100716
|
|
|
5346.4.2
by Martin Pool
Move internal_tree_files and safe_relpath_files onto WorkingTree |
294 |
if tree.supports_views() and apply_view: |
295 |
view_files = tree.views.lookup_view() |
|
296 |
if view_files: |
|
297 |
file_list = view_files |
|
298 |
view_str = views.view_display_str(view_files) |
|
|
6138.3.4
by Jonathan Riddell
add gettext() to uses of trace.note() |
299 |
note(gettext("Ignoring files outside view. View is %s") % view_str) |
|
5346.4.2
by Martin Pool
Move internal_tree_files and safe_relpath_files onto WorkingTree |
300 |
return tree, file_list |
|
5521.1.1
by Vincent Ladeuil
Handle --directory when paths are also provided to shelve and restore. |
301 |
if default_directory == u'.': |
302 |
seed = file_list[0] |
|
303 |
else: |
|
304 |
seed = default_directory |
|
305 |
file_list = [osutils.pathjoin(default_directory, f) |
|
306 |
for f in file_list] |
|
307 |
tree = WorkingTree.open_containing(seed)[0] |
|
|
5346.4.2
by Martin Pool
Move internal_tree_files and safe_relpath_files onto WorkingTree |
308 |
return tree, tree.safe_relpath_files(file_list, canonicalize, |
|
5521.1.1
by Vincent Ladeuil
Handle --directory when paths are also provided to shelve and restore. |
309 |
apply_view=apply_view) |
|
5346.4.2
by Martin Pool
Move internal_tree_files and safe_relpath_files onto WorkingTree |
310 |
|
311 |
def safe_relpath_files(self, file_list, canonicalize=True, apply_view=True): |
|
312 |
"""Convert file_list into a list of relpaths in tree. |
|
313 |
||
314 |
:param self: A tree to operate on.
|
|
315 |
:param file_list: A list of user provided paths or None.
|
|
316 |
:param apply_view: if True and a view is set, apply it or check that
|
|
317 |
specified files are within it
|
|
318 |
:return: A list of relative paths.
|
|
319 |
:raises errors.PathNotChild: When a provided path is in a different self
|
|
320 |
than self.
|
|
321 |
"""
|
|
322 |
if file_list is None: |
|
323 |
return None |
|
324 |
if self.supports_views() and apply_view: |
|
325 |
view_files = self.views.lookup_view() |
|
326 |
else: |
|
327 |
view_files = [] |
|
328 |
new_list = [] |
|
329 |
# self.relpath exists as a "thunk" to osutils, but canonical_relpath
|
|
330 |
# doesn't - fix that up here before we enter the loop.
|
|
331 |
if canonicalize: |
|
332 |
fixer = lambda p: osutils.canonical_relpath(self.basedir, p) |
|
333 |
else: |
|
334 |
fixer = self.relpath |
|
335 |
for filename in file_list: |
|
|
5346.4.3
by Martin Pool
PathNotChild should not give a traceback. |
336 |
relpath = fixer(osutils.dereference_path(filename)) |
337 |
if view_files and not osutils.is_inside_any(view_files, relpath): |
|
|
6734.1.2
by Jelmer Vernooij
Fix more imports. |
338 |
raise views.FileOutsideView(filename, view_files) |
|
5346.4.3
by Martin Pool
PathNotChild should not give a traceback. |
339 |
new_list.append(relpath) |
|
5346.4.2
by Martin Pool
Move internal_tree_files and safe_relpath_files onto WorkingTree |
340 |
return new_list |
341 |
||
342 |
@staticmethod
|
|
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
343 |
def open_downlevel(path=None): |
344 |
"""Open an unsupported working tree. |
|
345 |
||
|
6681.2.4
by Jelmer Vernooij
More renames. |
346 |
Only intended for advanced situations like upgrading part of a controldir.
|
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
347 |
"""
|
348 |
return WorkingTree.open(path, _unsupported=True) |
|
|
1508.1.1
by Robert Collins
Provide a open_containing for WorkingTree. |
349 |
|
|
3140.1.4
by Aaron Bentley
Add WorkingTree.find_trees |
350 |
@staticmethod
|
351 |
def find_trees(location): |
|
352 |
def list_current(transport): |
|
|
6681.2.4
by Jelmer Vernooij
More renames. |
353 |
return [d for d in transport.list_dir('') |
354 |
if not controldir.is_control_filename(d)] |
|
355 |
def evaluate(controldir): |
|
|
3140.1.4
by Aaron Bentley
Add WorkingTree.find_trees |
356 |
try: |
|
6681.2.4
by Jelmer Vernooij
More renames. |
357 |
tree = controldir.open_workingtree() |
|
3140.1.4
by Aaron Bentley
Add WorkingTree.find_trees |
358 |
except errors.NoWorkingTree: |
359 |
return True, None |
|
360 |
else: |
|
361 |
return True, tree |
|
|
5273.1.7
by Vincent Ladeuil
No more use of the get_transport imported *symbol*, all uses are through |
362 |
t = transport.get_transport(location) |
|
6681.2.3
by Jelmer Vernooij
Rename find_bzrdir. |
363 |
iterator = controldir.ControlDir.find_controldirs(t, evaluate=evaluate, |
|
3140.1.4
by Aaron Bentley
Add WorkingTree.find_trees |
364 |
list_current=list_current) |
|
5273.1.7
by Vincent Ladeuil
No more use of the get_transport imported *symbol*, all uses are through |
365 |
return [tr for tr in iterator if tr is not None] |
|
3140.1.4
by Aaron Bentley
Add WorkingTree.find_trees |
366 |
|
|
453
by Martin Pool
- Split WorkingTree into its own file |
367 |
def __repr__(self): |
368 |
return "<%s of %s>" % (self.__class__.__name__, |
|
|
954
by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly |
369 |
getattr(self, 'basedir', None)) |
|
453
by Martin Pool
- Split WorkingTree into its own file |
370 |
|
371 |
def abspath(self, filename): |
|
|
6653.3.1
by Jelmer Vernooij
Move bzr-specific code to breezy.bzrworkingtree. |
372 |
return osutils.pathjoin(self.basedir, filename) |
|
2292.1.30
by Marius Kruger
* Minor text fixes. |
373 |
|
|
1534.4.35
by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree() |
374 |
def basis_tree(self): |
|
1927.2.3
by Robert Collins
review comment application - paired with Martin. |
375 |
"""Return RevisionTree for the current last revision. |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
376 |
|
|
1927.2.3
by Robert Collins
review comment application - paired with Martin. |
377 |
If the left most parent is a ghost then the returned tree will be an
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
378 |
empty tree - one obtained by calling
|
|
3668.5.1
by Jelmer Vernooij
Use NULL_REVISION rather than None for Repository.revision_tree(). |
379 |
repository.revision_tree(NULL_REVISION).
|
|
1927.2.3
by Robert Collins
review comment application - paired with Martin. |
380 |
"""
|
|
1908.7.6
by Robert Collins
Deprecate WorkingTree.last_revision. |
381 |
try: |
382 |
revision_id = self.get_parent_ids()[0] |
|
383 |
except IndexError: |
|
384 |
# no parents, return an empty revision tree.
|
|
385 |
# in the future this should return the tree for
|
|
386 |
# 'empty:' - the implicit root empty tree.
|
|
|
3668.5.1
by Jelmer Vernooij
Use NULL_REVISION rather than None for Repository.revision_tree(). |
387 |
return self.branch.repository.revision_tree( |
388 |
_mod_revision.NULL_REVISION) |
|
|
1908.11.2
by Robert Collins
Implement WorkingTree interface conformance tests for |
389 |
try: |
390 |
return self.revision_tree(revision_id) |
|
391 |
except errors.NoSuchRevision: |
|
392 |
pass
|
|
|
1908.7.6
by Robert Collins
Deprecate WorkingTree.last_revision. |
393 |
# No cached copy available, retrieve from the repository.
|
394 |
# FIXME? RBC 20060403 should we cache the inventory locally
|
|
395 |
# at this point ?
|
|
|
1927.2.1
by Robert Collins
Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge. |
396 |
try: |
397 |
return self.branch.repository.revision_tree(revision_id) |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
398 |
except (errors.RevisionNotPresent, errors.NoSuchRevision): |
|
1927.2.1
by Robert Collins
Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge. |
399 |
# the basis tree *may* be a ghost or a low level error may have
|
|
4031.3.1
by Frank Aspell
Fixing various typos |
400 |
# occurred. If the revision is present, its a problem, if its not
|
|
1927.2.1
by Robert Collins
Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge. |
401 |
# its a ghost.
|
402 |
if self.branch.repository.has_revision(revision_id): |
|
403 |
raise
|
|
|
1927.2.3
by Robert Collins
review comment application - paired with Martin. |
404 |
# the basis tree is a ghost so return an empty tree.
|
|
3668.5.1
by Jelmer Vernooij
Use NULL_REVISION rather than None for Repository.revision_tree(). |
405 |
return self.branch.repository.revision_tree( |
406 |
_mod_revision.NULL_REVISION) |
|
|
453
by Martin Pool
- Split WorkingTree into its own file |
407 |
|
|
1713.1.9
by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool). |
408 |
def relpath(self, path): |
409 |
"""Return the local path portion from a given path. |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
410 |
|
411 |
The path may be absolute or relative. If its a relative path it is
|
|
|
1713.1.9
by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool). |
412 |
interpreted relative to the python current working directory.
|
413 |
"""
|
|
|
1996.3.6
by John Arbash Meinel
Find a few places that weren't importing their dependencies. |
414 |
return osutils.relpath(self.basedir, path) |
|
1457.1.3
by Robert Collins
make Branch.relpath delegate to the working tree. |
415 |
|
|
453
by Martin Pool
- Split WorkingTree into its own file |
416 |
def has_filename(self, filename): |
|
1836.1.22
by John Arbash Meinel
[merge] bzr.dev 1861 |
417 |
return osutils.lexists(self.abspath(filename)) |
|
453
by Martin Pool
- Split WorkingTree into its own file |
418 |
|
|
3368.2.11
by Ian Clatworthy
add filtered option to get_file and get_file_byname in workingtree.py |
419 |
def get_file(self, file_id, path=None, filtered=True): |
|
3368.2.45
by Ian Clatworthy
add and use supports_content_filtering API |
420 |
return self.get_file_with_stat(file_id, path, filtered=filtered)[0] |
|
3709.3.2
by Robert Collins
Race-free stat-fingerprint updating during commit via a new method get_file_with_stat. |
421 |
|
|
3368.2.45
by Ian Clatworthy
add and use supports_content_filtering API |
422 |
def get_file_with_stat(self, file_id, path=None, filtered=True, |
|
5609.29.5
by John Arbash Meinel
Fix bug #740932. Transform should update the sha cache. |
423 |
_fstat=osutils.fstat): |
|
4354.4.7
by Aaron Bentley
Move MutableTree.get_file_with_stat to Tree.get_file_with_stat. |
424 |
"""See Tree.get_file_with_stat.""" |
|
2743.3.3
by Ian Clatworthy
Skip path lookup for tree.get_file() when we already know the path |
425 |
if path is None: |
426 |
path = self.id2path(file_id) |
|
|
3368.2.41
by Ian Clatworthy
1st cut merge of bzr.dev r3907 |
427 |
file_obj = self.get_file_byname(path, filtered=False) |
|
3368.2.45
by Ian Clatworthy
add and use supports_content_filtering API |
428 |
stat_value = _fstat(file_obj.fileno()) |
|
4413.4.3
by John Arbash Meinel
Move the boolean check to the first part of the if statement |
429 |
if filtered and self.supports_content_filtering(): |
|
3368.2.46
by Ian Clatworthy
minor fix |
430 |
filters = self._content_filter_stack(path) |
|
5745.3.2
by Jelmer Vernooij
Add filters to import tariff blacklist. |
431 |
file_obj = _mod_filters.filtered_input_file(file_obj, filters) |
|
3368.2.45
by Ian Clatworthy
add and use supports_content_filtering API |
432 |
return (file_obj, stat_value) |
|
453
by Martin Pool
- Split WorkingTree into its own file |
433 |
|
|
3368.2.41
by Ian Clatworthy
1st cut merge of bzr.dev r3907 |
434 |
def get_file_text(self, file_id, path=None, filtered=True): |
|
5236.1.1
by Tim Penhey
Close the file after read. |
435 |
my_file = self.get_file(file_id, path=path, filtered=filtered) |
|
4708.2.1
by Martin
Ensure all files opened by bazaar proper are explicitly closed |
436 |
try: |
|
5236.1.1
by Tim Penhey
Close the file after read. |
437 |
return my_file.read() |
|
4708.2.1
by Martin
Ensure all files opened by bazaar proper are explicitly closed |
438 |
finally: |
|
5236.1.1
by Tim Penhey
Close the file after read. |
439 |
my_file.close() |
|
1852.6.9
by Robert Collins
Add more test trees to the tree-implementations tests. |
440 |
|
|
3368.2.11
by Ian Clatworthy
add filtered option to get_file and get_file_byname in workingtree.py |
441 |
def get_file_byname(self, filename, filtered=True): |
|
3368.2.1
by Ian Clatworthy
first cut at working tree content filtering |
442 |
path = self.abspath(filename) |
|
3368.2.11
by Ian Clatworthy
add filtered option to get_file and get_file_byname in workingtree.py |
443 |
f = file(path, 'rb') |
|
4413.4.3
by John Arbash Meinel
Move the boolean check to the first part of the if statement |
444 |
if filtered and self.supports_content_filtering(): |
|
3368.2.11
by Ian Clatworthy
add filtered option to get_file and get_file_byname in workingtree.py |
445 |
filters = self._content_filter_stack(filename) |
|
5745.3.2
by Jelmer Vernooij
Add filters to import tariff blacklist. |
446 |
return _mod_filters.filtered_input_file(f, filters) |
|
3368.2.11
by Ian Clatworthy
add filtered option to get_file and get_file_byname in workingtree.py |
447 |
else: |
448 |
return f |
|
|
453
by Martin Pool
- Split WorkingTree into its own file |
449 |
|
|
3368.2.45
by Ian Clatworthy
add and use supports_content_filtering API |
450 |
def get_file_lines(self, file_id, path=None, filtered=True): |
|
3774.1.4
by Aaron Bentley
Use file.readlines on working trees. |
451 |
"""See Tree.get_file_lines()""" |
|
3368.2.45
by Ian Clatworthy
add and use supports_content_filtering API |
452 |
file = self.get_file(file_id, path, filtered=filtered) |
|
3774.1.4
by Aaron Bentley
Use file.readlines on working trees. |
453 |
try: |
454 |
return file.readlines() |
|
455 |
finally: |
|
456 |
file.close() |
|
457 |
||
|
1773.2.1
by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids. |
458 |
def get_parent_ids(self): |
459 |
"""See Tree.get_parent_ids. |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
460 |
|
|
1773.2.1
by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids. |
461 |
This implementation reads the pending merges list and last_revision
|
462 |
value and uses that to decide what the parents list should be.
|
|
463 |
"""
|
|
|
2598.5.3
by Aaron Bentley
Push NULL_REVISION deeper |
464 |
last_rev = _mod_revision.ensure_null(self._last_revision()) |
|
2598.5.7
by Aaron Bentley
Updates from review |
465 |
if _mod_revision.NULL_REVISION == last_rev: |
|
1773.2.1
by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids. |
466 |
parents = [] |
467 |
else: |
|
468 |
parents = [last_rev] |
|
|
1908.6.10
by Robert Collins
forward to get_parent_ids in pending_merges. |
469 |
try: |
|
4852.1.7
by John Arbash Meinel
Lots of tweaks in WorkingTree. |
470 |
merges_bytes = self._transport.get_bytes('pending-merges') |
|
2206.1.7
by Marius Kruger
* errors |
471 |
except errors.NoSuchFile: |
|
1908.6.10
by Robert Collins
forward to get_parent_ids in pending_merges. |
472 |
pass
|
473 |
else: |
|
|
4852.1.9
by John Arbash Meinel
Minor typo fix. |
474 |
for l in osutils.split_lines(merges_bytes): |
|
2858.2.1
by Martin Pool
Remove most calls to safe_file_id and safe_revision_id. |
475 |
revision_id = l.rstrip('\n') |
|
2249.5.9
by John Arbash Meinel
Update WorkingTree to use safe_revision_id when appropriate |
476 |
parents.append(revision_id) |
|
1908.6.10
by Robert Collins
forward to get_parent_ids in pending_merges. |
477 |
return parents |
|
1773.2.1
by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids. |
478 |
|
|
1497
by Robert Collins
Move Branch.read_working_inventory to WorkingTree. |
479 |
def get_root_id(self): |
480 |
"""Return the id of this trees root""" |
|
|
5777.5.2
by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method |
481 |
raise NotImplementedError(self.get_root_id) |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
482 |
|
|
1534.4.35
by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree() |
483 |
@needs_read_lock
|
|
6207.3.5
by Jelmer Vernooij
Use controldir rather than bzrdir. |
484 |
def clone(self, to_controldir, revision_id=None): |
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
485 |
"""Duplicate this working tree into to_bzr, including all state. |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
486 |
|
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
487 |
Specifically modified files are kept as modified, but
|
488 |
ignored and unknown files are discarded.
|
|
|
1534.4.35
by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree() |
489 |
|
|
6207.3.5
by Jelmer Vernooij
Use controldir rather than bzrdir. |
490 |
If you want to make a new line of development, see ControlDir.sprout()
|
|
1534.4.35
by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree() |
491 |
|
492 |
revision
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
493 |
If not None, the cloned tree will have its last revision set to
|
|
4031.3.1
by Frank Aspell
Fixing various typos |
494 |
revision, and difference between the source trees last revision
|
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
495 |
and this one merged in.
|
|
1534.4.35
by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree() |
496 |
"""
|
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
497 |
# assumes the target bzr dir format is compatible.
|
|
6207.3.5
by Jelmer Vernooij
Use controldir rather than bzrdir. |
498 |
result = to_controldir.create_workingtree() |
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
499 |
self.copy_content_into(result, revision_id) |
500 |
return result |
|
501 |
||
502 |
@needs_read_lock
|
|
503 |
def copy_content_into(self, tree, revision_id=None): |
|
504 |
"""Copy the current content and user files of this tree into tree.""" |
|
|
1731.1.33
by Aaron Bentley
Revert no-special-root changes |
505 |
tree.set_root_id(self.get_root_id()) |
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
506 |
if revision_id is None: |
|
1996.3.6
by John Arbash Meinel
Find a few places that weren't importing their dependencies. |
507 |
merge.transform_tree(tree, self) |
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
508 |
else: |
|
1908.6.1
by Robert Collins
Change all callers of set_last_revision to use set_parent_trees. |
509 |
# TODO now merge from tree.last_revision to revision (to preserve
|
510 |
# user local changes)
|
|
|
6519.3.4
by Neil Martinsen-Burrell
try looking up revision in tree first |
511 |
try: |
512 |
other_tree = self.revision_tree(revision_id) |
|
513 |
except errors.NoSuchRevision: |
|
514 |
other_tree = self.branch.repository.revision_tree(revision_id) |
|
515 |
||
516 |
merge.transform_tree(tree, other_tree) |
|
|
6241.3.1
by Jelmer Vernooij
Support WorkingTree.clone() having its revision argument set to the NULL revision. |
517 |
if revision_id == _mod_revision.NULL_REVISION: |
518 |
new_parents = [] |
|
519 |
else: |
|
520 |
new_parents = [revision_id] |
|
521 |
tree.set_parent_ids(new_parents) |
|
|
1534.4.35
by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree() |
522 |
|
|
1248
by Martin Pool
- new weave based cleanup [broken] |
523 |
def id2abspath(self, file_id): |
524 |
return self.abspath(self.id2path(file_id)) |
|
525 |
||
|
453
by Martin Pool
- Split WorkingTree into its own file |
526 |
def get_file_size(self, file_id): |
|
3363.3.4
by Aaron Bentley
Add get_file_size to Tree interface |
527 |
"""See Tree.get_file_size""" |
|
4595.11.11
by Martin Pool
Split out _file_content_summary from path_content_summary and let it return None for size |
528 |
# XXX: this returns the on-disk size; it should probably return the
|
529 |
# canonical size
|
|
|
3363.2.7
by Aaron Bentley
Implement alterntative-to-inventory tests |
530 |
try: |
531 |
return os.path.getsize(self.id2abspath(file_id)) |
|
|
6619.3.2
by Jelmer Vernooij
Apply 2to3 except fix. |
532 |
except OSError as e: |
|
3363.2.7
by Aaron Bentley
Implement alterntative-to-inventory tests |
533 |
if e.errno != errno.ENOENT: |
534 |
raise
|
|
535 |
else: |
|
536 |
return None |
|
|
453
by Martin Pool
- Split WorkingTree into its own file |
537 |
|
|
1997.1.3
by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch |
538 |
@needs_tree_write_lock
|
|
1986.1.2
by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely |
539 |
def _gather_kinds(self, files, kinds): |
540 |
"""See MutableTree._gather_kinds.""" |
|
541 |
for pos, f in enumerate(files): |
|
542 |
if kinds[pos] is None: |
|
|
6653.3.1
by Jelmer Vernooij
Move bzr-specific code to breezy.bzrworkingtree. |
543 |
fullpath = osutils.normpath(self.abspath(f)) |
|
1986.1.2
by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely |
544 |
try: |
|
6653.3.1
by Jelmer Vernooij
Move bzr-specific code to breezy.bzrworkingtree. |
545 |
kinds[pos] = osutils.file_kind(fullpath) |
|
6619.3.2
by Jelmer Vernooij
Apply 2to3 except fix. |
546 |
except OSError as e: |
|
1986.1.2
by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely |
547 |
if e.errno == errno.ENOENT: |
|
2206.1.7
by Marius Kruger
* errors |
548 |
raise errors.NoSuchFile(fullpath) |
|
1986.1.2
by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely |
549 |
|
|
1508.1.5
by Robert Collins
Move add from Branch to WorkingTree. |
550 |
@needs_write_lock
|
|
1908.5.9
by Robert Collins
Add a guard against setting the tree last-revision value to a ghost in the new tree parent management api. |
551 |
def add_parent_tree_id(self, revision_id, allow_leftmost_as_ghost=False): |
|
1908.5.4
by Robert Collins
Add add_parent_tree_id WorkingTree helper api. |
552 |
"""Add revision_id as a parent. |
553 |
||
554 |
This is equivalent to retrieving the current list of parent ids
|
|
555 |
and setting the list to its value plus revision_id.
|
|
556 |
||
557 |
:param revision_id: The revision id to add to the parent list. It may
|
|
|
5891.1.2
by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier. |
558 |
be a ghost revision as long as its not the first parent to be
|
559 |
added, or the allow_leftmost_as_ghost parameter is set True.
|
|
|
1908.5.12
by Robert Collins
Apply review feedback - paired with Martin. |
560 |
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
|
|
1908.5.4
by Robert Collins
Add add_parent_tree_id WorkingTree helper api. |
561 |
"""
|
|
1908.5.13
by Robert Collins
Adding a parent when the first is a ghost already should not require forcing it. |
562 |
parents = self.get_parent_ids() + [revision_id] |
|
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
563 |
self.set_parent_ids(parents, allow_leftmost_as_ghost=len(parents) > 1 |
|
2206.1.7
by Marius Kruger
* errors |
564 |
or allow_leftmost_as_ghost) |
|
1908.5.4
by Robert Collins
Add add_parent_tree_id WorkingTree helper api. |
565 |
|
|
1997.1.3
by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch |
566 |
@needs_tree_write_lock
|
|
1908.5.9
by Robert Collins
Add a guard against setting the tree last-revision value to a ghost in the new tree parent management api. |
567 |
def add_parent_tree(self, parent_tuple, allow_leftmost_as_ghost=False): |
|
1908.5.6
by Robert Collins
Add add_parent_tree to WorkingTree. |
568 |
"""Add revision_id, tree tuple as a parent. |
569 |
||
570 |
This is equivalent to retrieving the current list of parent trees
|
|
571 |
and setting the list to its value plus parent_tuple. See also
|
|
572 |
add_parent_tree_id - if you only have a parent id available it will be
|
|
573 |
simpler to use that api. If you have the parent already available, using
|
|
574 |
this api is preferred.
|
|
575 |
||
|
1908.5.12
by Robert Collins
Apply review feedback - paired with Martin. |
576 |
:param parent_tuple: The (revision id, tree) to add to the parent list.
|
577 |
If the revision_id is a ghost, pass None for the tree.
|
|
578 |
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
|
|
|
1908.5.6
by Robert Collins
Add add_parent_tree to WorkingTree. |
579 |
"""
|
|
1979.2.1
by Robert Collins
(robertc) adds a convenience method "merge_from_branch" to WorkingTree. |
580 |
parent_ids = self.get_parent_ids() + [parent_tuple[0]] |
581 |
if len(parent_ids) > 1: |
|
582 |
# the leftmost may have already been a ghost, preserve that if it
|
|
583 |
# was.
|
|
584 |
allow_leftmost_as_ghost = True |
|
585 |
self.set_parent_ids(parent_ids, |
|
|
1908.5.9
by Robert Collins
Add a guard against setting the tree last-revision value to a ghost in the new tree parent management api. |
586 |
allow_leftmost_as_ghost=allow_leftmost_as_ghost) |
|
1908.5.6
by Robert Collins
Add add_parent_tree to WorkingTree. |
587 |
|
|
1997.1.3
by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch |
588 |
@needs_tree_write_lock
|
|
1457.1.15
by Robert Collins
Move add_pending_merge to WorkingTree. |
589 |
def add_pending_merge(self, *revision_ids): |
590 |
# TODO: Perhaps should check at this point that the
|
|
591 |
# history of the revision is actually present?
|
|
|
1908.6.7
by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly. |
592 |
parents = self.get_parent_ids() |
|
1457.1.15
by Robert Collins
Move add_pending_merge to WorkingTree. |
593 |
updated = False |
594 |
for rev_id in revision_ids: |
|
|
1908.6.7
by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly. |
595 |
if rev_id in parents: |
596 |
continue
|
|
597 |
parents.append(rev_id) |
|
|
1457.1.15
by Robert Collins
Move add_pending_merge to WorkingTree. |
598 |
updated = True |
599 |
if updated: |
|
|
1908.6.7
by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly. |
600 |
self.set_parent_ids(parents, allow_leftmost_as_ghost=True) |
|
1457.1.15
by Robert Collins
Move add_pending_merge to WorkingTree. |
601 |
|
|
2949.6.2
by Alexander Belchenko
more changes osutils.lstat -> os.lstat |
602 |
def path_content_summary(self, path, _lstat=os.lstat, |
|
2776.1.7
by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a |
603 |
_mapper=osutils.file_kind_from_stat_mode): |
604 |
"""See Tree.path_content_summary.""" |
|
605 |
abspath = self.abspath(path) |
|
606 |
try: |
|
607 |
stat_result = _lstat(abspath) |
|
|
6619.3.2
by Jelmer Vernooij
Apply 2to3 except fix. |
608 |
except OSError as e: |
|
2776.1.7
by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a |
609 |
if getattr(e, 'errno', None) == errno.ENOENT: |
610 |
# no file.
|
|
611 |
return ('missing', None, None, None) |
|
|
2776.1.9
by Robert Collins
Review feedback. |
612 |
# propagate other errors
|
|
2776.1.7
by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a |
613 |
raise
|
614 |
kind = _mapper(stat_result.st_mode) |
|
615 |
if kind == 'file': |
|
|
4595.11.11
by Martin Pool
Split out _file_content_summary from path_content_summary and let it return None for size |
616 |
return self._file_content_summary(path, stat_result) |
|
2776.1.7
by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a |
617 |
elif kind == 'directory': |
618 |
# perhaps it looks like a plain directory, but it's really a
|
|
619 |
# reference.
|
|
620 |
if self._directory_is_tree_reference(path): |
|
621 |
kind = 'tree-reference' |
|
622 |
return kind, None, None, None |
|
623 |
elif kind == 'symlink': |
|
|
4241.14.18
by Vincent Ladeuil
Use better fixes for unicode symlinks handling in WTs. |
624 |
target = osutils.readlink(abspath) |
|
4241.14.12
by Vincent Ladeuil
Far too many modifications for a single commit, need to restart. |
625 |
return ('symlink', None, None, target) |
|
2776.1.7
by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a |
626 |
else: |
627 |
return (kind, None, None, None) |
|
628 |
||
|
4595.11.11
by Martin Pool
Split out _file_content_summary from path_content_summary and let it return None for size |
629 |
def _file_content_summary(self, path, stat_result): |
630 |
size = stat_result.st_size |
|
631 |
executable = self._is_executable_from_path_and_stat(path, stat_result) |
|
632 |
# try for a stat cache lookup
|
|
633 |
return ('file', size, executable, self._sha_from_stat( |
|
634 |
path, stat_result)) |
|
635 |
||
|
2041.1.2
by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv. |
636 |
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost): |
637 |
"""Common ghost checking functionality from set_parent_*. |
|
638 |
||
639 |
This checks that the left hand-parent exists if there are any
|
|
640 |
revisions present.
|
|
641 |
"""
|
|
642 |
if len(revision_ids) > 0: |
|
643 |
leftmost_id = revision_ids[0] |
|
644 |
if (not allow_leftmost_as_ghost and not |
|
645 |
self.branch.repository.has_revision(leftmost_id)): |
|
646 |
raise errors.GhostRevisionUnusableHere(leftmost_id) |
|
647 |
||
648 |
def _set_merges_from_parent_ids(self, parent_ids): |
|
649 |
merges = parent_ids[1:] |
|
|
3407.2.7
by Martin Pool
Deprecate LockableFiles.put_utf8 and put_bytes. |
650 |
self._transport.put_bytes('pending-merges', '\n'.join(merges), |
|
6653.6.1
by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir. |
651 |
mode=self.controldir._get_file_mode()) |
|
2041.1.2
by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv. |
652 |
|
|
3462.1.2
by John Arbash Meinel
Change WT.set_parent_(ids/trees) to filter out ancestors. |
653 |
def _filter_parent_ids_by_ancestry(self, revision_ids): |
654 |
"""Check that all merged revisions are proper 'heads'. |
|
655 |
||
656 |
This will always return the first revision_id, and any merged revisions
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
657 |
which are
|
|
3462.1.2
by John Arbash Meinel
Change WT.set_parent_(ids/trees) to filter out ancestors. |
658 |
"""
|
659 |
if len(revision_ids) == 0: |
|
660 |
return revision_ids |
|
661 |
graph = self.branch.repository.get_graph() |
|
662 |
heads = graph.heads(revision_ids) |
|
663 |
new_revision_ids = revision_ids[:1] |
|
664 |
for revision_id in revision_ids[1:]: |
|
665 |
if revision_id in heads and revision_id not in new_revision_ids: |
|
666 |
new_revision_ids.append(revision_id) |
|
667 |
if new_revision_ids != revision_ids: |
|
|
5753.2.2
by Jelmer Vernooij
Remove some unnecessary imports, clean up lazy imports. |
668 |
mutter('requested to set revision_ids = %s,' |
|
3462.1.2
by John Arbash Meinel
Change WT.set_parent_(ids/trees) to filter out ancestors. |
669 |
' but filtered to %s', revision_ids, new_revision_ids) |
670 |
return new_revision_ids |
|
671 |
||
|
1997.1.3
by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch |
672 |
@needs_tree_write_lock
|
|
1908.5.9
by Robert Collins
Add a guard against setting the tree last-revision value to a ghost in the new tree parent management api. |
673 |
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False): |
|
1908.5.5
by Robert Collins
Add WorkingTree.set_parent_ids. |
674 |
"""Set the parent ids to revision_ids. |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
675 |
|
|
1908.5.5
by Robert Collins
Add WorkingTree.set_parent_ids. |
676 |
See also set_parent_trees. This api will try to retrieve the tree data
|
677 |
for each element of revision_ids from the trees repository. If you have
|
|
678 |
tree data already available, it is more efficient to use
|
|
679 |
set_parent_trees rather than set_parent_ids. set_parent_ids is however
|
|
680 |
an easier API to use.
|
|
681 |
||
682 |
:param revision_ids: The revision_ids to set as the parent ids of this
|
|
683 |
working tree. Any of these may be ghosts.
|
|
684 |
"""
|
|
|
2041.1.2
by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv. |
685 |
self._check_parents_for_ghosts(revision_ids, |
686 |
allow_leftmost_as_ghost=allow_leftmost_as_ghost) |
|
|
2598.5.2
by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision |
687 |
for revision_id in revision_ids: |
688 |
_mod_revision.check_not_reserved_id(revision_id) |
|
|
2041.1.2
by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv. |
689 |
|
|
3462.1.2
by John Arbash Meinel
Change WT.set_parent_(ids/trees) to filter out ancestors. |
690 |
revision_ids = self._filter_parent_ids_by_ancestry(revision_ids) |
691 |
||
|
1908.6.7
by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly. |
692 |
if len(revision_ids) > 0: |
|
2041.1.2
by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv. |
693 |
self.set_last_revision(revision_ids[0]) |
|
1908.6.7
by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly. |
694 |
else: |
|
2598.5.3
by Aaron Bentley
Push NULL_REVISION deeper |
695 |
self.set_last_revision(_mod_revision.NULL_REVISION) |
|
2041.1.2
by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv. |
696 |
|
697 |
self._set_merges_from_parent_ids(revision_ids) |
|
|
1908.5.5
by Robert Collins
Add WorkingTree.set_parent_ids. |
698 |
|
|
1997.1.3
by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch |
699 |
@needs_tree_write_lock
|
|
1457.1.16
by Robert Collins
Move set_pending_merges to WorkingTree. |
700 |
def set_pending_merges(self, rev_list): |
|
1908.6.7
by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly. |
701 |
parents = self.get_parent_ids() |
702 |
leftmost = parents[:1] |
|
703 |
new_parents = leftmost + rev_list |
|
704 |
self.set_parent_ids(new_parents) |
|
|
1457.1.16
by Robert Collins
Move set_pending_merges to WorkingTree. |
705 |
|
|
1997.1.3
by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch |
706 |
@needs_tree_write_lock
|
|
1534.7.192
by Aaron Bentley
Record hashes produced by merges |
707 |
def set_merge_modified(self, modified_hashes): |
|
6313.1.1
by Jelmer Vernooij
Move bzr-specific functionality to InventoryWorkingTree. |
708 |
"""Set the merge modified hashes.""" |
709 |
raise NotImplementedError(self.set_merge_modified) |
|
|
1534.10.3
by Aaron Bentley
Simplify set_merge_modified with rio_file |
710 |
|
|
2776.1.8
by Robert Collins
Retrieve the sha from the dirstate for path_content_summary on hash cache hits; slight performance hit but a big win for incremental commits. |
711 |
def _sha_from_stat(self, path, stat_result): |
712 |
"""Get a sha digest from the tree's stat cache. |
|
713 |
||
714 |
The default implementation assumes no stat cache is present.
|
|
715 |
||
716 |
:param path: The path.
|
|
717 |
:param stat_result: The stat result being looked up.
|
|
718 |
"""
|
|
719 |
return None |
|
720 |
||
|
1997.1.3
by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch |
721 |
@needs_write_lock # because merge pulls data into the branch. |
|
1551.15.69
by Aaron Bentley
Add merge_type to merge_from_branch |
722 |
def merge_from_branch(self, branch, to_revision=None, from_revision=None, |
|
4721.3.2
by Vincent Ladeuil
Simplify mutable_tree.has_changes() and update call sites. |
723 |
merge_type=None, force=False): |
|
1979.2.1
by Robert Collins
(robertc) adds a convenience method "merge_from_branch" to WorkingTree. |
724 |
"""Merge from a branch into this working tree. |
725 |
||
726 |
:param branch: The branch to merge from.
|
|
|
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
727 |
:param to_revision: If non-None, the merge will merge to to_revision,
|
728 |
but not beyond it. to_revision does not need to be in the history
|
|
|
2206.1.7
by Marius Kruger
* errors |
729 |
of the branch when it is supplied. If None, to_revision defaults to
|
|
1979.2.1
by Robert Collins
(robertc) adds a convenience method "merge_from_branch" to WorkingTree. |
730 |
branch.last_revision().
|
731 |
"""
|
|
|
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
732 |
from .merge import Merger, Merge3Merger |
|
4961.2.10
by Martin Pool
No longer need to pass pb in to Merger |
733 |
merger = Merger(self.branch, this_tree=self) |
734 |
# check that there are no local alterations
|
|
735 |
if not force and self.has_changes(): |
|
736 |
raise errors.UncommittedChanges(self) |
|
737 |
if to_revision is None: |
|
738 |
to_revision = _mod_revision.ensure_null(branch.last_revision()) |
|
739 |
merger.other_rev_id = to_revision |
|
740 |
if _mod_revision.is_null(merger.other_rev_id): |
|
741 |
raise errors.NoCommits(branch) |
|
742 |
self.branch.fetch(branch, last_revision=merger.other_rev_id) |
|
743 |
merger.other_basis = merger.other_rev_id |
|
744 |
merger.other_tree = self.branch.repository.revision_tree( |
|
745 |
merger.other_rev_id) |
|
746 |
merger.other_branch = branch |
|
747 |
if from_revision is None: |
|
748 |
merger.find_base() |
|
749 |
else: |
|
750 |
merger.set_base_revision(from_revision, branch) |
|
751 |
if merger.base_rev_id == merger.other_rev_id: |
|
752 |
raise errors.PointlessMerge |
|
753 |
merger.backup_files = False |
|
754 |
if merge_type is None: |
|
755 |
merger.merge_type = Merge3Merger |
|
756 |
else: |
|
757 |
merger.merge_type = merge_type |
|
758 |
merger.set_interesting_files(None) |
|
759 |
merger.show_base = False |
|
760 |
merger.reprocess = False |
|
761 |
conflicts = merger.do_merge() |
|
762 |
merger.set_pending() |
|
|
1979.2.1
by Robert Collins
(robertc) adds a convenience method "merge_from_branch" to WorkingTree. |
763 |
return conflicts |
764 |
||
|
2255.2.156
by Martin Pool
Merge WorkingTree implementation back from trunk |
765 |
def merge_modified(self): |
|
2298.1.1
by Martin Pool
Add test for merge_modified |
766 |
"""Return a dictionary of files modified by a merge. |
767 |
||
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
768 |
The list is initialized by WorkingTree.set_merge_modified, which is
|
|
2298.1.1
by Martin Pool
Add test for merge_modified |
769 |
typically called after we make some automatic updates to the tree
|
770 |
because of a merge.
|
|
771 |
||
772 |
This returns a map of file_id->sha1, containing only files which are
|
|
773 |
still in the working inventory and have that text hash.
|
|
774 |
"""
|
|
|
5777.5.2
by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method |
775 |
raise NotImplementedError(self.merge_modified) |
|
2255.2.156
by Martin Pool
Merge WorkingTree implementation back from trunk |
776 |
|
777 |
@needs_write_lock
|
|
778 |
def mkdir(self, path, file_id=None): |
|
779 |
"""See MutableTree.mkdir().""" |
|
780 |
if file_id is None: |
|
781 |
file_id = generate_ids.gen_file_id(os.path.basename(path)) |
|
|
6741.1.1
by Jelmer Vernooij
Add WorkingTreeFormat.supports_setting_file_ids. |
782 |
elif not self.supports_setting_file_ids(): |
783 |
raise SettingFileIdUnsupported() |
|
|
2255.2.156
by Martin Pool
Merge WorkingTree implementation back from trunk |
784 |
os.mkdir(self.abspath(path)) |
785 |
self.add(path, file_id, 'directory') |
|
786 |
return file_id |
|
787 |
||
|
5858.1.1
by Jelmer Vernooij
Support optional path argument to Tree.get_symlink_target. |
788 |
def get_symlink_target(self, file_id, path=None): |
789 |
if path is not None: |
|
790 |
abspath = self.abspath(path) |
|
791 |
else: |
|
792 |
abspath = self.id2abspath(file_id) |
|
|
4241.14.18
by Vincent Ladeuil
Use better fixes for unicode symlinks handling in WTs. |
793 |
target = osutils.readlink(abspath) |
|
4241.14.12
by Vincent Ladeuil
Far too many modifications for a single commit, need to restart. |
794 |
return target |
|
2255.2.156
by Martin Pool
Merge WorkingTree implementation back from trunk |
795 |
|
|
1731.2.1
by Aaron Bentley
Initial subsume implementation |
796 |
def subsume(self, other_tree): |
|
5777.5.2
by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method |
797 |
raise NotImplementedError(self.subsume) |
|
1731.2.1
by Aaron Bentley
Initial subsume implementation |
798 |
|
|
2974.2.2
by John Arbash Meinel
Only one test failed, because it was incorrectly succeeding. |
799 |
def _setup_directory_is_tree_reference(self): |
800 |
if self._branch.repository._format.supports_tree_reference: |
|
801 |
self._directory_is_tree_reference = \ |
|
802 |
self._directory_may_be_tree_reference |
|
803 |
else: |
|
804 |
self._directory_is_tree_reference = \ |
|
805 |
self._directory_is_never_tree_reference |
|
806 |
||
807 |
def _directory_is_never_tree_reference(self, relpath): |
|
808 |
return False |
|
809 |
||
810 |
def _directory_may_be_tree_reference(self, relpath): |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
811 |
# as a special case, if a directory contains control files then
|
|
2776.1.7
by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a |
812 |
# it's a tree reference, except that the root of the tree is not
|
813 |
return relpath and osutils.isdir(self.abspath(relpath) + u"/.bzr") |
|
814 |
# TODO: We could ask all the control formats whether they
|
|
815 |
# recognize this directory, but at the moment there's no cheap api
|
|
816 |
# to do that. Since we probably can only nest bzr checkouts and
|
|
817 |
# they always use this name it's ok for now. -- mbp 20060306
|
|
818 |
#
|
|
819 |
# FIXME: There is an unhandled case here of a subdirectory
|
|
820 |
# containing .bzr but not a branch; that will probably blow up
|
|
821 |
# when you try to commit it. It might happen if there is a
|
|
822 |
# checkout in a subdirectory. This can be avoided by not adding
|
|
823 |
# it. mbp 20070306
|
|
824 |
||
|
1731.2.17
by Aaron Bentley
Support extracting with checkouts |
825 |
def extract(self, file_id, format=None): |
|
1731.2.16
by Aaron Bentley
Get extract working for standalone trees |
826 |
"""Extract a subtree from this tree. |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
827 |
|
|
1731.2.16
by Aaron Bentley
Get extract working for standalone trees |
828 |
A new branch will be created, relative to the path for this tree.
|
829 |
"""
|
|
|
5777.5.2
by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method |
830 |
raise NotImplementedError(self.extract) |
|
453
by Martin Pool
- Split WorkingTree into its own file |
831 |
|
|
1986.5.3
by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory |
832 |
def flush(self): |
|
5777.5.2
by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method |
833 |
"""Write the in memory meta data to disk.""" |
834 |
raise NotImplementedError(self.flush) |
|
|
1986.5.3
by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory |
835 |
|
|
1551.10.29
by Aaron Bentley
Fix tree.list_files when file kind changes |
836 |
def _kind(self, relpath): |
837 |
return osutils.file_kind(self.abspath(relpath)) |
|
838 |
||
|
4370.5.2
by Ian Clatworthy
extend list_files() with from_dir and recursive parameters |
839 |
def list_files(self, include_root=False, from_dir=None, recursive=True): |
840 |
"""List all files as (path, class, kind, id, entry). |
|
|
453
by Martin Pool
- Split WorkingTree into its own file |
841 |
|
842 |
Lists, but does not descend into unversioned directories.
|
|
843 |
This does not include files that have been deleted in this
|
|
|
4370.5.2
by Ian Clatworthy
extend list_files() with from_dir and recursive parameters |
844 |
tree. Skips the control directory.
|
|
453
by Martin Pool
- Split WorkingTree into its own file |
845 |
|
|
5128.1.1
by Vincent Ladeuil
Uncontroversial cleanups, mostly comments |
846 |
:param include_root: if True, return an entry for the root
|
|
4370.5.2
by Ian Clatworthy
extend list_files() with from_dir and recursive parameters |
847 |
:param from_dir: start from this directory or None for the root
|
848 |
:param recursive: whether to recurse into subdirectories or not
|
|
|
453
by Martin Pool
- Split WorkingTree into its own file |
849 |
"""
|
|
5777.5.2
by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method |
850 |
raise NotImplementedError(self.list_files) |
851 |
||
|
5346.1.5
by Vincent Ladeuil
Delete the to_name parameter from WorkingTree.move() |
852 |
def move(self, from_paths, to_dir=None, after=False): |
|
1508.1.8
by Robert Collins
move move() from Branch to WorkingTree. |
853 |
"""Rename files. |
854 |
||
|
5777.5.2
by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method |
855 |
to_dir must be known to the working tree.
|
|
1508.1.8
by Robert Collins
move move() from Branch to WorkingTree. |
856 |
|
|
2123.3.1
by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system |
857 |
If to_dir exists and is a directory, the files are moved into
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
858 |
it, keeping their old names.
|
|
1508.1.8
by Robert Collins
move move() from Branch to WorkingTree. |
859 |
|
|
2123.3.1
by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system |
860 |
Note that to_dir is only the last component of the new name;
|
|
1508.1.8
by Robert Collins
move move() from Branch to WorkingTree. |
861 |
this doesn't change the directory.
|
862 |
||
|
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
863 |
For each entry in from_paths the move mode will be determined
|
|
2123.3.1
by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system |
864 |
independently.
|
865 |
||
|
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
866 |
The first mode moves the file in the filesystem and updates the
|
|
5777.5.2
by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method |
867 |
working tree metadata. The second mode only updates the working tree
|
868 |
metadata without touching the file on the filesystem.
|
|
|
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
869 |
|
|
2123.3.1
by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system |
870 |
move uses the second mode if 'after == True' and the target is not
|
871 |
versioned but present in the working tree.
|
|
872 |
||
|
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
873 |
move uses the second mode if 'after == False' and the source is
|
874 |
versioned but no longer in the working tree, and the target is not
|
|
|
2123.3.1
by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system |
875 |
versioned but present in the working tree.
|
876 |
||
|
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
877 |
move uses the first mode if 'after == False' and the source is
|
878 |
versioned and present in the working tree, and the target is not
|
|
|
2123.3.1
by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system |
879 |
versioned and not present in the working tree.
|
880 |
||
881 |
Everything else results in an error.
|
|
882 |
||
|
1508.1.8
by Robert Collins
move move() from Branch to WorkingTree. |
883 |
This returns a list of (from_path, to_path) pairs for each
|
|
2220.1.6
by Marius Kruger
* change error message telling user about --after option sightly |
884 |
entry that is moved.
|
|
1508.1.8
by Robert Collins
move move() from Branch to WorkingTree. |
885 |
"""
|
|
5777.5.2
by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method |
886 |
raise NotImplementedError(self.move) |
|
1508.1.8
by Robert Collins
move move() from Branch to WorkingTree. |
887 |
|
|
1997.1.3
by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch |
888 |
@needs_tree_write_lock
|
|
2123.3.1
by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system |
889 |
def rename_one(self, from_rel, to_rel, after=False): |
|
1508.1.7
by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins). |
890 |
"""Rename one file. |
891 |
||
892 |
This can change the directory or the filename or both.
|
|
|
2123.3.1
by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system |
893 |
|
|
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
894 |
rename_one has several 'modes' to work. First, it can rename a physical
|
895 |
file and change the file_id. That is the normal mode. Second, it can
|
|
|
5777.5.2
by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method |
896 |
only change the file_id without touching any physical file.
|
|
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
897 |
|
|
5911.1.4
by Benoît Pierre
Update docstrings for WorkingTree.move() and WorkingTree.rename_one(). |
898 |
rename_one uses the second mode if 'after == True' and 'to_rel' is
|
899 |
either not versioned or newly added, and present in the working tree.
|
|
|
2123.3.1
by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system |
900 |
|
|
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
901 |
rename_one uses the second mode if 'after == False' and 'from_rel' is
|
902 |
versioned but no longer in the working tree, and 'to_rel' is not
|
|
|
2123.3.1
by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system |
903 |
versioned but present in the working tree.
|
904 |
||
|
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
905 |
rename_one uses the first mode if 'after == False' and 'from_rel' is
|
906 |
versioned and present in the working tree, and 'to_rel' is not
|
|
|
2123.3.1
by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system |
907 |
versioned and not present in the working tree.
|
908 |
||
909 |
Everything else results in an error.
|
|
|
1508.1.7
by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins). |
910 |
"""
|
|
5777.5.2
by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method |
911 |
raise NotImplementedError(self.rename_one) |
|
2123.3.1
by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system |
912 |
|
|
1508.1.7
by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins). |
913 |
@needs_read_lock
|
|
453
by Martin Pool
- Split WorkingTree into its own file |
914 |
def unknowns(self): |
|
1508.1.6
by Robert Collins
Move Branch.unknowns() to WorkingTree. |
915 |
"""Return all unknown files. |
916 |
||
917 |
These are files in the working directory that are not versioned or
|
|
918 |
control files or ignored.
|
|
919 |
"""
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
920 |
# force the extras method to be fully executed before returning, to
|
|
2255.2.15
by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing. |
921 |
# prevent race conditions with the lock
|
922 |
return iter( |
|
923 |
[subp for subp in self.extras() if not self.is_ignored(subp)]) |
|
|
2323.6.1
by Martin Pool
(broken) Give a message when opening old workingtree formats suggesting upgrade |
924 |
|
|
1988.2.1
by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of |
925 |
def unversion(self, file_ids): |
926 |
"""Remove the file ids in file_ids from the current versioned set. |
|
927 |
||
928 |
When a file_id is unversioned, all of its children are automatically
|
|
929 |
unversioned.
|
|
930 |
||
931 |
:param file_ids: The file ids to stop versioning.
|
|
932 |
:raises: NoSuchId if any fileid is not currently versioned.
|
|
933 |
"""
|
|
|
5777.5.2
by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method |
934 |
raise NotImplementedError(self.unversion) |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
935 |
|
|
1442.1.67
by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull(). |
936 |
@needs_write_lock
|
|
1551.11.10
by Aaron Bentley
Add change reporting to pull |
937 |
def pull(self, source, overwrite=False, stop_revision=None, |
|
5430.7.1
by Rory Yorke
Added --show-base to pull and update (bug 202374). |
938 |
change_reporter=None, possible_transports=None, local=False, |
939 |
show_base=False): |
|
|
1442.1.67
by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull(). |
940 |
source.lock_read() |
941 |
try: |
|
|
2249.4.2
by Wouter van Heyst
Convert callers of Branch.revision_history() to Branch.last_revision_info() where sensible. |
942 |
old_revision_info = self.branch.last_revision_info() |
|
1563.1.4
by Robert Collins
Fix 'bzr pull' on metadir trees. |
943 |
basis_tree = self.basis_tree() |
|
2817.4.3
by Vincent Ladeuil
Add tests for commit, reuse master branch transport. |
944 |
count = self.branch.pull(source, overwrite, stop_revision, |
|
4056.6.4
by Gary van der Merwe
Implement pull --local. |
945 |
possible_transports=possible_transports, |
946 |
local=local) |
|
|
2249.4.2
by Wouter van Heyst
Convert callers of Branch.revision_history() to Branch.last_revision_info() where sensible. |
947 |
new_revision_info = self.branch.last_revision_info() |
948 |
if new_revision_info != old_revision_info: |
|
|
1185.67.2
by Aaron Bentley
Renamed Branch.storage to Branch.repository |
949 |
repository = self.branch.repository |
|
5847.2.1
by John Arbash Meinel
Bug #780677, use a RevisionTree for pull |
950 |
if repository._format.fast_deltas: |
|
5847.2.2
by John Arbash Meinel
Forgot that sometimes we don't have any parents during pull. |
951 |
parent_ids = self.get_parent_ids() |
952 |
if parent_ids: |
|
953 |
basis_id = parent_ids[0] |
|
954 |
basis_tree = repository.revision_tree(basis_id) |
|
|
2255.2.38
by Robert Collins
Fix WorkingTree4.pull to work. |
955 |
basis_tree.lock_read() |
|
1594.1.3
by Robert Collins
Fixup pb usage to use nested_progress_bar. |
956 |
try: |
|
1908.6.1
by Robert Collins
Change all callers of set_last_revision to use set_parent_trees. |
957 |
new_basis_tree = self.branch.basis_tree() |
|
1996.3.6
by John Arbash Meinel
Find a few places that weren't importing their dependencies. |
958 |
merge.merge_inner( |
959 |
self.branch, |
|
|
1908.6.1
by Robert Collins
Change all callers of set_last_revision to use set_parent_trees. |
960 |
new_basis_tree, |
961 |
basis_tree, |
|
962 |
this_tree=self, |
|
|
5430.7.1
by Rory Yorke
Added --show-base to pull and update (bug 202374). |
963 |
change_reporter=change_reporter, |
964 |
show_base=show_base) |
|
|
4634.123.11
by John Arbash Meinel
fix 'pull' to also set the root id. |
965 |
basis_root_id = basis_tree.get_root_id() |
966 |
new_root_id = new_basis_tree.get_root_id() |
|
|
6243.1.1
by Jelmer Vernooij
Fix WorkingTree.pull(stop_revision='null:', overwrite=True). |
967 |
if new_root_id is not None and basis_root_id != new_root_id: |
|
4634.123.11
by John Arbash Meinel
fix 'pull' to also set the root id. |
968 |
self.set_root_id(new_root_id) |
|
1594.1.3
by Robert Collins
Fixup pb usage to use nested_progress_bar. |
969 |
finally: |
|
2255.2.38
by Robert Collins
Fix WorkingTree4.pull to work. |
970 |
basis_tree.unlock() |
|
1908.6.1
by Robert Collins
Change all callers of set_last_revision to use set_parent_trees. |
971 |
# TODO - dedup parents list with things merged by pull ?
|
|
1908.6.3
by Robert Collins
Tidy up the last_revision_id and add_pending_merge conversion to use cleaner apis. |
972 |
# reuse the revisiontree we merged against to set the new
|
973 |
# tree data.
|
|
|
6243.1.1
by Jelmer Vernooij
Fix WorkingTree.pull(stop_revision='null:', overwrite=True). |
974 |
parent_trees = [] |
975 |
if self.branch.last_revision() != _mod_revision.NULL_REVISION: |
|
976 |
parent_trees.append( |
|
977 |
(self.branch.last_revision(), new_basis_tree)) |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
978 |
# we have to pull the merge trees out again, because
|
979 |
# merge_inner has set the ids. - this corner is not yet
|
|
|
1908.6.3
by Robert Collins
Tidy up the last_revision_id and add_pending_merge conversion to use cleaner apis. |
980 |
# layered well enough to prevent double handling.
|
|
2255.2.38
by Robert Collins
Fix WorkingTree4.pull to work. |
981 |
# XXX TODO: Fix the double handling: telling the tree about
|
982 |
# the already known parent data is wasteful.
|
|
|
1908.6.1
by Robert Collins
Change all callers of set_last_revision to use set_parent_trees. |
983 |
merges = self.get_parent_ids()[1:] |
984 |
parent_trees.extend([ |
|
985 |
(parent, repository.revision_tree(parent)) for |
|
986 |
parent in merges]) |
|
987 |
self.set_parent_trees(parent_trees) |
|
|
1185.33.44
by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer) |
988 |
return count |
|
1442.1.67
by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull(). |
989 |
finally: |
990 |
source.unlock() |
|
991 |
||
|
1986.1.2
by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely |
992 |
@needs_write_lock
|
993 |
def put_file_bytes_non_atomic(self, file_id, bytes): |
|
994 |
"""See MutableTree.put_file_bytes_non_atomic.""" |
|
995 |
stream = file(self.id2abspath(file_id), 'wb') |
|
996 |
try: |
|
997 |
stream.write(bytes) |
|
998 |
finally: |
|
999 |
stream.close() |
|
1000 |
||
|
453
by Martin Pool
- Split WorkingTree into its own file |
1001 |
def extras(self): |
|
2255.7.85
by Robert Collins
Teach _iter_changes to gather unversioned path details upon request. |
1002 |
"""Yield all unversioned files in this WorkingTree. |
|
453
by Martin Pool
- Split WorkingTree into its own file |
1003 |
|
|
2255.7.85
by Robert Collins
Teach _iter_changes to gather unversioned path details upon request. |
1004 |
If there are any unversioned directories then only the directory is
|
1005 |
returned, not all its children. But if there are unversioned files
|
|
|
453
by Martin Pool
- Split WorkingTree into its own file |
1006 |
under a versioned subdirectory, they are returned.
|
1007 |
||
1008 |
Currently returned depth-first, sorted by name within directories.
|
|
|
2255.7.85
by Robert Collins
Teach _iter_changes to gather unversioned path details upon request. |
1009 |
This is the same order used by 'osutils.walkdirs'.
|
|
453
by Martin Pool
- Split WorkingTree into its own file |
1010 |
"""
|
|
5777.5.2
by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method |
1011 |
raise NotImplementedError(self.extras) |
|
453
by Martin Pool
- Split WorkingTree into its own file |
1012 |
|
1013 |
def ignored_files(self): |
|
1014 |
"""Yield list of PATH, IGNORE_PATTERN""" |
|
1015 |
for subp in self.extras(): |
|
1016 |
pat = self.is_ignored(subp) |
|
|
1963.2.6
by Robey Pointer
pychecker is on crack; go back to using 'is None'. |
1017 |
if pat is not None: |
|
453
by Martin Pool
- Split WorkingTree into its own file |
1018 |
yield subp, pat |
1019 |
||
1020 |
def is_ignored(self, filename): |
|
1021 |
r"""Check whether the filename matches an ignore pattern. |
|
|
6724.3.1
by Jelmer Vernooij
Move get_ignore_list to InventoryWorkingTree. |
1022 |
"""
|
1023 |
raise NotImplementedError(self.is_ignored) |
|
|
1185.14.6
by Aaron Bentley
Made iter_conflicts a WorkingTree method |
1024 |
|
|
1185.12.28
by Aaron Bentley
Removed use of readonly path for executability test |
1025 |
def kind(self, file_id): |
|
6653.3.1
by Jelmer Vernooij
Move bzr-specific code to breezy.bzrworkingtree. |
1026 |
return osutils.file_kind(self.id2abspath(file_id)) |
|
1185.12.28
by Aaron Bentley
Removed use of readonly path for executability test |
1027 |
|
|
3146.8.4
by Aaron Bentley
Eliminate direct use of inventory from transform application |
1028 |
def stored_kind(self, file_id): |
1029 |
"""See Tree.stored_kind""" |
|
|
5777.5.2
by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method |
1030 |
raise NotImplementedError(self.stored_kind) |
|
3146.8.4
by Aaron Bentley
Eliminate direct use of inventory from transform application |
1031 |
|
|
2012.1.7
by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file |
1032 |
def _comparison_data(self, entry, path): |
1033 |
abspath = self.abspath(path) |
|
1034 |
try: |
|
1035 |
stat_value = os.lstat(abspath) |
|
|
6619.3.2
by Jelmer Vernooij
Apply 2to3 except fix. |
1036 |
except OSError as e: |
|
2012.1.7
by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file |
1037 |
if getattr(e, 'errno', None) == errno.ENOENT: |
1038 |
stat_value = None |
|
1039 |
kind = None |
|
1040 |
executable = False |
|
1041 |
else: |
|
1042 |
raise
|
|
1043 |
else: |
|
1044 |
mode = stat_value.st_mode |
|
1045 |
kind = osutils.file_kind_from_stat_mode(mode) |
|
|
6379.7.1
by Jelmer Vernooij
Add and use WorkingTree._supports_executable. |
1046 |
if not self._supports_executable(): |
|
2409.1.2
by Dmitry Vasiliev
Used one-line conditional expression instead of the multi-line one |
1047 |
executable = entry is not None and entry.executable |
|
2012.1.7
by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file |
1048 |
else: |
1049 |
executable = bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode) |
|
1050 |
return kind, executable, stat_value |
|
1051 |
||
1052 |
def _file_size(self, entry, stat_value): |
|
1053 |
return stat_value.st_size |
|
1054 |
||
|
1534.4.35
by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree() |
1055 |
def last_revision(self): |
|
1986.1.6
by Robert Collins
Add MemoryTree.last_revision. |
1056 |
"""Return the last revision of the branch for this tree. |
1057 |
||
1058 |
This format tree does not support a separate marker for last-revision
|
|
1059 |
compared to the branch.
|
|
1060 |
||
1061 |
See MutableTree.last_revision
|
|
|
1534.4.35
by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree() |
1062 |
"""
|
|
1908.7.6
by Robert Collins
Deprecate WorkingTree.last_revision. |
1063 |
return self._last_revision() |
1064 |
||
1065 |
@needs_read_lock
|
|
1066 |
def _last_revision(self): |
|
1067 |
"""helper for get_parent_ids.""" |
|
|
2598.5.10
by Aaron Bentley
Return NULL_REVISION instead of None for the null revision |
1068 |
return _mod_revision.ensure_null(self.branch.last_revision()) |
|
1534.4.35
by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree() |
1069 |
|
|
1694.2.6
by Martin Pool
[merge] bzr.dev |
1070 |
def is_locked(self): |
|
6313.1.1
by Jelmer Vernooij
Move bzr-specific functionality to InventoryWorkingTree. |
1071 |
"""Check if this tree is locked.""" |
1072 |
raise NotImplementedError(self.is_locked) |
|
|
2298.1.1
by Martin Pool
Add test for merge_modified |
1073 |
|
|
1442.1.65
by Robert Collins
Branch.remove has been moved to WorkingTree. |
1074 |
def lock_read(self): |
|
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
1075 |
"""Lock the tree for reading. |
1076 |
||
1077 |
This also locks the branch, and can be unlocked via self.unlock().
|
|
1078 |
||
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
1079 |
:return: A breezy.lock.LogicalLockResult.
|
|
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
1080 |
"""
|
|
6313.1.1
by Jelmer Vernooij
Move bzr-specific functionality to InventoryWorkingTree. |
1081 |
raise NotImplementedError(self.lock_read) |
|
1442.1.65
by Robert Collins
Branch.remove has been moved to WorkingTree. |
1082 |
|
|
1997.1.1
by Robert Collins
Add WorkingTree.lock_tree_write. |
1083 |
def lock_tree_write(self): |
|
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
1084 |
"""See MutableTree.lock_tree_write, and WorkingTree.unlock. |
1085 |
||
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
1086 |
:return: A breezy.lock.LogicalLockResult.
|
|
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
1087 |
"""
|
|
6313.1.1
by Jelmer Vernooij
Move bzr-specific functionality to InventoryWorkingTree. |
1088 |
raise NotImplementedError(self.lock_tree_write) |
|
1997.1.1
by Robert Collins
Add WorkingTree.lock_tree_write. |
1089 |
|
|
1442.1.65
by Robert Collins
Branch.remove has been moved to WorkingTree. |
1090 |
def lock_write(self): |
|
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
1091 |
"""See MutableTree.lock_write, and WorkingTree.unlock. |
1092 |
||
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
1093 |
:return: A breezy.lock.LogicalLockResult.
|
|
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
1094 |
"""
|
|
6313.1.1
by Jelmer Vernooij
Move bzr-specific functionality to InventoryWorkingTree. |
1095 |
raise NotImplementedError(self.lock_write) |
|
1442.1.65
by Robert Collins
Branch.remove has been moved to WorkingTree. |
1096 |
|
|
1694.2.6
by Martin Pool
[merge] bzr.dev |
1097 |
def get_physical_lock_status(self): |
|
6313.1.1
by Jelmer Vernooij
Move bzr-specific functionality to InventoryWorkingTree. |
1098 |
raise NotImplementedError(self.get_physical_lock_status) |
|
2255.2.204
by Robert Collins
Fix info and status again. |
1099 |
|
|
1638.1.2
by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name. |
1100 |
def set_last_revision(self, new_revision): |
|
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
1101 |
"""Change the last revision in the working tree.""" |
|
5777.5.2
by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method |
1102 |
raise NotImplementedError(self.set_last_revision) |
|
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
1103 |
|
1104 |
def _change_last_revision(self, new_revision): |
|
|
1638.1.2
by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name. |
1105 |
"""Template method part of set_last_revision to perform the change. |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1106 |
|
|
1638.1.2
by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name. |
1107 |
This is used to allow WorkingTree3 instances to not affect branch
|
1108 |
when their last revision is set.
|
|
1109 |
"""
|
|
|
2598.5.1
by Aaron Bentley
Start eliminating the use of None to indicate null revision |
1110 |
if _mod_revision.is_null(new_revision): |
|
5718.7.13
by Jelmer Vernooij
Avoid using set_revision_history. |
1111 |
self.branch.set_last_revision_info(0, new_revision) |
|
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
1112 |
return False |
|
5718.8.14
by Jelmer Vernooij
Check for reserved revids. |
1113 |
_mod_revision.check_not_reserved_id(new_revision) |
|
1534.4.35
by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree() |
1114 |
try: |
|
1908.1.1
by Robert Collins
Relax WorkingTree.set_last-revision to allow any revision to be set. |
1115 |
self.branch.generate_revision_history(new_revision) |
1116 |
except errors.NoSuchRevision: |
|
1117 |
# not present in the repo - dont try to set it deeper than the tip
|
|
|
5807.6.1
by Jelmer Vernooij
Use undeprecated wrappers. |
1118 |
self.branch._set_revision_history([new_revision]) |
|
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
1119 |
return True |
1120 |
||
|
1997.1.3
by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch |
1121 |
@needs_tree_write_lock
|
|
2292.1.22
by Marius Kruger
Implement TODO: Normalize names. |
1122 |
def remove(self, files, verbose=False, to_file=None, keep_files=True, |
|
2292.1.10
by Marius Kruger
* workingtree.remove |
1123 |
force=False): |
|
5777.5.2
by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method |
1124 |
"""Remove nominated files from the working tree metadata. |
|
1442.1.65
by Robert Collins
Branch.remove has been moved to WorkingTree. |
1125 |
|
|
2292.1.22
by Marius Kruger
Implement TODO: Normalize names. |
1126 |
:files: File paths relative to the basedir.
|
|
2292.1.7
by Marius Kruger
First pass at only deleting files on 'bzr remove' when |
1127 |
:keep_files: If true, the files will also be kept.
|
|
2292.1.10
by Marius Kruger
* workingtree.remove |
1128 |
:force: Delete files and directories, even if they are changed and
|
1129 |
even if the directories are not empty.
|
|
|
1442.1.65
by Robert Collins
Branch.remove has been moved to WorkingTree. |
1130 |
"""
|
|
6695.3.1
by Martin
Remove remaining uses of basestring from the codebase |
1131 |
if isinstance(files, (str, text_type)): |
|
1442.1.65
by Robert Collins
Branch.remove has been moved to WorkingTree. |
1132 |
files = [files] |
1133 |
||
|
1551.15.12
by Aaron Bentley
Stop using inventory directly in WorkingTree.remove |
1134 |
inv_delta = [] |
|
2292.1.25
by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show() |
1135 |
|
|
5340.8.3
by Marius Kruger
new_files => all_files |
1136 |
all_files = set() # specified and nested files |
|
2655.2.16
by Marius Kruger
* Rename `unknown_files_in_directory` to `unknown_nested_files`, which |
1137 |
unknown_nested_files=set() |
|
4792.5.2
by Martin Pool
Move stubby show_status from bzrlib.textui into remove(), its only user |
1138 |
if to_file is None: |
1139 |
to_file = sys.stdout |
|
|
2292.1.25
by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show() |
1140 |
|
|
5340.8.1
by Marius Kruger
* make the backup file name generator in bzrdir available to others |
1141 |
files_to_backup = [] |
1142 |
||
|
2292.1.25
by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show() |
1143 |
def recurse_directory_to_add_files(directory): |
|
2655.2.16
by Marius Kruger
* Rename `unknown_files_in_directory` to `unknown_nested_files`, which |
1144 |
# Recurse directory and add all files
|
|
2292.1.25
by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show() |
1145 |
# so we can check if they have changed.
|
|
5160.2.2
by Marius Kruger
check if changed file isStillInDirToBeRemoved before bailing out |
1146 |
for parent_info, file_infos in self.walkdirs(directory): |
|
3585.2.4
by Robert Collins
* Deleting directories by hand before running ``bzr rm`` will not |
1147 |
for relpath, basename, kind, lstat, fileid, kind in file_infos: |
|
2655.2.16
by Marius Kruger
* Rename `unknown_files_in_directory` to `unknown_nested_files`, which |
1148 |
# Is it versioned or ignored?
|
|
5340.8.1
by Marius Kruger
* make the backup file name generator in bzrdir available to others |
1149 |
if self.path2id(relpath): |
|
2655.2.16
by Marius Kruger
* Rename `unknown_files_in_directory` to `unknown_nested_files`, which |
1150 |
# Add nested content for deletion.
|
|
5340.8.3
by Marius Kruger
new_files => all_files |
1151 |
all_files.add(relpath) |
|
2655.2.16
by Marius Kruger
* Rename `unknown_files_in_directory` to `unknown_nested_files`, which |
1152 |
else: |
|
5340.8.1
by Marius Kruger
* make the backup file name generator in bzrdir available to others |
1153 |
# Files which are not versioned
|
|
2655.2.16
by Marius Kruger
* Rename `unknown_files_in_directory` to `unknown_nested_files`, which |
1154 |
# should be treated as unknown.
|
|
5340.8.1
by Marius Kruger
* make the backup file name generator in bzrdir available to others |
1155 |
files_to_backup.append(relpath) |
|
2292.1.25
by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show() |
1156 |
|
1157 |
for filename in files: |
|
1158 |
# Get file name into canonical form.
|
|
|
1551.15.11
by Aaron Bentley
Bugfix WorkingTree.remove to handle subtrees, and non-cwd trees |
1159 |
abspath = self.abspath(filename) |
1160 |
filename = self.relpath(abspath) |
|
|
2292.1.25
by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show() |
1161 |
if len(filename) > 0: |
|
5340.8.3
by Marius Kruger
new_files => all_files |
1162 |
all_files.add(filename) |
|
3585.2.4
by Robert Collins
* Deleting directories by hand before running ``bzr rm`` will not |
1163 |
recurse_directory_to_add_files(filename) |
|
2655.2.4
by Marius Kruger
* workingtree.remove |
1164 |
|
|
5340.8.3
by Marius Kruger
new_files => all_files |
1165 |
files = list(all_files) |
|
2292.1.22
by Marius Kruger
Implement TODO: Normalize names. |
1166 |
|
|
2475.5.2
by Marius Kruger
* blackbox/test_remove |
1167 |
if len(files) == 0: |
1168 |
return # nothing to do |
|
1169 |
||
|
2292.1.22
by Marius Kruger
Implement TODO: Normalize names. |
1170 |
# Sort needed to first handle directory content before the directory
|
1171 |
files.sort(reverse=True) |
|
|
2655.2.6
by Marius Kruger
* workingtree.remove |
1172 |
|
|
2655.2.4
by Marius Kruger
* workingtree.remove |
1173 |
# Bail out if we are going to delete files we shouldn't
|
|
2292.1.11
by Marius Kruger
* workingtree.remove |
1174 |
if not keep_files and not force: |
|
5340.8.1
by Marius Kruger
* make the backup file name generator in bzrdir available to others |
1175 |
for (file_id, path, content_change, versioned, parent_id, name, |
1176 |
kind, executable) in self.iter_changes(self.basis_tree(), |
|
1177 |
include_unchanged=True, require_versioned=False, |
|
1178 |
want_unversioned=True, specific_files=files): |
|
1179 |
if versioned[0] == False: |
|
1180 |
# The record is unknown or newly added
|
|
1181 |
files_to_backup.append(path[1]) |
|
1182 |
elif (content_change and (kind[1] is not None) and |
|
1183 |
osutils.is_inside_any(files, path[1])): |
|
1184 |
# Versioned and changed, but not deleted, and still
|
|
1185 |
# in one of the dirs to be deleted.
|
|
1186 |
files_to_backup.append(path[1]) |
|
|
2475.5.2
by Marius Kruger
* blackbox/test_remove |
1187 |
|
|
5340.8.5
by Marius Kruger
* extract backup_files |
1188 |
def backup(file_to_backup): |
|
6653.6.1
by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir. |
1189 |
backup_name = self.controldir._available_backup_name(file_to_backup) |
|
5340.8.5
by Marius Kruger
* extract backup_files |
1190 |
osutils.rename(abs_path, self.abspath(backup_name)) |
|
5409.5.4
by Vincent Ladeuil
Deprecate BzrDir.generate_backup_name and use osutils.available_backup_name. |
1191 |
return "removed %s (but kept a copy: %s)" % (file_to_backup, |
1192 |
backup_name) |
|
|
5340.8.5
by Marius Kruger
* extract backup_files |
1193 |
|
|
4031.3.1
by Frank Aspell
Fixing various typos |
1194 |
# Build inv_delta and delete files where applicable,
|
|
5777.5.2
by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method |
1195 |
# do this before any modifications to meta data.
|
|
1442.1.65
by Robert Collins
Branch.remove has been moved to WorkingTree. |
1196 |
for f in files: |
|
1551.15.12
by Aaron Bentley
Stop using inventory directly in WorkingTree.remove |
1197 |
fid = self.path2id(f) |
|
2655.2.4
by Marius Kruger
* workingtree.remove |
1198 |
message = None |
|
1442.1.65
by Robert Collins
Branch.remove has been moved to WorkingTree. |
1199 |
if not fid: |
|
2655.2.4
by Marius Kruger
* workingtree.remove |
1200 |
message = "%s is not versioned." % (f,) |
|
2245.5.1
by Marius Kruger
Let bzr rm rather give a warning than an error when trying to remove a non-versioned file. |
1201 |
else: |
1202 |
if verbose: |
|
|
2292.1.10
by Marius Kruger
* workingtree.remove |
1203 |
# having removed it, it must be either ignored or unknown
|
|
2245.5.1
by Marius Kruger
Let bzr rm rather give a warning than an error when trying to remove a non-versioned file. |
1204 |
if self.is_ignored(f): |
1205 |
new_status = 'I' |
|
1206 |
else: |
|
1207 |
new_status = '?' |
|
|
4792.5.2
by Martin Pool
Move stubby show_status from bzrlib.textui into remove(), its only user |
1208 |
# XXX: Really should be a more abstract reporter interface
|
|
4792.5.3
by Martin Pool
Further cleanup of removal reporting code |
1209 |
kind_ch = osutils.kind_marker(self.kind(fid)) |
1210 |
to_file.write(new_status + ' ' + f + kind_ch + '\n') |
|
|
2655.2.17
by Marius Kruger
Minor doc and spacing updates. |
1211 |
# Unversion file
|
|
1551.15.12
by Aaron Bentley
Stop using inventory directly in WorkingTree.remove |
1212 |
inv_delta.append((f, None, fid, None)) |
|
2655.2.4
by Marius Kruger
* workingtree.remove |
1213 |
message = "removed %s" % (f,) |
|
2292.1.7
by Marius Kruger
First pass at only deleting files on 'bzr remove' when |
1214 |
|
|
2292.1.13
by Marius Kruger
* merge the unversion command back into the remove command, |
1215 |
if not keep_files: |
|
2292.1.30
by Marius Kruger
* Minor text fixes. |
1216 |
abs_path = self.abspath(f) |
1217 |
if osutils.lexists(abs_path): |
|
1218 |
if (osutils.isdir(abs_path) and |
|
1219 |
len(os.listdir(abs_path)) > 0): |
|
|
2655.2.4
by Marius Kruger
* workingtree.remove |
1220 |
if force: |
1221 |
osutils.rmtree(abs_path) |
|
|
5340.8.1
by Marius Kruger
* make the backup file name generator in bzrdir available to others |
1222 |
message = "deleted %s" % (f,) |
|
2655.2.4
by Marius Kruger
* workingtree.remove |
1223 |
else: |
|
5340.8.5
by Marius Kruger
* extract backup_files |
1224 |
message = backup(f) |
|
2292.1.25
by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show() |
1225 |
else: |
|
5340.8.1
by Marius Kruger
* make the backup file name generator in bzrdir available to others |
1226 |
if f in files_to_backup: |
|
5340.8.5
by Marius Kruger
* extract backup_files |
1227 |
message = backup(f) |
|
5340.8.1
by Marius Kruger
* make the backup file name generator in bzrdir available to others |
1228 |
else: |
1229 |
osutils.delete_any(abs_path) |
|
1230 |
message = "deleted %s" % (f,) |
|
|
2292.1.13
by Marius Kruger
* merge the unversion command back into the remove command, |
1231 |
elif message is not None: |
|
2655.2.17
by Marius Kruger
Minor doc and spacing updates. |
1232 |
# Only care if we haven't done anything yet.
|
1233 |
message = "%s does not exist." % (f,) |
|
|
2292.1.25
by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show() |
1234 |
|
|
2655.2.17
by Marius Kruger
Minor doc and spacing updates. |
1235 |
# Print only one message (if any) per file.
|
|
2292.1.1
by Marius Kruger
"bzr remove" and "bzr rm" will now remove the working file. |
1236 |
if message is not None: |
1237 |
note(message) |
|
|
1551.15.12
by Aaron Bentley
Stop using inventory directly in WorkingTree.remove |
1238 |
self.apply_inventory_delta(inv_delta) |
|
1442.1.65
by Robert Collins
Branch.remove has been moved to WorkingTree. |
1239 |
|
|
1997.1.3
by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch |
1240 |
@needs_tree_write_lock
|
|
2748.3.2
by Aaron Bentley
Fix revert, remove-tree, and various tests to use None for 'no files specified' |
1241 |
def revert(self, filenames=None, old_tree=None, backups=True, |
|
4961.2.9
by Martin Pool
Rip out most remaining uses of DummyProgressBar |
1242 |
pb=None, report_changes=False): |
|
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
1243 |
from .conflicts import resolve |
|
1501
by Robert Collins
Move revert from Branch to WorkingTree. |
1244 |
if old_tree is None: |
|
2949.2.1
by Robert Collins
* Revert takes out an appropriate lock when reverting to a basis tree, and |
1245 |
basis_tree = self.basis_tree() |
1246 |
basis_tree.lock_read() |
|
1247 |
old_tree = basis_tree |
|
|
1534.10.14
by Aaron Bentley
Made revert clear conflicts |
1248 |
else: |
|
2949.2.1
by Robert Collins
* Revert takes out an appropriate lock when reverting to a basis tree, and |
1249 |
basis_tree = None |
1250 |
try: |
|
1251 |
conflicts = transform.revert(self, old_tree, filenames, backups, pb, |
|
1252 |
report_changes) |
|
|
2949.2.2
by Robert Collins
Avoid dirstate parent resetting when it is not needed during revert. |
1253 |
if filenames is None and len(self.get_parent_ids()) > 1: |
|
2949.2.1
by Robert Collins
* Revert takes out an appropriate lock when reverting to a basis tree, and |
1254 |
parent_trees = [] |
1255 |
last_revision = self.last_revision() |
|
|
4496.3.4
by Andrew Bennetts
Tidy up unused and redundant imports in workingtree.py. |
1256 |
if last_revision != _mod_revision.NULL_REVISION: |
|
2949.2.1
by Robert Collins
* Revert takes out an appropriate lock when reverting to a basis tree, and |
1257 |
if basis_tree is None: |
1258 |
basis_tree = self.basis_tree() |
|
1259 |
basis_tree.lock_read() |
|
1260 |
parent_trees.append((last_revision, basis_tree)) |
|
1261 |
self.set_parent_trees(parent_trees) |
|
1262 |
resolve(self) |
|
1263 |
else: |
|
|
3017.2.1
by Aaron Bentley
Revert now resolves conflicts recursively (#102739) |
1264 |
resolve(self, filenames, ignore_misses=True, recursive=True) |
|
2949.2.1
by Robert Collins
* Revert takes out an appropriate lock when reverting to a basis tree, and |
1265 |
finally: |
1266 |
if basis_tree is not None: |
|
1267 |
basis_tree.unlock() |
|
|
1558.7.13
by Aaron Bentley
WorkingTree.revert returns conflicts |
1268 |
return conflicts |
|
1501
by Robert Collins
Move revert from Branch to WorkingTree. |
1269 |
|
|
6538.1.20
by Aaron Bentley
Cleanup |
1270 |
@needs_write_lock
|
|
6538.1.5
by Aaron Bentley
Implement WorkingTree.store_uncommitted. |
1271 |
def store_uncommitted(self): |
|
6538.1.20
by Aaron Bentley
Cleanup |
1272 |
"""Store uncommitted changes from the tree in the branch.""" |
1273 |
target_tree = self.basis_tree() |
|
1274 |
shelf_creator = shelf.ShelfCreator(self, target_tree) |
|
|
6538.1.5
by Aaron Bentley
Implement WorkingTree.store_uncommitted. |
1275 |
try: |
|
6538.1.20
by Aaron Bentley
Cleanup |
1276 |
if not shelf_creator.shelve_all(): |
1277 |
return
|
|
1278 |
self.branch.store_uncommitted(shelf_creator) |
|
1279 |
shelf_creator.transform() |
|
|
6538.1.5
by Aaron Bentley
Implement WorkingTree.store_uncommitted. |
1280 |
finally: |
|
6538.1.20
by Aaron Bentley
Cleanup |
1281 |
shelf_creator.finalize() |
|
6538.1.7
by Aaron Bentley
Move to shelve_all and improve it. |
1282 |
note('Uncommitted changes stored in branch "%s".', self.branch.nick) |
|
6538.1.5
by Aaron Bentley
Implement WorkingTree.store_uncommitted. |
1283 |
|
|
6538.1.20
by Aaron Bentley
Cleanup |
1284 |
@needs_write_lock
|
1285 |
def restore_uncommitted(self): |
|
1286 |
"""Restore uncommitted changes from the branch into the tree.""" |
|
|
6538.1.12
by Aaron Bentley
Move unshelver construction to Branch. |
1287 |
unshelver = self.branch.get_unshelver(self) |
1288 |
if unshelver is None: |
|
|
6538.1.11
by Aaron Bentley
Switch to much simpler implementation of restore_uncommitted. |
1289 |
return
|
|
6538.1.10
by Aaron Bentley
Implement WorkingTree.get_uncommitted_data |
1290 |
try: |
|
6538.1.11
by Aaron Bentley
Switch to much simpler implementation of restore_uncommitted. |
1291 |
merger = unshelver.make_merger() |
1292 |
merger.ignore_zero = True |
|
1293 |
merger.do_merge() |
|
|
6538.1.21
by Aaron Bentley
Ensure shelves are deleted when restored. |
1294 |
self.branch.store_uncommitted(None) |
|
6538.1.11
by Aaron Bentley
Switch to much simpler implementation of restore_uncommitted. |
1295 |
finally: |
1296 |
unshelver.finalize() |
|
|
6538.1.10
by Aaron Bentley
Implement WorkingTree.get_uncommitted_data |
1297 |
|
|
1908.11.2
by Robert Collins
Implement WorkingTree interface conformance tests for |
1298 |
def revision_tree(self, revision_id): |
1299 |
"""See Tree.revision_tree. |
|
1300 |
||
1301 |
WorkingTree can supply revision_trees for the basis revision only
|
|
1302 |
because there is only one cached inventory in the bzr directory.
|
|
1303 |
"""
|
|
|
5777.5.2
by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method |
1304 |
raise NotImplementedError(self.revision_tree) |
|
1497
by Robert Collins
Move Branch.read_working_inventory to WorkingTree. |
1305 |
|
|
1997.1.3
by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch |
1306 |
@needs_tree_write_lock
|
|
1457.1.10
by Robert Collins
Move set_root_id to WorkingTree. |
1307 |
def set_root_id(self, file_id): |
1308 |
"""Set the root id for this tree.""" |
|
|
6741.1.1
by Jelmer Vernooij
Add WorkingTreeFormat.supports_setting_file_ids. |
1309 |
if not self.supports_setting_file_ids(): |
1310 |
raise SettingFileIdUnsupported() |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1311 |
# for compatability
|
|
2858.2.4
by Martin Pool
Restore deprecated behaviour of accepting None for WorkingTree.set_root_id (thanks igc) |
1312 |
if file_id is None: |
|
3400.3.6
by Martin Pool
Remove code deprecated prior to 1.1 and its tests |
1313 |
raise ValueError( |
1314 |
'WorkingTree.set_root_id with fileid=None') |
|
1315 |
file_id = osutils.safe_file_id(file_id) |
|
|
2255.2.15
by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing. |
1316 |
self._set_root_id(file_id) |
1317 |
||
1318 |
def _set_root_id(self, file_id): |
|
1319 |
"""Set the root id for this tree, in a format specific manner. |
|
1320 |
||
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1321 |
:param file_id: The file id to assign to the root. It must not be
|
|
2255.2.15
by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing. |
1322 |
present in the current inventory or an error will occur. It must
|
1323 |
not be None, but rather a valid file id.
|
|
1324 |
"""
|
|
|
5777.5.2
by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method |
1325 |
raise NotImplementedError(self._set_root_id) |
|
1457.1.10
by Robert Collins
Move set_root_id to WorkingTree. |
1326 |
|
|
1442.1.65
by Robert Collins
Branch.remove has been moved to WorkingTree. |
1327 |
def unlock(self): |
1328 |
"""See Branch.unlock. |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1329 |
|
|
1442.1.65
by Robert Collins
Branch.remove has been moved to WorkingTree. |
1330 |
WorkingTree locking just uses the Branch locking facilities.
|
1331 |
This is current because all working trees have an embedded branch
|
|
1332 |
within them. IF in the future, we were to make branch data shareable
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1333 |
between multiple working trees, i.e. via shared storage, then we
|
|
1442.1.65
by Robert Collins
Branch.remove has been moved to WorkingTree. |
1334 |
would probably want to lock both the local tree, and the branch.
|
1335 |
"""
|
|
|
1852.4.2
by Robert Collins
Refactor workingtree.unlock to be cleaner, adding a trivial test for unlock. Introduces an explicit Format2 tree type, making the base WorkingTree cleaner to derive from. |
1336 |
raise NotImplementedError(self.unlock) |
|
1442.1.65
by Robert Collins
Branch.remove has been moved to WorkingTree. |
1337 |
|
|
1907.5.7
by Matthieu Moy
Coding style fixes thanks to jam. |
1338 |
_marker = object() |
1339 |
||
|
2009.1.4
by Mark Hammond
First attempt to merge .dev and resolve the conflicts (but tests are |
1340 |
def update(self, change_reporter=None, possible_transports=None, |
|
5430.7.1
by Rory Yorke
Added --show-base to pull and update (bug 202374). |
1341 |
revision=None, old_tip=_marker, show_base=False): |
|
1587.1.11
by Robert Collins
Local commits appear to be working properly. |
1342 |
"""Update a working tree along its branch. |
1343 |
||
|
1731.1.33
by Aaron Bentley
Revert no-special-root changes |
1344 |
This will update the branch if its bound too, which means we have
|
1345 |
multiple trees involved:
|
|
1346 |
||
1347 |
- The new basis tree of the master.
|
|
1348 |
- The old basis tree of the branch.
|
|
1349 |
- The old basis tree of the working tree.
|
|
1350 |
- The current working tree state.
|
|
1351 |
||
1352 |
Pathologically, all three may be different, and non-ancestors of each
|
|
1353 |
other. Conceptually we want to:
|
|
1354 |
||
1355 |
- Preserve the wt.basis->wt.state changes
|
|
1356 |
- Transform the wt.basis to the new master basis.
|
|
1357 |
- Apply a merge of the old branch basis to get any 'local' changes from
|
|
1358 |
it into the tree.
|
|
1359 |
- Restore the wt.basis->wt.state changes.
|
|
|
1587.1.11
by Robert Collins
Local commits appear to be working properly. |
1360 |
|
1361 |
There isn't a single operation at the moment to do that, so we:
|
|
|
5891.1.2
by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier. |
1362 |
|
|
1731.1.33
by Aaron Bentley
Revert no-special-root changes |
1363 |
- Merge current state -> basis tree of the master w.r.t. the old tree
|
1364 |
basis.
|
|
1365 |
- Do a 'normal' merge of the old branch basis if it is relevant.
|
|
|
1907.5.4
by Matthieu Moy
Added test-cases for update -r. Tweaked the implementation too. |
1366 |
|
|
2009.1.2
by John Arbash Meinel
minor whitespace cleanup. |
1367 |
:param revision: The target revision to update to. Must be in the
|
1368 |
revision history.
|
|
1369 |
:param old_tip: If branch.update() has already been run, the value it
|
|
1370 |
returned (old tip of the branch or None). _marker is used
|
|
1371 |
otherwise.
|
|
|
1587.1.11
by Robert Collins
Local commits appear to be working properly. |
1372 |
"""
|
|
3280.5.1
by John Arbash Meinel
Avoid opening the master branch when we won't use it. |
1373 |
if self.branch.get_bound_location() is not None: |
|
2084.2.1
by Aaron Bentley
Support updating lightweight checkouts of readonly branches |
1374 |
self.lock_write() |
|
2009.1.6
by Mark Hammond
more tweaks of the merge to get the tests passing. |
1375 |
update_branch = (old_tip is self._marker) |
|
2084.2.1
by Aaron Bentley
Support updating lightweight checkouts of readonly branches |
1376 |
else: |
1377 |
self.lock_tree_write() |
|
1378 |
update_branch = False |
|
1379 |
try: |
|
1380 |
if update_branch: |
|
|
2806.2.2
by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport. |
1381 |
old_tip = self.branch.update(possible_transports) |
|
2084.2.1
by Aaron Bentley
Support updating lightweight checkouts of readonly branches |
1382 |
else: |
|
2009.1.6
by Mark Hammond
more tweaks of the merge to get the tests passing. |
1383 |
if old_tip is self._marker: |
1384 |
old_tip = None |
|
|
5430.7.1
by Rory Yorke
Added --show-base to pull and update (bug 202374). |
1385 |
return self._update_tree(old_tip, change_reporter, revision, show_base) |
|
2084.2.1
by Aaron Bentley
Support updating lightweight checkouts of readonly branches |
1386 |
finally: |
1387 |
self.unlock() |
|
1388 |
||
1389 |
@needs_tree_write_lock
|
|
|
5430.7.1
by Rory Yorke
Added --show-base to pull and update (bug 202374). |
1390 |
def _update_tree(self, old_tip=None, change_reporter=None, revision=None, |
1391 |
show_base=False): |
|
|
2084.2.1
by Aaron Bentley
Support updating lightweight checkouts of readonly branches |
1392 |
"""Update a tree to the master branch. |
1393 |
||
1394 |
:param old_tip: if supplied, the previous tip revision the branch,
|
|
1395 |
before it was changed to the master branch's tip.
|
|
1396 |
"""
|
|
|
1927.2.3
by Robert Collins
review comment application - paired with Martin. |
1397 |
# here if old_tip is not None, it is the old tip of the branch before
|
1398 |
# it was updated from the master branch. This should become a pending
|
|
1399 |
# merge in the working tree to preserve the user existing work. we
|
|
1400 |
# cant set that until we update the working trees last revision to be
|
|
1401 |
# one from the new branch, because it will just get absorbed by the
|
|
1402 |
# parent de-duplication logic.
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1403 |
#
|
|
1927.2.3
by Robert Collins
review comment application - paired with Martin. |
1404 |
# We MUST save it even if an error occurs, because otherwise the users
|
1405 |
# local work is unreferenced and will appear to have been lost.
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1406 |
#
|
|
4985.3.17
by Vincent Ladeuil
Some cleanup. |
1407 |
nb_conflicts = 0 |
|
1907.5.13
by Matthieu Moy
Fixed bad conflict resolution. |
1408 |
try: |
1409 |
last_rev = self.get_parent_ids()[0] |
|
1410 |
except IndexError: |
|
|
2598.5.1
by Aaron Bentley
Start eliminating the use of None to indicate null revision |
1411 |
last_rev = _mod_revision.NULL_REVISION |
|
1907.5.8
by Matthieu Moy
merge (with conflicts) |
1412 |
if revision is None: |
|
1907.5.13
by Matthieu Moy
Fixed bad conflict resolution. |
1413 |
revision = self.branch.last_revision() |
|
4985.3.17
by Vincent Ladeuil
Some cleanup. |
1414 |
|
|
4985.3.14
by Gerard Krol
Don't compare old_tip to revision, just do the merge. |
1415 |
old_tip = old_tip or _mod_revision.NULL_REVISION |
|
4985.3.17
by Vincent Ladeuil
Some cleanup. |
1416 |
|
|
4985.3.15
by Gerard Krol
Now correctly determine the branch point (instead of some lucky guesses) |
1417 |
if not _mod_revision.is_null(old_tip) and old_tip != last_rev: |
|
4985.3.14
by Gerard Krol
Don't compare old_tip to revision, just do the merge. |
1418 |
# the branch we are bound to was updated
|
1419 |
# merge those changes in first
|
|
1420 |
base_tree = self.basis_tree() |
|
|
4985.3.1
by Gerard Krol
Werkt wel ok |
1421 |
other_tree = self.branch.repository.revision_tree(old_tip) |
|
4985.3.17
by Vincent Ladeuil
Some cleanup. |
1422 |
nb_conflicts = merge.merge_inner(self.branch, other_tree, |
1423 |
base_tree, this_tree=self, |
|
|
5430.7.1
by Rory Yorke
Added --show-base to pull and update (bug 202374). |
1424 |
change_reporter=change_reporter, |
1425 |
show_base=show_base) |
|
|
4985.3.17
by Vincent Ladeuil
Some cleanup. |
1426 |
if nb_conflicts: |
|
4985.3.14
by Gerard Krol
Don't compare old_tip to revision, just do the merge. |
1427 |
self.add_parent_tree((old_tip, other_tree)) |
|
6138.3.4
by Jonathan Riddell
add gettext() to uses of trace.note() |
1428 |
note(gettext('Rerun update after fixing the conflicts.')) |
|
4985.3.17
by Vincent Ladeuil
Some cleanup. |
1429 |
return nb_conflicts |
|
4985.3.1
by Gerard Krol
Werkt wel ok |
1430 |
|
|
2009.1.4
by Mark Hammond
First attempt to merge .dev and resolve the conflicts (but tests are |
1431 |
if last_rev != _mod_revision.ensure_null(revision): |
|
4985.3.15
by Gerard Krol
Now correctly determine the branch point (instead of some lucky guesses) |
1432 |
# the working tree is up to date with the branch
|
1433 |
# we can merge the specified revision from master
|
|
1434 |
to_tree = self.branch.repository.revision_tree(revision) |
|
1435 |
to_root_id = to_tree.get_root_id() |
|
1436 |
||
|
1927.2.3
by Robert Collins
review comment application - paired with Martin. |
1437 |
basis = self.basis_tree() |
|
2255.2.44
by Robert Collins
Fix tree unlock on readonly Format4 trees with dirty hashcache. |
1438 |
basis.lock_read() |
1439 |
try: |
|
|
5777.5.2
by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method |
1440 |
if (basis.get_root_id() is None or basis.get_root_id() != to_root_id): |
|
4634.123.10
by John Arbash Meinel
update now properly handles root-id changes. |
1441 |
self.set_root_id(to_root_id) |
|
2255.6.6
by Aaron Bentley
Fix update to set unique roots, and work with dirstate |
1442 |
self.flush() |
|
2255.2.44
by Robert Collins
Fix tree unlock on readonly Format4 trees with dirty hashcache. |
1443 |
finally: |
1444 |
basis.unlock() |
|
|
4985.3.15
by Gerard Krol
Now correctly determine the branch point (instead of some lucky guesses) |
1445 |
|
1446 |
# determine the branch point
|
|
1447 |
graph = self.branch.repository.get_graph() |
|
|
4985.3.17
by Vincent Ladeuil
Some cleanup. |
1448 |
base_rev_id = graph.find_unique_lca(self.branch.last_revision(), |
1449 |
last_rev) |
|
|
4985.3.15
by Gerard Krol
Now correctly determine the branch point (instead of some lucky guesses) |
1450 |
base_tree = self.branch.repository.revision_tree(base_rev_id) |
1451 |
||
|
4985.3.17
by Vincent Ladeuil
Some cleanup. |
1452 |
nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree, |
1453 |
this_tree=self, |
|
|
5430.7.1
by Rory Yorke
Added --show-base to pull and update (bug 202374). |
1454 |
change_reporter=change_reporter, |
1455 |
show_base=show_base) |
|
|
4985.3.15
by Gerard Krol
Now correctly determine the branch point (instead of some lucky guesses) |
1456 |
self.set_last_revision(revision) |
|
1908.6.6
by Robert Collins
Merge updated set_parents api. |
1457 |
# TODO - dedup parents list with things merged by pull ?
|
1458 |
# reuse the tree we've updated to to set the basis:
|
|
|
1907.5.11
by Matthieu Moy
Simple fixes (deprecation warning, use revision where needed) |
1459 |
parent_trees = [(revision, to_tree)] |
|
1908.6.6
by Robert Collins
Merge updated set_parents api. |
1460 |
merges = self.get_parent_ids()[1:] |
1461 |
# Ideally we ask the tree for the trees here, that way the working
|
|
|
1907.5.12
by Matthieu Moy
Manage InvalidRevisionSpec in update command. |
1462 |
# tree can decide whether to give us the entire tree or give us a
|
|
1908.6.6
by Robert Collins
Merge updated set_parents api. |
1463 |
# lazy initialised tree. dirstate for instance will have the trees
|
1464 |
# in ram already, whereas a last-revision + basis-inventory tree
|
|
1465 |
# will not, but also does not need them when setting parents.
|
|
1466 |
for parent in merges: |
|
1467 |
parent_trees.append( |
|
1468 |
(parent, self.branch.repository.revision_tree(parent))) |
|
|
4985.3.14
by Gerard Krol
Don't compare old_tip to revision, just do the merge. |
1469 |
if not _mod_revision.is_null(old_tip): |
1470 |
parent_trees.append( |
|
1471 |
(old_tip, self.branch.repository.revision_tree(old_tip))) |
|
|
1908.6.6
by Robert Collins
Merge updated set_parents api. |
1472 |
self.set_parent_trees(parent_trees) |
|
1908.7.6
by Robert Collins
Deprecate WorkingTree.last_revision. |
1473 |
last_rev = parent_trees[0][0] |
|
4985.3.17
by Vincent Ladeuil
Some cleanup. |
1474 |
return nb_conflicts |
|
1508.1.24
by Robert Collins
Add update command for use with checkouts. |
1475 |
|
|
1534.10.22
by Aaron Bentley
Got ConflictList implemented |
1476 |
def set_conflicts(self, arg): |
|
2206.1.7
by Marius Kruger
* errors |
1477 |
raise errors.UnsupportedOperation(self.set_conflicts, self) |
|
1534.10.8
by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree |
1478 |
|
|
1551.7.11
by Aaron Bentley
Add WorkingTree.add_conflicts |
1479 |
def add_conflicts(self, arg): |
|
2206.1.7
by Marius Kruger
* errors |
1480 |
raise errors.UnsupportedOperation(self.add_conflicts, self) |
|
1551.7.11
by Aaron Bentley
Add WorkingTree.add_conflicts |
1481 |
|
|
1534.10.22
by Aaron Bentley
Got ConflictList implemented |
1482 |
def conflicts(self): |
|
5582.10.47
by Jelmer Vernooij
Move some upgrade tests that rely on bzrdirformat 0.0.4. |
1483 |
raise NotImplementedError(self.conflicts) |
|
1534.10.22
by Aaron Bentley
Got ConflictList implemented |
1484 |
|
|
1852.15.3
by Robert Collins
Add a first-cut Tree.walkdirs method. |
1485 |
def walkdirs(self, prefix=""): |
|
2255.2.18
by Robert Collins
Dirstate: all tree_implementation tests passing. |
1486 |
"""Walk the directories of this tree. |
1487 |
||
|
2292.1.25
by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show() |
1488 |
returns a generator which yields items in the form:
|
|
2292.1.30
by Marius Kruger
* Minor text fixes. |
1489 |
((curren_directory_path, fileid),
|
|
2292.1.25
by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show() |
1490 |
[(file1_path, file1_name, file1_kind, (lstat), file1_id,
|
1491 |
file1_kind), ... ])
|
|
1492 |
||
|
2255.2.18
by Robert Collins
Dirstate: all tree_implementation tests passing. |
1493 |
This API returns a generator, which is only valid during the current
|
1494 |
tree transaction - within a single lock_read or lock_write duration.
|
|
1495 |
||
|
2292.1.25
by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show() |
1496 |
If the tree is not locked, it may cause an error to be raised,
|
1497 |
depending on the tree implementation.
|
|
|
2255.2.18
by Robert Collins
Dirstate: all tree_implementation tests passing. |
1498 |
"""
|
|
1852.15.7
by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs. |
1499 |
disk_top = self.abspath(prefix) |
1500 |
if disk_top.endswith('/'): |
|
1501 |
disk_top = disk_top[:-1] |
|
1502 |
top_strip_len = len(disk_top) + 1 |
|
|
1852.15.11
by Robert Collins
Tree.walkdirs handles missing contents in workingtrees. |
1503 |
inventory_iterator = self._walkdirs(prefix) |
|
1852.15.7
by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs. |
1504 |
disk_iterator = osutils.walkdirs(disk_top, prefix) |
|
1852.15.10
by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful. |
1505 |
try: |
|
6634.2.1
by Martin
Apply 2to3 next fixer and make compatible |
1506 |
current_disk = next(disk_iterator) |
|
1852.15.11
by Robert Collins
Tree.walkdirs handles missing contents in workingtrees. |
1507 |
disk_finished = False |
|
6619.3.2
by Jelmer Vernooij
Apply 2to3 except fix. |
1508 |
except OSError as e: |
|
2423.2.1
by Alexander Belchenko
Fix for walkdirs in missing dir with Py2.4 @ win32 |
1509 |
if not (e.errno == errno.ENOENT or |
1510 |
(sys.platform == 'win32' and e.errno == ERROR_PATH_NOT_FOUND)): |
|
|
1852.15.11
by Robert Collins
Tree.walkdirs handles missing contents in workingtrees. |
1511 |
raise
|
1512 |
current_disk = None |
|
1513 |
disk_finished = True |
|
1514 |
try: |
|
|
6634.2.1
by Martin
Apply 2to3 next fixer and make compatible |
1515 |
current_inv = next(inventory_iterator) |
|
1852.15.10
by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful. |
1516 |
inv_finished = False |
1517 |
except StopIteration: |
|
1518 |
current_inv = None |
|
1519 |
inv_finished = True |
|
|
1852.15.7
by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs. |
1520 |
while not inv_finished or not disk_finished: |
|
2457.2.3
by Marius Kruger
factor out tuples into better readable variables |
1521 |
if current_disk: |
1522 |
((cur_disk_dir_relpath, cur_disk_dir_path_from_top), |
|
1523 |
cur_disk_dir_content) = current_disk |
|
1524 |
else: |
|
1525 |
((cur_disk_dir_relpath, cur_disk_dir_path_from_top), |
|
1526 |
cur_disk_dir_content) = ((None, None), None) |
|
|
1852.15.7
by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs. |
1527 |
if not disk_finished: |
1528 |
# strip out .bzr dirs
|
|
|
2457.2.3
by Marius Kruger
factor out tuples into better readable variables |
1529 |
if (cur_disk_dir_path_from_top[top_strip_len:] == '' and |
1530 |
len(cur_disk_dir_content) > 0): |
|
1531 |
# osutils.walkdirs can be made nicer -
|
|
|
1852.15.7
by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs. |
1532 |
# yield the path-from-prefix rather than the pathjoined
|
1533 |
# value.
|
|
|
2457.2.3
by Marius Kruger
factor out tuples into better readable variables |
1534 |
bzrdir_loc = bisect_left(cur_disk_dir_content, |
1535 |
('.bzr', '.bzr')) |
|
|
3719.1.1
by Vincent Ladeuil
Fix bug #272648 |
1536 |
if (bzrdir_loc < len(cur_disk_dir_content) |
|
6653.6.1
by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir. |
1537 |
and self.controldir.is_control_filename( |
|
4324.5.1
by Jelmer Vernooij
Use utility function to check for control filename rather than assuming it is '.bzr.' |
1538 |
cur_disk_dir_content[bzrdir_loc][0])): |
|
1852.15.7
by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs. |
1539 |
# we dont yield the contents of, or, .bzr itself.
|
|
2457.2.3
by Marius Kruger
factor out tuples into better readable variables |
1540 |
del cur_disk_dir_content[bzrdir_loc] |
|
1852.15.10
by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful. |
1541 |
if inv_finished: |
1542 |
# everything is unknown
|
|
|
1852.15.12
by Robert Collins
WorkingTree.walkdirs handling of changing file kinds, and multi-directory with missing and unknown ordering bugfix. |
1543 |
direction = 1 |
|
1852.15.11
by Robert Collins
Tree.walkdirs handles missing contents in workingtrees. |
1544 |
elif disk_finished: |
1545 |
# everything is missing
|
|
|
1852.15.12
by Robert Collins
WorkingTree.walkdirs handling of changing file kinds, and multi-directory with missing and unknown ordering bugfix. |
1546 |
direction = -1 |
|
1852.15.10
by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful. |
1547 |
else: |
|
2457.2.3
by Marius Kruger
factor out tuples into better readable variables |
1548 |
direction = cmp(current_inv[0][0], cur_disk_dir_relpath) |
|
1852.15.12
by Robert Collins
WorkingTree.walkdirs handling of changing file kinds, and multi-directory with missing and unknown ordering bugfix. |
1549 |
if direction > 0: |
|
1852.15.10
by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful. |
1550 |
# disk is before inventory - unknown
|
|
1852.15.11
by Robert Collins
Tree.walkdirs handles missing contents in workingtrees. |
1551 |
dirblock = [(relpath, basename, kind, stat, None, None) for |
|
2457.2.7
by Marius Kruger
extract method as per review request |
1552 |
relpath, basename, kind, stat, top_path in |
|
2457.2.3
by Marius Kruger
factor out tuples into better readable variables |
1553 |
cur_disk_dir_content] |
1554 |
yield (cur_disk_dir_relpath, None), dirblock |
|
|
1852.15.7
by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs. |
1555 |
try: |
|
6634.2.1
by Martin
Apply 2to3 next fixer and make compatible |
1556 |
current_disk = next(disk_iterator) |
|
1852.15.7
by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs. |
1557 |
except StopIteration: |
1558 |
disk_finished = True |
|
|
1852.15.12
by Robert Collins
WorkingTree.walkdirs handling of changing file kinds, and multi-directory with missing and unknown ordering bugfix. |
1559 |
elif direction < 0: |
|
1852.15.10
by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful. |
1560 |
# inventory is before disk - missing.
|
|
1852.15.11
by Robert Collins
Tree.walkdirs handles missing contents in workingtrees. |
1561 |
dirblock = [(relpath, basename, 'unknown', None, fileid, kind) |
|
2457.2.7
by Marius Kruger
extract method as per review request |
1562 |
for relpath, basename, dkind, stat, fileid, kind in |
|
1852.15.11
by Robert Collins
Tree.walkdirs handles missing contents in workingtrees. |
1563 |
current_inv[1]] |
1564 |
yield (current_inv[0][0], current_inv[0][1]), dirblock |
|
|
1852.15.7
by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs. |
1565 |
try: |
|
6634.2.1
by Martin
Apply 2to3 next fixer and make compatible |
1566 |
current_inv = next(inventory_iterator) |
|
1852.15.7
by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs. |
1567 |
except StopIteration: |
1568 |
inv_finished = True |
|
1569 |
else: |
|
1570 |
# versioned present directory
|
|
1571 |
# merge the inventory and disk data together
|
|
1572 |
dirblock = [] |
|
|
1852.15.11
by Robert Collins
Tree.walkdirs handles missing contents in workingtrees. |
1573 |
for relpath, subiterator in itertools.groupby(sorted( |
|
2457.2.7
by Marius Kruger
extract method as per review request |
1574 |
current_inv[1] + cur_disk_dir_content, |
|
2457.2.3
by Marius Kruger
factor out tuples into better readable variables |
1575 |
key=operator.itemgetter(0)), operator.itemgetter(1)): |
|
1852.15.7
by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs. |
1576 |
path_elements = list(subiterator) |
1577 |
if len(path_elements) == 2: |
|
|
1852.15.12
by Robert Collins
WorkingTree.walkdirs handling of changing file kinds, and multi-directory with missing and unknown ordering bugfix. |
1578 |
inv_row, disk_row = path_elements |
|
1852.15.7
by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs. |
1579 |
# versioned, present file
|
|
1852.15.12
by Robert Collins
WorkingTree.walkdirs handling of changing file kinds, and multi-directory with missing and unknown ordering bugfix. |
1580 |
dirblock.append((inv_row[0], |
1581 |
inv_row[1], disk_row[2], |
|
1582 |
disk_row[3], inv_row[4], |
|
1583 |
inv_row[5])) |
|
|
1852.15.7
by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs. |
1584 |
elif len(path_elements[0]) == 5: |
1585 |
# unknown disk file
|
|
|
1852.15.11
by Robert Collins
Tree.walkdirs handles missing contents in workingtrees. |
1586 |
dirblock.append((path_elements[0][0], |
1587 |
path_elements[0][1], path_elements[0][2], |
|
1588 |
path_elements[0][3], None, None)) |
|
1589 |
elif len(path_elements[0]) == 6: |
|
1590 |
# versioned, absent file.
|
|
1591 |
dirblock.append((path_elements[0][0], |
|
1592 |
path_elements[0][1], 'unknown', None, |
|
1593 |
path_elements[0][4], path_elements[0][5])) |
|
1594 |
else: |
|
1595 |
raise NotImplementedError('unreachable code') |
|
|
1852.15.7
by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs. |
1596 |
yield current_inv[0], dirblock |
1597 |
try: |
|
|
6634.2.1
by Martin
Apply 2to3 next fixer and make compatible |
1598 |
current_inv = next(inventory_iterator) |
|
1852.15.7
by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs. |
1599 |
except StopIteration: |
1600 |
inv_finished = True |
|
1601 |
try: |
|
|
6634.2.1
by Martin
Apply 2to3 next fixer and make compatible |
1602 |
current_disk = next(disk_iterator) |
|
1852.15.7
by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs. |
1603 |
except StopIteration: |
1604 |
disk_finished = True |
|
1605 |
||
1606 |
def _walkdirs(self, prefix=""): |
|
|
2292.1.25
by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show() |
1607 |
"""Walk the directories of this tree. |
1608 |
||
|
5891.1.2
by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier. |
1609 |
:param prefix: is used as the directrory to start with.
|
1610 |
:returns: a generator which yields items in the form::
|
|
1611 |
||
1612 |
((curren_directory_path, fileid),
|
|
1613 |
[(file1_path, file1_name, file1_kind, None, file1_id,
|
|
1614 |
file1_kind), ... ])
|
|
|
2292.1.25
by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show() |
1615 |
"""
|
|
5777.5.2
by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method |
1616 |
raise NotImplementedError(self._walkdirs) |
|
1852.15.3
by Robert Collins
Add a first-cut Tree.walkdirs method. |
1617 |
|
|
2120.7.2
by Aaron Bentley
Move autoresolve functionality to workingtree |
1618 |
@needs_tree_write_lock
|
1619 |
def auto_resolve(self): |
|
1620 |
"""Automatically resolve text conflicts according to contents. |
|
1621 |
||
1622 |
Only text conflicts are auto_resolvable. Files with no conflict markers
|
|
1623 |
are considered 'resolved', because bzr always puts conflict markers
|
|
1624 |
into files that have text conflicts. The corresponding .THIS .BASE and
|
|
1625 |
.OTHER files are deleted, as per 'resolve'.
|
|
|
5891.1.2
by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier. |
1626 |
|
|
2120.7.2
by Aaron Bentley
Move autoresolve functionality to workingtree |
1627 |
:return: a tuple of ConflictLists: (un_resolved, resolved).
|
1628 |
"""
|
|
1629 |
un_resolved = _mod_conflicts.ConflictList() |
|
1630 |
resolved = _mod_conflicts.ConflictList() |
|
1631 |
conflict_re = re.compile('^(<{7}|={7}|>{7})') |
|
1632 |
for conflict in self.conflicts(): |
|
|
2120.7.3
by Aaron Bentley
Update resolve command to automatically mark conflicts as resolved |
1633 |
if (conflict.typestring != 'text conflict' or |
1634 |
self.kind(conflict.file_id) != 'file'): |
|
|
2120.7.2
by Aaron Bentley
Move autoresolve functionality to workingtree |
1635 |
un_resolved.append(conflict) |
1636 |
continue
|
|
1637 |
my_file = open(self.id2abspath(conflict.file_id), 'rb') |
|
1638 |
try: |
|
1639 |
for line in my_file: |
|
1640 |
if conflict_re.search(line): |
|
1641 |
un_resolved.append(conflict) |
|
1642 |
break
|
|
1643 |
else: |
|
1644 |
resolved.append(conflict) |
|
1645 |
finally: |
|
1646 |
my_file.close() |
|
1647 |
resolved.remove_files(self) |
|
1648 |
self.set_conflicts(un_resolved) |
|
1649 |
return un_resolved, resolved |
|
1650 |
||
|
2371.2.1
by John Arbash Meinel
Update DirState._validate() to detect rename errors. |
1651 |
def _validate(self): |
1652 |
"""Validate internal structures. |
|
1653 |
||
1654 |
This is meant mostly for the test suite. To give it a chance to detect
|
|
1655 |
corruption after actions have occurred. The default implementation is a
|
|
1656 |
just a no-op.
|
|
1657 |
||
1658 |
:return: None. An exception should be raised if there is an error.
|
|
1659 |
"""
|
|
1660 |
return
|
|
1661 |
||
|
5630.2.3
by John Arbash Meinel
Looks like it was a stale experimental .pyd file causing trouble. Tests pass again now. |
1662 |
def check_state(self): |
1663 |
"""Check that the working state is/isn't valid.""" |
|
|
5850.1.2
by Jelmer Vernooij
Move inventory tree specific check implementation to InventoryWorkingTree. |
1664 |
raise NotImplementedError(self.check_state) |
|
5630.2.4
by John Arbash Meinel
Basically works in the case where the dirstate isn't corrupted. |
1665 |
|
1666 |
def reset_state(self, revision_ids=None): |
|
1667 |
"""Reset the state of the working tree. |
|
1668 |
||
1669 |
This does a hard-reset to a last-known-good state. This is a way to
|
|
1670 |
fix if something got corrupted (like the .bzr/checkout/dirstate file)
|
|
1671 |
"""
|
|
|
5777.5.2
by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method |
1672 |
raise NotImplementedError(self.reset_state) |
|
5630.2.2
by John Arbash Meinel
Start fleshing out the design. Something weird is causing my tests to all fail. |
1673 |
|
|
3398.1.24
by Ian Clatworthy
make iter_search_rules a tree method |
1674 |
def _get_rules_searcher(self, default_searcher): |
1675 |
"""See Tree._get_rules_searcher.""" |
|
1676 |
if self._rules_searcher is None: |
|
1677 |
self._rules_searcher = super(WorkingTree, |
|
1678 |
self)._get_rules_searcher(default_searcher) |
|
1679 |
return self._rules_searcher |
|
1680 |
||
|
0.12.68
by Aaron Bentley
Update docs, move items to proper files. |
1681 |
def get_shelf_manager(self): |
1682 |
"""Return the ShelfManager for this WorkingTree.""" |
|
|
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
1683 |
from .shelf import ShelfManager |
|
0.12.68
by Aaron Bentley
Update docs, move items to proper files. |
1684 |
return ShelfManager(self, self._transport) |
1685 |
||
|
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
1686 |
|
|
5669.3.9
by Jelmer Vernooij
Consistent naming. |
1687 |
class WorkingTreeFormatRegistry(controldir.ControlComponentFormatRegistry): |
|
5662.3.1
by Jelmer Vernooij
Add WorkingTreeFormatRegistry. |
1688 |
"""Registry for working tree formats.""" |
1689 |
||
1690 |
def __init__(self, other_registry=None): |
|
1691 |
super(WorkingTreeFormatRegistry, self).__init__(other_registry) |
|
1692 |
self._default_format = None |
|
|
5816.2.1
by Jelmer Vernooij
Allow lazily setting default for working trees. |
1693 |
self._default_format_key = None |
|
5662.3.1
by Jelmer Vernooij
Add WorkingTreeFormatRegistry. |
1694 |
|
1695 |
def get_default(self): |
|
1696 |
"""Return the current default format.""" |
|
|
5816.2.1
by Jelmer Vernooij
Allow lazily setting default for working trees. |
1697 |
if (self._default_format_key is not None and |
1698 |
self._default_format is None): |
|
1699 |
self._default_format = self.get(self._default_format_key) |
|
|
5662.3.1
by Jelmer Vernooij
Add WorkingTreeFormatRegistry. |
1700 |
return self._default_format |
1701 |
||
1702 |
def set_default(self, format): |
|
|
5816.2.3
by Jelmer Vernooij
Add docstrings. |
1703 |
"""Set the default format.""" |
|
5662.3.1
by Jelmer Vernooij
Add WorkingTreeFormatRegistry. |
1704 |
self._default_format = format |
|
5816.2.1
by Jelmer Vernooij
Allow lazily setting default for working trees. |
1705 |
self._default_format_key = None |
1706 |
||
1707 |
def set_default_key(self, format_string): |
|
|
5816.2.3
by Jelmer Vernooij
Add docstrings. |
1708 |
"""Set the default format by its format string.""" |
|
5816.2.1
by Jelmer Vernooij
Allow lazily setting default for working trees. |
1709 |
self._default_format_key = format_string |
1710 |
self._default_format = None |
|
|
5662.3.1
by Jelmer Vernooij
Add WorkingTreeFormatRegistry. |
1711 |
|
1712 |
||
1713 |
format_registry = WorkingTreeFormatRegistry() |
|
1714 |
||
1715 |
||
|
5669.3.10
by Jelmer Vernooij
Use ControlComponentFormat. |
1716 |
class WorkingTreeFormat(controldir.ControlComponentFormat): |
|
1534.4.45
by Robert Collins
Start WorkingTree -> .bzr/checkout transition |
1717 |
"""An encapsulation of the initialization and open routines for a format. |
1718 |
||
1719 |
Formats provide three things:
|
|
1720 |
* An initialization routine,
|
|
1721 |
* a format string,
|
|
1722 |
* an open routine.
|
|
1723 |
||
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1724 |
Formats are placed in an dict by their format string for reference
|
|
1534.4.45
by Robert Collins
Start WorkingTree -> .bzr/checkout transition |
1725 |
during workingtree opening. Its not required that these be instances, they
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1726 |
can be classes themselves with class methods - it simply depends on
|
|
1534.4.45
by Robert Collins
Start WorkingTree -> .bzr/checkout transition |
1727 |
whether state is needed for a given format or not.
|
1728 |
||
1729 |
Once a format is deprecated, just deprecate the initialize and open
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1730 |
methods on the format class. Do not deprecate the object, as the
|
|
1534.4.45
by Robert Collins
Start WorkingTree -> .bzr/checkout transition |
1731 |
object will be created every time regardless.
|
1732 |
"""
|
|
1733 |
||
|
2100.3.14
by Aaron Bentley
Test workingtree4 format, prevent use with old repos |
1734 |
requires_rich_root = False |
1735 |
||
|
2323.6.4
by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which |
1736 |
upgrade_recommended = False |
1737 |
||
|
5582.10.29
by Jelmer Vernooij
Add requires_normalized_unicode_filenames |
1738 |
requires_normalized_unicode_filenames = False |
1739 |
||
|
5632.1.1
by John Arbash Meinel
Make case_sensitive_filename an attribute of the format. |
1740 |
case_sensitive_filename = "FoRMaT" |
1741 |
||
|
5661.1.1
by Jelmer Vernooij
Add 'WorkingTreeFormat.missing_parent_conflicts' flag to use in tests. |
1742 |
missing_parent_conflicts = False |
1743 |
"""If this format supports missing parent conflicts.""" |
|
1744 |
||
|
5993.3.1
by Jelmer Vernooij
Add WorkingTreeFormat.supports_versioned_directories attribute. |
1745 |
supports_versioned_directories = None |
1746 |
||
|
6741.1.1
by Jelmer Vernooij
Add WorkingTreeFormat.supports_setting_file_ids. |
1747 |
supports_setting_file_ids = True |
1748 |
"""If this format allows setting the file id.""" |
|
1749 |
||
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
1750 |
def initialize(self, controldir, revision_id=None, from_branch=None, |
|
5683.1.1
by Jelmer Vernooij
Add stub WorkingTreeFormat.initialize(). |
1751 |
accelerator_tree=None, hardlink=False): |
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
1752 |
"""Initialize a new working tree in controldir. |
|
5683.1.1
by Jelmer Vernooij
Add stub WorkingTreeFormat.initialize(). |
1753 |
|
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
1754 |
:param controldir: ControlDir to initialize the working tree in.
|
|
5683.1.1
by Jelmer Vernooij
Add stub WorkingTreeFormat.initialize(). |
1755 |
:param revision_id: allows creating a working tree at a different
|
1756 |
revision than the branch is at.
|
|
1757 |
:param from_branch: Branch to checkout
|
|
1758 |
:param accelerator_tree: A tree which can be used for retrieving file
|
|
1759 |
contents more quickly than the revision tree, i.e. a workingtree.
|
|
1760 |
The revision tree will be used for cases where accelerator_tree's
|
|
1761 |
content is different.
|
|
1762 |
:param hardlink: If true, hard-link files from accelerator_tree,
|
|
1763 |
where possible.
|
|
1764 |
"""
|
|
1765 |
raise NotImplementedError(self.initialize) |
|
1766 |
||
|
2100.3.35
by Aaron Bentley
equality operations on bzrdir |
1767 |
def __eq__(self, other): |
1768 |
return self.__class__ is other.__class__ |
|
1769 |
||
1770 |
def __ne__(self, other): |
|
1771 |
return not (self == other) |
|
1772 |
||
|
1624.3.19
by Olaf Conradi
New call get_format_description to give a user-friendly description of a |
1773 |
def get_format_description(self): |
1774 |
"""Return the short description for this format.""" |
|
1775 |
raise NotImplementedError(self.get_format_description) |
|
1776 |
||
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
1777 |
def is_supported(self): |
1778 |
"""Is this format supported? |
|
1779 |
||
1780 |
Supported formats can be initialized and opened.
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1781 |
Unsupported formats may not support initialization or committing or
|
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
1782 |
some other features depending on the reason for not being supported.
|
1783 |
"""
|
|
1784 |
return True |
|
1785 |
||
|
3907.2.1
by Ian Clatworthy
WorkingTreeFormat5 supporting content filtering and views |
1786 |
def supports_content_filtering(self): |
1787 |
"""True if this format supports content filtering.""" |
|
1788 |
return False |
|
1789 |
||
|
3586.1.4
by Ian Clatworthy
first cut at tree-level view tests |
1790 |
def supports_views(self): |
1791 |
"""True if this format supports stored views.""" |
|
1792 |
return False |
|
1793 |
||
|
6162.3.2
by Jelmer Vernooij
Add WorkingTreeFormat.get_controldir_for_branch(). |
1794 |
def get_controldir_for_branch(self): |
1795 |
"""Get the control directory format for creating branches. |
|
1796 |
||
1797 |
This is to support testing of working tree formats that can not exist
|
|
1798 |
in the same control directory as a branch.
|
|
1799 |
"""
|
|
|
6746.2.1
by Jelmer Vernooij
Rename matchingbzrdir to matchingcontroldir. |
1800 |
return self._matchingcontroldir |
|
6162.3.2
by Jelmer Vernooij
Add WorkingTreeFormat.get_controldir_for_branch(). |
1801 |
|
|
1534.4.45
by Robert Collins
Start WorkingTree -> .bzr/checkout transition |
1802 |
|
|
5662.3.1
by Jelmer Vernooij
Add WorkingTreeFormatRegistry. |
1803 |
format_registry.register_lazy("Bazaar Working Tree Format 4 (bzr 0.15)\n", |
|
6670.4.1
by Jelmer Vernooij
Update imports. |
1804 |
"breezy.bzr.workingtree_4", "WorkingTreeFormat4") |
|
5662.3.1
by Jelmer Vernooij
Add WorkingTreeFormatRegistry. |
1805 |
format_registry.register_lazy("Bazaar Working Tree Format 5 (bzr 1.11)\n", |
|
6670.4.1
by Jelmer Vernooij
Update imports. |
1806 |
"breezy.bzr.workingtree_4", "WorkingTreeFormat5") |
|
5662.3.1
by Jelmer Vernooij
Add WorkingTreeFormatRegistry. |
1807 |
format_registry.register_lazy("Bazaar Working Tree Format 6 (bzr 1.14)\n", |
|
6670.4.1
by Jelmer Vernooij
Update imports. |
1808 |
"breezy.bzr.workingtree_4", "WorkingTreeFormat6") |
|
5816.5.1
by Jelmer Vernooij
Move WorkingTree3 to bzrlib.workingtree_3. |
1809 |
format_registry.register_lazy("Bazaar-NG Working Tree format 3", |
|
6670.4.1
by Jelmer Vernooij
Update imports. |
1810 |
"breezy.bzr.workingtree_3", "WorkingTreeFormat3") |
|
5816.2.1
by Jelmer Vernooij
Allow lazily setting default for working trees. |
1811 |
format_registry.set_default_key("Bazaar Working Tree Format 6 (bzr 1.14)\n") |