bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
1  | 
# Copyright (C) 2005 Canonical Ltd
 | 
2  | 
||
3  | 
# This program is free software; you can redistribute it and/or modify
 | 
|
4  | 
# it under the terms of the GNU General Public License as published by
 | 
|
5  | 
# the Free Software Foundation; either version 2 of the License, or
 | 
|
6  | 
# (at your option) any later version.
 | 
|
7  | 
||
8  | 
# This program is distributed in the hope that it will be useful,
 | 
|
9  | 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
|
10  | 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
|
11  | 
# GNU General Public License for more details.
 | 
|
12  | 
||
13  | 
# You should have received a copy of the GNU General Public License
 | 
|
14  | 
# along with this program; if not, write to the Free Software
 | 
|
15  | 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 | 
|
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.
 | 
|
20  | 
Operations which represent the WorkingTree are also done here, 
 | 
|
21  | 
such as renaming or adding files.  The WorkingTree has an inventory 
 | 
|
22  | 
which is updated by these operations.  A commit produces a 
 | 
|
23  | 
new revision based on the workingtree and its inventory.
 | 
|
24  | 
||
25  | 
At the moment every WorkingTree has its own branch.  Remote
 | 
|
26  | 
WorkingTrees aren't supported.
 | 
|
27  | 
||
28  | 
To get a WorkingTree, call Branch.working_tree():
 | 
|
29  | 
"""
 | 
|
30  | 
||
31  | 
||
32  | 
# TODO: Don't allow WorkingTrees to be constructed for remote branches if 
 | 
|
33  | 
# they don't work.
 | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
34  | 
|
| 
956
by Martin Pool
 doc  | 
35  | 
# FIXME: I don't know if writing out the cache from the destructor is really a
 | 
| 
1185.16.72
by Martin Pool
 [merge] from robert and fix up tests  | 
36  | 
# good idea, because destructors are considered poor taste in Python, and it's
 | 
37  | 
# not predictable when it will be written out.
 | 
|
38  | 
||
39  | 
# TODO: Give the workingtree sole responsibility for the working inventory;
 | 
|
40  | 
# remove the variable and references to it from the branch.  This may require
 | 
|
41  | 
# updating the commit code so as to update the inventory within the working
 | 
|
42  | 
# copy, and making sure there's only one WorkingTree for any directory on disk.
 | 
|
43  | 
# At the momenthey may alias the inventory and have old copies of it in memory.
 | 
|
| 
956
by Martin Pool
 doc  | 
44  | 
|
| 
1508.1.8
by Robert Collins
 move move() from Branch to WorkingTree.  | 
45  | 
from copy import deepcopy  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
46  | 
import os  | 
| 
1398
by Robert Collins
 integrate in Gustavos x-bit patch  | 
47  | 
import stat  | 
| 
1140
by Martin Pool
 - lift out import statements within WorkingTree  | 
48  | 
import fnmatch  | 
| 
1457.1.1
by Robert Collins
 rather than getting the branch inventory, WorkingTree can use the whole Branch, or make its own.  | 
49  | 
|
| 
1508.1.5
by Robert Collins
 Move add from Branch to WorkingTree.  | 
50  | 
from bzrlib.branch import (Branch,  | 
51  | 
is_control_file,  | 
|
52  | 
needs_read_lock,  | 
|
53  | 
needs_write_lock,  | 
|
54  | 
quotefn)  | 
|
55  | 
from bzrlib.errors import (BzrCheckError,  | 
|
| 
1508.1.7
by Robert Collins
 Move rename_one from Branch to WorkingTree. (Robert Collins).  | 
56  | 
BzrError,  | 
| 
1508.1.5
by Robert Collins
 Move add from Branch to WorkingTree.  | 
57  | 
DivergedBranches,  | 
| 
1185.33.59
by Martin Pool
 [patch] keep a cached basis inventory (Johan Rydberg)  | 
58  | 
WeaveRevisionNotPresent,  | 
| 
1508.1.5
by Robert Collins
 Move add from Branch to WorkingTree.  | 
59  | 
NotBranchError,  | 
60  | 
NotVersionedError)  | 
|
61  | 
from bzrlib.inventory import InventoryEntry  | 
|
| 
1457.1.11
by Robert Collins
 Move _write_inventory to WorkingTree.  | 
62  | 
from bzrlib.osutils import (appendpath,  | 
| 
1508.1.5
by Robert Collins
 Move add from Branch to WorkingTree.  | 
63  | 
compact_date,  | 
| 
1457.1.11
by Robert Collins
 Move _write_inventory to WorkingTree.  | 
64  | 
file_kind,  | 
65  | 
isdir,  | 
|
| 
1185.31.39
by John Arbash Meinel
 Replacing os.getcwdu() with osutils.getcwd(),  | 
66  | 
getcwd,  | 
| 
1185.31.32
by John Arbash Meinel
 Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \  | 
67  | 
pathjoin,  | 
| 
1457.1.11
by Robert Collins
 Move _write_inventory to WorkingTree.  | 
68  | 
pumpfile,  | 
69  | 
splitpath,  | 
|
| 
1508.1.5
by Robert Collins
 Move add from Branch to WorkingTree.  | 
70  | 
rand_bytes,  | 
| 
1185.31.37
by John Arbash Meinel
 Switched os.path.abspath and os.path.realpath to osutils.* (still passes on cygwin)  | 
71  | 
abspath,  | 
| 
1185.31.38
by John Arbash Meinel
 Changing os.path.normpath to osutils.normpath  | 
72  | 
normpath,  | 
| 
1508.1.10
by Robert Collins
 bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)  | 
73  | 
realpath,  | 
| 
1508.1.7
by Robert Collins
 Move rename_one from Branch to WorkingTree. (Robert Collins).  | 
74  | 
relpath,  | 
75  | 
rename)  | 
|
| 
1185.33.92
by Martin Pool
 [patch] fix for 'bzr rm -v' (Wouter van Heyst)  | 
76  | 
from bzrlib.textui import show_status  | 
| 
1508.1.5
by Robert Collins
 Move add from Branch to WorkingTree.  | 
77  | 
import bzrlib.tree  | 
| 
1140
by Martin Pool
 - lift out import statements within WorkingTree  | 
78  | 
from bzrlib.trace import mutter  | 
| 
1497
by Robert Collins
 Move Branch.read_working_inventory to WorkingTree.  | 
79  | 
import bzrlib.xml5  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
80  | 
|
| 
1465
by Robert Collins
 Bugfix the new pull --clobber to not generate spurious conflicts.  | 
81  | 
|
| 
1508.1.5
by Robert Collins
 Move add from Branch to WorkingTree.  | 
82  | 
def gen_file_id(name):  | 
83  | 
"""Return new file id.  | 
|
84  | 
||
85  | 
    This should probably generate proper UUIDs, but for the moment we
 | 
|
86  | 
    cope with just randomness because running uuidgen every time is
 | 
|
87  | 
    slow."""
 | 
|
88  | 
import re  | 
|
89  | 
from binascii import hexlify  | 
|
90  | 
from time import time  | 
|
91  | 
||
92  | 
    # get last component
 | 
|
93  | 
idx = name.rfind('/')  | 
|
94  | 
if idx != -1:  | 
|
95  | 
name = name[idx+1 : ]  | 
|
96  | 
idx = name.rfind('\\')  | 
|
97  | 
if idx != -1:  | 
|
98  | 
name = name[idx+1 : ]  | 
|
99  | 
||
100  | 
    # make it not a hidden file
 | 
|
101  | 
name = name.lstrip('.')  | 
|
102  | 
||
103  | 
    # remove any wierd characters; we don't escape them but rather
 | 
|
104  | 
    # just pull them out
 | 
|
105  | 
name = re.sub(r'[^\w.]', '', name)  | 
|
106  | 
||
107  | 
s = hexlify(rand_bytes(8))  | 
|
108  | 
return '-'.join((name, compact_date(time()), s))  | 
|
109  | 
||
110  | 
||
111  | 
def gen_root_id():  | 
|
112  | 
"""Return a new tree-root file id."""  | 
|
113  | 
return gen_file_id('TREE_ROOT')  | 
|
114  | 
||
115  | 
||
| 
1399.1.2
by Robert Collins
 push kind character creation into InventoryEntry and TreeEntry  | 
116  | 
class TreeEntry(object):  | 
117  | 
"""An entry that implements the minium interface used by commands.  | 
|
118  | 
||
119  | 
    This needs further inspection, it may be better to have 
 | 
