##// END OF EJS Templates
rebase: choose default destination the same way as 'hg merge' (BC)...
rebase: choose default destination the same way as 'hg merge' (BC) This changeset finally make 'hg rebase' choose its default destination using the same logic as 'hg merge'. The previous default was "tipmost changeset on the current branch", the new default is "the other head if there is only one". This change has multiple consequences: - Multiple tests which were not rebasing anything (rebasing from tipmost head) are now rebasing on the other "lower" branch. This is the expected new behavior. - A test is now explicitly aborting when there is too many heads on the branch. This is the expected behavior. - We gained a better detection of the "nothing to rebase" case while performing 'hg pull --rebase' so the message have been updated. Making clearer than an update was performed and why. This is beneficial side-effect. - Rebasing from an active bookmark will behave the same as 'hg merge' from a bookmark.

File last commit:

r27376:fc810d95 default
r28189:fac3a24b default
Show More
test-globalopts.t
450 lines | 13.9 KiB | text/troff | Tads3Lexer
/ tests / test-globalopts.t
Adrian Buehlmann
tests: unify test-globalopts
r12194 $ hg init a
$ cd a
$ echo a > a
$ hg ci -A -d'1 0' -m a
adding a
$ cd ..
$ hg init b
$ cd b
$ echo b > b
$ hg ci -A -d'1 0' -m b
adding b
$ cd ..
$ hg clone a c
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd c
Brodie Rao
dispatch: properly handle relative path aliases used with -R (issue2376)...
r12637 $ cat >> .hg/hgrc <<EOF
> [paths]
> relative = ../a
> EOF
Adrian Buehlmann
tests: unify test-globalopts
r12194 $ hg pull -f ../b
pulling from ../b
searching for changes
warning: repository is unrelated
Peter Arrenbrecht
discovery: avoid discovery when local graph is a subset of remote...
r13742 requesting all changes
Adrian Buehlmann
tests: unify test-globalopts
r12194 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)
$ hg merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ cd ..
Testing -R/--repository:
$ hg -R a tip
changeset: 0:8580ff50825a
tag: tip
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: a
$ hg --repository b tip
changeset: 0:b6c483daf290
tag: tip
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: b
Brodie Rao
test-globalopts: test hg -R file:// and hg -R path-alias
r12635 -R with a URL:
$ hg -R file:a identify
8580ff50825a tip
$ hg -R file://localhost/`pwd`/a/ identify
8580ff50825a tip
Brodie Rao
dispatch: properly handle relative path aliases used with -R (issue2376)...
r12637 -R with path aliases:
Brodie Rao
test-globalopts: test hg -R file:// and hg -R path-alias
r12635
$ cd c
$ hg -R default identify
8580ff50825a tip
Brodie Rao
dispatch: properly handle relative path aliases used with -R (issue2376)...
r12637 $ hg -R relative identify
8580ff50825a tip
$ echo '[paths]' >> $HGRCPATH
$ echo 'relativetohome = a' >> $HGRCPATH
$ HOME=`pwd`/../ hg -R relativetohome identify
8580ff50825a tip
Brodie Rao
test-globalopts: test hg -R file:// and hg -R path-alias
r12635 $ cd ..
Mads Kiilerich
tests: convert some 'hghave no-outer-repo' to #if...
r17014 #if no-outer-repo
Adrian Buehlmann
tests: unify test-globalopts
r12194 Implicit -R:
$ hg ann a/a
0: a
$ hg ann a/a a/a
0: a
$ hg ann a/a b/b
Matt Mackall
dispatch: improve repository not found message...
r13967 abort: no repository found in '$TESTTMP' (.hg not found)!
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Adrian Buehlmann
tests: unify test-globalopts
r12194 $ hg -R b ann a/a
Mads Kiilerich
tests: fix for windows - slashes and no serve
r18506 abort: a/a not under root '$TESTTMP/b' (glob)
Matt Harbison
pathutil: hint if a path is root relative instead of cwd relative (issue4663)...
r25011 (consider using '--cwd b')
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Adrian Buehlmann
tests: unify test-globalopts
r12194 $ hg log
Matt Mackall
dispatch: improve repository not found message...
r13967 abort: no repository found in '$TESTTMP' (.hg not found)!
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Adrian Buehlmann
tests: unify test-globalopts
r12194
Mads Kiilerich
tests: convert some 'hghave no-outer-repo' to #if...
r17014 #endif
Adrian Buehlmann
tests: unify test-globalopts
r12194 Abbreviation of long option:
$ hg --repo c tip
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):
$ hg --cwd a --cwd b --cwd c tip
changeset: 1:b6c483daf290
tag: tip
parent: -1:000000000000
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: b
$ hg --repo c --repository b -R a tip
changeset: 0:8580ff50825a
tag: tip
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: a
earlygetopt short option without following space:
$ hg -q -Rb tip
0:b6c483daf290
earlygetopt with illegal abbreviations:
$ hg --confi "foo.bar=baz"
abort: option --config may not be abbreviated!
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Adrian Buehlmann
tests: unify test-globalopts
r12194 $ hg --cw a tip
abort: option --cwd may not be abbreviated!
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Adrian Buehlmann
tests: unify test-globalopts
r12194 $ hg --rep a tip
Martin Geisler
dispatch: lowercase abort message
r15781 abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Adrian Buehlmann
tests: unify test-globalopts
r12194 $ hg --repositor a tip
Martin Geisler
dispatch: lowercase abort message
r15781 abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Adrian Buehlmann
tests: unify test-globalopts
r12194 $ hg -qR a tip
Martin Geisler
dispatch: lowercase abort message
r15781 abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Adrian Buehlmann
tests: unify test-globalopts
r12194 $ hg -qRa tip
Martin Geisler
dispatch: lowercase abort message
r15781 abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Adrian Buehlmann
tests: unify test-globalopts
r12194
Testing --cwd:
$ hg --cwd a parents
changeset: 0:8580ff50825a
tag: tip
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: a
Testing -y/--noninteractive - just be sure it is parsed:
$ hg --cwd a tip -q --noninteractive
0:8580ff50825a
$ hg --cwd a tip -q -y
0:8580ff50825a
Testing -q/--quiet:
$ hg -R a -q tip
0:8580ff50825a
$ hg -R b -q tip
0:b6c483daf290
$ hg -R c --quiet parents
0:8580ff50825a
1:b6c483daf290
Testing -v/--verbose:
$ hg --cwd c head -v
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
$ hg --cwd b tip --verbose
changeset: 0:b6c483daf290
tag: tip
user: test
date: Thu Jan 01 00:00:01 1970 +0000
files: b
description:
b
Testing --config:
$ hg --cwd c --config paths.quuxfoo=bar paths | grep quuxfoo > /dev/null && echo quuxfoo
quuxfoo
$ hg --cwd c --config '' tip -q
abort: malformed --config option: '' (use --config section.name=value)
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Adrian Buehlmann
tests: unify test-globalopts
r12194 $ hg --cwd c --config a.b tip -q
abort: malformed --config option: 'a.b' (use --config section.name=value)
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Adrian Buehlmann
tests: unify test-globalopts
r12194 $ hg --cwd c --config a tip -q
abort: malformed --config option: 'a' (use --config section.name=value)
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Adrian Buehlmann
tests: unify test-globalopts
r12194 $ hg --cwd c --config a.= tip -q
abort: malformed --config option: 'a.=' (use --config section.name=value)
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Adrian Buehlmann
tests: unify test-globalopts
r12194 $ hg --cwd c --config .b= tip -q
abort: malformed --config option: '.b=' (use --config section.name=value)
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Adrian Buehlmann
tests: unify test-globalopts
r12194
Testing --debug:
$ hg --cwd c log --debug
changeset: 1:b6c483daf2907ce5825c0bb50f5716226281cc1a
tag: tip
Jordi Gutiérrez Hermoso
log: do not hide the public phase in debug mode (BC)...
r22765 phase: public
Adrian Buehlmann
tests: unify test-globalopts
r12194 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
Jordi Gutiérrez Hermoso
log: do not hide the public phase in debug mode (BC)...
r22765 phase: public
Adrian Buehlmann
tests: unify test-globalopts
r12194 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
Testing --traceback:
$ hg --cwd c --config x --traceback id 2>&1 | grep -i 'traceback'
Traceback (most recent call last):
Testing --time:
$ hg --cwd a --time id
8580ff50825a tip
Martin Geisler
dispatch: lowercase --time message
r16933 time: real * (glob)
Adrian Buehlmann
tests: unify test-globalopts
r12194
Testing --version:
$ hg --version -q
Brodie Rao
tests: add glob matching for unified tests...
r12376 Mercurial Distributed SCM * (glob)
Adrian Buehlmann
tests: unify test-globalopts
r12194
Mads Kiilerich
tests: convert some 'hghave no-outer-repo' to #if...
r17014 hide outer repo
$ hg init
Adrian Buehlmann
tests: unify test-globalopts
r12194 Testing -h/--help:
$ hg -h
Mercurial Distributed SCM
list of commands:
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 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
Matt Mackall
bookmarks: improve the bookmark help (issue4244)
r21762 bookmarks create a new bookmark or list existing bookmarks
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 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
Matt Mackall
config: move showconfig code and add config as primary alias...
r20570 config show combined config settings from all hgrc files
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 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
Matt Mackall
files: add new command unifying locate and manifest functionality
r22423 files list tracked files
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 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
Matt Mackall
heads: modernize documentation (issue3992)...
r19469 heads show branch heads
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 help show help for a given topic or a help overview
Yuya Nishihara
commands: replace "working copy" with "working directory" in help/messages...
r24364 identify identify the working directory or specified revision
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 import import an ordered set of patches
incoming show new changesets found in source
init create a new repository in the given directory
log show revision history of entire repository or files
manifest output the current or given revision of the project manifest
anatoly techtonik
merge: be precise about what merged into what in short desc
r23400 merge merge another revision into working directory
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 outgoing show changesets not found in the destination
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
root print the root (top) of the current working directory
serve start stand-alone webserver
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
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
Adrian Buehlmann
tests: unify test-globalopts
r12194
additional help topics:
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 config Configuration Files
dates Date Formats
diffs Diff Formats
environment Environment Variables
Martin Geisler
help: consistently use title capitalization for help topics
r16547 extensions Using Additional Features
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 filesets Specifying File Sets
glossary Glossary
Martin Geisler
help: consistently use title capitalization for help topics
r16547 hgignore Syntax for Mercurial Ignore Files
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 hgweb Configuring hgweb
Gregory Szorc
help: add "internals" topic...
r27376 internals Technical implementation topics
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 merge-tools Merge Tools
multirevs Specifying Multiple Revisions
patterns File Name Patterns
Matt Mackall
help: add phases topic
r15996 phases Working with Phases
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 revisions Specifying Single Revisions
revsets Specifying Revision Sets
Gregory Szorc
help: scripting help topic...
r25881 scripting Using Mercurial from scripts and automation
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 subrepos Subrepositories
templating Template Usage
urls URL Paths
Adrian Buehlmann
tests: unify test-globalopts
r12194
Matt Mackall
help: normalize helplist hints
r22118 (use "hg help -v" to show built-in aliases and global options)
Adrian Buehlmann
tests: unify test-globalopts
r12194
Yun Lee
help: sort help topics to make the output more readable (issue2751)
r13888
Adrian Buehlmann
tests: unify test-globalopts
r12194 $ hg --help
Mercurial Distributed SCM
list of commands:
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 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
Matt Mackall
bookmarks: improve the bookmark help (issue4244)
r21762 bookmarks create a new bookmark or list existing bookmarks
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 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
Matt Mackall
config: move showconfig code and add config as primary alias...
r20570 config show combined config settings from all hgrc files
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 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
Matt Mackall
files: add new command unifying locate and manifest functionality
r22423 files list tracked files
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 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
Matt Mackall
heads: modernize documentation (issue3992)...
r19469 heads show branch heads
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 help show help for a given topic or a help overview
Yuya Nishihara
commands: replace "working copy" with "working directory" in help/messages...
r24364 identify identify the working directory or specified revision
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 import import an ordered set of patches
incoming show new changesets found in source
init create a new repository in the given directory
log show revision history of entire repository or files
manifest output the current or given revision of the project manifest
anatoly techtonik
merge: be precise about what merged into what in short desc
r23400 merge merge another revision into working directory
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 outgoing show changesets not found in the destination
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
root print the root (top) of the current working directory
serve start stand-alone webserver
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
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
Adrian Buehlmann
tests: unify test-globalopts
r12194
additional help topics:
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 config Configuration Files
dates Date Formats
diffs Diff Formats
environment Environment Variables
Martin Geisler
help: consistently use title capitalization for help topics
r16547 extensions Using Additional Features
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 filesets Specifying File Sets
glossary Glossary
Martin Geisler
help: consistently use title capitalization for help topics
r16547 hgignore Syntax for Mercurial Ignore Files
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 hgweb Configuring hgweb
Gregory Szorc
help: add "internals" topic...
r27376 internals Technical implementation topics
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 merge-tools Merge Tools
multirevs Specifying Multiple Revisions
patterns File Name Patterns
Matt Mackall
help: add phases topic
r15996 phases Working with Phases
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 revisions Specifying Single Revisions
revsets Specifying Revision Sets
Gregory Szorc
help: scripting help topic...
r25881 scripting Using Mercurial from scripts and automation
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 subrepos Subrepositories
templating Template Usage
urls URL Paths
Adrian Buehlmann
tests: unify test-globalopts
r12194
Matt Mackall
help: normalize helplist hints
r22118 (use "hg help -v" to show built-in aliases and global options)
Adrian Buehlmann
tests: unify test-globalopts
r12194
Not tested: --debugger