bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
1553.5.74
by Martin Pool
 Convert WorkingTree format3 to use LockDirs  | 
1  | 
# Copyright (C) 2005, 2006 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
 | 
|
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  | 
||
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
28  | 
To get a WorkingTree, call bzrdir.open_workingtree() or
 | 
29  | 
WorkingTree.open(dir).
 | 
|
| 
1185.16.72
by Martin Pool
 [merge] from robert and fix up tests  | 
30  | 
"""
 | 
31  | 
||
| 
1534.7.196
by Aaron Bentley
 Switched to Rio format for merge-modified list  | 
32  | 
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"  | 
| 
1534.10.6
by Aaron Bentley
 Conflict serialization working for WorkingTree3  | 
33  | 
CONFLICT_HEADER_1 = "BZR conflict list format 1"  | 
| 
1185.16.72
by Martin Pool
 [merge] from robert and fix up tests  | 
34  | 
|
35  | 
# TODO: Give the workingtree sole responsibility for the working inventory;
 | 
|
36  | 
# remove the variable and references to it from the branch.  This may require
 | 
|
37  | 
# updating the commit code so as to update the inventory within the working
 | 
|
38  | 
# copy, and making sure there's only one WorkingTree for any directory on disk.
 | 
|
| 
1553.5.74
by Martin Pool
 Convert WorkingTree format3 to use LockDirs  | 
39  | 
# At the moment they may alias the inventory and have old copies of it in
 | 
40  | 
# memory.  (Now done? -- mbp 20060309)
 | 
|
| 
956
by Martin Pool
 doc  | 
41  | 
|
| 
1713.1.6
by Robert Collins
 Move file id random data selection out of the inner loop for 'bzr add'.  | 
42  | 
from binascii import hexlify  | 
| 
1732.1.9
by John Arbash Meinel
 Non-recursive implementation of WorkingTree.list_files  | 
43  | 
import collections  | 
| 
1508.1.8
by Robert Collins
 move move() from Branch to WorkingTree.  | 
44  | 
from copy import deepcopy  | 
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
45  | 
from cStringIO import StringIO  | 
46  | 
import errno  | 
|
47  | 
import fnmatch  | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
48  | 
import os  | 
| 
1185.85.34
by John Arbash Meinel
 Updating 'bzr file-id' exposed that we weren't allowing unicode file ids. Enabling them reveals a lot more bugs.  | 
49  | 
import re  | 
| 
1398
by Robert Collins
 integrate in Gustavos x-bit patch  | 
50  | 
import stat  | 
| 
1713.1.6
by Robert Collins
 Move file id random data selection out of the inner loop for 'bzr add'.  | 
51  | 
from time import time  | 
| 
1773.4.1
by Martin Pool
 Add pyflakes makefile target; fix many warnings  | 
52  | 
import warnings  | 
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
53  | 
|
| 
1836.1.21
by John Arbash Meinel
 Restore the ability to ignore items by modifying DEFAULT_IGNORE  | 
54  | 
import bzrlib  | 
| 
1836.1.22
by John Arbash Meinel
 [merge] bzr.dev 1861  | 
55  | 
from bzrlib import bzrdir, errors, ignores, osutils, urlutils  | 
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
56  | 
from bzrlib.atomicfile import AtomicFile  | 
| 
1852.3.1
by Robert Collins
 Trivial cleanups to workingtree.py  | 
57  | 
import bzrlib.branch  | 
| 
1534.10.22
by Aaron Bentley
 Got ConflictList implemented  | 
58  | 
from bzrlib.conflicts import Conflict, ConflictList, CONFLICT_SUFFIXES  | 
| 
1534.4.28
by Robert Collins
 first cut at merge from integration.  | 
59  | 
from bzrlib.decorators import needs_read_lock, needs_write_lock  | 
| 
1508.1.5
by Robert Collins
 Move add from Branch to WorkingTree.  | 
60  | 
from bzrlib.errors import (BzrCheckError,  | 
| 
1508.1.7
by Robert Collins
 Move rename_one from Branch to WorkingTree. (Robert Collins).  | 
61  | 
BzrError,  | 
| 
1534.10.7
by Aaron Bentley
 Added tests for bad conflict lists  | 
62  | 
ConflictFormatError,  | 
| 
1185.33.59
by Martin Pool
 [patch] keep a cached basis inventory (Johan Rydberg)  | 
63  | 
WeaveRevisionNotPresent,  | 
| 
1508.1.5
by Robert Collins
 Move add from Branch to WorkingTree.  | 
64  | 
NotBranchError,  | 
| 
1185.65.17
by Robert Collins
 Merge from integration, mode-changes are broken.  | 
65  | 
NoSuchFile,  | 
| 
1558.3.3
by Aaron Bentley
 Fix error handling for merge_modified  | 
66  | 
NotVersionedError,  | 
| 
1534.10.8
by Aaron Bentley
 Implemented conflict_lines in terms of old system on WorkingTree  | 
67  | 
MergeModifiedFormatError,  | 
68  | 
UnsupportedOperation,  | 
|
69  | 
                           )
 | 
|
| 
1534.7.165
by Aaron Bentley
 Switched to build_tree instead of revert  | 
70  | 
from bzrlib.inventory import InventoryEntry, Inventory  | 
| 
1553.5.63
by Martin Pool
 Lock type is now mandatory for LockableFiles constructor  | 
71  | 
from bzrlib.lockable_files import LockableFiles, TransportLock  | 
| 
1553.5.74
by Martin Pool
 Convert WorkingTree format3 to use LockDirs  | 
72  | 
from bzrlib.lockdir import LockDir  | 
| 
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.  | 
73  | 
from bzrlib.merge import merge_inner, transform_tree  | 
| 
1986.1.2
by Robert Collins
 Various changes to allow non-workingtree specific tests to run entirely  | 
74  | 
import bzrlib.mutabletree  | 
| 
1986.1.8
by Robert Collins
 Update to bzr.dev, which involves adding lock_tree_write to MutableTree and MemoryTree.  | 
75  | 
from bzrlib.mutabletree import needs_tree_write_lock  | 
| 
1587.1.14
by Robert Collins
 Make bound branch creation happen via 'checkout'  | 
76  | 
from bzrlib.osutils import (  | 
77  | 
abspath,  | 
|
| 
1508.1.5
by Robert Collins
 Move add from Branch to WorkingTree.  | 
78  | 
compact_date,  | 
| 
1457.1.11
by Robert Collins
 Move _write_inventory to WorkingTree.  | 
79  | 
file_kind,  | 
80  | 
isdir,  | 
|
| 
1185.31.39
by John Arbash Meinel
 Replacing os.getcwdu() with osutils.getcwd(),  | 
81  | 
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 \  | 
82  | 
pathjoin,  | 
| 
1457.1.11
by Robert Collins
 Move _write_inventory to WorkingTree.  | 
83  | 
pumpfile,  | 
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
84  | 
safe_unicode,  | 
| 
1457.1.11
by Robert Collins
 Move _write_inventory to WorkingTree.  | 
85  | 
splitpath,  | 
| 
1713.1.7
by Robert Collins
 Review comments for gen_file_id changes.  | 
86  | 
rand_chars,  | 
| 
1185.31.38
by John Arbash Meinel
 Changing os.path.normpath to osutils.normpath  | 
87  | 
normpath,  | 
| 
1508.1.10
by Robert Collins
 bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)  | 
88  | 
realpath,  | 
| 
1508.1.7
by Robert Collins
 Move rename_one from Branch to WorkingTree. (Robert Collins).  | 
89  | 
relpath,  | 
| 
1534.7.25
by Aaron Bentley
 Added set_executability  | 
90  | 
rename,  | 
91  | 
supports_executable,  | 
|
92  | 
                            )
 | 
|
| 
1551.2.36
by Aaron Bentley
 Make pull update the progress bar more nicely  | 
93  | 
from bzrlib.progress import DummyProgress, ProgressPhase  | 
| 
1508.1.19
by Robert Collins
 Give format3 working trees their own last-revision marker.  | 
94  | 
from bzrlib.revision import NULL_REVISION  | 
| 
1986.1.2
by Robert Collins
 Various changes to allow non-workingtree specific tests to run entirely  | 
95  | 
import bzrlib.revisiontree  | 
| 
1534.10.3
by Aaron Bentley
 Simplify set_merge_modified with rio_file  | 
96  | 
from bzrlib.rio import RioReader, rio_file, Stanza  | 
| 
1773.4.1
by Martin Pool
 Add pyflakes makefile target; fix many warnings  | 
97  | 
from bzrlib.symbol_versioning import (deprecated_passed,  | 
98  | 
deprecated_method,  | 
|
99  | 
deprecated_function,  | 
|
100  | 
DEPRECATED_PARAMETER,  | 
|
101  | 
zero_eight,  | 
|
| 
1908.7.6
by Robert Collins
 Deprecate WorkingTree.last_revision.  | 
102  | 
zero_eleven,  | 
| 
1773.4.1
by Martin Pool
 Add pyflakes makefile target; fix many warnings  | 
103  | 
        )
 | 
| 
1852.3.1
by Robert Collins
 Trivial cleanups to workingtree.py  | 
104  | 
from bzrlib.trace import mutter, note  | 
| 
1534.7.165
by Aaron Bentley
 Switched to build_tree instead of revert  | 
105  | 
from bzrlib.transform import build_tree  | 
| 
1534.4.28
by Robert Collins
 first cut at merge from integration.  | 
106  | 
from bzrlib.transport import get_transport  | 
| 
1534.4.42
by Robert Collins
 add working tree to the BzrDir facilities.  | 
107  | 
from bzrlib.transport.local import LocalTransport  | 
| 
1852.3.1
by Robert Collins
 Trivial cleanups to workingtree.py  | 
108  | 
from bzrlib.textui import show_status  | 
| 
1534.9.10
by Aaron Bentley
 Fixed use of ui_factory (which can't be imported directly)  | 
109  | 
import bzrlib.ui  | 
| 
1497
by Robert Collins
 Move Branch.read_working_inventory to WorkingTree.  | 
110  | 
import bzrlib.xml5  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
111  | 
|
| 
1685.1.30
by John Arbash Meinel
 PEP8 for workingtree.py  | 
112  | 
|
| 
1864.4.1
by John Arbash Meinel
 Fix bug #43801 by squashing file ids a little bit more.  | 
113  | 
# the regex removes any weird characters; we don't escape them 
 | 
114  | 
# but rather just pull them out
 | 
|
115  | 
_gen_file_id_re = re.compile(r'[^\w.]')  | 
|
| 
1713.1.6
by Robert Collins
 Move file id random data selection out of the inner loop for 'bzr add'.  | 
116  | 
_gen_id_suffix = None  | 
117  | 
_gen_id_serial = 0  | 
|
118  | 
||
119  | 
||
120  | 
def _next_id_suffix():  | 
|
121  | 
"""Create a new file id suffix that is reasonably unique.  | 
|
122  | 
    
 | 
|
123  | 
    On the first call we combine the current time with 64 bits of randomness
 | 
|
124  | 
    to give a highly probably globally unique number. Then each call in the same
 | 
|
125  | 
    process adds 1 to a serial number we append to that unique value.
 | 
|
126  | 
    """
 | 
|
| 
1713.1.7
by Robert Collins
 Review comments for gen_file_id changes.  | 
127  | 
    # XXX TODO: change bzrlib.add.smart_add to call workingtree.add() rather 
 | 
128  | 
    # than having to move the id randomness out of the inner loop like this.
 | 
|
129  | 
    # XXX TODO: for the global randomness this uses we should add the thread-id
 | 
|
130  | 
    # before the serial #.
 | 
|
| 
1713.1.6
by Robert Collins
 Move file id random data selection out of the inner loop for 'bzr add'.  | 
131  | 
global _gen_id_suffix, _gen_id_serial  | 
132  | 
if _gen_id_suffix is None:  | 
|
| 
1713.1.7
by Robert Collins
 Review comments for gen_file_id changes.  | 
133  | 
_gen_id_suffix = "-%s-%s-" % (compact_date(time()), rand_chars(16))  | 
| 
1713.1.6
by Robert Collins
 Move file id random data selection out of the inner loop for 'bzr add'.  | 
134  | 
_gen_id_serial += 1  | 
135  | 
return _gen_id_suffix + str(_gen_id_serial)  | 
|
| 
1185.85.34
by John Arbash Meinel
 Updating 'bzr file-id' exposed that we weren't allowing unicode file ids. Enabling them reveals a lot more bugs.  | 
136  | 
|
| 
1713.1.6
by Robert Collins
 Move file id random data selection out of the inner loop for 'bzr add'.  | 
137  | 
|
| 
1508.1.5
by Robert Collins
 Move add from Branch to WorkingTree.  | 
138  | 
def gen_file_id(name):  | 
| 
1713.1.6
by Robert Collins
 Move file id random data selection out of the inner loop for 'bzr add'.  | 
139  | 
"""Return new file id for the basename 'name'.  | 
| 
1508.1.5
by Robert Collins
 Move add from Branch to WorkingTree.  | 
140  | 
|
| 
1713.1.6
by Robert Collins
 Move file id random data selection out of the inner loop for 'bzr add'.  | 
141  | 
    The uniqueness is supplied from _next_id_suffix.
 | 
| 
1185.85.34
by John Arbash Meinel
 Updating 'bzr file-id' exposed that we weren't allowing unicode file ids. Enabling them reveals a lot more bugs.  | 
142  | 
    """
 | 
| 
1864.4.1
by John Arbash Meinel
 Fix bug #43801 by squashing file ids a little bit more.  | 
143  | 
    # The real randomness is in the _next_id_suffix, the
 | 
144  | 
    # rest of the identifier is just to be nice.
 | 
|
145  | 
    # So we:
 | 
|
146  | 
    # 1) Remove non-ascii word characters to keep the ids portable
 | 
|
147  | 
    # 2) squash to lowercase, so the file id doesn't have to
 | 
|
148  | 
    #    be escaped (case insensitive filesystems would bork for ids
 | 
|
149  | 
    #    that only differred in case without escaping).
 | 
|
150  | 
    # 3) truncate the filename to 20 chars. Long filenames also bork on some
 | 
|
151  | 
    #    filesystems
 | 
|
152  | 
    # 4) Removing starting '.' characters to prevent the file ids from
 | 
|
153  | 
    #    being considered hidden.
 | 
|
154  | 
ascii_word_only = _gen_file_id_re.sub('', name.lower())  | 
|
155  | 
short_no_dots = ascii_word_only.lstrip('.')[:20]  | 
|
156  | 
return short_no_dots + _next_id_suffix()  | 
|
| 
1508.1.5
by Robert Collins
 Move add from Branch to WorkingTree.  | 
157  | 
|
158  | 
||
159  | 
def gen_root_id():  | 
|
160  | 
"""Return a new tree-root file id."""  | 
|
161  | 
return gen_file_id('TREE_ROOT')  | 
|
162  | 
||
163  | 
||
| 
1399.1.2
by Robert Collins
 push kind character creation into InventoryEntry and TreeEntry  | 
164  | 
class TreeEntry(object):  | 
| 
1759.2.1
by Jelmer Vernooij
 Fix some types (found using aspell).  | 
165  | 
"""An entry that implements the minimum interface used by commands.  | 
| 
1399.1.2
by Robert Collins
 push kind character creation into InventoryEntry and TreeEntry  | 
166  | 
|
167  | 
    This needs further inspection, it may be better to have 
 | 
|
168  | 
    InventoryEntries without ids - though that seems wrong. For now,
 | 
|
169  | 
    this is a parallel hierarchy to InventoryEntry, and needs to become
 | 
|
170  | 
    one of several things: decorates to that hierarchy, children of, or
 | 
|
171  | 
    parents of it.
 | 
|
| 
1399.1.3
by Robert Collins
 move change detection for text and metadata from delta to entry.detect_changes  | 
172  | 
    Another note is that these objects are currently only used when there is
 | 
173  | 
    no InventoryEntry available - i.e. for unversioned objects.
 | 
|
174  | 
    Perhaps they should be UnversionedEntry et al. ? - RBC 20051003
 | 
|
| 
1399.1.2
by Robert Collins
 push kind character creation into InventoryEntry and TreeEntry  | 
175  | 
    """
 | 
176  | 
||
177  | 
def __eq__(self, other):  | 
|
178  | 
        # yes, this us ugly, TODO: best practice __eq__ style.
 | 
|
179  | 
return (isinstance(other, TreeEntry)  | 
|
180  | 
and other.__class__ == self.__class__)  | 
|
181  | 
||
182  | 
def kind_character(self):  | 
|
183  | 
return "???"  | 
|
184  | 
||
185  | 
||
186  | 
class TreeDirectory(TreeEntry):  | 
|
187  | 
"""See TreeEntry. This is a directory in a working tree."""  | 
|
188  | 
||
189  | 
def __eq__(self, other):  | 
|
190  | 
return (isinstance(other, TreeDirectory)  | 
|
191  | 
and other.__class__ == self.__class__)  | 
|
192  | 
||
193  | 
def kind_character(self):  | 
|
194  | 
return "/"  | 
|
195  | 
||
196  | 
||
197  | 
class TreeFile(TreeEntry):  | 
|
198  | 
"""See TreeEntry. This is a regular file in a working tree."""  | 
|
199  | 
||
200  | 
def __eq__(self, other):  | 
|
201  | 
return (isinstance(other, TreeFile)  | 
|
202  | 
and other.__class__ == self.__class__)  | 
|
203  | 
||
204  | 
def kind_character(self):  | 
|
205  | 
return ''  | 
|
206  | 
||
207  | 
||
208  | 
class TreeLink(TreeEntry):  | 
|
209  | 
"""See TreeEntry. This is a symlink in a working tree."""  | 
|
210  | 
||
211  | 
def __eq__(self, other):  | 
|
212  | 
return (isinstance(other, TreeLink)  | 
|
213  | 
and other.__class__ == self.__class__)  | 
|
214  | 
||
215  | 
def kind_character(self):  | 
|
216  | 
return ''  | 
|
217  | 
||
218  | 
||
| 
1986.1.2
by Robert Collins
 Various changes to allow non-workingtree specific tests to run entirely  | 
219  | 
class WorkingTree(bzrlib.mutabletree.MutableTree):  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
220  | 
"""Working copy tree.  | 
221  | 
||
222  | 
    The inventory is held in the `Branch` working-inventory, and the
 | 
|
223  | 
    files are in a directory on disk.
 | 
|
224  | 
||
225  | 
    It is possible for a `WorkingTree` to have a filename which is
 | 
|
226  | 
    not listed in the Inventory and vice versa.
 | 
|
227  | 
    """
 | 
|
| 
1442.1.65
by Robert Collins
 Branch.remove has been moved to WorkingTree.  | 
228  | 
|
| 
1534.4.51
by Robert Collins
 Test the disk layout of format3 working trees.  | 
229  | 
def __init__(self, basedir='.',  | 
| 
1508.1.19
by Robert Collins
 Give format3 working trees their own last-revision marker.  | 
230  | 
branch=DEPRECATED_PARAMETER,  | 
| 
1534.4.51
by Robert Collins
 Test the disk layout of format3 working trees.  | 
231  | 
_inventory=None,  | 
232  | 
_control_files=None,  | 
|
233  | 
_internal=False,  | 
|
234  | 
_format=None,  | 
|
235  | 
_bzrdir=None):  | 
|
| 
1457.1.1
by Robert Collins
 rather than getting the branch inventory, WorkingTree can use the whole Branch, or make its own.  | 
236  | 
"""Construct a WorkingTree for basedir.  | 
237  | 
||
238  | 
        If the branch is not supplied, it is opened automatically.
 | 
|
239  | 
        If the branch is supplied, it must be the branch for this basedir.
 | 
|
240  | 
        (branch.base is not cross checked, because for remote branches that
 | 
|
241  | 
        would be meaningless).
 | 
