← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Robert Collins
  • Date: 2006-07-20 04:04:58 UTC
  • mto: (1874.1.1 bzr.socket-delay)
  • mto: This revision was merged to the branch mainline in revision 1872.
  • Revision ID: robertc@robertcollins.net-20060720040458-81540e4c481c12d3
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2029
2029
 
2030
2030
class cmd_version(Command):
2031
2031
    """Show version of bzr."""
 
2032
 
2032
2033
    @display_command
2033
2034
    def run(self):
2034
2035
        show_version()
2035
2036
 
 
2037
 
2036
2038
class cmd_rocks(Command):
2037
2039
    """Statement of optimism."""
 
2040
 
2038
2041
    hidden = True
 
2042
 
2039
2043
    @display_command
2040
2044
    def run(self):
2041
2045
        print "it sure does!"
2042
2046
 
2043
2047
 
2044
2048
class cmd_find_merge_base(Command):
2045
 
    """Find and print a base revision for merging two branches.
2046
 
    """
 
2049
    """Find and print a base revision for merging two branches."""
2047
2050
    # TODO: Options to specify revisions on either side, as if
2048
2051
    #       merging only part of the history.
2049
2052
    takes_args = ['branch', 'other']