← 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: 2007-06-18 20:04:16 UTC
  • mfrom: (2533 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2534.
  • Revision ID: abentley@panoramicfeedback.com-20070618200416-9b164rn1a60uh82p
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1058
1058
    takes_options = ['verbose']
1059
1059
 
1060
1060
    @display_command
1061
 
    def run(self, location=None, verbose=False):
 
1061
    def run(self, location=None, verbose=0):
1062
1062
        from bzrlib.info import show_bzrdir_info
1063
1063
        show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
1064
1064
                         verbose=verbose)
2358
2358
class cmd_selftest(Command):
2359
2359
    """Run internal test suite.
2360
2360
    
2361
 
    This creates temporary test directories in the working directory, but no
2362
 
    existing data is affected.  These directories are deleted if the tests
2363
 
    pass, or left behind to help in debugging if they fail and --keep-output
2364
 
    is specified.
2365
 
    
2366
2361
    If arguments are given, they are regular expressions that say which tests
2367
2362
    should run.  Tests matching any expression are run, and other tests are
2368
2363
    not run.
2476
2471
            from bzrlib.tests import clean_selftest_output
2477
2472
            clean_selftest_output()
2478
2473
            return 0
 
2474
        if keep_output:
 
2475
            trace.warning("notice: selftest --keep-output "
 
2476
                          "is no longer supported; "
 
2477
                          "test output is always removed")
2479
2478
 
2480
2479
        if numbered_dirs is None and sys.platform == 'win32':
2481
2480
            numbered_dirs = True
2504
2503
            result = selftest(verbose=verbose, 
2505
2504
                              pattern=pattern,
2506
2505
                              stop_on_failure=one, 
2507
 
                              keep_output=keep_output,
2508
2506
                              transport=transport,
2509
2507
                              test_suite_factory=test_suite_factory,
2510
2508
                              lsprof_timed=lsprof_timed,
2964
2962
 
2965
2963
class cmd_missing(Command):
2966
2964
    """Show unmerged/unpulled revisions between two branches.
2967
 
 
 
2965
    
2968
2966
    OTHER_BRANCH may be local or remote.
2969
2967
    """
2970
2968
 
2973
2971
    takes_options = [Option('reverse', 'Reverse the order of revisions'),
2974
2972
                     Option('mine-only', 
2975
2973
                            'Display changes in the local branch only'),
 
2974
                     Option('this' , 'same as --mine-only'),
2976
2975
                     Option('theirs-only', 
2977
 
                            'Display changes in the remote branch only'), 
 
2976
                            'Display changes in the remote branch only'),
 
2977
                     Option('other', 'same as --theirs-only'),
2978
2978
                     'log-format',
2979
2979
                     'show-ids',
2980
2980
                     'verbose'
2984
2984
    @display_command
2985
2985
    def run(self, other_branch=None, reverse=False, mine_only=False,
2986
2986
            theirs_only=False, log_format=None, long=False, short=False, line=False, 
2987
 
            show_ids=False, verbose=False):
 
2987
            show_ids=False, verbose=False, this=False, other=False):
2988
2988
        from bzrlib.missing import find_unmerged, iter_log_revisions
2989
2989
        from bzrlib.log import log_formatter
 
2990
 
 
2991
        if this:
 
2992
          mine_only = this
 
2993
        if other:
 
2994
          theirs_only = other
 
2995
 
2990
2996
        local_branch = Branch.open_containing(u".")[0]
2991
2997
        parent = local_branch.get_parent()
2992
2998
        if other_branch is None:
3798
3804
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
3799
3805
from bzrlib.bundle.commands import cmd_bundle_revisions
3800
3806
from bzrlib.sign_my_commits import cmd_sign_my_commits
3801
 
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join, \
 
3807
from bzrlib.weave_commands import cmd_versionedfile_list, cmd_weave_join, \
3802
3808
        cmd_weave_plan_merge, cmd_weave_merge_text