##// END OF EJS Templates
rebase: avoid redundant merges (issue1301)
rebase: avoid redundant merges (issue1301)

File last commit:

r7210:833d1250 default
r7278:45495d78 default
Show More
test-globalopts.out
272 lines | 9.7 KiB | text/plain | TextLexer
/ tests / test-globalopts.out
Vadim Gelfer
add --config global option. allows to set hgrc option on command line....
r2293 adding a
adding b
Adrian Buehlmann
clone: print "updating working directory" status message...
r6338 updating working directory
Vadim Gelfer
add --config global option. allows to set hgrc option on command line....
r2293 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
Jesse Glick
Infer a --repository argument from command arguments when reasonable....
r6150 %% 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)!
Vadim Gelfer
add --config global option. allows to set hgrc option on command line....
r2293 %% abbrev of long option
changeset: 1:b6c483daf290
tag: tip
Matt Mackall
Fix up parent display in logging...
r3619 parent: -1:000000000000
Vadim Gelfer
add --config global option. allows to set hgrc option on command line....
r2293 user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: b
Thomas Arendsen Hein
Added test for earlygetopt fixes (36d23de02da1 and 79cc512a34ed)
r4728 %% 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
Thomas Arendsen Hein
Disallow short earlygetop option combined with other short options...
r4732 %% earlygetopt short option without following space
Thomas Arendsen Hein
Added test for earlygetopt fixes (36d23de02da1 and 79cc512a34ed)
r4728 0:b6c483daf290
Thomas Arendsen Hein
Abort if earlygetopt fails to detect an option....
r4734 %% 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 (i.e. not -qR) and --repository may only be abbreviated as --repo!
abort: Option -R has to be separated from other options (i.e. not -qR) and --repository may only be abbreviated as --repo!
abort: Option -R has to be separated from other options (i.e. not -qR) and --repository may only be abbreviated as --repo!
abort: Option -R has to be separated from other options (i.e. not -qR) and --repository may only be abbreviated as --repo!
Vadim Gelfer
add --config global option. allows to set hgrc option on command line....
r2293 %% --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
Matt Mackall
Only show long hashes with --debug, not --verbose
r2966 changeset: 1:b6c483daf290
Vadim Gelfer
add --config global option. allows to set hgrc option on command line....
r2293 tag: tip
Matt Mackall
Fix up parent display in logging...
r3619 parent: -1:000000000000
Vadim Gelfer
add --config global option. allows to set hgrc option on command line....
r2293 user: test
date: Thu Jan 01 00:00:01 1970 +0000
files: b
description:
b
Matt Mackall
Only show long hashes with --debug, not --verbose
r2966 changeset: 0:8580ff50825a
Vadim Gelfer
add --config global option. allows to set hgrc option on command line....
r2293 user: test
date: Thu Jan 01 00:00:01 1970 +0000
files: a
description:
a
Matt Mackall
Only show long hashes with --debug, not --verbose
r2966 changeset: 0:b6c483daf290
Vadim Gelfer
add --config global option. allows to set hgrc option on command line....
r2293 tag: tip
user: test
date: Thu Jan 01 00:00:01 1970 +0000
files: b
description:
b
%% --config
quuxfoo
abort: malformed --config option:
abort: malformed --config option: a.b
abort: malformed --config option: a
abort: malformed --config option: a.=
abort: malformed --config option: .b=
%% --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
Alexis S. L. Carvalho
"default" is the default branch name
r4176 extra: branch=default
Vadim Gelfer
add --config global option. allows to set hgrc option on command line....
r2293 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
Alexis S. L. Carvalho
"default" is the default branch name
r4176 extra: branch=default
Vadim Gelfer
add --config global option. allows to set hgrc option on command line....
r2293 description:
a
%% --traceback
Alexis S. L. Carvalho
call ui.updateopts only after changing directories...
r3348 Traceback (most recent call last):
Vadim Gelfer
add --config global option. allows to set hgrc option on command line....
r2293 %% --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
Alexis S. L. Carvalho
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output...
r4315 list of commands:
Vadim Gelfer
add --config global option. allows to set hgrc option on command line....
r2293
Thomas Arendsen Hein
Un-debugify debugconfig to showconfig. (issue 317)
r3268 add add the specified files on the next commit
addremove add all new files, delete all missing files
annotate show changeset information per file line
archive create unversioned archive of a repository revision
backout reverse effect of earlier changeset
Matt Mackall
bisect: make bisect a built-in command
r5775 bisect subdivision search of changesets
Matt Mackall
add branch and branches commands
r3502 branch set or show the current branch name
branches list repository named branches
Thomas Arendsen Hein
Un-debugify debugconfig to showconfig. (issue 317)
r3268 bundle create a changegroup file
Thomas Arendsen Hein
doc string fix: hg cat and manifest default to current parent revision.
r3914 cat output the current or given revision of files
Thomas Arendsen Hein
Un-debugify debugconfig to showconfig. (issue 317)
r3268 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
grep search for a pattern in specified files and revisions
Alexis S. L. Carvalho
update the output of test-help and test-globalopts
r4655 heads show current repository heads or show branch heads
Matt Mackall
help: update help...
r7210 help show help for a given topic or a help overview
Matt Mackall
identify: accept a revision argument
r4665 identify identify the working copy or specified revision
Thomas Arendsen Hein
Un-debugify debugconfig to showconfig. (issue 317)
r3268 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
Thomas Arendsen Hein
doc string fix: hg cat and manifest default to current parent revision.
r3914 manifest output the current or given revision of the project manifest
Benoit Boissinot
various doc fixes...
r4014 merge merge working directory with another revision
Thomas Arendsen Hein
Un-debugify debugconfig to showconfig. (issue 317)
r3268 outgoing show changesets not found in destination
parents show the parents of the working dir or revision
paths show definition of symbolic path names
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
Matt Mackall
resolve: new command...
r6518 resolve resolve file merges from a branch merge or update
Matt Mackall
doc: add repo/ to .hgignore and .hgtags...
r5576 revert restore individual files or dirs to an earlier state
rollback roll back the last transaction
Thomas Arendsen Hein
Un-debugify debugconfig to showconfig. (issue 317)
r3268 root print the root (top) of the current working dir
serve export the repository via HTTP
showconfig show combined config settings from all hgrc files
status show changed files in the working directory
John Coomes
tag: allow multiple tags to be added or removed...
r6321 tag add one or more tags for the current or given revision
Thomas Arendsen Hein
Un-debugify debugconfig to showconfig. (issue 317)
r3268 tags list repository tags
tip show the tip revision
Giorgos Keramidas
unbundle: accept multiple file arguments...
r4699 unbundle apply one or more changegroup files
Benoit Boissinot
various doc fixes...
r4014 update update working directory
Thomas Arendsen Hein
Un-debugify debugconfig to showconfig. (issue 317)
r3268 verify verify the integrity of the repository
version output version and copyright information
Alexis S. L. Carvalho
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output...
r4315
Matt Mackall
help: update help...
r7210 additional help topics:
Dirkjan Ochtman
help: show extension commands in short list, separate extension list in help...
r7197
dates Date Formats
patterns File Name Patterns
environment Environment Variables
revisions Specifying Single Revisions
multirevs Specifying Multiple Revisions
Alexis S. L. Carvalho
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output...
r4315 use "hg -v help" to show aliases and global options
Vadim Gelfer
add --config global option. allows to set hgrc option on command line....
r2293 Mercurial Distributed SCM
Alexis S. L. Carvalho
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output...
r4315 list of commands:
Vadim Gelfer
add --config global option. allows to set hgrc option on command line....
r2293
Thomas Arendsen Hein
Un-debugify debugconfig to showconfig. (issue 317)
r3268 add add the specified files on the next commit
addremove add all new files, delete all missing files
annotate show changeset information per file line
archive create unversioned archive of a repository revision
backout reverse effect of earlier changeset
Matt Mackall
bisect: make bisect a built-in command
r5775 bisect subdivision search of changesets
Matt Mackall
add branch and branches commands
r3502 branch set or show the current branch name
branches list repository named branches
Thomas Arendsen Hein
Un-debugify debugconfig to showconfig. (issue 317)
r3268 bundle create a changegroup file
Thomas Arendsen Hein
doc string fix: hg cat and manifest default to current parent revision.
r3914 cat output the current or given revision of files
Thomas Arendsen Hein
Un-debugify debugconfig to showconfig. (issue 317)
r3268 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
grep search for a pattern in specified files and revisions
Alexis S. L. Carvalho
update the output of test-help and test-globalopts
r4655 heads show current repository heads or show branch heads
Matt Mackall
help: update help...
r7210 help show help for a given topic or a help overview
Matt Mackall
identify: accept a revision argument
r4665 identify identify the working copy or specified revision
Thomas Arendsen Hein
Un-debugify debugconfig to showconfig. (issue 317)
r3268 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
Thomas Arendsen Hein
doc string fix: hg cat and manifest default to current parent revision.
r3914 manifest output the current or given revision of the project manifest
Benoit Boissinot
various doc fixes...
r4014 merge merge working directory with another revision
Thomas Arendsen Hein
Un-debugify debugconfig to showconfig. (issue 317)
r3268 outgoing show changesets not found in destination
parents show the parents of the working dir or revision
paths show definition of symbolic path names
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
Matt Mackall
resolve: new command...
r6518 resolve resolve file merges from a branch merge or update
Matt Mackall
doc: add repo/ to .hgignore and .hgtags...
r5576 revert restore individual files or dirs to an earlier state
rollback roll back the last transaction
Thomas Arendsen Hein
Un-debugify debugconfig to showconfig. (issue 317)
r3268 root print the root (top) of the current working dir
serve export the repository via HTTP
showconfig show combined config settings from all hgrc files
status show changed files in the working directory
John Coomes
tag: allow multiple tags to be added or removed...
r6321 tag add one or more tags for the current or given revision
Thomas Arendsen Hein
Un-debugify debugconfig to showconfig. (issue 317)
r3268 tags list repository tags
tip show the tip revision
Giorgos Keramidas
unbundle: accept multiple file arguments...
r4699 unbundle apply one or more changegroup files
Benoit Boissinot
various doc fixes...
r4014 update update working directory
Thomas Arendsen Hein
Un-debugify debugconfig to showconfig. (issue 317)
r3268 verify verify the integrity of the repository
version output version and copyright information
Alexis S. L. Carvalho
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output...
r4315
Matt Mackall
help: update help...
r7210 additional help topics:
Dirkjan Ochtman
help: show extension commands in short list, separate extension list in help...
r7197
dates Date Formats
patterns File Name Patterns
environment Environment Variables
revisions Specifying Single Revisions
multirevs Specifying Multiple Revisions
Alexis S. L. Carvalho
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output...
r4315 use "hg -v help" to show aliases and global options
Vadim Gelfer
add --config global option. allows to set hgrc option on command line....
r2293 %% not tested: --debugger