help: add "glossary" topic

Joint work with Vishakh Harikumar, Pradeepkumar Gayam, David Champion,
Mark Booth, timeless, Matt Mackall, Heinrik Stuart, Greg Ward, and
Martin Geisler.

mercurial/help/glossary.txt

@@ -0,0 +1,357
+Ancestor
+    Any changeset that can be reached by an unbroken chain of parent
+    changesets from a given changeset. More precisely, the ancestors
+    of a changeset can be defined by two properties: a parent of a
+    changeset is an ancestor, and a parent of an ancestor is an
+    ancestor. See also: 'Descendant'.
+
+Branch
+    (Noun) A child changeset that has been created from a parent that
+    is not a head. These are known as topological branches, see
+    'Branch, topological'.If a topological branch is named, it becomes
+    a named branch. If a topological branch is not named, it becomes
+    an anonymous branch. See 'Branch, anonymous' and 'Branch, named'.
+
+    Branches may be created when changes are pulled from or pushed to
+    a remote repository, since new heads may be created by these
+    operations. Note that the term branch can also be used informally
+    to describe a development process in which certain development is
+    done independently of other development.This is sometimes done
+    explicitly with a named branch, but it can also be done locally,
+    using bookmarks or clones and anonymous branches.
+
+    Example: "The experimental branch".
+
+    (Verb) The action of creating a child changeset which results in
+    its parent having more than one child.
+
+    Example: "I'm going to branch at X".
+
+Branch, anonymous
+    Every time a new child changeset is created from a parent that is not
+    a head and the name of the branch is not changed, a new anonymous
+    branch is created.
+
+Branch, closed
+    A named branch whose branch heads have all been closed.
+
+Branch, default
+    The branch assigned to a changeset when no name has previously been
+    assigned.
+
+Branch head
+    See 'Head, branch'.
+
+Branch, named
+    A collection of changesets which have the same branch name. By
+    default, children of a changeset in a named branch belong to the
+    same named branch. A child can be explicitly assigned to a
+    different branch. See :hg:`help branch`, :hg:`help branches` and
+    :hg:`commit --close-branch` for more information on managing
+    branches.
+
+    Named branches can be thought of as a kind of namespace, dividing
+    the collection of changesets that comprise the repository into a
+    collection of disjoint subsets. A named branch is not necessarily
+    a topological branch. If a new named branch is created from the
+    head of another named branch, or the default branch, but no
+    further changesets are added to that previous branch, then the new
+    named branch will be a branch in name only.
+
+Branch tip
+    See 'Tip, branch'.
+
+Branch, topological
+    Every time a new child changeset is created from a parent that is
+    not a head, a new topological branch is created. If a topological
+    branch is named, it becomes a named branch. If a topological
+    branch is not named, it becomes an anonymous branch of the
+    current, possibly default, branch.
+
+Changelog
+    A record of the changesets in the order in which they were added
+    to the repository. This includes details such as changeset id,
+    author, commit message, date, and list of changed files.
+
+Changeset
+    A snapshot of the state of the repository used to record a change.
+
+Changeset, child
+    The converse of parent changeset: if P is a parent of C, then C is
+    a child of P. There is no limit to the number of children that a
+    changeset may have.
+
+Changeset id
+    A SHA-1 hash that uniquely identifies a changeset. It may be
+    represented as either a "long" 40-byte hexadecimal string, or a
+    "short" 12-byte hexadecimal string.
+
+Changeset, merge
+    A changeset with two parents. This occurs when a merge is
+    committed.
+
+Changeset, parent
+    A revision upon which a child changeset is based. Specifically, a
+    parent changeset of a changeset C is a changeset whose node
+    immediately precedes C in the DAG. Changesets have at most two
+    parents.
+
+Checkout
+    (Noun) The working directory being updated to a specific
+    revision. This use should probably be avoided where possible, as
+    changeset is much more appropriate than checkout in this context.
+
+    Example: "I'm using checkout X."
+
+    (Verb) Updating the working directory to a specific changeset. See
+    :hg:`help update`.
+
+    Example: "I'm going to check out changeset X."
+
+Child changeset
+    See 'Changeset, child'.
+
+Close changeset
+    See 'Changeset, close'.
+
+Closed branch
+    See 'Branch, closed'.
+
+Clone
+    (Noun) An entire or partial copy of a repository. The partial
+    clone must be in the form of a revision and its ancestors.
+
+    Example: "Is your clone up to date?".
+
+    (Verb) The process of creating a clone, using :hg:`clone`.
+
+    Example: "I'm going to clone the repository".
+
+Closed branch head
+    See 'Head, closed branch'.
+
+Commit
+    (Noun) A synonym for changeset.
+
+    Example: "Is the bug fixed in your recent commit?"
+
+    (Verb) The act of recording changes to a repository. When files
+    are committed in a working directory, Mercurial finds the
+    differences between the committed files and their parent
+    changeset, creating a new changeset in the repository.
+
+    Example: "You should commit those changes now."
+
+Cset
+    A common abbreviation of the term changeset.
+
+DAG
+    The repository of changesets of a distributed version control
+    system (DVCS) can be described as a directed acyclic graph (DAG),
+    consisting of nodes and edges, where nodes correspond to
+    changesets and edges imply a parent -> child relation. This graph
+    can be visualized by graphical tools such as :hg:`glog`
+    (graphlog). In mercurial, the DAG is limited by the requirement
+    for children to have at most two parents.
+
+Default branch
+    See 'Branch, default'.
+
+Descendant
+    Any changeset that can be reached by a chain of child changesets
+    from a given changeset. More precisely, the descendants of a
+    changeset can be defined by two properties: the child of a
+    changeset is a descendant, and the child of a descendant is a
+    descendant. See also: 'Ancestor'.
+
+Diff
+    (Noun) The difference between the contents and attributes of files
+    in two changesets or a changeset and the current working
+    directory. The difference is usually represented in a standard
+    form called a "diff" or "patch". The "git diff" format is used
+    when the changes include copies, renames, or changes to file
+    attributes, none of which can be represented/handled by classic
+    "diff" and "patch".
+
+    Example: "Did you see my correction in the diff?"
+
+    (Verb) Diffing two changesets is the action of creating a diff or
+    patch.
+
+    Example: "If you diff with changeset X, you will see what I mean."
+
+Directory, working
+    The working directory represents the state of the files tracked by
+    Mercurial, that will be recorded in the next commit. The working
+    directory initially corresponds to the snapshot at an existing
+    changeset, known as the parent of the working directory. See
+    'Parents, working directory'. The state may be modified by changes
+    to the files introduced manually or by a merge. The repository
+    metadata exists in the .hg directory inside the working directory.
+
+Graph
+    See DAG and :hg:`help graphlog`.
+
+Head
+    The term 'head' may be used to refer to both a branch head or a
+    repository head, depending on the context. See 'Head, branch' and
+    'Head, repository' for specific definitions.
+
+    Heads are where development generally takes place and are the
+    usual targets for update and merge operations.
+
+Head, branch
+    A changeset with no descendants on the same named branch.
+
+Head, closed branch
+    A changeset that marks a head as no longer interesting. The closed
+    head is no longer listed by :hg:`heads`. A branch is considered
+    closed when all its heads are closed and consequently is not
+    listed by :hg:`branches`.
+
+Head, repository
+    A topological head which has not been closed.
+
+Head, topological
+    A changeset with no children in the repository.
+
+History, immutable
+    Once committed, changesets cannot be altered.  Extensions which
+    appear to change history actually create new changesets that
+    replace existing ones, and then destroy the old changesets. Doing
+    so in public repositories can result in old changesets being
+    reintroduced to the repository.
+
+History, rewriting
+    The changesets in a repository are immutable. However, extensions
+    to Mercurial can be used to alter the repository, usually in such
+    a way as to preserve changeset contents.
+
+Immutable history
+    See 'History, immutable'.
+
+Merge changeset
+    See 'Changeset, merge'.
+
+Manifest
+    Each changeset has a manifest, which is the list of files that are
+    tracked by the changeset.
+
+Merge
+    Used to bring together divergent branches of work. When you update
+    to a changeset and then merge another changeset, you bring the
+    history of the latter changeset into your working directory. Once
+    conflicts are resolved (and marked), this merge may be committed
+    as a merge changeset, bringing two branches together in the DAG.
+
+Named branch
+    See 'Branch, named'.
+
+Null changeset
+    The empty changeset. It is the parent state of newly-initialized
+    repositories and repositories with no checked out revision. It is
+    thus the parent of root changesets and the effective ancestor when
+    merging unrelated changesets. Can be specified by the alias 'null'
+    or by the changeset ID '000000000000'.
+
+Parent
+    See 'Changeset, parent'.
+
+Parent changeset
+    See 'Changeset, parent'.
+
+Parent, working directory
+    The working directory parent reflects a virtual revision which is
+    the child of the changeset (or two changesets with an uncommitted
+    merge) shown by :hg:`parents`. This is changed with
+    :hg:`update`. Other commands to see the working directory parent
+    are :hg:`summary` and :hg:`id`. Can be specified by the alias ".".
+
+Patch
+    (Noun) The product of a diff operation.
+
+    Example: "I've sent you my patch."
+
+    (Verb) The process of using a patch file to transform one
+    changeset into another.
+
+    Example: "You will need to patch that revision."
+
+Pull
+    An operation in which changesets in a remote repository which are
+    not in the local repository are brought into the local
+    repository. Note that this operation without special arguments
+    only updates the repository, it does not update the files in the
+    working directory. See :hg:`help pull`.
+
+Push
+    An operation in which changesets in a local repository which are
+    not in a remote repository are sent to the remote repository. Note
+    that this operation only adds changesets which have been committed
+    locally to the remote repository. Uncommitted changes are not
+    sent. See :hg:`help push`.
+
+Repository
+    The metadata describing all recorded states of a collection of
+    files. Each recorded state is represented by a changeset. A
+    repository is usually (but not always) found in the ``.hg``
+    subdirectory of a working directory. Any recorded state can be
+    recreated by "updating" a working directory to a specific
+    changeset.
+
+Repository head
+    See 'Head, repository'.
+
+Revision
+    A state of the repository at some point in time. Earlier revisions
+    can be updated to by using :hg:`update`.  See also 'Revision
+    number'; See also 'Changeset'.
+
+Revision number
+    This integer uniquely identifies a changeset in a specific
+    repository. It represents the order in which changesets were added
+    to a repository, starting with revision number 0. Note that the
+    revision number may be different in each clone of a repository. To
+    identify changesets uniquely between different clones, see
+    'Changeset id'.
+
+Revlog
+    History storage mechanism used by Mercurial. It is a form of delta
+    encoding, with occasional full revision of data followed by delta
+    of each successive revision. It includes data and an index
+    pointing to the data.
+
+Rewriting history
+    See  'History, rewriting'.
+
+Root
+    A changeset that has only the null changeset as its parent. Most
+    repositories have only a single root changeset.
+
+Tip
+    The changeset with the highest revision number. It is the changeset
+    most recently added in a repository.
+
+Tip, branch
+    The head of a given branch with the highest revision number. When
+    a branch name is used as a revision identifier, it refers to the
+    branch tip. See also 'Branch, head'. Note that because revision
+    numbers may be different in different repository clones, the
+    branch tip may be different in different cloned repositories.
+
+Update
+    (Noun) Another synonym of changeset.
+
+    Example:  "I've pushed an update".
+
+    (Verb) This term is usually used to describe updating the state of
+    the working directory to that of a specific changeset. See
+    :hg:`help update`.
+
+    Example: "You should update".
+
+Working directory
+    See 'Directory, working'.
+
+Working directory parent
+    See  'Parent, working directory'.