|
120  | 
    InventoryEntries without ids - though that seems wrong. For now,
 | 
|
121  | 
    this is a parallel hierarchy to InventoryEntry, and needs to become
 | 
|
122  | 
    one of several things: decorates to that hierarchy, children of, or
 | 
|
123  | 
    parents of it.
 | 
|
| 
1399.1.3
by Robert Collins
 move change detection for text and metadata from delta to entry.detect_changes  | 
124  | 
    Another note is that these objects are currently only used when there is
 | 
125  | 
    no InventoryEntry available - i.e. for unversioned objects.
 | 
|
126  | 
    Perhaps they should be UnversionedEntry et al. ? - RBC 20051003
 | 
|
| 
1399.1.2
by Robert Collins
 push kind character creation into InventoryEntry and TreeEntry  | 
127  | 
    """
 | 
128  | 
||
129  | 
def __eq__(self, other):  | 
|
130  | 
        # yes, this us ugly, TODO: best practice __eq__ style.
 | 
|
131  | 
return (isinstance(other, TreeEntry)  | 
|
132  | 
and other.__class__ == self.__class__)  | 
|
133  | 
||
134  | 
def kind_character(self):  | 
|
135  | 
return "???"  | 
|
136  | 
||
137  | 
||
138  | 
class TreeDirectory(TreeEntry):  | 
|
139  | 
"""See TreeEntry. This is a directory in a working tree."""  | 
|
140  | 
||
141  | 
def __eq__(self, other):  | 
|
142  | 
return (isinstance(other, TreeDirectory)  | 
|
143  | 
and other.__class__ == self.__class__)  | 
|
144  | 
||
145  | 
def kind_character(self):  | 
|
146  | 
return "/"  | 
|
147  | 
||
148  | 
||
149  | 
class TreeFile(TreeEntry):  | 
|
150  | 
"""See TreeEntry. This is a regular file in a working tree."""  | 
|
151  | 
||
152  | 
def __eq__(self, other):  | 
|
153  | 
return (isinstance(other, TreeFile)  | 
|
154  | 
and other.__class__ == self.__class__)  | 
|
155  | 
||
156  | 
def kind_character(self):  | 
|
157  | 
return ''  | 
|
158  | 
||
159  | 
||
160  | 
class TreeLink(TreeEntry):  | 
|
161  | 
"""See TreeEntry. This is a symlink in a working tree."""  | 
|
162  | 
||
163  | 
def __eq__(self, other):  | 
|
164  | 
return (isinstance(other, TreeLink)  | 
|
165  | 
and other.__class__ == self.__class__)  | 
|
166  | 
||
167  | 
def kind_character(self):  | 
|
168  | 
return ''  | 
|
169  | 
||
170  | 
||
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
171  | 
class WorkingTree(bzrlib.tree.Tree):  | 
172  | 
"""Working copy tree.  | 
|
173  | 
||
174  | 
    The inventory is held in the `Branch` working-inventory, and the
 | 
|
175  | 
    files are in a directory on disk.
 | 
|
176  | 
||
177  | 
    It is possible for a `WorkingTree` to have a filename which is
 | 
|
178  | 
    not listed in the Inventory and vice versa.
 | 
|
179  | 
    """
 | 
|
| 
1442.1.65
by Robert Collins
 Branch.remove has been moved to WorkingTree.  | 
180  | 
|
| 
1185.33.66
by Martin Pool
 [patch] use unicode literals for all hardcoded paths (Alexander Belchenko)  | 
181  | 
def __init__(self, basedir=u'.', branch=None):  | 
| 
1457.1.1
by Robert Collins
 rather than getting the branch inventory, WorkingTree can use the whole Branch, or make its own.  | 
182  | 
"""Construct a WorkingTree for basedir.  | 
183  | 
||
184  | 
        If the branch is not supplied, it is opened automatically.
 | 
|
185  | 
        If the branch is supplied, it must be the branch for this basedir.
 | 
|
186  | 
        (branch.base is not cross checked, because for remote branches that
 | 
|
187  | 
        would be meaningless).
 | 
|
188  | 
        """
 | 
|
| 
866
by Martin Pool
 - use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.  | 
189  | 
from bzrlib.hashcache import HashCache  | 
190  | 
from bzrlib.trace import note, mutter  | 
|
| 
1185.16.72
by Martin Pool
 [merge] from robert and fix up tests  | 
191  | 
assert isinstance(basedir, basestring), \  | 
192  | 
"base directory %r is not a string" % basedir  | 
|
| 
1457.1.1
by Robert Collins
 rather than getting the branch inventory, WorkingTree can use the whole Branch, or make its own.  | 
193  | 
if branch is None:  | 
194  | 
branch = Branch.open(basedir)  | 
|
| 
1185.16.72
by Martin Pool
 [merge] from robert and fix up tests  | 
195  | 
assert isinstance(branch, Branch), \  | 
196  | 
"branch %r is not a Branch" % branch  | 
|
| 
1457.1.1
by Robert Collins
 rather than getting the branch inventory, WorkingTree can use the whole Branch, or make its own.  | 
197  | 
self.branch = branch  | 
| 
1508.1.10
by Robert Collins
 bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)  | 
198  | 
self.basedir = realpath(basedir)  | 
199  | 
||
| 
866
by Martin Pool
 - use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.  | 
200  | 
        # update the whole cache up front and write to disk if anything changed;
 | 
201  | 
        # in the future we might want to do this more selectively
 | 
|
| 
1467
by Robert Collins
 WorkingTree.__del__ has been removed.  | 
202  | 
        # two possible ways offer themselves : in self._unlock, write the cache
 | 
203  | 
        # if needed, or, when the cache sees a change, append it to the hash
 | 
|
204  | 
        # cache file, and have the parser take the most recent entry for a
 | 
|
205  | 
        # given path only.
 | 
|
| 
866
by Martin Pool
 - use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.  | 
206  | 
hc = self._hashcache = HashCache(basedir)  | 
207  | 
hc.read()  | 
|
| 
954
by Martin Pool
 - separate out code that just scans the hash cache to find files that are possibly  | 
208  | 
hc.scan()  | 
| 
866
by Martin Pool
 - use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.  | 
209  | 
|
210  | 
if hc.needs_write:  | 
|
211  | 
mutter("write hc")  | 
|
212  | 
hc.write()  | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
213  | 
|
| 
1185.60.6
by Aaron Bentley
 Fixed hashcache  | 
214  | 
self._set_inventory(self.read_working_inventory())  | 
215  | 
||
| 
1508.1.10
by Robert Collins
 bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)  | 
216  | 
def _set_inventory(self, inv):  | 
217  | 
self._inventory = inv  | 
|
218  | 
self.path2id = self._inventory.path2id  | 
|
219  | 
||
| 
1508.1.1
by Robert Collins
 Provide a open_containing for WorkingTree.  | 
220  | 
    @staticmethod
 | 
221  | 
def open_containing(path=None):  | 
|
222  | 
"""Open an existing working tree which has its root about path.  | 
|
223  | 
        
 | 
|
224  | 
        This probes for a working tree at path and searches upwards from there.
 | 
|
225  | 
||
226  | 
        Basically we keep looking up until we find the control directory or
 | 
