/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: Aaron Bentley
  • Date: 2007-09-13 01:54:49 UTC
  • mfrom: (2817 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2826.
  • Revision ID: aaron.bentley@utoronto.ca-20070913015449-bjjw2njf3in5roq7
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1903
1903
        self.apply_inventory_delta(inv_delta)
1904
1904
 
1905
1905
    @needs_tree_write_lock
1906
 
    def revert(self, filenames, old_tree=None, backups=True, 
 
1906
    def revert(self, filenames=None, old_tree=None, backups=True,
1907
1907
               pb=DummyProgress(), report_changes=False):
1908
1908
        from bzrlib.conflicts import resolve
 
1909
        if filenames == []:
 
1910
            filenames = None
 
1911
            symbol_versioning.warn('Using [] to revert all files is deprecated'
 
1912
                ' as of bzr 0.91.  Please use None (the default) instead.',
 
1913
                DeprecationWarning, stacklevel=2)
1909
1914
        if old_tree is None:
1910
1915
            old_tree = self.basis_tree()
1911
1916
        conflicts = transform.revert(self, old_tree, filenames, backups, pb,
1912
1917
                                     report_changes)
1913
 
        if not len(filenames):
 
1918
        if filenames is None:
1914
1919
            self.set_parent_ids(self.get_parent_ids()[:1])
1915
1920
            resolve(self)
1916
1921
        else:
2017
2022
        """
2018
2023
        raise NotImplementedError(self.unlock)
2019
2024
 
2020
 
    def update(self, change_reporter=None):
 
2025
    def update(self, change_reporter=None, possible_transports=None):
2021
2026
        """Update a working tree along its branch.
2022
2027
 
2023
2028
        This will update the branch if its bound too, which means we have
2042
2047
          basis.
2043
2048
        - Do a 'normal' merge of the old branch basis if it is relevant.
2044
2049
        """
2045
 
        if self.branch.get_master_branch() is not None:
 
2050
        if self.branch.get_master_branch(possible_transports) is not None:
2046
2051
            self.lock_write()
2047
2052
            update_branch = True
2048
2053
        else:
2050
2055
            update_branch = False
2051
2056
        try:
2052
2057
            if update_branch:
2053
 
                old_tip = self.branch.update()
 
2058
                old_tip = self.branch.update(possible_transports)
2054
2059
            else:
2055
2060
                old_tip = None
2056
2061
            return self._update_tree(old_tip, change_reporter)