|
242  | 
        """
 | 
|
| 
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.  | 
243  | 
self._format = _format  | 
| 
1534.4.51
by Robert Collins
 Test the disk layout of format3 working trees.  | 
244  | 
self.bzrdir = _bzrdir  | 
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
245  | 
if not _internal:  | 
| 
1508.1.19
by Robert Collins
 Give format3 working trees their own last-revision marker.  | 
246  | 
            # not created via open etc.
 | 
| 
1773.4.1
by Martin Pool
 Add pyflakes makefile target; fix many warnings  | 
247  | 
warnings.warn("WorkingTree() is deprecated as of bzr version 0.8. "  | 
| 
1508.1.19
by Robert Collins
 Give format3 working trees their own last-revision marker.  | 
248  | 
"Please use bzrdir.open_workingtree or WorkingTree.open().",  | 
249  | 
DeprecationWarning,  | 
|
250  | 
stacklevel=2)  | 
|
| 
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.  | 
251  | 
wt = WorkingTree.open(basedir)  | 
| 
1681.1.1
by Robert Collins
 Make WorkingTree.branch a read only property. (Robert Collins)  | 
252  | 
self._branch = wt.branch  | 
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
253  | 
self.basedir = wt.basedir  | 
254  | 
self._control_files = wt._control_files  | 
|
255  | 
self._hashcache = wt._hashcache  | 
|
256  | 
self._set_inventory(wt._inventory)  | 
|
| 
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.  | 
257  | 
self._format = wt._format  | 
| 
1534.4.51
by Robert Collins
 Test the disk layout of format3 working trees.  | 
258  | 
self.bzrdir = wt.bzrdir  | 
| 
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.  | 
259  | 
from bzrlib.hashcache import HashCache  | 
260  | 
from bzrlib.trace import note, mutter  | 
|
| 
1185.16.72
by Martin Pool
 [merge] from robert and fix up tests  | 
261  | 
assert isinstance(basedir, basestring), \  | 
262  | 
"base directory %r is not a string" % basedir  | 
|
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
263  | 
basedir = safe_unicode(basedir)  | 
| 
1534.5.3
by Robert Collins
 Make format 4/5/6 branches share a single LockableFiles instance across wt/branch/repository.  | 
264  | 
mutter("opening working tree %r", basedir)  | 
| 
1508.1.19
by Robert Collins
 Give format3 working trees their own last-revision marker.  | 
265  | 
if deprecated_passed(branch):  | 
266  | 
if not _internal:  | 
|
| 
1773.4.1
by Martin Pool
 Add pyflakes makefile target; fix many warnings  | 
267  | 
warnings.warn("WorkingTree(..., branch=XXX) is deprecated as of bzr 0.8."  | 
| 
1534.10.8
by Aaron Bentley
 Implemented conflict_lines in terms of old system on WorkingTree  | 
268  | 
                     " Please use bzrdir.open_workingtree() or"
 | 
269  | 
" WorkingTree.open().",  | 
|
| 
1508.1.19
by Robert Collins
 Give format3 working trees their own last-revision marker.  | 
270  | 
DeprecationWarning,  | 
271  | 
stacklevel=2  | 
|
272  | 
                     )
 | 
|
| 
1681.1.1
by Robert Collins
 Make WorkingTree.branch a read only property. (Robert Collins)  | 
273  | 
self._branch = branch  | 
| 
1508.1.19
by Robert Collins
 Give format3 working trees their own last-revision marker.  | 
274  | 
else:  | 
| 
1681.1.1
by Robert Collins
 Make WorkingTree.branch a read only property. (Robert Collins)  | 
275  | 
self._branch = self.bzrdir.open_branch()  | 
| 
1508.1.10
by Robert Collins
 bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)  | 
276  | 
self.basedir = realpath(basedir)  | 
| 
1534.4.28
by Robert Collins
 first cut at merge from integration.  | 
277  | 
        # if branch is at our basedir and is a format 6 or less
 | 
| 
1534.4.51
by Robert Collins
 Test the disk layout of format3 working trees.  | 
278  | 
if isinstance(self._format, WorkingTreeFormat2):  | 
279  | 
            # share control object
 | 
|
| 
1534.4.28
by Robert Collins
 first cut at merge from integration.  | 
280  | 
self._control_files = self.branch.control_files  | 
281  | 
else:  | 
|
| 
1852.3.1
by Robert Collins
 Trivial cleanups to workingtree.py  | 
282  | 
            # assume all other formats have their own control files.
 | 
| 
1553.5.74
by Martin Pool
 Convert WorkingTree format3 to use LockDirs  | 
283  | 
assert isinstance(_control_files, LockableFiles), \  | 
284  | 
"_control_files must be a LockableFiles, not %r" \  | 
|
285  | 
% _control_files  | 
|
286  | 
self._control_files = _control_files  | 
|
| 
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.  | 
287  | 
        # update the whole cache up front and write to disk if anything changed;
 | 
288  | 
        # in the future we might want to do this more selectively
 | 
|
| 
1467
by Robert Collins
 WorkingTree.__del__ has been removed.  | 
289  | 
        # two possible ways offer themselves : in self._unlock, write the cache
 | 
290  | 
        # if needed, or, when the cache sees a change, append it to the hash
 | 
|
291  | 
        # cache file, and have the parser take the most recent entry for a
 | 
|
292  | 
        # given path only.
 | 
|
| 
1685.1.9
by John Arbash Meinel
 Updated LocalTransport so that it's base is now a URL rather than a local path. This helps consistency with all other functions. To do so, I added local_abspath() which returns the local path, and local_path_to/from_url  | 
293  | 
cache_filename = self.bzrdir.get_workingtree_transport(None).local_abspath('stat-cache')  | 
| 
1534.4.51
by Robert Collins
 Test the disk layout of format3 working trees.  | 
294  | 
hc = self._hashcache = HashCache(basedir, cache_filename, self._control_files._file_mode)  | 
| 
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.  | 
295  | 
hc.read()  | 
| 
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.  | 
296  | 
        # is this scan needed ? it makes things kinda slow.
 | 
| 
1732.1.20
by John Arbash Meinel
 hash cache pre-scan cost us ~500ms on a kernel sized tree  | 
297  | 
        #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.  | 
298  | 
|
299  | 
if hc.needs_write:  | 
|
300  | 
mutter("write hc")  | 
|
301  | 
hc.write()  | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
302  | 
|
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
303  | 
if _inventory is None:  | 
304  | 
self._set_inventory(self.read_working_inventory())  | 
|
305  | 
else:  | 
|
306  | 
self._set_inventory(_inventory)  | 
|
| 
1185.60.6
by Aaron Bentley
 Fixed hashcache  | 
307  | 
|
| 
1681.1.1
by Robert Collins
 Make WorkingTree.branch a read only property. (Robert Collins)  | 
308  | 
branch = property(  | 
309  | 
fget=lambda self: self._branch,  | 
|
310  | 
doc="""The branch this WorkingTree is connected to.  | 
|
311  | 
||
312  | 
            This cannot be set - it is reflective of the actual disk structure
 | 
|
313  | 
            the working tree has been constructed from.
 | 
|
314  | 
""")  | 
|
315  | 
||
| 
1687.1.9
by Robert Collins
 Teach WorkingTree about break-lock.  | 
316  | 
def break_lock(self):  | 
317  | 
"""Break a lock if one is present from another instance.  | 
|
318  | 
||
319  | 
        Uses the ui factory to ask for confirmation if the lock may be from
 | 
|
320  | 
        an active process.
 | 
|
321  | 
||
322  | 
        This will probe the repository for its lock as well.
 | 
|
323  | 
        """
 | 
|
324  | 
self._control_files.break_lock()  | 
|
325  | 
self.branch.break_lock()  | 
|
326  | 
||
| 
1508.1.10
by Robert Collins
 bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)  | 
327  | 
def _set_inventory(self, inv):  | 
| 
1910.2.6
by Aaron Bentley
 Update for merge review, handle deprecations  | 
328  | 
assert inv.root is not None  | 
| 
1508.1.10
by Robert Collins
 bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)  | 
329  | 
self._inventory = inv  | 
| 
1534.5.5
by Robert Collins
 Move is_control_file into WorkingTree.is_control_filename and test.  | 
330  | 
|
| 
1508.1.1
by Robert Collins
 Provide a open_containing for WorkingTree.  | 
331  | 
    @staticmethod
 | 
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
332  | 
def open(path=None, _unsupported=False):  | 
333  | 
"""Open an existing working tree at path.  | 
|
334  | 
||
335  | 
        """
 | 
|
336  | 
if path is None:  | 
|
337  | 
path = os.path.getcwdu()  | 
|
338  | 
control = bzrdir.BzrDir.open(path, _unsupported)  | 
|
339  | 
return control.open_workingtree(_unsupported)  | 
|
340  | 
||
341  | 
    @staticmethod
 | 
|
| 
1508.1.1
by Robert Collins
 Provide a open_containing for WorkingTree.  | 
342  | 
def open_containing(path=None):  | 
343  | 
"""Open an existing working tree which has its root about path.  | 
|
344  | 
        
 | 
|
345  | 
        This probes for a working tree at path and searches upwards from there.
 | 
|
346  | 
||
347  | 
        Basically we keep looking up until we find the control directory or
 | 
|
348  | 
        run into /.  If there isn't one, raises NotBranchError.
 | 
|
349  | 
        TODO: give this a new exception.
 | 
|
350  | 
        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  | 
351  | 
|
352  | 
        :return: The WorkingTree that contains 'path', and the rest of path
 | 
|
| 
1508.1.1
by Robert Collins
 Provide a open_containing for WorkingTree.  | 
353  | 
        """
 | 
354  | 
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  | 
355  | 
path = osutils.getcwd()  | 
| 
1685.1.28
by John Arbash Meinel
 Changing open_containing to always return a unicode path.  | 
356  | 
control, relpath = bzrdir.BzrDir.open_containing(path)  | 
| 
1685.1.27
by John Arbash Meinel
 BzrDir works in URLs, but WorkingTree works in unicode paths  | 
357  | 
|
| 
1685.1.28
by John Arbash Meinel
 Changing open_containing to always return a unicode path.  | 
358  | 
return control.open_workingtree(), relpath  | 
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
359  | 
|
360  | 
    @staticmethod
 | 
|
361  | 
def open_downlevel(path=None):  | 
|
362  | 
"""Open an unsupported working tree.  | 
|
363  | 
||
364  | 
        Only intended for advanced situations like upgrading part of a bzrdir.
 | 
|
365  | 
        """
 | 
|
366  | 
return WorkingTree.open(path, _unsupported=True)  | 
|
| 
1508.1.1
by Robert Collins
 Provide a open_containing for WorkingTree.  | 
367  | 
|
| 
462
by Martin Pool
 - New form 'file_id in tree' to check if the file is present  | 
368  | 
def __iter__(self):  | 
369  | 
"""Iterate through file_ids for this tree.  | 
|
370  | 
||
371  | 
        file_ids are in a WorkingTree if they are in the working inventory
 | 
|
372  | 
        and the working file exists.
 | 
|
373  | 
        """
 | 
|
374  | 
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.  | 
375  | 
for path, ie in inv.iter_entries():  | 
| 
1836.1.22
by John Arbash Meinel
 [merge] bzr.dev 1861  | 
376  | 
if 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.  | 
377  | 
yield ie.file_id  | 
| 
462
by Martin Pool
 - New form 'file_id in tree' to check if the file is present  | 
378  | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
379  | 
def __repr__(self):  | 
380  | 
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  | 
381  | 
getattr(self, 'basedir', None))  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
382  | 
|
383  | 
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 \  | 
384  | 
return pathjoin(self.basedir, filename)  | 
| 
1534.4.35
by Robert Collins
 Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()  | 
385  | 
|
386  | 
def basis_tree(self):  | 
|
| 
1927.2.3
by Robert Collins
 review comment application - paired with Martin.  | 
387  | 
"""Return RevisionTree for the current last revision.  | 
388  | 
        
 | 
|
389  | 
        If the left most parent is a ghost then the returned tree will be an
 | 
|
390  | 
        empty tree - one obtained by calling repository.revision_tree(None).
 | 
|
391  | 
        """
 | 
|
| 
1908.7.6
by Robert Collins
 Deprecate WorkingTree.last_revision.  | 
392  | 
try:  | 
393  | 
revision_id = self.get_parent_ids()[0]  | 
|
394  | 
except IndexError:  | 
|
395  | 
            # no parents, return an empty revision tree.
 | 
|
396  | 
            # in the future this should return the tree for
 | 
|
397  | 
            # 'empty:' - the implicit root empty tree.
 | 
|
398  | 
return self.branch.repository.revision_tree(None)  | 
|
399  | 
else:  | 
|
| 
1534.4.35
by Robert Collins
 Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()  | 
400  | 
try:  | 
| 
1638.1.2
by Robert Collins
 Change the basis-inventory file to not have the revision-id in the file name.  | 
401  | 
xml = self.read_basis_inventory()  | 
| 
1910.2.31
by Aaron Bentley
 Fix bugs in basis inventory handling, change filename  | 
402  | 
inv = bzrlib.xml6.serializer_v6.read_inventory_from_string(xml)  | 
403  | 
if inv is not None and inv.revision_id == revision_id:  | 
|
404  | 
return bzrlib.tree.RevisionTree(self.branch.repository,  | 
|
405  | 
inv, revision_id)  | 
|
406  | 
except (NoSuchFile, errors.BadInventoryFormat):  | 
|
407  | 
                pass
 | 
|
| 
1908.7.6
by Robert Collins
 Deprecate WorkingTree.last_revision.  | 
408  | 
        # No cached copy available, retrieve from the repository.
 | 
409  | 
        # FIXME? RBC 20060403 should we cache the inventory locally
 | 
|
410  | 
        # 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.  | 
411  | 
try:  | 
412  | 
return self.branch.repository.revision_tree(revision_id)  | 
|
413  | 
except errors.RevisionNotPresent:  | 
|
414  | 
            # the basis tree *may* be a ghost or a low level error may have
 | 
|
415  | 
            # occured. If the revision is present, its a problem, if its not
 | 
|
416  | 
            # its a ghost.
 | 
|
417  | 
if self.branch.repository.has_revision(revision_id):  | 
|
418  | 
                raise
 | 
|
| 
1927.2.3
by Robert Collins
 review comment application - paired with Martin.  | 
419  | 
            # the basis tree is a ghost so return an empty tree.
 | 
| 
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.  | 
420  | 
return self.branch.repository.revision_tree(None)  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
421  | 
|
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
422  | 
    @staticmethod
 | 
| 
1534.4.47
by Robert Collins
 Split out repository into .bzr/repository  | 
423  | 
@deprecated_method(zero_eight)  | 
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
424  | 
def create(branch, directory):  | 
425  | 
"""Create a workingtree for branch at directory.  | 
|
426  | 
||
427  | 
        If existing_directory already exists it must have a .bzr directory.
 | 
|
428  | 
        If it does not exist, it will be created.
 | 
|
429  | 
||
430  | 
        This returns a new WorkingTree object for the new checkout.
 | 
|
431  | 
||
432  | 
        TODO FIXME RBC 20060124 when we have checkout formats in place this
 | 
|
433  | 
        should accept an optional revisionid to checkout [and reject this if
 | 
|
434  | 
        checking out into the same dir as a pre-checkout-aware branch format.]
 | 
|
| 
1551.1.2
by Martin Pool
 Deprecation warnings for popular APIs that will change in BzrDir  | 
435  | 
|
436  | 
        XXX: When BzrDir is present, these should be created through that 
 | 
|
437  | 
        interface instead.
 | 
|
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
438  | 
        """
 | 
| 
1773.4.1
by Martin Pool
 Add pyflakes makefile target; fix many warnings  | 
439  | 
warnings.warn('delete WorkingTree.create', stacklevel=3)  | 
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
440  | 
transport = get_transport(directory)  | 
| 
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.  | 
441  | 
if branch.bzrdir.root_transport.base == transport.base:  | 
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
442  | 
            # same dir 
 | 
443  | 
return branch.bzrdir.create_workingtree()  | 
|
444  | 
        # different directory, 
 | 
|
445  | 
        # create a branch reference
 | 
|
446  | 
        # and now a working tree.
 | 
|
447  | 
raise NotImplementedError  | 
|
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
448  | 
|
449  | 
    @staticmethod
 | 
|
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
450  | 
@deprecated_method(zero_eight)  | 
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
451  | 
def create_standalone(directory):  | 
| 
1534.4.41
by Robert Collins
 Branch now uses BzrDir reasonably sanely.  | 
452  | 
"""Create a checkout and a branch and a repo at directory.  | 
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
453  | 
|
454  | 
        Directory must exist and be empty.
 | 
|
| 
1551.1.2
by Martin Pool
 Deprecation warnings for popular APIs that will change in BzrDir  | 
455  | 
|
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
456  | 
        please use BzrDir.create_standalone_workingtree
 | 
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
457  | 
        """
 | 
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
458  | 
return bzrdir.BzrDir.create_standalone_workingtree(directory)  | 
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
459  | 
|
| 
1713.1.9
by Robert Collins
 Paired performance tuning of bzr add. (Robert Collins, Martin Pool).  | 
460  | 
def relpath(self, path):  | 
461  | 
"""Return the local path portion from a given path.  | 
|
462  | 
        
 | 
|
463  | 
        The path may be absolute or relative. If its a relative path it is 
 | 
|
464  | 
        interpreted relative to the python current working directory.
 | 
|
465  | 
        """
 | 
|
466  | 
return relpath(self.basedir, path)  | 
|
| 
1457.1.3
by Robert Collins
 make Branch.relpath delegate to the working tree.  | 
467  | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
468  | 
def has_filename(self, filename):  | 
| 
1836.1.22
by John Arbash Meinel
 [merge] bzr.dev 1861  | 
469  | 
return osutils.lexists(self.abspath(filename))  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
470  | 
|
471  | 
def get_file(self, file_id):  | 
|
472  | 
return self.get_file_byname(self.id2path(file_id))  | 
|
473  | 
||
| 
1852.6.9
by Robert Collins
 Add more test trees to the tree-implementations tests.  | 
474  | 
def get_file_text(self, file_id):  | 
475  | 
return self.get_file(file_id).read()  | 
|
476  | 
||
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
477  | 
def get_file_byname(self, filename):  | 
478  | 
return file(self.abspath(filename), 'rb')  | 
|
479  | 
||
| 
1773.2.1
by Robert Collins
 Teach all trees about unknowns, conflicts and get_parent_ids.  | 
480  | 
def get_parent_ids(self):  | 
481  | 
"""See Tree.get_parent_ids.  | 
|
482  | 
        
 | 
|
483  | 
        This implementation reads the pending merges list and last_revision
 | 
|
484  | 
        value and uses that to decide what the parents list should be.
 | 
|
485  | 
        """
 | 
|
| 
1908.7.6
by Robert Collins
 Deprecate WorkingTree.last_revision.  | 
486  | 
last_rev = self._last_revision()  | 
| 
1773.2.1
by Robert Collins
 Teach all trees about unknowns, conflicts and get_parent_ids.  | 
487  | 
if last_rev is None:  | 
488  | 
parents = []  | 
|
489  | 
else:  | 
|
490  | 
parents = [last_rev]  | 
|
| 
1908.6.10
by Robert Collins
 forward to get_parent_ids in pending_merges.  | 
491  | 
try:  | 
492  | 
merges_file = self._control_files.get_utf8('pending-merges')  | 
|
493  | 
except NoSuchFile:  | 
|
494  | 
            pass
 | 
|
495  | 
else:  | 
|
496  | 
for l in merges_file.readlines():  | 
|
497  | 
parents.append(l.rstrip('\n'))  | 
|
498  | 
return parents  | 
|
| 
1773.2.1
by Robert Collins
 Teach all trees about unknowns, conflicts and get_parent_ids.  | 
499  | 
|
| 
1497
by Robert Collins
 Move Branch.read_working_inventory to WorkingTree.  | 
500  | 
def get_root_id(self):  | 
501  | 
"""Return the id of this trees root"""  | 
|
502  | 
inv = self.read_working_inventory()  | 
|
503  | 
return inv.root.file_id  | 
|
504  | 
||
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
505  | 
def _get_store_filename(self, file_id):  | 
| 
1508.1.1
by Robert Collins
 Provide a open_containing for WorkingTree.  | 
506  | 
        ## XXX: badly named; this is not in the store at all
 | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
507  | 
return self.abspath(self.id2path(file_id))  | 
508  | 
||
| 
1534.4.35
by Robert Collins
 Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()  | 
509  | 
    @needs_read_lock
 | 
| 
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.  | 
510  | 
def clone(self, to_bzrdir, revision_id=None, basis=None):  | 
511  | 
"""Duplicate this working tree into to_bzr, including all state.  | 
|
| 
1534.4.35
by Robert Collins
 Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()  | 
512  | 
        
 | 
| 
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.  | 
513  | 
        Specifically modified files are kept as modified, but
 | 
514  | 
        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()  | 
515  | 
|
| 
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.  | 
516  | 
        If you want to make a new line of development, see bzrdir.sprout()
 | 
| 
1534.4.35
by Robert Collins
 Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()  | 
517  | 
|
518  | 
        revision
 | 
|
519  | 
            If not None, the cloned tree will have its last revision set to 
 | 
|
| 
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.  | 
520  | 
            revision, and and difference between the source trees last revision
 | 
521  | 
            and this one merged in.
 | 
|
522  | 
||
523  | 
        basis
 | 
|
524  | 
            If not None, a closer copy of a tree which may have some files in
 | 
|
525  | 
            common, and which file content should be preferentially copied from.
 | 
|
| 
1534.4.35
by Robert Collins
 Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()  | 
