/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.py

Merge with stacked-fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
111
111
        deprecated_method,
112
112
        deprecated_function,
113
113
        DEPRECATED_PARAMETER,
114
 
        zero_eight,
115
 
        zero_eleven,
116
 
        zero_thirteen,
117
114
        )
118
115
 
119
116
 
123
120
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
124
121
 
125
122
 
126
 
@deprecated_function(zero_thirteen)
127
 
def gen_file_id(name):
128
 
    """Return new file id for the basename 'name'.
129
 
 
130
 
    Use bzrlib.generate_ids.gen_file_id() instead
131
 
    """
132
 
    return generate_ids.gen_file_id(name)
133
 
 
134
 
 
135
 
@deprecated_function(zero_thirteen)
136
 
def gen_root_id():
137
 
    """Return a new tree-root file id.
138
 
 
139
 
    This has been deprecated in favor of bzrlib.generate_ids.gen_root_id()
140
 
    """
141
 
    return generate_ids.gen_root_id()
142
 
 
143
 
 
144
123
class TreeEntry(object):
145
124
    """An entry that implements the minimum interface used by commands.
146
125
 
222
201
        if not _internal:
223
202
            raise errors.BzrError("Please use bzrdir.open_workingtree or "
224
203
                "WorkingTree.open() to obtain a WorkingTree.")
225
 
        assert isinstance(basedir, basestring), \
226
 
            "base directory %r is not a string" % basedir
227
204
        basedir = safe_unicode(basedir)
228
205
        mutter("opening working tree %r", basedir)
229
206
        if deprecated_passed(branch):
237
214
            self._control_files = self.branch.control_files
238
215
        else:
239
216
            # assume all other formats have their own control files.
240
 
            assert isinstance(_control_files, LockableFiles), \
241
 
                    "_control_files must be a LockableFiles, not %r" \
242
 
                    % _control_files
243
217
            self._control_files = _control_files
 
218
        self._transport = self._control_files._transport
244
219
        # update the whole cache up front and write to disk if anything changed;
245
220
        # in the future we might want to do this more selectively
246
221
        # two possible ways offer themselves : in self._unlock, write the cache
250
225
        wt_trans = self.bzrdir.get_workingtree_transport(None)
251
226
        cache_filename = wt_trans.local_abspath('stat-cache')
252
227
        self._hashcache = hashcache.HashCache(basedir, cache_filename,
253
 
                                              self._control_files._file_mode)
 
228
            self.bzrdir._get_file_mode())
254
229
        hc = self._hashcache
255
230
        hc.read()
256
231
        # is this scan needed ? it makes things kinda slow.
318
293
            False then the inventory is the same as that on disk and any
319
294
            serialisation would be unneeded overhead.
320
295
        """
321
 
        assert inv.root is not None
322
296
        self._inventory = inv
323
297
        self._inventory_is_modified = dirty
324
298
 
434
408
    def _cleanup(self):
435
409
        self._flush_ignore_list_cache()
436
410
 
437
 
    @staticmethod
438
 
    @deprecated_method(zero_eight)
439
 
    def create(branch, directory):
440
 
        """Create a workingtree for branch at directory.
441
 
 
442
 
        If existing_directory already exists it must have a .bzr directory.
443
 
        If it does not exist, it will be created.
444
 
 
445
 
        This returns a new WorkingTree object for the new checkout.
446
 
 
447
 
        TODO FIXME RBC 20060124 when we have checkout formats in place this
448
 
        should accept an optional revisionid to checkout [and reject this if
449
 
        checking out into the same dir as a pre-checkout-aware branch format.]
450
 
 
451
 
        XXX: When BzrDir is present, these should be created through that 
452
 
        interface instead.
453
 
        """
454
 
        warnings.warn('delete WorkingTree.create', stacklevel=3)
455
 
        transport = get_transport(directory)
456
 
        if branch.bzrdir.root_transport.base == transport.base:
457
 
            # same dir 
