A Scalable, User-Friendly Source Control System.
Go to file
Vadim Gelfer b5016aab02 let commands that show changesets use templates.
mechanism is same as hgweb templates.

old show_changeset code is still used for now if no template given,
because it is faster than template code when verbose or debug.

simple template can be given on command line using -t, --template.

example:

  hg log -t '{author|person}\n'

complex template can be put in template map file, given on command line
using --map-file.

we give two example map files:
map-log.compact prints 3 lines of output for every change.
map-log.verbose prints exact same output as default "hg log -v".

map files are searched where user says, then in template path as backup.

example:

  hg log --map-file map-log.compact

defaults can be set in hgrc with ui.logtemplate and ui.logmap.
2006-02-27 13:18:57 -08:00
contrib bisect: fix for recent changes disallowing "false" merges 2006-02-19 18:59:20 +01:00
doc let commands that show changesets use templates. 2006-02-27 13:18:57 -08:00
hgext add --mbox output to patchbomb 2006-02-06 17:34:39 -06:00
mercurial let commands that show changesets use templates. 2006-02-27 13:18:57 -08:00
templates let commands that show changesets use templates. 2006-02-27 13:18:57 -08:00
tests Don't use mktemp in tests, we're already in a secure temp dir. 2006-02-22 07:51:32 +01:00
.hgignore Switch to new syntax for .hgignore files. 2005-09-17 00:27:27 -07:00
comparison.txt Cleanup of tabs and trailing spaces. 2005-09-21 07:56:19 +02:00
CONTRIBUTORS Add Benoit to CONTRIBUTORS 2005-10-25 16:31:38 -07: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 hgmerge: do not use file with markers in tools merging themselves 2006-02-23 18:10:04 +01: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 Documented passing list or dict instead of config file in hgwebdir.cgi 2005-08-29 07:42:46 +02:00
Makefile add a target for running only one test 2005-10-24 14:53:36 -07:00
MANIFEST.in Add Makefile to the manifest 2005-08-24 00:38:36 -07:00
notes.txt Cleanup of tabs and trailing spaces. 2005-09-21 07:56:19 +02:00
PKG-INFO Update version number in PKG-INFO 2005-09-18 14:05:04 -07:00
README Cleanup of tabs and trailing spaces. 2005-09-21 07:56:19 +02:00
rewrite-log Simple script to recompress a log file 2005-05-23 16:06:25 -08:00
setup.py [hgweb] Static content serving 2006-02-18 21:53:41 -05: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>

 To install system-wide:

 $ python setup.py install   # change python to python2.3 if 2.2 is default

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

 $ python2.3 setup.py install --home=~
 $ 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:

 $ cd project/
 $ hg init         # creates .hg
 $ hg addremove    # add all unknown files and remove all missing 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 update -m              # 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 addremove
 $ hg commit

 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 update -m        # 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
 Mercurial wiki at http://selenic.com/mercurial/wiki