Mercurial > hg
changeset 2531:7a90e0c77f43
Merge with crew.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 30 Jun 2006 21:35:28 +0200 |
parents | d181845bdc51 (diff) c1974f65d781 (current diff) |
children | 8a8d9ada4528 |
files | hgext/mq.py |
diffstat | 5 files changed, 17 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Fri Jun 30 18:57:04 2006 +0200 +++ b/Makefile Fri Jun 30 21:35:28 2006 +0200 @@ -37,12 +37,20 @@ rm -f MANIFEST mercurial/__version__.py mercurial/*.so tests/*.err $(MAKE) -C doc clean -install: all +install: install-bin install-doc + +install-bin: build $(PYTHON) setup.py install --prefix="$(PREFIX)" --force + +install-doc: doc cd doc && $(MAKE) $(MFLAGS) install -install-home: all +install-home: install-home-bin install-home-doc + +install-home-bin: build $(PYTHON) setup.py install --home="$(HOME)" --force + +install-home-doc: doc cd doc && $(MAKE) $(MFLAGS) PREFIX="$(HOME)" install dist: tests dist-notests @@ -57,5 +65,5 @@ cd tests && $(PYTHON) run-tests.py $@ -.PHONY: help all local build doc clean install install-home dist dist-notests tests - +.PHONY: help all local build doc clean install install-bin install-doc \ + install-home install-home-bin install-home-doc dist dist-notests tests
--- a/hgext/mq.py Fri Jun 30 18:57:04 2006 +0200 +++ b/hgext/mq.py Fri Jun 30 21:35:28 2006 +0200 @@ -1083,6 +1083,7 @@ return 0 def commit(ui, repo, *pats, **opts): + """commit changes in the queue repository""" q = repomap[repo] r = q.qrepo() if not r: raise util.Abort('no queue repository') @@ -1264,7 +1265,7 @@ 'hg qimport [-e] [-n NAME] [-f] FILE...'), "^qinit": (init, - [('c', 'create-repo', None, 'create patch repository')], + [('c', 'create-repo', None, 'create queue repository')], 'hg qinit [-c]'), "qnew": (new,
--- a/tests/test-globalopts Fri Jun 30 18:57:04 2006 +0200 +++ b/tests/test-globalopts Fri Jun 30 21:35:28 2006 +0200 @@ -62,7 +62,7 @@ hg --cwd a --time tip 2>&1 | grep '^Time:' | sed 's/[0-9][0-9]*/x/g' echo %% --version -hg --version -q | sed 's/version \([a-f0-9+]*\|unknown\)/version xxx/' +hg --version -q | sed 's/version [^)]*/version xxx/' echo %% -h/--help hg -h