526  | 
        """
 | 
| 
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.  | 
527  | 
        # assumes the target bzr dir format is compatible.
 | 
528  | 
result = self._format.initialize(to_bzrdir)  | 
|
529  | 
self.copy_content_into(result, revision_id)  | 
|
530  | 
return result  | 
|
531  | 
||
532  | 
    @needs_read_lock
 | 
|
533  | 
def copy_content_into(self, tree, revision_id=None):  | 
|
534  | 
"""Copy the current content and user files of this tree into tree."""  | 
|
535  | 
if revision_id is None:  | 
|
536  | 
transform_tree(tree, self)  | 
|
537  | 
else:  | 
|
| 
1908.6.1
by Robert Collins
 Change all callers of set_last_revision to use set_parent_trees.  | 
538  | 
            # TODO now merge from tree.last_revision to revision (to preserve
 | 
539  | 
            # user local changes)
 | 
|
| 
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.  | 
540  | 
transform_tree(tree, self)  | 
| 
1908.6.3
by Robert Collins
 Tidy up the last_revision_id and add_pending_merge conversion to use cleaner apis.  | 
541  | 
tree.set_parent_ids([revision_id])  | 
| 
1534.4.35
by Robert Collins
 Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()  | 
542  | 
|
| 
1248
by Martin Pool
 - new weave based cleanup [broken]  | 
543  | 
def id2abspath(self, file_id):  | 
544  | 
return self.abspath(self.id2path(file_id))  | 
|
545  | 
||
| 
1185.12.39
by abentley
 Propogated has_or_had_id to Tree  | 
546  | 
def has_id(self, file_id):  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
547  | 
        # files that have been deleted are excluded
 | 
| 
1185.12.39
by abentley
 Propogated has_or_had_id to Tree  | 
548  | 
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.  | 
549  | 
if not inv.has_id(file_id):  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
550  | 
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.  | 
551  | 
path = inv.id2path(file_id)  | 
| 
1836.1.22
by John Arbash Meinel
 [merge] bzr.dev 1861  | 
552  | 
return osutils.lexists(self.abspath(path))  | 
| 
462
by Martin Pool
 - New form 'file_id in tree' to check if the file is present  | 
553  | 
|
| 
1185.12.39
by abentley
 Propogated has_or_had_id to Tree  | 
554  | 
def has_or_had_id(self, file_id):  | 
555  | 
if file_id == self.inventory.root.file_id:  | 
|
556  | 
return True  | 
|
557  | 
return self.inventory.has_id(file_id)  | 
|
| 
462
by Martin Pool
 - New form 'file_id in tree' to check if the file is present  | 
558  | 
|
559  | 
__contains__ = has_id  | 
|
560  | 
||
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
561  | 
def get_file_size(self, file_id):  | 
| 
1248
by Martin Pool
 - new weave based cleanup [broken]  | 
562  | 
return os.path.getsize(self.id2abspath(file_id))  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
563  | 
|
| 
1185.60.6
by Aaron Bentley
 Fixed hashcache  | 
564  | 
    @needs_read_lock
 | 
| 
1732.1.19
by John Arbash Meinel
 If you have the path, use it rather than looking it up again  | 
565  | 
def get_file_sha1(self, file_id, path=None):  | 
566  | 
if not path:  | 
|
567  | 
path = self._inventory.id2path(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.  | 
568  | 
return self._hashcache.get_sha1(path)  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
569  | 
|
| 
1740.2.5
by Aaron Bentley
 Merge from bzr.dev  | 
570  | 
def get_file_mtime(self, file_id, path=None):  | 
571  | 
if not path:  | 
|
572  | 
path = self._inventory.id2path(file_id)  | 
|
573  | 
return os.lstat(self.abspath(path)).st_mtime  | 
|
574  | 
||
| 
1732.1.19
by John Arbash Meinel
 If you have the path, use it rather than looking it up again  | 
575  | 
if not supports_executable():  | 
576  | 
def is_executable(self, file_id, path=None):  | 
|
| 
1398
by Robert Collins
 integrate in Gustavos x-bit patch  | 
577  | 
return self._inventory[file_id].executable  | 
| 
1732.1.19
by John Arbash Meinel
 If you have the path, use it rather than looking it up again  | 
578  | 
else:  | 
579  | 
def is_executable(self, file_id, path=None):  | 
|
580  | 
if not path:  | 
|
581  | 
path = self._inventory.id2path(file_id)  | 
|
| 
1398
by Robert Collins
 integrate in Gustavos x-bit patch  | 
582  | 
mode = os.lstat(self.abspath(path)).st_mode  | 
| 
1733.1.4
by Robert Collins
 Cosmetic niceties for debugging, extra comments etc.  | 
583  | 
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)  | 
| 
1398
by Robert Collins
 integrate in Gustavos x-bit patch  | 
584  | 
|
| 
1457.1.16
by Robert Collins
 Move set_pending_merges to WorkingTree.  | 
585  | 
    @needs_write_lock
 | 
| 
1986.1.2
by Robert Collins
 Various changes to allow non-workingtree specific tests to run entirely  | 
586  | 
def _add(self, files, ids, kinds):  | 
587  | 
"""See MutableTree._add."""  | 
|
| 
1508.1.5
by Robert Collins
 Move add from Branch to WorkingTree.  | 
588  | 
        # TODO: Re-adding a file that is removed in the working copy
 | 
589  | 
        # should probably put it back with the previous ID.
 | 
|
| 
1986.1.2
by Robert Collins
 Various changes to allow non-workingtree specific tests to run entirely  | 
590  | 
        # the read and write working inventory should not occur in this 
 | 
591  | 
        # function - they should be part of lock_write and unlock.
 | 
|
| 
1508.1.5
by Robert Collins
 Move add from Branch to WorkingTree.  | 
592  | 
inv = self.read_working_inventory()  | 
| 
1986.1.2
by Robert Collins
 Various changes to allow non-workingtree specific tests to run entirely  | 
593  | 
for f, file_id, kind in zip(files, ids, kinds):  | 
594  | 
assert kind is not None  | 
|
| 
1508.1.5
by Robert Collins
 Move add from Branch to WorkingTree.  | 
595  | 
if file_id is None:  | 
| 
1713.1.6
by Robert Collins
 Move file id random data selection out of the inner loop for 'bzr add'.  | 
596  | 
inv.add_path(f, kind=kind)  | 
597  | 
else:  | 
|
598  | 
inv.add_path(f, kind=kind, file_id=file_id)  | 
|
| 
1508.1.5
by Robert Collins
 Move add from Branch to WorkingTree.  | 
599  | 
self._write_inventory(inv)  | 
600  | 
||
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
601  | 
    @needs_tree_write_lock
 | 
| 
1986.1.2
by Robert Collins
 Various changes to allow non-workingtree specific tests to run entirely  | 
602  | 
def _gather_kinds(self, files, kinds):  | 
603  | 
"""See MutableTree._gather_kinds."""  | 
|
604  | 
for pos, f in enumerate(files):  | 
|
605  | 
if kinds[pos] is None:  | 
|
606  | 
fullpath = normpath(self.abspath(f))  | 
|
607  | 
try:  | 
|
608  | 
kinds[pos] = file_kind(fullpath)  | 
|
609  | 
except OSError, e:  | 
|
610  | 
if e.errno == errno.ENOENT:  | 
|
611  | 
raise NoSuchFile(fullpath)  | 
|
612  | 
||
| 
1508.1.5
by Robert Collins
 Move add from Branch to WorkingTree.  | 
613  | 
    @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.  | 
614  | 
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.  | 
615  | 
"""Add revision_id as a parent.  | 
616  | 
||
617  | 
        This is equivalent to retrieving the current list of parent ids
 | 
|
618  | 
        and setting the list to its value plus revision_id.
 | 
|
619  | 
||
620  | 
        :param revision_id: The revision id to add to the parent list. It may
 | 
|
| 
1908.5.12
by Robert Collins
 Apply review feedback - paired with Martin.  | 
621  | 
        be a ghost revision as long as its not the first parent to be added,
 | 
622  | 
        or the allow_leftmost_as_ghost parameter is set True.
 | 
|
623  | 
        :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.  | 
624  | 
        """
 | 
| 
1908.5.13
by Robert Collins
 Adding a parent when the first is a ghost already should not require forcing it.  | 
625  | 
parents = self.get_parent_ids() + [revision_id]  | 
626  | 
self.set_parent_ids(parents,  | 
|
627  | 
allow_leftmost_as_ghost=len(parents) > 1 or allow_leftmost_as_ghost)  | 
|
| 
1908.5.4
by Robert Collins
 Add add_parent_tree_id WorkingTree helper api.  | 
628  | 
|
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
629  | 
    @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.  | 
630  | 
def add_parent_tree(self, parent_tuple, allow_leftmost_as_ghost=False):  | 
| 
1908.5.6
by Robert Collins
 Add add_parent_tree to WorkingTree.  | 
631  | 
"""Add revision_id, tree tuple as a parent.  | 
632  | 
||
633  | 
        This is equivalent to retrieving the current list of parent trees
 | 
|
634  | 
        and setting the list to its value plus parent_tuple. See also
 | 
|
635  | 
        add_parent_tree_id - if you only have a parent id available it will be
 | 
|
636  | 
        simpler to use that api. If you have the parent already available, using
 | 
|
637  | 
        this api is preferred.
 | 
|
638  | 
||
| 
1908.5.12
by Robert Collins
 Apply review feedback - paired with Martin.  | 
639  | 
        :param parent_tuple: The (revision id, tree) to add to the parent list.
 | 
640  | 
            If the revision_id is a ghost, pass None for the tree.
 | 
|
641  | 
        :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.  | 
642  | 
        """
 | 
| 
1979.2.1
by Robert Collins
 (robertc) adds a convenience method "merge_from_branch" to WorkingTree.  | 
643  | 
parent_ids = self.get_parent_ids() + [parent_tuple[0]]  | 
644  | 
if len(parent_ids) > 1:  | 
|
645  | 
            # the leftmost may have already been a ghost, preserve that if it
 | 
|
646  | 
            # was.
 | 
|
647  | 
allow_leftmost_as_ghost = True  | 
|
648  | 
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.  | 
649  | 
allow_leftmost_as_ghost=allow_leftmost_as_ghost)  | 
| 
1908.5.6
by Robert Collins
 Add add_parent_tree to WorkingTree.  | 
650  | 
|
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
651  | 
    @needs_tree_write_lock
 | 
| 
1457.1.15
by Robert Collins
 Move add_pending_merge to WorkingTree.  | 
652  | 
def add_pending_merge(self, *revision_ids):  | 
653  | 
        # TODO: Perhaps should check at this point that the
 | 
|
654  | 
        # 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.  | 
655  | 
parents = self.get_parent_ids()  | 
| 
1457.1.15
by Robert Collins
 Move add_pending_merge to WorkingTree.  | 
656  | 
updated = False  | 
657  | 
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.  | 
658  | 
if rev_id in parents:  | 
659  | 
                continue
 | 
|
660  | 
parents.append(rev_id)  | 
|
| 
1457.1.15
by Robert Collins
 Move add_pending_merge to WorkingTree.  | 
661  | 
updated = True  | 
662  | 
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.  | 
663  | 
self.set_parent_ids(parents, allow_leftmost_as_ghost=True)  | 
| 
1457.1.15
by Robert Collins
 Move add_pending_merge to WorkingTree.  | 
664  | 
|
| 
1908.7.7
by Robert Collins
 Deprecated WorkingTree.pending_merges.  | 
665  | 
@deprecated_method(zero_eleven)  | 
| 
1185.69.2
by John Arbash Meinel
 Changed LockableFiles to take the root directory directly. Moved mode information into LockableFiles instead of Branch  | 
666  | 
    @needs_read_lock
 | 
| 
1457.1.14
by Robert Collins
 Move pending_merges() to WorkingTree.  | 
667  | 
def pending_merges(self):  | 
668  | 
"""Return a list of pending merges.  | 
|
669  | 
||
670  | 
        These are revisions that have been merged into the working
 | 
|
671  | 
        directory but not yet committed.
 | 
|
| 
1908.7.9
by Robert Collins
 WorkingTree.last_revision and WorkingTree.pending_merges are deprecated.  | 
672  | 
|
673  | 
        As of 0.11 this is deprecated. Please see WorkingTree.get_parent_ids()
 | 
|
674  | 
        instead - which is available on all tree objects.
 | 
|
| 
1457.1.14
by Robert Collins
 Move pending_merges() to WorkingTree.  | 
675  | 
        """
 | 
| 
1908.6.10
by Robert Collins
 forward to get_parent_ids in pending_merges.  | 
676  | 
return self.get_parent_ids()[1:]  | 
| 
1457.1.14
by Robert Collins
 Move pending_merges() to WorkingTree.  | 
677  | 
|
| 
2041.1.2
by John Arbash Meinel
 Update WorkingTree.set_parent_trees() to directly cache inv.  | 
678  | 
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):  | 
679  | 
"""Common ghost checking functionality from set_parent_*.  | 
|
680  | 
||
681  | 
        This checks that the left hand-parent exists if there are any
 | 
|
682  | 
        revisions present.
 | 
|
683  | 
        """
 | 
|
684  | 
if len(revision_ids) > 0:  | 
|
685  | 
leftmost_id = revision_ids[0]  | 
|
686  | 
if (not allow_leftmost_as_ghost and not  | 
|
687  | 
self.branch.repository.has_revision(leftmost_id)):  | 
|
688  | 
raise errors.GhostRevisionUnusableHere(leftmost_id)  | 
|
689  | 
||
690  | 
def _set_merges_from_parent_ids(self, parent_ids):  | 
|
691  | 
merges = parent_ids[1:]  | 
|
692  | 
self._control_files.put_utf8('pending-merges', '\n'.join(merges))  | 
|
693  | 
||
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
694  | 
    @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.  | 
695  | 
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):  | 
| 
1908.5.5
by Robert Collins
 Add WorkingTree.set_parent_ids.  | 
696  | 
"""Set the parent ids to revision_ids.  | 
697  | 
        
 | 
|
698  | 
        See also set_parent_trees. This api will try to retrieve the tree data
 | 
|
699  | 
        for each element of revision_ids from the trees repository. If you have
 | 
|
700  | 
        tree data already available, it is more efficient to use
 | 
|
701  | 
        set_parent_trees rather than set_parent_ids. set_parent_ids is however
 | 
|
702  | 
        an easier API to use.
 | 
|
703  | 
||
704  | 
        :param revision_ids: The revision_ids to set as the parent ids of this
 | 
|
705  | 
            working tree. Any of these may be ghosts.
 | 
|
706  | 
        """
 | 
|
| 
2041.1.2
by John Arbash Meinel
 Update WorkingTree.set_parent_trees() to directly cache inv.  | 
707  | 
self._check_parents_for_ghosts(revision_ids,  | 
708  | 
allow_leftmost_as_ghost=allow_leftmost_as_ghost)  | 
|
709  | 
||
| 
1908.6.7
by Robert Collins
 Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.  | 
710  | 
if len(revision_ids) > 0:  | 
| 
2041.1.2
by John Arbash Meinel
 Update WorkingTree.set_parent_trees() to directly cache inv.  | 
711  | 
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.  | 
712  | 
else:  | 
713  | 
self.set_last_revision(None)  | 
|
| 
2041.1.2
by John Arbash Meinel
 Update WorkingTree.set_parent_trees() to directly cache inv.  | 
714  | 
|
715  | 
self._set_merges_from_parent_ids(revision_ids)  | 
|
| 
1908.5.5
by Robert Collins
 Add WorkingTree.set_parent_ids.  | 
716  | 
|
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
717  | 
    @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.  | 
718  | 
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):  | 
| 
1986.1.2
by Robert Collins
 Various changes to allow non-workingtree specific tests to run entirely  | 
719  | 
"""See MutableTree.set_parent_trees."""  | 
| 
2041.1.2
by John Arbash Meinel
 Update WorkingTree.set_parent_trees() to directly cache inv.  | 
720  | 
parent_ids = [rev for (rev, tree) in parents_list]  | 
721  | 
||
722  | 
self._check_parents_for_ghosts(parent_ids,  | 
|
| 
1908.6.7
by Robert Collins
 Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.  | 
723  | 
allow_leftmost_as_ghost=allow_leftmost_as_ghost)  | 
| 
1908.5.2
by Robert Collins
 Create and test set_parent_trees.  | 
724  | 
|
| 
2041.1.2
by John Arbash Meinel
 Update WorkingTree.set_parent_trees() to directly cache inv.  | 
725  | 
if len(parent_ids) == 0:  | 
| 
2041.1.3
by John Arbash Meinel
 Call _cache_basis_inventory directly rather than set_last_revision  | 
726  | 
leftmost_parent_id = None  | 
727  | 
leftmost_parent_tree = None  | 
|
| 
2041.1.2
by John Arbash Meinel
 Update WorkingTree.set_parent_trees() to directly cache inv.  | 
728  | 
else:  | 
729  | 
leftmost_parent_id, leftmost_parent_tree = parents_list[0]  | 
|
730  | 
||
| 
2041.1.3
by John Arbash Meinel
 Call _cache_basis_inventory directly rather than set_last_revision  | 
731  | 
if self._change_last_revision(leftmost_parent_id):  | 
732  | 
if leftmost_parent_tree is None:  | 
|
| 
2041.1.4
by John Arbash Meinel
 NEWS and documentation  | 
733  | 
                # If we don't have a tree, fall back to reading the
 | 
734  | 
                # parent tree from the repository.
 | 
|
| 
2041.1.3
by John Arbash Meinel
 Call _cache_basis_inventory directly rather than set_last_revision  | 
735  | 
self._cache_basis_inventory(leftmost_parent_id)  | 
736  | 
else:  | 
|
| 
2041.1.2
by John Arbash Meinel
 Update WorkingTree.set_parent_trees() to directly cache inv.  | 
737  | 
inv = leftmost_parent_tree.inventory  | 
738  | 
xml = self._create_basis_xml_from_inventory(  | 
|
739  | 
leftmost_parent_id, inv)  | 
|
740  | 
self._write_basis_inventory(xml)  | 
|
741  | 
self._set_merges_from_parent_ids(parent_ids)  | 
|
742  | 
||
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
743  | 
    @needs_tree_write_lock
 | 
| 
1457.1.16
by Robert Collins
 Move set_pending_merges to WorkingTree.  | 
744  | 
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.  | 
745  | 
parents = self.get_parent_ids()  | 
746  | 
leftmost = parents[:1]  | 
|
747  | 
new_parents = leftmost + rev_list  | 
|
748  | 
self.set_parent_ids(new_parents)  | 
|
| 
1457.1.16
by Robert Collins
 Move set_pending_merges to WorkingTree.  | 
749  | 
|
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
750  | 
    @needs_tree_write_lock
 | 
| 
1534.7.192
by Aaron Bentley
 Record hashes produced by merges  | 
751  | 
def set_merge_modified(self, modified_hashes):  | 
| 
1534.10.3
by Aaron Bentley
 Simplify set_merge_modified with rio_file  | 
752  | 
def iter_stanzas():  | 
753  | 
for file_id, hash in modified_hashes.iteritems():  | 
|
754  | 
yield Stanza(file_id=file_id, hash=hash)  | 
|
755  | 
self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1)  | 
|
756  | 
||
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
757  | 
    @needs_tree_write_lock
 | 
| 
1534.10.3
by Aaron Bentley
 Simplify set_merge_modified with rio_file  | 
758  | 
def _put_rio(self, filename, stanzas, header):  | 
759  | 
my_file = rio_file(stanzas, header)  | 
|
760  | 
self._control_files.put(filename, my_file)  | 
|
| 
1534.7.192
by Aaron Bentley
 Record hashes produced by merges  | 
761  | 
|
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
762  | 
@needs_write_lock # because merge pulls data into the branch.  | 
| 
1979.2.1
by Robert Collins
 (robertc) adds a convenience method "merge_from_branch" to WorkingTree.  | 
763  | 
def merge_from_branch(self, branch, to_revision=None):  | 
764  | 
"""Merge from a branch into this working tree.  | 
|
765  | 
||
766  | 
        :param branch: The branch to merge from.
 | 
|
767  | 
        :param to_revision: If non-None, the merge will merge to to_revision, but 
 | 
|
768  | 
            not beyond it. to_revision does not need to be in the history of
 | 
|
769  | 
            the branch when it is supplied. If None, to_revision defaults to
 | 
|
770  | 
            branch.last_revision().
 | 
