/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-03-19 07:00:51 UTC
  • mfrom: (4152.2.8 bzr.dev)
  • Revision ID: pqm@pqm.ubuntu.com-20090319070051-g88q6nfmvkxgvnto
(tanner) Added explicit instructions to check ./bzr _script_version
        and ./bzrlib/__init__.py version_info to the releasing documentation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
1
 
# Copyright (C) 2007-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
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
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""WorkingTree4 format and implementation.
18
18
 
28
28
 
29
29
from bzrlib.lazy_import import lazy_import
30
30
lazy_import(globals(), """
 
31
from bisect import bisect_left
 
32
import collections
 
33
from copy import deepcopy
31
34
import errno
 
35
import itertools
 
36
import operator
32
37
import stat
 
38
from time import time
 
39
import warnings
33
40
 
34
41
import bzrlib
35
42
from bzrlib import (
36
43
    bzrdir,
37
44
    cache_utf8,
 
45
    conflicts as _mod_conflicts,
38
46
    debug,
 
47
    delta,
39
48
    dirstate,
40
49
    errors,
41
50
    generate_ids,
 
51
    globbing,
 
52
    ignores,
 
53
    merge,
42
54
    osutils,
43
55
    revision as _mod_revision,
44
56
    revisiontree,
 
57
    textui,
45
58
    trace,
46
59
    transform,
 
60
    urlutils,
47
61
    views,
 
62
    xml5,
 
63
    xml6,
48
64
    )
49
65
import bzrlib.branch
 
66
from bzrlib.transport import get_transport
50
67
import bzrlib.ui
51
68
""")
52
69
 
 
70
from bzrlib import symbol_versioning
53
71
from bzrlib.decorators import needs_read_lock, needs_write_lock
54
 
from bzrlib.filters import filtered_input_file, internal_size_sha_file_byname
55
 
from bzrlib.inventory import Inventory, ROOT_ID, entry_factory
 
72
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID, entry_factory
 
73
import bzrlib.mutabletree
56
74
from bzrlib.mutabletree import needs_tree_write_lock
57
75
from bzrlib.osutils import (
58
76
    file_kind,
59
77
    isdir,
 
78
    normpath,
60
79
    pathjoin,
 
80
    rand_chars,
61
81
    realpath,
62
82
    safe_unicode,
 
83
    splitpath,
63
84
    )
64
 
from bzrlib.trace import mutter
 
85
from bzrlib.trace import mutter, note
65
86
from bzrlib.transport.local import LocalTransport
66
87
from bzrlib.tree import InterTree
 
88
from bzrlib.progress import DummyProgress, ProgressPhase
 
89
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
 
90
from bzrlib.rio import RioReader, rio_file, Stanza
 
91
from bzrlib.symbol_versioning import (deprecated_passed,
 
92
        deprecated_method,
 
93
        deprecated_function,
 
94
        DEPRECATED_PARAMETER,
 
95
        )
67
96
from bzrlib.tree import Tree
68
97
from bzrlib.workingtree import WorkingTree, WorkingTree3, WorkingTreeFormat3
69
98
 
217
246
            return self._dirstate
218
247
        local_path = self.bzrdir.get_workingtree_transport(None
219
248
            ).local_abspath('dirstate')
220
 
        self._dirstate = dirstate.DirState.on_file(local_path,
221
 
            self._sha1_provider())
 
249
        self._dirstate = dirstate.DirState.on_file(local_path)
222
250
        return self._dirstate
223
251
 
224
 
    def _sha1_provider(self):
225
 
        """A function that returns a SHA1Provider suitable for this tree.
226
 
 
227
 
        :return: None if content filtering is not supported by this tree.
228
 
          Otherwise, a SHA1Provider is returned that sha's the canonical
229
 
          form of files, i.e. after read filters are applied.
230
 
        """
231
 
        if self.supports_content_filtering():
232
 
            return ContentFilterAwareSHA1Provider(self)
233
 
        else:
234
 
            return None
235
 
 
236
252
    def filter_unversioned_files(self, paths):
