#
# patch ".mt-attrs"
# from [f9b65d9f157beb7932b20e4a85eb65487949ade9]
# to [d916e2d789f2c0f4e92f983099b16ec904a2379b]
#
# patch "ChangeLog"
# from [be3a9dca5d3b53b571b3720483e8a8bab9a1c691]
# to [de1eecdc63f7ec17f696e556669df261779da114]
#
# patch "commands.cc"
# from [958cd3bbc982aef81f63b90b24dcebaddf135166]
# to [802ab5385a30de04950cf7dbf99f0b445a248a84]
#
# patch "contrib/README"
# from [6d1db875fa3a286389a8c19eee3b19bf1772a3d6]
# to [41748f8afac99a87841c3f94004bbfc6f4295611]
#
# patch "monotone.1"
# from [7ce55a7b2b6ec659e94edd7947ee9ce6c62053e1]
# to [9a00ecadd333fe803fe4788d579afb75f3a8aa51]
#
# patch "monotone.texi"
# from [17687a1f93e1694cb6433d5e878ce3a00c08cd7f]
# to [31fabd3d2cdf017dfc5af29af363dbd9e6f74c21]
#
# patch "tests/t_netsync_defaults.at"
# from [8f37b7de81c532b83851011586762f8c7fd91083]
# to [09eba929e451e94f6075bd99fe75fc0469ba84e1]
#
# patch "tests/t_netsync_single.at"
# from [1fa271a852629b392339705a3b6d5e143b7948c3]
# to [faa5253849ae86d140b67fb93609d191456b0ec3]
#
# patch "testsuite.at"
# from [de91ab8f49725d23766ca45e078e522f5ce6f3a4]
# to [450a36914862e3cdf4485494b25be20b5c6184f3]
#
--- .mt-attrs
+++ .mt-attrs
@@ -1,4 +1,4 @@
- file "contrib/Notify.pl"
+ file "contrib/monotone-notify.pl"
execute "true"
file "contrib/ciabot_monotone.py"
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,4 @@
+2005-04-16 Nathaniel Smith
2005-04-16 Emile Snyder
* tests/t_add_vs_commit.at: New test for failing case. If you
@@ -8,6 +9,24 @@
2005-04-16 Nathaniel Smith
+ * commands.cc (checkout): Move check for existence of revision
+ earlier.
+
+ * tests/t_netsync_defaults.at, tests/t_netsync_single.at:
+ Don't hard-code netsync port.
+
+2005-04-16 Nathaniel Smith
+
+ * testsuite.at: Use a random server port.
+
+ * .mt-attrs, contrib/README: Update for Notify.pl ->
+ monotone-notify.pl rename.
+
+ * monotone.1: Warn people off rcs_import.
+ * monotone.texi (Commands): Likewise.
+
+2005-04-16 Nathaniel Smith
+
* AUTHORS: Add Emile Snyder .
2005-04-16 Nathaniel Smith
--- commands.cc
+++ commands.cc
@@ -1793,6 +1793,9 @@
dir = idx(args, 1)();
complete(app, idx(args, 0)(), ident);
+ N(app.db.revision_exists(ident),
+ F("no revision %s found in database") % ident);
+
{
cert_value b;
guess_branch(ident, app, b);
@@ -1824,9 +1827,6 @@
manifest_id mid;
manifest_map m;
- N(app.db.revision_exists(ident),
- F("no revision %s found in database") % ident);
-
app.db.get_revision_manifest(ident, mid);
put_revision_id(ident);
--- contrib/README
+++ contrib/README
@@ -5,8 +5,8 @@
-- Log2Gxl.java: Java code to convert output from 'monotone log' into
GXL, an XML-based graph description language.
- -- Notify.pl: a Perl hack to create email logs with recent changes
- in a repository database. It's designed to be run at regular
+ -- monotone-notify.pl: a Perl hack to create email logs with recent
+ changes in a repository database. It's designed to be run at regular
intervals, for example from a cron script. It uses database
variables (those handled with 'monotone set/unset') in the domain
domain 'notify' to keep track of the last revisions that have
--- monotone.1
+++ monotone.1
@@ -114,7 +114,8 @@
.TP
\fBrcs_import\fP \fI ...\fP
Import all file versions in RCS files. Does not reconstruct revisions
-across the entire tree.
+across the entire tree. You do not want this command, it is for
+debugging; use cvs_import.
.TP
\fBcheckout\fP \fI[manifest-id]\fP \fI ...}
Import all file versions in RCS files. Does not reconstruct revisions
-across the entire tree.
+across the entire tree. You do not want this command, it is for
+debugging; use cvs_import.
@comment TROFF INPUT: .TP
@item @b{checkout} @i{[manifest-id]} @i{}
--- tests/t_netsync_defaults.at
+++ tests/t_netsync_defaults.at
@@ -35,7 +35,7 @@
AT_CHECK(test -f testdir2/testfile)
# And finally,
-AT_CHECK(MONOTONE2 set database default-server 127.0.0.1:5555, [], [ignore], [ignore])
+AT_CHECK(MONOTONE2 set database default-server 127.0.0.1:$_PORT, [], [ignore], [ignore])
AT_CHECK(MONOTONE2 set database default-collection thirdbranch, [], [ignore], [ignore])
AT_CHECK(MONOTONE2 sync, [], [ignore], [ignore])
AT_CHECK(MONOTONE2 checkout --branch=thirdbranch $THIRDBRANCH_R testdir3, [], [ignore], [ignore])
--- tests/t_netsync_single.at
+++ tests/t_netsync_single.at
@@ -24,9 +24,9 @@
VER0=`BASE_REVISION`
NETSYNC_KILLHARD
- MONOTONE --rcfile=netsync.lua serve 127.0.0.1:5555 testbranch &
+ MONOTONE --rcfile=netsync.lua serve 127.0.0.1:$_PORT testbranch &
sleep 5
-AT_CHECK(MONOTONE --rcfile=netsync.lua --db=test2.db pull 127.0.0.1:5555 testbranch, [], [ignore], [ignore])
+AT_CHECK(MONOTONE --rcfile=netsync.lua --db=test2.db pull 127.0.0.1:$_PORT testbranch, [], [ignore], [ignore])
NETSYNC_KILLHARD
AT_CHECK(MONOTONE --db=test2.db ls certs $VER0, [], [stdout])
--- testsuite.at
+++ testsuite.at
@@ -37,6 +37,10 @@
# Save the PWD so MONOTONE macro can refer back to it
_ROOT_DIR=`pwd -P`
+# Pick a random port, so running multiple testsuites concurrently on
+# the same machine has a hope of working.
+_PORT=`awk 'BEGIN {srand()} END {printf "%.0f\n", (rand() * 450 + 20050)}'< /dev/null`
+
AT_DATA(test_keys, [@<:@pubkey address@hidden@:>@
MIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQCfN/cAMabgb6T7m8ksGnpQ7LO6hOdnc/7V
yivrRGtmpwSItljht1bmgLQF37KiSPoMEDUb1stfKxaMsYiy8iTyoQ+M2EVFP37n2rtnNZ0H
@@ -336,13 +340,13 @@
# note that NETSYNC_SERVE_START is _not_ a special case of this macro.
m4_define([NETSYNC_SERVE_N_START], [
NETSYNC_KILLHARD
-MONOTONE --db=test$1.db --rcfile=netsync.lua serve localhost:5555 $2 &
+MONOTONE --db=test$1.db --rcfile=netsync.lua serve localhost:$_PORT $2 &
sleep 4
])
# run as NETSYNC_SERVE_START(collection name)
m4_define([NETSYNC_SERVE_START], [
NETSYNC_KILLHARD
-MONOTONE --rcfile=netsync.lua serve localhost:5555 $1 &
+MONOTONE --rcfile=netsync.lua serve localhost:$_PORT $1 &
sleep 4
])
# run as NETSYNC_SERVE_STOP
@@ -354,7 +358,7 @@
# run as NETSYNC_CLIENT_N_RUN(2|3, push|pull|sync, collection name[, expected result])
# first argument chooses whether to use the 2nd or 3rd database
m4_define([NETSYNC_CLIENT_N_RUN], [
-AT_CHECK(MONOTONE --db=test$1.db --rcfile=netsync.lua $2 localhost:5555 $3, [$4], [ignore], [ignore])
+AT_CHECK(MONOTONE --db=test$1.db --rcfile=netsync.lua $2 localhost:$_PORT $3, [$4], [ignore], [ignore])
])
# run as NETSYNC_CLIENT_RUN(push|pull|sync, collection name[, expected result])
m4_define([NETSYNC_CLIENT_RUN], [