Merge with TAH
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Merge with TAH
manifest hash:
1742d7ba2093dc643b57e45167cb2d794212cbb9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxPCQywK+sNU5EO8RAkr0AJ9qut/31lCLQ/xY3FWaF3c21RhS7wCfW1eV
3WexPDsJldMAr3V5vc9eowA=
=pJYu
-----END PGP SIGNATURE-----
--- a/TODO Thu Jun 30 23:23:12 2005 -0800
+++ b/TODO Thu Jun 30 23:28:16 2005 -0800
@@ -15,8 +15,8 @@
- directory foo.d or foo.i with existing file foo (use some quoting?)
- get various options from hgrc (e.g. history always -v, tip always -q)
- better push support (hack exists)
-- hg over ssh:// and https://
-- commit mailinglist/trigger/hooks
+- hg over ssh:// and https:// and rsync://
+- hooks for new changesets getting pulled/imported etc.
- make showing removed files (in history etc.) faster.
Commands:
@@ -26,8 +26,6 @@
- select to pull a subset of the heads
- commands.py: number of args too much magic (e.g. in patch())
- automatic pull fallback to old-http://
-- hg pull http://example.com doesn't say that no repo was found
-- hg annotate -u and hgweb annotate with long $EMAIL
- hg pull default in a subdir doesn't work, if it is a relative path
- optionally only show merges (two parents or parent != changeset-1, etc.)
--- a/hgeditor Thu Jun 30 23:23:12 2005 -0800
+++ b/hgeditor Thu Jun 30 23:28:16 2005 -0800
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# This is an example of using HGEDITOR to automate the signing of
# commits and so on.
--- a/hgmerge Thu Jun 30 23:23:12 2005 -0800
+++ b/hgmerge Thu Jun 30 23:28:16 2005 -0800
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# hgmerge - default merge helper for Mercurial
#
--- a/mercurial/commands.py Thu Jun 30 23:23:12 2005 -0800
+++ b/mercurial/commands.py Thu Jun 30 23:28:16 2005 -0800
@@ -137,7 +137,7 @@
if ui.verbose:
ui.status("description:\n")
ui.status(description)
- ui.status("\n")
+ ui.status("\n\n")
else:
ui.status("summary: %s\n" % description.splitlines()[0])
ui.status("\n")
@@ -295,7 +295,9 @@
d = dircleanup(dest)
link = 0
- if not source.startswith("http://"):
+ if not (source.startswith("http://") or
+ source.startswith("hg://") or
+ source.startswith("old-http://")):
d1 = os.stat(dest).st_dev
d2 = os.stat(source).st_dev
if d1 == d2: link = 1
--- a/tests/fish-merge Thu Jun 30 23:23:12 2005 -0800
+++ b/tests/fish-merge Thu Jun 30 23:28:16 2005 -0800
@@ -1,3 +1,5 @@
+#!/bin/sh
+
set -e
set -x
--- a/tests/run-tests Thu Jun 30 23:23:12 2005 -0800
+++ b/tests/run-tests Thu Jun 30 23:28:16 2005 -0800
@@ -1,6 +1,4 @@
-#!/bin/bash
-
-set -e
+#!/bin/sh -e
export LANG=C
export LC_CTYPE="C"
@@ -47,7 +45,7 @@
rm -f $1.err
export TZ=GMT
D=`mktemp -d`
- if [ "$D" == "" ] ; then
+ if [ "$D" = "" ] ; then
echo mktemp failed!
fi
@@ -77,7 +75,7 @@
}
TESTS=$@
-if [ "$TESTS" == "" ] ; then
+if [ "$TESTS" = "" ] ; then
TESTS=`ls test-* | grep -Ev "\.|~"`
fi
--- a/tests/test-bad-pull Thu Jun 30 23:23:12 2005 -0800
+++ b/tests/test-bad-pull Thu Jun 30 23:28:16 2005 -0800
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/sh -x
hg clone http://localhost:20059/ copy
echo $?
@@ -18,6 +18,7 @@
EOF
python dumb.py 2>/dev/null &
+sleep 2
hg clone http://localhost:20059/foo copy2
echo $?
--- a/tests/test-bad-pull.out Thu Jun 30 23:23:12 2005 -0800
+++ b/tests/test-bad-pull.out Thu Jun 30 23:28:16 2005 -0800
@@ -10,6 +10,7 @@
ls: copy: No such file or directory
+ cat
+ python dumb.py
++ sleep 2
+ hg clone http://localhost:20059/foo copy2
requesting all changes
adding changesets
--- a/tests/test-basic Thu Jun 30 23:23:12 2005 -0800
+++ b/tests/test-basic Thu Jun 30 23:28:16 2005 -0800
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
set -x
mkdir t
@@ -10,4 +10,4 @@
hg history
hg manifest
hg cat a
-hg verify
\ No newline at end of file
+hg verify
--- a/tests/test-conflict Thu Jun 30 23:23:12 2005 -0800
+++ b/tests/test-conflict Thu Jun 30 23:28:16 2005 -0800
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
set -x
hg init
--- a/tests/test-copy Thu Jun 30 23:23:12 2005 -0800
+++ b/tests/test-copy Thu Jun 30 23:28:16 2005 -0800
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
set -x
hg init
--- a/tests/test-help Thu Jun 30 23:23:12 2005 -0800
+++ b/tests/test-help Thu Jun 30 23:28:16 2005 -0800
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
set -x
--- a/tests/test-pull Thu Jun 30 23:23:12 2005 -0800
+++ b/tests/test-pull Thu Jun 30 23:28:16 2005 -0800
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
mkdir test
cd test
--- a/tests/test-rawcommit1.out Thu Jun 30 23:23:12 2005 -0800
+++ b/tests/test-rawcommit1.out Thu Jun 30 23:28:16 2005 -0800
@@ -28,6 +28,7 @@
description:
2
+
+ rm b
+ hg -d rawcommit -p 2 -d '0 0' -u user -t3 b
+ hg -d manifest 3
@@ -45,6 +46,7 @@
description:
3
+
+ echo this is a22
+ hg -d rawcommit -p 3 -d '0 0' -u user -t4 a
+ hg -d manifest 4
@@ -62,6 +64,7 @@
description:
4
+
+ echo this is c22
+ hg -d rawcommit -p 1 -d '0 0' -u user -t5 c
+ hg -d manifest 5
@@ -79,6 +82,7 @@
description:
4
+
+ hg -d rawcommit -p 4 -p 5 -d '0 0' -u user -t6
+ hg -d manifest 6
d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
@@ -94,6 +98,7 @@
description:
6
+
+ hg -d rawcommit -p 6 -d '0 0' -u user -t7
+ hg -d manifest 7
d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
@@ -109,3 +114,4 @@
description:
7
+
--- a/tests/test-simple-update Thu Jun 30 23:23:12 2005 -0800
+++ b/tests/test-simple-update Thu Jun 30 23:28:16 2005 -0800
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
set -ex
--- a/tests/test-tags Thu Jun 30 23:23:12 2005 -0800
+++ b/tests/test-tags Thu Jun 30 23:28:16 2005 -0800
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
set -x
mkdir t
--- a/tests/test-undo Thu Jun 30 23:23:12 2005 -0800
+++ b/tests/test-undo Thu Jun 30 23:28:16 2005 -0800
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
set -x
mkdir t
--- a/tests/test-up-local-change Thu Jun 30 23:23:12 2005 -0800
+++ b/tests/test-up-local-change Thu Jun 30 23:28:16 2005 -0800
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
export HGMERGE=true
--- a/tests/test-up-local-change.out Thu Jun 30 23:23:12 2005 -0800
+++ b/tests/test-up-local-change.out Thu Jun 30 23:28:16 2005 -0800
@@ -54,6 +54,7 @@
description:
2
+
changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
user: test
@@ -62,6 +63,7 @@
description:
1
+
+ hg diff
+ sed 's/\(\(---\|+++\).*\)\t.*/\1/'
diff -r 1e71731e6fbb a