|
227  | 
        run into /.  If there isn't one, raises NotBranchError.
 | 
|
228  | 
        TODO: give this a new exception.
 | 
|
229  | 
        If there is one, it is returned, along with the unused portion of path.
 | 
|
230  | 
        """
 | 
|
231  | 
if path is None:  | 
|
| 
1185.31.39
by John Arbash Meinel
 Replacing os.getcwdu() with osutils.getcwd(),  | 
232  | 
path = getcwd()  | 
| 
1508.1.3
by Robert Collins
 Do not consider urls to be relative paths within working trees.  | 
233  | 
else:  | 
234  | 
            # sanity check.
 | 
|
235  | 
if path.find('://') != -1:  | 
|
236  | 
raise NotBranchError(path=path)  | 
|
| 
1185.31.37
by John Arbash Meinel
 Switched os.path.abspath and os.path.realpath to osutils.* (still passes on cygwin)  | 
237  | 
path = abspath(path)  | 
| 
1185.33.66
by Martin Pool
 [patch] use unicode literals for all hardcoded paths (Alexander Belchenko)  | 
238  | 
tail = u''  | 
| 
1508.1.1
by Robert Collins
 Provide a open_containing for WorkingTree.  | 
239  | 
while True:  | 
240  | 
try:  | 
|
241  | 
return WorkingTree(path), tail  | 
|
242  | 
except NotBranchError:  | 
|
243  | 
                pass
 | 
|
244  | 
if tail:  | 
|
| 
1185.31.32
by John Arbash Meinel
 Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \  | 
245  | 
tail = pathjoin(os.path.basename(path), tail)  | 
| 
1508.1.1
by Robert Collins
 Provide a open_containing for WorkingTree.  | 
246  | 
else:  | 
247  | 
tail = os.path.basename(path)  | 
|
| 
1185.31.41
by John Arbash Meinel
 Creating a PathNotChild exception, and using relpath in HTTPTestUtil  | 
248  | 
lastpath = path  | 
| 
1508.1.1
by Robert Collins
 Provide a open_containing for WorkingTree.  | 
249  | 
path = os.path.dirname(path)  | 
| 
1185.31.41
by John Arbash Meinel
 Creating a PathNotChild exception, and using relpath in HTTPTestUtil  | 
250  | 
if lastpath == path:  | 
| 
1508.1.1
by Robert Collins
 Provide a open_containing for WorkingTree.  | 
251  | 
                # reached the root, whatever that may be
 | 
252  | 
raise NotBranchError(path=path)  | 
|
253  | 
||
| 
462
by Martin Pool
 - New form 'file_id in tree' to check if the file is present  | 
254  | 
def __iter__(self):  | 
255  | 
"""Iterate through file_ids for this tree.  | 
|
256  | 
||
257  | 
        file_ids are in a WorkingTree if they are in the working inventory
 | 
|
258  | 
        and the working file exists.
 | 
|
259  | 
        """
 | 
|
260  | 
inv = self._inventory  | 
|
| 
866
by Martin Pool
 - use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.  | 
261  | 
for path, ie in inv.iter_entries():  | 
| 
1092.2.6
by Robert Collins
 symlink support updated to work  | 
262  | 
if bzrlib.osutils.lexists(self.abspath(path)):  | 
| 
866
by Martin Pool
 - use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.  | 
263  | 
yield ie.file_id  | 
| 
462
by Martin Pool
 - New form 'file_id in tree' to check if the file is present  | 
264  | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
265  | 
def __repr__(self):  | 
266  | 
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  | 
267  | 
getattr(self, 'basedir', None))  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
268  | 
|
269  | 
def abspath(self, filename):  | 
|
| 
1185.31.32
by John Arbash Meinel
 Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \  | 
270  | 
return pathjoin(self.basedir, filename)  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
271  | 
|
| 
1185.31.37
by John Arbash Meinel
 Switched os.path.abspath and os.path.realpath to osutils.* (still passes on cygwin)  | 
272  | 
def relpath(self, abs):  | 
| 
1457.1.3
by Robert Collins
 make Branch.relpath delegate to the working tree.  | 
273  | 
"""Return the local path portion from a given absolute path."""  | 
| 
1185.31.37
by John Arbash Meinel
 Switched os.path.abspath and os.path.realpath to osutils.* (still passes on cygwin)  | 
274  | 
return relpath(self.basedir, abs)  | 
| 
1457.1.3
by Robert Collins
 make Branch.relpath delegate to the working tree.  | 
275  | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
276  | 
def has_filename(self, filename):  | 
| 
1092.2.6
by Robert Collins
 symlink support updated to work  | 
277  | 
return bzrlib.osutils.lexists(self.abspath(filename))  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
278  | 
|
279  | 
def get_file(self, file_id):  | 
|
280  | 
return self.get_file_byname(self.id2path(file_id))  | 
|
281  | 
||
282  | 
def get_file_byname(self, filename):  | 
|
283  | 
return file(self.abspath(filename), 'rb')  | 
|
284  | 
||
| 
1497
by Robert Collins
 Move Branch.read_working_inventory to WorkingTree.  | 
285  | 
def get_root_id(self):  | 
286  | 
"""Return the id of this trees root"""  | 
|
287  | 
inv = self.read_working_inventory()  | 
|
288  | 
return inv.root.file_id  | 
|
289  | 
||
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
290  | 
def _get_store_filename(self, file_id):  | 
| 
1508.1.1
by Robert Collins
 Provide a open_containing for WorkingTree.  | 
291  | 
        ## XXX: badly named; this is not in the store at all
 | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
292  | 
return self.abspath(self.id2path(file_id))  | 
293  | 
||
| 
1457.1.17
by Robert Collins
 Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)  | 
294  | 
    @needs_write_lock
 | 
295  | 
def commit(self, *args, **kw):  | 
|
296  | 
from bzrlib.commit import Commit  | 
|
297  | 
Commit().commit(self.branch, *args, **kw)  | 
|
| 
1508.1.10
by Robert Collins
 bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)  | 
298  | 
self._set_inventory(self.read_working_inventory())  | 
| 
1248
by Martin Pool
 - new weave based cleanup [broken]  | 
299  | 
|
300  | 
def id2abspath(self, file_id):  | 
|
301  | 
return self.abspath(self.id2path(file_id))  | 
|
302  | 
||
| 
1185.12.39
by abentley
 Propogated has_or_had_id to Tree  | 
303  | 
def has_id(self, file_id):  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
304  | 
        # files that have been deleted are excluded
 | 
| 
1185.12.39
by abentley
 Propogated has_or_had_id to Tree  | 
305  | 
inv = self._inventory  | 
| 
866
by Martin Pool
 - use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.  | 
306  | 
if not inv.has_id(file_id):  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
307  | 
return False  | 
| 
866
by Martin Pool
 - use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.  | 
308  | 
path = inv.id2path(file_id)  | 
| 
1092.2.6
by Robert Collins
 symlink support updated to work  | 
309  | 
return bzrlib.osutils.lexists(self.abspath(path))  | 
| 
462
by Martin Pool
 - New form 'file_id in tree' to check if the file is present  | 
310  | 
|
| 
1185.12.39
by abentley
 Propogated has_or_had_id to Tree  | 
311  | 
def has_or_had_id(self, file_id):  | 
312  | 
if file_id == self.inventory.root.file_id:  | 
|
313  | 
return True  | 
|
314  | 
return self.inventory.has_id(file_id)  | 
|
| 
462
by Martin Pool
 - New form 'file_id in tree' to check if the file is present  | 
315  | 
|
316  | 
__contains__ = has_id  | 
|
317  | 
||
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
318  | 
def get_file_size(self, file_id):  | 
| 
1248
by Martin Pool
 - new weave based cleanup [broken]  | 
319  | 
return os.path.getsize(self.id2abspath(file_id))  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
320  | 
|
| 
1185.60.6
by Aaron Bentley
 Fixed hashcache  | 
321  | 
    @needs_read_lock
 | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
322  | 
def get_file_sha1(self, file_id):  | 
| 
866
by Martin Pool
 - use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.  | 
323  | 
path = self._inventory.id2path(file_id)  | 
324  | 
return self._hashcache.get_sha1(path)  | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
325  | 
|
| 
1398
by Robert Collins
 integrate in Gustavos x-bit patch  | 
326  | 
def is_executable(self, file_id):  | 
327  | 
if os.name == "nt":  | 
|
328  | 
return self._inventory[file_id].executable  | 
|
329  | 
else:  | 
|
330  | 
path = self._inventory.id2path(file_id)  | 
|
331  | 
mode = os.lstat(self.abspath(path)).st_mode  | 
|
332  | 
return bool(stat.S_ISREG(mode) and stat.S_IEXEC&mode)  | 
|
333  | 
||
| 
1457.1.16
by Robert Collins
 Move set_pending_merges to WorkingTree.  | 
334  | 
    @needs_write_lock
 | 
| 
1508.1.5
by Robert Collins
 Move add from Branch to WorkingTree.  | 
335  | 
def add(self, files, ids=None):  | 
336  | 
"""Make files versioned.  | 
|
337  | 
||
338  | 
        Note that the command line normally calls smart_add instead,
 | 