|
771  | 
        """
 | 
|
772  | 
from bzrlib.merge import Merger, Merge3Merger  | 
|
773  | 
pb = bzrlib.ui.ui_factory.nested_progress_bar()  | 
|
774  | 
try:  | 
|
775  | 
merger = Merger(self.branch, this_tree=self, pb=pb)  | 
|
776  | 
merger.pp = ProgressPhase("Merge phase", 5, pb)  | 
|
777  | 
merger.pp.next_phase()  | 
|
778  | 
            # check that there are no
 | 
|
779  | 
            # local alterations
 | 
|
780  | 
merger.check_basis(check_clean=True, require_commits=False)  | 
|
781  | 
if to_revision is None:  | 
|
782  | 
to_revision = branch.last_revision()  | 
|
783  | 
merger.other_rev_id = to_revision  | 
|
784  | 
if merger.other_rev_id is None:  | 
|
785  | 
raise error.NoCommits(branch)  | 
|
786  | 
self.branch.fetch(branch, last_revision=merger.other_rev_id)  | 
|
787  | 
merger.other_basis = merger.other_rev_id  | 
|
788  | 
merger.other_tree = self.branch.repository.revision_tree(  | 
|
789  | 
merger.other_rev_id)  | 
|
790  | 
merger.pp.next_phase()  | 
|
791  | 
merger.find_base()  | 
|
792  | 
if merger.base_rev_id == merger.other_rev_id:  | 
|
793  | 
raise errors.PointlessMerge  | 
|
794  | 
merger.backup_files = False  | 
|
795  | 
merger.merge_type = Merge3Merger  | 
|
796  | 
merger.set_interesting_files(None)  | 
|
797  | 
merger.show_base = False  | 
|
798  | 
merger.reprocess = False  | 
|
799  | 
conflicts = merger.do_merge()  | 
|
800  | 
merger.set_pending()  | 
|
801  | 
finally:  | 
|
802  | 
pb.finished()  | 
|
803  | 
return conflicts  | 
|
804  | 
||
| 
1534.7.192
by Aaron Bentley
 Record hashes produced by merges  | 
805  | 
    @needs_read_lock
 | 
806  | 
def merge_modified(self):  | 
|
807  | 
try:  | 
|
808  | 
hashfile = self._control_files.get('merge-hashes')  | 
|
809  | 
except NoSuchFile:  | 
|
810  | 
return {}  | 
|
| 
1534.7.196
by Aaron Bentley
 Switched to Rio format for merge-modified list  | 
811  | 
merge_hashes = {}  | 
812  | 
try:  | 
|
813  | 
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':  | 
|
814  | 
raise MergeModifiedFormatError()  | 
|
815  | 
except StopIteration:  | 
|
816  | 
raise MergeModifiedFormatError()  | 
|
817  | 
for s in RioReader(hashfile):  | 
|
| 
1534.7.198
by Aaron Bentley
 Removed spurious encode/decode  | 
818  | 
file_id = s.get("file_id")  | 
| 
1558.12.10
by Aaron Bentley
 Be robust when merge_hash file_id not in inventory  | 
819  | 
if file_id not in self.inventory:  | 
820  | 
                continue
 | 
|
| 
1534.7.196
by Aaron Bentley
 Switched to Rio format for merge-modified list  | 
821  | 
hash = s.get("hash")  | 
822  | 
if hash == self.get_file_sha1(file_id):  | 
|
823  | 
merge_hashes[file_id] = hash  | 
|
824  | 
return merge_hashes  | 
|
| 
1534.7.192
by Aaron Bentley
 Record hashes produced by merges  | 
825  | 
|
| 
1986.1.2
by Robert Collins
 Various changes to allow non-workingtree specific tests to run entirely  | 
826  | 
    @needs_write_lock
 | 
827  | 
def mkdir(self, path, file_id=None):  | 
|
828  | 
"""See MutableTree.mkdir()."""  | 
|
829  | 
if file_id is None:  | 
|
830  | 
file_id = gen_file_id(os.path.basename(path))  | 
|
831  | 
os.mkdir(self.abspath(path))  | 
|
832  | 
self.add(path, file_id, 'directory')  | 
|
833  | 
return file_id  | 
|
834  | 
||
| 
1092.2.6
by Robert Collins
 symlink support updated to work  | 
835  | 
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  | 
836  | 
return os.readlink(self.id2abspath(file_id))  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
837  | 
|
838  | 
def file_class(self, filename):  | 
|
839  | 
if self.path2id(filename):  | 
|
840  | 
return 'V'  | 
|
841  | 
elif self.is_ignored(filename):  | 
|
842  | 
return 'I'  | 
|
843  | 
else:  | 
|
844  | 
return '?'  | 
|
845  | 
||
| 
1907.1.1
by Aaron Bentley
 Unshelved all changes except those related to removing RootEntry  | 
846  | 
def list_files(self):  | 
| 
1732.1.6
by John Arbash Meinel
 Fix documentation bug in workingtree.list_files  | 
847  | 
"""Recursively list all files as (path, class, kind, id, entry).  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
848  | 
|
849  | 
        Lists, but does not descend into unversioned directories.
 | 
|
850  | 
||
851  | 
        This does not include files that have been deleted in this
 | 
|
852  | 
        tree.
 | 
|
853  | 
||
854  | 
        Skips the control directory.
 | 
|
855  | 
        """
 | 
|
| 
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.  | 
856  | 
inv = self._inventory  | 
| 
1732.1.9
by John Arbash Meinel
 Non-recursive implementation of WorkingTree.list_files  | 
857  | 
        # Convert these into local objects to save lookup times
 | 
| 
1836.1.22
by John Arbash Meinel
 [merge] bzr.dev 1861  | 
858  | 
pathjoin = osutils.pathjoin  | 
859  | 
file_kind = osutils.file_kind  | 
|
| 
1732.1.9
by John Arbash Meinel
 Non-recursive implementation of WorkingTree.list_files  | 
860  | 
|
861  | 
        # transport.base ends in a slash, we want the piece
 | 
|
862  | 
        # between the last two slashes
 | 
|
863  | 
transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]  | 
|
864  | 
||
| 
1732.1.11
by John Arbash Meinel
 Trying multiple things to get WorkingTree.list_files time down  | 
865  | 
fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}  | 
866  | 
||
| 
1732.1.9
by John Arbash Meinel
 Non-recursive implementation of WorkingTree.list_files  | 
867  | 
        # directory file_id, relative path, absolute path, reverse sorted children
 | 
868  | 
children = os.listdir(self.basedir)  | 
|
869  | 
children.sort()  | 
|
| 
1732.1.14
by John Arbash Meinel
 Some speedups by not calling pathjoin()  | 
870  | 
        # jam 20060527 The kernel sized tree seems equivalent whether we 
 | 
871  | 
        # use a deque and popleft to keep them sorted, or if we use a plain
 | 
|
872  | 
        # list and just reverse() them.
 | 
|
| 
1732.1.13
by John Arbash Meinel
 A large improvement from not popping the parent off until we have done all children.  | 
873  | 
children = collections.deque(children)  | 
| 
1732.1.21
by John Arbash Meinel
 We don't need to strip off 2 characters, just do one, minor memory improvement  | 
874  | 
stack = [(inv.root.file_id, u'', self.basedir, children)]  | 
| 
1732.1.9
by John Arbash Meinel
 Non-recursive implementation of WorkingTree.list_files  | 
875  | 
while stack:  | 
| 
1732.1.13
by John Arbash Meinel
 A large improvement from not popping the parent off until we have done all children.  | 
876  | 
from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]  | 
| 
1732.1.9
by John Arbash Meinel
 Non-recursive implementation of WorkingTree.list_files  | 
877  | 
|
878  | 
while children:  | 
|
| 
1732.1.13
by John Arbash Meinel
 A large improvement from not popping the parent off until we have done all children.  | 
879  | 
f = children.popleft()  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
880  | 
                ## TODO: If we find a subdirectory with its own .bzr
 | 
881  | 
                ## directory, then that is a separate tree and we
 | 
|
882  | 
                ## should exclude it.
 | 
|
| 
1534.5.5
by Robert Collins
 Move is_control_file into WorkingTree.is_control_filename and test.  | 
883  | 
|
884  | 
                # the bzrdir for this tree
 | 
|
| 
1732.1.9
by John Arbash Meinel
 Non-recursive implementation of WorkingTree.list_files  | 
885  | 
if transport_base_dir == f:  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
886  | 
                    continue
 | 
887  | 
||
| 
1732.1.14
by John Arbash Meinel
 Some speedups by not calling pathjoin()  | 
888  | 
                # we know that from_dir_relpath and from_dir_abspath never end in a slash
 | 
889  | 
                # and 'f' doesn't begin with one, we can do a string op, rather
 | 
|
| 
1732.1.21
by John Arbash Meinel
 We don't need to strip off 2 characters, just do one, minor memory improvement  | 
890  | 
                # than the checks of pathjoin(), all relative paths will have an extra slash
 | 
891  | 
                # at the beginning
 | 
|
| 
1732.1.14
by John Arbash Meinel
 Some speedups by not calling pathjoin()  | 
892  | 
fp = from_dir_relpath + '/' + f  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
893  | 
|
894  | 
                # absolute path
 | 
|
| 
1732.1.14
by John Arbash Meinel
 Some speedups by not calling pathjoin()  | 
895  | 
fap = from_dir_abspath + '/' + f  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
896  | 
|
897  | 
f_ie = inv.get_child(from_dir_id, f)  | 
|
898  | 
if f_ie:  | 
|
899  | 
c = 'V'  | 
|
| 
1551.6.36
by Aaron Bentley
 Revert --debris/--detritus changes  | 
900  | 
elif self.is_ignored(fp[1:]):  | 
901  | 
c = 'I'  | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
902  | 
else:  | 
| 
1830.3.3
by John Arbash Meinel
 inside workingtree check for normalized filename access  | 
903  | 
                    # we may not have found this file, because of a unicode issue
 | 
904  | 
f_norm, can_access = osutils.normalized_filename(f)  | 
|
905  | 
if f == f_norm or not can_access:  | 
|
906  | 
                        # No change, so treat this file normally
 | 
|
907  | 
c = '?'  | 
|
908  | 
else:  | 
|
909  | 
                        # this file can be accessed by a normalized path
 | 
|
910  | 
                        # check again if it is versioned
 | 
|
911  | 
                        # these lines are repeated here for performance
 | 
|
912  | 
f = f_norm  | 
|
913  | 
fp = from_dir_relpath + '/' + f  | 
|
914  | 
fap = from_dir_abspath + '/' + f  | 
|
915  | 
f_ie = inv.get_child(from_dir_id, f)  | 
|
916  | 
if f_ie:  | 
|
917  | 
c = 'V'  | 
|
918  | 
elif self.is_ignored(fp[1:]):  | 
|
919  | 
c = 'I'  | 
|
920  | 
else:  | 
|
921  | 
c = '?'  | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
922  | 
|
923  | 
fk = file_kind(fap)  | 
|
924  | 
||
925  | 
if f_ie:  | 
|
926  | 
if f_ie.kind != fk:  | 
|
927  | 
raise BzrCheckError("file %r entered as kind %r id %r, "  | 
|
928  | 
"now of kind %r"  | 
|
929  | 
% (fap, f_ie.kind, f_ie.file_id, fk))  | 
|
930  | 
||
| 
1399.1.2
by Robert Collins
 push kind character creation into InventoryEntry and TreeEntry  | 
931  | 
                # make a last minute entry
 | 
932  | 
if f_ie:  | 
|
| 
1732.1.21
by John Arbash Meinel
 We don't need to strip off 2 characters, just do one, minor memory improvement  | 
933  | 
yield fp[1:], c, fk, f_ie.file_id, f_ie  | 
| 
1399.1.2
by Robert Collins
 push kind character creation into InventoryEntry and TreeEntry  | 
934  | 
else:  | 
| 
1732.1.11
by John Arbash Meinel
 Trying multiple things to get WorkingTree.list_files time down  | 
935  | 
try:  | 
| 
1732.1.21
by John Arbash Meinel
 We don't need to strip off 2 characters, just do one, minor memory improvement  | 
936  | 
yield fp[1:], c, fk, None, fk_entries[fk]()  | 
| 
1732.1.11
by John Arbash Meinel
 Trying multiple things to get WorkingTree.list_files time down  | 
937  | 
except KeyError:  | 
| 
1732.1.21
by John Arbash Meinel
 We don't need to strip off 2 characters, just do one, minor memory improvement  | 
938  | 
yield fp[1:], c, fk, None, TreeEntry()  | 
| 
1732.1.13
by John Arbash Meinel
 A large improvement from not popping the parent off until we have done all children.  | 
939  | 
                    continue
 | 
| 
1399.1.2
by Robert Collins
 push kind character creation into InventoryEntry and TreeEntry  | 
940  | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
941  | 
if fk != 'directory':  | 
942  | 
                    continue
 | 
|
943  | 
||
| 
1732.1.9
by John Arbash Meinel
 Non-recursive implementation of WorkingTree.list_files  | 
944  | 
                # But do this child first
 | 
| 
1732.1.13
by John Arbash Meinel
 A large improvement from not popping the parent off until we have done all children.  | 
945  | 
new_children = os.listdir(fap)  | 
946  | 
new_children.sort()  | 
|
947  | 
new_children = collections.deque(new_children)  | 
|
948  | 
stack.append((f_ie.file_id, fp, fap, new_children))  | 
|
| 
1732.1.9
by John Arbash Meinel
 Non-recursive implementation of WorkingTree.list_files  | 
949  | 
                # Break out of inner loop, so that we start outer loop with child
 | 
950  | 
                break
 | 
|
| 
1732.1.22
by John Arbash Meinel
 Bug in list_files if the last entry in a directory is another directory  | 
951  | 
else:  | 
952  | 
                # if we finished all children, pop it off the stack
 | 
|
| 
1732.1.25
by John Arbash Meinel
 Fix list_files test, we don't need to check if children are empty if we fall off the loop.  | 
953  | 
stack.pop()  | 
| 
1732.1.13
by John Arbash Meinel
 A large improvement from not popping the parent off until we have done all children.  | 
954  | 
|
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
955  | 
    @needs_tree_write_lock
 | 
| 
1508.1.8
by Robert Collins
 move move() from Branch to WorkingTree.  | 
956  | 
def move(self, from_paths, to_name):  | 
957  | 
"""Rename files.  | 
|
958  | 
||
959  | 
        to_name must exist in the inventory.
 | 
|
960  | 
||
961  | 
        If to_name exists and is a directory, the files are moved into
 | 
|
962  | 
        it, keeping their old names.  
 | 
|
963  | 
||
964  | 
        Note that to_name is only the last component of the new name;
 | 
|
965  | 
        this doesn't change the directory.
 | 
|
966  | 
||
967  | 
        This returns a list of (from_path, to_path) pairs for each
 | 
|
968  | 
        entry that is moved.
 | 
|
969  | 
        """
 | 
|
970  | 
result = []  | 
|
971  | 
        ## TODO: Option to move IDs only
 | 
|
972  | 
assert not isinstance(from_paths, basestring)  | 
|
973  | 
inv = self.inventory  | 
|
974  | 
to_abs = self.abspath(to_name)  | 
|
975  | 
if not isdir(to_abs):  | 
|
976  | 
raise BzrError("destination %r is not a directory" % to_abs)  | 
|
977  | 
if not self.has_filename(to_name):  | 
|
978  | 
raise BzrError("destination %r not in working directory" % to_abs)  | 
|
979  | 
to_dir_id = inv.path2id(to_name)  | 
|
| 
1963.2.6
by Robey Pointer
 pychecker is on crack; go back to using 'is None'.  | 
980  | 
if to_dir_id is None and to_name != '':  | 
| 
1508.1.8
by Robert Collins
 move move() from Branch to WorkingTree.  | 
981  | 
raise BzrError("destination %r is not a versioned directory" % to_name)  | 
982  | 
to_dir_ie = inv[to_dir_id]  | 
|
| 
1731.1.2
by Aaron Bentley
 Removed all remaining uses of root_directory  | 
983  | 
if to_dir_ie.kind != 'directory':  | 
| 
1508.1.8
by Robert Collins
 move move() from Branch to WorkingTree.  | 
984  | 
raise BzrError("destination %r is not a directory" % to_abs)  | 
985  | 
||
986  | 
to_idpath = inv.get_idpath(to_dir_id)  | 
|
987  | 
||
988  | 
for f in from_paths:  | 
|
989  | 
if not self.has_filename(f):  | 
|
990  | 
raise BzrError("%r does not exist in working tree" % f)  | 
|
991  | 
f_id = inv.path2id(f)  | 
|
| 
1963.2.6
by Robey Pointer
 pychecker is on crack; go back to using 'is None'.  | 
992  | 
if f_id is None:  | 
| 
1508.1.8
by Robert Collins
 move move() from Branch to WorkingTree.  | 
993  | 
raise BzrError("%r is not versioned" % f)  | 
994  | 
name_tail = splitpath(f)[-1]  | 
|
| 
1732.1.1
by John Arbash Meinel
 deprecating appendpath, it does exactly what pathjoin does  | 
995  | 
dest_path = pathjoin(to_name, name_tail)  | 
| 
1508.1.8
by Robert Collins
 move move() from Branch to WorkingTree.  | 
996  | 
if self.has_filename(dest_path):  | 
997  | 
raise BzrError("destination %r already exists" % dest_path)  | 
|
998  | 
if f_id in to_idpath:  | 
|
999  | 
raise BzrError("can't move %r to a subdirectory of itself" % f)  | 
|
1000  | 
||
1001  | 
        # OK, so there's a race here, it's possible that someone will
 | 
|
1002  | 
        # create a file in this interval and then the rename might be
 | 
|
1003  | 
        # left half-done.  But we should have caught most problems.
 | 
|
1004  | 
orig_inv = deepcopy(self.inventory)  | 
|
1005  | 
try:  | 
|
1006  | 
for f in from_paths:  | 
|
1007  | 
name_tail = splitpath(f)[-1]  | 
|
| 
1732.1.1
by John Arbash Meinel
 deprecating appendpath, it does exactly what pathjoin does  | 
1008  | 
dest_path = pathjoin(to_name, name_tail)  | 
| 
1508.1.8
by Robert Collins
 move move() from Branch to WorkingTree.  | 
1009  | 
result.append((f, dest_path))  | 
1010  | 
inv.rename(inv.path2id(f), to_dir_id, name_tail)  | 
|
1011  | 
try:  | 
|
1012  | 
rename(self.abspath(f), self.abspath(dest_path))  | 
|
1013  | 
except OSError, e:  | 
|
1014  | 
raise BzrError("failed to rename %r to %r: %s" %  | 
|
1015  | 
(f, dest_path, e[1]),  | 
|
1016  | 
["rename rolled back"])  | 
|
1017  | 
except:  | 
|
1018  | 
            # restore the inventory on error
 | 
|
| 
1508.1.10
by Robert Collins
 bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)  | 
1019  | 
self._set_inventory(orig_inv)  | 
| 
1508.1.8
by Robert Collins
 move move() from Branch to WorkingTree.  | 
1020  | 
            raise
 | 
1021  | 
self._write_inventory(inv)  | 
|
1022  | 
return result  | 
|
1023  | 
||
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
1024  | 
    @needs_tree_write_lock
 | 
| 
1508.1.7
by Robert Collins
 Move rename_one from Branch to WorkingTree. (Robert Collins).  | 
1025  | 
def rename_one(self, from_rel, to_rel):  | 
1026  | 
"""Rename one file.  | 
|
1027  | 
||
1028  | 
        This can change the directory or the filename or both.
 | 
|
1029  | 
        """
 | 
|
1030  | 
inv = self.inventory  | 
|
1031  | 
if not self.has_filename(from_rel):  | 
|
1032  | 
raise BzrError("can't rename: old working file %r does not exist" % from_rel)  | 
|
1033  | 
if self.has_filename(to_rel):  | 
|
1034  | 
raise BzrError("can't rename: new working file %r already exists" % to_rel)  | 
|
1035  | 
||
1036  | 
file_id = inv.path2id(from_rel)  | 
|
| 
1963.2.6
by Robey Pointer
 pychecker is on crack; go back to using 'is None'.  | 
1037  | 
if file_id is None:  | 
| 
1508.1.7
by Robert Collins
 Move rename_one from Branch to WorkingTree. (Robert Collins).  | 
1038  | 
raise BzrError("can't rename: old name %r is not versioned" % from_rel)  | 
1039  | 
||
1040  | 
entry = inv[file_id]  | 
|
1041  | 
from_parent = entry.parent_id  | 
|
1042  | 
from_name = entry.name  | 
|
1043  | 
||
1044  | 
if inv.path2id(to_rel):  | 
|
1045  | 
raise BzrError("can't rename: new name %r is already versioned" % to_rel)  | 
|
1046  | 
||
1047  | 
to_dir, to_tail = os.path.split(to_rel)  | 
|
1048  | 
to_dir_id = inv.path2id(to_dir)  | 
|
| 
1963.2.6
by Robey Pointer
 pychecker is on crack; go back to using 'is None'.  | 
1049  | 
if to_dir_id is None and to_dir != '':  | 
| 
1508.1.7
by Robert Collins
 Move rename_one from Branch to WorkingTree. (Robert Collins).  | 
1050  | 
raise BzrError("can't determine destination directory id for %r" % to_dir)  | 
1051  | 
||
1052  | 
mutter("rename_one:")  | 
|
1053  | 
mutter(" file_id {%s}" % file_id)  | 
|
1054  | 
mutter(" from_rel %r" % from_rel)  | 
|
1055  | 
mutter(" to_rel %r" % to_rel)  | 
|
1056  | 
mutter(" to_dir %r" % to_dir)  | 
|
1057  | 
mutter(" to_dir_id {%s}" % to_dir_id)  | 
|
1058  | 
||
1059  | 
inv.rename(file_id, to_dir_id, to_tail)  | 
|
1060  | 
||
1061  | 
from_abs = self.abspath(from_rel)  | 
|
1062  | 
to_abs = self.abspath(to_rel)  | 
|
1063  | 
try:  | 
|
1064  | 
rename(from_abs, to_abs)  | 
|
1065  | 
except OSError, e:  | 
|
1066  | 
inv.rename(file_id, from_parent, from_name)  | 
|
1067  | 
raise BzrError("failed to rename %r to %r: %s"  | 
|
1068  | 
% (from_abs, to_abs, e[1]),  | 
|
1069  | 
["rename rolled back"])  | 
|
1070  | 
self._write_inventory(inv)  | 
|
1071  | 
||
1072  | 
    @needs_read_lock
 | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
1073  | 
def unknowns(self):  | 
| 
1508.1.6
by Robert Collins
 Move Branch.unknowns() to WorkingTree.  | 
1074  | 
"""Return all unknown files.  | 
1075  | 
||
1076  | 
        These are files in the working directory that are not versioned or
 | 
