← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-07-04 02:40:13 UTC
  • mfrom: (2578.1.1 ianc-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20070704024013-cwx0ld720nvdfb8q
(Daniel Watkins) Bug #113990 - update should print summary of changes (like pull does)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1970
1970
        """
1971
1971
        raise NotImplementedError(self.unlock)
1972
1972
 
1973
 
    def update(self):
 
1973
    def update(self, change_reporter=None):
1974
1974
        """Update a working tree along its branch.
1975
1975
 
1976
1976
        This will update the branch if its bound too, which means we have
2006
2006
                old_tip = self.branch.update()
2007
2007
            else:
2008
2008
                old_tip = None
2009
 
            return self._update_tree(old_tip)
 
2009
            return self._update_tree(old_tip, change_reporter)
2010
2010
        finally:
2011
2011
            self.unlock()
2012
2012
 
2013
2013
    @needs_tree_write_lock
2014
 
    def _update_tree(self, old_tip=None):
 
2014
    def _update_tree(self, old_tip=None, change_reporter=None):
2015
2015
        """Update a tree to the master branch.
2016
2016
 
2017
2017
        :param old_tip: if supplied, the previous tip revision the branch,
2045
2045
                                      self.branch,
2046
2046
                                      to_tree,
2047
2047
                                      basis,
2048
 
                                      this_tree=self)
 
2048
                                      this_tree=self,
 
2049
                                      change_reporter=change_reporter)
2049
2050
            finally:
2050
2051
                basis.unlock()
2051
2052
            # TODO - dedup parents list with things merged by pull ?
2093
2094
                                  self.branch,
2094
2095
                                  other_tree,
2095
2096
                                  base_tree,
2096
 
                                  this_tree=self)
 
2097
                                  this_tree=self,
 
2098
                                  change_reporter=change_reporter)
2097
2099
        return result
2098
2100
 
2099
2101
    def _write_hashcache_if_dirty(self):