|
339  | 
        which can automatically recurse.
 | 
|
340  | 
||
341  | 
        This adds the files to the inventory, so that they will be
 | 
|
342  | 
        recorded by the next commit.
 | 
|
343  | 
||
344  | 
        files
 | 
|
345  | 
            List of paths to add, relative to the base of the tree.
 | 
|
346  | 
||
347  | 
        ids
 | 
|
348  | 
            If set, use these instead of automatically generated ids.
 | 
|
349  | 
            Must be the same length as the list of files, but may
 | 
|
350  | 
            contain None for ids that are to be autogenerated.
 | 
|
351  | 
||
352  | 
        TODO: Perhaps have an option to add the ids even if the files do
 | 
|
353  | 
              not (yet) exist.
 | 
|
354  | 
||
355  | 
        TODO: Perhaps callback with the ids and paths as they're added.
 | 
|
356  | 
        """
 | 
|
357  | 
        # TODO: Re-adding a file that is removed in the working copy
 | 
|
358  | 
        # should probably put it back with the previous ID.
 | 
|
359  | 
if isinstance(files, basestring):  | 
|
360  | 
assert(ids is None or isinstance(ids, basestring))  | 
|
361  | 
files = [files]  | 
|
362  | 
if ids is not None:  | 
|
363  | 
ids = [ids]  | 
|
364  | 
||
365  | 
if ids is None:  | 
|
366  | 
ids = [None] * len(files)  | 
|
367  | 
else:  | 
|
368  | 
assert(len(ids) == len(files))  | 
|
369  | 
||
370  | 
inv = self.read_working_inventory()  | 
|
371  | 
for f,file_id in zip(files, ids):  | 
|
372  | 
if is_control_file(f):  | 
|
373  | 
raise BzrError("cannot add control file %s" % quotefn(f))  | 
|
374  | 
||
375  | 
fp = splitpath(f)  | 
|
376  | 
||
377  | 
if len(fp) == 0:  | 
|
378  | 
raise BzrError("cannot add top-level %r" % f)  | 
|
379  | 
||
| 
1185.31.38
by John Arbash Meinel
 Changing os.path.normpath to osutils.normpath  | 
380  | 
fullpath = normpath(self.abspath(f))  | 
| 
1508.1.5
by Robert Collins
 Move add from Branch to WorkingTree.  | 
381  | 
|
382  | 
try:  | 
|
383  | 
kind = file_kind(fullpath)  | 
|
384  | 
except OSError:  | 
|
385  | 
                # maybe something better?
 | 
|
386  | 
raise BzrError('cannot add: not a regular file, symlink or directory: %s' % quotefn(f))  | 
|
387  | 
||
388  | 
if not InventoryEntry.versionable_kind(kind):  | 
|
389  | 
raise BzrError('cannot add: not a versionable file ('  | 
|
390  | 
'i.e. regular file, symlink or directory): %s' % quotefn(f))  | 
|
391  | 
||
392  | 
if file_id is None:  | 
|
393  | 
file_id = gen_file_id(f)  | 
|
394  | 
inv.add_path(f, kind=kind, file_id=file_id)  | 
|
395  | 
||
396  | 
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))  | 
|
397  | 
self._write_inventory(inv)  | 
|
398  | 
||
399  | 
    @needs_write_lock
 | 
|
| 
1457.1.15
by Robert Collins
 Move add_pending_merge to WorkingTree.  | 
400  | 
def add_pending_merge(self, *revision_ids):  | 
401  | 
        # TODO: Perhaps should check at this point that the
 | 
|
402  | 
        # history of the revision is actually present?
 | 
|
403  | 
p = self.pending_merges()  | 
|
404  | 
updated = False  | 
|
405  | 
for rev_id in revision_ids:  | 
|
406  | 
if rev_id in p:  | 
|
407  | 
                continue
 | 
|
408  | 
p.append(rev_id)  | 
|
409  | 
updated = True  | 
|
410  | 
if updated:  | 
|
| 
1457.1.16
by Robert Collins
 Move set_pending_merges to WorkingTree.  | 
411  | 
self.set_pending_merges(p)  | 
| 
1457.1.15
by Robert Collins
 Move add_pending_merge to WorkingTree.  | 
412  | 
|
| 
1457.1.14
by Robert Collins
 Move pending_merges() to WorkingTree.  | 
413  | 
def pending_merges(self):  | 
414  | 
"""Return a list of pending merges.  | 
|
415  | 
||
416  | 
        These are revisions that have been merged into the working
 | 
|
417  | 
        directory but not yet committed.
 | 
|
418  | 
        """
 | 
|
419  | 
cfn = self.branch._rel_controlfilename('pending-merges')  | 
|
420  | 
if not self.branch._transport.has(cfn):  | 
|
421  | 
return []  | 
|
422  | 
p = []  | 
|
423  | 
for l in self.branch.controlfile('pending-merges', 'r').readlines():  | 
|
424  | 
p.append(l.rstrip('\n'))  | 
|
425  | 
return p  | 
|
426  | 
||
| 
1457.1.16
by Robert Collins
 Move set_pending_merges to WorkingTree.  | 
427  | 
    @needs_write_lock
 | 
428  | 
def set_pending_merges(self, rev_list):  | 
|
429  | 
self.branch.put_controlfile('pending-merges', '\n'.join(rev_list))  | 
|
430  | 
||
| 
1092.2.6
by Robert Collins
 symlink support updated to work  | 
431  | 
def get_symlink_target(self, file_id):  | 
| 
1185.15.10
by Scott James Remnant
 Fix WorkingTree.get_symlink_target() to read the absolute path of the  | 
432  | 
return os.readlink(self.id2abspath(file_id))  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
433  | 
|
434  | 
def file_class(self, filename):  | 
|
435  | 
if self.path2id(filename):  | 
|
436  | 
return 'V'  | 
|
437  | 
elif self.is_ignored(filename):  | 
|
438  | 
return 'I'  | 
|
439  | 
else:  | 
|
440  | 
return '?'  | 
|
441  | 
||
442  | 
||
443  | 
def list_files(self):  | 
|
444  | 
"""Recursively list all files as (path, class, kind, id).  | 
|
445  | 
||
446  | 
        Lists, but does not descend into unversioned directories.
 | 
|
447  | 
||
448  | 
        This does not include files that have been deleted in this
 | 
|
449  | 
        tree.
 | 
|
450  | 
||
451  | 
        Skips the control directory.
 | 
