facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 00:14:35 +03:00
Code Issues Projects Releases Wiki Activity
77e1cb22e8
sapling/tests/test-globalopts.t

490 lines
15 KiB
Perl
Raw Normal View History

tests: unify test-globalopts
2010-09-04 00:10:08 +04:00
$ 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
dispatch: properly handle relative path aliases used with -R (issue2376) This ensures the repo config is read relative to the repo root during dispatch.
2010-10-05 00:07:12 +04:00
$ cat >> .hg/hgrc <<EOF
> [paths]
> relative = ../a
> EOF
tests: unify test-globalopts
2010-09-04 00:10:08 +04:00
$ hg pull -f ../b
pulling from ../b
searching for changes
warning: repository is unrelated
discovery: avoid discovery when local graph is a subset of remote Immediately sends local's heads to the server to check whether the server knows them all. If it does, we can call getbundle immediately. Interesting test output changes are: - added 1 changesets with 0 changes to 1 files (+1 heads) + added 1 changesets with 0 changes to 0 files (+1 heads) -> The new getbundle() actually fixes a bug vs. changegroupsubset() in that it no longer returns unnecessary files when file revs are reused. warning: repository is unrelated + requesting all changes -> The new use of common instead of bases correctly indicates that an unrelated pull gets all changes from the server.
2011-03-23 18:06:55 +03:00
requesting all changes
tests: unify test-globalopts
2010-09-04 00:10:08 +04:00
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
transaction-summary: show the range of new revisions upon pull/unbundle (BC) Upon pull or unbundle, we display a message with the range of new revisions fetched. This revision range could readily be used after a pull to look out what's new with 'hg log'. The algorithm takes care of filtering "obsolete" revisions that might be present in transaction's "changes" but should not be displayed to the end user.
2017-10-12 10:39:50 +03:00
new changesets b6c483daf290
tests: unify test-globalopts
2010-09-04 00:10:08 +04:00
(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
test-globalopts: test hg -R file:// and hg -R path-alias
2010-10-04 23:26:37 +04:00
-R with a URL:
$ hg -R file:a identify
8580ff50825a tip
$ hg -R file://localhost/`pwd`/a/ identify
8580ff50825a tip
dispatch: properly handle relative path aliases used with -R (issue2376) This ensures the repo config is read relative to the repo root during dispatch.
2010-10-05 00:07:12 +04:00
-R with path aliases:
test-globalopts: test hg -R file:// and hg -R path-alias
2010-10-04 23:26:37 +04:00
$ cd c
$ hg -R default identify
8580ff50825a tip
dispatch: properly handle relative path aliases used with -R (issue2376) This ensures the repo config is read relative to the repo root during dispatch.
2010-10-05 00:07:12 +04:00
$ hg -R relative identify
8580ff50825a tip
$ echo '[paths]' >> $HGRCPATH
$ echo 'relativetohome = a' >> $HGRCPATH
$ HOME=`pwd`/../ hg -R relativetohome identify
8580ff50825a tip
test-globalopts: test hg -R file:// and hg -R path-alias
2010-10-04 23:26:37 +04:00
$ cd ..
tests: convert some 'hghave no-outer-repo' to #if In some places we instead use 'hg init' to create a well-known outer repo without any special extensions or other config settings.
2012-06-21 01:41:21 +04:00
#if no-outer-repo
tests: unify test-globalopts
2010-09-04 00:10:08 +04:00
Implicit -R:
$ hg ann a/a
0: a
$ hg ann a/a a/a
0: a
$ hg ann a/a b/b
dispatch: improve repository not found message This should help clarify what the problem is in various problematic cases like ssh.
2011-04-20 23:28:40 +04:00
abort: no repository found in '$TESTTMP' (.hg not found)!
tests: add exit codes to unified tests
2010-09-17 02:51:32 +04:00
[255]
tests: unify test-globalopts
2010-09-04 00:10:08 +04:00
$ hg -R b ann a/a
tests: remove (glob) annotations that were only for '\' matches # skip-blame because this was mechanically rewritten the following script. I ran it on both *.t and *.py, but none of the *.py changes were proper. All *.t ones appear to be, and they run without addition failures on both Windows and Linux. import argparse import os import re ap = argparse.ArgumentParser() ap.add_argument('path', nargs='+') opts = ap.parse_args() globre = re.compile(r'^(.*) \(glob\)(.*)$') for p in opts.path: tmp = p + '.tmp' with open(p, 'rb') as src, open(tmp, 'wb') as dst: for line in src: m = globre.match(line) if not m or '$LOCALIP' in line or '*' in line: dst.write(line) continue if '?' in line[:-3] or ('?' in line[:-3] and line[-3:] != '(?)'): dst.write(line) continue dst.write(m.group(1) + m.group(2) + '\n') os.unlink(p) os.rename(tmp, p)
2017-12-11 06:50:57 +03:00
abort: a/a not under root '$TESTTMP/b'
pathutil: hint if a path is root relative instead of cwd relative (issue4663) Given that this path is going to abort, it seems OK to spend the time to do an alternate lookup to better inform the user. The path returned by util.pathto() ends with '/' at least in some cases, so os.path.relpath() is used instead, which requires python 2.6.
2015-05-12 04:26:13 +03:00
(consider using '--cwd b')
tests: add exit codes to unified tests
2010-09-17 02:51:32 +04:00
[255]
tests: unify test-globalopts
2010-09-04 00:10:08 +04:00
$ hg log
dispatch: improve repository not found message This should help clarify what the problem is in various problematic cases like ssh.
2011-04-20 23:28:40 +04:00
abort: no repository found in '$TESTTMP' (.hg not found)!
tests: add exit codes to unified tests
2010-09-17 02:51:32 +04:00
[255]
tests: unify test-globalopts
2010-09-04 00:10:08 +04:00
tests: convert some 'hghave no-outer-repo' to #if In some places we instead use 'hg init' to create a well-known outer repo without any special extensions or other config settings.
2012-06-21 01:41:21 +04:00
#endif
tests: unify test-globalopts
2010-09-04 00:10:08 +04:00
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: add --configfile global option Summary: This adds the ability to specify a config file to be used during the command. This is useful during clones for letting the clone command use the given repositories system specified repo-specific hgrc file. Reviewed By: quark-zju Differential Revision: D7311576 fbshipit-source-id: a97d8ebada2e0bea27c75a7650df8ede00dc10c6
2018-03-20 02:20:55 +03:00
$ hg --configfi "foo.bar=baz"
abort: option --configfile may not be abbreviated!
tests: add exit codes to unified tests
2010-09-17 02:51:32 +04:00
[255]
tests: unify test-globalopts
2010-09-04 00:10:08 +04:00
$ hg --cw a tip
abort: option --cwd may not be abbreviated!
tests: add exit codes to unified tests
2010-09-17 02:51:32 +04:00
[255]
tests: unify test-globalopts
2010-09-04 00:10:08 +04:00
$ hg --rep a tip
dispatch: lowercase abort message
2012-01-06 19:16:58 +04:00
abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
tests: add exit codes to unified tests
2010-09-17 02:51:32 +04:00
[255]
tests: unify test-globalopts
2010-09-04 00:10:08 +04:00
$ hg --repositor a tip
dispatch: lowercase abort message
2012-01-06 19:16:58 +04:00
abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
tests: add exit codes to unified tests
2010-09-17 02:51:32 +04:00
[255]
tests: unify test-globalopts
2010-09-04 00:10:08 +04:00
$ hg -qR a tip
dispatch: lowercase abort message
2012-01-06 19:16:58 +04:00
abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
tests: add exit codes to unified tests
2010-09-17 02:51:32 +04:00
[255]
tests: unify test-globalopts
2010-09-04 00:10:08 +04:00
$ hg -qRa tip
dispatch: lowercase abort message
2012-01-06 19:16:58 +04:00
abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
tests: add exit codes to unified tests
2010-09-17 02:51:32 +04:00
[255]
tests: unify test-globalopts
2010-09-04 00:10:08 +04:00
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)
tests: add exit codes to unified tests
2010-09-17 02:51:32 +04:00
[255]
tests: unify test-globalopts
2010-09-04 00:10:08 +04:00
$ hg --cwd c --config a.b tip -q
abort: malformed --config option: 'a.b' (use --config section.name=value)
tests: add exit codes to unified tests
2010-09-17 02:51:32 +04:00
[255]
tests: unify test-globalopts
2010-09-04 00:10:08 +04:00
$ hg --cwd c --config a tip -q
abort: malformed --config option: 'a' (use --config section.name=value)
tests: add exit codes to unified tests
2010-09-17 02:51:32 +04:00
[255]
tests: unify test-globalopts
2010-09-04 00:10:08 +04:00
$ hg --cwd c --config a.= tip -q
abort: malformed --config option: 'a.=' (use --config section.name=value)
tests: add exit codes to unified tests
2010-09-17 02:51:32 +04:00
[255]
tests: unify test-globalopts
2010-09-04 00:10:08 +04:00
$ hg --cwd c --config .b= tip -q
abort: malformed --config option: '.b=' (use --config section.name=value)
tests: add exit codes to unified tests
2010-09-17 02:51:32 +04:00
[255]
tests: unify test-globalopts
2010-09-04 00:10:08 +04:00
Testing --debug:
$ hg --cwd c log --debug
changeset: 1:b6c483daf2907ce5825c0bb50f5716226281cc1a
tag: tip
log: do not hide the public phase in debug mode (BC) When 62900f2373fa introduced phases to the `hg log --debug` output, it also disabled outputting public phase. At the same time, it always shows phases in the default template, `hg log --debug -T default`. Those two should produce the same output, but they don't. I think it makes a lot more sense to always show all phases. There's already loss of backwards compatibility in this case when using a newer hg on an old hg repo, since draft commits will show up in the output of `hg log --debug`. Finally, I just don't think that any sort of information should be hidden with --debug. This flag should be about showing as much information as possible.
2014-10-05 00:28:28 +04:00
phase: public
tests: unify test-globalopts
2010-09-04 00:10:08 +04:00
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
log: do not hide the public phase in debug mode (BC) When 62900f2373fa introduced phases to the `hg log --debug` output, it also disabled outputting public phase. At the same time, it always shows phases in the default template, `hg log --debug -T default`. Those two should produce the same output, but they don't. I think it makes a lot more sense to always show all phases. There's already loss of backwards compatibility in this case when using a newer hg on an old hg repo, since draft commits will show up in the output of `hg log --debug`. Finally, I just don't think that any sort of information should be hidden with --debug. This flag should be about showing as much information as possible.
2014-10-05 00:28:28 +04:00
phase: public
tests: unify test-globalopts
2010-09-04 00:10:08 +04:00
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:
test-globalopts: make the test compatible with chg The test fails when run with the '--chg' option. Therefore, this commit modifies the test to make it compatible with chg. Test Plan: Ran 'test-globalopts.t' with and without the '--chg' option. Differential Revision: https://phab.mercurial-scm.org/D913
2017-10-03 21:10:03 +03:00
#if no-chg
tests: unify test-globalopts
2010-09-04 00:10:08 +04:00
$ hg --cwd c --config x --traceback id 2>&1 | grep -i 'traceback'
Traceback (most recent call last):
test-globalopts: make the test compatible with chg The test fails when run with the '--chg' option. Therefore, this commit modifies the test to make it compatible with chg. Test Plan: Ran 'test-globalopts.t' with and without the '--chg' option. Differential Revision: https://phab.mercurial-scm.org/D913
2017-10-03 21:10:03 +03:00
#else
Traceback for '--config' errors not supported with chg.
$ hg --cwd c --config x --traceback id 2>&1 | grep -i 'traceback'
[1]
#endif
tests: unify test-globalopts
2010-09-04 00:10:08 +04:00
Testing --time:
$ hg --cwd a --time id
8580ff50825a tip
dispatch: lowercase --time message
2012-06-12 16:18:18 +04:00
time: real * (glob)
tests: unify test-globalopts
2010-09-04 00:10:08 +04:00
Testing --version:
$ hg --version -q
tests: add glob matching for unified tests This adds a " (glob)" marker that works like a simpler version of (re): "*" is converted to ".*", and "?" is converted to ".". Both special characters can be escaped using "\", and the backslash itself can be escaped as well. Other glob-style syntax, like "**", "[chars]", or "[!chars]", isn't supported.
2010-09-23 01:06:02 +04:00
Mercurial Distributed SCM * (glob)
tests: unify test-globalopts
2010-09-04 00:10:08 +04:00
tests: convert some 'hghave no-outer-repo' to #if In some places we instead use 'hg init' to create a well-known outer repo without any special extensions or other config settings.
2012-06-21 01:41:21 +04:00
hide outer repo
$ hg init
tests: unify test-globalopts
2010-09-04 00:10:08 +04:00
Testing -h/--help:
$ hg -h
Mercurial Distributed SCM
list of commands:
help: fix column alignment in "hg help" output The output of "hg help" is changed to ensure that the column containing descriptions of commands, extensions, and other topics is correctly alignmened.
2012-01-11 21:14:55 +04:00
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: improve the bookmark help (issue4244)
2014-06-19 00:26:07 +04:00
bookmarks create a new bookmark or list existing bookmarks
help: fix column alignment in "hg help" output The output of "hg help" is changed to ensure that the column containing descriptions of commands, extensions, and other topics is correctly alignmened.
2012-01-11 21:14:55 +04:00
branch set or show the current branch name
branches list repository named branches
commands: update help for "bundle" We now have a dedicated help topic to describe bundle specification strings. Let's update `hg bundle`'s documentation to reflect its existence. While I was hear, I also tweaked some wording which I felt was out of date and needed tweaking. Specifically, `hg bundle` no longer just deals with "changegroup" data: it can also generate files that have non-changegroup data.
2017-04-01 23:43:43 +03:00
bundle create a bundle file
help: fix column alignment in "hg help" output The output of "hg help" is changed to ensure that the column containing descriptions of commands, extensions, and other topics is correctly alignmened.
2012-01-11 21:14:55 +04:00
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
config: move showconfig code and add config as primary alias Preparation for adding config --edit to launch an editor
2014-02-27 22:42:09 +04:00
config show combined config settings from all hgrc files
help: fix column alignment in "hg help" output The output of "hg help" is changed to ensure that the column containing descriptions of commands, extensions, and other topics is correctly alignmened.
2012-01-11 21:14:55 +04:00
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
files: add new command unifying locate and manifest functionality
2014-09-13 03:32:46 +04:00
files list tracked files
help: fix column alignment in "hg help" output The output of "hg help" is changed to ensure that the column containing descriptions of commands, extensions, and other topics is correctly alignmened.
2012-01-11 21:14:55 +04:00
forget forget the specified files on the next commit
graft copy changes from other branches onto the current branch
grep: rewrite help to better document current (confusing) behavior
2016-09-23 20:45:10 +03:00
grep search revision history for a pattern in specified files
heads: modernize documentation (issue3992) The old docs emphasized topological heads rather than branch heads and incorrectly defined branch heads as not having children rather than descendants.
2013-07-22 03:45:42 +04:00
heads show branch heads
help: fix column alignment in "hg help" output The output of "hg help" is changed to ensure that the column containing descriptions of commands, extensions, and other topics is correctly alignmened.
2012-01-11 21:14:55 +04:00
help show help for a given topic or a help overview
hint: add a command to silence hints Summary: This allows people to silence hints as they like. It's done by modifying user hgrc. Reviewed By: markbt Differential Revision: D7392133 fbshipit-source-id: 1365294217db92dfb3a0c81332a9fefd164795d4
2018-04-07 10:36:46 +03:00
hint acknowledge hints
commands: replace "working copy" with "working directory" in help/messages "working directory" is the standard term, we should use it consistently. But I didn't touch the hint, "run 'hg update' to get a working copy", because "get a working directory" sounds a bit odd.
2015-03-17 16:47:08 +03:00
identify identify the working directory or specified revision
help: fix column alignment in "hg help" output The output of "hg help" is changed to ensure that the column containing descriptions of commands, extensions, and other topics is correctly alignmened.
2012-01-11 21:14:55 +04:00
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
merge: be precise about what merged into what in short desc
2014-11-26 17:22:09 +03:00
merge merge another revision into working directory
help: fix column alignment in "hg help" output The output of "hg help" is changed to ensure that the column containing descriptions of commands, extensions, and other topics is correctly alignmened.
2012-01-11 21:14:55 +04:00
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
commands: update help for "unbundle" Similar to the recent change to "bundle," this command no longer just deals with "changegroup" data.
2017-04-01 23:43:52 +03:00
unbundle apply one or more bundle files
help: fix column alignment in "hg help" output The output of "hg help" is changed to ensure that the column containing descriptions of commands, extensions, and other topics is correctly alignmened.
2012-01-11 21:14:55 +04:00
update update working directory (or switch revisions)
verify verify the integrity of the repository
version output version and copyright information
tests: unify test-globalopts
2010-09-04 00:10:08 +04:00
tests: fix for D6717635
2018-01-13 03:58:28 +03:00
enabled extensions:
extensions: default-on conflictinfo, errorredirect, ... Summary: ...mergedriver, and progressfile. Reviewed By: quark-zju, singhsrb Differential Revision: D6765952 fbshipit-source-id: 8eddcdeffa5d6532f737f45f7e1071c1a563a3cd
2018-01-23 23:08:57 +03:00
conflictinfo
debugshell: enable it by default Summary: It's pretty handy. The implementation is simple and clean. So move it from contrib and enable it by default. "import"s are adjusted to make the module checker happy. Security and UX wise, since we have `--debugger` already, adding another REPL seems fine. Test Plan: Ran all tests Reviewers: phillco, #mercurial Reviewed By: phillco Differential Revision: https://phabricator.intern.facebook.com/D6741283 Signature: 6741283:1516225662:ddc19a663e7ecef2a1fdaa5041f308dc838a8471
2018-01-17 23:54:24 +03:00
debugshell a python shell with repo, changelog & manifest objects
extensions: default-on conflictinfo, errorredirect, ... Summary: ...mergedriver, and progressfile. Reviewed By: quark-zju, singhsrb Differential Revision: D6765952 fbshipit-source-id: 8eddcdeffa5d6532f737f45f7e1071c1a563a3cd
2018-01-23 23:08:57 +03:00
errorredirect
redirect error message
tests: fix for D6717635
2018-01-13 03:58:28 +03:00
githelp try mapping git commands to Mercurial commands
extensions: default-on conflictinfo, errorredirect, ... Summary: ...mergedriver, and progressfile. Reviewed By: quark-zju, singhsrb Differential Revision: D6765952 fbshipit-source-id: 8eddcdeffa5d6532f737f45f7e1071c1a563a3cd
2018-01-23 23:08:57 +03:00
mergedriver custom merge drivers for autoresolved files
progressfile allows users to have JSON progress bar information written to a
path
simplecache: enable by default Summary: Default-on this moderately hard extension. Reviewed By: DurhamG, quark-zju Differential Revision: D6792641 fbshipit-source-id: 475135f4f4f295a4e6356443405bd6eb185c310a
2018-01-24 04:55:25 +03:00
simplecache
extensions: always turn on treedirstate Summary: This would make tests run on treedirstate. To avoid issues with Eden pulling from a non-eden treedirstate repo, treedirstate is changed to be "always on" and disables itself on an eden repo. The extension list is changed to a set for efficient `__contains__` test. Reviewed By: phillco Differential Revision: D7769804 fbshipit-source-id: d328fe51ef67c4730cfc53f43bdfc48c2765c541
2018-05-01 18:12:48 +03:00
treedirstate tree-based dirstate implementation
tests: fix for D6717635
2018-01-13 03:58:28 +03:00
tests: unify test-globalopts
2010-09-04 00:10:08 +04:00
additional help topics:
help: document bundle specifications I softly formalized the concept of a "bundle specification" a while ago when I was working on clone bundles and stream clone bundles and wanted a more robust way to define what exactly is in a bundle file. The concept has existed for a while. Since it is part of the clone bundles feature and exposed to the user via the "-t" argument to `hg bundle`, it is something we need to support for the long haul. After the 4.1 release, I heard a few people comment that they didn't realize you could generate zstd bundles with `hg bundle`. I'm partially to blame for not documenting it in bundle's docstring. Additionally, I added a hacky, experimental feature for controlling the compression level of bundles in 054e64c4d837. As the commit message says, I went with a quick and dirty solution out of time constraints. Furthermore, I wanted to eventually store this configuration in the "bundlespec" so it could be made more flexible. Given: a) bundlespecs are here to stay b) we don't have great documentation over what they are, despite being a user-facing feature c) the list of available compression engines and their behavior isn't exposed d) we need an extensible place to modify behavior of compression engines I want to move forward with formalizing bundlespecs as a user-facing feature. This commit does that by introducing a "bundlespec" help page. Leaning on the just-added compression engine documentation and API, the topic also conveniently lists available compression engines and details about them. This makes features like zstd bundle compression more discoverable. e.g. you can now `hg help -k zstd` and it lists the "bundlespec" topic.
2017-04-01 23:42:06 +03:00
bundlespec Bundle File Formats
color: update the help table We also need to reference the new topic in the great old help table.
2017-03-01 22:22:04 +03:00
color Colorizing Outputs
help: fix column alignment in "hg help" output The output of "hg help" is changed to ensure that the column containing descriptions of commands, extensions, and other topics is correctly alignmened.
2012-01-11 21:14:55 +04:00
config Configuration Files
dates Date Formats
diffs Diff Formats
environment Environment Variables
help: consistently use title capitalization for help topics
2012-04-30 13:51:24 +04:00
extensions Using Additional Features
help: fix column alignment in "hg help" output The output of "hg help" is changed to ensure that the column containing descriptions of commands, extensions, and other topics is correctly alignmened.
2012-01-11 21:14:55 +04:00
filesets Specifying File Sets
help: adding a topic on flags This is a short topic to explain how command-line flags can be specified. Some users have been confused by hg offerring different flag syntax than some other libraries, so it'd be nice to point them to this rather than explaining it every time. Differential Revision: https://phab.mercurial-scm.org/D1270
2017-10-31 06:35:30 +03:00
flags Command-line flags
help: fix column alignment in "hg help" output The output of "hg help" is changed to ensure that the column containing descriptions of commands, extensions, and other topics is correctly alignmened.
2012-01-11 21:14:55 +04:00
glossary Glossary
help: consistently use title capitalization for help topics
2012-04-30 13:51:24 +04:00
hgignore Syntax for Mercurial Ignore Files
help: fix column alignment in "hg help" output The output of "hg help" is changed to ensure that the column containing descriptions of commands, extensions, and other topics is correctly alignmened.
2012-01-11 21:14:55 +04:00
hgweb Configuring hgweb
help: add "internals" topic We introduce the "internals" help topic, which renders an index of available sub-topics. The sub-topics themselves are still not reachable via the help system.
2015-12-13 21:35:03 +03:00
internals Technical implementation topics
help: fix column alignment in "hg help" output The output of "hg help" is changed to ensure that the column containing descriptions of commands, extensions, and other topics is correctly alignmened.
2012-01-11 21:14:55 +04:00
merge-tools Merge Tools
pager: move most help to a new help topic and deprecate extension
2017-02-07 08:07:53 +03:00
pager Pager Support
help: fix column alignment in "hg help" output The output of "hg help" is changed to ensure that the column containing descriptions of commands, extensions, and other topics is correctly alignmened.
2012-01-11 21:14:55 +04:00
patterns File Name Patterns
help: add phases topic
2012-01-26 21:23:14 +04:00
phases Working with Phases
help: merge revsets.txt into revisions.txt Selecting single and multiple revisions is closely related, so let's put it in one place, so users can easily find it. We actually did not even point to "hg help revsets" from "hg help revisions", but now that they're on a single page, that won't be necessary.
2017-01-11 22:37:38 +03:00
revisions Specifying Revisions
help: scripting help topic There are a lot of non-human consumers of Mercurial. And the challenges and considerations for machines consuming Mercurial is significantly different from what humans face. I think there are enough special considerations around how machines consume Mercurial that a dedicated help topic is warranted. I concede the audience for this topic is probably small compared to the general audience. However, lots of normal Mercurial users do things like create one-off shell scripts for common workflows that I think this is useful enough to be in the install (as opposed to, say, a wiki page - which most users will likely never find). This text is by no means perfect. But you have to start somewhere. I think I did cover the important parts, though.
2015-07-19 03:10:28 +03:00
scripting Using Mercurial from scripts and automation
help: fix column alignment in "hg help" output The output of "hg help" is changed to ensure that the column containing descriptions of commands, extensions, and other topics is correctly alignmened.
2012-01-11 21:14:55 +04:00
subrepos Subrepositories
templating Template Usage
urls URL Paths
tests: unify test-globalopts
2010-09-04 00:10:08 +04:00
help: use single quotes in use warning
2016-09-21 02:47:46 +03:00
(use 'hg help -v' to show built-in aliases and global options)
tests: unify test-globalopts
2010-09-04 00:10:08 +04:00
help: sort help topics to make the output more readable (issue2751)
2011-04-05 08:40:47 +04:00
tests: unify test-globalopts
2010-09-04 00:10:08 +04:00
$ hg --help
Mercurial Distributed SCM
list of commands:
help: fix column alignment in "hg help" output The output of "hg help" is changed to ensure that the column containing descriptions of commands, extensions, and other topics is correctly alignmened.
2012-01-11 21:14:55 +04:00
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: improve the bookmark help (issue4244)
2014-06-19 00:26:07 +04:00
bookmarks create a new bookmark or list existing bookmarks
help: fix column alignment in "hg help" output The output of "hg help" is changed to ensure that the column containing descriptions of commands, extensions, and other topics is correctly alignmened.
2012-01-11 21:14:55 +04:00
branch set or show the current branch name
branches list repository named branches
commands: update help for "bundle" We now have a dedicated help topic to describe bundle specification strings. Let's update `hg bundle`'s documentation to reflect its existence. While I was hear, I also tweaked some wording which I felt was out of date and needed tweaking. Specifically, `hg bundle` no longer just deals with "changegroup" data: it can also generate files that have non-changegroup data.
2017-04-01 23:43:43 +03:00
bundle create a bundle file
help: fix column alignment in "hg help" output The output of "hg help" is changed to ensure that the column containing descriptions of commands, extensions, and other topics is correctly alignmened.
2012-01-11 21:14:55 +04:00
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
config: move showconfig code and add config as primary alias Preparation for adding config --edit to launch an editor
2014-02-27 22:42:09 +04:00
config show combined config settings from all hgrc files
help: fix column alignment in "hg help" output The output of "hg help" is changed to ensure that the column containing descriptions of commands, extensions, and other topics is correctly alignmened.
2012-01-11 21:14:55 +04:00
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
files: add new command unifying locate and manifest functionality
2014-09-13 03:32:46 +04:00
files list tracked files
help: fix column alignment in "hg help" output The output of "hg help" is changed to ensure that the column containing descriptions of commands, extensions, and other topics is correctly alignmened.
2012-01-11 21:14:55 +04:00
forget forget the specified files on the next commit
graft copy changes from other branches onto the current branch
grep: rewrite help to better document current (confusing) behavior
2016-09-23 20:45:10 +03:00
grep search revision history for a pattern in specified files
heads: modernize documentation (issue3992) The old docs emphasized topological heads rather than branch heads and incorrectly defined branch heads as not having children rather than descendants.
2013-07-22 03:45:42 +04:00
heads show branch heads
help: fix column alignment in "hg help" output The output of "hg help" is changed to ensure that the column containing descriptions of commands, extensions, and other topics is correctly alignmened.
2012-01-11 21:14:55 +04:00
help show help for a given topic or a help overview
hint: add a command to silence hints Summary: This allows people to silence hints as they like. It's done by modifying user hgrc. Reviewed By: markbt Differential Revision: D7392133 fbshipit-source-id: 1365294217db92dfb3a0c81332a9fefd164795d4
2018-04-07 10:36:46 +03:00
hint acknowledge hints
commands: replace "working copy" with "working directory" in help/messages "working directory" is the standard term, we should use it consistently. But I didn't touch the hint, "run 'hg update' to get a working copy", because "get a working directory" sounds a bit odd.
2015-03-17 16:47:08 +03:00
identify identify the working directory or specified revision
help: fix column alignment in "hg help" output The output of "hg help" is changed to ensure that the column containing descriptions of commands, extensions, and other topics is correctly alignmened.
2012-01-11 21:14:55 +04:00
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
merge: be precise about what merged into what in short desc
2014-11-26 17:22:09 +03:00
merge merge another revision into working directory
help: fix column alignment in "hg help" output The output of "hg help" is changed to ensure that the column containing descriptions of commands, extensions, and other topics is correctly alignmened.
2012-01-11 21:14:55 +04:00
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
commands: update help for "unbundle" Similar to the recent change to "bundle," this command no longer just deals with "changegroup" data.
2017-04-01 23:43:52 +03:00
unbundle apply one or more bundle files
help: fix column alignment in "hg help" output The output of "hg help" is changed to ensure that the column containing descriptions of commands, extensions, and other topics is correctly alignmened.
2012-01-11 21:14:55 +04:00
update update working directory (or switch revisions)
verify verify the integrity of the repository
version output version and copyright information
tests: unify test-globalopts
2010-09-04 00:10:08 +04:00
tests: fix for D6717635
2018-01-13 03:58:28 +03:00
enabled extensions:
extensions: default-on conflictinfo, errorredirect, ... Summary: ...mergedriver, and progressfile. Reviewed By: quark-zju, singhsrb Differential Revision: D6765952 fbshipit-source-id: 8eddcdeffa5d6532f737f45f7e1071c1a563a3cd
2018-01-23 23:08:57 +03:00
conflictinfo
debugshell: enable it by default Summary: It's pretty handy. The implementation is simple and clean. So move it from contrib and enable it by default. "import"s are adjusted to make the module checker happy. Security and UX wise, since we have `--debugger` already, adding another REPL seems fine. Test Plan: Ran all tests Reviewers: phillco, #mercurial Reviewed By: phillco Differential Revision: https://phabricator.intern.facebook.com/D6741283 Signature: 6741283:1516225662:ddc19a663e7ecef2a1fdaa5041f308dc838a8471
2018-01-17 23:54:24 +03:00
debugshell a python shell with repo, changelog & manifest objects
extensions: default-on conflictinfo, errorredirect, ... Summary: ...mergedriver, and progressfile. Reviewed By: quark-zju, singhsrb Differential Revision: D6765952 fbshipit-source-id: 8eddcdeffa5d6532f737f45f7e1071c1a563a3cd
2018-01-23 23:08:57 +03:00
errorredirect
redirect error message
tests: fix for D6717635
2018-01-13 03:58:28 +03:00
githelp try mapping git commands to Mercurial commands
extensions: default-on conflictinfo, errorredirect, ... Summary: ...mergedriver, and progressfile. Reviewed By: quark-zju, singhsrb Differential Revision: D6765952 fbshipit-source-id: 8eddcdeffa5d6532f737f45f7e1071c1a563a3cd
2018-01-23 23:08:57 +03:00
mergedriver custom merge drivers for autoresolved files
progressfile allows users to have JSON progress bar information written to a
path
simplecache: enable by default Summary: Default-on this moderately hard extension. Reviewed By: DurhamG, quark-zju Differential Revision: D6792641 fbshipit-source-id: 475135f4f4f295a4e6356443405bd6eb185c310a
2018-01-24 04:55:25 +03:00
simplecache
extensions: always turn on treedirstate Summary: This would make tests run on treedirstate. To avoid issues with Eden pulling from a non-eden treedirstate repo, treedirstate is changed to be "always on" and disables itself on an eden repo. The extension list is changed to a set for efficient `__contains__` test. Reviewed By: phillco Differential Revision: D7769804 fbshipit-source-id: d328fe51ef67c4730cfc53f43bdfc48c2765c541
2018-05-01 18:12:48 +03:00
treedirstate tree-based dirstate implementation
tests: fix for D6717635
2018-01-13 03:58:28 +03:00
tests: unify test-globalopts
2010-09-04 00:10:08 +04:00
additional help topics:
help: document bundle specifications I softly formalized the concept of a "bundle specification" a while ago when I was working on clone bundles and stream clone bundles and wanted a more robust way to define what exactly is in a bundle file. The concept has existed for a while. Since it is part of the clone bundles feature and exposed to the user via the "-t" argument to `hg bundle`, it is something we need to support for the long haul. After the 4.1 release, I heard a few people comment that they didn't realize you could generate zstd bundles with `hg bundle`. I'm partially to blame for not documenting it in bundle's docstring. Additionally, I added a hacky, experimental feature for controlling the compression level of bundles in 054e64c4d837. As the commit message says, I went with a quick and dirty solution out of time constraints. Furthermore, I wanted to eventually store this configuration in the "bundlespec" so it could be made more flexible. Given: a) bundlespecs are here to stay b) we don't have great documentation over what they are, despite being a user-facing feature c) the list of available compression engines and their behavior isn't exposed d) we need an extensible place to modify behavior of compression engines I want to move forward with formalizing bundlespecs as a user-facing feature. This commit does that by introducing a "bundlespec" help page. Leaning on the just-added compression engine documentation and API, the topic also conveniently lists available compression engines and details about them. This makes features like zstd bundle compression more discoverable. e.g. you can now `hg help -k zstd` and it lists the "bundlespec" topic.
2017-04-01 23:42:06 +03:00
bundlespec Bundle File Formats
color: update the help table We also need to reference the new topic in the great old help table.
2017-03-01 22:22:04 +03:00
color Colorizing Outputs
help: fix column alignment in "hg help" output The output of "hg help" is changed to ensure that the column containing descriptions of commands, extensions, and other topics is correctly alignmened.
2012-01-11 21:14:55 +04:00
config Configuration Files
dates Date Formats
diffs Diff Formats
environment Environment Variables
help: consistently use title capitalization for help topics
2012-04-30 13:51:24 +04:00
extensions Using Additional Features
help: fix column alignment in "hg help" output The output of "hg help" is changed to ensure that the column containing descriptions of commands, extensions, and other topics is correctly alignmened.
2012-01-11 21:14:55 +04:00
filesets Specifying File Sets
help: adding a topic on flags This is a short topic to explain how command-line flags can be specified. Some users have been confused by hg offerring different flag syntax than some other libraries, so it'd be nice to point them to this rather than explaining it every time. Differential Revision: https://phab.mercurial-scm.org/D1270
2017-10-31 06:35:30 +03:00
flags Command-line flags
help: fix column alignment in "hg help" output The output of "hg help" is changed to ensure that the column containing descriptions of commands, extensions, and other topics is correctly alignmened.
2012-01-11 21:14:55 +04:00
glossary Glossary
help: consistently use title capitalization for help topics
2012-04-30 13:51:24 +04:00
hgignore Syntax for Mercurial Ignore Files
help: fix column alignment in "hg help" output The output of "hg help" is changed to ensure that the column containing descriptions of commands, extensions, and other topics is correctly alignmened.
2012-01-11 21:14:55 +04:00
hgweb Configuring hgweb
help: add "internals" topic We introduce the "internals" help topic, which renders an index of available sub-topics. The sub-topics themselves are still not reachable via the help system.
2015-12-13 21:35:03 +03:00
internals Technical implementation topics
help: fix column alignment in "hg help" output The output of "hg help" is changed to ensure that the column containing descriptions of commands, extensions, and other topics is correctly alignmened.
2012-01-11 21:14:55 +04:00
merge-tools Merge Tools
pager: move most help to a new help topic and deprecate extension
2017-02-07 08:07:53 +03:00
pager Pager Support
help: fix column alignment in "hg help" output The output of "hg help" is changed to ensure that the column containing descriptions of commands, extensions, and other topics is correctly alignmened.
2012-01-11 21:14:55 +04:00
patterns File Name Patterns
help: add phases topic
2012-01-26 21:23:14 +04:00
phases Working with Phases
help: merge revsets.txt into revisions.txt Selecting single and multiple revisions is closely related, so let's put it in one place, so users can easily find it. We actually did not even point to "hg help revsets" from "hg help revisions", but now that they're on a single page, that won't be necessary.
2017-01-11 22:37:38 +03:00
revisions Specifying Revisions
help: scripting help topic There are a lot of non-human consumers of Mercurial. And the challenges and considerations for machines consuming Mercurial is significantly different from what humans face. I think there are enough special considerations around how machines consume Mercurial that a dedicated help topic is warranted. I concede the audience for this topic is probably small compared to the general audience. However, lots of normal Mercurial users do things like create one-off shell scripts for common workflows that I think this is useful enough to be in the install (as opposed to, say, a wiki page - which most users will likely never find). This text is by no means perfect. But you have to start somewhere. I think I did cover the important parts, though.
2015-07-19 03:10:28 +03:00
scripting Using Mercurial from scripts and automation
help: fix column alignment in "hg help" output The output of "hg help" is changed to ensure that the column containing descriptions of commands, extensions, and other topics is correctly alignmened.
2012-01-11 21:14:55 +04:00
subrepos Subrepositories
templating Template Usage
urls URL Paths
tests: unify test-globalopts
2010-09-04 00:10:08 +04:00
help: use single quotes in use warning
2016-09-21 02:47:46 +03:00
(use 'hg help -v' to show built-in aliases and global options)
tests: unify test-globalopts
2010-09-04 00:10:08 +04:00
Not tested: --debugger
Reference in New Issue Copy Permalink