Merge with crew.
--- 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
--- a/tests/test-hup Fri Jun 30 18:57:04 2006 +0200
+++ b/tests/test-hup Fri Jun 30 21:35:28 2006 +0200
@@ -7,7 +7,7 @@
P=$!
(echo lock; echo addchangegroup; sleep 5) > p &
Q=$!
-sleep 1
+sleep 3
kill -HUP $P
wait
ls .hg
--- a/tests/test-pull-pull-corruption2 Fri Jun 30 18:57:04 2006 +0200
+++ b/tests/test-pull-pull-corruption2 Fri Jun 30 21:35:28 2006 +0200
@@ -20,5 +20,6 @@
sleep 1
hg clone --pull -U version2 corrupted
+wait
hg -R corrupted verify
hg -R version2 verify