|
1077  | 
        control files or ignored.
 | 
|
1078  | 
        """
 | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
1079  | 
for subp in self.extras():  | 
1080  | 
if not self.is_ignored(subp):  | 
|
1081  | 
yield subp  | 
|
| 
1988.2.1
by Robert Collins
 WorkingTree has a new api ``unversion`` which allow the unversioning of  | 
1082  | 
|
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
1083  | 
    @needs_tree_write_lock
 | 
| 
1988.2.1
by Robert Collins
 WorkingTree has a new api ``unversion`` which allow the unversioning of  | 
1084  | 
def unversion(self, file_ids):  | 
1085  | 
"""Remove the file ids in file_ids from the current versioned set.  | 
|
1086  | 
||
1087  | 
        When a file_id is unversioned, all of its children are automatically
 | 
|
1088  | 
        unversioned.
 | 
|
1089  | 
||
1090  | 
        :param file_ids: The file ids to stop versioning.
 | 
|
1091  | 
        :raises: NoSuchId if any fileid is not currently versioned.
 | 
|
1092  | 
        """
 | 
|
1093  | 
for file_id in file_ids:  | 
|
1094  | 
if self._inventory.has_id(file_id):  | 
|
| 
1988.2.6
by Robert Collins
 Review feedback.  | 
1095  | 
self._inventory.remove_recursive_id(file_id)  | 
| 
1988.2.1
by Robert Collins
 WorkingTree has a new api ``unversion`` which allow the unversioning of  | 
1096  | 
else:  | 
1097  | 
raise errors.NoSuchId(self, file_id)  | 
|
1098  | 
if len(file_ids):  | 
|
1099  | 
            # in the future this should just set a dirty bit to wait for the 
 | 
|
1100  | 
            # final unlock. However, until all methods of workingtree start
 | 
|
1101  | 
            # with the current in -memory inventory rather than triggering 
 | 
|
1102  | 
            # a read, it is more complex - we need to teach read_inventory
 | 
|
1103  | 
            # to know when to read, and when to not read first... and possibly
 | 
|
1104  | 
            # to save first when the in memory one may be corrupted.
 | 
|
1105  | 
            # so for now, we just only write it if it is indeed dirty.
 | 
|
1106  | 
            # - RBC 20060907
 | 
|
1107  | 
self._write_inventory(self._inventory)  | 
|
1108  | 
||
| 
1534.10.16
by Aaron Bentley
 Small tweaks  | 
1109  | 
@deprecated_method(zero_eight)  | 
| 
1185.14.6
by Aaron Bentley
 Made iter_conflicts a WorkingTree method  | 
1110  | 
def iter_conflicts(self):  | 
| 
1534.10.16
by Aaron Bentley
 Small tweaks  | 
1111  | 
"""List all files in the tree that have text or content conflicts.  | 
| 
1534.10.22
by Aaron Bentley
 Got ConflictList implemented  | 
1112  | 
        DEPRECATED.  Use conflicts instead."""
 | 
| 
1534.10.10
by Aaron Bentley
 Resolve uses the new stuff.  | 
1113  | 
return self._iter_conflicts()  | 
1114  | 
||
| 
1534.10.9
by Aaron Bentley
 Switched display functions to conflict_lines  | 
1115  | 
def _iter_conflicts(self):  | 
| 
1185.14.6
by Aaron Bentley
 Made iter_conflicts a WorkingTree method  | 
1116  | 
conflicted = set()  | 
| 
1732.1.11
by John Arbash Meinel
 Trying multiple things to get WorkingTree.list_files time down  | 
1117  | 
for info in self.list_files():  | 
1118  | 
path = info[0]  | 
|
| 
1185.14.6
by Aaron Bentley
 Made iter_conflicts a WorkingTree method  | 
1119  | 
stem = get_conflicted_stem(path)  | 
1120  | 
if stem is None:  | 
|
1121  | 
                continue
 | 
|
1122  | 
if stem not in conflicted:  | 
|
1123  | 
conflicted.add(stem)  | 
|
1124  | 
yield stem  | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
1125  | 
|
| 
1442.1.67
by Robert Collins
 Factor out the guts of 'pull' from the command into WorkingTree.pull().  | 
1126  | 
    @needs_write_lock
 | 
| 
1185.76.1
by Erik Bågfors
 Support for --revision in pull  | 
1127  | 
def pull(self, source, overwrite=False, stop_revision=None):  | 
| 
1551.2.36
by Aaron Bentley
 Make pull update the progress bar more nicely  | 
1128  | 
top_pb = bzrlib.ui.ui_factory.nested_progress_bar()  | 
| 
1442.1.67
by Robert Collins
 Factor out the guts of 'pull' from the command into WorkingTree.pull().  | 
1129  | 
source.lock_read()  | 
1130  | 
try:  | 
|
| 
1551.2.36
by Aaron Bentley
 Make pull update the progress bar more nicely  | 
1131  | 
pp = ProgressPhase("Pull phase", 2, top_pb)  | 
1132  | 
pp.next_phase()  | 
|
| 
1442.1.67
by Robert Collins
 Factor out the guts of 'pull' from the command into WorkingTree.pull().  | 
1133  | 
old_revision_history = self.branch.revision_history()  | 
| 
1563.1.4
by Robert Collins
 Fix 'bzr pull' on metadir trees.  | 
1134  | 
basis_tree = self.basis_tree()  | 
| 
1534.4.54
by Robert Collins
 Merge from integration.  | 
1135  | 
count = self.branch.pull(source, overwrite, stop_revision)  | 
| 
1442.1.67
by Robert Collins
 Factor out the guts of 'pull' from the command into WorkingTree.pull().  | 
1136  | 
new_revision_history = self.branch.revision_history()  | 
1137  | 
if new_revision_history != old_revision_history:  | 
|
| 
1551.2.36
by Aaron Bentley
 Make pull update the progress bar more nicely  | 
1138  | 
pp.next_phase()  | 
| 
1465
by Robert Collins
 Bugfix the new pull --clobber to not generate spurious conflicts.  | 
1139  | 
if len(old_revision_history):  | 
1140  | 
other_revision = old_revision_history[-1]  | 
|
1141  | 
else:  | 
|
1142  | 
other_revision = None  | 
|
| 
1185.67.2
by Aaron Bentley
 Renamed Branch.storage to Branch.repository  | 
1143  | 
repository = self.branch.repository  | 
| 
1594.1.3
by Robert Collins
 Fixup pb usage to use nested_progress_bar.  | 
1144  | 
pb = bzrlib.ui.ui_factory.nested_progress_bar()  | 
1145  | 
try:  | 
|
| 
1908.6.1
by Robert Collins
 Change all callers of set_last_revision to use set_parent_trees.  | 
1146  | 
new_basis_tree = self.branch.basis_tree()  | 
| 
1907.1.1
by Aaron Bentley
 Unshelved all changes except those related to removing RootEntry  | 
1147  | 
merge_inner(self.branch,  | 
| 
1908.6.1
by Robert Collins
 Change all callers of set_last_revision to use set_parent_trees.  | 
1148  | 
new_basis_tree,  | 
1149  | 
basis_tree,  | 
|
1150  | 
this_tree=self,  | 
|
| 
1907.1.1
by Aaron Bentley
 Unshelved all changes except those related to removing RootEntry  | 
1151  | 
pb=pb)  | 
| 
1594.1.3
by Robert Collins
 Fixup pb usage to use nested_progress_bar.  | 
1152  | 
finally:  | 
1153  | 
pb.finished()  | 
|
| 
1908.6.1
by Robert Collins
 Change all callers of set_last_revision to use set_parent_trees.  | 
1154  | 
                # 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.  | 
1155  | 
                # reuse the revisiontree we merged against to set the new
 | 
1156  | 
                # tree data.
 | 
|
| 
1908.6.1
by Robert Collins
 Change all callers of set_last_revision to use set_parent_trees.  | 
1157  | 
parent_trees = [(self.branch.last_revision(), new_basis_tree)]  | 
| 
1908.6.3
by Robert Collins
 Tidy up the last_revision_id and add_pending_merge conversion to use cleaner apis.  | 
1158  | 
                # we have to pull the merge trees out again, because 
 | 
1159  | 
                # merge_inner has set the ids. - this corner is not yet 
 | 
|
1160  | 
                # layered well enough to prevent double handling.
 | 
|
| 
1908.6.1
by Robert Collins
 Change all callers of set_last_revision to use set_parent_trees.  | 
1161  | 
merges = self.get_parent_ids()[1:]  | 
1162  | 
parent_trees.extend([  | 
|
1163  | 
(parent, repository.revision_tree(parent)) for  | 
|
1164  | 
parent in merges])  | 
|
1165  | 
self.set_parent_trees(parent_trees)  | 
|
| 
1185.33.44
by Martin Pool
 [patch] show number of revisions pushed/pulled/merged (Robey Pointer)  | 
1166  | 
return count  | 
| 
1442.1.67
by Robert Collins
 Factor out the guts of 'pull' from the command into WorkingTree.pull().  | 
1167  | 
finally:  | 
1168  | 
source.unlock()  | 
|
| 
1551.2.36
by Aaron Bentley
 Make pull update the progress bar more nicely  | 
1169  | 
top_pb.finished()  | 
| 
1442.1.67
by Robert Collins
 Factor out the guts of 'pull' from the command into WorkingTree.pull().  | 
1170  | 
|
| 
1986.1.2
by Robert Collins
 Various changes to allow non-workingtree specific tests to run entirely  | 
1171  | 
    @needs_write_lock
 | 
1172  | 
def put_file_bytes_non_atomic(self, file_id, bytes):  | 
|
1173  | 
"""See MutableTree.put_file_bytes_non_atomic."""  | 
|
1174  | 
stream = file(self.id2abspath(file_id), 'wb')  | 
|
1175  | 
try:  | 
|
1176  | 
stream.write(bytes)  | 
|
1177  | 
finally:  | 
|
1178  | 
stream.close()  | 
|
1179  | 
        # TODO: update the hashcache here ?
 | 
|
1180  | 
||
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
1181  | 
def extras(self):  | 
1182  | 
"""Yield all unknown files in this WorkingTree.  | 
|
1183  | 
||
1184  | 
        If there are any unknown directories then only the directory is
 | 
|
1185  | 
        returned, not all its children.  But if there are unknown files
 | 
|
1186  | 
        under a versioned subdirectory, they are returned.
 | 
|
1187  | 
||
1188  | 
        Currently returned depth-first, sorted by name within directories.
 | 
|
1189  | 
        """
 | 
|
1190  | 
        ## TODO: Work from given directory downwards
 | 
|
1191  | 
for path, dir_entry in self.inventory.directories():  | 
|
| 
1711.2.101
by John Arbash Meinel
 Clean up some unnecessary mutter() calls  | 
1192  | 
            # mutter("search for unknowns in %r", path)
 | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
1193  | 
dirabs = self.abspath(path)  | 
1194  | 
if not isdir(dirabs):  | 
|
1195  | 
                # e.g. directory deleted
 | 
|
1196  | 
                continue
 | 
|
1197  | 
||
1198  | 
fl = []  | 
|
1199  | 
for subf in os.listdir(dirabs):  | 
|
| 
1830.3.3
by John Arbash Meinel
 inside workingtree check for normalized filename access  | 
1200  | 
if subf == '.bzr':  | 
1201  | 
                    continue
 | 
|
1202  | 
if subf not in dir_entry.children:  | 
|
1203  | 
subf_norm, can_access = osutils.normalized_filename(subf)  | 
|
1204  | 
if subf_norm != subf and can_access:  | 
|
1205  | 
if subf_norm not in dir_entry.children:  | 
|
1206  | 
fl.append(subf_norm)  | 
|
1207  | 
else:  | 
|
1208  | 
fl.append(subf)  | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
1209  | 
|
1210  | 
fl.sort()  | 
|
1211  | 
for subf in fl:  | 
|
| 
1732.1.1
by John Arbash Meinel
 deprecating appendpath, it does exactly what pathjoin does  | 
1212  | 
subp = pathjoin(path, subf)  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
1213  | 
yield subp  | 
1214  | 
||
| 
1713.2.3
by Robert Collins
 Combine ignore rules into a single regex preventing pathological behaviour during add.  | 
1215  | 
def _translate_ignore_rule(self, rule):  | 
1216  | 
"""Translate a single ignore rule to a regex.  | 
|
1217  | 
||
| 
1713.2.7
by Robert Collins
 Better description of ignore rule types from Martin.  | 
1218  | 
        There are two types of ignore rules.  Those that do not contain a / are
 | 
1219  | 
        matched against the tail of the filename (that is, they do not care
 | 
|
1220  | 
        what directory the file is in.)  Rules which do contain a slash must
 | 
|
1221  | 
        match the entire path.  As a special case, './' at the start of the
 | 
|
1222  | 
        string counts as a slash in the string but is removed before matching
 | 
|
1223  | 
        (e.g. ./foo.c, ./src/foo.c)
 | 
|
| 
1713.2.3
by Robert Collins
 Combine ignore rules into a single regex preventing pathological behaviour during add.  | 
1224  | 
|
1225  | 
        :return: The translated regex.
 | 
|
1226  | 
        """
 | 
|
1227  | 
if rule[:2] in ('./', '.\\'):  | 
|
1228  | 
            # rootdir rule
 | 
|
1229  | 
result = fnmatch.translate(rule[2:])  | 
|
1230  | 
elif '/' in rule or '\\' in rule:  | 
|
1231  | 
            # path prefix 
 | 
|
1232  | 
result = fnmatch.translate(rule)  | 
|
1233  | 
else:  | 
|
1234  | 
            # default rule style.
 | 
|
1235  | 
result = "(?:.*/)?(?!.*/)" + fnmatch.translate(rule)  | 
|
1236  | 
assert result[-1] == '$', "fnmatch.translate did not add the expected $"  | 
|
1237  | 
return "(" + result + ")"  | 
|
1238  | 
||
1239  | 
def _combine_ignore_rules(self, rules):  | 
|
1240  | 
"""Combine a list of ignore rules into a single regex object.  | 
|
1241  | 
||
1242  | 
        Each individual rule is combined with | to form a big regex, which then
 | 
|
1243  | 
        has $ added to it to form something like ()|()|()$. The group index for
 | 
|
1244  | 
        each subregex's outermost group is placed in a dictionary mapping back 
 | 
|
1245  | 
        to the rule. This allows quick identification of the matching rule that
 | 
|
1246  | 
        triggered a match.
 | 
|
| 
1713.2.5
by Robert Collins
 Support more than 100 ignore rules.  | 
1247  | 
        :return: a list of the compiled regex and the matching-group index 
 | 
1248  | 
        dictionaries. We return a list because python complains if you try to 
 | 
|
1249  | 
        combine more than 100 regexes.
 | 
|
| 
1713.2.3
by Robert Collins
 Combine ignore rules into a single regex preventing pathological behaviour during add.  | 
1250  | 
        """
 | 
| 
1713.2.5
by Robert Collins
 Support more than 100 ignore rules.  | 
1251  | 
result = []  | 
| 
1713.2.3
by Robert Collins
 Combine ignore rules into a single regex preventing pathological behaviour during add.  | 
1252  | 
groups = {}  | 
1253  | 
next_group = 0  | 
|
1254  | 
translated_rules = []  | 
|
1255  | 
for rule in rules:  | 
|
1256  | 
translated_rule = self._translate_ignore_rule(rule)  | 
|
1257  | 
compiled_rule = re.compile(translated_rule)  | 
|
1258  | 
groups[next_group] = rule  | 
|
1259  | 
next_group += compiled_rule.groups  | 
|
1260  | 
translated_rules.append(translated_rule)  | 
|
| 
1713.2.5
by Robert Collins
 Support more than 100 ignore rules.  | 
1261  | 
if next_group == 99:  | 
1262  | 
result.append((re.compile("|".join(translated_rules)), groups))  | 
|
1263  | 
groups = {}  | 
|
1264  | 
next_group = 0  | 
|
1265  | 
translated_rules = []  | 
|
1266  | 
if len(translated_rules):  | 
|
1267  | 
result.append((re.compile("|".join(translated_rules)), groups))  | 
|
1268  | 
return result  | 
|
| 
1713.2.3
by Robert Collins
 Combine ignore rules into a single regex preventing pathological behaviour during add.  | 
1269  | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
1270  | 
def ignored_files(self):  | 
1271  | 
"""Yield list of PATH, IGNORE_PATTERN"""  | 
|
1272  | 
for subp in self.extras():  | 
|
1273  | 
pat = self.is_ignored(subp)  | 
|
| 
1963.2.6
by Robey Pointer
 pychecker is on crack; go back to using 'is None'.  | 
1274  | 
if pat is not None:  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
1275  | 
yield subp, pat  | 
1276  | 
||
1277  | 
def get_ignore_list(self):  | 
|
1278  | 
"""Return list of ignore patterns.  | 
|
1279  | 
||
1280  | 
        Cached in the Tree object after the first call.
 | 
|
1281  | 
        """
 | 
|
| 
1836.1.30
by John Arbash Meinel
 Change ignore functions to use sets instead of lists.  | 
1282  | 
ignoreset = getattr(self, '_ignoreset', None)  | 
1283  | 
if ignoreset is not None:  | 
|
1284  | 
return ignoreset  | 
|
1285  | 
||
1286  | 
ignore_globs = set(bzrlib.DEFAULT_IGNORE)  | 
|
1287  | 
ignore_globs.update(ignores.get_runtime_ignores())  | 
|
1288  | 
||
1289  | 
ignore_globs.update(ignores.get_user_ignores())  | 
|
| 
1836.1.4
by John Arbash Meinel
 Cleanup is_ignored to handle comment lines, and a global ignore pattern  | 
1290  | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
1291  | 
if self.has_filename(bzrlib.IGNORE_FILENAME):  | 
1292  | 
f = self.get_file_byname(bzrlib.IGNORE_FILENAME)  | 
|
| 
1836.1.4
by John Arbash Meinel
 Cleanup is_ignored to handle comment lines, and a global ignore pattern  | 
1293  | 
try:  | 
| 
1836.1.30
by John Arbash Meinel
 Change ignore functions to use sets instead of lists.  | 
1294  | 
ignore_globs.update(ignores.parse_ignore_file(f))  | 
| 
1836.1.4
by John Arbash Meinel
 Cleanup is_ignored to handle comment lines, and a global ignore pattern  | 
1295  | 
finally:  | 
1296  | 
f.close()  | 
|
1297  | 
||
| 
1836.1.30
by John Arbash Meinel
 Change ignore functions to use sets instead of lists.  | 
1298  | 
self._ignoreset = ignore_globs  | 
| 
1836.1.4
by John Arbash Meinel
 Cleanup is_ignored to handle comment lines, and a global ignore pattern  | 
1299  | 
self._ignore_regex = self._combine_ignore_rules(ignore_globs)  | 
1300  | 
return ignore_globs  | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
1301  | 
|
| 
1713.2.3
by Robert Collins
 Combine ignore rules into a single regex preventing pathological behaviour during add.  | 
1302  | 
def _get_ignore_rules_as_regex(self):  | 
1303  | 
"""Return a regex of the ignore rules and a mapping dict.  | 
|
1304  | 
||
1305  | 
        :return: (ignore rules compiled regex, dictionary mapping rule group 
 | 
|
1306  | 
        indices to original rule.)
 | 
|
1307  | 
        """
 | 
|
| 
1836.1.30
by John Arbash Meinel
 Change ignore functions to use sets instead of lists.  | 
1308  | 
if getattr(self, '_ignoreset', None) is None:  | 
| 
1713.2.3
by Robert Collins
 Combine ignore rules into a single regex preventing pathological behaviour during add.  | 
1309  | 
self.get_ignore_list()  | 
1310  | 
return self._ignore_regex  | 
|
1311  | 
||
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
1312  | 
def is_ignored(self, filename):  | 
1313  | 
r"""Check whether the filename matches an ignore pattern.  | 
|
1314  | 
||
1315  | 
        Patterns containing '/' or '\' need to match the whole path;
 | 
|
1316  | 
        others match against only the last component.
 | 
|
1317  | 
||
1318  | 
        If the file is ignored, returns the pattern which caused it to
 | 
|
1319  | 
        be ignored, otherwise None.  So this can simply be used as a
 | 