mercurial/help.py

@@ -1,101 +1,102
 # help.py - help data for mercurial
 #
 # Copyright 2006 Matt Mackall <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 from i18n import gettext, _
 import sys, os
 import extensions
 
 
 def moduledoc(file):
     '''return the top-level python documentation for the given file
 
     Loosely inspired by pydoc.source_synopsis(), but rewritten to
     handle triple quotes and to return the whole text instead of just
     the synopsis'''
     result = []
 
     line = file.readline()
     while line[:1] == '#' or not line.strip():
         line = file.readline()
         if not line:
             break
 
     start = line[:3]
     if start == '"""' or start == "'''":
         line = line[3:]
         while line:
             if line.rstrip().endswith(start):
                 line = line.split(start)[0]
                 if line:
                     result.append(line)
                 break
             elif not line:
                 return None # unmatched delimiter
             result.append(line)
             line = file.readline()
     else:
         return None
 
     return ''.join(result)
 
 def listexts(header, exts, maxlength, indent=1):
     '''return a text listing of the given extensions'''
     if not exts:
         return ''
     result = '\n%s\n\n' % header
     for name, desc in sorted(exts.iteritems()):
         result += '%s%-*s %s\n' % (' ' * indent, maxlength + 2,
                                    ':%s:' % name, desc)
     return result
 
 def extshelp():
     doc = loaddoc('extensions')()
 
     exts, maxlength = extensions.enabled()
     doc += listexts(_('enabled extensions:'), exts, maxlength)
 
     exts, maxlength = extensions.disabled()
     doc += listexts(_('disabled extensions:'), exts, maxlength)
 
     return doc
 
 def loaddoc(topic):
     """Return a delayed loader for help/topic.txt."""
 
     def loader():
         if hasattr(sys, 'frozen'):
             module = sys.executable
         else:
             module = __file__
         base = os.path.dirname(module)
 
         for dir in ('.', '..'):
             docdir = os.path.join(base, dir, 'help')
             if os.path.isdir(docdir):
                 break
 
         path = os.path.join(docdir, topic + ".txt")
         return gettext(open(path).read())
     return loader
 
 helptable = (
     (["config"], _("Configuration Files"), loaddoc('config')),
     (["dates"], _("Date Formats"), loaddoc('dates')),
     (["patterns"], _("File Name Patterns"), loaddoc('patterns')),
     (['environment', 'env'], _('Environment Variables'),
      loaddoc('environment')),
     (['revs', 'revisions'], _('Specifying Single Revisions'),
      loaddoc('revisions')),
     (['mrevs', 'multirevs'], _('Specifying Multiple Revisions'),
      loaddoc('multirevs')),
     (['diffs'], _('Diff Formats'), loaddoc('diffs')),
     (['templating', 'templates'], _('Template Usage'),
      loaddoc('templates')),
     (['urls'], _('URL Paths'), loaddoc('urls')),
     (["extensions"], _("Using additional features"), extshelp),
     (["hgweb"], _("Configuring hgweb"), loaddoc('hgweb')),
+    (["glossary"], _("Glossary"), loaddoc('glossary')),
 )

