Mercurial > hg
changeset 1010:f46e809bbe87
Merge with TAH
| author | mpm@selenic.com |
|---|---|
| date | Tue, 23 Aug 2005 14:21:19 -0700 |
| parents | 42956a6cb257 (current diff) 1bc619b12025 (diff) |
| children | d74bcc61be6f |
| files | |
| diffstat | 4 files changed, 30 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/MANIFEST.in Tue Aug 23 14:20:17 2005 -0700 +++ b/MANIFEST.in Tue Aug 23 14:21:19 2005 -0700 @@ -7,7 +7,7 @@ include *.txt include templates/map templates/map-*[a-z0-9] include templates/*.tmpl -include doc/README doc/*.txt doc/Makefile +include doc/README doc/Makefile doc/*.txt doc/*.html doc/*.[0-9] recursive-include contrib * include README include CONTRIBUTORS
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Makefile Tue Aug 23 14:21:19 2005 -0700 @@ -0,0 +1,23 @@ +# This Makefile is only used by developers. +PYTHON=python + +all: + @echo "Read the file README for install instructions." + +clean: + -$(PYTHON) setup.py clean --all # ignore errors of this command + find . -name '*.py[co]' -exec rm -f '{}' ';' + make -C doc clean + +dist: tests doc + TAR_OPTIONS="--owner=root --group=root --mode=u+w,go-w,a+rX-s" $(PYTHON) setup.py sdist --force-manifest + +tests: + cd tests && ./run-tests + +doc: + make -C doc + + +.PHONY: all clean dist tests doc +
--- a/doc/Makefile Tue Aug 23 14:20:17 2005 -0700 +++ b/doc/Makefile Tue Aug 23 14:21:19 2005 -0700 @@ -2,7 +2,7 @@ MAN=$(SOURCES:%.txt=%) HTML=$(SOURCES:%.txt=%.html) -all: man +all: man html man: $(MAN)
--- a/hgeditor Tue Aug 23 14:20:17 2005 -0700 +++ b/hgeditor Tue Aug 23 14:21:19 2005 -0700 @@ -51,7 +51,11 @@ grep -vE '^(HG: manifest hash .*)?$' "$1" >> "$HGTMP/msg" CHECKSUM=`md5sum "$HGTMP/msg"` -$EDITOR "$HGTMP/msg" "$HGTMP/diff" || exit $? +if [ -s "$HGTMP/diff" ]; then + $EDITOR "$HGTMP/msg" "$HGTMP/diff" || exit $? +else + $EDITOR "$HGTMP/msg" || exit $? +fi echo "$CHECKSUM" | md5sum -c >/dev/null 2>&1 && exit 13 if [ "$SIGN" == "1" ]; then