237
253
        """Filter out paths that are versioned.
238
254
 
321
337
                    parent_ies[(dirname + '/' + name).strip('/')] = inv_entry
322
338
                elif kind == 'tree-reference':
323
339
                    if not self._repo_supports_tree_reference:
324
 
                        raise errors.UnsupportedOperation(
325
 
                            self._generate_inventory,
326
 
                            self.branch.repository)
 
340
                        raise AssertionError(
 
341
                            "repository of %r "
 
342
                            "doesn't support tree references "
 
343
                            "required by entry %r"
 
344
                            % (self, name))
327
345
                    inv_entry.reference_revision = link_or_sha1 or None
328
346
                elif kind != 'symlink':
329
347
                    raise AssertionError("unknown kind %r" % kind)
434
452
        return osutils.lexists(pathjoin(
435
453
                    self.basedir, row[0].decode('utf8'), row[1].decode('utf8')))
436
454
 
437
 
    def has_or_had_id(self, file_id):
438
 
        state = self.current_dirstate()
439
 
        row, parents = self._get_entry(file_id=file_id)
440
 
        return row is not None
441
 
 
442
455
    @needs_read_lock
443
456
    def id2path(self, file_id):
444
457
        "Convert a file-id to a path."
691
704
            from_entry = self._get_entry(path=from_rel)
692
705
            if from_entry == (None, None):
693
706
                raise errors.BzrMoveFailedError(from_rel,to_dir,
694
 
                    errors.NotVersionedError(path=from_rel))
 
707
                    errors.NotVersionedError(path=str(from_rel)))
695
708
 
696
709
            from_id = from_entry[0][2]
697
710
            to_rel = pathjoin(to_dir, from_tail)
1026
1039
    def set_last_revision(self, new_revision):
1027
1040
        """Change the last revision in the working tree."""
1028
1041
        parents = self.get_parent_ids()
1029
 
        if new_revision in (_mod_revision.NULL_REVISION, None):
 
1042
        if new_revision in (NULL_REVISION, None):
1030
1043
            if len(parents) >= 2:
1031
1044
                raise AssertionError(
1032
1045
                    "setting the last parent to none with a pending merge is "
1199
1212
                # just forget the whole block.
1200
1213
                entry_index = 0
1201
1214
                while entry_index < len(block[1]):
 
1215
                    # Mark this file id as having been removed
1202
1216
                    entry = block[1][entry_index]
1203
 
                    if entry[1][0][0] in 'ar':
1204
 
                        # don't remove absent or renamed entries
 
1217
                    ids_to_unversion.discard(entry[0][2])
 
1218
                    if (entry[1][0][0] in 'ar' # don't remove absent or renamed
 
1219
                                               # entries
 
1220
                        or not state._make_absent(entry)):
1205
1221
                        entry_index += 1
1206
 
                    else:
1207
 
                        # Mark this file id as having been removed
1208
 
                        ids_to_unversion.discard(entry[0][2])
1209
 
                        if not state._make_absent(entry):
1210
 
                            # The block has not shrunk.
1211
 
                            entry_index += 1
1212
1222
                # go to the next block. (At the moment we dont delete empty
1213
1223
                # dirblocks)
1214
1224
                block_index += 1
1266
1276
        if self._dirty:
1267
1277
            raise AssertionError("attempting to write an inventory when the "
1268
1278
                "dirstate is dirty will lose pending changes")
1269
 
        had_inventory = self._inventory is not None
1270
 
        # Setting self._inventory = None forces the dirstate to regenerate the
1271
 
        # working inventory. We do this because self.inventory may be inv, or
1272
 
        # may have been modified, and either case would prevent a clean delta
1273
 
        # being created.
1274
 
        self._inventory = None
1275
 
        # generate a delta,
1276
 
        delta = inv._make_delta(self.inventory)
1277
 
        # and apply it.
1278
 
        self.apply_inventory_delta(delta)
1279
 
        if had_inventory:
 
1279
        self.current_dirstate().set_state_from_inventory(inv)
 
1280
        self._make_dirty(reset_inventory=False)
 
1281
        if self._inventory is not None:
1280
1282
            self._inventory = inv
1281
1283
        self.flush()
1282
1284
 
1283
1285
 
1284
 
class ContentFilterAwareSHA1Provider(dirstate.SHA1Provider):
1285
 
 
1286
 
    def __init__(self, tree):
1287
 
        self.tree = tree
1288
 
 
1289
 
    def sha1(self, abspath):
1290
 
        """See dirstate.SHA1Provider.sha1()."""
1291
 
        filters = self.tree._content_filter_stack(
1292
 
            self.tree.relpath(osutils.safe_unicode(abspath)))
1293
 
        return internal_size_sha_file_byname(abspath, filters)[1]
1294
 
 
1295
 
    def stat_and_sha1(self, abspath):
1296
 
        """See dirstate.SHA1Provider.stat_and_sha1()."""
1297
 
        filters = self.tree._content_filter_stack(
1298
 
            self.tree.relpath(osutils.safe_unicode(abspath)))
1299
 
        file_obj = file(abspath, 'rb', 65000)
1300
 
        try:
1301
 
            statvalue = os.fstat(file_obj.fileno())
1302
 
            if filters:
1303
 
                file_obj = filtered_input_file(file_obj, filters)
1304
 
            sha1 = osutils.size_sha_file(file_obj)[1]
1305
 
        finally:
1306
 
            file_obj.close()
1307
 
        return statvalue, sha1
1308
 
 
1309
 
 
1310
 
class ContentFilteringDirStateWorkingTree(DirStateWorkingTree):
1311
 
    """Dirstate working tree that supports content filtering.
