Mercurial > hg
annotate contrib/chg/README @ 45670:a8fb29b05f92
salvaged: properly deal with salvaged file during copy tracing
When salvaged files are encountered, the removal have been reverted and we
should keep the rename information from the other side.
The conditional was starting to be quite hairy, so we spell it out in multiple
elif case for readability.
This fixes the associated test cases introduced a while back. The changeset centric copy tracing is now (known) bug free.
Differential Revision: https://phab.mercurial-scm.org/D9130
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Wed, 16 Sep 2020 21:00:02 +0200 |
parents | 4c8d9b53b1c7 |
children |
rev | line source |
---|---|
28060 | 1 cHg |
2 === | |
3 | |
4 A fast client for Mercurial command server running on Unix. | |
5 | |
6 Install: | |
7 | |
8 $ make | |
9 $ make install | |
10 | |
11 Usage: | |
12 | |
13 $ chg help # show help of Mercurial | |
14 $ alias hg=chg # replace hg command | |
15 $ chg --kill-chg-daemon # terminate background server | |
16 | |
17 Environment variables: | |
18 | |
19 Although cHg tries to update environment variables, some of them cannot be | |
20 changed after spawning the server. The following variables are specially | |
21 handled: | |
22 | |
28454 | 23 * configuration files are reloaded automatically by default. |
28060 | 24 * CHGHG or HG specifies the path to the hg executable spawned as the |
25 background command server. | |
26 | |
27 The following variables are available for testing: | |
28 | |
29 * CHGDEBUG enables debug messages. | |
30 * CHGSOCKNAME specifies the socket path of the background cmdserver. | |
29345 | 31 * CHGTIMEOUT specifies how many seconds chg will wait before giving up |
29357
66d41c9e9222
chg: change default connect timeout to 60 seconds
Jun Wu <quark@fb.com>
parents:
29345
diff
changeset
|
32 connecting to a cmdserver. If it is 0, chg will wait forever. Default: 60 |
45551
4c8d9b53b1c7
chg: make is possible to call by default an hg binary located next to chg
Valentin Gatien-Baron <vgatien-baron@janestreet.com>
parents:
29357
diff
changeset
|
33 |
4c8d9b53b1c7
chg: make is possible to call by default an hg binary located next to chg
Valentin Gatien-Baron <vgatien-baron@janestreet.com>
parents:
29357
diff
changeset
|
34 Build environment variables: |
4c8d9b53b1c7
chg: make is possible to call by default an hg binary located next to chg
Valentin Gatien-Baron <vgatien-baron@janestreet.com>
parents:
29357
diff
changeset
|
35 |
4c8d9b53b1c7
chg: make is possible to call by default an hg binary located next to chg
Valentin Gatien-Baron <vgatien-baron@janestreet.com>
parents:
29357
diff
changeset
|
36 * HGPATH: the path to the hg executable to call when CHGHG and HG are not set, |
4c8d9b53b1c7
chg: make is possible to call by default an hg binary located next to chg
Valentin Gatien-Baron <vgatien-baron@janestreet.com>
parents:
29357
diff
changeset
|
37 instead of "hg" |
4c8d9b53b1c7
chg: make is possible to call by default an hg binary located next to chg
Valentin Gatien-Baron <vgatien-baron@janestreet.com>
parents:
29357
diff
changeset
|
38 * HGPATHREL=1: when CHGHG and HG are not set, the hg executable will be ./hg |
4c8d9b53b1c7
chg: make is possible to call by default an hg binary located next to chg
Valentin Gatien-Baron <vgatien-baron@janestreet.com>
parents:
29357
diff
changeset
|
39 relative to the chg executable. Only works on linux, falls back to "hg" |
4c8d9b53b1c7
chg: make is possible to call by default an hg binary located next to chg
Valentin Gatien-Baron <vgatien-baron@janestreet.com>
parents:
29357
diff
changeset
|
40 otherwise. |