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