mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 23:07:18 +03:00
c4363f362b
Summary: Improve docstring to mention Git a bit, give examples and more pointers. Reviewed By: bolinfest Differential Revision: D41347502 fbshipit-source-id: 1668be9c18b7e4ef10979d455fb46435cc2b3cd2
405 lines
10 KiB
Perl
405 lines
10 KiB
Perl
#chg-compatible
|
|
#debugruntest-compatible
|
|
|
|
$ configure modernclient
|
|
|
|
$ newclientrepo server
|
|
$ newclientrepo a test:server_server
|
|
$ echo a > a
|
|
$ hg ci -A -d'1 0' -m a
|
|
adding a
|
|
$ hg push -q -r . --to master_a --create
|
|
|
|
$ newclientrepo b test:server_server
|
|
$ echo b > b
|
|
$ hg ci -A -d'1 0' -m b
|
|
adding b
|
|
$ hg push -q -r . --to master_b --create --force
|
|
warning: repository is unrelated
|
|
|
|
$ newclientrepo c test:server_server master_a
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [paths]
|
|
> relative = ../a
|
|
> EOF
|
|
$ hg pull -f test:server_server -B master_b
|
|
pulling from test:server_server
|
|
searching for changes
|
|
$ 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
|
|
commit: 8580ff50825a
|
|
user: test
|
|
date: Thu Jan 01 00:00:01 1970 +0000
|
|
summary: a
|
|
|
|
$ hg --repository b tip
|
|
commit: b6c483daf290
|
|
user: test
|
|
date: Thu Jan 01 00:00:01 1970 +0000
|
|
summary: b
|
|
|
|
#if no-outer-repo
|
|
|
|
Implicit -R:
|
|
|
|
$ hg ann a/a
|
|
0: a
|
|
$ hg ann a/a a/a
|
|
0: a
|
|
$ hg ann a/a b/b
|
|
abort: '$TESTTMP' is not inside a repository, but this command requires a repository!
|
|
(use 'cd' to go to a directory inside a repository and try again)
|
|
[255]
|
|
$ hg -R b ann a/a
|
|
abort: a/a not under root '$TESTTMP/b'
|
|
(consider using '--cwd b')
|
|
[255]
|
|
$ hg log
|
|
abort: '$TESTTMP' is not inside a repository, but this command requires a repository!
|
|
(use 'cd' to go to a directory inside a repository and try again)
|
|
[255]
|
|
|
|
#endif
|
|
|
|
Abbreviation of long option:
|
|
|
|
$ hg --repo c tip
|
|
commit: b6c483daf290
|
|
bookmark: remote/master_b
|
|
hoistedname: master_b
|
|
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
|
|
commit: b6c483daf290
|
|
bookmark: remote/master_b
|
|
hoistedname: master_b
|
|
user: test
|
|
date: Thu Jan 01 00:00:01 1970 +0000
|
|
summary: b
|
|
|
|
$ hg --repo c --repository b -R a tip
|
|
commit: 8580ff50825a
|
|
user: test
|
|
date: Thu Jan 01 00:00:01 1970 +0000
|
|
summary: a
|
|
|
|
|
|
earlygetopt short option without following space:
|
|
|
|
$ hg -q -Rb tip
|
|
b6c483daf290
|
|
|
|
earlygetopt with illegal abbreviations:
|
|
|
|
$ hg --configfi "foo.bar=baz"
|
|
abort: option --configfile may not be abbreviated!
|
|
[255]
|
|
$ hg --cw a tip
|
|
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!
|
|
[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!
|
|
[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!
|
|
[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!
|
|
[255]
|
|
|
|
Testing --cwd:
|
|
|
|
$ hg --cwd a parents
|
|
commit: 8580ff50825a
|
|
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
|
|
8580ff50825a
|
|
$ hg --cwd a tip -q -y
|
|
8580ff50825a
|
|
|
|
Testing -q/--quiet:
|
|
|
|
$ hg -R a -q tip
|
|
8580ff50825a
|
|
$ hg -R b -q tip
|
|
b6c483daf290
|
|
$ hg -R c --quiet parents
|
|
8580ff50825a
|
|
b6c483daf290
|
|
|
|
Testing -v/--verbose:
|
|
|
|
$ hg --cwd c head -v
|
|
commit: b6c483daf290
|
|
bookmark: remote/master_b
|
|
hoistedname: master_b
|
|
user: test
|
|
date: Thu Jan 01 00:00:01 1970 +0000
|
|
files: b
|
|
description:
|
|
b
|
|
|
|
|
|
commit: 8580ff50825a
|
|
bookmark: remote/master_a
|
|
hoistedname: master_a
|
|
user: test
|
|
date: Thu Jan 01 00:00:01 1970 +0000
|
|
files: a
|
|
description:
|
|
a
|
|
|
|
|
|
$ hg --cwd b tip --verbose
|
|
commit: b6c483daf290
|
|
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
|
|
hg: parse errors: malformed --config option: '' (use --config section.name=value)
|
|
|
|
[255]
|
|
$ hg --cwd c --config a.b tip -q
|
|
hg: parse errors: malformed --config option: 'a.b' (use --config section.name=value)
|
|
|
|
[255]
|
|
$ hg --cwd c --config a tip -q
|
|
hg: parse errors: malformed --config option: 'a' (use --config section.name=value)
|
|
|
|
[255]
|
|
$ hg --cwd c --config a.= tip -q
|
|
abort: malformed --config option: 'a.=' (use --config section.name=value)
|
|
[255]
|
|
$ hg --cwd c --config .b= tip -q
|
|
abort: malformed --config option: '.b=' (use --config section.name=value)
|
|
[255]
|
|
|
|
Testing --debug:
|
|
|
|
$ hg --cwd c log --debug
|
|
commit: b6c483daf2907ce5825c0bb50f5716226281cc1a
|
|
bookmark: remote/master_b
|
|
hoistedname: master_b
|
|
phase: public
|
|
manifest: 23226e7a252cacdc2d99e4fbdc3653441056de49
|
|
user: test
|
|
date: Thu Jan 01 00:00:01 1970 +0000
|
|
files+: b
|
|
extra: branch=default
|
|
description:
|
|
b
|
|
|
|
|
|
commit: 8580ff50825a50c8f716709acdf8de0deddcd6ab
|
|
bookmark: remote/master_a
|
|
hoistedname: master_a
|
|
phase: public
|
|
manifest: a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
|
|
user: test
|
|
date: Thu Jan 01 00:00:01 1970 +0000
|
|
files+: a
|
|
extra: branch=default
|
|
description:
|
|
a
|
|
|
|
|
|
|
|
Testing --traceback (this does not work with the Rust code path):
|
|
|
|
$ hg --traceback log -r foo
|
|
Traceback (most recent call last):
|
|
# collapsed by devel.collapse-traceback
|
|
edenscm.error.RepoError: '$TESTTMP' is not inside a repository, but this command requires a repository
|
|
abort: '$TESTTMP' is not inside a repository, but this command requires a repository!
|
|
(use 'cd' to go to a directory inside a repository and try again)
|
|
[255]
|
|
|
|
Testing --time:
|
|
|
|
$ hg --cwd a --time id
|
|
8580ff50825a
|
|
time: real * (glob)
|
|
|
|
Testing --version:
|
|
|
|
$ hg --version -q
|
|
Mercurial * (glob)
|
|
|
|
hide outer repo
|
|
$ hg init
|
|
|
|
Testing -h/--help:
|
|
|
|
$ hg -h
|
|
Mercurial Distributed SCM
|
|
|
|
hg COMMAND [OPTIONS]
|
|
|
|
These are some common Mercurial commands. Use 'hg help commands' to list all
|
|
commands, and 'hg help COMMAND' to get help on a specific command.
|
|
|
|
Get the latest commits from the server:
|
|
|
|
pull pull commits from the specified source
|
|
|
|
View commits:
|
|
|
|
show show commit in detail
|
|
diff show differences between commits
|
|
|
|
Check out a commit:
|
|
|
|
goto update working copy to a given commit
|
|
|
|
Work with your checkout:
|
|
|
|
status list files with pending changes
|
|
add start tracking the specified files
|
|
remove delete the specified tracked files
|
|
forget stop tracking the specified files
|
|
revert change the specified files to match a commit
|
|
purge delete untracked files
|
|
|
|
Commit changes and modify commits:
|
|
|
|
commit save all pending changes or specified files in a new commit
|
|
amend meld pending changes into the current commit
|
|
metaedit edit commit message and other metadata
|
|
|
|
Rearrange commits:
|
|
|
|
graft copy commits from a different location
|
|
hide hide commits and their descendants
|
|
unhide unhide commits and their ancestors
|
|
|
|
Work with stacks of commits:
|
|
|
|
previous check out an ancestor commit
|
|
next check out a descendant commit
|
|
split split a commit into smaller commits
|
|
fold combine multiple commits into a single commit
|
|
|
|
Undo changes:
|
|
|
|
uncommit uncommit part or all of the current commit
|
|
unamend undo the last amend operation on the current commit
|
|
|
|
Other commands:
|
|
|
|
config show config settings
|
|
doctor attempt to check and fix issues
|
|
grep search for a pattern in tracked files in the working directory
|
|
web launch Sapling Web GUI on localhost
|
|
|
|
Additional help topics:
|
|
|
|
filesets specifying files by their characteristics
|
|
glossary common terms
|
|
patterns specifying files by file name pattern
|
|
revisions specifying commits
|
|
templating customizing output with templates
|
|
|
|
|
|
|
|
$ hg --help
|
|
Mercurial Distributed SCM
|
|
|
|
hg COMMAND [OPTIONS]
|
|
|
|
These are some common Mercurial commands. Use 'hg help commands' to list all
|
|
commands, and 'hg help COMMAND' to get help on a specific command.
|
|
|
|
Get the latest commits from the server:
|
|
|
|
pull pull commits from the specified source
|
|
|
|
View commits:
|
|
|
|
show show commit in detail
|
|
diff show differences between commits
|
|
|
|
Check out a commit:
|
|
|
|
goto update working copy to a given commit
|
|
|
|
Work with your checkout:
|
|
|
|
status list files with pending changes
|
|
add start tracking the specified files
|
|
remove delete the specified tracked files
|
|
forget stop tracking the specified files
|
|
revert change the specified files to match a commit
|
|
purge delete untracked files
|
|
|
|
Commit changes and modify commits:
|
|
|
|
commit save all pending changes or specified files in a new commit
|
|
amend meld pending changes into the current commit
|
|
metaedit edit commit message and other metadata
|
|
|
|
Rearrange commits:
|
|
|
|
graft copy commits from a different location
|
|
hide hide commits and their descendants
|
|
unhide unhide commits and their ancestors
|
|
|
|
Work with stacks of commits:
|
|
|
|
previous check out an ancestor commit
|
|
next check out a descendant commit
|
|
split split a commit into smaller commits
|
|
fold combine multiple commits into a single commit
|
|
|
|
Undo changes:
|
|
|
|
uncommit uncommit part or all of the current commit
|
|
unamend undo the last amend operation on the current commit
|
|
|
|
Other commands:
|
|
|
|
config show config settings
|
|
doctor attempt to check and fix issues
|
|
grep search for a pattern in tracked files in the working directory
|
|
web launch Sapling Web GUI on localhost
|
|
|
|
Additional help topics:
|
|
|
|
filesets specifying files by their characteristics
|
|
glossary common terms
|
|
patterns specifying files by file name pattern
|
|
revisions specifying commits
|
|
templating customizing output with templates
|
|
|
|
Not tested: --debugger
|
|
|