A Scalable, User-Friendly Source Control System.
Go to file
mpm@selenic.com 71401f47a5 hg import error checking
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

hg import error checking

From: Chris Mason <mason@suse.com>

hg import wasn't checking the return value of patch
and wasn't making sure the list of files collected
was unique.

manifest hash: 85b2a0f0602cfff6ba6a61128a50d79d7fb6e1c7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCuym/ywK+sNU5EO8RAlwSAJ48h8hHi3JMNwrVq0CXIfgMCTGRRQCfSfpP
9kHam+Rt8tra46lCQ4d27G4=
=P00x
-----END PGP SIGNATURE-----
2005-06-23 13:29:35 -08:00
contrib convert-repo fixups 2005-06-22 11:21:04 -08:00
doc Update docs 2005-06-22 22:33:30 -08:00
mercurial hg import error checking 2005-06-23 13:29:35 -08:00
templates hgweb: missed a long hash 2005-06-15 21:18:35 -08:00
tests Fix up tests for command name changes 2005-06-23 09:26:43 -08:00
.hgignore Support for 'hg --version'. setup.py stores version from hg repository. 2005-06-18 16:32:41 +01:00
comparison.txt Minor updates to comparison 2005-05-23 16:05:05 -08:00
COPYING Add COPYING 2005-06-17 09:32:13 -08:00
hg Mark the usual things executable 2005-06-08 10:52:01 -08:00
hgeditor Improved hgeditor: 2005-06-14 08:49:52 +01:00
hgmerge Use vi if $EDITOR is unset. 2005-06-10 07:52:39 +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
MANIFEST.in hgweb: put map-raw in setup.py and MANIFEST.in 2005-06-01 17:01:09 -08:00
notes.txt Some tweaking of notes.txt 2005-06-05 00:42:44 -08:00
PKG-INFO Add back links from file revisions to changeset revisions 2005-05-03 13:16:10 -08:00
README Tweak README for branch, push, and .hgrc 2005-06-13 15:01:38 -08:00
rewrite-log Simple script to recompress a log file 2005-05-23 16:06:25 -08:00
setup.py Pull from TAH 2005-06-21 21:04:49 -08:00
TODO Support for 'hg --version'. setup.py stores version from hg repository. 2005-06-18 16:32:41 +01:00

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  # add this to your .bashrc
 $ export PATH=${HOME}/bin:$PATH         # 

 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 linux/
 $ hg init         # creates .hg
 $ hg status       # show changes between repo and working dir
 $ hg diff         # generate a unidiff
 $ hg addremove    # add all unknown files and remove all missing files
 $ hg commit       # commit all changes, edit changelog entry
 $ hg export <rev> # export a changeset as a diff

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

Mercurial commands:

 $ hg history          # show changesets
 $ hg log Makefile     # show commits per file
 $ hg update           # check out the tip revision
 $ hg update <id>      # check out a specified changeset
                       # IDs can be tags, revision numbers, or unique
                       # subsets of changeset hash numbers
 $ hg add foo          # add a new file for the next commit
 $ hg remove bar       # mark a file as removed
 $ hg verify           # check repo integrity
 $ hg tags             # show current tags
 $ hg annotate [files] # show changeset numbers for each file line

Branching and merging:

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

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 the self-hosting hg repo
 foo$ hg init
 foo$ hg pull http://selenic.com/hg/
 foo$ hg update # hg co works too

 # 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 co        # merge changes into your working directory

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

Symbolic repository names:

 Mercurial uses an options file called ~/.hgrc. To track locations
 symbolically, add a section to it like this:

 [paths]
 main = http://selenic.com/hg
 hgweb = http://edge2.net/hg/hgweb/
 hgdoc = http://edge2.net/hg/man/