/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/builtins.py

  • Committer: Aaron Bentley
  • Date: 2007-02-09 16:26:22 UTC
  • mto: This revision was merged to the branch mainline in revision 2288.
  • Revision ID: abentley@panoramicfeedback.com-20070209162622-mczvdmtgxwwi91mq
Add change reporting to pull

Show diffs side-by-side

added added

removed removed

Lines of Context:
541
541
    takes_args = ['location?']
542
542
    encoding_type = 'replace'
543
543
 
544
 
    def run(self, location=None, remember=False, overwrite=False, revision=None, verbose=False):
 
544
    def run(self, location=None, remember=False, overwrite=False,
 
545
            revision=None, verbose=False):
545
546
        # FIXME: too much stuff is in the command class
546
547
        try:
547
548
            tree_to = WorkingTree.open_containing(u'.')[0]
589
590
 
590
591
        old_rh = branch_to.revision_history()
591
592
        if tree_to is not None:
592
 
            count = tree_to.pull(branch_from, overwrite, rev_id)
 
593
            count = tree_to.pull(branch_from, overwrite, rev_id,
 
594
            delta.ChangeReporter(tree_to.inventory))
593
595
        else:
594
596
            count = branch_to.pull(branch_from, overwrite, rev_id)
595
597
        note('%d revision(s) pulled.' % (count,))