/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-02-13 23:57:28 UTC
  • mfrom: (7490 work)
  • mto: This revision was merged to the branch mainline in revision 7492.
  • Revision ID: jelmer@jelmer.uk-20200213235728-m6ds0mm3mbs4y182
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/workingtree.py
27
27
WorkingTree.open(dir).
28
28
"""
29
29
 
 
30
from __future__ import absolute_import
 
31
 
30
32
import contextlib
31
33
import errno
32
34
import os
819
821
 
820
822
    def pull(self, source, overwrite=False, stop_revision=None,
821
823
             change_reporter=None, possible_transports=None, local=False,
822
 
             show_base=False, tag_selector=None):
 
824
             show_base=False):
823
825
        with self.lock_write(), source.lock_read():
824
826
            old_revision_info = self.branch.last_revision_info()
825
827
            basis_tree = self.basis_tree()
826
828
            count = self.branch.pull(source, overwrite, stop_revision,
827
829
                                     possible_transports=possible_transports,
828
 
                                     local=local, tag_selector=tag_selector)
 
830
                                     local=local)
829
831
            new_revision_info = self.branch.last_revision_info()
830
832
            if new_revision_info != old_revision_info:
831
833
                repository = self.branch.repository
1049
1051
            if file_id is None:
1050
1052
                raise ValueError(
1051
1053
                    'WorkingTree.set_root_id with fileid=None')
 
1054
            file_id = osutils.safe_file_id(file_id)
1052
1055
            self._set_root_id(file_id)
1053
1056
 
1054
1057
    def _set_root_id(self, file_id):