|
452  | 
        """
 | 
|
| 
866
by Martin Pool
 - use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.  | 
453  | 
inv = self._inventory  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
454  | 
|
455  | 
def descend(from_dir_relpath, from_dir_id, dp):  | 
|
456  | 
ls = os.listdir(dp)  | 
|
457  | 
ls.sort()  | 
|
458  | 
for f in ls:  | 
|
459  | 
                ## TODO: If we find a subdirectory with its own .bzr
 | 
|
460  | 
                ## directory, then that is a separate tree and we
 | 
|
461  | 
                ## should exclude it.
 | 
|
462  | 
if bzrlib.BZRDIR == f:  | 
|
463  | 
                    continue
 | 
|
464  | 
||
465  | 
                # path within tree
 | 
|
466  | 
fp = appendpath(from_dir_relpath, f)  | 
|
467  | 
||
468  | 
                # absolute path
 | 
|
469  | 
fap = appendpath(dp, f)  | 
|
470  | 
||
471  | 
f_ie = inv.get_child(from_dir_id, f)  | 
|
472  | 
if f_ie:  | 
|
473  | 
c = 'V'  | 
|
474  | 
elif self.is_ignored(fp):  | 
|
475  | 
c = 'I'  | 
|
476  | 
else:  | 
|
477  | 
c = '?'  | 
|
478  | 
||
479  | 
fk = file_kind(fap)  | 
|
480  | 
||
481  | 
if f_ie:  | 
|
482  | 
if f_ie.kind != fk:  | 
|
483  | 
raise BzrCheckError("file %r entered as kind %r id %r, "  | 
|
484  | 
"now of kind %r"  | 
|
485  | 
% (fap, f_ie.kind, f_ie.file_id, fk))  | 
|
486  | 
||
| 
1399.1.2
by Robert Collins
 push kind character creation into InventoryEntry and TreeEntry  | 
487  | 
                # make a last minute entry
 | 
488  | 
if f_ie:  | 
|
489  | 
entry = f_ie  | 
|
490  | 
else:  | 
|
491  | 
if fk == 'directory':  | 
|
492  | 
entry = TreeDirectory()  | 
|
493  | 
elif fk == 'file':  | 
|
494  | 
entry = TreeFile()  | 
|
495  | 
elif fk == 'symlink':  | 
|
496  | 
entry = TreeLink()  | 
|
497  | 
else:  | 
|
498  | 
entry = TreeEntry()  | 
|
499  | 
||
500  | 
yield fp, c, fk, (f_ie and f_ie.file_id), entry  | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
501  | 
|
502  | 
if fk != 'directory':  | 
|
503  | 
                    continue
 | 
|
504  | 
||
505  | 
if c != 'V':  | 
|
506  | 
                    # don't descend unversioned directories
 | 
|
507  | 
                    continue
 | 
|
508  | 
||
509  | 
for ff in descend(fp, f_ie.file_id, fap):  | 
|
510  | 
yield ff  | 
|
511  | 
||
| 
1185.33.66
by Martin Pool
 [patch] use unicode literals for all hardcoded paths (Alexander Belchenko)  | 
512  | 
for f in descend(u'', inv.root.file_id, self.basedir):  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
513  | 
yield f  | 
| 
1508.1.7
by Robert Collins
 Move rename_one from Branch to WorkingTree. (Robert Collins).  | 
514  | 
|
515  | 
    @needs_write_lock
 | 
|
| 
1508.1.8
by Robert Collins
 move move() from Branch to WorkingTree.  | 
516  | 
def move(self, from_paths, to_name):  | 
517  | 
"""Rename files.  | 
|
518  | 
||
519  | 
        to_name must exist in the inventory.
 | 
|
520  | 
||
521  | 
        If to_name exists and is a directory, the files are moved into
 | 
|
522  | 
        it, keeping their old names.  
 | 
|
523  | 
||
524  | 
        Note that to_name is only the last component of the new name;
 | 
|
525  | 
        this doesn't change the directory.
 | 
|
526  | 
||
527  | 
        This returns a list of (from_path, to_path) pairs for each
 | 
|
528  | 
        entry that is moved.
 | 
|
529  | 
        """
 | 
|
530  | 
result = []  | 
|
531  | 
        ## TODO: Option to move IDs only
 | 
|
532  | 
assert not isinstance(from_paths, basestring)  | 
|
533  | 
inv = self.inventory  | 
|
534  | 
to_abs = self.abspath(to_name)  | 
|
535  | 
if not isdir(to_abs):  | 
|
536  | 
raise BzrError("destination %r is not a directory" % to_abs)  | 
|
537  | 
if not self.has_filename(to_name):  | 
|
538  | 
raise BzrError("destination %r not in working directory" % to_abs)  | 
|
539  | 
to_dir_id = inv.path2id(to_name)  | 
|
540  | 
if to_dir_id == None and to_name != '':  | 
|
541  | 
raise BzrError("destination %r is not a versioned directory" % to_name)  | 
|
542  | 
to_dir_ie = inv[to_dir_id]  | 
|
543  | 
if to_dir_ie.kind not in ('directory', 'root_directory'):  | 
|
544  | 
raise BzrError("destination %r is not a directory" % to_abs)  | 
|
545  | 
||
546  | 
to_idpath = inv.get_idpath(to_dir_id)  | 
|
547  | 
||
548  | 
for f in from_paths:  | 
|
549  | 
if not self.has_filename(f):  | 
|
550  | 
raise BzrError("%r does not exist in working tree" % f)  | 
|
551  | 
f_id = inv.path2id(f)  | 
|
552  | 
if f_id == None:  | 
|
553  | 
raise BzrError("%r is not versioned" % f)  | 
|
554  | 
name_tail = splitpath(f)[-1]  | 
|
555  | 
dest_path = appendpath(to_name, name_tail)  | 
|
556  | 
if self.has_filename(dest_path):  | 
|
557  | 
raise BzrError("destination %r already exists" % dest_path)  | 
|
558  | 
if f_id in to_idpath:  | 
|
559  | 
raise BzrError("can't move %r to a subdirectory of itself" % f)  | 
|
560  | 
||
561  | 
        # OK, so there's a race here, it's possible that someone will
 | 
|
562  | 
        # create a file in this interval and then the rename might be
 | 
|
563  | 
        # left half-done.  But we should have caught most problems.
 | 
|
564  | 
orig_inv = deepcopy(self.inventory)  | 
|
565  | 
try:  | 
|
566  | 
for f in from_paths:  | 
|
567  | 
name_tail = splitpath(f)[-1]  | 
|
568  | 
dest_path = appendpath(to_name, name_tail)  | 
|
569  | 
result.append((f, dest_path))  | 
|
570  | 
inv.rename(inv.path2id(f), to_dir_id, name_tail)  | 
|
571  | 
try:  | 
|
572  | 
rename(self.abspath(f), self.abspath(dest_path))  | 
|
573  | 
except OSError, e:  | 
|
574  | 
raise BzrError("failed to rename %r to %r: %s" %  | 
|
575  | 
(f, dest_path, e[1]),  | 
|
576  | 
["rename rolled back"])  | 
|
577  | 
except:  | 
|
578  | 
            # restore the inventory on error
 | 
|
| 
1508.1.10
by Robert Collins
 bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)  | 
579  | 
self._set_inventory(orig_inv)  | 
| 
1508.1.8
by Robert Collins
 move move() from Branch to WorkingTree.  | 
580  | 
            raise
 | 
581  | 
self._write_inventory(inv)  | 
|
582  | 
return result  | 
|
583  | 
||
584  | 
    @needs_write_lock
 | 
|
| 
1508.1.7
by Robert Collins
 Move rename_one from Branch to WorkingTree. (Robert Collins).  | 
585  | 
def rename_one(self, from_rel, to_rel):  | 
586  | 
"""Rename one file.  | 
|
587  | 
||
588  | 
        This can change the directory or the filename or both.
 | 