1312
 
 
1313
 
    The dirstate holds the hash and size of the canonical form of the file, 
1314
 
    and most methods must return that.
1315
 
    """
1316
 
 
1317
 
    def _file_content_summary(self, path, stat_result):
1318
 
        # This is to support the somewhat obsolete path_content_summary method
1319
 
        # with content filtering: see
1320
 
        # <https://bugs.edge.launchpad.net/bzr/+bug/415508>.
1321
 
        #
1322
 
        # If the dirstate cache is up to date and knows the hash and size,
1323
 
        # return that.
1324
 
        # Otherwise if there are no content filters, return the on-disk size
1325
 
        # and leave the hash blank.
1326
 
        # Otherwise, read and filter the on-disk file and use its size and
1327
 
        # hash.
1328
 
        #
1329
 
        # The dirstate doesn't store the size of the canonical form so we
1330
 
        # can't trust it for content-filtered trees.  We just return None.
1331
 
        dirstate_sha1 = self._dirstate.sha1_from_stat(path, stat_result)
1332
 
        executable = self._is_executable_from_path_and_stat(path, stat_result)
1333
 
        return ('file', None, executable, dirstate_sha1)
1334
 
 
1335
 
 
1336
1286
class WorkingTree4(DirStateWorkingTree):
1337
1287
    """This is the Format 4 working tree.
1338
1288
 
1346
1296
    """
1347
1297
 
1348
1298
 
1349
 
class WorkingTree5(ContentFilteringDirStateWorkingTree):
 
1299
class WorkingTree5(DirStateWorkingTree):
1350
1300
    """This is the Format 5 working tree.
1351
1301
 
1352
1302
    This differs from WorkingTree4 by:
1353
1303
     - Supporting content filtering.
1354
 
 
1355
 
    This is new in bzr 1.11.
1356
 
    """
1357
 
 
1358
 
 
1359
 
class WorkingTree6(ContentFilteringDirStateWorkingTree):
1360
 
    """This is the Format 6 working tree.
1361
 
 
1362
 
    This differs from WorkingTree5 by:
1363
1304
     - Supporting a current view that may mask the set of files in a tree
1364
1305
       impacted by most user operations.
1365
1306
 
1366
 
    This is new in bzr 1.14.
 
1307
    This is new in bzr 1.11.
1367
1308
    """
1368
1309
 
1369
1310
    def _make_views(self):
1371
1312
 
1372
1313
 
1373
1314
class DirStateWorkingTreeFormat(WorkingTreeFormat3):
1374
 
 
1375
1315
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1376
1316
                   accelerator_tree=None, hardlink=False):
1377
1317
        """See WorkingTreeFormat.initialize().
1416
1356
        wt.lock_tree_write()
1417
1357
        try:
1418
1358
            self._init_custom_control_files(wt)
1419
 
            if revision_id in (None, _mod_revision.NULL_REVISION):
 
1359
            if revision_id in (None, NULL_REVISION):
1420
1360
                if branch.repository.supports_rich_root():
1421
1361
                    wt._set_root_id(generate_ids.gen_root_id())
1422
1362
                else:
1433
1373
                    pass
1434
1374
            if basis is None:
1435
1375
                basis = branch.repository.revision_tree(revision_id)
1436
 
            if revision_id == _mod_revision.NULL_REVISION:
 
1376
            if revision_id == NULL_REVISION:
1437
1377
                parents_list = []
1438
1378
            else:
1439
1379
                parents_list = [(revision_id, basis)]
1447
1387
                if basis_root_id is not None:
1448
1388
                    wt._set_root_id(basis_root_id)
1449
1389
                    wt.flush()
1450
 
                if wt.supports_content_filtering():
1451
 
                    # The original tree may not have the same content filters
1452
 
                    # applied so we can't safely build the inventory delta from
1453
 
                    # the source tree.
1454
 
                    delta_from_tree = False
1455
 
                else:
1456
 
                    delta_from_tree = True
1457
1390
                # delta_from_tree is safe even for DirStateRevisionTrees,
1458
1391
                # because wt4.apply_inventory_delta does not mutate the input
1459
1392
                # inventory entries.
1460
1393
                transform.build_tree(basis, wt, accelerator_tree,
1461
 
                                     hardlink=hardlink,
1462
 
                                     delta_from_tree=delta_from_tree)
 
1394
                                     hardlink=hardlink, delta_from_tree=True)
1463
1395
            finally:
1464
1396
                basis.unlock()
1465
1397
        finally:
1489
1421
                           _control_files=control_files)
1490
1422
 
1491
1423
    def __get_matchingbzrdir(self):
1492
 
        return self._get_matchingbzrdir()
1493
 
 
1494
 
    def _get_matchingbzrdir(self):
1495
 
        """Overrideable method to get a bzrdir for testing."""
1496
1424
        # please test against something that will let us do tree references
1497
1425
        return bzrdir.format_registry.make_bzrdir(
1498
1426
            'dirstate-with-subtree')
1526
1454
 
1527
1455
 
1528
1456
class WorkingTreeFormat5(DirStateWorkingTreeFormat):
1529
 
    """WorkingTree format supporting content filtering.
 
1457
    """WorkingTree format supporting views.
1530
1458
    """
1531
1459
 
1532
1460
    upgrade_recommended = False
1541
1469
        """See WorkingTreeFormat.get_format_description()."""
1542
1470
        return "Working tree format 5"
1543
1471
 
1544
 
    def supports_content_filtering(self):
1545
 
        return True
1546
 
 
1547
 
 
1548
 
class WorkingTreeFormat6(DirStateWorkingTreeFormat):
1549
 
    """WorkingTree format supporting views.
1550
 
    """
1551
 
 
1552
 
    upgrade_recommended = False
1553
 
 
1554
 
    _tree_class = WorkingTree6
1555
 
 
1556
 
    def get_format_string(self):
1557
 
        """See WorkingTreeFormat.get_format_string()."""
1558
 
        return "Bazaar Working Tree Format 6 (bzr 1.14)\n"
1559
 
 
1560
 
    def get_format_description(self):
1561
 
        """See WorkingTreeFormat.get_format_description()."""
1562
 
        return "Working tree format 6"
1563
 
 
1564
1472
    def _init_custom_control_files(self, wt):
1565
1473
        """Subclasses with custom control files should override this method."""
1566
1474
        wt._transport.put_bytes('views', '', mode=wt.bzrdir._get_file_mode())
1573
1481
 
1574
1482
 
1575
1483
class DirStateRevisionTree(Tree):
1576
 
    """A revision tree pulling the inventory from a dirstate.
1577
 
    
1578
 
    Note that this is one of the historical (ie revision) trees cached in the
1579
 
    dirstate for easy access, not the workingtree.
1580
 
    """
 
1484
    """A revision tree pulling the inventory from a dirstate."""
1581
1485
 
1582
1486
    def __init__(self, dirstate, revision_id, repository):
1583
1487
        self._dirstate = dirstate
1755
1659
            return None
1756
1660
        parent_index = self._get_parent_index()
1757
1661
        last_changed_revision = entry[1][parent_index][4]
1758
 
        try:
1759
 
            rev = self._repository.get_revision(last_changed_revision)
1760
 
        except errors.NoSuchRevision:
1761
 
            raise errors.FileTimestampUnavailable(self.id2path(file_id))
1762
 
        return rev.timestamp
 
1662
        return self._repository.get_revision(last_changed_revision).timestamp
1763
1663
 
1764
1664
    def get_file_sha1(self, file_id, path=None, stat_value=None):
1765
1665
        entry = self._get_entry(file_id=file_id, path=path)
1777
1677
        return self.inventory[file_id].text_size
1778
1678
 
1779
1679
    def get_file_text(self, file_id, path=None):
1780
 
        _, content = list(self.iter_files_bytes([(file_id, None)]))[0]
1781
 
        return ''.join(content)
 
1680
        return list(self.iter_files_bytes([(file_id, None)]))[0][1]
1782
1681
 
1783
1682
    def get_reference_revision(self, file_id, path=None):
1784
1683
        return self.inventory[file_id].reference_revision
1803
1702
        if entry[1][parent_index][0] != 'l':
1804
1703
            return None
1805
1704
        else:
1806
 
            target = entry[1][parent_index][1]
1807
 
            target = target.decode('utf8')
1808
 
            return target
 
1705
            # At present, none of the tree implementations supports non-ascii
 
1706
            # symlink targets. So we will just assume that the dirstate path is
 
1707
            # correct.
 
1708
            return entry[1][parent_index][1]
1809
1709
 
1810
1710
    def get_revision_id(self):
1811
1711
        """Return the revision id for this tree."""
1832
1732
        entry = self._get_entry(file_id=file_id)[1]
1833
1733
        if entry is None:
1834
1734
            raise errors.NoSuchId(tree=self, file_id=file_id)
1835
 
        parent_index = self._get_parent_index()
1836
 
        return dirstate.DirState._minikind_to_kind[entry[parent_index][0]]
 
1735
        return dirstate.DirState._minikind_to_kind[entry[1][0]]
1837
1736
 
1838
1737
    def stored_kind(self, file_id):
1839
1738
        """See Tree.stored_kind"""
1859
1758
            return None
1860
1759
        return ie.executable
1861
1760
 
1862
 
    def list_files(self, include_root=False, from_dir=None, recursive=True):
 
1761
    def list_files(self, include_root=False):
1863
1762
        # We use a standard implementation, because DirStateRevisionTree is
1864
1763
        # dealing with one of the parents of the current state
1865
1764
        inv = self._get_inventory()
1866
 
        if from_dir is None:
1867
 
            from_dir_id = None
1868
 
        else:
1869
 
            from_dir_id = inv.path2id(from_dir)
1870
 
            if from_dir_id is None:
1871
 
                # Directory not versioned
1872
 
                return
1873
 
        entries = inv.iter_entries(from_dir=from_dir_id, recursive=recursive)
1874
 
        if inv.root is not None and not include_root and from_dir is None:
 
1765
        entries = inv.iter_entries()
 
1766
        if self.inventory.root is not None and not include_root:
1875
1767
            entries.next()
1876
1768
        for path, entry in entries:
1877
1769
            yield path, 'V', entry.kind, entry.file_id, entry
1979
1871
        return result
1980
1872
 
1981
1873
    @classmethod
1982
 
    def make_source_parent_tree_compiled_dirstate(klass, test_case, source,
1983
 
                                                  target):
 
1874
    def make_source_parent_tree_compiled_dirstate(klass, test_case, source, target):
1984
1875
        from bzrlib.tests.test__dirstate_helpers import \
1985
 
            compiled_dirstate_helpers_feature
1986
 
        test_case.requireFeature(compiled_dirstate_helpers_feature)
1987
 
        from bzrlib._dirstate_helpers_pyx import ProcessEntryC
 
1876
            CompiledDirstateHelpersFeature
 
1877
        if not CompiledDirstateHelpersFeature.available():
 
1878
            from bzrlib.tests import UnavailableFeature
 
1879
            raise UnavailableFeature(CompiledDirstateHelpersFeature)
 
1880
        from bzrlib._dirstate_helpers_c import ProcessEntryC
1988
1881
        result = klass.make_source_parent_tree(source, target)
1989
1882
        result[1]._iter_changes = ProcessEntryC
1990
1883
        return result
2020
1913
            output. An unversioned file is defined as one with (False, False)
2021
1914
            for the versioned pair.
2022
1915
        """
 
1916
        # NB: show_status depends on being able to pass in non-versioned files
 
1917
        # and report them as unknown
2023
1918
        # TODO: handle extra trees in the dirstate.
2024
1919
        if (extra_trees or specific_files == []):
2025
1920
            # we can't fast-path these cases (yet)
2028
1923
                require_versioned, want_unversioned=want_unversioned)
2029
1924
        parent_ids = self.target.get_parent_ids()
2030
1925
        if not (self.source._revision_id in parent_ids
2031
 
                or self.source._revision_id == _mod_revision.NULL_REVISION):
 
