/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-09-13 01:54:49 UTC
  • mfrom: (2817 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2826.
  • Revision ID: aaron.bentley@utoronto.ca-20070913015449-bjjw2njf3in5roq7
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1017
1017
 
1018
1018
    def run(self, dir='.'):
1019
1019
        tree = WorkingTree.open_containing(dir)[0]
1020
 
        master = tree.branch.get_master_branch()
 
1020
        possible_transports = []
 
1021
        master = tree.branch.get_master_branch(
 
1022
            possible_transports=possible_transports)
1021
1023
        if master is not None:
1022
1024
            tree.lock_write()
1023
1025
        else:
1033
1035
                    revno = tree.branch.revision_id_to_revno(last_rev)
1034
1036
                    note("Tree is up to date at revision %d." % (revno,))
1035
1037
                    return 0
1036
 
            conflicts = tree.update(delta._ChangeReporter(
1037
 
                                        unversioned_filter=tree.is_ignored))
 
1038
            conflicts = tree.update(
 
1039
                delta._ChangeReporter(unversioned_filter=tree.is_ignored),
 
1040
                possible_transports=possible_transports)
1038
1041
            revno = tree.branch.revision_id_to_revno(
1039
1042
                _mod_revision.ensure_null(tree.last_revision()))
1040
1043
            note('Updated to revision %d.' % (revno,))
1103
1106
        tree, file_list = tree_files(file_list)
1104
1107
 
1105
1108
        if file_list is not None:
1106
 
            file_list = [f for f in file_list if f != '']
 
1109
            file_list = [f for f in file_list]
1107
1110
        elif not new:
1108
1111
            raise errors.BzrCommandError('Specify one or more files to'
1109
1112
            ' remove, or use --new.')
2553
2556
                     ]
2554
2557
    encoding_type = 'replace'
2555
2558
 
2556
 
    def run(self, testspecs_list=None, verbose=None, one=False,
 
2559
    def run(self, testspecs_list=None, verbose=False, one=False,
2557
2560
            transport=None, benchmark=None,
2558
2561
            lsprof_timed=None, cache_dir=None,
2559
2562
            first=False, list_only=False,
2562
2565
        from bzrlib.tests import selftest
2563
2566
        import bzrlib.benchmarks as benchmarks
2564
2567
        from bzrlib.benchmarks import tree_creator
2565
 
        from bzrlib.version import show_version
2566
2568
 
2567
2569
        if cache_dir is not None:
2568
2570
            tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
2580
2582
            pattern = ".*"
2581
2583
        if benchmark:
2582
2584
            test_suite_factory = benchmarks.test_suite
2583
 
            if verbose is None:
2584
 
                verbose = True
 
2585
            # Unless user explicitly asks for quiet, be verbose in benchmarks
 
2586
            verbose = not is_quiet()
2585
2587
            # TODO: should possibly lock the history file...
2586
2588
            benchfile = open(".perf_history", "at", buffering=1)
2587
2589
        else:
2588
2590
            test_suite_factory = None
2589
 
            if verbose is None:
2590
 
                verbose = False
2591
2591
            benchfile = None
2592
2592
        try:
2593
2593
            result = selftest(verbose=verbose,
2616
2616
class cmd_version(Command):
2617
2617
    """Show version of bzr."""
2618
2618
 
 
2619
    encoding_type = 'replace'
 
2620
 
2619
2621
    @display_command
2620
2622
    def run(self):
2621
2623
        from bzrlib.version import show_version
2622
 
        show_version()
 
2624
        show_version(to_file=self.outf)
2623
2625
 
2624
2626
 
2625
2627
class cmd_rocks(Command):
3060
3062
        if file_list is not None:
3061
3063
            if len(file_list) == 0:
3062
3064
                raise errors.BzrCommandError("No files specified")
3063
 
        else:
3064
 
            file_list = []
3065
3065
        
3066
3066
        tree, file_list = tree_files(file_list)
3067
3067
        if revision is None:
3869
3869
 
3870
3870
    encoding_type = 'exact'
3871
3871
 
3872
 
    _see_also = ['merge', 'doc/configuration.txt']
 
3872
    _see_also = ['merge']
3873
3873
 
3874
3874
    takes_args = ['submit_branch?', 'public_branch?']
3875
3875