|
589  | 
        """
 | 
|
590  | 
inv = self.inventory  | 
|
591  | 
if not self.has_filename(from_rel):  | 
|
592  | 
raise BzrError("can't rename: old working file %r does not exist" % from_rel)  | 
|
593  | 
if self.has_filename(to_rel):  | 
|
594  | 
raise BzrError("can't rename: new working file %r already exists" % to_rel)  | 
|
595  | 
||
596  | 
file_id = inv.path2id(from_rel)  | 
|
597  | 
if file_id == None:  | 
|
598  | 
raise BzrError("can't rename: old name %r is not versioned" % from_rel)  | 
|
599  | 
||
600  | 
entry = inv[file_id]  | 
|
601  | 
from_parent = entry.parent_id  | 
|
602  | 
from_name = entry.name  | 
|
603  | 
||
604  | 
if inv.path2id(to_rel):  | 
|
605  | 
raise BzrError("can't rename: new name %r is already versioned" % to_rel)  | 
|
606  | 
||
607  | 
to_dir, to_tail = os.path.split(to_rel)  | 
|
608  | 
to_dir_id = inv.path2id(to_dir)  | 
|
609  | 
if to_dir_id == None and to_dir != '':  | 
|
610  | 
raise BzrError("can't determine destination directory id for %r" % to_dir)  | 
|
611  | 
||
612  | 
mutter("rename_one:")  | 
|
613  | 
mutter(" file_id {%s}" % file_id)  | 
|
614  | 
mutter(" from_rel %r" % from_rel)  | 
|
615  | 
mutter(" to_rel %r" % to_rel)  | 
|
616  | 
mutter(" to_dir %r" % to_dir)  | 
|
617  | 
mutter(" to_dir_id {%s}" % to_dir_id)  | 
|
618  | 
||
619  | 
inv.rename(file_id, to_dir_id, to_tail)  | 
|
620  | 
||
621  | 
from_abs = self.abspath(from_rel)  | 
|
622  | 
to_abs = self.abspath(to_rel)  | 
|
623  | 
try:  | 
|
624  | 
rename(from_abs, to_abs)  | 
|
625  | 
except OSError, e:  | 
|
626  | 
inv.rename(file_id, from_parent, from_name)  | 
|
627  | 
raise BzrError("failed to rename %r to %r: %s"  | 
|
628  | 
% (from_abs, to_abs, e[1]),  | 
|
629  | 
["rename rolled back"])  | 
|
630  | 
self._write_inventory(inv)  | 
|
631  | 
||
632  | 
    @needs_read_lock
 | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
633  | 
def unknowns(self):  | 
| 
1508.1.6
by Robert Collins
 Move Branch.unknowns() to WorkingTree.  | 
634  | 
"""Return all unknown files.  | 
635  | 
||
636  | 
        These are files in the working directory that are not versioned or
 | 
|
637  | 
        control files or ignored.
 | 
|
638  | 
        
 | 
|
639  | 
        >>> from bzrlib.branch import ScratchBranch
 | 
|
640  | 
        >>> b = ScratchBranch(files=['foo', 'foo~'])
 | 
|
641  | 
        >>> tree = WorkingTree(b.base, b)
 | 
|
642  | 
        >>> map(str, tree.unknowns())
 | 
|
643  | 
        ['foo']
 | 
|
644  | 
        >>> tree.add('foo')
 | 
|
645  | 
        >>> list(b.unknowns())
 | 
|
646  | 
        []
 | 
|
647  | 
        >>> tree.remove('foo')
 | 
|
648  | 
        >>> list(b.unknowns())
 | 
|
649  | 
        [u'foo']
 | 
|
650  | 
        """
 | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
651  | 
for subp in self.extras():  | 
652  | 
if not self.is_ignored(subp):  | 
|
653  | 
yield subp  | 
|
654  | 
||
| 
1185.14.6
by Aaron Bentley
 Made iter_conflicts a WorkingTree method  | 
655  | 
def iter_conflicts(self):  | 
656  | 
conflicted = set()  | 
|
657  | 
for path in (s[0] for s in self.list_files()):  | 
|
658  | 
stem = get_conflicted_stem(path)  | 
|
659  | 
if stem is None:  | 
|
660  | 
                continue
 | 
|
661  | 
if stem not in conflicted:  | 
|
662  | 
conflicted.add(stem)  | 
|
663  | 
yield stem  | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
664  | 
|
| 
1442.1.67
by Robert Collins
 Factor out the guts of 'pull' from the command into WorkingTree.pull().  | 
665  | 
    @needs_write_lock
 | 
| 
1490
by Robert Collins
 Implement a 'bzr push' command, with saved locations; update diff to return 1.  | 
666  | 
def pull(self, source, overwrite=False):  | 
| 
1465
by Robert Collins
 Bugfix the new pull --clobber to not generate spurious conflicts.  | 
667  | 
from bzrlib.merge import merge_inner  | 
| 
1442.1.67
by Robert Collins
 Factor out the guts of 'pull' from the command into WorkingTree.pull().  | 
668  | 
source.lock_read()  | 
669  | 
try:  | 
|
670  | 
old_revision_history = self.branch.revision_history()  | 
|
| 
1185.33.44
by Martin Pool
 [patch] show number of revisions pushed/pulled/merged (Robey Pointer)  | 
671  | 
count = self.branch.pull(source, overwrite)  | 
| 
1442.1.67
by Robert Collins
 Factor out the guts of 'pull' from the command into WorkingTree.pull().  | 
672  | 
new_revision_history = self.branch.revision_history()  | 
673  | 
if new_revision_history != old_revision_history:  | 
|
| 
1465
by Robert Collins
 Bugfix the new pull --clobber to not generate spurious conflicts.  | 
674  | 
if len(old_revision_history):  | 
675  | 
other_revision = old_revision_history[-1]  | 
|
676  | 
else:  | 
|
677  | 
other_revision = None  | 
|
678  | 
merge_inner(self.branch,  | 
|
679  | 
self.branch.basis_tree(),  | 
|
680  | 
self.branch.revision_tree(other_revision))  | 
|
| 
1185.33.44
by Martin Pool
 [patch] show number of revisions pushed/pulled/merged (Robey Pointer)  | 
681  | 
return count  | 
| 
1442.1.67
by Robert Collins
 Factor out the guts of 'pull' from the command into WorkingTree.pull().  | 
682  | 
finally:  | 
683  | 
source.unlock()  | 
|
684  | 
||
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
685  | 
def extras(self):  | 
686  | 
"""Yield all unknown files in this WorkingTree.  | 
|
687  | 
||
688  | 
        If there are any unknown directories then only the directory is
 | 
|
689  | 
        returned, not all its children.  But if there are unknown files
 | 
|
690  | 
        under a versioned subdirectory, they are returned.
 | 
|
691  | 
||
692  | 
        Currently returned depth-first, sorted by name within directories.
 | 
|
693  | 
        """
 | 
|
694  | 
        ## TODO: Work from given directory downwards
 | 
|
695  | 
for path, dir_entry in self.inventory.directories():  | 
|
| 
1185.31.4
by John Arbash Meinel
 Fixing mutter() calls to not have to do string processing.  | 
696  | 
mutter("search for unknowns in %r", path)  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
697  | 
dirabs = self.abspath(path)  | 
698  | 
if not isdir(dirabs):  | 
|
699  | 
                # e.g. directory deleted
 | 
|
700  | 
                continue
 | 
|
701  | 
||
702  | 
fl = []  | 
|
703  | 
for subf in os.listdir(dirabs):  | 
|
704  | 
if (subf != '.bzr'  | 
|
705  | 
and (subf not in dir_entry.children)):  | 
|
706  | 
fl.append(subf)  | 
|
707  | 
||
708  | 
fl.sort()  | 
|
709  | 
for subf in fl:  | 
|
710  | 
subp = appendpath(path, subf)  | 
|
711  | 
yield subp  | 
|
712  | 
||
713  | 
||
714  | 
def ignored_files(self):  | 
|
715  | 
"""Yield list of PATH, IGNORE_PATTERN"""  | 
|
716  | 
for subp in self.extras():  | 
|
717  | 
pat = self.is_ignored(subp)  | 
|
718  | 
if pat != None:  | 
|
719  | 
yield subp, pat  | 
|
720  | 
||
721  | 
||
722  | 
def get_ignore_list(self):  | 
|
723  | 
"""Return list of ignore patterns.  | 
|
724  | 
||
725  | 
        Cached in the Tree object after the first call.
 | 
