[Pkg-bazaar-commits] ./bzr/unstable r401: - very short tutorial on help page

[Martin Pool]

------------------------------------------------------------
revno: 401
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-05-09 13:01:21 +1000
message:
  - very short tutorial on help page
modified:
  TODO
  bzrlib/help.py
-------------- next part --------------
=== modified file 'TODO'
--- a/TODO	2005-05-08 23:11:45 +0000
+++ b/TODO	2005-05-09 03:01:21 +0000
@@ -54,8 +54,6 @@
 * ``bzr ignore`` command that just adds a line to the ``.bzrignore`` file
   and makes it versioned.  Fix this to break symlinks.
 
-* ``bzr help commands`` should give a one-line summary of each command.
-
 * Any useful sanity checks in 'bzr ignore'?  Perhaps give a warning if
   they try to add a single file which is already versioned, or if they
   add a pattern which already exists, or if it looks like they gave an

=== modified file 'bzrlib/help.py'
--- a/bzrlib/help.py	2005-05-05 03:02:38 +0000
+++ b/bzrlib/help.py	2005-05-09 03:01:21 +0000
@@ -29,40 +29,34 @@
 
 * No merge operators yet.
 
-Interesting commands:
-
-  bzr help [COMMAND]
-      Show help screen
-  bzr version
-      Show software version/licence/non-warranty.
-  bzr init
-      Start versioning the current directory
-  bzr add FILE...
-      Make files versioned.
-  bzr log
-      Show revision history.
-  bzr rename FROM TO
-      Rename one file.
-  bzr move FROM... DESTDIR
-      Move one or more files to a different directory.
-  bzr diff [FILE...]
-      Show changes from last revision to working copy.
-  bzr commit -m 'MESSAGE'
-      Store current state as new revision.
-  bzr export [-r REVNO] DESTINATION
-      Export the branch state at a previous version.
-  bzr status
-      Show summary of pending changes.
-  bzr remove FILE...
-      Make a file not versioned.
-  bzr info
-      Show statistics about this branch.
-  bzr check
-      Verify history is stored safely. 
-  (for more type 'bzr help commands')
+
+To make a branch, use 'bzr init' in an existing directory, then 'bzr
+add' to make files versioned.  'bzr add .' will recursively add all
+non-ignored files.
+
+'bzr status' describes files that are unknown, ignored, or modified.
+'bzr diff' shows the text changes to the tree or named files.
+'bzr commit -m <MESSAGE>' commits all changes in that branch.
+
+'bzr move' and 'bzr rename' allow you to rename files or directories.
+'bzr remove' makes a file unversioned but keeps the working copy;
+to delete that too simply delete the file.
+
+'bzr log' shows a history of changes, and
+'bzr info' gives summary statistical information.
+'bzr check' validates all files are stored safely.
+
+Files can be ignored by giving a path or a glob in .bzrignore at the
+top of the tree.  Use 'bzr ignored' to see what files are ignored and
+why, and 'bzr unknowns' to see files that are neither versioned or
+ignored.
+
+For more help on any command, type 'bzr help COMMAND', or 'bzr help
+commands' for a list.
 """
 
 
+
 def help(topic=None):
     if topic == None:
         print global_help