← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

Multiple merges:
 * push should work with branches without a working tree.
 * Knit pushes on SFTP are now much faster (removed a bad latency multiplier).
 * Reconciles at the end of fetch now skip non-dataloss issues. The command line
   reconcile will still check all data.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
476
476
        # command.
477
477
        from bzrlib.transport import get_transport
478
478
        
479
 
        tree_from = WorkingTree.open_containing(u'.')[0]
480
 
        br_from = tree_from.branch
481
 
        stored_loc = tree_from.branch.get_push_location()
 
479
        br_from = Branch.open_containing('.')[0]
 
480
        stored_loc = br_from.get_push_location()
482
481
        if location is None:
483
482
            if stored_loc is None:
484
483
                raise BzrCommandError("No push location known or specified.")