|
726  | 
        """
 | 
|
727  | 
if hasattr(self, '_ignorelist'):  | 
|
728  | 
return self._ignorelist  | 
|
729  | 
||
730  | 
l = bzrlib.DEFAULT_IGNORE[:]  | 
|
731  | 
if self.has_filename(bzrlib.IGNORE_FILENAME):  | 
|
732  | 
f = self.get_file_byname(bzrlib.IGNORE_FILENAME)  | 
|
733  | 
l.extend([line.rstrip("\n\r") for line in f.readlines()])  | 
|
734  | 
self._ignorelist = l  | 
|
735  | 
return l  | 
|
736  | 
||
737  | 
||
738  | 
def is_ignored(self, filename):  | 
|
739  | 
r"""Check whether the filename matches an ignore pattern.  | 
|
740  | 
||
741  | 
        Patterns containing '/' or '\' need to match the whole path;
 | 
|
742  | 
        others match against only the last component.
 | 
|
743  | 
||
744  | 
        If the file is ignored, returns the pattern which caused it to
 | 
|
745  | 
        be ignored, otherwise None.  So this can simply be used as a
 | 
|
746  | 
        boolean if desired."""
 | 
|
747  | 
||
748  | 
        # TODO: Use '**' to match directories, and other extended
 | 
|
749  | 
        # globbing stuff from cvs/rsync.
 | 
|
750  | 
||
751  | 
        # XXX: fnmatch is actually not quite what we want: it's only
 | 
|
752  | 
        # approximately the same as real Unix fnmatch, and doesn't
 | 
|
753  | 
        # treat dotfiles correctly and allows * to match /.
 | 
|
754  | 
        # Eventually it should be replaced with something more
 | 
|
755  | 
        # accurate.
 | 
|
756  | 
||
757  | 
for pat in self.get_ignore_list():  | 
|
758  | 
if '/' in pat or '\\' in pat:  | 
|
759  | 
||
760  | 
                # as a special case, you can put ./ at the start of a
 | 
|
761  | 
                # pattern; this is good to match in the top-level
 | 
|
762  | 
                # only;
 | 
|
763  | 
||
764  | 
if (pat[:2] == './') or (pat[:2] == '.\\'):  | 
|
765  | 
newpat = pat[2:]  | 
|
766  | 
else:  | 
|
767  | 
newpat = pat  | 
|
768  | 
if fnmatch.fnmatchcase(filename, newpat):  | 
|
769  | 
return pat  | 
|
770  | 
else:  | 
|
771  | 
if fnmatch.fnmatchcase(splitpath(filename)[-1], pat):  | 
|
772  | 
return pat  | 
|
773  | 
else:  | 
|
774  | 
return None  | 
|
| 
1185.14.6
by Aaron Bentley
 Made iter_conflicts a WorkingTree method  | 
775  | 
|
| 
1185.12.28
by Aaron Bentley
 Removed use of readonly path for executability test  | 
776  | 
def kind(self, file_id):  | 
777  | 
return file_kind(self.id2abspath(file_id))  | 
|
778  | 
||
| 
1442.1.65
by Robert Collins
 Branch.remove has been moved to WorkingTree.  | 
779  | 
def lock_read(self):  | 
780  | 
"""See Branch.lock_read, and WorkingTree.unlock."""  | 
|
781  | 
return self.branch.lock_read()  | 
|
782  | 
||
783  | 
def lock_write(self):  | 
|
784  | 
"""See Branch.lock_write, and WorkingTree.unlock."""  | 
|
785  | 
return self.branch.lock_write()  | 
|
786  | 
||
| 
1185.33.59
by Martin Pool
 [patch] keep a cached basis inventory (Johan Rydberg)  | 
787  | 
def _basis_inventory_name(self, revision_id):  | 
788  | 
return 'basis-inventory.%s' % revision_id  | 
|
789  | 
||
790  | 
def set_last_revision(self, new_revision, old_revision=None):  | 
|
791  | 
if old_revision:  | 
|
792  | 
try:  | 
|
793  | 
path = self._basis_inventory_name(old_revision)  | 
|
794  | 
path = self.branch._rel_controlfilename(path)  | 
|
795  | 
self.branch._transport.delete(path)  | 
|
796  | 
except:  | 
|
797  | 
                pass
 | 
|
798  | 
try:  | 
|
799  | 
xml = self.branch.get_inventory_xml(new_revision)  | 
|
800  | 
path = self._basis_inventory_name(new_revision)  | 
|
801  | 
self.branch.put_controlfile(path, xml)  | 
|
802  | 
except WeaveRevisionNotPresent:  | 
|
803  | 
            pass
 | 
|
804  | 
||
805  | 
def read_basis_inventory(self, revision_id):  | 
|
806  | 
"""Read the cached basis inventory."""  | 
|
807  | 
path = self._basis_inventory_name(revision_id)  | 
|
808  | 
return self.branch.controlfile(path, 'r').read()  | 
|
809  | 
||
| 
1497
by Robert Collins
 Move Branch.read_working_inventory to WorkingTree.  | 
810  | 
    @needs_read_lock
 | 
811  | 
def read_working_inventory(self):  | 
|
812  | 
"""Read the working inventory."""  | 
|
813  | 
        # ElementTree does its own conversion from UTF-8, so open in
 | 
|
814  | 
        # binary.
 | 
|
815  | 
f = self.branch.controlfile('inventory', 'rb')  | 
|
816  | 
return bzrlib.xml5.serializer_v5.read_inventory(f)  | 
|
817  | 
||
| 
1442.1.65
by Robert Collins
 Branch.remove has been moved to WorkingTree.  | 
818  | 
    @needs_write_lock
 | 
819  | 
def remove(self, files, verbose=False):  | 
|
820  | 
"""Remove nominated files from the working inventory..  | 
|
821  | 
||
822  | 
        This does not remove their text.  This does not run on XXX on what? RBC
 | 
|
823  | 
||
824  | 
        TODO: Refuse to remove modified files unless --force is given?
 | 
|
825  | 
||
826  | 
        TODO: Do something useful with directories.
 | 
|
827  | 
||
828  | 
        TODO: Should this remove the text or not?  Tough call; not
 | 
|
829  | 
        removing may be useful and the user can just use use rm, and
 | 
|
830  | 
        is the opposite of add.  Removing it is consistent with most
 | 
|
831  | 
        other tools.  Maybe an option.
 | 