|
1320  | 
        boolean if desired."""
 | 
|
1321  | 
||
1322  | 
        # TODO: Use '**' to match directories, and other extended
 | 
|
1323  | 
        # globbing stuff from cvs/rsync.
 | 
|
1324  | 
||
1325  | 
        # XXX: fnmatch is actually not quite what we want: it's only
 | 
|
1326  | 
        # approximately the same as real Unix fnmatch, and doesn't
 | 
|
1327  | 
        # treat dotfiles correctly and allows * to match /.
 | 
|
1328  | 
        # Eventually it should be replaced with something more
 | 
|
1329  | 
        # accurate.
 | 
|
| 
1713.2.5
by Robert Collins
 Support more than 100 ignore rules.  | 
1330  | 
|
1331  | 
rules = self._get_ignore_rules_as_regex()  | 
|
1332  | 
for regex, mapping in rules:  | 
|
1333  | 
match = regex.match(filename)  | 
|
1334  | 
if match is not None:  | 
|
| 
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.  | 
1335  | 
                # one or more of the groups in mapping will have a non-None
 | 
1336  | 
                # group match.
 | 
|
| 
1713.2.5
by Robert Collins
 Support more than 100 ignore rules.  | 
1337  | 
groups = match.groups()  | 
1338  | 
rules = [mapping[group] for group in  | 
|
1339  | 
mapping if groups[group] is not None]  | 
|
1340  | 
return rules[0]  | 
|
| 
1707.2.5
by Robert Collins
 slightly improve add  | 
1341  | 
return None  | 
| 
1185.14.6
by Aaron Bentley
 Made iter_conflicts a WorkingTree method  | 
1342  | 
|
| 
1185.12.28
by Aaron Bentley
 Removed use of readonly path for executability test  | 
1343  | 
def kind(self, file_id):  | 
1344  | 
return file_kind(self.id2abspath(file_id))  | 
|
1345  | 
||
| 
1534.4.35
by Robert Collins
 Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()  | 
1346  | 
def last_revision(self):  | 
| 
1986.1.6
by Robert Collins
 Add MemoryTree.last_revision.  | 
1347  | 
"""Return the last revision of the branch for this tree.  | 
1348  | 
||
1349  | 
        This format tree does not support a separate marker for last-revision
 | 
|
1350  | 
        compared to the branch.
 | 
|
1351  | 
||
1352  | 
        See MutableTree.last_revision
 | 
|
| 
1534.4.35
by Robert Collins
 Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()  | 
1353  | 
        """
 | 
| 
1908.7.6
by Robert Collins
 Deprecate WorkingTree.last_revision.  | 
1354  | 
return self._last_revision()  | 
1355  | 
||
1356  | 
    @needs_read_lock
 | 
|
1357  | 
def _last_revision(self):  | 
|
1358  | 
"""helper for get_parent_ids."""  | 
|
| 
1534.4.35
by Robert Collins
 Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()  | 
1359  | 
return self.branch.last_revision()  | 
1360  | 
||
| 
1694.2.6
by Martin Pool
 [merge] bzr.dev  | 
1361  | 
def is_locked(self):  | 
1362  | 
return self._control_files.is_locked()  | 
|
1363  | 
||
| 
1442.1.65
by Robert Collins
 Branch.remove has been moved to WorkingTree.  | 
1364  | 
def lock_read(self):  | 
1365  | 
"""See Branch.lock_read, and WorkingTree.unlock."""  | 
|
| 
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.  | 
1366  | 
self.branch.lock_read()  | 
1367  | 
try:  | 
|
1368  | 
return self._control_files.lock_read()  | 
|
1369  | 
except:  | 
|
1370  | 
self.branch.unlock()  | 
|
1371  | 
            raise
 | 
|
| 
1442.1.65
by Robert Collins
 Branch.remove has been moved to WorkingTree.  | 
1372  | 
|
| 
1997.1.1
by Robert Collins
 Add WorkingTree.lock_tree_write.  | 
1373  | 
def lock_tree_write(self):  | 
| 
1986.1.8
by Robert Collins
 Update to bzr.dev, which involves adding lock_tree_write to MutableTree and MemoryTree.  | 
1374  | 
"""See MutableTree.lock_tree_write, and WorkingTree.unlock."""  | 
| 
1997.1.1
by Robert Collins
 Add WorkingTree.lock_tree_write.  | 
1375  | 
self.branch.lock_read()  | 
1376  | 
try:  | 
|
1377  | 
return self._control_files.lock_write()  | 
|
1378  | 
except:  | 
|
1379  | 
self.branch.unlock()  | 
|
1380  | 
            raise
 | 
|
1381  | 
||
| 
1442.1.65
by Robert Collins
 Branch.remove has been moved to WorkingTree.  | 
1382  | 
def lock_write(self):  | 
| 
1986.1.2
by Robert Collins
 Various changes to allow non-workingtree specific tests to run entirely  | 
1383  | 
"""See MutableTree.lock_write, and WorkingTree.unlock."""  | 
| 
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.  | 
1384  | 
self.branch.lock_write()  | 
1385  | 
try:  | 
|
1386  | 
return self._control_files.lock_write()  | 
|
1387  | 
except:  | 
|
1388  | 
self.branch.unlock()  | 
|
1389  | 
            raise
 | 
|
| 
1442.1.65
by Robert Collins
 Branch.remove has been moved to WorkingTree.  | 
1390  | 
|
| 
1694.2.6
by Martin Pool
 [merge] bzr.dev  | 
1391  | 
def get_physical_lock_status(self):  | 
1392  | 
return self._control_files.get_physical_lock_status()  | 
|
1393  | 
||
| 
1638.1.2
by Robert Collins
 Change the basis-inventory file to not have the revision-id in the file name.  | 
1394  | 
def _basis_inventory_name(self):  | 
| 
1910.2.31
by Aaron Bentley
 Fix bugs in basis inventory handling, change filename  | 
1395  | 
return 'basis-inventory-cache'  | 
| 
1185.33.59
by Martin Pool
 [patch] keep a cached basis inventory (Johan Rydberg)  | 
1396  | 
|
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
1397  | 
    @needs_tree_write_lock
 | 
| 
1638.1.2
by Robert Collins
 Change the basis-inventory file to not have the revision-id in the file name.  | 
1398  | 
def set_last_revision(self, new_revision):  | 
| 
1508.1.19
by Robert Collins
 Give format3 working trees their own last-revision marker.  | 
1399  | 
"""Change the last revision in the working tree."""  | 
1400  | 
if self._change_last_revision(new_revision):  | 
|
1401  | 
self._cache_basis_inventory(new_revision)  | 
|
1402  | 
||
1403  | 
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.  | 
1404  | 
"""Template method part of set_last_revision to perform the change.  | 
1405  | 
        
 | 
|
1406  | 
        This is used to allow WorkingTree3 instances to not affect branch
 | 
|
1407  | 
        when their last revision is set.
 | 
|
1408  | 
        """
 | 
|
| 
1534.4.35
by Robert Collins
 Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()  | 
1409  | 
if new_revision is None:  | 
1410  | 
self.branch.set_revision_history([])  | 
|
| 
1508.1.19
by Robert Collins
 Give format3 working trees their own last-revision marker.  | 
1411  | 
return False  | 
| 
1534.4.35
by Robert Collins
 Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()  | 
1412  | 
try:  | 
| 
1908.1.1
by Robert Collins
 Relax WorkingTree.set_last-revision to allow any revision to be set.  | 
1413  | 
self.branch.generate_revision_history(new_revision)  | 
1414  | 
except errors.NoSuchRevision:  | 
|
1415  | 
            # not present in the repo - dont try to set it deeper than the tip
 | 
|
1416  | 
self.branch.set_revision_history([new_revision])  | 
|
| 
1508.1.19
by Robert Collins
 Give format3 working trees their own last-revision marker.  | 
1417  | 
return True  | 
1418  | 
||
| 
2041.1.2
by John Arbash Meinel
 Update WorkingTree.set_parent_trees() to directly cache inv.  | 
1419  | 
def _write_basis_inventory(self, xml):  | 
1420  | 
"""Write the basis inventory XML to the basis-inventory file"""  | 
|
1421  | 
assert isinstance(xml, str), 'serialised xml must be bytestring.'  | 
|
1422  | 
path = self._basis_inventory_name()  | 
|
1423  | 
sio = StringIO(xml)  | 
|
1424  | 
self._control_files.put(path, sio)  | 
|
1425  | 
||
1426  | 
def _create_basis_xml_from_inventory(self, revision_id, inventory):  | 
|
1427  | 
"""Create the text that will be saved in basis-inventory"""  | 
|
1428  | 
inventory.revision_id = revision_id  | 
|
1429  | 
return bzrlib.xml6.serializer_v6.write_inventory_to_string(inventory)  | 
|
1430  | 
||
| 
1508.1.19
by Robert Collins
 Give format3 working trees their own last-revision marker.  | 
1431  | 
def _cache_basis_inventory(self, new_revision):  | 
1432  | 
"""Cache new_revision as the basis inventory."""  | 
|
| 
1740.2.3
by Aaron Bentley
 Only reserialize the working tree basis inventory when needed.  | 
1433  | 
        # TODO: this should allow the ready-to-use inventory to be passed in,
 | 
1434  | 
        # as commit already has that ready-to-use [while the format is the
 | 
|
1435  | 
        # same, that is].
 | 
|
| 
1185.33.59
by Martin Pool
 [patch] keep a cached basis inventory (Johan Rydberg)  | 
1436  | 
try:  | 
| 
1638.1.2
by Robert Collins
 Change the basis-inventory file to not have the revision-id in the file name.  | 
1437  | 
            # this double handles the inventory - unpack and repack - 
 | 
1438  | 
            # but is easier to understand. We can/should put a conditional
 | 
|
1439  | 
            # in here based on whether the inventory is in the latest format
 | 
|
1440  | 
            # - perhaps we should repack all inventories on a repository
 | 
|
1441  | 
            # upgrade ?
 | 
|
| 
1740.2.3
by Aaron Bentley
 Only reserialize the working tree basis inventory when needed.  | 
1442  | 
            # the fast path is to copy the raw xml from the repository. If the
 | 
1443  | 
            # xml contains 'revision_id="', then we assume the right 
 | 
|
1444  | 
            # revision_id is set. We must check for this full string, because a
 | 
|
1445  | 
            # root node id can legitimately look like 'revision_id' but cannot
 | 
|
1446  | 
            # contain a '"'.
 | 
|
1447  | 
xml = self.branch.repository.get_inventory_xml(new_revision)  | 
|
| 
1910.2.22
by Aaron Bentley
 Make commits preserve root entry data  | 
1448  | 
firstline = xml.split('\n', 1)[0]  | 
1449  | 
if (not 'revision_id="' in firstline or  | 
|
| 
1910.2.31
by Aaron Bentley
 Fix bugs in basis inventory handling, change filename  | 
1450  | 
'format="6"' not in firstline):  | 
| 
1740.2.3
by Aaron Bentley
 Only reserialize the working tree basis inventory when needed.  | 
1451  | 
inv = self.branch.repository.deserialise_inventory(  | 
1452  | 
new_revision, xml)  | 
|
| 
2041.1.2
by John Arbash Meinel
 Update WorkingTree.set_parent_trees() to directly cache inv.  | 
1453  | 
xml = self._create_basis_xml_from_inventory(new_revision, inv)  | 
1454  | 
self._write_basis_inventory(xml)  | 
|
| 
1908.1.1
by Robert Collins
 Relax WorkingTree.set_last-revision to allow any revision to be set.  | 
1455  | 
except (errors.NoSuchRevision, errors.RevisionNotPresent):  | 
| 
1185.33.59
by Martin Pool
 [patch] keep a cached basis inventory (Johan Rydberg)  | 
1456  | 
            pass
 | 
1457  | 
||
| 
1638.1.2
by Robert Collins
 Change the basis-inventory file to not have the revision-id in the file name.  | 
1458  | 
def read_basis_inventory(self):  | 
| 
1185.33.59
by Martin Pool
 [patch] keep a cached basis inventory (Johan Rydberg)  | 
1459  | 
"""Read the cached basis inventory."""  | 
| 
1638.1.2
by Robert Collins
 Change the basis-inventory file to not have the revision-id in the file name.  | 
1460  | 
path = self._basis_inventory_name()  | 
| 
1757.1.3
by Robert Collins
 Dont treat the basis inventory xml as ascii - its utf8 and should be preserved as such.  | 
1461  | 
return self._control_files.get(path).read()  | 
| 
1185.33.59
by Martin Pool
 [patch] keep a cached basis inventory (Johan Rydberg)  | 
1462  | 
|
| 
1497
by Robert Collins
 Move Branch.read_working_inventory to WorkingTree.  | 
1463  | 
    @needs_read_lock
 | 
1464  | 
def read_working_inventory(self):  | 
|
1465  | 
"""Read the working inventory."""  | 
|
1466  | 
        # ElementTree does its own conversion from UTF-8, so open in
 | 
|
1467  | 
        # binary.
 | 
|
| 
1534.4.35
by Robert Collins
 Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()  | 
1468  | 
result = bzrlib.xml5.serializer_v5.read_inventory(  | 
| 
1534.4.28
by Robert Collins
 first cut at merge from integration.  | 
1469  | 
self._control_files.get('inventory'))  | 
| 
1534.4.35
by Robert Collins
 Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()  | 
1470  | 
self._set_inventory(result)  | 
1471  | 
return result  | 
|
| 
1497
by Robert Collins
 Move Branch.read_working_inventory to WorkingTree.  | 
1472  | 
|
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
1473  | 
    @needs_tree_write_lock
 | 
| 
1685.1.77
by Wouter van Heyst
 WorkingTree.remove takes an optional output file  | 
1474  | 
def remove(self, files, verbose=False, to_file=None):  | 
| 
1442.1.65
by Robert Collins
 Branch.remove has been moved to WorkingTree.  | 
1475  | 
"""Remove nominated files from the working inventory..  | 
1476  | 
||
1477  | 
        This does not remove their text.  This does not run on XXX on what? RBC
 | 
|
1478  | 
||
1479  | 
        TODO: Refuse to remove modified files unless --force is given?
 | 
|
1480  | 
||
1481  | 
        TODO: Do something useful with directories.
 | 
|
1482  | 
||
1483  | 
        TODO: Should this remove the text or not?  Tough call; not
 | 
|
1484  | 
        removing may be useful and the user can just use use rm, and
 | 
|
1485  | 
        is the opposite of add.  Removing it is consistent with most
 | 
|
1486  | 
        other tools.  Maybe an option.
 | 
|
1487  | 
        """
 | 
|
1488  | 
        ## TODO: Normalize names
 | 
|
1489  | 
        ## TODO: Remove nested loops; better scalability
 | 
|
1490  | 
if isinstance(files, basestring):  | 
|
1491  | 
files = [files]  | 
|
1492  | 
||
1493  | 
inv = self.inventory  | 
|
1494  | 
||
1495  | 
        # do this before any modifications
 | 
|
1496  | 
for f in files:  | 
|
1497  | 
fid = inv.path2id(f)  | 
|
1498  | 
if not fid:  | 
|
| 
1185.16.72
by Martin Pool
 [merge] from robert and fix up tests  | 
1499  | 
                # TODO: Perhaps make this just a warning, and continue?
 | 
1500  | 
                # This tends to happen when 
 | 
|
1501  | 
raise NotVersionedError(path=f)  | 
|
| 
1442.1.65
by Robert Collins
 Branch.remove has been moved to WorkingTree.  | 
1502  | 
if verbose:  | 
1503  | 
                # having remove it, it must be either ignored or unknown
 | 
|
1504  | 
if self.is_ignored(f):  | 
|
1505  | 
new_status = 'I'  | 
|
1506  | 
else:  | 
|
1507  | 
new_status = '?'  | 
|
| 
1773.4.1
by Martin Pool
 Add pyflakes makefile target; fix many warnings  | 
1508  | 
show_status(new_status, inv[fid].kind, f, to_file=to_file)  | 
| 
1442.1.65
by Robert Collins
 Branch.remove has been moved to WorkingTree.  | 
1509  | 
del inv[fid]  | 
1510  | 
||
| 
1457.1.11
by Robert Collins
 Move _write_inventory to WorkingTree.  | 
1511  | 
self._write_inventory(inv)  | 
| 
1442.1.65
by Robert Collins
 Branch.remove has been moved to WorkingTree.  | 
1512  | 
|
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
1513  | 
    @needs_tree_write_lock
 | 
| 
1534.9.4
by Aaron Bentley
 Added progress bars to revert.  | 
1514  | 
def revert(self, filenames, old_tree=None, backups=True,  | 
1515  | 
pb=DummyProgress()):  | 
|
| 
1534.7.47
by Aaron Bentley
 Started work on 'revert'  | 
1516  | 
from transform import revert  | 
| 
1534.10.14
by Aaron Bentley
 Made revert clear conflicts  | 
1517  | 
from conflicts import resolve  | 
| 
1501
by Robert Collins
 Move revert from Branch to WorkingTree.  | 
1518  | 
if old_tree is None:  | 
| 
1534.4.35
by Robert Collins
 Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()  | 
1519  | 
old_tree = self.basis_tree()  | 
| 
1558.7.13
by Aaron Bentley
 WorkingTree.revert returns conflicts  | 
1520  | 
conflicts = revert(self, old_tree, filenames, backups, pb)  | 
| 
1457.1.8
by Robert Collins
 Replace the WorkingTree.revert method algorithm with a call to merge_inner.  | 
1521  | 
if not len(filenames):  | 
| 
1908.6.7
by Robert Collins
 Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.  | 
1522  | 
self.set_parent_ids(self.get_parent_ids()[:1])  | 
| 
1534.10.14
by Aaron Bentley
 Made revert clear conflicts  | 
1523  | 
resolve(self)  | 
1524  | 
else:  | 
|
| 
1534.10.15
by Aaron Bentley
 Revert does resolve  | 
1525  | 
resolve(self, filenames, ignore_misses=True)  | 
| 
1558.7.13
by Aaron Bentley
 WorkingTree.revert returns conflicts  | 
1526  | 
return conflicts  | 
| 
1501
by Robert Collins
 Move revert from Branch to WorkingTree.  | 
1527  | 
|
| 
1658.1.3
by Martin Pool
 Doc  | 
1528  | 
    # XXX: This method should be deprecated in favour of taking in a proper
 | 
1529  | 
    # new Inventory object.
 | 
|
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
1530  | 
    @needs_tree_write_lock
 | 
| 
1497
by Robert Collins
 Move Branch.read_working_inventory to WorkingTree.  | 
1531  | 
def set_inventory(self, new_inventory_list):  | 
1532  | 
from bzrlib.inventory import (Inventory,  | 
|
1533  | 
InventoryDirectory,  | 
|
1534  | 
InventoryEntry,  | 
|
1535  | 
InventoryFile,  | 
|
1536  | 
InventoryLink)  | 
|
1537  | 
inv = Inventory(self.get_root_id())  | 
|
| 
1658.1.2
by Martin Pool
 Revert changes to WorkingTree.set_inventory to unbreak bzrtools  | 
1538  | 
for path, file_id, parent, kind in new_inventory_list:  | 
| 
1497
by Robert Collins
 Move Branch.read_working_inventory to WorkingTree.  | 
1539  | 
name = os.path.basename(path)  | 
1540  | 
if name == "":  | 
|
1541  | 
                continue
 | 
|
1542  | 
            # fixme, there should be a factory function inv,add_?? 
 | 
|
1543  | 
if kind == 'directory':  | 
|
1544  | 
inv.add(InventoryDirectory(file_id, name, parent))  | 
|
1545  | 
elif kind == 'file':  | 
|
| 
1658.1.2
by Martin Pool
 Revert changes to WorkingTree.set_inventory to unbreak bzrtools  | 
1546  | 
inv.add(InventoryFile(file_id, name, parent))  | 
| 
1497
by Robert Collins
 Move Branch.read_working_inventory to WorkingTree.  | 
1547  | 
elif kind == 'symlink':  | 
1548  | 
inv.add(InventoryLink(file_id, name, parent))  | 
|
1549  | 
else:  | 
|
1550  | 
raise BzrError("unknown kind %r" % kind)  | 
|
| 
1457.1.11
by Robert Collins
 Move _write_inventory to WorkingTree.  | 
1551  | 
self._write_inventory(inv)  | 
| 
1497
by Robert Collins
 Move Branch.read_working_inventory to WorkingTree.  | 
1552  | 
|
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
1553  | 
    @needs_tree_write_lock
 | 
| 
1457.1.10
by Robert Collins
 Move set_root_id to WorkingTree.  | 
1554  | 
def set_root_id(self, file_id):  | 
1555  | 
"""Set the root id for this tree."""  | 
|
1556  | 
inv = self.read_working_inventory()  | 
|
1557  | 
orig_root_id = inv.root.file_id  | 
|
1558  | 
del inv._byid[inv.root.file_id]  | 
|
1559  | 
inv.root.file_id = file_id  | 
|
1560  | 
inv._byid[inv.root.file_id] = inv.root  | 
|
1561  | 
for fid in inv:  | 
|
1562  | 
entry = inv[fid]  | 
|
| 
1534.4.35
by Robert Collins
 Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()  | 
1563  | 
if entry.parent_id == orig_root_id:  | 
| 
1457.1.10
by Robert Collins
 Move set_root_id to WorkingTree.  | 
1564  | 
entry.parent_id = inv.root.file_id  | 
| 
1457.1.11
by Robert Collins
 Move _write_inventory to WorkingTree.  | 
1565  | 
self._write_inventory(inv)  | 
| 
1457.1.10
by Robert Collins
 Move set_root_id to WorkingTree.  | 
1566  | 
|
| 
1442.1.65
by Robert Collins
 Branch.remove has been moved to WorkingTree.  | 
1567  | 
def unlock(self):  | 
1568  | 
"""See Branch.unlock.  | 
|
1569  | 
        
 | 
|
1570  | 
        WorkingTree locking just uses the Branch locking facilities.
 | 
|
1571  | 
        This is current because all working trees have an embedded branch
 | 
|
1572  | 
        within them. IF in the future, we were to make branch data shareable
 | 
|
1573  | 
        between multiple working trees, i.e. via shared storage, then we 
 | 
|
1574  | 
        would probably want to lock both the local tree, and the branch.
 | 
|
1575  | 
        """
 | 
|
| 
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.  | 
1576  | 
raise NotImplementedError(self.unlock)  | 
| 
1442.1.65
by Robert Collins
 Branch.remove has been moved to WorkingTree.  | 
1577  | 
|
| 
1457.1.11
by Robert Collins
 Move _write_inventory to WorkingTree.  | 
1578  | 
    @needs_write_lock
 | 
| 
1508.1.24
by Robert Collins
 Add update command for use with checkouts.  | 
1579  | 
def update(self):  | 
| 
1587.1.11
by Robert Collins
 Local commits appear to be working properly.  | 
1580  | 
"""Update a working tree along its branch.  | 
1581  | 
||
| 
1907.1.1
by Aaron Bentley
 Unshelved all changes except those related to removing RootEntry  | 
1582  | 
        This will update the branch if its bound too, which means we have multiple trees involved:
 | 
1583  | 
        The new basis tree of the master.
 | 
|
1584  | 
        The old basis tree of the branch.
 | 
|
1585  | 
        The old basis tree of the working tree.
 | 
|
1586  | 
        The current working tree state.
 | 
|
1587  | 
        pathologically all three may be different, and non ancestors of each other.
 | 
|
1588  | 
        Conceptually we want to:
 | 
|
1589  | 
        Preserve the wt.basis->wt.state changes
 | 
|
1590  | 
        Transform the wt.basis to the new master basis.
 | 
|
1591  | 
        Apply a merge of the old branch basis to get any 'local' changes from it into the tree.
 | 
|
1592  | 
        Restore the wt.basis->wt.state changes.
 | 
|
| 
1587.1.11
by Robert Collins
 Local commits appear to be working properly.  | 
1593  | 
|
1594  | 
        There isn't a single operation at the moment to do that, so we:
 | 
|
| 
1907.1.1
by Aaron Bentley
 Unshelved all changes except those related to removing RootEntry  | 
1595  | 
        Merge current state -> basis tree of the master w.r.t. the old tree basis.
 | 
1596  | 
        Do a 'normal' merge of the old branch basis if it is relevant.
 | 
|
| 
1587.1.11
by Robert Collins
 Local commits appear to be working properly.  | 
1597  | 
        """
 | 
| 
1587.1.10
by Robert Collins
 update updates working tree and branch together.  | 
1598  | 
old_tip = self.branch.update()  | 
| 
1927.2.3
by Robert Collins
 review comment application - paired with Martin.  | 
1599  | 
        # here if old_tip is not None, it is the old tip of the branch before
 | 
1600  | 
        # it was updated from the master branch. This should become a pending
 | 
|
1601  | 
        # merge in the working tree to preserve the user existing work.  we
 | 
|
1602  | 
        # cant set that until we update the working trees last revision to be
 | 
|
1603  | 
        # one from the new branch, because it will just get absorbed by the
 | 
|
1604  | 
        # parent de-duplication logic.
 | 
|
1605  | 
        # 
 | 
|
1606  | 
        # We MUST save it even if an error occurs, because otherwise the users
 | 
|
1607  | 
        # local work is unreferenced and will appear to have been lost.
 | 
|
1608  | 
        # 
 | 
|
1609  | 
result = 0  | 
|
| 
1908.7.6
by Robert Collins
 Deprecate WorkingTree.last_revision.  | 
1610  | 
try:  | 
1611  | 
last_rev = self.get_parent_ids()[0]  | 
|
1612  | 
except IndexError:  | 
|
1613  | 
last_rev = None  | 
|
1614  | 
if last_rev != self.branch.last_revision():  | 
|
| 
1927.2.3
by Robert Collins
 review comment application - paired with Martin.  | 
1615  | 
            # merge tree state up to new branch tip.
 | 
1616  | 
basis = self.basis_tree()  | 
|
1617  | 
to_tree = self.branch.basis_tree()  | 
|
1618  | 
result += merge_inner(self.branch,  | 
|
1619  | 
to_tree,  | 
|
1620  | 
basis,  | 
|
1621  | 
this_tree=self)  | 
|
| 
1908.6.6
by Robert Collins
 Merge updated set_parents api.  | 
1622  | 
            # TODO - dedup parents list with things merged by pull ?
 | 
1623  | 
            # reuse the tree we've updated to to set the basis:
 | 
|
1624  | 
parent_trees = [(self.branch.last_revision(), to_tree)]  | 
|
1625  | 
merges = self.get_parent_ids()[1:]  | 
|
1626  | 
            # Ideally we ask the tree for the trees here, that way the working
 | 
|
1627  | 
            # tree can decide whether to give us teh entire tree or give us a
 | 
|
1628  | 
            # lazy initialised tree. dirstate for instance will have the trees
 | 
|
1629  | 
            # in ram already, whereas a last-revision + basis-inventory tree
 | 
|
1630  | 
            # will not, but also does not need them when setting parents.
 | 
|
1631  | 
for parent in merges:  | 
|
1632  | 
parent_trees.append(  | 
|
1633  | 
(parent, self.branch.repository.revision_tree(parent)))  | 
|
1634  | 
if old_tip is not None:  | 
|
1635  | 
parent_trees.append(  | 
|
1636  | 
(old_tip, self.branch.repository.revision_tree(old_tip)))  | 
|
1637  | 
self.set_parent_trees(parent_trees)  | 
|
| 
1908.7.6
by Robert Collins
 Deprecate WorkingTree.last_revision.  | 
1638  | 
last_rev = parent_trees[0][0]  | 
| 
1927.2.3
by Robert Collins
 review comment application - paired with Martin.  | 
1639  | 
else:  | 
1640  | 
            # the working tree had the same last-revision as the master
 | 
|
1641  | 
            # branch did. We may still have pivot local work from the local
 | 
|
1642  | 
            # branch into old_tip:
 | 
|
| 
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.  | 
1643  | 
if old_tip is not None:  | 
| 
1908.6.7
by Robert Collins
 Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.  | 
1644  | 
self.add_parent_tree_id(old_tip)  | 
| 
1908.7.6
by Robert Collins
 Deprecate WorkingTree.last_revision.  | 
1645  | 
if old_tip and old_tip != last_rev:  | 
| 
1927.2.3
by Robert Collins
 review comment application - paired with Martin.  | 
1646  | 
            # our last revision was not the prior branch last revision
 | 
1647  | 
            # and we have converted that last revision to a pending merge.
 | 
|
1648  | 
            # base is somewhere between the branch tip now
 | 
|
1649  | 
            # and the now pending merge
 | 
|
1650  | 
from bzrlib.revision import common_ancestor  | 
|
1651  | 
try:  | 
|
1652  | 
base_rev_id = common_ancestor(self.branch.last_revision(),  | 
|
1653  | 
old_tip,  | 
|
1654  | 
self.branch.repository)  | 
|
1655  | 
except errors.NoCommonAncestor:  | 
|
1656  | 
base_rev_id = None  | 
|
1657  | 
base_tree = self.branch.repository.revision_tree(base_rev_id)  | 
|
1658  | 
other_tree = self.branch.repository.revision_tree(old_tip)  | 
|
1659  | 
result += merge_inner(self.branch,  | 
|
1660  | 
other_tree,  | 
|
1661  | 
base_tree,  | 
|
1662  | 
this_tree=self)  | 
|
1663  | 
return result  | 
|
| 
1508.1.24
by Robert Collins
 Add update command for use with checkouts.  | 
1664  | 
|
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
1665  | 
    @needs_tree_write_lock
 | 
| 
1457.1.11
by Robert Collins
 Move _write_inventory to WorkingTree.  | 
1666  | 
def _write_inventory(self, inv):  | 
1667  | 
"""Write inventory as the current inventory."""  | 
|
1668  | 
sio = StringIO()  | 
|
1669  | 
bzrlib.xml5.serializer_v5.write_inventory(inv, sio)  | 
|
1670  | 
sio.seek(0)  | 
|
| 
1534.4.28
by Robert Collins
 first cut at merge from integration.  | 
1671  | 
self._control_files.put('inventory', sio)  | 
| 
1508.1.10
by Robert Collins
 bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)  | 
1672  | 
self._set_inventory(inv)  | 
| 
1457.1.11
by Robert Collins
 Move _write_inventory to WorkingTree.  | 
1673  | 
mutter('wrote working inventory')  | 
| 
1508.1.19
by Robert Collins
 Give format3 working trees their own last-revision marker.  | 
1674  | 
|
| 
1534.10.22
by Aaron Bentley
 Got ConflictList implemented  | 
1675  | 
def set_conflicts(self, arg):  | 
1676  | 
raise UnsupportedOperation(self.set_conflicts, self)  | 
|
| 
1534.10.8
by Aaron Bentley
 Implemented conflict_lines in terms of old system on WorkingTree  | 
1677  | 
|
| 
1551.7.11
by Aaron Bentley
 Add WorkingTree.add_conflicts  | 
1678  | 
def add_conflicts(self, arg):  | 
1679  | 
raise UnsupportedOperation(self.add_conflicts, self)  | 
|
1680  | 
||
| 
1534.10.8
by Aaron Bentley
 Implemented conflict_lines in terms of old system on WorkingTree  | 
1681  | 
    @needs_read_lock
 | 
| 
1534.10.22
by Aaron Bentley
 Got ConflictList implemented  | 
1682  | 
def conflicts(self):  | 
1683  | 
conflicts = ConflictList()  | 
|
| 
1534.10.9
by Aaron Bentley
 Switched display functions to conflict_lines  | 
1684  | 
for conflicted in self._iter_conflicts():  | 
| 
1534.10.8
by Aaron Bentley
 Implemented conflict_lines in terms of old system on WorkingTree  | 
1685  | 
text = True  | 
1686  | 
try:  | 
|
1687  | 
if file_kind(self.abspath(conflicted)) != "file":  | 
|
1688  | 
text = False  | 
|
| 
1757.2.4
by Robert Collins
 Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add.  | 
1689  | 
except errors.NoSuchFile:  | 
1690  | 
text = False  | 
|
| 
1534.10.8
by Aaron Bentley
 Implemented conflict_lines in terms of old system on WorkingTree  | 
1691  | 
if text is True:  | 
1692  | 
for suffix in ('.THIS', '.OTHER'):  | 
|
1693  | 
try:  | 
|
1694  | 
kind = file_kind(self.abspath(conflicted+suffix))  | 
|
| 
1757.2.4
by Robert Collins
 Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add.  | 
1695  | 
if kind != "file":  | 
| 
1534.10.8
by Aaron Bentley
 Implemented conflict_lines in terms of old system on WorkingTree  | 
1696  | 
text = False  | 
| 
1757.2.4
by Robert Collins
 Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add.  | 
1697  | 
except errors.NoSuchFile:  | 
| 
1534.10.8
by Aaron Bentley
 Implemented conflict_lines in terms of old system on WorkingTree  | 
1698  | 
text = False  | 
| 
1757.2.4
by Robert Collins
 Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add.  | 
1699  | 
if text == False:  | 
| 
1534.10.8
by Aaron Bentley
 Implemented conflict_lines in terms of old system on WorkingTree  | 
1700  | 
                        break
 | 
1701  | 
ctype = {True: 'text conflict', False: 'contents conflict'}[text]  | 
|
| 
1534.10.22
by Aaron Bentley
 Got ConflictList implemented  | 
1702  | 
conflicts.append(Conflict.factory(ctype, path=conflicted,  | 
1703  | 
file_id=self.path2id(conflicted)))  | 
|
1704  | 
return conflicts  | 
|
1705  | 
||
| 
1508.1.19
by Robert Collins
 Give format3 working trees their own last-revision marker.  | 
1706  | 
|
| 
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.  | 
1707  | 
class WorkingTree2(WorkingTree):  | 
1708  | 
"""This is the Format 2 working tree.  | 
|
1709  | 
||
1710  | 
    This was the first weave based working tree. 
 | 
|
1711  | 
     - uses os locks for locking.
 | 
|
1712  | 
     - uses the branch last-revision.
 | 
|
1713  | 
    """
 | 
|
1714  | 
||
| 
1997.1.1
by Robert Collins
 Add WorkingTree.lock_tree_write.  | 
1715  | 
def lock_tree_write(self):  | 
1716  | 
"""See WorkingTree.lock_tree_write().  | 
|
1717  | 
||
1718  | 
        In Format2 WorkingTrees we have a single lock for the branch and tree
 | 
|
1719  | 
        so lock_tree_write() degrades to lock_write().
 | 
|
1720  | 
        """
 | 
|
1721  | 
self.branch.lock_write()  | 
|
1722  | 
try:  | 
|
1723  | 
return self._control_files.lock_write()  | 
|
1724  | 
except:  | 
|
1725  | 
self.branch.unlock()  | 
|
1726  | 
            raise
 | 
|
1727  | 
||
| 
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.  | 
1728  | 
def unlock(self):  | 
1729  | 
        # we share control files:
 | 
|
1730  | 
if self._hashcache.needs_write and self._control_files._lock_count==3:  | 
|
1731  | 
self._hashcache.write()  | 
|
1732  | 
        # reverse order of locking.
 | 
|
1733  | 
try:  | 
|
1734  | 
return self._control_files.unlock()  | 
|
1735  | 
finally:  | 
|
1736  | 
self.branch.unlock()  | 
|
1737  | 
||
1738  | 
||
| 
1508.1.19
by Robert Collins
 Give format3 working trees their own last-revision marker.  | 
1739  | 
class WorkingTree3(WorkingTree):  | 
1740  | 
"""This is the Format 3 working tree.  | 
|
1741  | 
||
1742  | 
    This differs from the base WorkingTree by:
 | 
|
1743  | 
     - having its own file lock
 | 
|
1744  | 
     - having its own last-revision property.
 | 
|
| 
1553.5.74
by Martin Pool
 Convert WorkingTree format3 to use LockDirs  | 
1745  | 
|
1746  | 
    This is new in bzr 0.8
 | 
|
| 
1508.1.19
by Robert Collins
 Give format3 working trees their own last-revision marker.  | 
1747  | 
    """
 | 
1748  | 
||
1749  | 
    @needs_read_lock
 | 
|
| 
1908.7.6
by Robert Collins
 Deprecate WorkingTree.last_revision.  | 
1750  | 
def _last_revision(self):  | 
| 
1986.1.6
by Robert Collins
 Add MemoryTree.last_revision.  | 
1751  | 
"""See Mutable.last_revision."""  | 
| 
1508.1.19
by Robert Collins
 Give format3 working trees their own last-revision marker.  | 
1752  | 
try:  | 
1753  | 
return self._control_files.get_utf8('last-revision').read()  | 
|
1754  | 
except NoSuchFile:  | 
|
1755  | 
return None  | 
|
1756  | 
||
1757  | 
def _change_last_revision(self, revision_id):  | 
|
1758  | 
"""See WorkingTree._change_last_revision."""  | 
|
1759  | 
if revision_id is None or revision_id == NULL_REVISION:  | 
|
1760  | 
try:  | 
|
1761  | 
self._control_files._transport.delete('last-revision')  | 
|
1762  | 
except errors.NoSuchFile:  | 
|
1763  | 
                pass
 | 
|
1764  | 
return False  | 
|
1765  | 
else:  | 
|
1766  | 
self._control_files.put_utf8('last-revision', revision_id)  | 
|
1767  | 
return True  | 
|
1768  | 
||
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
1769  | 
    @needs_tree_write_lock
 | 
| 
1534.10.22
by Aaron Bentley
 Got ConflictList implemented  | 
1770  | 
def set_conflicts(self, conflicts):  | 
1771  | 
self._put_rio('conflicts', conflicts.to_stanzas(),  | 
|
| 
1534.10.21
by Aaron Bentley
 Moved and renamed conflict functions  | 
1772  | 
CONFLICT_HEADER_1)  | 
| 
1534.10.6
by Aaron Bentley
 Conflict serialization working for WorkingTree3  | 
1773  | 
|
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
1774  | 
    @needs_tree_write_lock
 | 
| 
1551.7.11
by Aaron Bentley
 Add WorkingTree.add_conflicts  | 
1775  | 
def add_conflicts(self, new_conflicts):  | 
1776  | 
conflict_set = set(self.conflicts())  | 
|
1777  | 
conflict_set.update(set(list(new_conflicts)))  | 
|
1778  | 
self.set_conflicts(ConflictList(sorted(conflict_set,  | 
|
1779  | 
key=Conflict.sort_key)))  | 
|
1780  | 
||
| 
1534.10.6
by Aaron Bentley
 Conflict serialization working for WorkingTree3  | 
1781  | 
    @needs_read_lock
 | 
| 
1534.10.22
by Aaron Bentley
 Got ConflictList implemented  | 
1782  | 
def conflicts(self):  | 
| 
1534.10.6
by Aaron Bentley
 Conflict serialization working for WorkingTree3  | 
1783  | 
try:  | 
1784  | 
confile = self._control_files.get('conflicts')  | 
|
1785  | 
except NoSuchFile:  | 
|
| 
1534.10.22
by Aaron Bentley
 Got ConflictList implemented  | 
1786  | 
return ConflictList()  | 
| 
1534.10.6
by Aaron Bentley
 Conflict serialization working for WorkingTree3  | 
1787  | 
try:  | 
1788  | 
if confile.next() != CONFLICT_HEADER_1 + '\n':  | 
|
1789  | 
raise ConflictFormatError()  | 
|
1790  | 
except StopIteration:  | 
|
1791  | 
raise ConflictFormatError()  | 
|
| 
1534.10.22
by Aaron Bentley
 Got ConflictList implemented  | 
1792  | 
return ConflictList.from_stanzas(RioReader(confile))  | 
| 
1534.10.6
by Aaron Bentley
 Conflict serialization working for WorkingTree3  | 
1793  | 
|
| 
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.  | 
1794  | 
def unlock(self):  | 
1795  | 
if self._hashcache.needs_write and self._control_files._lock_count==1:  | 
|
1796  | 
self._hashcache.write()  | 
|
1797  | 
        # reverse order of locking.
 | 
|
1798  | 
try:  | 
|
1799  | 
return self._control_files.unlock()  | 
|
1800  | 
finally:  | 
|
1801  | 
self.branch.unlock()  | 
|
1802  | 
||
| 
1534.10.6
by Aaron Bentley
 Conflict serialization working for WorkingTree3  | 
1803  | 
|
| 
1185.14.6
by Aaron Bentley
 Made iter_conflicts a WorkingTree method  | 
1804  | 
def get_conflicted_stem(path):  | 
1805  | 
for suffix in CONFLICT_SUFFIXES:  | 
|
1806  | 
if path.endswith(suffix):  | 
|
1807  | 
return path[:-len(suffix)]  | 
|
| 
1534.4.41
by Robert Collins
 Branch now uses BzrDir reasonably sanely.  | 
1808  | 
|
| 
1534.5.5
by Robert Collins
 Move is_control_file into WorkingTree.is_control_filename and test.  | 
1809  | 
@deprecated_function(zero_eight)  | 
| 
1534.4.41
by Robert Collins
 Branch now uses BzrDir reasonably sanely.  | 
1810  | 
def is_control_file(filename):  | 
| 
1534.5.5
by Robert Collins
 Move is_control_file into WorkingTree.is_control_filename and test.  | 
1811  | 
"""See WorkingTree.is_control_filename(filename)."""  | 
| 
1534.4.41
by Robert Collins
 Branch now uses BzrDir reasonably sanely.  | 
1812  | 
    ## FIXME: better check
 | 
1813  | 
filename = normpath(filename)  | 
|
1814  | 
while filename != '':  | 
|
1815  | 
head, tail = os.path.split(filename)  | 
|
1816  | 
        ## mutter('check %r for control file' % ((head, tail),))
 | 
|
| 
1534.5.5
by Robert Collins
 Move is_control_file into WorkingTree.is_control_filename and test.  | 
1817  | 
if tail == '.bzr':  | 
| 
1534.4.41
by Robert Collins
 Branch now uses BzrDir reasonably sanely.  | 
1818  | 
return True  | 
1819  | 
if filename == head:  | 
|
1820  | 
            break
 | 
|
1821  | 
filename = head  | 
|
1822  | 
return False  | 
|
1823  | 
||
1824  | 
||
| 
1534.4.45
by Robert Collins
 Start WorkingTree -> .bzr/checkout transition  | 
1825  | 
class WorkingTreeFormat(object):  | 
1826  | 
"""An encapsulation of the initialization and open routines for a format.  | 
|
1827  | 
||
1828  | 
    Formats provide three things:
 | 
|
1829  | 
     * An initialization routine,
 | 
|
1830  | 
     * a format string,
 | 
|
1831  | 
     * an open routine.
 | 
|
1832  | 
||
1833  | 
    Formats are placed in an dict by their format string for reference 
 | 
|
1834  | 
    during workingtree opening. Its not required that these be instances, they
 | 
|
1835  | 
    can be classes themselves with class methods - it simply depends on 
 | 
|
1836  | 
    whether state is needed for a given format or not.
 | 
|
1837  | 
||
1838  | 
    Once a format is deprecated, just deprecate the initialize and open
 | 
|
1839  | 
    methods on the format class. Do not deprecate the object, as the 
 | 
|
1840  | 
    object will be created every time regardless.
 | 
|
1841  | 
    """
 | 
|
1842  | 
||
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
1843  | 
_default_format = None  | 
1844  | 
"""The default format used for new trees."""  | 
|
1845  | 
||
1846  | 
_formats = {}  | 
|
1847  | 
"""The known formats."""  | 
|
1848  | 
||
1849  | 
    @classmethod
 | 
|
1850  | 
def find_format(klass, a_bzrdir):  | 
|
1851  | 
"""Return the format for the working tree object in a_bzrdir."""  | 
|
1852  | 
try:  | 
|
1853  | 
transport = a_bzrdir.get_workingtree_transport(None)  | 
|
1854  | 
format_string = transport.get("format").read()  | 
|
1855  | 
return klass._formats[format_string]  | 
|
1856  | 
except NoSuchFile:  | 
|
| 
1508.1.19
by Robert Collins
 Give format3 working trees their own last-revision marker.  | 
1857  | 
raise errors.NoWorkingTree(base=transport.base)  | 
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
1858  | 
except KeyError:  | 
| 
1740.5.6
by Martin Pool
 Clean up many exception classes.  | 
1859  | 
raise errors.UnknownFormatError(format=format_string)  | 
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
1860  | 
|
1861  | 
    @classmethod
 | 
|
1862  | 
def get_default_format(klass):  | 
|
1863  | 
"""Return the current default format."""  | 
|
1864  | 
return klass._default_format  | 
|
1865  | 
||
| 
1534.4.45
by Robert Collins
 Start WorkingTree -> .bzr/checkout transition  | 
1866  | 
def get_format_string(self):  | 
1867  | 
"""Return the ASCII format string that identifies this format."""  | 
|
1868  | 
raise NotImplementedError(self.get_format_string)  | 
|
1869  | 
||
| 
1624.3.19
by Olaf Conradi
 New call get_format_description to give a user-friendly description of a  | 
1870  | 
def get_format_description(self):  | 
1871  | 
"""Return the short description for this format."""  | 
|
1872  | 
raise NotImplementedError(self.get_format_description)  | 
|
1873  | 
||
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
1874  | 
def is_supported(self):  | 
1875  | 
"""Is this format supported?  | 
|
1876  | 
||
1877  | 
        Supported formats can be initialized and opened.
 | 
|
1878  | 
        Unsupported formats may not support initialization or committing or 
 | 
|
1879  | 
        some other features depending on the reason for not being supported.
 | 
|
1880  | 
        """
 | 
|
1881  | 
return True  | 
|
1882  | 
||
1883  | 
    @classmethod
 | 
|
1884  | 
def register_format(klass, format):  | 
|
1885  | 
klass._formats[format.get_format_string()] = format  | 
|
1886  | 
||
1887  | 
    @classmethod
 | 
|
1888  | 
def set_default_format(klass, format):  | 
|
1889  | 
klass._default_format = format  | 
|
1890  | 
||
1891  | 
    @classmethod
 | 
|
1892  | 
def unregister_format(klass, format):  | 
|
1893  | 
assert klass._formats[format.get_format_string()] is format  | 
|
1894  | 
del klass._formats[format.get_format_string()]  | 
|
1895  | 
||
| 
1534.4.45
by Robert Collins
 Start WorkingTree -> .bzr/checkout transition  | 
1896  | 
|
1897  | 
||
1898  | 
class WorkingTreeFormat2(WorkingTreeFormat):  | 
|
| 
1534.4.42
by Robert Collins
 add working tree to the BzrDir facilities.  | 
1899  | 
"""The second working tree format.  | 
1900  | 
||
1901  | 
    This format modified the hash cache from the format 1 hash cache.
 | 
|
1902  | 
    """
 | 
|
1903  | 
||
| 
1624.3.19
by Olaf Conradi
 New call get_format_description to give a user-friendly description of a  | 
1904  | 
def get_format_description(self):  | 
1905  | 
"""See WorkingTreeFormat.get_format_description()."""  | 
|
1906  | 
return "Working tree format 2"  | 
|
1907  | 
||
| 
1692.7.9
by Martin Pool
 Don't create broken standalone branches over sftp (Malone #43064)  | 
1908  | 
def stub_initialize_remote(self, control_files):  | 
1909  | 
"""As a special workaround create critical control files for a remote working tree  | 
|
1910  | 
        
 | 
|
1911  | 
        This ensures that it can later be updated and dealt with locally,
 | 
|
1912  | 
        since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with 
 | 
|
1913  | 
        no working tree.  (See bug #43064).
 | 
|
1914  | 
        """
 | 
|
1915  | 
sio = StringIO()  | 
|
1916  | 
inv = Inventory()  | 
|
1917  | 
bzrlib.xml5.serializer_v5.write_inventory(inv, sio)  | 
|
1918  | 
sio.seek(0)  | 
|
1919  | 
control_files.put('inventory', sio)  | 
|
1920  | 
||
1921  | 
control_files.put_utf8('pending-merges', '')  | 
|
1922  | 
||
1923  | 
||
| 
1508.1.21
by Robert Collins
 Implement -r limit for checkout command.  | 
1924  | 
def initialize(self, a_bzrdir, revision_id=None):  | 
| 
1534.4.42
by Robert Collins
 add working tree to the BzrDir facilities.  | 
1925  | 
"""See WorkingTreeFormat.initialize()."""  | 
1926  | 
if not isinstance(a_bzrdir.transport, LocalTransport):  | 
|
1927  | 
raise errors.NotLocalUrl(a_bzrdir.transport.base)  | 
|
| 
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.  | 
1928  | 
branch = a_bzrdir.open_branch()  | 
| 
1508.1.21
by Robert Collins
 Implement -r limit for checkout command.  | 
1929  | 
if revision_id is not None:  | 
1930  | 
branch.lock_write()  | 
|
1931  | 
try:  | 
|
1932  | 
revision_history = branch.revision_history()  | 
|
1933  | 
try:  | 
|
1934  | 
position = revision_history.index(revision_id)  | 
|
1935  | 
except ValueError:  | 
|
1936  | 
raise errors.NoSuchRevision(branch, revision_id)  | 
|
1937  | 
branch.set_revision_history(revision_history[:position + 1])  | 
|
1938  | 
finally:  | 
|
1939  | 
branch.unlock()  | 
|
| 
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.  | 
1940  | 
revision = branch.last_revision()  | 
| 
1908.6.1
by Robert Collins
 Change all callers of set_last_revision to use set_parent_trees.  | 
1941  | 
inv = Inventory()  | 
| 
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.  | 
1942  | 
wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),  | 
| 
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.  | 
1943  | 
branch,  | 
1944  | 
inv,  | 
|
1945  | 
_internal=True,  | 
|
| 
1534.4.51
by Robert Collins
 Test the disk layout of format3 working trees.  | 
1946  | 
_format=self,  | 
1947  | 
_bzrdir=a_bzrdir)  | 
|
| 
1907.1.1
by Aaron Bentley
 Unshelved all changes except those related to removing RootEntry  | 
1948  | 
wt._write_inventory(inv)  | 
1949  | 
wt.set_root_id(inv.root.file_id)  | 
|
| 
1908.6.1
by Robert Collins
 Change all callers of set_last_revision to use set_parent_trees.  | 
1950  | 
basis_tree = branch.repository.revision_tree(revision)  | 
1951  | 
wt.set_parent_trees([(revision, basis_tree)])  | 
|
1952  | 
build_tree(basis_tree, wt)  | 
|
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
1953  | 
return wt  | 
1954  | 
||
1955  | 
def __init__(self):  | 
|
1956  | 
super(WorkingTreeFormat2, self).__init__()  | 
|
1957  | 
self._matchingbzrdir = bzrdir.BzrDirFormat6()  | 
|
| 
1534.4.42
by Robert Collins
 add working tree to the BzrDir facilities.  | 
1958  | 
|
1959  | 
def open(self, a_bzrdir, _found=False):  | 
|
1960  | 
"""Return the WorkingTree object for a_bzrdir  | 
|
1961  | 
||
1962  | 
        _found is a private parameter, do not use it. It is used to indicate
 | 
|
1963  | 
               if format probing has already been done.
 | 
|
1964  | 
        """
 | 
|
1965  | 
if not _found:  | 
|
1966  | 
            # we are being called directly and must probe.
 | 
|
1967  | 
raise NotImplementedError  | 
|
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
1968  | 
if not isinstance(a_bzrdir.transport, LocalTransport):  | 
1969  | 
raise errors.NotLocalUrl(a_bzrdir.transport.base)  | 
|
| 
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.  | 
1970  | 
return WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),  | 
| 
1534.4.51
by Robert Collins
 Test the disk layout of format3 working trees.  | 
1971  | 
_internal=True,  | 
1972  | 
_format=self,  | 
|
1973  | 
_bzrdir=a_bzrdir)  | 
|
| 
1534.4.45
by Robert Collins
 Start WorkingTree -> .bzr/checkout transition  | 
1974  | 
|
1975  | 
||
1976  | 
class WorkingTreeFormat3(WorkingTreeFormat):  | 
|
1977  | 
"""The second working tree format updated to record a format marker.  | 
|
1978  | 
||
| 
1553.5.74
by Martin Pool
 Convert WorkingTree format3 to use LockDirs  | 
1979  | 
    This format:
 | 
1980  | 
        - exists within a metadir controlling .bzr
 | 
|
1981  | 
        - includes an explicit version marker for the workingtree control
 | 
|
1982  | 
          files, separate from the BzrDir format
 | 
|
1983  | 
        - modifies the hash cache format
 | 
|
1984  | 
        - is new in bzr 0.8
 | 
|
| 
1852.3.1
by Robert Collins
 Trivial cleanups to workingtree.py  | 
1985  | 
        - uses a LockDir to guard access for writes.
 | 
| 
1534.4.45
by Robert Collins
 Start WorkingTree -> .bzr/checkout transition  | 
1986  | 
    """
 | 
1987  | 
||
1988  | 
def get_format_string(self):  | 
|
1989  | 
"""See WorkingTreeFormat.get_format_string()."""  | 
|
| 
1553.5.81
by Martin Pool
 Revert change to WorkingTreeFormat3 format string; too many things want it the old way  | 
1990  | 
return "Bazaar-NG Working Tree format 3"  | 
| 
1534.4.45
by Robert Collins
 Start WorkingTree -> .bzr/checkout transition  | 
1991  | 
|
| 
1624.3.19
by Olaf Conradi
 New call get_format_description to give a user-friendly description of a  | 
1992  | 
def get_format_description(self):  | 
1993  | 
"""See WorkingTreeFormat.get_format_description()."""  | 
|
1994  | 
return "Working tree format 3"  | 
|
1995  | 
||
| 
1553.5.74
by Martin Pool
 Convert WorkingTree format3 to use LockDirs  | 
1996  | 
_lock_file_name = 'lock'  | 
1997  | 
_lock_class = LockDir  | 
|
1998  | 
||
1999  | 
def _open_control_files(self, a_bzrdir):  | 
|
2000  | 
transport = a_bzrdir.get_workingtree_transport(None)  | 
|
2001  | 
return LockableFiles(transport, self._lock_file_name,  | 
|
2002  | 
self._lock_class)  | 
|
2003  | 
||
| 
1508.1.21
by Robert Collins
 Implement -r limit for checkout command.  | 
2004  | 
def initialize(self, a_bzrdir, revision_id=None):  | 
2005  | 
"""See WorkingTreeFormat.initialize().  | 
|
2006  | 
        
 | 
|
| 
1759.2.1
by Jelmer Vernooij
 Fix some types (found using aspell).  | 
2007  | 
        revision_id allows creating a working tree at a different
 | 
| 
1508.1.21
by Robert Collins
 Implement -r limit for checkout command.  | 
2008  | 
        revision than the branch is at.
 | 
2009  | 
        """
 | 
|
| 
1534.4.45
by Robert Collins
 Start WorkingTree -> .bzr/checkout transition  | 
2010  | 
if not isinstance(a_bzrdir.transport, LocalTransport):  | 
2011  | 
raise errors.NotLocalUrl(a_bzrdir.transport.base)  | 
|
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
2012  | 
transport = a_bzrdir.get_workingtree_transport(self)  | 
| 
1553.5.74
by Martin Pool
 Convert WorkingTree format3 to use LockDirs  | 
2013  | 
control_files = self._open_control_files(a_bzrdir)  | 
2014  | 
control_files.create_lock()  | 
|
| 
1607.1.14
by Robert Collins
 Reduce lock thrashing somewhat - drops bound branch tests lock count from 6554 to 4456 locks.  | 
2015  | 
control_files.lock_write()  | 
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
2016  | 
control_files.put_utf8('format', self.get_format_string())  | 
| 
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.  | 
2017  | 
branch = a_bzrdir.open_branch()  | 
| 
1508.1.21
by Robert Collins
 Implement -r limit for checkout command.  | 
2018  | 
if revision_id is None:  | 
2019  | 
revision_id = branch.last_revision()  | 
|
| 
1907.1.1
by Aaron Bentley
 Unshelved all changes except those related to removing RootEntry  | 
2020  | 
inv = Inventory()  | 
| 
1685.1.9
by John Arbash Meinel
 Updated LocalTransport so that it's base is now a URL rather than a local path. This helps consistency with all other functions. To do so, I added local_abspath() which returns the local path, and local_path_to/from_url  | 
2021  | 
wt = WorkingTree3(a_bzrdir.root_transport.local_abspath('.'),  | 
| 
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.  | 
2022  | 
branch,  | 
2023  | 
inv,  | 
|
2024  | 
_internal=True,  | 
|
| 
1534.4.51
by Robert Collins
 Test the disk layout of format3 working trees.  | 
2025  | 
_format=self,  | 
| 
1553.5.74
by Martin Pool
 Convert WorkingTree format3 to use LockDirs  | 
2026  | 
_bzrdir=a_bzrdir,  | 
2027  | 
_control_files=control_files)  | 
|
| 
1997.1.4
by Robert Collins
 ``bzr checkout --lightweight`` now operates on readonly branches as well  | 
2028  | 
wt.lock_tree_write()  | 
| 
1607.1.14
by Robert Collins
 Reduce lock thrashing somewhat - drops bound branch tests lock count from 6554 to 4456 locks.  | 
2029  | 
try:  | 
| 
1907.1.1
by Aaron Bentley
 Unshelved all changes except those related to removing RootEntry  | 
2030  | 
wt._write_inventory(inv)  | 
2031  | 
wt.set_root_id(inv.root.file_id)  | 
|
| 
1908.6.1
by Robert Collins
 Change all callers of set_last_revision to use set_parent_trees.  | 
2032  | 
basis_tree = branch.repository.revision_tree(revision_id)  | 
| 
1551.8.20
by Aaron Bentley
 Fix BzrDir.create_workingtree for NULL_REVISION  | 
2033  | 
if revision_id == bzrlib.revision.NULL_REVISION:  | 
2034  | 
wt.set_parent_trees([])  | 
|
2035  | 
else:  | 
|
2036  | 
wt.set_parent_trees([(revision_id, basis_tree)])  | 
|
| 
1908.6.1
by Robert Collins
 Change all callers of set_last_revision to use set_parent_trees.  | 
2037  | 
build_tree(basis_tree, wt)  | 
| 
1607.1.14
by Robert Collins
 Reduce lock thrashing somewhat - drops bound branch tests lock count from 6554 to 4456 locks.  | 
2038  | 
finally:  | 
2039  | 
wt.unlock()  | 
|
2040  | 
control_files.unlock()  | 
|
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
2041  | 
return wt  | 
2042  | 
||
2043  | 
def __init__(self):  | 
|
2044  | 
super(WorkingTreeFormat3, self).__init__()  | 
|
2045  | 
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()  | 
|
| 
1534.4.45
by Robert Collins
 Start WorkingTree -> .bzr/checkout transition  | 
2046  | 
|
2047  | 
def open(self, a_bzrdir, _found=False):  | 
|
2048  | 
"""Return the WorkingTree object for a_bzrdir  | 
|
2049  | 
||
2050  | 
        _found is a private parameter, do not use it. It is used to indicate
 | 
|
2051  | 
               if format probing has already been done.
 | 
|
2052  | 
        """
 | 
|
2053  | 
if not _found:  | 
|
2054  | 
            # we are being called directly and must probe.
 | 
|
2055  | 
raise NotImplementedError  | 
|
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
2056  | 
if not isinstance(a_bzrdir.transport, LocalTransport):  | 
2057  | 
raise errors.NotLocalUrl(a_bzrdir.transport.base)  | 
|
| 
1852.3.1
by Robert Collins
 Trivial cleanups to workingtree.py  | 
2058  | 
return self._open(a_bzrdir, self._open_control_files(a_bzrdir))  | 
2059  | 
||
2060  | 
def _open(self, a_bzrdir, control_files):  | 
|
2061  | 
"""Open the tree itself.  | 
|
2062  | 
        
 | 
|
2063  | 
        :param a_bzrdir: the dir for the tree.
 | 
|
2064  | 
        :param control_files: the control files for the tree.
 | 
|
2065  | 
        """
 | 
|
| 
1685.1.9
by John Arbash Meinel
 Updated LocalTransport so that it's base is now a URL rather than a local path. This helps consistency with all other functions. To do so, I added local_abspath() which returns the local path, and local_path_to/from_url  | 
2066  | 
return WorkingTree3(a_bzrdir.root_transport.local_abspath('.'),  | 
| 
1534.4.51
by Robert Collins
 Test the disk layout of format3 working trees.  | 
2067  | 
_internal=True,  | 
2068  | 
_format=self,  | 
|
| 
1553.5.74
by Martin Pool
 Convert WorkingTree format3 to use LockDirs  | 
2069  | 
_bzrdir=a_bzrdir,  | 
2070  | 
_control_files=control_files)  | 
|
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
2071  | 
|
| 
1534.5.1
by Robert Collins
 Give info some reasonable output and tests.  | 
2072  | 
def __str__(self):  | 
2073  | 
return self.get_format_string()  | 
|
2074  | 
||
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
2075  | 
|
2076  | 
# formats which have no format string are not discoverable
 | 
|
2077  | 
# and not independently creatable, so are not registered.
 | 
|
2078  | 
__default_format = WorkingTreeFormat3()  | 
|
2079  | 
WorkingTreeFormat.register_format(__default_format)  | 
|
2080  | 
WorkingTreeFormat.set_default_format(__default_format)  | 
|
2081  | 
_legacy_formats = [WorkingTreeFormat2(),  | 
|
2082  | 
                   ]
 | 
|
2083  | 
||
2084  | 
||
2085  | 
class WorkingTreeTestProviderAdapter(object):  | 
|
2086  | 
"""A tool to generate a suite testing multiple workingtree formats at once.  | 
|
2087  | 
||
2088  | 
    This is done by copying the test once for each transport and injecting
 | 
|
2089  | 
    the transport_server, transport_readonly_server, and workingtree_format
 | 
|
2090  | 
    classes into each copy. Each copy is also given a new id() to make it
 | 
|
2091  | 
    easy to identify.
 | 
|
2092  | 
    """
 | 
|
2093  | 
||
2094  | 
def __init__(self, transport_server, transport_readonly_server, formats):  | 
|
2095  | 
self._transport_server = transport_server  | 
|
2096  | 
self._transport_readonly_server = transport_readonly_server  | 
|
2097  | 
self._formats = formats  | 
|
2098  | 
||
| 
1852.6.1
by Robert Collins
 Start tree implementation tests.  | 
2099  | 
def _clone_test(self, test, bzrdir_format, workingtree_format, variation):  | 
2100  | 
"""Clone test for adaption."""  | 
|
2101  | 
new_test = deepcopy(test)  | 
|
2102  | 
new_test.transport_server = self._transport_server  | 
|
2103  | 
new_test.transport_readonly_server = self._transport_readonly_server  | 
|
2104  | 
new_test.bzrdir_format = bzrdir_format  | 
|
2105  | 
new_test.workingtree_format = workingtree_format  | 
|
2106  | 
def make_new_test_id():  | 
|
2107  | 
new_id = "%s(%s)" % (test.id(), variation)  | 
|
2108  | 
return lambda: new_id  | 
|
2109  | 
new_test.id = make_new_test_id()  | 
|
2110  | 
return new_test  | 
|
2111  | 
||
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
2112  | 
def adapt(self, test):  | 
2113  | 
from bzrlib.tests import TestSuite  | 
|
2114  | 
result = TestSuite()  | 
|
2115  | 
for workingtree_format, bzrdir_format in self._formats:  | 
|
| 
1852.6.1
by Robert Collins
 Start tree implementation tests.  | 
2116  | 
new_test = self._clone_test(  | 
2117  | 
test,  | 
|
2118  | 
bzrdir_format,  | 
|
2119  | 
workingtree_format, workingtree_format.__class__.__name__)  | 
|
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
2120  | 
result.addTest(new_test)  | 
2121  | 
return result  |