tests/test-globalopts.out

@@ -1,288 +1,290
 adding a
 adding b
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 pulling from ../b
 searching for changes
 warning: repository is unrelated
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 %% -R/--repository
 changeset:   0:8580ff50825a
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     a
 
 changeset:   0:b6c483daf290
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     b
 
 %% implicit -R
 0: a
 0: a
 abort: There is no Mercurial repository here (.hg not found)!
 abort: a/a not under root
 abort: There is no Mercurial repository here (.hg not found)!
 %% abbrev of long option
 changeset:   1:b6c483daf290
 tag:         tip
 parent:      -1:000000000000
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     b
 
 %% earlygetopt with duplicate options (36d23de02da1)
 changeset:   1:b6c483daf290
 tag:         tip
 parent:      -1:000000000000
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     b
 
 changeset:   0:8580ff50825a
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     a
 
 %% earlygetopt short option without following space
 0:b6c483daf290
 %% earlygetopt with illegal abbreviations
 abort: Option --config may not be abbreviated!
 abort: Option --cwd may not be abbreviated!
 abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
 abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
 abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
 abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
 %% --cwd
 changeset:   0:8580ff50825a
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     a
 
 %% -y/--noninteractive - just be sure it is parsed
 0:8580ff50825a
 0:8580ff50825a
 %% -q/--quiet
 0:8580ff50825a
 0:b6c483daf290
 0:8580ff50825a
 1:b6c483daf290
 %% -v/--verbose
 changeset:   1:b6c483daf290
 tag:         tip
 parent:      -1:000000000000
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 files:       b
 description:
 b
 
 
 changeset:   0:8580ff50825a
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 files:       a
 description:
 a
 
 
 changeset:   0:b6c483daf290
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 files:       b
 description:
 b
 
 
 %% --config
 quuxfoo
 abort: malformed --config option: '' (use --config section.name=value)
 abort: malformed --config option: 'a.b' (use --config section.name=value)
 abort: malformed --config option: 'a' (use --config section.name=value)
 abort: malformed --config option: 'a.=' (use --config section.name=value)
 abort: malformed --config option: '.b=' (use --config section.name=value)
 %% --debug
 changeset:   1:b6c483daf2907ce5825c0bb50f5716226281cc1a
 tag:         tip
 parent:      -1:0000000000000000000000000000000000000000
 parent:      -1:0000000000000000000000000000000000000000
 manifest:    1:23226e7a252cacdc2d99e4fbdc3653441056de49
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 files+:      b
 extra:       branch=default
 description:
 b
 
 
 changeset:   0:8580ff50825a50c8f716709acdf8de0deddcd6ab
 parent:      -1:0000000000000000000000000000000000000000
 parent:      -1:0000000000000000000000000000000000000000
 manifest:    0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 files+:      a
 extra:       branch=default
 description:
 a
 
 
 %% --traceback
 Traceback (most recent call last):
 %% --time
 Time: real x.x secs (user x.x+x.x sys x.x+x.x)
 %% --version
 Mercurial Distributed SCM (version xxx)
 %% -h/--help
 Mercurial Distributed SCM
 
 list of commands:
 
  add          add the specified files on the next commit
  addremove    add all new files, delete all missing files
  annotate     show changeset information by line for each file
  archive      create an unversioned archive of a repository revision
  backout      reverse effect of earlier changeset
  bisect       subdivision search of changesets
  branch       set or show the current branch name
  branches     list repository named branches
  bundle       create a changegroup file
  cat          output the current or given revision of files
  clone        make a copy of an existing repository
  commit       commit the specified files or all outstanding changes
  copy         mark files as copied for the next commit
  diff         diff repository (or selected files)
  export       dump the header and diffs for one or more changesets
  forget       forget the specified files on the next commit
  grep         search for a pattern in specified files and revisions
  heads        show current repository heads or show branch heads
  help         show help for a given topic or a help overview
  identify     identify the working copy or specified revision
  import       import an ordered set of patches
  incoming     show new changesets found in source
  init         create a new repository in the given directory
  locate       locate files matching specific patterns
  log          show revision history of entire repository or files
  manifest     output the current or given revision of the project manifest
  merge        merge working directory with another revision
  outgoing     show changesets not found in the destination
  parents      show the parents of the working directory or revision
  paths        show aliases for remote repositories
  pull         pull changes from the specified source
  push         push changes to the specified destination
  recover      roll back an interrupted transaction
  remove       remove the specified files on the next commit
  rename       rename files; equivalent of copy + remove
  resolve      various operations to help finish a merge
  revert       restore individual files or directories to an earlier state
  rollback     roll back the last transaction (dangerous)
  root         print the root (top) of the current working directory
  serve        start stand-alone webserver
  showconfig   show combined config settings from all hgrc files
  status       show changed files in the working directory
  summary      summarize working directory state
  tag          add one or more tags for the current or given revision
  tags         list repository tags
  tip          show the tip revision
  unbundle     apply one or more changegroup files
  update       update working directory (or switch revisions)
  verify       verify the integrity of the repository
  version      output version and copyright information
 
 additional help topics:
 
  config       Configuration Files
  dates        Date Formats
  patterns     File Name Patterns
  environment  Environment Variables
  revisions    Specifying Single Revisions
  multirevs    Specifying Multiple Revisions
  diffs        Diff Formats
  templating   Template Usage
  urls         URL Paths
  extensions   Using additional features
  hgweb        Configuring hgweb
