← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Aaron Bentley
  • Date: 2008-03-03 16:52:41 UTC
  • mfrom: (3144.3.11 fix-conflict-handling)
  • mto: This revision was merged to the branch mainline in revision 3250.
  • Revision ID: aaron@aaronbentley.com-20080303165241-0k2c7ggs6kr9q6hf
Merge with fix-conflict-handling

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
610
610
            else:
611
611
                display_url = urlutils.unescape_for_display(stored_loc,
612
612
                        self.outf.encoding)
613
 
                self.outf.write("Using saved location: %s\n" % display_url)
 
613
                if not is_quiet():
 
614
                    self.outf.write("Using saved location: %s\n" % display_url)
614
615
                location = stored_loc
615
616
                location_transport = transport.get_transport(
616
617
                    location, possible_transports=possible_transports)
863
864
 
864
865
    _see_also = ['checkout']
865
866
    takes_args = ['from_location', 'to_location?']
866
 
    takes_options = ['revision']
 
867
    takes_options = ['revision', Option('hardlink',
 
868
        help='Hard-link working tree files where possible.')]
867
869
    aliases = ['get', 'clone']
868
870
 
869
 
    def run(self, from_location, to_location=None, revision=None):
 
871
    def run(self, from_location, to_location=None, revision=None,
 
872
            hardlink=False):
870
873
        from bzrlib.tag import _merge_tags_if_possible
871
874
        if revision is None:
872
875
            revision = [None]
904
907
                # preserve whatever source format we have.
905
908
                dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
906
909
                                            possible_transports=[to_transport],
907
 
                                            accelerator_tree=accelerator_tree)
 
910
                                            accelerator_tree=accelerator_tree,
 
911
                                            hardlink=hardlink)
908
912
                branch = dir.open_branch()
909
913
            except errors.NoSuchRevision:
910
914
                to_transport.delete_tree('.')
949
953
                                 "common operations like diff and status without "
950
954
                                 "such access, and also support local commits."
951
955
                            ),
952
 
                     Option('files-from',
953
 
                            help="Get file contents from this tree.", type=str)
 
956
                     Option('files-from', type=str,
 
957
                            help="Get file contents from this tree."),
 
958
                     Option('hardlink',
 
959
                            help='Hard-link working tree files where possible.'
 
960
                            ),
954
961
                     ]
955
962
    aliases = ['co']
956
963
 
957
964
    def run(self, branch_location=None, to_location=None, revision=None,
958
 
            lightweight=False, files_from=None):
 
965
            lightweight=False, files_from=None, hardlink=False):
959
966
        if revision is None:
960
967
            revision = [None]
961
968
        elif len(revision) > 1:
986
993
                source.bzrdir.create_workingtree(revision_id)
987
994
                return
988
995
        source.create_checkout(to_location, revision_id, lightweight,
989
 
                               accelerator_tree)
 
996
                               accelerator_tree, hardlink)
990
997
 
991
998
 
992
999
class cmd_renames(Command):
2656
2663
            if benchfile is not None:
2657
2664
                benchfile.close()
2658
2665
        if result:
2659
 
            info('tests passed')
 
2666
            note('tests passed')
2660
2667
        else:
2661
 
            info('tests failed')
 
2668
            note('tests failed')
2662
2669
        return int(not result)
2663
2670
 
2664
2671
 
2874
2881
        from bzrlib.diff import show_diff_trees
2875
2882
        tree_merger = merger.make_merger()
2876
2883
        tt = tree_merger.make_preview_transform()
2877
 
        result_tree = tt.get_preview_tree()
2878
 
        show_diff_trees(merger.this_tree, result_tree, self.outf, old_label='',
2879
 
                        new_label='')
 
2884
        try:
 
2885
            result_tree = tt.get_preview_tree()
 
2886
            show_diff_trees(merger.this_tree, result_tree, self.outf,
 
2887
                            old_label='', new_label='')
 
2888
        finally:
 
2889
            tt.finalize()
2880
2890
 
2881
2891
    def _do_merge(self, merger, change_reporter, allow_pending, verified):
2882
2892
        merger.change_reporter = change_reporter