Mercurial > hg > gitserve
changeset 2249:3e5fbf001f9b
merge with crew.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Wed, 10 May 2006 10:32:24 -0700 |
parents | b914f0557832 (current diff) d2118a0926bd (diff) |
children | 45aef5ddcdbe |
files | |
diffstat | 2 files changed, 22 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Wed May 10 10:31:54 2006 -0700 +++ b/Makefile Wed May 10 10:32:24 2006 -0700 @@ -2,7 +2,25 @@ export PREFIX PYTHON=python -all: local build doc +help: + @echo 'Commonly used make targets:' + @echo ' all - build program and documentation' + @echo ' install - install program and man pages to PREFIX ($(PREFIX))' + @echo ' install-home - install with setup.py install --home=HOME ($(HOME))' + @echo ' local - build C extensions for inplace usage' + @echo ' tests - run all tests in the automatic test suite' + @echo ' test-foo - run only specified tests (e.g. test-merge1)' + @echo ' dist - run all tests and create a source tarball in dist/' + @echo ' clean - remove files created by other targets' + @echo ' (except installed files or dist source tarball)' + @echo + @echo 'Example for a system-wide installation under /usr/local:' + @echo ' make all && su -c "make install" && hg version' + @echo + @echo 'Example for a local installation (usable in this directory):' + @echo ' make local && ./hg version' + +all: build doc local: $(PYTHON) setup.py build_ext -i @@ -16,6 +34,7 @@ clean: -$(PYTHON) setup.py clean --all # ignore errors of this command find . -name '*.py[co]' -exec rm -f '{}' ';' + rm -f MANIFEST mercurial/__version__.py mercurial/*.so tests/*.err $(MAKE) -C doc clean install: all @@ -38,5 +57,5 @@ cd tests && $(PYTHON) run-tests.py $@ -.PHONY: all local build doc clean install install-home dist dist-notests tests +.PHONY: help all local build doc clean install install-home dist dist-notests tests
--- a/mercurial/commands.py Wed May 10 10:31:54 2006 -0700 +++ b/mercurial/commands.py Wed May 10 10:32:24 2006 -0700 @@ -3021,7 +3021,7 @@ "recover": (recover, [], _('hg recover')), "^remove|rm": (remove, - [('', 'after', None, _('record remove that has already occurred')), + [('A', 'after', None, _('record remove that has already occurred')), ('f', 'force', None, _('remove file even if modified')), ('I', 'include', [], _('include names matching the given patterns')), ('X', 'exclude', [], _('exclude names matching the given patterns'))],