+ glossary     Glossary
 
 use "hg -v help" to show aliases and global options
 Mercurial Distributed SCM
 
 list of commands:
 
  add          add the specified files on the next commit
  addremove    add all new files, delete all missing files
  annotate     show changeset information by line for each file
  archive      create an unversioned archive of a repository revision
  backout      reverse effect of earlier changeset
  bisect       subdivision search of changesets
  branch       set or show the current branch name
  branches     list repository named branches
  bundle       create a changegroup file
  cat          output the current or given revision of files
  clone        make a copy of an existing repository
  commit       commit the specified files or all outstanding changes
  copy         mark files as copied for the next commit
  diff         diff repository (or selected files)
  export       dump the header and diffs for one or more changesets
  forget       forget the specified files on the next commit
  grep         search for a pattern in specified files and revisions
  heads        show current repository heads or show branch heads
  help         show help for a given topic or a help overview
  identify     identify the working copy or specified revision
  import       import an ordered set of patches
  incoming     show new changesets found in source
  init         create a new repository in the given directory
  locate       locate files matching specific patterns
  log          show revision history of entire repository or files
  manifest     output the current or given revision of the project manifest
  merge        merge working directory with another revision
  outgoing     show changesets not found in the destination
  parents      show the parents of the working directory or revision
  paths        show aliases for remote repositories
  pull         pull changes from the specified source
  push         push changes to the specified destination
  recover      roll back an interrupted transaction
  remove       remove the specified files on the next commit
  rename       rename files; equivalent of copy + remove
  resolve      various operations to help finish a merge
  revert       restore individual files or directories to an earlier state
  rollback     roll back the last transaction (dangerous)
  root         print the root (top) of the current working directory
  serve        start stand-alone webserver
  showconfig   show combined config settings from all hgrc files
  status       show changed files in the working directory
  summary      summarize working directory state
  tag          add one or more tags for the current or given revision
  tags         list repository tags
  tip          show the tip revision
  unbundle     apply one or more changegroup files
  update       update working directory (or switch revisions)
  verify       verify the integrity of the repository
  version      output version and copyright information
 
 additional help topics:
 
  config       Configuration Files
  dates        Date Formats
  patterns     File Name Patterns
  environment  Environment Variables
  revisions    Specifying Single Revisions
  multirevs    Specifying Multiple Revisions
  diffs        Diff Formats
  templating   Template Usage
  urls         URL Paths
  extensions   Using additional features
  hgweb        Configuring hgweb
+ glossary     Glossary
 
 use "hg -v help" to show aliases and global options
 %% not tested: --debugger

tests/test-help.out

@@ -1,664 +1,667
 Mercurial Distributed SCM
 
 basic commands:
 
  add        add the specified files on the next commit
  annotate   show changeset information by line for each file
  clone      make a copy of an existing repository
  commit     commit the specified files or all outstanding changes
  diff       diff repository (or selected files)
  export     dump the header and diffs for one or more changesets
  forget     forget the specified files on the next commit
  init       create a new repository in the given directory
  log        show revision history of entire repository or files
  merge      merge working directory with another revision
  pull       pull changes from the specified source
  push       push changes to the specified destination
  remove     remove the specified files on the next commit
  serve      start stand-alone webserver
  status     show changed files in the working directory
  summary    summarize working directory state
  update     update working directory (or switch revisions)
 
 use "hg help" for the full list of commands or "hg -v" for details
  add        add the specified files on the next commit
  annotate   show changeset information by line for each file
  clone      make a copy of an existing repository
  commit     commit the specified files or all outstanding changes
  diff       diff repository (or selected files)
  export     dump the header and diffs for one or more changesets
  forget     forget the specified files on the next commit
  init       create a new repository in the given directory
  log        show revision history of entire repository or files
  merge      merge working directory with another revision
  pull       pull changes from the specified source
  push       push changes to the specified destination
  remove     remove the specified files on the next commit
  serve      start stand-alone webserver
  status     show changed files in the working directory
  summary    summarize working directory state
  update     update working directory (or switch revisions)
 Mercurial Distributed SCM
 
 list of commands:
 
  add          add the specified files on the next commit
  addremove    add all new files, delete all missing files
  annotate     show changeset information by line for each file
  archive      create an unversioned archive of a repository revision
  backout      reverse effect of earlier changeset
  bisect       subdivision search of changesets
  branch       set or show the current branch name
  branches     list repository named branches
  bundle       create a changegroup file
  cat          output the current or given revision of files
  clone        make a copy of an existing repository
  commit       commit the specified files or all outstanding changes
  copy         mark files as copied for the next commit
  diff         diff repository (or selected files)
  export       dump the header and diffs for one or more changesets
  forget       forget the specified files on the next commit
  grep         search for a pattern in specified files and revisions
  heads        show current repository heads or show branch heads
  help         show help for a given topic or a help overview
  identify     identify the working copy or specified revision
  import       import an ordered set of patches
  incoming     show new changesets found in source
  init         create a new repository in the given directory
  locate       locate files matching specific patterns
  log          show revision history of entire repository or files
  manifest     output the current or given revision of the project manifest
  merge        merge working directory with another revision
  outgoing     show changesets not found in the destination
  parents      show the parents of the working directory or revision
  paths        show aliases for remote repositories
  pull         pull changes from the specified source
  push         push changes to the specified destination
  recover      roll back an interrupted transaction
  remove       remove the specified files on the next commit
  rename       rename files; equivalent of copy + remove
  resolve      various operations to help finish a merge
  revert       restore individual files or directories to an earlier state
  rollback     roll back the last transaction (dangerous)
  root         print the root (top) of the current working directory
  serve        start stand-alone webserver
  showconfig   show combined config settings from all hgrc files
  status       show changed files in the working directory
  summary      summarize working directory state
  tag          add one or more tags for the current or given revision
  tags         list repository tags
  tip          show the tip revision
  unbundle     apply one or more changegroup files
  update       update working directory (or switch revisions)
  verify       verify the integrity of the repository
  version      output version and copyright information
 
 additional help topics:
 
  config       Configuration Files
  dates        Date Formats
  patterns     File Name Patterns
  environment  Environment Variables
  revisions    Specifying Single Revisions
  multirevs    Specifying Multiple Revisions
  diffs        Diff Formats
  templating   Template Usage
  urls         URL Paths
  extensions   Using additional features
  hgweb        Configuring hgweb
+ glossary     Glossary
 
 use "hg -v help" to show aliases and global options
  add          add the specified files on the next commit
  addremove    add all new files, delete all missing files
  annotate     show changeset information by line for each file
  archive      create an unversioned archive of a repository revision
  backout      reverse effect of earlier changeset
  bisect       subdivision search of changesets
  branch       set or show the current branch name
  branches     list repository named branches
  bundle       create a changegroup file
  cat          output the current or given revision of files
  clone        make a copy of an existing repository
  commit       commit the specified files or all outstanding changes
  copy         mark files as copied for the next commit
  diff         diff repository (or selected files)
  export       dump the header and diffs for one or more changesets
  forget       forget the specified files on the next commit
  grep         search for a pattern in specified files and revisions
  heads        show current repository heads or show branch heads
  help         show help for a given topic or a help overview
  identify     identify the working copy or specified revision
  import       import an ordered set of patches
  incoming     show new changesets found in source
  init         create a new repository in the given directory
  locate       locate files matching specific patterns
  log          show revision history of entire repository or files
  manifest     output the current or given revision of the project manifest
  merge        merge working directory with another revision
  outgoing     show changesets not found in the destination
  parents      show the parents of the working directory or revision
  paths        show aliases for remote repositories
  pull         pull changes from the specified source
  push         push changes to the specified destination
  recover      roll back an interrupted transaction
  remove       remove the specified files on the next commit
  rename       rename files; equivalent of copy + remove
  resolve      various operations to help finish a merge
  revert       restore individual files or directories to an earlier state
  rollback     roll back the last transaction (dangerous)
  root         print the root (top) of the current working directory
  serve        start stand-alone webserver
  showconfig   show combined config settings from all hgrc files
  status       show changed files in the working directory
  summary      summarize working directory state
  tag          add one or more tags for the current or given revision
  tags         list repository tags
  tip          show the tip revision
  unbundle     apply one or more changegroup files
  update       update working directory (or switch revisions)
  verify       verify the integrity of the repository
  version      output version and copyright information
 
 additional help topics:
 
  config       Configuration Files
  dates        Date Formats
  patterns     File Name Patterns
  environment  Environment Variables
  revisions    Specifying Single Revisions
  multirevs    Specifying Multiple Revisions
  diffs        Diff Formats
  templating   Template Usage
  urls         URL Paths
  extensions   Using additional features
  hgweb        Configuring hgweb
+ glossary     Glossary
 %% test short command list with verbose option
 Mercurial Distributed SCM (version xxx)
 
 Copyright (C) 2005-2010 Matt Mackall <[e-mail]> and others
 This is free software; see the source for copying conditions. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 basic commands:
 
  add:
       add the specified files on the next commit
  annotate, blame:
       show changeset information by line for each file
  clone:
       make a copy of an existing repository
  commit, ci:
       commit the specified files or all outstanding changes
  diff:
       diff repository (or selected files)
  export:
       dump the header and diffs for one or more changesets
  forget:
       forget the specified files on the next commit
  init:
       create a new repository in the given directory
  log, history:
       show revision history of entire repository or files
  merge:
       merge working directory with another revision
  pull:
       pull changes from the specified source
  push:
       push changes to the specified destination
  remove, rm:
       remove the specified files on the next commit
  serve:
       start stand-alone webserver
  status, st:
       show changed files in the working directory
  summary, sum:
       summarize working directory state
  update, up, checkout, co:
       update working directory (or switch revisions)
 
 global options:
  -R --repository REPO    repository root directory or name of overlay bundle
                          file
     --cwd DIR            change working directory
  -y --noninteractive     do not prompt, assume 'yes' for any required answers
  -q --quiet              suppress output
  -v --verbose            enable additional output
     --config CONFIG [+]  set/override config option (use 'section.name=value')
     --debug              enable debugging output
     --debugger           start debugger
     --encoding ENCODE    set the charset encoding (default: ascii)
     --encodingmode MODE  set the charset encoding mode (default: strict)
     --traceback          always print a traceback on exception
     --time               time how long the command takes
     --profile            print command execution profile
     --version            output version information and exit
  -h --help               display help and exit
 
 [+] marked option can be specified multiple times
 
 use "hg help" for the full list of commands
 hg add [OPTION]... [FILE]...
 
 add the specified files on the next commit
 
     Schedule files to be version controlled and added to the repository.
 
     The files will be added to the repository at the next commit. To undo an
     add before that, see "hg forget".
 
     If no names are given, add all files to the repository.
 
 use "hg -v help add" to show verbose help
 
 options:
 
  -I --include PATTERN [+]  include names matching the given patterns
  -X --exclude PATTERN [+]  exclude names matching the given patterns
  -n --dry-run              do not perform actions, just print output
 
 [+] marked option can be specified multiple times
 
 use "hg -v help add" to show global options
 %% verbose help for add
 hg add [OPTION]... [FILE]...
 
 add the specified files on the next commit
 
     Schedule files to be version controlled and added to the repository.
 
     The files will be added to the repository at the next commit. To undo an
     add before that, see "hg forget".
 
     If no names are given, add all files to the repository.
 
     An example showing how new (unknown) files are added automatically by "hg
     add":
 
       $ ls
       foo.c
       $ hg status
       ? foo.c
       $ hg add
       adding foo.c
       $ hg status
       A foo.c
 
 options:
 
  -I --include PATTERN [+]  include names matching the given patterns
  -X --exclude PATTERN [+]  exclude names matching the given patterns
  -n --dry-run              do not perform actions, just print output
 
 global options:
  -R --repository REPO      repository root directory or name of overlay bundle
                            file
     --cwd DIR              change working directory
  -y --noninteractive       do not prompt, assume 'yes' for any required
                            answers
  -q --quiet                suppress output
  -v --verbose              enable additional output
     --config CONFIG [+]    set/override config option (use
                            'section.name=value')
     --debug                enable debugging output
     --debugger             start debugger
     --encoding ENCODE      set the charset encoding (default: ascii)
     --encodingmode MODE    set the charset encoding mode (default: strict)
     --traceback            always print a traceback on exception
     --time                 time how long the command takes
     --profile              print command execution profile
     --version              output version information and exit
  -h --help                 display help and exit
 
 [+] marked option can be specified multiple times
 %% test help option with version option
 Mercurial Distributed SCM (version xxx)
 
 Copyright (C) 2005-2010 Matt Mackall <[e-mail]> and others
 This is free software; see the source for copying conditions. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 hg add [OPTION]... [FILE]...
 
 add the specified files on the next commit
 
     Schedule files to be version controlled and added to the repository.
 
     The files will be added to the repository at the next commit. To undo an
     add before that, see "hg forget".
 
     If no names are given, add all files to the repository.
 
 use "hg -v help add" to show verbose help
 
 options:
 
  -I --include PATTERN [+]  include names matching the given patterns
  -X --exclude PATTERN [+]  exclude names matching the given patterns
  -n --dry-run              do not perform actions, just print output
 
 [+] marked option can be specified multiple times
 
 use "hg -v help add" to show global options
 hg add: option --skjdfks not recognized
 hg add [OPTION]... [FILE]...
 
 add the specified files on the next commit
 
     Schedule files to be version controlled and added to the repository.
 
     The files will be added to the repository at the next commit. To undo an
     add before that, see "hg forget".
 
     If no names are given, add all files to the repository.
 
 use "hg -v help add" to show verbose help
 
 options:
 
  -I --include PATTERN [+]  include names matching the given patterns
  -X --exclude PATTERN [+]  exclude names matching the given patterns
  -n --dry-run              do not perform actions, just print output
 
 [+] marked option can be specified multiple times
 
 use "hg -v help add" to show global options
 %% test ambiguous command help
 list of commands:
 
  add         add the specified files on the next commit
  addremove   add all new files, delete all missing files
 
 use "hg -v help ad" to show aliases and global options
 %% test command without options
 hg verify
 
 verify the integrity of the repository
 
     Verify the integrity of the current repository.
 
     This will perform an extensive check of the repository's integrity,
     validating the hashes and checksums of each entry in the changelog,
     manifest, and tracked files, as well as the integrity of their crosslinks
     and indices.
 
     Returns 0 on success, 1 if errors are encountered.
 
 use "hg -v help verify" to show global options
 hg diff [OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...
 
 diff repository (or selected files)
 
     Show differences between revisions for the specified files.
 
     Differences between files are shown using the unified diff format.
 
     NOTE: diff may generate unexpected results for merges, as it will default
     to comparing against the working directory's first parent changeset if no
     revisions are specified.
 
     When two revision arguments are given, then changes are shown between
     those revisions. If only one revision is specified then that revision is
     compared to the working directory, and, when no revisions are specified,
     the working directory files are compared to its parent.
 
     Alternatively you can specify -c/--change with a revision to see the
     changes in that changeset relative to its first parent.
 
     Without the -a/--text option, diff will avoid generating diffs of files it
     detects as binary. With -a, diff will generate a diff anyway, probably
     with undesirable results.
 
     Use the -g/--git option to generate diffs in the git extended diff format.
     For more information, read "hg help diffs".
 
     Returns 0 on success.
 
 options:
 
  -r --rev REV [+]          revision
  -c --change REV           change made by revision
  -a --text                 treat all files as text
  -g --git                  use git extended diff format
     --nodates              omit dates from diff headers
  -p --show-function        show which function each change is in
     --reverse              produce a diff that undoes the changes
  -w --ignore-all-space     ignore white space when comparing lines
  -b --ignore-space-change  ignore changes in the amount of white space
  -B --ignore-blank-lines   ignore changes whose lines are all blank
  -U --unified NUM          number of lines of context to show
     --stat                 output diffstat-style summary of changes
  -I --include PATTERN [+]  include names matching the given patterns
  -X --exclude PATTERN [+]  exclude names matching the given patterns
 
 [+] marked option can be specified multiple times
 
 use "hg -v help diff" to show global options
 hg status [OPTION]... [FILE]...
 
 aliases: st
 
 show changed files in the working directory
 
     Show status of files in the repository. If names are given, only files
     that match are shown. Files that are clean or ignored or the source of a
     copy/move operation, are not listed unless -c/--clean, -i/--ignored,
     -C/--copies or -A/--all are given. Unless options described with "show
     only ..." are given, the options -mardu are used.
 
     Option -q/--quiet hides untracked (unknown and ignored) files unless
     explicitly requested with -u/--unknown or -i/--ignored.
 
     NOTE: status may appear to disagree with diff if permissions have changed
     or a merge has occurred. The standard diff format does not report
     permission changes and diff only reports changes relative to one merge
     parent.
 
     If one revision is given, it is used as the base revision. If two
     revisions are given, the differences between them are shown. The --change
     option can also be used as a shortcut to list the changed files of a
     revision from its first parent.
 
     The codes used to show the status of files are:
 
       M = modified
       A = added
       R = removed
       C = clean
       ! = missing (deleted by non-hg command, but still tracked)
       ? = not tracked
       I = ignored
         = origin of the previous file listed as A (added)
 
     Returns 0 on success.
 
 options:
 
  -A --all                  show status of all files
  -m --modified             show only modified files
  -a --added                show only added files
  -r --removed              show only removed files
  -d --deleted              show only deleted (but tracked) files
  -c --clean                show only files without changes
  -u --unknown              show only unknown (not tracked) files
  -i --ignored              show only ignored files
  -n --no-status            hide status prefix
  -C --copies               show source of copied files
  -0 --print0               end filenames with NUL, for use with xargs
     --rev REV [+]          show difference from revision
     --change REV           list the changed files of a revision
  -I --include PATTERN [+]  include names matching the given patterns
  -X --exclude PATTERN [+]  exclude names matching the given patterns
 
 [+] marked option can be specified multiple times
 
 use "hg -v help status" to show global options
 hg status [OPTION]... [FILE]...
 
 show changed files in the working directory
 hg: unknown command 'foo'
 Mercurial Distributed SCM
 
 basic commands:
 
  add        add the specified files on the next commit
  annotate   show changeset information by line for each file
  clone      make a copy of an existing repository
  commit     commit the specified files or all outstanding changes
  diff       diff repository (or selected files)
  export     dump the header and diffs for one or more changesets
  forget     forget the specified files on the next commit
  init       create a new repository in the given directory
  log        show revision history of entire repository or files
  merge      merge working directory with another revision
  pull       pull changes from the specified source
  push       push changes to the specified destination
  remove     remove the specified files on the next commit
  serve      start stand-alone webserver
  status     show changed files in the working directory
  summary    summarize working directory state
  update     update working directory (or switch revisions)
 
 use "hg help" for the full list of commands or "hg -v" for details
 hg: unknown command 'skjdfks'
 Mercurial Distributed SCM
 
 basic commands:
 
  add        add the specified files on the next commit
  annotate   show changeset information by line for each file
  clone      make a copy of an existing repository
  commit     commit the specified files or all outstanding changes
  diff       diff repository (or selected files)
  export     dump the header and diffs for one or more changesets
  forget     forget the specified files on the next commit
  init       create a new repository in the given directory
  log        show revision history of entire repository or files
  merge      merge working directory with another revision
  pull       pull changes from the specified source
  push       push changes to the specified destination
  remove     remove the specified files on the next commit
  serve      start stand-alone webserver
  status     show changed files in the working directory
  summary    summarize working directory state
  update     update working directory (or switch revisions)
 
 use "hg help" for the full list of commands or "hg -v" for details
 %% test command with no help text
 hg nohelp
 
 (no help text available)
 
 use "hg -v help nohelp" to show global options
 %% test that default list of commands omits extension commands
 Mercurial Distributed SCM
 
 list of commands:
 
  add          add the specified files on the next commit
  addremove    add all new files, delete all missing files
  annotate     show changeset information by line for each file
  archive      create an unversioned archive of a repository revision
  backout      reverse effect of earlier changeset
  bisect       subdivision search of changesets
  branch       set or show the current branch name
  branches     list repository named branches
  bundle       create a changegroup file
  cat          output the current or given revision of files
  clone        make a copy of an existing repository
  commit       commit the specified files or all outstanding changes
  copy         mark files as copied for the next commit
  diff         diff repository (or selected files)
  export       dump the header and diffs for one or more changesets
  forget       forget the specified files on the next commit
  grep         search for a pattern in specified files and revisions
  heads        show current repository heads or show branch heads
  help         show help for a given topic or a help overview
  identify     identify the working copy or specified revision
  import       import an ordered set of patches
  incoming     show new changesets found in source
  init         create a new repository in the given directory
  locate       locate files matching specific patterns
  log          show revision history of entire repository or files
  manifest     output the current or given revision of the project manifest
  merge        merge working directory with another revision
  outgoing     show changesets not found in the destination
  parents      show the parents of the working directory or revision
  paths        show aliases for remote repositories
  pull         pull changes from the specified source
  push         push changes to the specified destination
  recover      roll back an interrupted transaction
  remove       remove the specified files on the next commit
  rename       rename files; equivalent of copy + remove
  resolve      various operations to help finish a merge
  revert       restore individual files or directories to an earlier state
  rollback     roll back the last transaction (dangerous)
  root         print the root (top) of the current working directory
  serve        start stand-alone webserver
  showconfig   show combined config settings from all hgrc files
  status       show changed files in the working directory
  summary      summarize working directory state
  tag          add one or more tags for the current or given revision
  tags         list repository tags
  tip          show the tip revision
  unbundle     apply one or more changegroup files
  update       update working directory (or switch revisions)
  verify       verify the integrity of the repository
  version      output version and copyright information
 
 enabled extensions:
 
  helpext  (no help text available)
 
 additional help topics:
 
  config       Configuration Files
  dates        Date Formats
  patterns     File Name Patterns
  environment  Environment Variables
  revisions    Specifying Single Revisions
  multirevs    Specifying Multiple Revisions
  diffs        Diff Formats
  templating   Template Usage
  urls         URL Paths
  extensions   Using additional features
  hgweb        Configuring hgweb
+ glossary     Glossary
 
 use "hg -v help" to show aliases and global options
 %% test list of commands with command with no help text
 helpext extension - no help text available
 
 list of commands:
 
  nohelp   (no help text available)
 
 use "hg -v help helpext" to show aliases and global options
 %% test a help topic
 Specifying Single Revisions
 
     Mercurial supports several ways to specify individual revisions.
 
     A plain integer is treated as a revision number. Negative integers are
     treated as sequential offsets from the tip, with -1 denoting the tip, -2
     denoting the revision prior to the tip, and so forth.
 
     A 40-digit hexadecimal string is treated as a unique revision identifier.
 
     A hexadecimal string less than 40 characters long is treated as a unique
     revision identifier and is referred to as a short-form identifier. A
     short-form identifier is only valid if it is the prefix of exactly one
     full-length identifier.
 
     Any other string is treated as a tag or branch name. A tag name is a
     symbolic name associated with a revision identifier. A branch name denotes
     the tipmost revision of that branch. Tag and branch names must not contain
     the ":" character.
 
     The reserved name "tip" is a special tag that always identifies the most
     recent revision.
 
     The reserved name "null" indicates the null revision. This is the revision
     of an empty repository, and the parent of revision 0.
 
     The reserved name "." indicates the working directory parent. If no
     working directory is checked out, it is equivalent to null. If an
     uncommitted merge is in progress, "." is the revision of the first parent.