A Scalable, User-Friendly Source Control System.
Go to file
Vadim Gelfer d71b1891cb http client: support persistent connections.
uses keepalive module from urlgrabber package.  tested against "hg serve",
cgi server, and through http proxy.  used ethereal to verify that only
one tcp connection used during entire "hg pull" sequence.

if server supports keepalive, this makes latency of "hg pull" much lower.
2006-06-15 12:57:59 -07:00
contrib move hgk.py into hgext. now to enable "hg view" is one less step. 2006-06-14 15:41:06 -07:00
doc replace old-http:// syntax by static-http:// and deprecate the redundant hg:// 2006-06-14 21:53:42 +02:00
hgext move hgk.py into hgext. now to enable "hg view" is one less step. 2006-06-14 15:41:06 -07:00
mercurial http client: support persistent connections. 2006-06-15 12:57:59 -07:00
templates gitweb: strip leading & trailing blank lines in changeset description 2006-05-04 14:01:55 +02:00
tests replace old-http:// syntax by static-http:// and deprecate the redundant hg:// 2006-06-14 21:53:42 +02:00
.hgignore merge with crew. 2006-06-01 13:47:34 -07:00
.hgsigs Added signature for changeset 802c2d8415b769d4d43dfceac39c2fa8d6e96290 2006-05-10 17:05:43 -05:00
comparison.txt Cleanup of tabs and trailing spaces. 2005-09-21 07:56:19 +02:00
CONTRIBUTORS Add self to CONTRIBUTORS 2006-04-30 18:52:34 +02:00
COPYING Add COPYING 2005-06-17 09:32:13 -08:00
hg Update copyright notice 2006-02-05 22:21:02 -06:00
hgeditor Run commit message editor in the repo root (like hooks). 2006-02-09 07:01:23 +01:00
hgmerge Try to use /usr/bin/test or /bin/test to work around missing features. 2006-04-07 22:31:54 +02:00
hgweb.cgi hgweb: pull cgitb into CGI script example, where it can easily be disabled 2005-06-17 08:50:11 -08:00
hgwebdir.cgi hgwebdir: export collections of repos 2006-02-10 11:25:07 -08:00
Makefile Just using 'make' now shows help. 'make all' doesn't perform inplace build. 2006-05-10 18:53:32 +02:00
MANIFEST.in add tests/coverage.py to MANIFEST.in. 2006-05-04 22:23:18 -07:00
notes.txt deprecate undo command, replace with rollback command. 2006-05-08 14:19:05 -07:00
README update README. 2006-05-04 21:44:09 -07:00
rewrite-log Simple script to recompress a log file 2005-05-23 16:06:25 -08:00
setup.py packagescan can't scan nested packages 2006-06-02 16:19:47 +09:00

MERCURIAL QUICK-START

Setting up Mercurial:

 Note: some distributions fails to include bits of distutils by
 default, you'll need python-dev to install. You'll also need a C
 compiler and a 3-way merge tool like merge, tkdiff, or kdiff3.

 First, unpack the source:

 $ tar xvzf mercurial-<ver>.tar.gz
 $ cd mercurial-<ver>

 When installing, change python to python2.3 or python2.4 if 2.2 is the
 default on your system.

 To install system-wide:

 $ python setup.py install --force

 To install in your home directory (~/bin and ~/lib, actually), run:

 $ python setup.py install --home=${HOME} --force
 $ export PYTHONPATH=${HOME}/lib/python  # (or lib64/ on some systems)
 $ export PATH=${HOME}/bin:$PATH         # add these to your .bashrc

 And finally:

 $ hg                                    # test installation, show help

 If you get complaints about missing modules, you probably haven't set
 PYTHONPATH correctly.

Setting up a Mercurial project:

 $ hg init project     # creates project directory
 $ cd project
                       # copy files in, edit them
 $ hg add              # add all unknown files
 $ hg remove --after   # remove deleted files
 $ hg commit           # commit all changes, edit changelog entry

 Mercurial will look for a file named .hgignore in the root of your
 repository which contains a set of regular expressions to ignore in
 file paths.

Branching and merging:

 $ hg clone linux linux-work    # create a new branch
 $ cd linux-work
 $ <make changes>
 $ hg commit
 $ cd ../linux
 $ hg pull ../linux-work     # pull changesets from linux-work
 $ hg merge                  # merge the new tip from linux-work into
                             # our working directory
 $ hg commit                 # commit the result of the merge

Importing patches:

 Fast:
 $ patch < ../p/foo.patch
 $ hg commit -A

 Faster:
 $ patch < ../p/foo.patch
 $ hg commit `lsdiff -p1 ../p/foo.patch`

 Fastest:
 $ cat ../p/patchlist | xargs hg import -p1 -b ../p

Exporting a patch:

 (make changes)
 $ hg commit
 $ hg tip
 28237:747a537bd090880c29eae861df4d81b245aa0190
 $ hg export 28237 > foo.patch    # export changeset 28237

Network support:

 # pull from the primary Mercurial repo
 foo$ hg clone http://selenic.com/hg/
 foo$ cd hg

 # export your current repo via HTTP with browsable interface
 foo$ hg serve -n "My repo" -p 80

 # pushing changes to a remote repo with SSH
 foo$ hg push ssh://user@example.com/~/hg/

 # merge changes from a remote machine
 bar$ hg pull http://foo/
 bar$ hg merge   # merge changes into your working directory

 # Set up a CGI server on your webserver
 foo$ cp hgweb.cgi ~/public_html/hg/index.cgi
 foo$ emacs ~/public_html/hg/index.cgi # adjust the defaults

For more info:

 Documentation in doc/
 Mercurial website at http://selenic.com/mercurial