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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-02-21 04:40:09 UTC
  • mfrom: (7494.1.1 trunk-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200221044009-cijpllwtz5ql9tar
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/trunk-3.1/+merge/379600

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/workingtree.py
1210
1210
 
1211
1211
    def pull(self, source, overwrite=False, stop_revision=None,
1212
1212
             change_reporter=None, possible_transports=None, local=False,
1213
 
             show_base=False):
 
1213
             show_base=False, tag_selector=None):
1214
1214
        with self.lock_write(), source.lock_read():
1215
1215
            old_revision = self.branch.last_revision()
1216
1216
            count = self.branch.pull(source, overwrite, stop_revision,
1217
1217
                                     possible_transports=possible_transports,
1218
 
                                     local=local)
 
1218
                                     local=local, tag_selector=tag_selector)
1219
1219
            self._update_git_tree(
1220
1220
                old_revision=old_revision,
1221
1221
                new_revision=self.branch.last_revision(),