Imported from /srv/lorry/lorry-area/mercurial-tarball/mercurial-1.9.3.tar.gz.HEADmercurial-1.9.3master

1 files changed, 143 insertions, 154 deletions

diff --git a/tests/test-globalopts.t b/tests/test-globalopts.t
index 53716cd..67e0130 100644
--- a/tests/test-globalopts.t
+++ b/tests/test-globalopts.t
@@ -1,3 +1,5 @@
+  $ "$TESTDIR/hghave" no-outer-repo || exit 80
+
   $ hg init a
   $ cd a
   $ echo a > a
@@ -75,8 +77,6 @@ Testing -R/--repository:
   8580ff50825a tip
   $ cd ..
 
-#if no-outer-repo
-
 Implicit -R:
 
   $ hg ann a/a
@@ -93,8 +93,6 @@ Implicit -R:
   abort: no repository found in '$TESTTMP' (.hg not found)!
   [255]
 
-#endif
-
 Abbreviation of long option:
 
   $ hg --repo c tip
@@ -138,16 +136,16 @@ earlygetopt with illegal abbreviations:
   abort: option --cwd may not be abbreviated!
   [255]
   $ hg --rep a tip
-  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!
   [255]
   $ hg --repositor a tip
-  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!
   [255]
   $ hg -qR a tip
-  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!
   [255]
   $ hg -qRa tip
-  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!
   [255]
 
 Testing --cwd:
@@ -267,16 +265,13 @@ Testing --time:
 
   $ hg --cwd a --time id
   8580ff50825a tip
-  time: real * (glob)
+  Time: real * (glob)
 
 Testing --version:
 
   $ hg --version -q
   Mercurial Distributed SCM * (glob)
 
-hide outer repo
-  $ hg init
-
 Testing -h/--help:
 
   $ hg -h
@@ -284,80 +279,77 @@ Testing -h/--help:
   
   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
-   bookmarks     track a line of development with movable markers
-   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
-   graft         copy changes from other branches onto the current branch
-   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
-   phase         set or show the current phase name
-   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       redo merges or set/view the merge status of files
-   revert        restore files to their checkout 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
+   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
+   bookmarks    track a line of development with movable markers
+   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      redo merges or set/view the merge status of files
+   revert       restore files to their checkout 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
-   diffs         Diff Formats
-   environment   Environment Variables
-   extensions    Using Additional Features
-   filesets      Specifying File Sets
-   glossary      Glossary
-   hgignore      Syntax for Mercurial Ignore Files
-   hgweb         Configuring hgweb
-   merge-tools   Merge Tools
-   multirevs     Specifying Multiple Revisions
-   patterns      File Name Patterns
-   phases        Working with Phases
-   revisions     Specifying Single Revisions
-   revsets       Specifying Revision Sets
-   subrepos      Subrepositories
-   templating    Template Usage
-   urls          URL Paths
+   config       Configuration Files
+   dates        Date Formats
+   diffs        Diff Formats
+   environment  Environment Variables
+   extensions   Using additional features
+   filesets     Specifying File Sets
+   glossary     Glossary
+   hgignore     syntax for Mercurial ignore files
+   hgweb        Configuring hgweb
+   merge-tools  Merge Tools
+   multirevs    Specifying Multiple Revisions
+   patterns     File Name Patterns
+   revisions    Specifying Single Revisions
+   revsets      Specifying Revision Sets
+   subrepos     Subrepositories
+   templating   Template Usage
+   urls         URL Paths
   
   use "hg -v help" to show builtin aliases and global options
 
@@ -368,80 +360,77 @@ Testing -h/--help:
   
   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
-   bookmarks     track a line of development with movable markers
-   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
-   graft         copy changes from other branches onto the current branch
-   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
-   phase         set or show the current phase name
-   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       redo merges or set/view the merge status of files
-   revert        restore files to their checkout 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
+   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
+   bookmarks    track a line of development with movable markers
+   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      redo merges or set/view the merge status of files
+   revert       restore files to their checkout 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
-   diffs         Diff Formats
-   environment   Environment Variables
-   extensions    Using Additional Features
-   filesets      Specifying File Sets
-   glossary      Glossary
-   hgignore      Syntax for Mercurial Ignore Files
-   hgweb         Configuring hgweb
-   merge-tools   Merge Tools
-   multirevs     Specifying Multiple Revisions
-   patterns      File Name Patterns
-   phases        Working with Phases
-   revisions     Specifying Single Revisions
-   revsets       Specifying Revision Sets
-   subrepos      Subrepositories
-   templating    Template Usage
-   urls          URL Paths
+   config       Configuration Files
+   dates        Date Formats
+   diffs        Diff Formats
+   environment  Environment Variables
+   extensions   Using additional features
+   filesets     Specifying File Sets
+   glossary     Glossary
+   hgignore     syntax for Mercurial ignore files
+   hgweb        Configuring hgweb
+   merge-tools  Merge Tools
+   multirevs    Specifying Multiple Revisions
+   patterns     File Name Patterns
+   revisions    Specifying Single Revisions
+   revsets      Specifying Revision Sets
+   subrepos     Subrepositories
+   templating   Template Usage
+   urls         URL Paths
   
   use "hg -v help" to show builtin aliases and global options