/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

  • Committer: Jelmer Vernooij
  • Date: 2007-09-16 19:29:00 UTC
  • mfrom: (2823 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2824.
  • Revision ID: jelmer@samba.org-20070916192900-fph1i2wsytberyyl
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
995
995
        return wt
996
996
 
997
997
    def _serialize(self, inventory, out_file):
998
 
        xml5.serializer_v5.write_inventory(self._inventory, out_file)
 
998
        xml5.serializer_v5.write_inventory(self._inventory, out_file,
 
999
            working=True)
999
1000
 
1000
1001
    def _deserialize(selt, in_file):
1001
1002
        return xml5.serializer_v5.read_inventory(in_file)
1903
1904
        self.apply_inventory_delta(inv_delta)
1904
1905
 
1905
1906
    @needs_tree_write_lock
1906
 
    def revert(self, filenames, old_tree=None, backups=True, 
 
1907
    def revert(self, filenames=None, old_tree=None, backups=True,
1907
1908
               pb=DummyProgress(), report_changes=False):
1908
1909
        from bzrlib.conflicts import resolve
 
1910
        if filenames == []:
 
1911
            filenames = None
 
1912
            symbol_versioning.warn('Using [] to revert all files is deprecated'
 
1913
                ' as of bzr 0.91.  Please use None (the default) instead.',
 
1914
                DeprecationWarning, stacklevel=2)
1909
1915
        if old_tree is None:
1910
1916
            old_tree = self.basis_tree()
1911
1917
        conflicts = transform.revert(self, old_tree, filenames, backups, pb,
1912
1918
                                     report_changes)
1913
 
        if not len(filenames):
 
1919
        if filenames is None:
1914
1920
            self.set_parent_ids(self.get_parent_ids()[:1])
1915
1921
            resolve(self)
1916
1922
        else:
2017
2023
        """
2018
2024
        raise NotImplementedError(self.unlock)
2019
2025
 
2020
 
    def update(self, change_reporter=None):
 
2026
    def update(self, change_reporter=None, possible_transports=None):
2021
2027
        """Update a working tree along its branch.
2022
2028
 
2023
2029
        This will update the branch if its bound too, which means we have
2042
2048
          basis.
2043
2049
        - Do a 'normal' merge of the old branch basis if it is relevant.
2044
2050
        """
2045
 
        if self.branch.get_master_branch() is not None:
 
2051
        if self.branch.get_master_branch(possible_transports) is not None:
2046
2052
            self.lock_write()
2047
2053
            update_branch = True
2048
2054
        else:
2050
2056
            update_branch = False
2051
2057
        try:
2052
2058
            if update_branch:
2053
 
                old_tip = self.branch.update()
 
2059
                old_tip = self.branch.update(possible_transports)
2054
2060
            else:
2055
2061
                old_tip = None
2056
2062
            return self._update_tree(old_tip, change_reporter)
2635
2641
        """
2636
2642
        sio = StringIO()
2637
2643
        inv = Inventory()
2638
 
        xml5.serializer_v5.write_inventory(inv, sio)
 
2644
        xml5.serializer_v5.write_inventory(inv, sio, working=True)
2639
2645
        sio.seek(0)
2640
2646
        control_files.put('inventory', sio)
2641
2647