458
 
            return branch.bzrdir.create_workingtree()
459
 
        # different directory, 
460
 
        # create a branch reference
461
 
        # and now a working tree.
462
 
        raise NotImplementedError
463
 
 
464
 
    @staticmethod
465
 
    @deprecated_method(zero_eight)
466
 
    def create_standalone(directory):
467
 
        """Create a checkout and a branch and a repo at directory.
468
 
 
469
 
        Directory must exist and be empty.
470
 
 
471
 
        please use BzrDir.create_standalone_workingtree
472
 
        """
473
 
        return bzrdir.BzrDir.create_standalone_workingtree(directory)
474
 
 
475
411
    def relpath(self, path):
476
412
        """Return the local path portion from a given path.
477
413
        
508
444
        basis = self.basis_tree()
509
445
        basis.lock_read()
510
446
        try:
511
 
            changes = self._iter_changes(basis, True, [self.id2path(file_id)],
 
447
            changes = self.iter_changes(basis, True, [self.id2path(file_id)],
512
448
                require_versioned=True).next()
513
449
            changed_content, kind = changes[2], changes[6]
514
450
            if not changed_content:
550
486
        else:
551
487
            parents = [last_rev]
552
488
        try:
553
 
            merges_file = self._control_files.get('pending-merges')
 
489
            merges_file = self._transport.get('pending-merges')
554
490
        except errors.NoSuchFile:
555
491
            pass
556
492
        else:
618
554
    __contains__ = has_id
619
555
 
620
556
    def get_file_size(self, file_id):
621
 
        return os.path.getsize(self.id2abspath(file_id))
 
557
        """See Tree.get_file_size"""
 
558
        try:
 
559
            return os.path.getsize(self.id2abspath(file_id))
 
560
        except OSError, e:
 
561
            if e.errno != errno.ENOENT:
 
562
                raise
 
563
            else:
 
564
                return None
622
565
 
623
566
    @needs_read_lock
624
567
    def get_file_sha1(self, file_id, path=None, stat_value=None):
664
607
        # function - they should be part of lock_write and unlock.
665
608
        inv = self.inventory
666
609
        for f, file_id, kind in zip(files, ids, kinds):
667
 
            assert kind is not None
668
610
            if file_id is None:
669
611
                inv.add_path(f, kind=kind)
670
612
            else:
765
707
        else:
766
708
            return (kind, None, None, None)
767
709
 
768
 
    @deprecated_method(zero_eleven)
769
 
    @needs_read_lock
770
 
    def pending_merges(self):
771
 
        """Return a list of pending merges.
772
 
 
773
 
        These are revisions that have been merged into the working
774
 
        directory but not yet committed.
775
 
 
776
 
        As of 0.11 this is deprecated. Please see WorkingTree.get_parent_ids()
777
 
        instead - which is available on all tree objects.
778
 
        """
779
 
        return self.get_parent_ids()[1:]
780
 
 
781
710
    def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
782
711
        """Common ghost checking functionality from set_parent_*.
783
712
 
792
721
 
793
722
    def _set_merges_from_parent_ids(self, parent_ids):
794
723
        merges = parent_ids[1:]
795
 
        self._control_files.put_bytes('pending-merges', '\n'.join(merges))
 
724
        self._transport.put_bytes('pending-merges', '\n'.join(merges),
 
725
            mode=self._control_files._file_mode)
 
726
 
 
727
    def _filter_parent_ids_by_ancestry(self, revision_ids):
 
728
        """Check that all merged revisions are proper 'heads'.
 
729
 
 
730
        This will always return the first revision_id, and any merged revisions
 
731
        which are 
 
732
        """
 
733
        if len(revision_ids) == 0:
 
734
            return revision_ids
 
735
        graph = self.branch.repository.get_graph()
 
736
        heads = graph.heads(revision_ids)
 
737
        new_revision_ids = revision_ids[:1]
 
738
        for revision_id in revision_ids[1:]:
 
739
            if revision_id in heads and revision_id not in new_revision_ids:
 
740
                new_revision_ids.append(revision_id)
 
741
        if new_revision_ids != revision_ids:
 
742
            trace.mutter('requested to set revision_ids = %s,'
 
743
                         ' but filtered to %s', revision_ids, new_revision_ids)
 
744
        return new_revision_ids
796
745
 
797
746
    @needs_tree_write_lock
798
747
    def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
812
761
        for revision_id in revision_ids:
813
762
            _mod_revision.check_not_reserved_id(revision_id)
814
763
 
 
764
        revision_ids = self._filter_parent_ids_by_ancestry(revision_ids)
 
765
 
815
766
        if len(revision_ids) > 0:
816
767
            self.set_last_revision(revision_ids[0])
817
768
        else:
829
780
        self._check_parents_for_ghosts(parent_ids,
830
781
            allow_leftmost_as_ghost=allow_leftmost_as_ghost)
831
782
 
 
783
        parent_ids = self._filter_parent_ids_by_ancestry(parent_ids)
 
784
 
832
785
        if len(parent_ids) == 0:
833
786
            leftmost_parent_id = _mod_revision.NULL_REVISION
834
787
            leftmost_parent_tree = None
874
827
    def _put_rio(self, filename, stanzas, header):
875
828
        self._must_be_locked()
876
829
        my_file = rio_file(stanzas, header)
877
 
        self._control_files.put(filename, my_file)
 
830
        self._transport.put_file(filename, my_file,
 
831
            mode=self._control_files._file_mode)
878
832
 
879
833
    @needs_write_lock # because merge pulls data into the branch.
880
834
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
939
893
        still in the working inventory and have that text hash.
940
894
        """
941
895
        try:
942
 
            hashfile = self._control_files.get('merge-hashes')
 
896
            hashfile = self._transport.get('merge-hashes')
943
897
        except errors.NoSuchFile:
944
898
            return {}
945
899
        merge_hashes = {}
1102
1056
        sio = StringIO()
1103
1057
        self._serialize(self._inventory, sio)
1104
1058
        sio.seek(0)
1105
 
        self._control_files.put('inventory', sio)
 
1059
        self._transport.put_file('inventory', sio,
 
1060
            mode=self._control_files._file_mode)
1106
1061
        self._inventory_is_modified = False
1107
1062
 
1108
1063
    def _kind(self, relpath):
1269
1224
                                       DeprecationWarning)
1270
1225
 
1271
1226
        # check destination directory
1272
 
        assert not isinstance(from_paths, basestring)
 
1227
        if isinstance(from_paths, basestring):
 
1228
            raise ValueError()
1273
1229
        inv = self.inventory
1274
1230
        to_abs = self.abspath(to_dir)
1275
1231
        if not isdir(to_abs):
1539
1495
            # - RBC 20060907
1540
1496
            self._write_inventory(self._inventory)
1541
1497
    
1542
 
    @deprecated_method(zero_eight)
1543
 
    def iter_conflicts(self):
1544
 
        """List all files in the tree that have text or content conflicts.
1545
 
        DEPRECATED.  Use conflicts instead."""
1546
 
        return self._iter_conflicts()
1547
 
 
1548
1498
    def _iter_conflicts(self):
1549
1499
        conflicted = set()
1550
1500
        for info in self.list_files():
1793
1743
    def _reset_data(self):
1794
1744
        """Reset transient data that cannot be revalidated."""
1795
1745
        self._inventory_is_modified = False
1796
 
        result = self._deserialize(self._control_files.get('inventory'))
 
1746
        result = self._deserialize(self._transport.get('inventory'))
1797
1747
        self._set_inventory(result, dirty=False)
1798
1748
 
1799
1749
    @needs_tree_write_lock
1820
1770
 
1821
1771
    def _write_basis_inventory(self, xml):
1822
1772
        """Write the basis inventory XML to the basis-inventory file"""
1823
 
        assert isinstance(xml, str), 'serialised xml must be bytestring.'
1824
1773
        path = self._basis_inventory_name()
1825
1774
        sio = StringIO(xml)
1826
 
        self._control_files.put(path, sio)
 
1775
        self._transport.put_file(path, sio,
 
1776
            mode=self._control_files._file_mode)
1827
1777
 
1828
1778
    def _create_basis_xml_from_inventory(self, revision_id, inventory):
1829
1779
        """Create the text that will be saved in basis-inventory"""
1860
1810
    def read_basis_inventory(self):
1861
1811
        """Read the cached basis inventory."""
1862
1812
        path = self._basis_inventory_name()
1863
 
        return self._control_files.get(path).read()
 
1813
        return self._transport.get_bytes(path)
1864
1814
        
1865
1815
    @needs_read_lock
1866
1816
    def read_working_inventory(self):
1875
1825
        # binary.
1876
1826
        if self._inventory_is_modified:
1877
1827
            raise errors.InventoryModified(self)
1878
 
        result = self._deserialize(self._control_files.get('inventory'))
 
1828
        result = self._deserialize(self._transport.get('inventory'))
1879
1829
        self._set_inventory(result, dirty=False)
1880
1830
        return result
1881
1831
 
1935
1885
            has_changed_files = len(unknown_nested_files) > 0
1936
1886
            if not has_changed_files:
1937
1887
                for (file_id, path, content_change, versioned, parent_id, name,
1938
 
                     kind, executable) in self._iter_changes(self.basis_tree(),
 
1888
                     kind, executable) in self.iter_changes(self.basis_tree(),
1939
1889
                         include_unchanged=True, require_versioned=False,
1940
1890
                         want_unversioned=True, specific_files=files):
1941
1891
                    if versioned == (False, False):
1944
1894
                            # ... but not ignored
1945
1895
                            has_changed_files = True
1946
1896
                            break
1947
 
                    elif content_change and (kind[1] != None):
 
1897
                    elif content_change and (kind[1] is not None):
1948
1898
                        # Versioned and changed, but not deleted
1949
1899
                        has_changed_files = True
1950
1900
                        break
2090
2040
        """Set the root id for this tree."""
2091
2041
        # for compatability 
2092
2042
        if file_id is None:
2093
 
            symbol_versioning.warn(symbol_versioning.zero_twelve
2094
 
                % 'WorkingTree.set_root_id with fileid=None',
2095
 
                DeprecationWarning,
2096
 
                stacklevel=3)
2097
 
            file_id = ROOT_ID
2098
 
        else:
2099
 
            file_id = osutils.safe_file_id(file_id)
 
2043
            raise ValueError(
 
2044
                'WorkingTree.set_root_id with fileid=None')
 
2045
        file_id = osutils.safe_file_id(file_id)
2100
2046
        self._set_root_id(file_id)
2101
2047
 
2102
2048
    def _set_root_id(self, file_id):
2161
2107
          basis.
2162
2108
        - Do a 'normal' merge of the old branch basis if it is relevant.
2163
2109
        """
2164
 
        if self.branch.get_master_branch(possible_transports) is not None:
 
2110
        if self.branch.get_bound_location() is not None:
2165
2111
            self.lock_write()
2166
2112
            update_branch = True
2167
2113
        else:
2582
2528
    def _last_revision(self):
2583
2529
        """See Mutable.last_revision."""
2584
2530
        try:
2585
 
            return self._control_files.get('last-revision').read()
 
2531
            return self._transport.get_bytes('last-revision')
2586
2532
        except errors.NoSuchFile:
2587
2533
            return _mod_revision.NULL_REVISION
2588
2534
 
2590
2536
        """See WorkingTree._change_last_revision."""
2591
2537
        if revision_id is None or revision_id == NULL_REVISION:
2592
2538
            try:
2593
 
                self._control_files._transport.delete('last-revision')
 
2539
                self._transport.delete('last-revision')
2594
2540
            except errors.NoSuchFile:
2595
2541
                pass
2596
2542
            return False
2597
2543
        else:
2598
 
            self._control_files.put_bytes('last-revision', revision_id)
 
2544
            self._transport.put_bytes('last-revision', revision_id,
 
2545
                mode=self._control_files._file_mode)
2599
2546
            return True
2600
2547
 
2601
2548
    @needs_tree_write_lock
2613
2560
    @needs_read_lock
2614
2561
    def conflicts(self):
2615
2562
        try:
2616
 
            confile = self._control_files.get('conflicts')
 
2563
            confile = self._transport.get('conflicts')
2617
2564
        except errors.NoSuchFile:
2618
2565
            return _mod_conflicts.ConflictList()
2619
2566
        try:
2644
2591
            return path[:-len(suffix)]
2645
2592
 
2646
2593
 
2647
 
@deprecated_function(zero_eight)
2648
 
def is_control_file(filename):
2649
 
    """See WorkingTree.is_control_filename(filename)."""
2650
 
    ## FIXME: better check
2651
 
    filename = normpath(filename)
2652
 
    while filename != '':
2653
 
        head, tail = os.path.split(filename)
2654
 
        ## mutter('check %r for control file' % ((head, tail),))
2655
 
        if tail == '.bzr':
2656
 
            return True
2657
 
        if filename == head:
2658
 
            break
2659
 
        filename = head
2660
 
    return False
2661
 
 
2662
 
 
2663
2594
class WorkingTreeFormat(object):
2664
2595
    """An encapsulation of the initialization and open routines for a format.
2665
2596
 
2698
2629
        except errors.NoSuchFile:
2699
2630
            raise errors.NoWorkingTree(base=transport.base)
2700
2631
        except KeyError:
2701
 
            raise errors.UnknownFormatError(format=format_string)
 
2632
            raise errors.UnknownFormatError(format=format_string,
 
2633
                                            kind="working tree")
2702
2634
 
2703
2635
    def __eq__(self, other):
2704
2636
        return self.__class__ is other.__class__
2738
2670
 
2739
2671
    @classmethod
2740
2672
    def unregister_format(klass, format):
2741
 
        assert klass._formats[format.get_format_string()] is format
2742
2673
        del klass._formats[format.get_format_string()]
2743
2674
 
2744
2675
 
2754
2685
        """See WorkingTreeFormat.get_format_description()."""
2755
2686
        return "Working tree format 2"
2756
2687
 
2757
 
    def stub_initialize_remote(self, control_files):
2758
 
        """As a special workaround create critical control files for a remote working tree
 
2688
    def _stub_initialize_remote(self, branch):
 
2689
        """As a special workaround create critical control files for a remote working tree.
2759
2690
        
2760
2691
        This ensures that it can later be updated and dealt with locally,
2761
2692
        since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with 
2765
2696
        inv = Inventory()
2766
2697
        xml5.serializer_v5.write_inventory(inv, sio, working=True)
2767
2698
        sio.seek(0)
2768
 
        control_files.put('inventory', sio)
2769
 
 
2770
 
        control_files.put_bytes('pending-merges', '')
 
2699
        branch._transport.put_file('inventory', sio,
 
2700
            mode=branch.control_files._file_mode)
 
2701
        branch._transport.put_bytes('pending-merges', '',
 
2702
            mode=branch.control_files._file_mode)
2771
2703
        
2772
2704
 
2773
2705
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2882
2814
        control_files = self._open_control_files(a_bzrdir)
2883
2815
        control_files.create_lock()
2884
2816
        control_files.lock_write()
2885
 
        control_files.put_utf8('format', self.get_format_string())
 
2817
        transport.put_bytes('format', self.get_format_string(),
 
2818
            mode=control_files._file_mode)
2886
2819
        if from_branch is not None:
2887
2820
            branch = from_branch
2888
2821
        else: