short welcome message for bzr

[Martin Pool]

On 07/05/2006, at 3:49 AM, John Arbash Meinel wrote:

> Alexander Belchenko wrote:
>> I'd like to make in win32 distribution some special launcher that  
>> invoke
>> command shell in particular directory and prints short message  
>> from bzr.
>> Because by default new command console starts with size of 80*25  
>> symbols
>> I need something attractive and small (23 lines max).
>> Output of "bzr help" is bad because it more than 23 lines.

Actually by my count it's just on 23 lines now.  Possibly we could  
make better use of them though...

> I would get rid of the "Please remember to keep backups!". We have
> certainly discussed removing it from 'bzr help', and it takes up a lot
> of precious space.

It's now gone from bzr help.

> he web-page is wrong now. It should be "bazaar-vcs.org", attached is a
> patch in jam-integration to fix all occurrences of bazaar-ng.org to
> bazaar-vcs.org
>
> So I would do something more like the attached help.txt. It is 22  
> lines
> long, so it fits your length requirements. And I think it gives the  
> very
> basic, very useful commands. I changed the grouping a little bit, some
> to save space, and some to put the common commands for new users
> together. (init, add, ignore, commit then status, diff, log).
>
> John
> =:->

+1 for that.

>
> === modified file 'bzrlib/builtins.py'
> --- bzrlib/builtins.py	
> +++ bzrlib/builtins.py	
> @@ -1808,7 +1808,7 @@
>          if rh:
>              print "  revid: %s" % (rh[-1],)
>      print bzrlib.__copyright__
> -    print "http://bazaar-ng.org/"
> +    print "http://bazaar-vcs.org/"
>      print
>      print "bzr comes with ABSOLUTELY NO WARRANTY.  bzr is free  
> software, and"
>      print "you may use, modify and redistribute it under the terms  
> of the GNU"
>
> === modified file 'bzrlib/help.py'
> --- bzrlib/help.py	
> +++ bzrlib/help.py	
> @@ -24,7 +24,7 @@
>
>  global_help = \
>  """Bazaar-NG -- a free distributed version-control tool
> -http://bazaar-ng.org/
> +http://bazaar-vcs.org/
>
>  Please remember to keep backups!
>
>
> === modified file 'bzrlib/tests/branch_implementations/test_parent.py'
> --- bzrlib/tests/branch_implementations/test_parent.py	
> +++ bzrlib/tests/branch_implementations/test_parent.py	
> @@ -35,7 +35,7 @@
>      def test_set_get_parent(self):
>          """Set, re-get and reset the parent"""
>          b = self.make_branch('.')
> -        url = 'http://bazaar-ng.org/bzr/bzr.dev'
> +        url = 'http://bazaar-vcs.org/bzr/bzr.dev'
>          b.set_parent(url)
>          self.assertEquals(b.get_parent(), url)
>          b.set_parent(None)
>
> === modified file 'bzrlib/tests/test_http.py'
> --- bzrlib/tests/test_http.py	
> +++ bzrlib/tests/test_http.py	
> @@ -41,27 +41,27 @@
>          url = extract_auth('http://example.com', f)
>          self.assertEquals('http://example.com', url)
>          self.assertEquals(0, len(f.credentials))
> -        url = extract_auth('http://user:pass@www.bazaar-ng.org/bzr/ 
> bzr.dev', f)
> -        self.assertEquals('http://www.bazaar-ng.org/bzr/bzr.dev',  
> url)
> +        url = extract_auth('http://user:pass@www.bazaar-vcs.org/ 
> bzr/bzr.dev', f)
> +        self.assertEquals('http://www.bazaar-vcs.org/bzr/bzr.dev',  
> url)
>          self.assertEquals(1, len(f.credentials))
> -        self.assertEquals([None, 'www.bazaar-ng.org', 'user',  
> 'pass'], f.credentials[0])
> +        self.assertEquals([None, 'www.bazaar-vcs.org', 'user',  
> 'pass'], f.credentials[0])
>
>      def test_abs_url(self):
>          """Construction of absolute http URLs"""
> -        t = HttpTransport_urllib('http://bazaar-ng.org/bzr/bzr.dev/')
> +        t = HttpTransport_urllib('http://bazaar-vcs.org/bzr/ 
> bzr.dev/')
>          eq = self.assertEqualDiff
>          eq(t.abspath('.'),
> -           'http://bazaar-ng.org/bzr/bzr.dev')
> +           'http://bazaar-vcs.org/bzr/bzr.dev')
>          eq(t.abspath('foo/bar'),
> -           'http://bazaar-ng.org/bzr/bzr.dev/foo/bar')
> +           'http://bazaar-vcs.org/bzr/bzr.dev/foo/bar')
>          eq(t.abspath('.bzr'),
> -           'http://bazaar-ng.org/bzr/bzr.dev/.bzr')
> +           'http://bazaar-vcs.org/bzr/bzr.dev/.bzr')
>          eq(t.abspath('.bzr/1//2/./3'),
> -           'http://bazaar-ng.org/bzr/bzr.dev/.bzr/1/2/3')
> +           'http://bazaar-vcs.org/bzr/bzr.dev/.bzr/1/2/3')
>
>      def test_invalid_http_urls(self):
>          """Trap invalid construction of urls"""
> -        t = HttpTransport_urllib('http://bazaar-ng.org/bzr/bzr.dev/')
> +        t = HttpTransport_urllib('http://bazaar-vcs.org/bzr/ 
> bzr.dev/')
>          self.assertRaises(ValueError,
>              t.abspath,
>              '.bzr/')
>
> === modified file 'bzrlib/util/configobj/docs/configobj.txt'
> --- bzrlib/util/configobj/docs/configobj.txt	
> +++ bzrlib/util/configobj/docs/configobj.txt	
> @@ -35,7 +35,7 @@
>
>  .. sidebar:: ConfigObj in Bazaar
>
> -    **ConfigObj** is now used as the config file parser for  
> `Bazaar <http://bazaar-ng.org>`_.
> +    **ConfigObj** is now used as the config file parser for  
> `Bazaar <http://bazaar-vcs.org>`_.
>
>      Bazaar is *the* Python  distributed {acro;VCS;Version Control  
> System}.
>      ConfigObj is used to read ``bazaar.conf`` and ``branches.conf``.
>
> Bazaar-NG -- a free distributed version-control tool
> http://bazaar-vcs.org/
>
> Basic commands:
>
>   bzr init           makes this directory a versioned branch
>   bzr add            make files or directories versioned
>   bzr ignore         ignore a file or pattern
>   bzr commit         save some or all changes
>
>   bzr status         summarize changes in working copy
>   bzr diff           show detailed diffs
>   bzr log            show history of changes
>
>   bzr branch         make a copy of another branch
>   bzr merge          pull in changes from another branch
>
>   bzr help           short help
>   bzr help commands  list all commands
>   bzr help <cmd>     get detailed help for <cmd>
>
> See bzr_man.htm for more help.

-- 
Martin