|
832  | 
        """
 | 
|
833  | 
        ## TODO: Normalize names
 | 
|
834  | 
        ## TODO: Remove nested loops; better scalability
 | 
|
835  | 
if isinstance(files, basestring):  | 
|
836  | 
files = [files]  | 
|
837  | 
||
838  | 
inv = self.inventory  | 
|
839  | 
||
840  | 
        # do this before any modifications
 | 
|
841  | 
for f in files:  | 
|
842  | 
fid = inv.path2id(f)  | 
|
843  | 
if not fid:  | 
|
| 
1185.16.72
by Martin Pool
 [merge] from robert and fix up tests  | 
844  | 
                # TODO: Perhaps make this just a warning, and continue?
 | 
845  | 
                # This tends to happen when 
 | 
|
846  | 
raise NotVersionedError(path=f)  | 
|
| 
1185.31.4
by John Arbash Meinel
 Fixing mutter() calls to not have to do string processing.  | 
847  | 
mutter("remove inventory entry %s {%s}", quotefn(f), fid)  | 
| 
1442.1.65
by Robert Collins
 Branch.remove has been moved to WorkingTree.  | 
848  | 
if verbose:  | 
849  | 
                # having remove it, it must be either ignored or unknown
 | 
|
850  | 
if self.is_ignored(f):  | 
|
851  | 
new_status = 'I'  | 
|
852  | 
else:  | 
|
853  | 
new_status = '?'  | 
|
854  | 
show_status(new_status, inv[fid].kind, quotefn(f))  | 
|
855  | 
del inv[fid]  | 
|
856  | 
||
| 
1457.1.11
by Robert Collins
 Move _write_inventory to WorkingTree.  | 
857  | 
self._write_inventory(inv)  | 
| 
1442.1.65
by Robert Collins
 Branch.remove has been moved to WorkingTree.  | 
858  | 
|
| 
1497
by Robert Collins
 Move Branch.read_working_inventory to WorkingTree.  | 
859  | 
    @needs_write_lock
 | 
| 
1501
by Robert Collins
 Move revert from Branch to WorkingTree.  | 
860  | 
def revert(self, filenames, old_tree=None, backups=True):  | 
| 
1457.1.8
by Robert Collins
 Replace the WorkingTree.revert method algorithm with a call to merge_inner.  | 
861  | 
from bzrlib.merge import merge_inner  | 
| 
1501
by Robert Collins
 Move revert from Branch to WorkingTree.  | 
862  | 
if old_tree is None:  | 
863  | 
old_tree = self.branch.basis_tree()  | 
|
| 
1457.1.8
by Robert Collins
 Replace the WorkingTree.revert method algorithm with a call to merge_inner.  | 
864  | 
merge_inner(self.branch, old_tree,  | 
865  | 
self, ignore_zero=True,  | 
|
866  | 
backup_files=backups,  | 
|
867  | 
interesting_files=filenames)  | 
|
868  | 
if not len(filenames):  | 
|
| 
1457.1.16
by Robert Collins
 Move set_pending_merges to WorkingTree.  | 
869  | 
self.set_pending_merges([])  | 
| 
1501
by Robert Collins
 Move revert from Branch to WorkingTree.  | 
870  | 
|
871  | 
    @needs_write_lock
 | 
|
| 
1497
by Robert Collins
 Move Branch.read_working_inventory to WorkingTree.  | 
872  | 
def set_inventory(self, new_inventory_list):  | 
873  | 
from bzrlib.inventory import (Inventory,  | 
|
874  | 
InventoryDirectory,  | 
|
875  | 
InventoryEntry,  | 
|
876  | 
InventoryFile,  | 
|
877  | 
InventoryLink)  | 
|
878  | 
inv = Inventory(self.get_root_id())  | 
|
879  | 
for path, file_id, parent, kind in new_inventory_list:  | 
|
880  | 
name = os.path.basename(path)  | 
|
881  | 
if name == "":  | 
|
882  | 
                continue
 | 
|
883  | 
            # fixme, there should be a factory function inv,add_?? 
 | 
|
884  | 
if kind == 'directory':  | 
|
885  | 
inv.add(InventoryDirectory(file_id, name, parent))  | 
|
886  | 
elif kind == 'file':  | 
|
887  | 
inv.add(InventoryFile(file_id, name, parent))  | 
|
888  | 
elif kind == 'symlink':  | 
|
889  | 
inv.add(InventoryLink(file_id, name, parent))  | 
|
890  | 
else:  | 
|
891  | 
raise BzrError("unknown kind %r" % kind)  | 
|
| 
1457.1.11
by Robert Collins
 Move _write_inventory to WorkingTree.  | 
892  | 
self._write_inventory(inv)  | 
| 
1497
by Robert Collins
 Move Branch.read_working_inventory to WorkingTree.  | 
893  | 
|
| 
1457.1.10
by Robert Collins
 Move set_root_id to WorkingTree.  | 
894  | 
    @needs_write_lock
 | 
895  | 
def set_root_id(self, file_id):  | 
|
896  | 
"""Set the root id for this tree."""  | 
|
897  | 
inv = self.read_working_inventory()  | 
|
898  | 
orig_root_id = inv.root.file_id  | 
|
899  | 
del inv._byid[inv.root.file_id]  | 
|
900  | 
inv.root.file_id = file_id  | 
|
901  | 
inv._byid[inv.root.file_id] = inv.root  | 
|
902  | 
for fid in inv:  | 
|
903  | 
entry = inv[fid]  | 
|
904  | 
if entry.parent_id in (None, orig_root_id):  | 
|
905  | 
entry.parent_id = inv.root.file_id  | 
|
| 
1457.1.11
by Robert Collins
 Move _write_inventory to WorkingTree.  | 
906  | 
self._write_inventory(inv)  | 
| 
1457.1.10
by Robert Collins
 Move set_root_id to WorkingTree.  | 
907  | 
|
| 
1442.1.65
by Robert Collins
 Branch.remove has been moved to WorkingTree.  | 
908  | 
def unlock(self):  | 
909  | 
"""See Branch.unlock.  | 
|
910  | 
        
 | 
|
911  | 
        WorkingTree locking just uses the Branch locking facilities.
 | 
|
912  | 
        This is current because all working trees have an embedded branch
 | 
|
913  | 
        within them. IF in the future, we were to make branch data shareable
 | 
|
914  | 
        between multiple working trees, i.e. via shared storage, then we 
 | 
|
915  | 
        would probably want to lock both the local tree, and the branch.
 | 
|
916  | 
        """
 | 
|
| 
1185.60.6
by Aaron Bentley
 Fixed hashcache  | 
917  | 
if self._hashcache.needs_write:  | 
918  | 
self._hashcache.write()  | 
|
| 
1442.1.65
by Robert Collins
 Branch.remove has been moved to WorkingTree.  | 
919  | 
return self.branch.unlock()  | 
920  | 
||
| 
1457.1.11
by Robert Collins
 Move _write_inventory to WorkingTree.  | 
921  | 
    @needs_write_lock
 | 
922  | 
def _write_inventory(self, inv):  | 
|
923  | 
"""Write inventory as the current inventory."""  | 
|
924  | 
from cStringIO import StringIO  | 
|
925  | 
from bzrlib.atomicfile import AtomicFile  | 
|
926  | 
sio = StringIO()  | 
|
927  | 
bzrlib.xml5.serializer_v5.write_inventory(inv, sio)  | 
|
928  | 
sio.seek(0)  | 
|
929  | 
f = AtomicFile(self.branch.controlfilename('inventory'))  | 
|
930  | 
try:  | 
|
931  | 
pumpfile(sio, f)  | 
|
932  | 
f.commit()  | 
|
933  | 
finally:  | 
|
934  | 
f.close()  | 
|
| 
1508.1.10
by Robert Collins
 bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)  | 
935  | 
self._set_inventory(inv)  | 
| 
1457.1.11
by Robert Collins
 Move _write_inventory to WorkingTree.  | 
936  | 
mutter('wrote working inventory')  | 
937  | 
||
| 
1442.1.65
by Robert Collins
 Branch.remove has been moved to WorkingTree.  | 
938  | 
|
| 
1185.14.6
by Aaron Bentley
 Made iter_conflicts a WorkingTree method  | 
939  | 
CONFLICT_SUFFIXES = ('.THIS', '.BASE', '.OTHER')  | 
940  | 
def get_conflicted_stem(path):  | 
|
941  | 
for suffix in CONFLICT_SUFFIXES:  | 
|
942  | 
if path.endswith(suffix):  | 
|
943  | 
return path[:-len(suffix)]  |