/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: Martin Pool
  • Date: 2007-09-11 03:07:14 UTC
  • mfrom: (2813 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2814.
  • Revision ID: mbp@sourcefrog.net-20070911030714-nzoumditu81hhwtw
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
2022
2022
        """
2023
2023
        raise NotImplementedError(self.unlock)
2024
2024
 
2025
 
    def update(self, change_reporter=None):
 
2025
    def update(self, change_reporter=None, possible_transports=None):
2026
2026
        """Update a working tree along its branch.
2027
2027
 
2028
2028
        This will update the branch if its bound too, which means we have
2047
2047
          basis.
2048
2048
        - Do a 'normal' merge of the old branch basis if it is relevant.
2049
2049
        """
2050
 
        if self.branch.get_master_branch() is not None:
 
2050
        if self.branch.get_master_branch(possible_transports) is not None:
2051
2051
            self.lock_write()
2052
2052
            update_branch = True
2053
2053
        else:
2055
2055
            update_branch = False
2056
2056
        try:
2057
2057
            if update_branch:
2058
 
                old_tip = self.branch.update()
 
2058
                old_tip = self.branch.update(possible_transports)
2059
2059
            else:
2060
2060
                old_tip = None
2061
2061
            return self._update_tree(old_tip, change_reporter)