Show More
@@ -12,5 +12,4 b' recursive-include contrib *' | |||||
12 | include README |
|
12 | include README | |
13 | include CONTRIBUTORS |
|
13 | include CONTRIBUTORS | |
14 | include COPYING |
|
14 | include COPYING | |
15 | include TODO |
|
|||
16 | include MANIFEST.in |
|
15 | include MANIFEST.in |
@@ -1,7 +1,7 b'' | |||||
1 | _hg_commands() |
|
1 | _hg_commands() | |
2 | { |
|
2 | { | |
3 | local commands="$(hg -v help | sed -e '1,/^list of commands:/d' \ |
|
3 | local commands="$(hg -v help | sed -e '1,/^list of commands:/d' \ | |
4 |
-e '/^global options:/ |
|
4 | -e '/^global options:/,$d' \ | |
5 | -e '/^ [^ ]/!d; s/[,:]//g;')" |
|
5 | -e '/^ [^ ]/!d; s/[,:]//g;')" | |
6 |
|
6 | |||
7 | # hide debug commands from users, but complete them if |
|
7 | # hide debug commands from users, but complete them if |
@@ -273,9 +273,8 b' paths [NAME]::' | |||||
273 | Show definition of symbolic path name NAME. If no name is given, show |
|
273 | Show definition of symbolic path name NAME. If no name is given, show | |
274 | definition of available names. |
|
274 | definition of available names. | |
275 |
|
275 | |||
276 |
Path names are defined in the [paths] section of |
|
276 | Path names are defined in the [paths] section of /etc/mercurial/hgrc | |
277 | <repo>/.hg/hgrc configuration files. If run outside a repo, 'paths' |
|
277 | and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too. | |
278 | queries only $HOME/.hgrc. |
|
|||
279 |
|
278 | |||
280 | pull <repository path>:: |
|
279 | pull <repository path>:: | |
281 | Pull changes from a remote repository to a local one. |
|
280 | Pull changes from a remote repository to a local one. | |
@@ -589,10 +588,11 b' FILES' | |||||
589 | seperated by spaces) that correspond to tagged versions of the repository |
|
588 | seperated by spaces) that correspond to tagged versions of the repository | |
590 | contents. |
|
589 | contents. | |
591 |
|
590 | |||
592 | $HOME/.hgrc, .hg/hgrc:: |
|
591 | /etc/mercurial/hgrc, $HOME/.hgrc, .hg/hgrc:: | |
593 | This file contains defaults and configuration. Values in .hg/hgrc |
|
592 | This file contains defaults and configuration. Values in .hg/hgrc | |
594 | override those in .hgrc. See hgrc(5) for details of the contents |
|
593 | override those in $HOME/.hgrc, and these override settings made in the | |
595 | and format of these files. |
|
594 | global /etc/mercurial/hgrc configuration. See hgrc(5) for details of | |
|
595 | the contents and format of these files. | |||
596 |
|
596 | |||
597 | BUGS |
|
597 | BUGS | |
598 | ---- |
|
598 | ---- |
@@ -15,17 +15,22 b' aspects of its behaviour.' | |||||
15 | FILES |
|
15 | FILES | |
16 | ----- |
|
16 | ----- | |
17 |
|
17 | |||
18 |
Mercurial reads configuration data from t |
|
18 | Mercurial reads configuration data from three files: | |
|
19 | ||||
|
20 | /etc/mercurial/hgrc:: | |||
|
21 | Options in this global configuration file apply to all Mercurial | |||
|
22 | commands executed by any user in any directory. | |||
19 |
|
23 | |||
20 | $HOME/.hgrc:: |
|
24 | $HOME/.hgrc:: | |
21 |
|
|
25 | Per-user configuration options that apply to all Mercurial commands, | |
22 |
no matter |
|
26 | no matter from which directory they are run. Values in this file | |
|
27 | override global settings. | |||
23 |
|
28 | |||
24 | <repo>/.hg/hgrc:: |
|
29 | <repo>/.hg/hgrc:: | |
25 | Per-repository configuration options that only apply in a |
|
30 | Per-repository configuration options that only apply in a | |
26 | particular repository. This file is not version-controlled, and |
|
31 | particular repository. This file is not version-controlled, and | |
27 | will not get transferred during a "clone" operation. Values in |
|
32 | will not get transferred during a "clone" operation. Values in | |
28 |
this file override global |
|
33 | this file override global and per-user settings. | |
29 |
|
34 | |||
30 | SYNTAX |
|
35 | SYNTAX | |
31 | ------ |
|
36 | ------ |
@@ -13,7 +13,8 b' class ui:' | |||||
13 | def __init__(self, verbose=False, debug=False, quiet=False, |
|
13 | def __init__(self, verbose=False, debug=False, quiet=False, | |
14 | interactive=True): |
|
14 | interactive=True): | |
15 | self.cdata = ConfigParser.SafeConfigParser() |
|
15 | self.cdata = ConfigParser.SafeConfigParser() | |
16 |
self.cdata.read(os.path. |
|
16 | self.cdata.read([os.path.normpath(hgrc) for hgrc in | |
|
17 | "/etc/mercurial/hgrc", os.path.expanduser("~/.hgrc")]) | |||
17 |
|
18 | |||
18 | self.quiet = self.configbool("ui", "quiet") |
|
19 | self.quiet = self.configbool("ui", "quiet") | |
19 | self.verbose = self.configbool("ui", "verbose") |
|
20 | self.verbose = self.configbool("ui", "verbose") |
@@ -7,6 +7,8 b' hg ci -m "a" -d "0 0"' | |||||
7 |
|
7 | |||
8 | echo 123 > b |
|
8 | echo 123 > b | |
9 | hg add b |
|
9 | hg add b | |
10 |
hg diff | sed "s/\( |
|
10 | hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | |
|
11 | -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" | |||
11 |
|
12 | |||
12 |
hg diff -r tip | sed "s/\( |
|
13 | hg diff -r tip | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | |
|
14 | -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" |
@@ -27,7 +27,8 b' hg id' | |||||
27 | hg update -C 0 |
|
27 | hg update -C 0 | |
28 | echo "changed file1 different" >> file1 |
|
28 | echo "changed file1 different" >> file1 | |
29 | HGMERGE=merge hg update |
|
29 | HGMERGE=merge hg update | |
30 |
hg diff | sed -e "s/\( |
|
30 | hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(<<<<<<<\) .*/\1/" \ | |
|
31 | -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(>>>>>>>\) .*/\1/" | |||
31 | hg status |
|
32 | hg status | |
32 | hg id |
|
33 | hg id | |
33 | hg revert |
|
34 | hg revert |
@@ -12,8 +12,8 b' hg clone . ../r2' | |||||
12 | cd ../r2 |
|
12 | cd ../r2 | |
13 | hg up |
|
13 | hg up | |
14 | echo abc > a |
|
14 | echo abc > a | |
15 | hg diff > ../d |
|
15 | hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | |
16 |
|
|
16 | -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" | |
17 |
|
17 | |||
18 | cd ../r1 |
|
18 | cd ../r1 | |
19 | echo b > b |
|
19 | echo b > b | |
@@ -28,6 +28,6 b' hg --debug up' | |||||
28 | hg --debug up -m |
|
28 | hg --debug up -m | |
29 | hg parents |
|
29 | hg parents | |
30 | hg -v history |
|
30 | hg -v history | |
31 | hg diff > ../d |
|
31 | hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | |
32 |
|
|
32 | -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" | |
33 |
|
33 |
General Comments 0
You need to be logged in to leave comments.
Login now