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

  • Committer: Jelmer Vernooij
  • Date: 2020-03-22 19:12:43 UTC
  • mfrom: (7490.7.6 work)
  • mto: (7490.7.7 work)
  • mto: This revision was merged to the branch mainline in revision 7501.
  • Revision ID: jelmer@jelmer.uk-20200322191243-yx8ils8lvfmfh7rq
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
821
821
 
822
822
    def pull(self, source, overwrite=False, stop_revision=None,
823
823
             change_reporter=None, possible_transports=None, local=False,
824
 
             show_base=False):
 
824
             show_base=False, tag_selector=None):
825
825
        with self.lock_write(), source.lock_read():
826
826
            old_revision_info = self.branch.last_revision_info()
827
827
            basis_tree = self.basis_tree()
828
828
            count = self.branch.pull(source, overwrite, stop_revision,
829
829
                                     possible_transports=possible_transports,
830
 
                                     local=local)
 
830
                                     local=local, tag_selector=tag_selector)
831
831
            new_revision_info = self.branch.last_revision_info()
832
832
            if new_revision_info != old_revision_info:
833
833
                repository = self.branch.repository