1926
                or self.source._revision_id == NULL_REVISION):
2032
1927
            raise AssertionError(
2033
1928
                "revision {%s} is not stored in {%s}, but %s "
2034
1929
                "can only be used for trees stored in the dirstate"
2035
1930
                % (self.source._revision_id, self.target, self.iter_changes))
2036
1931
        target_index = 0
2037
 
        if self.source._revision_id == _mod_revision.NULL_REVISION:
 
1932
        if self.source._revision_id == NULL_REVISION:
2038
1933
            source_index = None
2039
1934
            indices = (target_index,)
2040
1935
        else:
2055
1950
        else:
2056
1951
            specific_files = set([''])
2057
1952
        # -- specific_files is now a utf8 path set --
2058
 
 
 
1953
        search_specific_files = set()
2059
1954
        # -- get the state object and prepare it.
2060
1955
        state = self.target.current_dirstate()
2061
1956
        state._read_dirblocks_if_needed()
2062
1957
        if require_versioned:
2063
1958
            # -- check all supplied paths are versioned in a search tree. --
2064
 
            not_versioned = []
 
1959
            all_versioned = True
2065
1960
            for path in specific_files:
2066
1961
                path_entries = state._entries_for_path(path)
2067
1962
                if not path_entries:
2068
1963
                    # this specified path is not present at all: error
2069
 
                    not_versioned.append(path)
2070
 
                    continue
 
1964
                    all_versioned = False
 
1965
                    break
2071
1966
                found_versioned = False
2072
1967
                # for each id at this path
2073
1968
                for entry in path_entries:
2080
1975
                if not found_versioned:
2081
1976
                    # none of the indexes was not 'absent' at all ids for this
2082
1977
                    # path.
2083
 
                    not_versioned.append(path)
2084
 
            if len(not_versioned) > 0:
2085
 
                raise errors.PathsNotVersionedError(not_versioned)
 
1978
                    all_versioned = False
 
1979
                    break
 
1980
            if not all_versioned:
 
1981
                raise errors.PathsNotVersionedError(specific_files)
2086
1982
        # -- remove redundancy in supplied specific_files to prevent over-scanning --
2087
 
        search_specific_files = osutils.minimum_path_selection(specific_files)
 
1983
        for path in specific_files:
 
1984
            other_specific_files = specific_files.difference(set([path]))
 
1985
            if not osutils.is_inside_any(other_specific_files, path):
 
1986
                # this is a top level path, we must check it.
 
1987
                search_specific_files.add(path)
2088
1988
 
2089
1989
        use_filesystem_for_exec = (sys.platform != 'win32')
2090
1990
        iter_changes = self.target._iter_changes(include_unchanged,
2102
2002
            (revisiontree.RevisionTree, DirStateRevisionTree)):
2103
2003
            return False
2104
2004
        # the source revid must be in the target dirstate
2105
 
        if not (source._revision_id == _mod_revision.NULL_REVISION or
 
2005
        if not (source._revision_id == NULL_REVISION or
2106
2006
            source._revision_id in target.get_parent_ids()):
2107
2007
            # TODO: what about ghosts? it may well need to
2108
2008
            # check for them explicitly.
2169
2069
        # tree during upgrade.
2170
2070
        tree._control_files.lock_write()
2171
2071
        try:
2172
 
            self.update_format(tree)
2173
 
        finally:
2174
 
            tree._control_files.unlock()
2175
 
 
2176
 
    def update_format(self, tree):
2177
 
        """Change the format marker."""
2178
 
        tree._transport.put_bytes('format',
2179
 
            self.target_format.get_format_string(),
2180
 
            mode=tree.bzrdir._get_file_mode())
2181
 
 
2182
 
 
2183
 
class Converter4or5to6(object):
2184
 
    """Perform an in-place upgrade of format 4 or 5 to format 6 trees."""
2185
 
 
2186
 
    def __init__(self):
2187
 
        self.target_format = WorkingTreeFormat6()
2188
 
 
2189
 
    def convert(self, tree):
2190
 
        # lock the control files not the tree, so that we don't get tree
2191
 
        # on-unlock behaviours, and so that no-one else diddles with the
2192
 
        # tree during upgrade.
2193
 
        tree._control_files.lock_write()
2194
 
        try:
2195
2072
            self.init_custom_control_files(tree)
2196
2073
            self.update_format(tree)
2197
2074
        finally: