/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5697.1.1 by Jelmer Vernooij
Move WorkingTreeFormat2 to a separate file.
1
# Copyright (C) 2005-2010 Canonical Ltd
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
6379.6.7 by Jelmer Vernooij
Move importing from future until after doc string, otherwise the doc string will disappear.
17
"""Weave-era working tree objects."""
18
6379.6.3 by Jelmer Vernooij
Use absolute_import.
19
from __future__ import absolute_import
20
7479.2.1 by Jelmer Vernooij
Drop python2 support.
21
from io import BytesIO
6876.4.1 by Jelmer Vernooij
Add format setting with ignore filename.
22
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
23
from ... import (
5697.1.1 by Jelmer Vernooij
Move WorkingTreeFormat2 to a separate file.
24
    conflicts as _mod_conflicts,
25
    errors,
6754.8.9 by Jelmer Vernooij
Fix more tests.
26
    lock,
5697.1.1 by Jelmer Vernooij
Move WorkingTreeFormat2 to a separate file.
27
    osutils,
28
    revision as _mod_revision,
29
    transform,
6670.4.1 by Jelmer Vernooij
Update imports.
30
    )
31
from ...bzr import (
32
    inventory,
5697.1.1 by Jelmer Vernooij
Move WorkingTreeFormat2 to a separate file.
33
    xml5,
34
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
35
from ...mutabletree import MutableTree
36
from ...transport.local import LocalTransport
37
from ...workingtree import (
5697.1.1 by Jelmer Vernooij
Move WorkingTreeFormat2 to a separate file.
38
    WorkingTreeFormat,
39
    )
6670.4.1 by Jelmer Vernooij
Update imports.
40
from ...bzr.workingtree_3 import (
6110.4.4 by Jelmer Vernooij
Add common base class.
41
    PreDirStateWorkingTree,
42
    )
5697.1.1 by Jelmer Vernooij
Move WorkingTreeFormat2 to a separate file.
43
44
45
def get_conflicted_stem(path):
46
    for suffix in _mod_conflicts.CONFLICT_SUFFIXES:
47
        if path.endswith(suffix):
48
            return path[:-len(suffix)]
49
50
51
class WorkingTreeFormat2(WorkingTreeFormat):
52
    """The second working tree format.
53
54
    This format modified the hash cache from the format 1 hash cache.
55
    """
56
57
    upgrade_recommended = True
58
59
    requires_normalized_unicode_filenames = True
60
61
    case_sensitive_filename = "Branch-FoRMaT"
62
63
    missing_parent_conflicts = False
64
5993.3.1 by Jelmer Vernooij
Add WorkingTreeFormat.supports_versioned_directories attribute.
65
    supports_versioned_directories = True
66
6876.4.1 by Jelmer Vernooij
Add format setting with ignore filename.
67
    ignore_filename = '.bzrignore'
68
5697.1.1 by Jelmer Vernooij
Move WorkingTreeFormat2 to a separate file.
69
    def get_format_description(self):
70
        """See WorkingTreeFormat.get_format_description()."""
71
        return "Working tree format 2"
72
73
    def _stub_initialize_on_transport(self, transport, file_mode):
74
        """Workaround: create control files for a remote working tree.
75
76
        This ensures that it can later be updated and dealt with locally,
77
        since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
78
        no working tree.  (See bug #43064).
79
        """
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
80
        sio = BytesIO()
5697.1.1 by Jelmer Vernooij
Move WorkingTreeFormat2 to a separate file.
81
        inv = inventory.Inventory()
82
        xml5.serializer_v5.write_inventory(inv, sio, working=True)
83
        sio.seek(0)
84
        transport.put_file('inventory', sio, file_mode)
6963.2.18 by Jelmer Vernooij
Add bees to some of bp.weave_fmt.
85
        transport.put_bytes('pending-merges', b'', file_mode)
5697.1.1 by Jelmer Vernooij
Move WorkingTreeFormat2 to a separate file.
86
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
87
    def initialize(self, a_controldir, revision_id=None, from_branch=None,
5697.1.1 by Jelmer Vernooij
Move WorkingTreeFormat2 to a separate file.
88
                   accelerator_tree=None, hardlink=False):
89
        """See WorkingTreeFormat.initialize()."""
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
90
        if not isinstance(a_controldir.transport, LocalTransport):
91
            raise errors.NotLocalUrl(a_controldir.transport.base)
5697.1.1 by Jelmer Vernooij
Move WorkingTreeFormat2 to a separate file.
92
        if from_branch is not None:
93
            branch = from_branch
94
        else:
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
95
            branch = a_controldir.open_branch()
5697.1.1 by Jelmer Vernooij
Move WorkingTreeFormat2 to a separate file.
96
        if revision_id is None:
97
            revision_id = _mod_revision.ensure_null(branch.last_revision())
7356.1.5 by Jelmer Vernooij
Use more ExitStacks.
98
        with branch.lock_write():
5697.1.1 by Jelmer Vernooij
Move WorkingTreeFormat2 to a separate file.
99
            branch.generate_revision_history(revision_id)
100
        inv = inventory.Inventory()
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
101
        wt = WorkingTree2(a_controldir.root_transport.local_abspath('.'),
7143.15.2 by Jelmer Vernooij
Run autopep8.
102
                          branch,
103
                          inv,
104
                          _internal=True,
105
                          _format=self,
106
                          _controldir=a_controldir,
107
                          _control_files=branch.control_files)
5697.1.1 by Jelmer Vernooij
Move WorkingTreeFormat2 to a separate file.
108
        basis_tree = branch.repository.revision_tree(revision_id)
7358.14.1 by Jelmer Vernooij
Remove Tree.get_root_id() in favour of Tree.path2id('').
109
        if basis_tree.path2id('') is not None:
110
            wt.set_root_id(basis_tree.path2id(''))
5697.1.1 by Jelmer Vernooij
Move WorkingTreeFormat2 to a separate file.
111
        # set the parent list and cache the basis tree.
112
        if _mod_revision.is_null(revision_id):
113
            parent_trees = []
114
        else:
115
            parent_trees = [(revision_id, basis_tree)]
116
        wt.set_parent_trees(parent_trees)
117
        transform.build_tree(basis_tree, wt)
6435.1.1 by Jelmer Vernooij
Add post_build_tree hook.
118
        for hook in MutableTree.hooks['post_build_tree']:
119
            hook(wt)
5697.1.1 by Jelmer Vernooij
Move WorkingTreeFormat2 to a separate file.
120
        return wt
121
122
    def __init__(self):
123
        super(WorkingTreeFormat2, self).__init__()
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
124
        from breezy.plugins.weave_fmt.bzrdir import BzrDirFormat6
6746.2.1 by Jelmer Vernooij
Rename matchingbzrdir to matchingcontroldir.
125
        self._matchingcontroldir = BzrDirFormat6()
5697.1.1 by Jelmer Vernooij
Move WorkingTreeFormat2 to a separate file.
126
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
127
    def open(self, a_controldir, _found=False):
128
        """Return the WorkingTree object for a_controldir
5697.1.1 by Jelmer Vernooij
Move WorkingTreeFormat2 to a separate file.
129
130
        _found is a private parameter, do not use it. It is used to indicate
131
               if format probing has already been done.
132
        """
133
        if not _found:
134
            # we are being called directly and must probe.
135
            raise NotImplementedError
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
136
        if not isinstance(a_controldir.transport, LocalTransport):
137
            raise errors.NotLocalUrl(a_controldir.transport.base)
138
        wt = WorkingTree2(a_controldir.root_transport.local_abspath('.'),
7143.15.2 by Jelmer Vernooij
Run autopep8.
139
                          _internal=True,
140
                          _format=self,
141
                          _controldir=a_controldir,
142
                          _control_files=a_controldir.open_branch().control_files)
5697.1.1 by Jelmer Vernooij
Move WorkingTreeFormat2 to a separate file.
143
        return wt
144
145
6110.4.4 by Jelmer Vernooij
Add common base class.
146
class WorkingTree2(PreDirStateWorkingTree):
5697.1.1 by Jelmer Vernooij
Move WorkingTreeFormat2 to a separate file.
147
    """This is the Format 2 working tree.
148
149
    This was the first weave based working tree.
150
     - uses os locks for locking.
151
     - uses the branch last-revision.
152
    """
153
6110.4.2 by Jelmer Vernooij
Move hashcache use to bzrlib.workingtree_3 and bzrlib.plugins.weave_fmt.workingtree.
154
    def __init__(self, basedir, *args, **kwargs):
155
        super(WorkingTree2, self).__init__(basedir, *args, **kwargs)
5697.1.1 by Jelmer Vernooij
Move WorkingTreeFormat2 to a separate file.
156
        # WorkingTree2 has more of a constraint that self._inventory must
157
        # exist. Because this is an older format, we don't mind the overhead
158
        # caused by the extra computation here.
159
160
        # Newer WorkingTree's should only have self._inventory set when they
161
        # have a read lock.
162
        if self._inventory is None:
163
            self.read_working_inventory()
164
165
    def _get_check_refs(self):
166
        """Return the references needed to perform a check of this tree."""
167
        return [('trees', self.last_revision())]
168
169
    def lock_tree_write(self):
170
        """See WorkingTree.lock_tree_write().
171
172
        In Format2 WorkingTrees we have a single lock for the branch and tree
173
        so lock_tree_write() degrades to lock_write().
174
175
        :return: An object with an unlock method which will release the lock
176
            obtained.
177
        """
178
        self.branch.lock_write()
179
        try:
6754.8.9 by Jelmer Vernooij
Fix more tests.
180
            token = self._control_files.lock_write()
181
            return lock.LogicalLockResult(self.unlock, token)
5697.1.1 by Jelmer Vernooij
Move WorkingTreeFormat2 to a separate file.
182
        except:
183
            self.branch.unlock()
184
            raise
185
186
    def unlock(self):
187
        # we share control files:
188
        if self._control_files._lock_count == 3:
5900.1.2 by Jelmer Vernooij
Fix weave plugin.
189
            # do non-implementation specific cleanup
190
            self._cleanup()
5697.1.1 by Jelmer Vernooij
Move WorkingTreeFormat2 to a separate file.
191
            # _inventory_is_modified is always False during a read lock.
192
            if self._inventory_is_modified:
193
                self.flush()
194
            self._write_hashcache_if_dirty()
195
196
        # reverse order of locking.
197
        try:
198
            return self._control_files.unlock()
199
        finally:
200
            self.branch.unlock()
201
202
    def _iter_conflicts(self):
203
        conflicted = set()
7143.19.5 by Jelmer Vernooij
Undo removal of kind.
204
        for path, file_class, file_kind, entry in self.list_files():
5697.1.1 by Jelmer Vernooij
Move WorkingTreeFormat2 to a separate file.
205
            stem = get_conflicted_stem(path)
206
            if stem is None:
207
                continue
208
            if stem not in conflicted:
209
                conflicted.add(stem)
210
                yield stem
211
212
    def conflicts(self):
6754.8.16 by Jelmer Vernooij
Get rid of all uses of needs_read_lock
213
        with self.lock_read():
214
            conflicts = _mod_conflicts.ConflictList()
215
            for conflicted in self._iter_conflicts():
216
                text = True
217
                try:
218
                    if osutils.file_kind(self.abspath(conflicted)) != "file":
219
                        text = False
220
                except errors.NoSuchFile:
5697.1.1 by Jelmer Vernooij
Move WorkingTreeFormat2 to a separate file.
221
                    text = False
6754.8.16 by Jelmer Vernooij
Get rid of all uses of needs_read_lock
222
                if text is True:
223
                    for suffix in ('.THIS', '.OTHER'):
224
                        try:
7143.15.2 by Jelmer Vernooij
Run autopep8.
225
                            kind = osutils.file_kind(
226
                                self.abspath(conflicted + suffix))
6754.8.16 by Jelmer Vernooij
Get rid of all uses of needs_read_lock
227
                            if kind != "file":
228
                                text = False
229
                        except errors.NoSuchFile:
5697.1.1 by Jelmer Vernooij
Move WorkingTreeFormat2 to a separate file.
230
                            text = False
7183.3.1 by Martin
Fix E71* lint errors
231
                        if text is False:
6754.8.16 by Jelmer Vernooij
Get rid of all uses of needs_read_lock
232
                            break
7143.15.2 by Jelmer Vernooij
Run autopep8.
233
                ctype = {True: 'text conflict',
234
                         False: 'contents conflict'}[text]
6754.8.16 by Jelmer Vernooij
Get rid of all uses of needs_read_lock
235
                conflicts.append(_mod_conflicts.Conflict.factory(ctype,
7143.15.2 by Jelmer Vernooij
Run autopep8.
236
                                                                 path=conflicted,
237
                                                                 file_id=self.path2id(conflicted)))
6754.8.16 by Jelmer Vernooij
Get rid of all uses of needs_read_lock
238
            return conflicts
5697.1.1 by Jelmer Vernooij
Move WorkingTreeFormat2 to a separate file.
239
5816.5.5 by Jelmer Vernooij
Fix conflict handling for wt2.
240
    def set_conflicts(self, arg):
241
        raise errors.UnsupportedOperation(self.set_conflicts, self)
5697.1.1 by Jelmer Vernooij
Move WorkingTreeFormat2 to a separate file.
242
5816.5.5 by Jelmer Vernooij
Fix conflict handling for wt2.
243
    def add_conflicts(self, arg):
244
        raise errors.UnsupportedOperation(self.add_conflicts, self)