##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

simplemerge: change _minimize() to minimize a single conflict...
simplemerge: change _minimize() to minimize a single conflict `_minimize()` is weird in that it changes `a_lines` and `b_lines` but leaves `base_lines` unchanged, which means they'll be inconsistent. That was fine because the caller never used `base_lines`. With the recent refactorings of this code, we can now make this function cleaner by having it minimize a single conflict and not care about `base_lines`. This also makes the code simpler and makes the code for each `render_*()` function more similar. Differential Revision: https://phab.mercurial-scm.org/D11981
Valentin Gatien-Baron - - Load All Authors

File last commit:

r46125:eb443f7c default
r49413:c2537aec default
Show More
README
40 lines | 1.2 KiB | text/plain | TextLexer
/ contrib / chg / README
History | Source | Raw |Copy content |Copy permalink
Yuya Nishihara
chg: import frontend sources...
 r28060 cHg
===
A fast client for Mercurial command server running on Unix.
Install:
$ make
$ make install
Usage:
$ chg help # show help of Mercurial
$ alias hg=chg # replace hg command
$ chg --kill-chg-daemon # terminate background server
Environment variables:
Although cHg tries to update environment variables, some of them cannot be
changed after spawning the server. The following variables are specially
handled:
Jun Wu
chg: remove manual reload logic...
 r28454 * configuration files are reloaded automatically by default.
Yuya Nishihara
chg: import frontend sources...
 r28060 * CHGHG or HG specifies the path to the hg executable spawned as the
background command server.
The following variables are available for testing:
* CHGDEBUG enables debug messages.
* CHGSOCKNAME specifies the socket path of the background cmdserver.
Jun Wu
chg: make timeout adjustable...
 r29345 * CHGTIMEOUT specifies how many seconds chg will wait before giving up
Jun Wu
chg: change default connect timeout to 60 seconds...
 r29357 connecting to a cmdserver. If it is 0, chg will wait forever. Default: 60
Valentin Gatien-Baron
chg: make is possible to call by default an hg binary located next to chg...
 r46128
Build environment variables:
* HGPATH: the path to the hg executable to call when CHGHG and HG are not set,
instead of "hg"
* HGPATHREL=1: when CHGHG and HG are not set, the hg executable will be ./hg
relative to the chg executable. Only works on linux, falls back to "hg"
otherwise.