#
# patch "ChangeLog"
# from [f8efaa043712e3731b8e54d68380b684eb1b7ccb]
# to [6bc2188e8f00c4c0041ba4c63ff39c3024905ec4]
#
# patch "Makefile.am"
# from [964cfb5a0488711ecd135b48fc8d28b560285d5a]
# to [1aaad508c1dd4ed673117e09716de8179b9db07d]
#
# patch "netsync.cc"
# from [45b48cc344050acadbbf0bcdfb9b62a3d262857d]
# to [3be43c22b543685088cbedf9d3c9947abc5bbd1e]
#
# patch "po/monotone.pot"
# from [05a052f738354bc65df04af3ac89d752eec2af28]
# to [7f7c5d05e99ff7bbed573bf3141722cf1c8a6f05]
#
===============================================
--- ChangeLog f8efaa043712e3731b8e54d68380b684eb1b7ccb
+++ ChangeLog 6bc2188e8f00c4c0041ba4c63ff39c3024905ec4
@@ -1,5 +1,18 @@
+2005-08-08 Nathaniel Smith
+
+ * Makefile.am (BOTAN_SOURCES): Add botan headers.
+ * po/monotone.pot: Regenerate.
+
2005-08-07 Nathaniel Smith
+ * netsync.cc (rebuild_merkle_trees, insert_with_parents): Make a
+ ticker for added revisions, since traversing the tree to pull in
+ ancestors causes a noticeable pause before the cert/key tickers
+ start up.
+ (insert_with_parents): Also simplify logic.
+
+2005-08-07 Nathaniel Smith
+
* commands.cc (pull): Clarify what the "doing anonymous pull"
message means and what you might do about it.
===============================================
--- Makefile.am 964cfb5a0488711ecd135b48fc8d28b560285d5a
+++ Makefile.am 1aaad508c1dd4ed673117e09716de8179b9db07d
@@ -65,48 +65,86 @@
netxx/streamserver.h netxx/timeout.h netxx/types.h
BOTAN_SOURCES = \
- botan/aes.cpp botan/aes_tab.cpp botan/algolist.cpp botan/allocate.cpp \
- botan/arc4.cpp botan/asn1_alg.cpp botan/asn1_alt.cpp botan/asn1_att.cpp \
- botan/asn1_dn.cpp botan/asn1_ext.cpp botan/asn1_ku.cpp \
- botan/asn1_oid.cpp botan/asn1_str.cpp botan/asn1_tm.cpp \
- botan/barrett.cpp botan/base.cpp botan/base64.cpp botan/basefilt.cpp \
- botan/ber_code.cpp botan/ber_dec.cpp botan/big_base.cpp \
- botan/big_code.cpp botan/big_io.cpp botan/big_ops2.cpp \
- botan/big_ops3.cpp botan/blinding.cpp botan/buf_es.cpp \
- botan/buf_filt.cpp botan/cbc.cpp botan/certstore.cpp botan/cfb.cpp \
- botan/charset.cpp botan/conf.cpp botan/crc32.cpp botan/crl_ent.cpp \
- botan/ctr.cpp botan/cts.cpp botan/data_snk.cpp botan/data_src.cpp \
- botan/def_eng.cpp botan/def_ops.cpp botan/defalloc.cpp \
- botan/der_code.cpp botan/der_enc.cpp \
- botan/divide.cpp botan/dl_algo.cpp botan/dl_get.cpp \
- botan/dl_group.cpp botan/dl_param.cpp botan/dlies.cpp \
- botan/eax.cpp botan/ecb.cpp botan/eme1.cpp \
- botan/eme_pkcs.cpp botan/emsa1.cpp botan/emsa2.cpp botan/emsa3.cpp \
- botan/emsa4.cpp botan/emsa_raw.cpp botan/eng_base.cpp botan/engine.cpp \
- botan/es_file.cpp botan/exceptn.cpp botan/filter.cpp botan/filters.cpp \
- botan/fips140.cpp botan/fips_rng.cpp botan/fused.cpp botan/get_algo.cpp \
- botan/get_enc.cpp botan/get_pbe.cpp botan/gzip.cpp botan/hash_id.cpp \
- botan/hex.cpp botan/hmac.cpp botan/if_algo.cpp botan/inifile.cpp \
- botan/init.cpp botan/kdf.cpp botan/keypair.cpp botan/look_pk.cpp \
- botan/lookup.cpp botan/make_prm.cpp botan/mdx_hash.cpp \
- botan/mem_pool.cpp botan/mgf1.cpp botan/mlock.cpp botan/mod_exp.cpp \
- botan/mode_pad.cpp botan/modebase.cpp botan/mp_comba.cpp \
- botan/mp_core.cpp botan/mp_fkmul.cpp botan/mp_misc.cpp botan/mp_mul.cpp \
- botan/mp_shift.cpp botan/mp_smul.cpp botan/mutex.cpp \
- botan/numthry.cpp botan/ofb.cpp botan/oids.cpp \
- botan/parse.cpp botan/pbes1.cpp botan/pbes2.cpp botan/pem.cpp \
- botan/pipe.cpp botan/pipe_io.cpp botan/pipe_rw.cpp botan/pk_algs.cpp \
- botan/pk_core.cpp botan/pk_filts.cpp botan/pk_keys.cpp \
- botan/pk_util.cpp botan/pkcs10.cpp botan/pkcs8.cpp botan/policy.cpp \
- botan/pow_mod.cpp botan/prf_ssl3.cpp botan/prf_tls.cpp \
- botan/prf_x942.cpp botan/primes.cpp botan/pubkey.cpp botan/randpool.cpp \
- botan/reducer.cpp botan/rng.cpp botan/rsa.cpp \
- botan/s2k.cpp botan/secqueue.cpp botan/sha160.cpp botan/symkey.cpp \
- botan/timers.cpp botan/ui.cpp botan/util.cpp botan/x509_ca.cpp \
- botan/x509_crl.cpp botan/x509_key.cpp botan/x509_obj.cpp \
- botan/x509cert.cpp botan/x509find.cpp botan/x509opt.cpp \
- botan/x509self.cpp botan/x509stor.cpp botan/x917_rng.cpp
+ botan/aes.cpp botan/aes_tab.cpp botan/algolist.cpp \
+ botan/allocate.cpp botan/arc4.cpp botan/asn1_alg.cpp \
+ botan/asn1_alt.cpp botan/asn1_att.cpp botan/asn1_dn.cpp \
+ botan/asn1_ext.cpp botan/asn1_ku.cpp botan/asn1_oid.cpp \
+ botan/asn1_str.cpp botan/asn1_tm.cpp botan/barrett.cpp \
+ botan/base.cpp botan/base64.cpp botan/basefilt.cpp \
+ botan/ber_code.cpp botan/ber_dec.cpp botan/big_base.cpp \
+ botan/big_code.cpp botan/big_io.cpp botan/big_ops2.cpp \
+ botan/big_ops3.cpp botan/blinding.cpp botan/buf_es.cpp \
+ botan/buf_filt.cpp botan/cbc.cpp botan/certstore.cpp \
+ botan/cfb.cpp botan/charset.cpp botan/conf.cpp botan/crc32.cpp \
+ botan/crl_ent.cpp botan/ctr.cpp botan/cts.cpp \
+ botan/data_snk.cpp botan/data_src.cpp botan/def_eng.cpp \
+ botan/def_ops.cpp botan/defalloc.cpp botan/der_code.cpp \
+ botan/der_enc.cpp botan/divide.cpp botan/dl_algo.cpp \
+ botan/dl_get.cpp botan/dl_group.cpp botan/dl_param.cpp \
+ botan/dlies.cpp botan/eax.cpp botan/ecb.cpp botan/eme1.cpp \
+ botan/eme_pkcs.cpp botan/emsa1.cpp botan/emsa2.cpp \
+ botan/emsa3.cpp botan/emsa4.cpp botan/emsa_raw.cpp \
+ botan/eng_base.cpp botan/engine.cpp botan/es_file.cpp \
+ botan/exceptn.cpp botan/filter.cpp botan/filters.cpp \
+ botan/fips140.cpp botan/fips_rng.cpp botan/fused.cpp \
+ botan/get_algo.cpp botan/get_enc.cpp botan/get_pbe.cpp \
+ botan/gzip.cpp botan/hash_id.cpp botan/hex.cpp botan/hmac.cpp \
+ botan/if_algo.cpp botan/inifile.cpp botan/init.cpp \
+ botan/kdf.cpp botan/keypair.cpp botan/look_pk.cpp \
+ botan/lookup.cpp botan/make_prm.cpp botan/mdx_hash.cpp \
+ botan/mem_pool.cpp botan/mgf1.cpp botan/mlock.cpp \
+ botan/mod_exp.cpp botan/mode_pad.cpp botan/modebase.cpp \
+ botan/mp_comba.cpp botan/mp_core.cpp botan/mp_fkmul.cpp \
+ botan/mp_misc.cpp botan/mp_mul.cpp botan/mp_shift.cpp \
+ botan/mp_smul.cpp botan/mutex.cpp botan/numthry.cpp \
+ botan/ofb.cpp botan/oids.cpp botan/parse.cpp botan/pbes1.cpp \
+ botan/pbes2.cpp botan/pem.cpp botan/pipe.cpp botan/pipe_io.cpp \
+ botan/pipe_rw.cpp botan/pk_algs.cpp botan/pk_core.cpp \
+ botan/pk_filts.cpp botan/pk_keys.cpp botan/pk_util.cpp \
+ botan/pkcs10.cpp botan/pkcs8.cpp botan/policy.cpp \
+ botan/pow_mod.cpp botan/prf_ssl3.cpp botan/prf_tls.cpp \
+ botan/prf_x942.cpp botan/primes.cpp botan/pubkey.cpp \
+ botan/randpool.cpp botan/reducer.cpp botan/rng.cpp \
+ botan/rsa.cpp botan/s2k.cpp botan/secqueue.cpp \
+ botan/sha160.cpp botan/symkey.cpp botan/timers.cpp \
+ botan/ui.cpp botan/util.cpp botan/x509_ca.cpp \
+ botan/x509_crl.cpp botan/x509_key.cpp botan/x509_obj.cpp \
+ botan/x509cert.cpp botan/x509find.cpp botan/x509opt.cpp \
+ botan/x509self.cpp botan/x509stor.cpp botan/x917_rng.cpp \
+ \
+ botan/aes.h botan/botan.h botan/def_eng.h botan/es_win32.h \
+ botan/lookup.h botan/omac.h botan/randpool.h botan/version.h \
+ botan/algolist.h botan/buf_es.h botan/der_enc.h \
+ botan/exceptn.h botan/mdx_hash.h botan/par_hash.h \
+ botan/reducer.h botan/x509_ca.h botan/allocate.h \
+ botan/buf_filt.h botan/dh.h botan/filter.h botan/mem_ops.h \
+ botan/pbe.h botan/rng.h botan/x509cert.h botan/arc4.h \
+ botan/cbc.h botan/dl_algo.h botan/filters.h botan/mem_pool.h \
+ botan/pbe_pkcs.h botan/rsa.h botan/x509_crl.h botan/asn1.h \
+ botan/certstor.h botan/dlies.h botan/fips140.h botan/mgf1.h \
+ botan/pem.h botan/s2k.h botan/x509_key.h botan/asn1_obj.h \
+ botan/cfb.h botan/dl_param.h botan/fips_rng.h botan/modebase.h \
+ botan/pipe.h botan/secalloc.h botan/x509_obj.h \
+ botan/asn1_oid.h botan/conf.h botan/eax.h botan/gzip.h \
+ botan/mode_pad.h botan/pk_algs.h botan/secmem.h \
+ botan/x509self.h botan/barrett.h botan/config.h botan/ecb.h \
+ botan/hex.h botan/mod_exp.h botan/pk_core.h botan/secqueue.h \
+ botan/x509stor.h botan/base64.h botan/crc32.h botan/eme.h \
+ botan/hmac.h botan/mp_core.h botan/pkcs10.h botan/sha160.h \
+ botan/x917_rng.h botan/base_eng.h botan/crl_ent.h botan/emsa.h \
+ botan/if_algo.h botan/mp_madd.h botan/pkcs8.h botan/socket.h \
+ botan/x919_mac.h botan/basefilt.h botan/ctr.h botan/engine.h \
+ botan/init.h botan/mp_types.h botan/pk_filts.h botan/symkey.h \
+ botan/base.h botan/cts.h botan/enums.h botan/kdf.h \
+ botan/mutex.h botan/pk_keys.h botan/timers.h botan/ber_dec.h \
+ botan/data_snk.h botan/es_capi.h botan/keypair.h \
+ botan/numthry.h botan/pk_ops.h botan/types.h botan/bigint.h \
+ botan/data_src.h botan/es_egd.h botan/look_add.h botan/ofb.h \
+ botan/pk_util.h botan/ui.h botan/blinding.h botan/defalloc.h \
+ botan/es_file.h botan/look_pk.h botan/oids.h botan/pubkey.h \
+ botan/util.h
+
BOOST_SANDBOX_SOURCES = \
boost/circular_buffer_adaptor.hpp \
boost/circular_buffer_base.hpp \
===============================================
--- netsync.cc 45b48cc344050acadbbf0bcdfb9b62a3d262857d
+++ netsync.cc 3be43c22b543685088cbedf9d3c9947abc5bbd1e
@@ -3591,29 +3591,24 @@
}
void
-insert_with_parents(revision_id rev, set & col, app_state & app)
+insert_with_parents(revision_id rev, set & col, app_state & app, ticker & revisions_ticker)
{
- if (col.find(rev) != col.end())
- return;
- col.insert(rev);
vector frontier;
frontier.push_back(rev);
while (!frontier.empty())
{
revision_id rid = frontier.back();
frontier.pop_back();
- if (!null_id(rid))
+ if (!null_id(rid) && col.find(rid) == col.end())
{
+ ++revisions_ticker;
col.insert(rid);
std::set parents;
app.db.get_revision_parents(rid, parents);
for (std::set::const_iterator i = parents.begin();
i != parents.end(); ++i)
{
- if (col.find(*i) == col.end())
- {
- frontier.push_back(*i);
- }
+ frontier.push_back(*i);
}
}
}
@@ -3623,7 +3618,7 @@
session::rebuild_merkle_trees(app_state & app,
set const & branchnames)
{
- P(F("calculating synchronization set...\n"));
+ P(F("finding items to be synchronized:\n"));
for (set::const_iterator i = branchnames.begin();
i != branchnames.end(); ++i)
L(F("including branch %s") % *i);
@@ -3632,6 +3627,7 @@
boost::shared_ptr ktab = make_root_node(*this, key_item);
boost::shared_ptr etab = make_root_node(*this, epoch_item);
+ ticker revisions_ticker("revisions", "r", 64);
ticker certs_ticker("certs", "c", 256);
ticker keys_ticker("keys", "k", 1);
@@ -3651,7 +3647,7 @@
if (branchnames.find(name()) != branchnames.end())
{
insert_with_parents(revision_id(idx(certs, i).inner().ident),
- revision_ids, app);
+ revision_ids, app, revisions_ticker);
}
else
{
===============================================
--- po/monotone.pot 05a052f738354bc65df04af3ac89d752eec2af28
+++ po/monotone.pot 7f7c5d05e99ff7bbed573bf3141722cf1c8a6f05
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2005-07-05 20:05-0700\n"
+"POT-Creation-Date: 2005-08-08 14:23-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -16,138 +16,139 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: app_state.cc:56
+#: app_state.cc:57
#, c-format
msgid "initializing from directory %s\n"
msgstr ""
-#: app_state.cc:57
+#: app_state.cc:58
#, c-format
msgid "found working copy directory %s\n"
msgstr ""
-#: app_state.cc:59
+#: app_state.cc:60
#, c-format
msgid "cannot change to directory to %s\n"
msgstr ""
-#: app_state.cc:67
+#: app_state.cc:68
#, c-format
msgid "branch name is '%s'\n"
msgstr ""
-#: app_state.cc:73
+#: app_state.cc:74
#, c-format
msgid "relative directory is '%s'\n"
msgstr ""
-#: app_state.cc:80
+#: app_state.cc:81
#, c-format
msgid "setting dump path to %s\n"
msgstr ""
-#: app_state.cc:90
-msgid "working copy directory required but not found"
+#: app_state.cc:92
+#, c-format
+msgid "working copy directory required but not found%s%s"
msgstr ""
-#: app_state.cc:97
+#: app_state.cc:100
msgid "invalid directory ''"
msgstr ""
-#: app_state.cc:101
+#: app_state.cc:104
#, c-format
msgid "cannot change to initial directory %s\n"
msgstr ""
-#: app_state.cc:105
+#: app_state.cc:108
#, c-format
msgid "create working copy in %s\n"
msgstr ""
-#: app_state.cc:116
+#: app_state.cc:119
#, c-format
msgid "could not create directory: %s: %s\n"
msgstr ""
-#: app_state.cc:121
+#: app_state.cc:124
#, c-format
msgid "cannot change to new directory %s\n"
msgstr ""
-#: app_state.cc:130
+#: app_state.cc:133
#, c-format
msgid "monotone book-keeping directory '%s' already exists in '%s'\n"
msgstr ""
-#: app_state.cc:133
+#: app_state.cc:136
#, c-format
msgid "creating book-keeping directory '%s' for working copy in '%s'\n"
msgstr ""
-#: app_state.cc:155
+#: app_state.cc:158
#, c-format
msgid "'%s' prefixed to '%s'\n"
msgstr ""
-#: app_state.cc:174
+#: app_state.cc:177
#, c-format
msgid "'%s' ignored by restricted path set\n"
msgstr ""
-#: app_state.cc:179
+#: app_state.cc:182
#, c-format
msgid "unknown path '%s'\n"
msgstr ""
-#: app_state.cc:181
+#: app_state.cc:184
#, c-format
msgid "'%s' added to restricted path set\n"
msgstr ""
-#: app_state.cc:222
+#: app_state.cc:225
#, c-format
msgid "checking restricted path set for '%s'\n"
msgstr ""
-#: app_state.cc:229
+#: app_state.cc:232
#, c-format
msgid "path '%s' found in restricted path set; '%s' included\n"
msgstr ""
-#: app_state.cc:235
+#: app_state.cc:238
#, c-format
msgid "path '%s' not found in restricted path set; '%s' excluded\n"
msgstr ""
-#: app_state.cc:287
+#: app_state.cc:297
#, c-format
msgid "search root '%s' does not exist\n"
msgstr ""
-#: app_state.cc:289
+#: app_state.cc:299
#, c-format
msgid "search root '%s' is not a directory\n"
msgstr ""
-#: app_state.cc:290
+#: app_state.cc:300
#, c-format
msgid "set search root to %s\n"
msgstr ""
-#: app_state.cc:321
+#: app_state.cc:331
msgid "negative depth not allowed\n"
msgstr ""
-#: app_state.cc:329
+#: app_state.cc:339
msgid "negative or zero last not allowed\n"
msgstr ""
-#: app_state.cc:419
+#: app_state.cc:448
#, c-format
msgid "Failed to read options file %s"
msgstr ""
-#: app_state.cc:436
+#: app_state.cc:465
#, c-format
msgid "Failed to write options file %s"
msgstr ""
@@ -211,7 +212,7 @@
msgid "cert: signable text %s\n"
msgstr ""
-#: cert.cc:364 keys.cc:511
+#: cert.cc:364 keys.cc:480
#, c-format
msgid "no private key '%s' found in database or get_priv_key hook"
msgstr ""
@@ -236,7 +237,7 @@
"multiple branch certs found for revision %s, please provide a branch name"
msgstr ""
-#: cert.cc:507 rcs_import.cc:1122 revision.cc:1577 revision.cc:1609
+#: cert.cc:507 rcs_import.cc:1234 revision.cc:1581 revision.cc:1613
msgid "no unique private key for cert construction"
msgstr ""
@@ -245,282 +246,292 @@
msgid "no default author name for branch '%s'"
msgstr ""
-#: change_set.cc:1495
+#: change_set.cc:290
+#, c-format
+msgid "tid %d: parent %d, type %s, name %s\n"
+msgstr ""
+
+#: change_set.cc:316
+#, c-format
+msgid "%d -> %d\n"
+msgstr ""
+
+#: change_set.cc:1540
msgid "concatenating change sets\n"
msgstr ""
-#: change_set.cc:1518
+#: change_set.cc:1563
#, c-format
msgid "concatenating %d and %d deltas\n"
msgstr ""
-#: change_set.cc:1528
+#: change_set.cc:1573
#, c-format
msgid "processing delta on %s\n"
msgstr ""
-#: change_set.cc:1532
+#: change_set.cc:1577
#, c-format
msgid "delta on %s in first changeset renamed to %s\n"
msgstr ""
-#: change_set.cc:1537
+#: change_set.cc:1582
#, c-format
msgid "discarding delta [%s]->[%s] for deleted file '%s'\n"
msgstr ""
-#: change_set.cc:1555
+#: change_set.cc:1600
#, c-format
msgid "fusing deltas on %s : %s -> %s and %s -> %s\n"
msgstr ""
-#: change_set.cc:1569
+#: change_set.cc:1614
#, c-format
msgid "delta on %s in second changeset copied forward\n"
msgstr ""
-#: change_set.cc:1583
+#: change_set.cc:1628
msgid "finished concatenation\n"
msgstr ""
-#: change_set.cc:1689 change_set.cc:1696
+#: change_set.cc:1734 change_set.cc:1741
#, c-format
msgid "delete of %s dominates rename to %s\n"
msgstr ""
-#: change_set.cc:1706
+#: change_set.cc:1751
#, c-format
msgid "unable to resolve file conflict '%s' -> '%s' vs. '%s'"
msgstr ""
-#: change_set.cc:1710
+#: change_set.cc:1755
#, c-format
msgid "unable to resolve dir conflict '%s' -> '%s' vs. '%s'"
msgstr ""
-#: change_set.cc:1715
+#: change_set.cc:1760
#, c-format
msgid "illegal conflict resolution '%s', wanted '%s' or '%s'\n"
msgstr ""
-#: change_set.cc:1771
+#: change_set.cc:1816
#, c-format
msgid "tid %d (%s) clobbered tid %d (%s)\n"
msgstr ""
-#: change_set.cc:1807
+#: change_set.cc:1852
#, c-format
msgid "skipping common change on %s (tid %d)\n"
msgstr ""
-#: change_set.cc:1812
+#: change_set.cc:1857
#, c-format
msgid "skipping neutral change of %s -> %s (tid %d)\n"
msgstr ""
-#: change_set.cc:1819
+#: change_set.cc:1864
#, c-format
msgid "propagating change on %s -> %s (tid %d)\n"
msgstr ""
-#: change_set.cc:1835
+#: change_set.cc:1880
msgid "conflict detected, resolved in A's favour\n"
msgstr ""
-#: change_set.cc:1841
+#: change_set.cc:1886
msgid "conflict detected, resolved in B's favour\n"
msgstr ""
-#: change_set.cc:2007
+#: change_set.cc:2053
#, c-format
msgid "reusing merge resolution '%s' : '%s' -> '%s'\n"
msgstr ""
-#: change_set.cc:2016
+#: change_set.cc:2062
#, c-format
msgid "merge of '%s' : '%s' vs. '%s' (no common ancestor) failed"
msgstr ""
-#: change_set.cc:2023
+#: change_set.cc:2069
#, c-format
msgid "merge of '%s' : '%s' -> '%s' vs '%s' failed"
msgstr ""
-#: change_set.cc:2027
+#: change_set.cc:2073
#, c-format
msgid "merge of '%s' : '%s' -> '%s' vs '%s' resolved to '%s'\n"
msgstr ""
-#: change_set.cc:2085
+#: change_set.cc:2131
#, c-format
msgid "skipping delta '%s'->'%s' on deleted file '%s'\n"
msgstr ""
-#: change_set.cc:2093
+#: change_set.cc:2139
#, c-format
msgid "merge is copying delta '%s' : '%s' -> '%s'\n"
msgstr ""
-#: change_set.cc:2117
+#: change_set.cc:2163
#, c-format
msgid "propagating new file addition delta on '%s' : '%s' -> '%s'\n"
msgstr ""
-#: change_set.cc:2129
+#: change_set.cc:2175
#, c-format
msgid "skipping new file addition delta on '%s' : '' -> '%s'\n"
msgstr ""
-#: change_set.cc:2137
+#: change_set.cc:2183
#, c-format
msgid "skipping common delta '%s' : '%s' -> '%s'\n"
msgstr ""
-#: change_set.cc:2143
+#: change_set.cc:2189
#, c-format
msgid "skipping neutral delta on '%s' : %s -> %s\n"
msgstr ""
-#: change_set.cc:2151
+#: change_set.cc:2197
#, c-format
msgid "propagating unperturbed delta on '%s' : '%s' -> '%s'\n"
msgstr ""
-#: change_set.cc:2161
+#: change_set.cc:2207
#, c-format
msgid "merging delta '%s' : '%s' -> '%s' vs. '%s'\n"
msgstr ""
-#: change_set.cc:2174
+#: change_set.cc:2220
#, c-format
msgid "resolved merge to '%s' : '%s' -> '%s'\n"
msgstr ""
-#: change_set.cc:2199
+#: change_set.cc:2249
msgid "merging change sets\n"
msgstr ""
-#: change_set.cc:2255
+#: change_set.cc:2311
msgid "finished merge\n"
msgstr ""
-#: change_set.cc:2271
+#: change_set.cc:2330
msgid "inverting change set\n"
msgstr ""
-#: change_set.cc:2301
+#: change_set.cc:2360
#, c-format
msgid "converted 'delete %s' to 'add as %s' in inverse\n"
msgstr ""
-#: change_set.cc:2310
+#: change_set.cc:2369
#, c-format
msgid "converted add %s to delete in inverse\n"
msgstr ""
-#: change_set.cc:2320
+#: change_set.cc:2379
#, c-format
msgid "converting delta %s -> %s on %s\n"
msgstr ""
-#: change_set.cc:2322
+#: change_set.cc:2381
#, c-format
msgid "inverse is delta %s -> %s on %s\n"
msgstr ""
-#: change_set.cc:2384
+#: change_set.cc:2443
#, c-format
msgid "moving %s -> %s\n"
msgstr ""
-#: change_set.cc:2433
+#: change_set.cc:2492
#, c-format
msgid "moving file %s -> %s\n"
msgstr ""
-#: change_set.cc:2441
+#: change_set.cc:2500
#, c-format
msgid "moving dir %s -> %s\n"
msgstr ""
-#: change_set.cc:2911
+#: change_set.cc:2978
#, c-format
msgid "[begin changeset %s]\n"
msgstr ""
-#: change_set.cc:2916
+#: change_set.cc:2983
#, c-format
msgid "%s"
msgstr ""
-#: change_set.cc:2917
+#: change_set.cc:2984
#, c-format
msgid "[end changeset %s]\n"
msgstr ""
-#: change_set.cc:2949
+#: change_set.cc:3016
msgid "beginning disjoint_merge_test\n"
msgstr ""
-#: change_set.cc:2967
+#: change_set.cc:3034
msgid "finished disjoint_merge_test\n"
msgstr ""
-#: change_set.cc:3039 change_set.cc:3124 change_set.cc:3169
+#: change_set.cc:3106 change_set.cc:3191 change_set.cc:3236
#, c-format
msgid "informative failure: %s\n"
msgstr ""
-#: change_set.cc:3043 change_set.cc:3128 change_set.cc:3173
+#: change_set.cc:3110 change_set.cc:3195 change_set.cc:3240
#, c-format
msgid "runtime error: %s\n"
msgstr ""
-#: change_set.cc:3050
+#: change_set.cc:3117
msgid "STARTING invert_change_test\n"
msgstr ""
-#: change_set.cc:3084
+#: change_set.cc:3151
msgid "ENDING invert_change_test\n"
msgstr ""
-#: change_set.cc:3193
+#: change_set.cc:3260
#, c-format
msgid "%s:%d"
msgstr ""
-#: change_set.cc:3195
+#: change_set.cc:3262
#, c-format
msgid "BEGINNING concatenation test %s\n"
msgstr ""
-#: change_set.cc:3200
+#: change_set.cc:3267
#, c-format
msgid "FINISHING concatenation test %s\n"
msgstr ""
-#: change_set.cc:3255
+#: change_set.cc:3322
#, c-format
msgid "RUNNING bad_concatenate_change_test %s\n"
msgstr ""
-#: change_set.cc:3263
+#: change_set.cc:3330
msgid "skipping change_set printing, one or both are not sane\n"
msgstr ""
-#: change_set.cc:3268
+#: change_set.cc:3335
msgid "concat change_set is insane\n"
msgstr ""
-#: change_set.cc:3271
+#: change_set.cc:3338
msgid "Checking combined change set\n"
msgstr ""
-#: change_set.cc:3278
+#: change_set.cc:3345
msgid "combined_concat is insane\n"
msgstr ""
-#: change_set.cc:3284
+#: change_set.cc:3351
#, c-format
msgid "RUNNING bad_concatenate_change_test %s again backwards\n"
msgstr ""
@@ -566,7 +577,7 @@
"note: perhaps consider 'monotone merge'"
msgstr ""
-#: commands.cc:428
+#: commands.cc:428 commands.cc:3617
#, c-format
msgid "no such revision '%s'"
msgstr ""
@@ -624,7 +635,7 @@
msgid "no keys found matching '%s'\n"
msgstr ""
-#: commands.cc:660 commands.cc:1436 commands.cc:1490 commands.cc:2917
+#: commands.cc:660 commands.cc:1438 commands.cc:1492 commands.cc:2976
#, c-format
msgid "no revision %s found in database"
msgstr ""
@@ -717,530 +728,543 @@
msgid "empty comment"
msgstr ""
-#: commands.cc:1168
+#: commands.cc:1170
#, c-format
msgid "cannot find file %s revision %s"
msgstr ""
-#: commands.cc:1209 commands.cc:2359
+#: commands.cc:1211 commands.cc:2378
msgid "empty log message"
msgstr ""
-#: commands.cc:1244
+#: commands.cc:1246
msgid "ancestor file id does not exist"
msgstr ""
-#: commands.cc:1247
+#: commands.cc:1249
msgid "left file id does not exist"
msgstr ""
-#: commands.cc:1250
+#: commands.cc:1252
msgid "right file id does not exist"
msgstr ""
-#: commands.cc:1261
+#: commands.cc:1263
msgid "merge failed"
msgstr ""
-#: commands.cc:1368
+#: commands.cc:1370
#, c-format
msgid "no file version %s found in database"
msgstr ""
-#: commands.cc:1380
+#: commands.cc:1382
#, c-format
msgid "no file '%s' found in revision '%s'\n"
msgstr ""
-#: commands.cc:1385
+#: commands.cc:1387
#, c-format
msgid "dumping file %s\n"
msgstr ""
-#: commands.cc:1409
+#: commands.cc:1411
#, c-format
msgid "no manifest version %s found in database"
msgstr ""
-#: commands.cc:1413
+#: commands.cc:1415
#, c-format
msgid "dumping manifest %s\n"
msgstr ""
-#: commands.cc:1440
+#: commands.cc:1442
#, c-format
msgid "dumping revision %s\n"
msgstr ""
-#: commands.cc:1466 commands.cc:1478
+#: commands.cc:1468 commands.cc:1480
msgid "need --branch argument for branch-based checkout"
msgstr ""
-#: commands.cc:1481
+#: commands.cc:1483
#, c-format
msgid "branch %s is empty"
msgstr ""
-#: commands.cc:1482
+#: commands.cc:1484
#, c-format
msgid "branch %s has multiple heads"
msgstr ""
-#: commands.cc:1503
+#: commands.cc:1505
#, c-format
msgid "found %d %s branch certs on revision %s\n"
msgstr ""
-#: commands.cc:1508
+#: commands.cc:1510
#, c-format
msgid "revision %s is not a member of branch %s\n"
msgstr ""
-#: commands.cc:1524
+#: commands.cc:1526
#, c-format
msgid "no manifest %s found in database"
msgstr ""
-#: commands.cc:1526
+#: commands.cc:1528
#, c-format
msgid "checking out revision %s to directory %s\n"
msgstr ""
-#: commands.cc:1532
+#: commands.cc:1534
#, c-format
msgid "no file %s found in database for %s"
msgstr ""
-#: commands.cc:1536 commands.cc:3440
+#: commands.cc:1538 commands.cc:3505
#, c-format
msgid "writing file %s to %s\n"
msgstr ""
-#: commands.cc:1557 commands.cc:3146
+#: commands.cc:1559 commands.cc:3210
msgid "please specify a branch, with --branch=BRANCH"
msgstr ""
-#: commands.cc:1562 commands.cc:3150 commands.cc:3220 commands.cc:3223
+#: commands.cc:1564 commands.cc:3214 commands.cc:3284 commands.cc:3287
#, c-format
msgid "branch '%s' is empty\n"
msgstr ""
-#: commands.cc:1564
+#: commands.cc:1566
#, c-format
msgid "branch '%s' is currently merged:\n"
msgstr ""
-#: commands.cc:1566
+#: commands.cc:1568
#, c-format
msgid "branch '%s' is currently unmerged:\n"
msgstr ""
-#: commands.cc:1614
+#: commands.cc:1607
#, c-format
msgid "no epoch for branch %s\n"
msgstr ""
-#: commands.cc:1811 commands.cc:1813 commands.cc:1876
+#: commands.cc:1807 commands.cc:1809 commands.cc:1872
#, c-format
msgid "no such manifest %s"
msgstr ""
-#: commands.cc:1836 commands.cc:1838 commands.cc:1895
+#: commands.cc:1832 commands.cc:1834 commands.cc:1891
#, c-format
msgid "no such file %s"
msgstr ""
-#: commands.cc:1858
+#: commands.cc:1854
#, c-format
msgid "no such revision %s"
msgstr ""
-#: commands.cc:1927
+#: commands.cc:1923
#, c-format
msgid "public key '%s' does not exist in database"
msgstr ""
-#: commands.cc:1943
+#: commands.cc:1939
#, c-format
-msgid "private key '%s' does not exist in database"
+msgid "public and private key '%s' do not exist in database"
msgstr ""
-#: commands.cc:1957
+#: commands.cc:1956
msgid "no packets found on stdin"
msgstr ""
-#: commands.cc:1959
+#: commands.cc:1958
msgid "read 1 packet\n"
msgstr ""
-#: commands.cc:1961
+#: commands.cc:1960
#, c-format
msgid "read %d packets\n"
msgstr ""
-#: commands.cc:1998
+#: commands.cc:1999
#, c-format
msgid "setting default server to %s\n"
msgstr ""
-#: commands.cc:2004
+#: commands.cc:2005
msgid "no hostname given"
msgstr ""
-#: commands.cc:2006
+#: commands.cc:2007
msgid "no server given and no default server set"
msgstr ""
-#: commands.cc:2010
+#: commands.cc:2011
#, c-format
msgid "using default server address: %s\n"
msgstr ""
-#: commands.cc:2018
+#: commands.cc:2023
#, c-format
-msgid "setting default branch pattern to %s\n"
+msgid "setting default branch include pattern to '%s'\n"
msgstr ""
-#: commands.cc:2024
+#: commands.cc:2029
+#, c-format
+msgid "setting default branch exclude pattern to '%s'\n"
+msgstr ""
+
+#: commands.cc:2035
msgid "no branch pattern given"
msgstr ""
-#: commands.cc:2026
+#: commands.cc:2037
msgid "no branch pattern given and no default pattern set"
msgstr ""
-#: commands.cc:2030
+#: commands.cc:2041
#, c-format
-msgid "using default branch pattern: %s\n"
+msgid "using default branch include pattern: '%s'\n"
msgstr ""
-#: commands.cc:2044 commands.cc:2071 commands.cc:2087
+#: commands.cc:2049
+#, c-format
+msgid "excluding: %s\n"
+msgstr ""
+
+#: commands.cc:2061 commands.cc:2090 commands.cc:2107
msgid "could not guess default signing key"
msgstr ""
-#: commands.cc:2058
-msgid "doing anonymous pull\n"
+#: commands.cc:2076
+msgid "doing anonymous pull; use -kKEYNAME if you need authentication\n"
msgstr ""
-#: commands.cc:2091
+#: commands.cc:2111
msgid ""
"need permission to store persistent passphrase (see hook persist_phrase_ok())"
msgstr ""
-#: commands.cc:2187
+#: commands.cc:2210
#, c-format
msgid "file '%s' not found"
msgstr ""
-#: commands.cc:2255 work.cc:115
+#: commands.cc:2278 work.cc:114
#, c-format
msgid "registering %s file in working copy\n"
msgstr ""
-#: commands.cc:2284
+#: commands.cc:2307
#, c-format
msgid "failed to parse date string '%s': %s"
msgstr ""
-#: commands.cc:2288
+#: commands.cc:2311
#, c-format
msgid "failed to parse date string '%s'"
msgstr ""
-#: commands.cc:2312
+#: commands.cc:2335
msgid "no changes to commit\n"
msgstr ""
-#: commands.cc:2323
+#: commands.cc:2346
#, c-format
msgid "beginning commit on branch '%s'\n"
msgstr ""
-#: commands.cc:2324
+#: commands.cc:2347
#, c-format
msgid "new manifest %s\n"
msgstr ""
-#: commands.cc:2325
+#: commands.cc:2348
#, c-format
msgid "new revision %s\n"
msgstr ""
-#: commands.cc:2329
+#: commands.cc:2352
msgid "--message and --message-file are mutually exclusive"
msgstr ""
-#: commands.cc:2332
+#: commands.cc:2355
msgid ""
"MT/log is non-empty and --message supplied\n"
"perhaps move or delete MT/log,\n"
"or remove --message from the command line?"
msgstr ""
-#: commands.cc:2337
+#: commands.cc:2360
msgid ""
"MT/log is non-empty and --message-file supplied\n"
"perhaps move or delete MT/log,\n"
"or remove --message-file from the command line?"
msgstr ""
-#: commands.cc:2367
+#: commands.cc:2390
#, c-format
msgid "revision %s already in database\n"
msgstr ""
-#: commands.cc:2372
+#: commands.cc:2395
#, c-format
msgid "inserting new revision %s\n"
msgstr ""
-#: commands.cc:2381
+#: commands.cc:2404
#, c-format
msgid "skipping manifest %s, already in database\n"
msgstr ""
-#: commands.cc:2385
+#: commands.cc:2408
#, c-format
msgid "inserting manifest delta %s -> %s\n"
msgstr ""
-#: commands.cc:2396
+#: commands.cc:2419
#, c-format
msgid "inserting full manifest %s\n"
msgstr ""
-#: commands.cc:2409
+#: commands.cc:2432
#, c-format
msgid "skipping file delta %s, already in database\n"
msgstr ""
-#: commands.cc:2415
+#: commands.cc:2438
#, c-format
msgid "inserting delta %s -> %s\n"
msgstr ""
-#: commands.cc:2425 commands.cc:2442
+#: commands.cc:2448 commands.cc:2465
#, c-format
msgid "file '%s' modified during commit, aborting"
msgstr ""
-#: commands.cc:2435
+#: commands.cc:2458
#, c-format
msgid "inserting full version %s\n"
msgstr ""
-#: commands.cc:2469
+#: commands.cc:2492
#, c-format
msgid "committed revision %s\n"
msgstr ""
-#: commands.cc:2475
+#: commands.cc:2498
msgid ""
"note: this revision creates divergence\n"
"note: you may (or may not) wish to run 'monotone merge'"
msgstr ""
-#: commands.cc:2538
+#: commands.cc:2607
#, c-format
-msgid "--- %s\n"
+msgid "--- %s\t%s\n"
msgstr ""
-#: commands.cc:2539
+#: commands.cc:2608
#, c-format
-msgid "+++ %s\n"
+msgid "+++ %s\t%s\n"
msgstr ""
-#: commands.cc:2540
+#: commands.cc:2609
#, c-format
msgid "@@ -0,0 +1,%d @@\n"
msgstr ""
-#: commands.cc:2619 commands.cc:2635 commands.cc:2639
+#: commands.cc:2695 commands.cc:2711 commands.cc:2715
#, c-format
msgid "revision %s does not exist"
msgstr ""
-#: commands.cc:2623
+#: commands.cc:2699
msgid "current revision has no ancestor"
msgstr ""
-#: commands.cc:2666
+#: commands.cc:2742
#, c-format
msgid "no common ancestor for %s and %s"
msgstr ""
-#: commands.cc:2672
+#: commands.cc:2748
msgid "concatenating un-committed changeset to composite\n"
msgstr ""
-#: commands.cc:2698
+#: commands.cc:2774
msgid "# no changes"
msgstr ""
-#: commands.cc:2843
+#: commands.cc:2902
#, c-format
msgid "updating %s to %s\n"
msgstr ""
-#: commands.cc:2894
+#: commands.cc:2951
msgid "this working directory is a new project; cannot update"
msgstr ""
-#: commands.cc:2901
-msgid "no candidates remain after selection"
+#: commands.cc:2958
+msgid ""
+"your request matches no descendents of the current revision\n"
+"in fact, it doesn't even match the current revision\n"
+"maybe you want --revision="
msgstr ""
-#: commands.cc:2904
+#: commands.cc:2963
msgid "multiple update candidates:\n"
msgstr ""
-#: commands.cc:2907
+#: commands.cc:2966
#, c-format
msgid " %s\n"
msgstr ""
-#: commands.cc:2908
+#: commands.cc:2967
msgid "choose one with 'monotone update '\n"
msgstr ""
-#: commands.cc:2909
+#: commands.cc:2968
msgid "multiple candidates remain after selection"
msgstr ""
-#: commands.cc:2924
+#: commands.cc:2983
#, c-format
msgid "already up to date at %s\n"
msgstr ""
-#: commands.cc:2928
+#: commands.cc:2987
#, c-format
msgid "selected update target %s\n"
msgstr ""
-#: commands.cc:2940
+#: commands.cc:2999
#, c-format
msgid ""
"revision %s is not a member of branch %s\n"
"try again with explicit --branch\n"
msgstr ""
-#: commands.cc:2955
+#: commands.cc:3014
#, c-format
msgid "updating along chosen edge %s -> %s\n"
msgstr ""
-#: commands.cc:2966
+#: commands.cc:3025
#, c-format
msgid "merging working copy with chosen edge %s -> %s\n"
msgstr ""
-#: commands.cc:3010
+#: commands.cc:3074
#, c-format
msgid "updated to base revision %s\n"
msgstr ""
-#: commands.cc:3076
+#: commands.cc:3140
#, c-format
msgid "common ancestor %s found\n"
msgstr ""
-#: commands.cc:3077
+#: commands.cc:3141
msgid "trying 3-way merge\n"
msgstr ""
-#: commands.cc:3087
+#: commands.cc:3151
msgid "no common ancestor found, synthesizing edges\n"
msgstr ""
-#: commands.cc:3151
+#: commands.cc:3215
#, c-format
msgid "branch '%s' is merged\n"
msgstr ""
-#: commands.cc:3157
+#: commands.cc:3221
#, c-format
msgid "starting with revision 1 / %d\n"
msgstr ""
-#: commands.cc:3161
+#: commands.cc:3225
#, c-format
msgid "merging with revision %d / %d\n"
msgstr ""
-#: commands.cc:3162 commands.cc:3163 commands.cc:3230 commands.cc:3313
-#: commands.cc:3314
+#: commands.cc:3226 commands.cc:3227 commands.cc:3294 commands.cc:3378
+#: commands.cc:3379
#, c-format
msgid "[source] %s\n"
msgstr ""
-#: commands.cc:3175
+#: commands.cc:3239
#, c-format
msgid ""
"merge of %s\n"
" and %s\n"
msgstr ""
-#: commands.cc:3180 commands.cc:3333
+#: commands.cc:3244 commands.cc:3331 commands.cc:3398
#, c-format
msgid "[merged] %s\n"
msgstr ""
-#: commands.cc:3183
+#: commands.cc:3247
msgid "note: your working copies have not been updated\n"
msgstr ""
-#: commands.cc:3221 commands.cc:3224
+#: commands.cc:3285 commands.cc:3288
#, c-format
msgid "branch '%s' is not merged\n"
msgstr ""
-#: commands.cc:3229
+#: commands.cc:3293
#, c-format
msgid "propagating %s -> %s\n"
msgstr ""
-#: commands.cc:3231
+#: commands.cc:3295
#, c-format
msgid "[target] %s\n"
msgstr ""
-#: commands.cc:3236
+#: commands.cc:3300
#, c-format
msgid "branch '%s' is up-to-date with respect to branch '%s'\n"
msgstr ""
-#: commands.cc:3238
+#: commands.cc:3302
msgid "no action taken\n"
msgstr ""
-#: commands.cc:3242
+#: commands.cc:3306
#, c-format
msgid "no merge necessary; putting %s in branch '%s'\n"
msgstr ""
-#: commands.cc:3259
+#: commands.cc:3323
#, c-format
msgid ""
"propagate from branch '%s' (head %s)\n"
" to branch '%s' (head %s)\n"
msgstr ""
-#: commands.cc:3295 commands.cc:3297
+#: commands.cc:3360 commands.cc:3362
#, c-format
msgid "%s is not an ancestor of %s"
msgstr ""
-#: commands.cc:3306
+#: commands.cc:3371
#, c-format
msgid "%s and %s are the same revision, aborting"
msgstr ""
-#: commands.cc:3308 commands.cc:3310
+#: commands.cc:3373 commands.cc:3375
#, c-format
msgid "%s is already an ancestor of %s"
msgstr ""
-#: commands.cc:3324
+#: commands.cc:3389
#, c-format
msgid ""
"explicit_merge of %s\n"
@@ -1249,247 +1273,291 @@
" to branch '%s'\n"
msgstr ""
-#: commands.cc:3346
+#: commands.cc:3411
msgid "non-hex digits in partial id"
msgstr ""
-#: commands.cc:3432
+#: commands.cc:3497
#, c-format
msgid "reverting %s from %s to %s\n"
msgstr ""
-#: commands.cc:3436
+#: commands.cc:3501
#, c-format
msgid "no file version %s found in database for %s"
msgstr ""
-#: commands.cc:3551
+#: commands.cc:3616
#, c-format
+msgid "no revision for file '%s' in database"
+msgstr ""
+
+#: commands.cc:3619
+#, c-format
msgid "annotate file file_path '%s'\n"
msgstr ""
-#: commands.cc:3560
+#: commands.cc:3628
#, c-format
msgid "No such file '%s' in revision %s\n"
msgstr ""
-#: commands.cc:3562
+#: commands.cc:3630
#, c-format
msgid "annotate for file_id %s\n"
msgstr ""
-#: commands.cc:3628
+#: commands.cc:3696
#, c-format
msgid "revision %s does not exist in db, skipping\n"
msgstr ""
-#: commands.cc:3661
+#: commands.cc:3729
#, c-format
msgid "revision '%s' in '%s' maps to '%s' in %s\n"
msgstr ""
-#: commands.cc:3809
+#: commands.cc:3877
#, c-format
msgid "no var with name %s in domain %s"
msgstr ""
-#: database.cc:132
+#: database.cc:82
#, c-format
msgid ""
"database schemas do not match: wanted %s, got %s. try migrating database"
msgstr ""
-#: database.cc:183
+#: database.cc:139
#, c-format
msgid "database %s is a directory\n"
msgstr ""
-#: database.cc:190
+#: database.cc:146
#, c-format
msgid "unable to probe database version in file %s"
msgstr ""
-#: database.cc:197
+#: database.cc:153
#, c-format
msgid "database %s is not an sqlite version 3 file, try dump and reload"
msgstr ""
-#: database.cc:209
+#: database.cc:169
+#, c-format
+msgid "sqlite error [%d]: %s"
+msgstr ""
+
+#: database.cc:177
msgid "no database specified"
msgstr ""
-#: database.cc:214
+#: database.cc:182
#, c-format
msgid "database %s does not exist"
msgstr ""
-#: database.cc:216
+#: database.cc:184
#, c-format
msgid "database %s is a directory"
msgstr ""
-#: database.cc:242
+#: database.cc:213
#, c-format
msgid "could not initialize database: %s: already exists"
msgstr ""
-#: database.cc:247
+#: database.cc:218
#, c-format
msgid ""
"existing (possibly stale) journal file '%s' has same stem as new database '%"
"s'"
msgstr ""
-#: database.cc:272
+#: database.cc:243
#, c-format
msgid "INSERT INTO %s VALUES("
msgstr ""
-#: database.cc:341 database.cc:443 database.cc:460
+#: database.cc:334 database.cc:435 database.cc:452
msgid "need database name"
msgstr ""
-#: database.cc:343
+#: database.cc:336
#, c-format
msgid "cannot create %s; it already exists\n"
msgstr ""
-#: database.cc:671
+#: database.cc:530
+msgid "statement cache statistics\n"
+msgstr ""
+
+#: database.cc:531
#, c-format
-msgid "db.execute(\"%s\")\n"
+msgid "prepared %d statements\n"
msgstr ""
-#: database.cc:709
+#: database.cc:536
#, c-format
-msgid "db.fetch(\"%s\")\n"
+msgid "%d executions of %s\n"
msgstr ""
-#: database.cc:736
+#: database.cc:593
#, c-format
-msgid "%s wanted %d columns, got %s"
+msgid "prepared statement %s\n"
msgstr ""
-#: database.cc:741
+#: database.cc:597
#, c-format
-msgid "%s wanted %d rows, got %s"
+msgid "multiple statements in query: %s\n"
msgstr ""
-#: database.cc:965
+#: database.cc:603
#, c-format
+msgid "wanted %d columns got %d in query: %s\n"
+msgstr ""
+
+#: database.cc:609
+#, c-format
+msgid "binding %d parameters for %s\n"
+msgstr ""
+
+#: database.cc:623
+#, c-format
+msgid "binding %d with value '%s'\n"
+msgstr ""
+
+#: database.cc:639
+#, c-format
+msgid "null result in query: %s\n"
+msgstr ""
+
+#: database.cc:657
+#, c-format
+msgid "wanted %d rows got %s in query: %s\n"
+msgstr ""
+
+#: database.cc:853
+#, c-format
msgid "%08.8x%08.8x%08.8x%08.8x%08.8x"
msgstr ""
-#: database.cc:977
+#: database.cc:865
#, c-format
msgid "version cache expiring %s\n"
msgstr ""
-#: database.cc:999
+#: database.cc:887
#, c-format
msgid "version cache hit on %s\n"
msgstr ""
-#: database.cc:1044
+#: database.cc:932
#, c-format
msgid "reconstructing %s in %s\n"
msgstr ""
-#: database.cc:1094
+#: database.cc:986
#, c-format
msgid "inserting edge: %s <- %s\n"
msgstr ""
-#: database.cc:1098
+#: database.cc:990
#, c-format
msgid "skipping merge edge %s <- %s\n"
msgstr ""
-#: database.cc:1144
+#: database.cc:1036
#, c-format
msgid "following delta %s -> %s\n"
msgstr ""
-#: database.cc:1509
+#: database.cc:1400
#, c-format
msgid "Killing revision %s locally\n"
msgstr ""
-#: database.cc:1522
+#: database.cc:1412
#, c-format
msgid "Deleting all references to branch %s\n"
msgstr ""
-#: database.cc:1673 database.cc:1685
+#: database.cc:1425
#, c-format
+msgid "Deleting all references to tag %s\n"
+msgstr ""
+
+#: database.cc:1575 database.cc:1587
+#, c-format
msgid "another key with name '%s' already exists"
msgstr ""
-#: database.cc:2249
+#: database.cc:2166
#, c-format
msgid "WHERE id GLOB '%s*'"
msgstr ""
-#: database.cc:2267
+#: database.cc:2184
#, c-format
msgid "WHERE name='%s' AND unbase64(value) glob '%s'"
msgstr ""
-#: database.cc:2273
+#: database.cc:2190
#, c-format
msgid "WHERE name='%s'"
msgstr ""
-#: database.cc:2282
+#: database.cc:2199
#, c-format
msgid " WHERE (name='%s' OR name='%s' OR name='%s')"
msgstr ""
-#: database.cc:2286
+#: database.cc:2203
#, c-format
msgid " AND unbase64(value) glob '*%s*'"
msgstr ""
-#: database.cc:2293
+#: database.cc:2212
#, c-format
msgid "SELECT id FROM revision_certs WHERE name='%s' AND "
msgstr ""
-#: database.cc:2297
+#: database.cc:2216
#, c-format
msgid "unbase64(value) <= X'%s'"
msgstr ""
-#: database.cc:2300
+#: database.cc:2219
#, c-format
msgid "unbase64(value) > X'%s'"
msgstr ""
-#: database.cc:2303
+#: database.cc:2222
#, c-format
-msgid "unbase64(value) glob '*%s*'"
+msgid "unbase64(value) glob '%s%s%s'"
msgstr ""
-#: database.cc:2318
+#: database.cc:2238
#, c-format
msgid "SELECT id FROM %s"
msgstr ""
-#: database.cc:2326
+#: database.cc:2248
#, c-format
msgid " (name='%s' OR name='%s' OR name='%s')"
msgstr ""
-#: database.cc:2336
+#: database.cc:2258
#, c-format
msgid " (name='%s')"
msgstr ""
-#: database.cc:2339
+#: database.cc:2261
#, c-format
-msgid " AND (unbase64(value) GLOB '*%s*')"
+msgid " AND (unbase64(value) GLOB '%s%s%s')"
msgstr ""
-#: database.cc:2340
+#: database.cc:2263
#, c-format
msgid " AND (id IN %s)"
msgstr ""
@@ -1630,142 +1698,147 @@
msgid "file %s in working copy has id %s, wanted %s"
msgstr ""
-#: file_io.cc:37
+#: file_io.cc:38
#, c-format
msgid "initial path is %s\n"
msgstr ""
-#: file_io.cc:50
+#: file_io.cc:51
#, c-format
msgid "searching for '%s' directory with root '%s'\n"
msgstr ""
-#: file_io.cc:64
+#: file_io.cc:65
#, c-format
msgid "'%s' not found in '%s' with '%s' removed\n"
msgstr ""
-#: file_io.cc:71
+#: file_io.cc:72
#, c-format
msgid "search for '%s' ended at '%s' with '%s' removed\n"
msgstr ""
-#: file_io.cc:76
+#: file_io.cc:77
#, c-format
msgid "'%s' does not exist\n"
msgstr ""
-#: file_io.cc:82
+#: file_io.cc:83
#, c-format
msgid "'%s' is not a directory\n"
msgstr ""
-#: file_io.cc:89
+#: file_io.cc:90
#, c-format
msgid "problems with '%s' (missing '.' or '..')\n"
msgstr ""
-#: file_io.cc:115
+#: file_io.cc:116
msgid "Searching for home directory\n"
msgstr ""
-#: file_io.cc:121
+#: file_io.cc:122
msgid "Home directory from MONOTONE_HOME\n"
msgstr ""
-#: file_io.cc:131
+#: file_io.cc:132
msgid "Home directory from HOME\n"
msgstr ""
-#: file_io.cc:138
+#: file_io.cc:139
msgid "Home directory from USERPROFILE\n"
msgstr ""
-#: file_io.cc:147
+#: file_io.cc:148
msgid "Home directory from HOMEDRIVE+HOMEPATH\n"
msgstr ""
-#: file_io.cc:151
+#: file_io.cc:152
msgid ""
"could not find home directory (tried MONOTONE_HOME, HOME (if cygwin/mingw), "
"USERPROFILE, HOMEDRIVE/HOMEPATH"
msgstr ""
-#: file_io.cc:159
+#: file_io.cc:160
#, c-format
msgid "could not find home directory for uid %d"
msgstr ""
-#: file_io.cc:204
+#: file_io.cc:205
#, c-format
msgid "could not find home directory for user %s"
msgstr ""
-#: file_io.cc:273 file_io.cc:281
+#: file_io.cc:268
#, c-format
+msgid "expected file '%s', but it is a directory."
+msgstr ""
+
+#: file_io.cc:295 file_io.cc:303
+#, c-format
msgid "file to delete '%s' does not exist"
msgstr ""
-#: file_io.cc:289 file_io.cc:297
+#: file_io.cc:311 file_io.cc:319
#, c-format
msgid "directory to delete '%s' does not exist"
msgstr ""
-#: file_io.cc:306 file_io.cc:318
+#: file_io.cc:328 file_io.cc:340
#, c-format
msgid "rename source file '%s' does not exist"
msgstr ""
-#: file_io.cc:308 file_io.cc:320
+#: file_io.cc:330 file_io.cc:342
#, c-format
msgid "rename target file '%s' already exists"
msgstr ""
-#: file_io.cc:330 file_io.cc:342
+#: file_io.cc:352 file_io.cc:364
#, c-format
msgid "rename source dir '%s' does not exist"
msgstr ""
-#: file_io.cc:332 file_io.cc:344
+#: file_io.cc:354 file_io.cc:366
#, c-format
msgid "rename target dir '%s' already exists"
msgstr ""
-#: file_io.cc:395
+#: file_io.cc:419
msgid "Cannot read standard input multiple times"
msgstr ""
-#: file_io.cc:484
+#: file_io.cc:510
#, c-format
msgid "file '%s' does not exist"
msgstr ""
-#: file_io.cc:524
+#: file_io.cc:551
#, c-format
msgid "removing %s failed"
msgstr ""
-#: file_io.cc:615
+#: file_io.cc:642
#, c-format
msgid "ignoring book keeping entry %s\n"
msgstr ""
-#: file_io.cc:634
+#: file_io.cc:661
#, c-format
msgid "caught runtime error %s constructing file path for %s\n"
msgstr ""
-#: file_io.cc:666
+#: file_io.cc:693
#, c-format
msgid "no such file or directory: %s"
msgstr ""
-#: keys.cc:44
+#: keys.cc:42
#, c-format
msgid "running arc4 process on %d bytes of data\n"
msgstr ""
-#: keys.cc:81
+#: keys.cc:80
msgid "got empty passphrase from get_passphrase() hook"
msgstr ""
@@ -1773,83 +1846,67 @@
msgid "empty passphrase not allowed"
msgstr ""
-#: keys.cc:105
+#: keys.cc:108
msgid "empty passphrases not allowed, try again\n"
msgstr ""
-#: keys.cc:106 keys.cc:113
+#: keys.cc:109 keys.cc:116
msgid "too many failed passphrases\n"
msgstr ""
-#: keys.cc:112
+#: keys.cc:115
msgid "passphrases do not match, try again\n"
msgstr ""
-#: keys.cc:157
-#, c-format
-msgid "wrote %d bytes of DER-encoded data\n"
+#: keys.cc:122
+msgid "no passphrase given"
msgstr ""
-#: keys.cc:220
+#: keys.cc:184
#, c-format
msgid "generated %d-byte public key\n"
msgstr ""
-#: keys.cc:221
+#: keys.cc:185
#, c-format
msgid "generated %d-byte (encrypted) private key\n"
msgstr ""
-#: keys.cc:241 keys.cc:302
+#: keys.cc:205 keys.cc:261
#, c-format
msgid "building signer from %d-byte decrypted private key\n"
msgstr ""
-#: keys.cc:293
+#: keys.cc:254
#, c-format
msgid "base64-decoding %d-byte private key\n"
msgstr ""
-#: keys.cc:328
+#: keys.cc:298
#, c-format
msgid "produced %d-byte signature\n"
msgstr ""
-#: keys.cc:356
+#: keys.cc:326
#, c-format
msgid "building verifier for %d-byte pub key\n"
msgstr ""
-#: keys.cc:371
+#: keys.cc:348
#, c-format
msgid "checking %d-byte (%d decoded) signature\n"
msgstr ""
-#: keys.cc:513
+#: keys.cc:482
#, c-format
msgid "no public key '%s' found in database"
msgstr ""
-#: keys.cc:524
+#: keys.cc:493
#, c-format
msgid "passphrase for '%s' is incorrect"
msgstr ""
-#: keys.cc:572
-#, c-format
-msgid "%d bytes blank input -> tests as %f randomness\n"
-msgstr ""
-
-#: keys.cc:582
-#, c-format
-msgid "%d bytes urandom-seeded input -> tests as %f randomness\n"
-msgstr ""
-
-#: keys.cc:593
-#, c-format
-msgid "%d bytes random-seeded input -> tests as %f randomness\n"
-msgstr ""
-
#: lua.cc:79
#, c-format
msgid "%s\n"
@@ -1963,19 +2020,23 @@
msgid "skipping nonexistent rcfile '%s'\n"
msgstr ""
-#: manifest.cc:56
+#: manifest.cc:55
#, c-format
msgid "scanning file %s\n"
msgstr ""
-#: manifest.cc:190
+#: manifest.cc:188
#, c-format
msgid "missing %s"
msgstr ""
-#: manifest.cc:203
+#: manifest.cc:201
#, c-format
-msgid "%d missing files\n"
+msgid ""
+"%d missing files\n"
+"to restore consistency, on each missing file run either\n"
+"'monotone drop FILE' to remove it permanently, or\n"
+"'monotone revert FILE' to restore it\n"
msgstr ""
#: merkle_tree.cc:281
@@ -1988,42 +2049,42 @@
msgid "mismatched node hash value %s, expected %s"
msgstr ""
-#: monotone.cc:186
+#: monotone.cc:196
#, c-format
msgid "problem parsing arguments from file %s: %s"
msgstr ""
-#: monotone.cc:195
+#: monotone.cc:205
#, c-format
msgid "weird error when stuffing arguments read from %s: %s\n"
msgstr ""
-#: monotone.cc:246
+#: monotone.cc:256
#, c-format
msgid "command line: %s\n"
msgstr ""
-#: monotone.cc:249
+#: monotone.cc:259
#, c-format
msgid "set locale: LC_CTYPE=%s, LC_MESSAGES=%s\n"
msgstr ""
-#: monotone.cc:410
+#: monotone.cc:447
#, c-format
msgid "syntax error near the \"%s\" option: %s"
msgstr ""
-#: monotone.cc:449
+#: monotone.cc:486
#, c-format
msgid "monotone %s doesn't use the option %s"
msgstr ""
-#: monotone.cc:471
+#: monotone.cc:508
#, c-format
msgid "Removed 'hidden' from option # %d\n"
msgstr ""
-#: monotone.cc:477 monotone.cc:488
+#: monotone.cc:514 monotone.cc:525
#, c-format
msgid "Added 'hidden' to option # %d\n"
msgstr ""
@@ -2050,132 +2111,134 @@
#: netcmd.cc:153
#, c-format
-msgid "bad HMAC %s vs. %s"
+msgid ""
+"bad HMAC checksum (got %s, wanted %s)\n"
+"this suggests data was corrupted in transit\n"
msgstr ""
-#: netcmd.cc:228 netcmd.cc:274
+#: netcmd.cc:230 netcmd.cc:276
#, c-format
msgid "unknown role specifier %d"
msgstr ""
-#: netcmd.cc:633
+#: netcmd.cc:632
msgid "checking i/o round trip on error_cmd\n"
msgstr ""
-#: netcmd.cc:641
+#: netcmd.cc:640
#, c-format
msgid "errmsg_cmd test done, buffer was %d bytes\n"
msgstr ""
-#: netcmd.cc:646
+#: netcmd.cc:645
msgid "checking i/o round trip on bye_cmd\n"
msgstr ""
-#: netcmd.cc:650
+#: netcmd.cc:649
#, c-format
msgid "bye_cmd test done, buffer was %d bytes\n"
msgstr ""
-#: netcmd.cc:655
+#: netcmd.cc:654
msgid "checking i/o round trip on hello_cmd\n"
msgstr ""
-#: netcmd.cc:667
+#: netcmd.cc:666
#, c-format
msgid "hello_cmd test done, buffer was %d bytes\n"
msgstr ""
-#: netcmd.cc:672
+#: netcmd.cc:671
msgid "checking i/o round trip on anonymous_cmd\n"
msgstr ""
-#: netcmd.cc:689
+#: netcmd.cc:688
#, c-format
msgid "anonymous_cmd test done, buffer was %d bytes\n"
msgstr ""
-#: netcmd.cc:694
+#: netcmd.cc:693
msgid "checking i/o round trip on auth_cmd\n"
msgstr ""
-#: netcmd.cc:719
+#: netcmd.cc:718
#, c-format
msgid "auth_cmd test done, buffer was %d bytes\n"
msgstr ""
-#: netcmd.cc:724
+#: netcmd.cc:723
msgid "checking i/o round trip on confirm_cmd\n"
msgstr ""
-#: netcmd.cc:730
+#: netcmd.cc:729
#, c-format
msgid "confirm_cmd test done, buffer was %d bytes\n"
msgstr ""
-#: netcmd.cc:735
+#: netcmd.cc:734
msgid "checking i/o round trip on refine_cmd\n"
msgstr ""
-#: netcmd.cc:753
+#: netcmd.cc:752
#, c-format
msgid "refine_cmd test done, buffer was %d bytes\n"
msgstr ""
-#: netcmd.cc:758
+#: netcmd.cc:757
msgid "checking i/o round trip on done_cmd\n"
msgstr ""
-#: netcmd.cc:769
+#: netcmd.cc:768
#, c-format
msgid "done_cmd test done, buffer was %d bytes\n"
msgstr ""
-#: netcmd.cc:774
+#: netcmd.cc:773
msgid "checking i/o round trip on send_data_cmd\n"
msgstr ""
-#: netcmd.cc:785
+#: netcmd.cc:784
#, c-format
msgid "send_data_cmd test done, buffer was %d bytes\n"
msgstr ""
-#: netcmd.cc:790
+#: netcmd.cc:789
msgid "checking i/o round trip on send_delta_cmd\n"
msgstr ""
-#: netcmd.cc:803
+#: netcmd.cc:802
#, c-format
msgid "send_delta_cmd test done, buffer was %d bytes\n"
msgstr ""
-#: netcmd.cc:808
+#: netcmd.cc:807
msgid "checking i/o round trip on data_cmd\n"
msgstr ""
-#: netcmd.cc:819
+#: netcmd.cc:818
#, c-format
msgid "data_cmd test done, buffer was %d bytes\n"
msgstr ""
-#: netcmd.cc:824
+#: netcmd.cc:823
msgid "checking i/o round trip on delta_cmd\n"
msgstr ""
-#: netcmd.cc:839
+#: netcmd.cc:838
#, c-format
msgid "delta_cmd test done, buffer was %d bytes\n"
msgstr ""
-#: netcmd.cc:844
+#: netcmd.cc:843
msgid "checking i/o round trip on nonexistant_cmd\n"
msgstr ""
-#: netcmd.cc:855
+#: netcmd.cc:854
#, c-format
msgid "nonexistant_cmd test done, buffer was %d bytes\n"
msgstr ""
-#: netcmd.cc:861
+#: netcmd.cc:860
#, c-format
msgid "bad decode exception: '%s'\n"
msgstr ""
@@ -2205,943 +2268,946 @@
msgid "expected %s to end at %d, have %d bytes"
msgstr ""
-#: netsync.cc:223
+#: netsync.cc:211
#, c-format
msgid "check of '%s' failed"
msgstr ""
-#: netsync.cc:710
+#: netsync.cc:703
msgid "all epochs processed, opening database valve\n"
msgstr ""
-#: netsync.cc:787
+#: netsync.cc:791
msgid "dropping outgoing netcmd (because we're in error unwind mode)\n"
msgstr ""
-#: netsync.cc:811
+#: netsync.cc:815
#, c-format
msgid "error: %s\n"
msgstr ""
-#: netsync.cc:819
+#: netsync.cc:823
#, c-format
msgid "analyzing %d entries in manifest\n"
msgstr ""
-#: netsync.cc:863
+#: netsync.cc:867
#, c-format
msgid "revision %s is attached via database\n"
msgstr ""
-#: netsync.cc:868
+#: netsync.cc:872
#, c-format
msgid "checking attachment of %s in ancestry\n"
msgstr ""
-#: netsync.cc:875
+#: netsync.cc:879
#, c-format
msgid "checking attachment of %s in parent %s\n"
msgstr ""
-#: netsync.cc:879
+#: netsync.cc:883
#, c-format
msgid "revision %s is attached via parent %s\n"
msgstr ""
-#: netsync.cc:885
+#: netsync.cc:889
#, c-format
msgid "decided that revision %s %s attached\n"
msgstr ""
-#: netsync.cc:952
+#: netsync.cc:956
#, c-format
msgid "not requesting (in reverse) initial manifest %s as we already have it\n"
msgstr ""
-#: netsync.cc:955
+#: netsync.cc:959
#, c-format
msgid "requesting (in reverse) initial manifest data %s\n"
msgstr ""
-#: netsync.cc:965
+#: netsync.cc:969
#, c-format
msgid ""
"not requesting (in reverse) manifest delta to %s as we already have it\n"
msgstr ""
-#: netsync.cc:968
+#: netsync.cc:972
#, c-format
msgid "requesting (in reverse) manifest delta %s -> %s\n"
msgstr ""
-#: netsync.cc:995
+#: netsync.cc:999
#, c-format
msgid "not requesting (in reverse) initial file %s as we already have it\n"
msgstr ""
-#: netsync.cc:998
+#: netsync.cc:1002
#, c-format
msgid "requesting (in reverse) initial file data %s\n"
msgstr ""
-#: netsync.cc:1008
+#: netsync.cc:1012
#, c-format
msgid "not requesting (in reverse) file delta to %s as we already have it\n"
msgstr ""
-#: netsync.cc:1011
+#: netsync.cc:1015
#, c-format
msgid "requesting (in reverse) file delta %s -> %s on %s\n"
msgstr ""
-#: netsync.cc:1043
+#: netsync.cc:1047
#, c-format
msgid "visiting revision '%s' for forward deltas\n"
msgstr ""
-#: netsync.cc:1071
+#: netsync.cc:1075
#, c-format
msgid "not requesting forward manifest delta to '%s' as we already have it\n"
msgstr ""
-#: netsync.cc:1077
+#: netsync.cc:1081
#, c-format
msgid "requesting full manifest data %s\n"
msgstr ""
-#: netsync.cc:1082
+#: netsync.cc:1086
#, c-format
msgid "requesting forward manifest delta %s -> %s\n"
msgstr ""
-#: netsync.cc:1096
+#: netsync.cc:1100
#, c-format
msgid ""
"not requesting forward delta %s -> %s on file %s as we already have it\n"
msgstr ""
-#: netsync.cc:1102
+#: netsync.cc:1106
#, c-format
msgid "requesting full file data %s\n"
msgstr ""
-#: netsync.cc:1108
+#: netsync.cc:1112
#, c-format
msgid "requesting forward delta %s -> %s on file %s\n"
msgstr ""
-#: netsync.cc:1138
+#: netsync.cc:1142
#, c-format
msgid "analyzing %d ancestry edges\n"
msgstr ""
-#: netsync.cc:1194
+#: netsync.cc:1198
#, c-format
msgid "Dropping branch certs for unwanted branch %s"
msgstr ""
-#: netsync.cc:1249
+#: netsync.cc:1253
#, c-format
msgid "isolated %d heads\n"
msgstr ""
-#: netsync.cc:1276
+#: netsync.cc:1280
#, c-format
msgid "requesting attached ancestry of revision '%s'\n"
msgstr ""
-#: netsync.cc:1281
+#: netsync.cc:1285
#, c-format
msgid "requesting detached ancestry of revision '%s'\n"
msgstr ""
-#: netsync.cc:1315
+#: netsync.cc:1319
#, c-format
msgid "read %d bytes from fd %d (peer %s)\n"
msgstr ""
-#: netsync.cc:1318
+#: netsync.cc:1322
msgid "in error unwind mode, so throwing them into the bit bucket\n"
msgstr ""
-#: netsync.cc:1350
+#: netsync.cc:1354
#, c-format
msgid "wrote %d bytes to fd %d (peer %s)\n"
msgstr ""
-#: netsync.cc:1358
+#: netsync.cc:1362
msgid "finished flushing output queue in error unwind mode, disconnecting\n"
msgstr ""
-#: netsync.cc:1372
+#: netsync.cc:1376
msgid "queueing 'bye' command\n"
msgstr ""
-#: netsync.cc:1382
+#: netsync.cc:1386
msgid "queueing 'error' command\n"
msgstr ""
-#: netsync.cc:1395
+#: netsync.cc:1399
#, c-format
msgid "queueing 'done' command for %s level %s\n"
msgstr ""
-#: netsync.cc:1471
+#: netsync.cc:1475
#, c-format
msgid "queueing request for refinement of %s node '%s', level %d\n"
msgstr ""
-#: netsync.cc:1489
+#: netsync.cc:1493
#, c-format
msgid "not queueing request for %s '%s' as we are in pure source role\n"
msgstr ""
-#: netsync.cc:1496
+#: netsync.cc:1500
#, c-format
msgid "not queueing request for %s '%s' as we already requested it\n"
msgstr ""
-#: netsync.cc:1501
+#: netsync.cc:1505
#, c-format
msgid "queueing request for data of %s item '%s'\n"
msgstr ""
-#: netsync.cc:1525
+#: netsync.cc:1529
#, c-format
msgid ""
"not queueing request for %s delta '%s' -> '%s' as we are in pure source "
"role\n"
msgstr ""
-#: netsync.cc:1532
+#: netsync.cc:1536
#, c-format
msgid ""
"not queueing request for %s delta '%s' -> '%s' as we already requested the "
"target\n"
msgstr ""
-#: netsync.cc:1537
+#: netsync.cc:1541
#, c-format
msgid "queueing request for contents of %s delta '%s' -> '%s'\n"
msgstr ""
-#: netsync.cc:1557
+#: netsync.cc:1561
#, c-format
msgid "not queueing %s data for '%s' as we are in pure sink role\n"
msgstr ""
-#: netsync.cc:1562
+#: netsync.cc:1566
#, c-format
msgid "queueing %d bytes of data for %s item '%s'\n"
msgstr ""
-#: netsync.cc:1587
+#: netsync.cc:1591
#, c-format
msgid "not queueing %s delta '%s' -> '%s' as we are in pure sink role\n"
msgstr ""
-#: netsync.cc:1592
+#: netsync.cc:1596
#, c-format
msgid "queueing %s delta '%s' -> '%s'\n"
msgstr ""
-#: netsync.cc:1610
+#: netsync.cc:1614
#, c-format
msgid ""
"not queueing note of nonexistence of %s item '%s' as we are in pure sink "
"role\n"
msgstr ""
-#: netsync.cc:1615
+#: netsync.cc:1619
#, c-format
msgid "queueing note of nonexistance of %s item '%s'\n"
msgstr ""
-#: netsync.cc:1627
+#: netsync.cc:1631
msgid "received 'bye' netcmd\n"
msgstr ""
-#: netsync.cc:1635
+#: netsync.cc:1639
#, c-format
msgid "received network error: %s\n"
msgstr ""
-#: netsync.cc:1652
+#: netsync.cc:1656
#, c-format
msgid "received 'done' for empty %s level %d, marking as complete\n"
msgstr ""
-#: netsync.cc:1674
+#: netsync.cc:1678
#, c-format
msgid ""
"received 'done' for %s level %d, which had refinements; sending echo of done "
"for level %d\n"
msgstr ""
-#: netsync.cc:1700
-msgid "No branches found."
-msgstr ""
-
-#: netsync.cc:1717
+#: netsync.cc:1711
#, c-format
msgid "server key has name %s, hash %s\n"
msgstr ""
-#: netsync.cc:1725 netsync.cc:1727
+#: netsync.cc:1719 netsync.cc:1721
msgid "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
msgstr ""
-#: netsync.cc:1726
+#: netsync.cc:1720
msgid "@ WARNING: SERVER IDENTIFICATION HAS CHANGED @\n"
msgstr ""
-#: netsync.cc:1728
+#: netsync.cc:1722
msgid "IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY\n"
msgstr ""
-#: netsync.cc:1729
+#: netsync.cc:1723
msgid "it is also possible that the server key has just been changed\n"
msgstr ""
-#: netsync.cc:1730
+#: netsync.cc:1724
#, c-format
msgid "remote host sent key %s\n"
msgstr ""
-#: netsync.cc:1731
+#: netsync.cc:1725
#, c-format
msgid "I expected %s\n"
msgstr ""
-#: netsync.cc:1732
+#: netsync.cc:1726
#, c-format
msgid "'monotone unset %s %s' overrides this check\n"
msgstr ""
-#: netsync.cc:1734
+#: netsync.cc:1728
msgid "server key changed"
msgstr ""
-#: netsync.cc:1739
+#: netsync.cc:1733
#, c-format
msgid "first time connecting to server %s\n"
msgstr ""
-#: netsync.cc:1740
+#: netsync.cc:1734
msgid "I'll assume it's really them, but you might want to double-check\n"
msgstr ""
-#: netsync.cc:1741
+#: netsync.cc:1735
#, c-format
msgid "their key's fingerprint: %s\n"
msgstr ""
-#: netsync.cc:1746
+#: netsync.cc:1740
#, c-format
msgid "saving public key for %s to database\n"
msgstr ""
-#: netsync.cc:1753
+#: netsync.cc:1747
#, c-format
msgid "received 'hello' netcmd from server '%s' with nonce '%s'\n"
msgstr ""
-#: netsync.cc:1832
+#: netsync.cc:1828
msgid "rejected attempt at anonymous connection for write\n"
msgstr ""
-#: netsync.cc:1839
+#: netsync.cc:1835
msgid "rejected attempt at anonymous connection while running as sink\n"
msgstr ""
-#: netsync.cc:1857
+#: netsync.cc:1852
#, c-format
-msgid "denied anonymous read permission for '%s' excluding '%s'\n"
+msgid "anonymous access to branch '%s' denied by server"
msgstr ""
-#: netsync.cc:1863
+#: netsync.cc:1857
#, c-format
msgid "allowed anonymous read permission for '%s' excluding '%s'\n"
msgstr ""
-#: netsync.cc:1895
+#: netsync.cc:1889
msgid "detected replay attack in auth netcmd\n"
msgstr ""
-#: netsync.cc:1916
+#: netsync.cc:1910
#, c-format
msgid "remote public key hash '%s' is unknown\n"
msgstr ""
-#: netsync.cc:1932
+#: netsync.cc:1926
#, c-format
msgid ""
"denied '%s' read permission for '%s' excluding '%s' while running as pure "
"sink\n"
msgstr ""
-#: netsync.cc:1949
+#: netsync.cc:1942
#, c-format
-msgid "denied '%s' read permission for '%s' excluding '%s'\n"
+msgid ""
+"denied '%s' read permission for '%s' excluding '%s' because of branch '%s'\n"
msgstr ""
-#: netsync.cc:1955
+#: netsync.cc:1944
#, c-format
+msgid "access to branch '%s' denied by server"
+msgstr ""
+
+#: netsync.cc:1952
+#, c-format
msgid "allowed '%s' read permission for '%s' excluding '%s'\n"
msgstr ""
-#: netsync.cc:1965 netsync.cc:1973
+#: netsync.cc:1961
#, c-format
msgid ""
"denied '%s' write permission for '%s' excluding '%s' while running as pure "
"source\n"
msgstr ""
-#: netsync.cc:1979
+#: netsync.cc:1969
#, c-format
+msgid "denied '%s' write permission for '%s' excluding '%s'\n"
+msgstr ""
+
+#: netsync.cc:1975
+#, c-format
msgid "allowed '%s' write permission for '%s' excluding '%s'\n"
msgstr ""
-#: netsync.cc:1994
+#: netsync.cc:1990
msgid "client signature OK, accepting authentication\n"
msgstr ""
-#: netsync.cc:2016
+#: netsync.cc:2012
msgid "bad client signature\n"
msgstr ""
-#: netsync.cc:2024
-msgid "Writing HMAC confirm command"
-msgstr ""
-
-#: netsync.cc:2043
+#: netsync.cc:2027
#, c-format
msgid ""
"received 'confirm' netcmd from server '%s' for pattern '%s' exclude '%s' in %"
"s mode\n"
msgstr ""
-#: netsync.cc:2059
+#: netsync.cc:2043
msgid "server signature OK, accepting authentication\n"
msgstr ""
-#: netsync.cc:2064
+#: netsync.cc:2048
msgid "bad server signature\n"
msgstr ""
-#: netsync.cc:2069
+#: netsync.cc:2053
msgid "unknown server key\n"
msgstr ""
-#: netsync.cc:2138
+#: netsync.cc:2122
#, c-format
msgid "epoch with hash '%s' does not exist in our database"
msgstr ""
-#: netsync.cc:2148
+#: netsync.cc:2132
#, c-format
msgid "public key '%s' is also called '%s'\n"
msgstr ""
-#: netsync.cc:2153
+#: netsync.cc:2137
#, c-format
msgid "public key '%s' does not exist in our database"
msgstr ""
-#: netsync.cc:2167
+#: netsync.cc:2151
#, c-format
msgid "revision '%s' does not exist in our database"
msgstr ""
-#: netsync.cc:2181
+#: netsync.cc:2165
#, c-format
msgid "manifest '%s' does not exist in our database"
msgstr ""
-#: netsync.cc:2195
+#: netsync.cc:2179
#, c-format
msgid "file '%s' does not exist in our database"
msgstr ""
-#: netsync.cc:2209
+#: netsync.cc:2193
#, c-format
msgid "cert '%s' does not exist in our database"
msgstr ""
-#: netsync.cc:2228
+#: netsync.cc:2212
#, c-format
msgid "received 'refine' netcmd on %s node '%s', level %d\n"
msgstr ""
-#: netsync.cc:2233
+#: netsync.cc:2217
#, c-format
msgid "no corresponding %s merkle node for prefix '%s', level %d\n"
msgstr ""
-#: netsync.cc:2243
+#: netsync.cc:2227
#, c-format
msgid ""
"(#0) they have an empty slot %d (in a %s node '%s', level %d, we do not "
"have)\n"
msgstr ""
-#: netsync.cc:2255
+#: netsync.cc:2239
#, c-format
msgid ""
"(#0) they have a live leaf at slot %d (in a %s node '%s', level %d, we do "
"not have)\n"
msgstr ""
-#: netsync.cc:2257
+#: netsync.cc:2241
#, c-format
msgid "(#0) requesting their %s leaf %s\n"
msgstr ""
-#: netsync.cc:2264
+#: netsync.cc:2248
#, c-format
msgid ""
"(#0) they have a dead leaf at slot %d (in a %s node '%s', level %d, we do "
"not have)\n"
msgstr ""
-#: netsync.cc:2272
+#: netsync.cc:2256
#, c-format
msgid ""
"(#0) they have a subtree at slot %d (in a %s node '%s', level %d, we do not "
"have)\n"
msgstr ""
-#: netsync.cc:2288
+#: netsync.cc:2272
#, c-format
msgid "found corresponding %s merkle node for prefix '%s', level %d\n"
msgstr ""
-#: netsync.cc:2302
+#: netsync.cc:2286
#, c-format
msgid ""
"(#1) they have an empty slot %d in %s node '%s', level %d, and so do we\n"
msgstr ""
-#: netsync.cc:2309
+#: netsync.cc:2293
#, c-format
msgid ""
"(#2) they have an empty slot %d in %s node '%s', level %d, we have a live "
"leaf\n"
msgstr ""
-#: netsync.cc:2323
+#: netsync.cc:2307
#, c-format
msgid ""
"(#3) they have an empty slot %d in %s node '%s', level %d, we have a dead "
"leaf\n"
msgstr ""
-#: netsync.cc:2330
+#: netsync.cc:2314
#, c-format
msgid ""
"(#4) they have an empty slot %d in %s node '%s', level %d, we have a "
"subtree\n"
msgstr ""
-#: netsync.cc:2354
+#: netsync.cc:2341
#, c-format
msgid ""
"(#5) they have a live leaf at slot %d in %s node '%s', level %d, we have "
"nothing\n"
msgstr ""
-#: netsync.cc:2365
+#: netsync.cc:2352
#, c-format
msgid "(#6) they have a live leaf at slot %d in %s node '%s', and so do we\n"
msgstr ""
-#: netsync.cc:2375
+#: netsync.cc:2362
#, c-format
msgid "(#6) we both have live %s leaf '%s'\n"
msgstr ""
-#: netsync.cc:2391
+#: netsync.cc:2378
#, c-format
msgid ""
"(#7) they have a live leaf at slot %d in %s node %s, level %d, we have a "
"dead one\n"
msgstr ""
-#: netsync.cc:2401
+#: netsync.cc:2388
#, c-format
msgid "(#7) it's the same %s leaf '%s', but ours is dead\n"
msgstr ""
-#: netsync.cc:2414
+#: netsync.cc:2401
#, c-format
msgid ""
"(#8) they have a live leaf in slot %d of %s node '%s', level %d, we have a "
"subtree\n"
msgstr ""
-#: netsync.cc:2423
+#: netsync.cc:2410
#, c-format
msgid ""
"(#8) we have a copy of their live leaf '%s' in slot %d of %s node '%s', "
"level %d\n"
msgstr ""
-#: netsync.cc:2427
+#: netsync.cc:2414
#, c-format
msgid ""
"(#8) requesting a copy of their live leaf '%s' in slot %d of %s node '%s', "
"level %d\n"
msgstr ""
-#: netsync.cc:2432
+#: netsync.cc:2419
#, c-format
msgid ""
"(#8) sending our subtree for refinement, in slot %d of %s node '%s', level %"
"d\n"
msgstr ""
-#: netsync.cc:2451
+#: netsync.cc:2442
#, c-format
msgid ""
"(#9) they have a dead leaf at slot %d in %s node '%s', level %d, we have "
"nothing\n"
msgstr ""
-#: netsync.cc:2458
+#: netsync.cc:2449
#, c-format
msgid ""
"(#10) they have a dead leaf at slot %d in %s node '%s', level %d, we have a "
"live one\n"
msgstr ""
-#: netsync.cc:2468
+#: netsync.cc:2459
#, c-format
msgid "(#10) we both have %s leaf %s, theirs is dead\n"
msgstr ""
-#: netsync.cc:2484
+#: netsync.cc:2475
#, c-format
msgid ""
"(#11) they have a dead leaf at slot %d in %s node '%s', level %d, so do we\n"
msgstr ""
-#: netsync.cc:2491
+#: netsync.cc:2482
#, c-format
msgid ""
"(#12) they have a dead leaf in slot %d of %s node '%s', we have a subtree\n"
msgstr ""
-#: netsync.cc:2511
+#: netsync.cc:2505
#, c-format
msgid ""
"(#13) they have a subtree at slot %d in %s node '%s', level %d, we have "
"nothing\n"
msgstr ""
-#: netsync.cc:2524
+#: netsync.cc:2518
#, c-format
msgid ""
"(#14) they have a subtree at slot %d in %s node '%s', level %d, we have a "
"live leaf\n"
msgstr ""
-#: netsync.cc:2536
+#: netsync.cc:2530
#, c-format
msgid "(#14) pushed our leaf '%s' into fake subtree slot %d, level %d\n"
msgstr ""
-#: netsync.cc:2548
+#: netsync.cc:2542
#, c-format
msgid ""
"(#15) they have a subtree at slot %d in %s node '%s', level %d, we have a "
"dead leaf\n"
msgstr ""
-#: netsync.cc:2567
+#: netsync.cc:2561
#, c-format
msgid ""
"(#16) they have a subtree at slot %d in %s node '%s', level %d, and so do "
"we\n"
msgstr ""
-#: netsync.cc:2577
+#: netsync.cc:2571
#, c-format
msgid "(#16) we both have %s subtree '%s'\n"
msgstr ""
-#: netsync.cc:2582
+#: netsync.cc:2576
#, c-format
msgid "(#16) %s subtrees at slot %d differ, refining ours\n"
msgstr ""
-#: netsync.cc:2609
+#: netsync.cc:2603
#, c-format
msgid "received 'send_data' netcmd requesting %s '%s'\n"
msgstr ""
-#: netsync.cc:2637
+#: netsync.cc:2631
#, c-format
msgid "received 'send_delta' netcmd requesting %s edge '%s' -> '%s'\n"
msgstr ""
-#: netsync.cc:2691
+#: netsync.cc:2685
#, c-format
msgid "delta requested for item type %s\n"
msgstr ""
-#: netsync.cc:2714
+#: netsync.cc:2708
#, c-format
msgid "epoch '%s' already exists in our database\n"
msgstr ""
-#: netsync.cc:2721
+#: netsync.cc:2715
#, c-format
msgid "received epoch %s for branch %s\n"
msgstr ""
-#: netsync.cc:2728
+#: netsync.cc:2722
#, c-format
msgid "branch %s has no epoch; setting epoch to %s\n"
msgstr ""
-#: netsync.cc:2734
+#: netsync.cc:2728
#, c-format
msgid "branch %s already has an epoch; checking\n"
msgstr ""
-#: netsync.cc:2745
+#: netsync.cc:2739
#, c-format
msgid "Mismatched epoch on branch %s. Server has '%s', client has '%s'."
msgstr ""
-#: netsync.cc:2756
+#: netsync.cc:2750
#, c-format
msgid "public key '%s' already exists in our database\n"
msgstr ""
-#: netsync.cc:2765
+#: netsync.cc:2759
#, c-format
msgid "hash check failed for public key '%s' (%s); wanted '%s' got '%s'"
msgstr ""
-#: netsync.cc:2774
+#: netsync.cc:2768
#, c-format
msgid "cert '%s' already exists in our database\n"
msgstr ""
-#: netsync.cc:2782
+#: netsync.cc:2776
#, c-format
msgid "hash check failed for revision cert '%s'"
msgstr ""
-#: netsync.cc:2798
+#: netsync.cc:2792
#, c-format
msgid "revision '%s' already exists in our database\n"
msgstr ""
-#: netsync.cc:2801
+#: netsync.cc:2795
#, c-format
msgid "received revision '%s' \n"
msgstr ""
-#: netsync.cc:2820
+#: netsync.cc:2814
#, c-format
msgid "manifest version '%s' already exists in our database\n"
msgstr ""
-#: netsync.cc:2835
+#: netsync.cc:2829
#, c-format
msgid "file version '%s' already exists in our database\n"
msgstr ""
-#: netsync.cc:2907
+#: netsync.cc:2899
#, c-format
msgid "ignoring delta received for item type %s\n"
msgstr ""
-#: netsync.cc:2921
+#: netsync.cc:2913
#, c-format
msgid "received 'nonexistant' netcmd for %s '%s'\n"
msgstr ""
-#: netsync.cc:2998
+#: netsync.cc:2990
#, c-format
msgid ""
"received 'anonymous' netcmd from client for pattern '%s' excluding '%s' in %"
"s mode\n"
msgstr ""
-#: netsync.cc:3028
+#: netsync.cc:3021
#, c-format
msgid ""
"received 'auth(hmac)' netcmd from client '%s' for pattern '%s' exclude '%s' "
"in %s mode with nonce1 '%s'\n"
msgstr ""
-#: netsync.cc:3193
+#: netsync.cc:3187
#, c-format
msgid "processing %d byte input buffer from peer %s\n"
msgstr ""
-#: netsync.cc:3196
+#: netsync.cc:3190
#, c-format
msgid "input buffer for peer %s is overfull after netcmd dispatch\n"
msgstr ""
-#: netsync.cc:3203 netsync.cc:3237 netsync.cc:3264
+#: netsync.cc:3197 netsync.cc:3231 netsync.cc:3258
#, c-format
msgid "protocol error while processing peer %s: '%s'\n"
msgstr ""
-#: netsync.cc:3223
+#: netsync.cc:3217
#, c-format
msgid "connecting to %s\n"
msgstr ""
-#: netsync.cc:3250
+#: netsync.cc:3244
#, c-format
msgid "timed out waiting for I/O with peer %s, disconnecting\n"
msgstr ""
-#: netsync.cc:3272
+#: netsync.cc:3266
#, c-format
msgid "read from fd %d (peer %s) closed OK after goodbye\n"
msgstr ""
-#: netsync.cc:3274
+#: netsync.cc:3268
#, c-format
msgid "read from fd %d (peer %s) failed, disconnecting\n"
msgstr ""
-#: netsync.cc:3284
+#: netsync.cc:3278
#, c-format
msgid "write on fd %d (peer %s) closed OK after goodbye\n"
msgstr ""
-#: netsync.cc:3286
+#: netsync.cc:3280
#, c-format
msgid "write on fd %d (peer %s) failed, disconnecting\n"
msgstr ""
-#: netsync.cc:3293
+#: netsync.cc:3287
#, c-format
msgid "got OOB data on fd %d (peer %s), disconnecting\n"
msgstr ""
-#: netsync.cc:3302
+#: netsync.cc:3296
#, c-format
msgid "terminated exchange with %s\n"
msgstr ""
-#: netsync.cc:3310
+#: netsync.cc:3304
#, c-format
msgid "successful exchange with %s\n"
msgstr ""
-#: netsync.cc:3331
+#: netsync.cc:3325
#, c-format
msgid "fd %d is armed\n"
msgstr ""
-#: netsync.cc:3338
+#: netsync.cc:3332
#, c-format
msgid "protocol error while processing peer %s: '%s', marking as bad\n"
msgstr ""
-#: netsync.cc:3360
+#: netsync.cc:3354
#, c-format
msgid "accepting new connection on %s : %d\n"
msgstr ""
-#: netsync.cc:3366
+#: netsync.cc:3360
msgid "accept() returned a dead client\n"
msgstr ""
-#: netsync.cc:3370
+#: netsync.cc:3364
#, c-format
msgid "accepted new client connection from %s\n"
msgstr ""
-#: netsync.cc:3397
+#: netsync.cc:3391
#, c-format
msgid "protocol error while processing peer %s: '%s', disconnecting\n"
msgstr ""
-#: netsync.cc:3405
+#: netsync.cc:3399
#, c-format
msgid "fd %d (peer %s) read failed, disconnecting\n"
msgstr ""
-#: netsync.cc:3421
+#: netsync.cc:3415
#, c-format
msgid "fd %d (peer %s) write failed, disconnecting\n"
msgstr ""
-#: netsync.cc:3445
+#: netsync.cc:3439
#, c-format
msgid "fd %d (peer %s) processing finished, disconnecting\n"
msgstr ""
-#: netsync.cc:3467
+#: netsync.cc:3461
#, c-format
msgid "fd %d (peer %s) has been idle too long, disconnecting\n"
msgstr ""
-#: netsync.cc:3473
+#: netsync.cc:3467
#, c-format
msgid "fd %d (peer %s) exchanged goodbyes and flushed output, disconnecting\n"
msgstr ""
-#: netsync.cc:3504
+#: netsync.cc:3498
#, c-format
msgid "beginning service on %s : %d\n"
msgstr ""
-#: netsync.cc:3518
+#: netsync.cc:3512
#, c-format
msgid "session limit %d reached, some connections will be refused\n"
msgstr ""
-#: netsync.cc:3524
+#: netsync.cc:3518
#, c-format
msgid "i/o probe with %d armed\n"
msgstr ""
-#: netsync.cc:3534
+#: netsync.cc:3528
#, c-format
msgid "timed out waiting for I/O (listening on %s : %d)\n"
msgstr ""
-#: netsync.cc:3550
+#: netsync.cc:3544
#, c-format
msgid "got woken up for action on unknown fd %d\n"
msgstr ""
-#: netsync.cc:3565
+#: netsync.cc:3559
#, c-format
msgid "got some OOB data on fd %d (peer %s), disconnecting\n"
msgstr ""
-#: netsync.cc:3632
-msgid "rebuilding merkle trees ...\n"
+#: netsync.cc:3621
+msgid "finding items to be synchronized:\n"
msgstr ""
-#: netsync.cc:3635
+#: netsync.cc:3624
#, c-format
msgid "including branch %s"
msgstr ""
-#: netsync.cc:3679
+#: netsync.cc:3675
#, c-format
msgid "setting epoch on %s to zero\n"
msgstr ""
-#: netsync.cc:3767
+#: netsync.cc:3766
#, c-format
msgid "network error: %s"
msgstr ""
-#: netsync.cc:3772
+#: netsync.cc:3771
#, c-format
msgid "network error: %s\n"
msgstr ""
@@ -3402,511 +3468,568 @@
msgid "parse failure %d:%d: expecting word\n"
msgstr ""
-#: rcs_import.cc:204
+#: rcs_import.cc:249
#, c-format
msgid "Calculating time of %s\n"
msgstr ""
-#: rcs_import.cc:218
+#: rcs_import.cc:263
#, c-format
msgid "= %i\n"
msgstr ""
-#: rcs_import.cc:232
+#: rcs_import.cc:283
#, c-format
msgid "version %s -> tag %s\n"
msgstr ""
-#: rcs_import.cc:399
+#: rcs_import.cc:450
msgid "skipping identity file edge\n"
msgstr ""
-#: rcs_import.cc:407 rcs_import.cc:433
+#: rcs_import.cc:458 rcs_import.cc:484
#, c-format
msgid "existing path to %s found, skipping\n"
msgstr ""
-#: rcs_import.cc:425
+#: rcs_import.cc:476
msgid "skipping identity manifest edge\n"
msgstr ""
-#: rcs_import.cc:543
+#: rcs_import.cc:594
#, c-format
msgid "version %s has %d lines\n"
msgstr ""
-#: rcs_import.cc:553
+#: rcs_import.cc:607
#, c-format
msgid "following RCS edge %s -> %s\n"
msgstr ""
-#: rcs_import.cc:556
+#: rcs_import.cc:610
#, c-format
msgid "constructed RCS version %s, inserting into database\n"
msgstr ""
-#: rcs_import.cc:599
+#: rcs_import.cc:653
#, c-format
msgid "following RCS branch %s = '%s'\n"
msgstr ""
-#: rcs_import.cc:609
+#: rcs_import.cc:663
#, c-format
msgid "finished RCS branch %s = '%s'\n"
msgstr ""
-#: rcs_import.cc:630 rcs_import.cc:679
+#: rcs_import.cc:684 rcs_import.cc:733
#, c-format
msgid "parsing RCS file %s\n"
msgstr ""
-#: rcs_import.cc:632 rcs_import.cc:682
+#: rcs_import.cc:686 rcs_import.cc:736
#, c-format
msgid "parsed RCS file %s OK\n"
msgstr ""
-#: rcs_import.cc:722
+#: rcs_import.cc:776
#, c-format
msgid "importing file '%s'\n"
msgstr ""
-#: rcs_import.cc:759
+#: rcs_import.cc:848
#, c-format
msgid "first version in branch %s would be %s\n"
msgstr ""
-#: rcs_import.cc:767
+#: rcs_import.cc:855
#, c-format
msgid "file branchpoint for %s at %s\n"
msgstr ""
-#: rcs_import.cc:837
+#: rcs_import.cc:925
#, c-format
msgid "error reading RCS file %s: %s\n"
msgstr ""
-#: rcs_import.cc:841
+#: rcs_import.cc:929
#, c-format
msgid "skipping non-RCS file %s\n"
msgstr ""
-#: rcs_import.cc:1020
+#: rcs_import.cc:1108
#, c-format
-msgid "examining next commit [t:%d] [a:%d] [c:%d]\n"
+msgid "examining next commit [t:%d] [p:%s] [a:%s] [c:%s]\n"
msgstr ""
-#: rcs_import.cc:1030
+#: rcs_import.cc:1121
msgid "expiring cluster\n"
msgstr ""
-#: rcs_import.cc:1049
+#: rcs_import.cc:1137
#, c-format
+msgid "examining cluster %d to see if it touched %d\n"
+msgstr ""
+
+#: rcs_import.cc:1145
+#, c-format
+msgid "found cluster touching %d: [t:%d] [a:%d] [c:%d]\n"
+msgstr ""
+
+#: rcs_import.cc:1153
+#, c-format
msgid "last modification time is %d\n"
msgstr ""
-#: rcs_import.cc:1064
-msgid "picked existing cluster target\n"
+#: rcs_import.cc:1169
+#, c-format
+msgid "picked existing cluster [t:%d] [a:%d] [c:%d]\n"
msgstr ""
-#: rcs_import.cc:1074
+#: rcs_import.cc:1183
#, c-format
msgid "building new cluster [t:%d] [a:%d] [c:%d]\n"
msgstr ""
-#: rcs_import.cc:1096
+#: rcs_import.cc:1208
msgid "finished branch commits, writing all pending clusters\n"
msgstr ""
-#: rcs_import.cc:1102
+#: rcs_import.cc:1214
msgid "finished writing pending clusters\n"
msgstr ""
-#: rcs_import.cc:1114
+#: rcs_import.cc:1226
#, c-format
msgid ""
"%s appears to be a CVS repository root directory\n"
"try importing a module instead, with 'cvs_import %s/"
msgstr ""
-#: rcs_import.cc:1127
+#: rcs_import.cc:1239
msgid "need base --branch argument for importing"
msgstr ""
-#: rcs_import.cc:1139
+#: rcs_import.cc:1251
#, c-format
msgid "path %s does not exist"
msgstr ""
-#: rcs_import.cc:1141
+#: rcs_import.cc:1253
#, c-format
msgid "path %s is not a directory"
msgstr ""
-#: rcs_import.cc:1144
+#: rcs_import.cc:1256
#, c-format
msgid "could not change directory to %s"
msgstr ""
-#: rcs_import.cc:1160
+#: rcs_import.cc:1272
#, c-format
msgid "branch %s has %d entries\n"
msgstr ""
-#: rcs_import.cc:1170
+#: rcs_import.cc:1282
#, c-format
msgid "trunk has %d entries\n"
msgstr ""
-#: rcs_import.cc:1223
+#: rcs_import.cc:1335
#, c-format
msgid "initial cluster on branch %s has %d live entries\n"
msgstr ""
-#: rcs_import.cc:1230
+#: rcs_import.cc:1342
#, c-format
msgid "initial cluster contains %s at %s\n"
msgstr ""
-#: rcs_import.cc:1281
+#: rcs_import.cc:1388
#, c-format
msgid "storing manifest '%s' (base %s)\n"
msgstr ""
-#: rcs_import.cc:1286
+#: rcs_import.cc:1393
#, c-format
msgid "storing head %s\n"
msgstr ""
-#: rcs_import.cc:1301
+#: rcs_import.cc:1408
msgid "skipping delta to null manifest\n"
msgstr ""
-#: rcs_import.cc:1313
+#: rcs_import.cc:1420
#, c-format
msgid "skipping cyclical manifest delta %s -> %s\n"
msgstr ""
-#: rcs_import.cc:1319
+#: rcs_import.cc:1426
#, c-format
msgid "writing full manifest %s\n"
msgstr ""
-#: rcs_import.cc:1329
+#: rcs_import.cc:1436
#, c-format
msgid "storing manifest delta %s -> %s\n"
msgstr ""
-#: rcs_import.cc:1391
+#: rcs_import.cc:1498
#, c-format
msgid "adding entry state '%s' on '%s'\n"
msgstr ""
-#: rcs_import.cc:1398
+#: rcs_import.cc:1505
#, c-format
msgid "applying state delta on '%s' : '%s' -> '%s'\n"
msgstr ""
-#: rcs_import.cc:1409
+#: rcs_import.cc:1516
#, c-format
msgid "deleting entry state '%s' on '%s'\n"
msgstr ""
-#: rcs_import.cc:1434
+#: rcs_import.cc:1535
+msgid "BEGIN consume_cluster()\n"
+msgstr ""
+
+#: rcs_import.cc:1555
#, c-format
-msgid "consumed cluster %s (parent '%s')\n"
+msgid "END consume_cluster('%s') (parent '%s')\n"
msgstr ""
-#: revision.cc:123
+#: revision.cc:124
msgid "verifying new revisions (this may take a while)\n"
msgstr ""
-#: revision.cc:125
+#: revision.cc:126
#, c-format
msgid "Verifying revision %s has sane history (to depth %i)\n"
msgstr ""
-#: revision.cc:163
+#: revision.cc:164
#, c-format
msgid "Examining %s -> %s\n"
msgstr ""
-#: revision.cc:236
+#: revision.cc:241
#, c-format
msgid "%s and %s have no common ancestor, so done\n"
msgstr ""
-#: revision.cc:242
+#: revision.cc:247
msgid "already checked common ancestor, so done\n"
msgstr ""
-#: revision.cc:245
+#: revision.cc:250
#, c-format
msgid "%s is a merge; verifying paths to common ancestor %s are sane\n"
msgstr ""
-#: revision.cc:299
+#: revision.cc:304
#, c-format
msgid "loading parents for node %d\n"
msgstr ""
-#: revision.cc:319
+#: revision.cc:324
#, c-format
msgid "parent %s -> node %d\n"
msgstr ""
-#: revision.cc:469
+#: revision.cc:474
#, c-format
msgid "found %d intersecting nodes\n"
msgstr ""
-#: revision.cc:517
+#: revision.cc:522
#, c-format
msgid "searching for common ancestor, left=%s right=%s\n"
msgstr ""
-#: revision.cc:522
+#: revision.cc:527
#, c-format
msgid "common ancestor scan [par=%d,anc=%d,dom=%d]\n"
msgstr ""
-#: revision.cc:527
+#: revision.cc:532
#, c-format
msgid "found node %d, ancestor of left %s and dominating right %s\n"
msgstr ""
-#: revision.cc:534
+#: revision.cc:539
#, c-format
msgid "found node %d, ancestor of right %s and dominating left %s\n"
msgstr ""
-#: revision.cc:571
+#: revision.cc:576
#, c-format
msgid "searching for least common ancestor, left=%s right=%s\n"
msgstr ""
-#: revision.cc:575
+#: revision.cc:580
#, c-format
msgid "least common ancestor scan [par=%d,anc=%d]\n"
msgstr ""
-#: revision.cc:580
+#: revision.cc:585
#, c-format
msgid "found node %d, ancestor of left %s and right %s\n"
msgstr ""
-#: revision.cc:634
+#: revision.cc:639
#, c-format
msgid "checking whether %s is an ancestor of %s\n"
msgstr ""
-#: revision.cc:746
+#: revision.cc:751
#, c-format
msgid "new root: %s\n"
msgstr ""
-#: revision.cc:761
+#: revision.cc:766
#, c-format
msgid "new leaf: %s\n"
msgstr ""
-#: revision.cc:903
+#: revision.cc:908
#, c-format
msgid "exploring changesets from parents of %s, seeking towards %s\n"
msgstr ""
-#: revision.cc:916
+#: revision.cc:921
#, c-format
msgid "considering parent %s of %s\n"
msgstr ""
-#: revision.cc:942
+#: revision.cc:947
#, c-format
msgid "revision %s is relevant, composing with edge to %s\n"
msgstr ""
-#: revision.cc:949
+#: revision.cc:954
#, c-format
msgid "parent %s of %s is not relevant\n"
msgstr ""
-#: revision.cc:985
+#: revision.cc:990
#, c-format
msgid "adding parents of %s to subgraph\n"
msgstr ""
-#: revision.cc:995
+#: revision.cc:1000
#, c-format
msgid "found parent %s of %s\n"
msgstr ""
-#: revision.cc:999
+#: revision.cc:1004
#, c-format
msgid "adding parent %s to next frontier\n"
msgstr ""
-#: revision.cc:1014
+#: revision.cc:1019
#, c-format
msgid "calculating composite changeset between %s and %s\n"
msgstr ""
-#: revision.cc:1032
+#: revision.cc:1037
#, c-format
msgid "calculating changeset from %s to %s\n"
msgstr ""
-#: revision.cc:1036
+#: revision.cc:1041
#, c-format
msgid "no common ancestor for %s and %s\n"
msgstr ""
-#: revision.cc:1037
+#: revision.cc:1042
#, c-format
msgid "common ancestor is %s\n"
msgstr ""
-#: revision.cc:1068
+#: revision.cc:1073
#, c-format
msgid "analyzing manifest changes from '%s' -> '%s'\n"
msgstr ""
-#: revision.cc:1081
+#: revision.cc:1086
#, c-format
msgid "splitting ancestry for file %s\n"
msgstr ""
-#: revision.cc:1148
+#: revision.cc:1153
#, c-format
msgid "noting ancestry from child %d -> parent %d\n"
msgstr ""
-#: revision.cc:1182
+#: revision.cc:1186
#, c-format
msgid "setting epoch for %s to %s\n"
msgstr ""
-#: revision.cc:1238
+#: revision.cc:1242
msgid "scanning for nodes with 3+ parents\n"
msgstr ""
-#: revision.cc:1279
+#: revision.cc:1283
#, c-format
msgid "optimizing out redundant edge %i -> %i\n"
msgstr ""
-#: revision.cc:1306
+#: revision.cc:1310
#, c-format
msgid "rebuilding %d nodes\n"
msgstr ""
-#: revision.cc:1343
+#: revision.cc:1347
#, c-format
msgid "node %d = manifest %s\n"
msgstr ""
-#: revision.cc:1354
+#: revision.cc:1358
#, c-format
msgid "loaded '%s' manifest cert for node %s\n"
msgstr ""
-#: revision.cc:1382
+#: revision.cc:1386
#, c-format
msgid "node %d = revision %s = manifest %s\n"
msgstr ""
-#: revision.cc:1394
+#: revision.cc:1398
#, c-format
msgid "loaded '%s' revision cert for node %s\n"
msgstr ""
-#: revision.cc:1418
+#: revision.cc:1422
#, c-format
msgid "processing node %d\n"
msgstr ""
-#: revision.cc:1422
+#: revision.cc:1426
#, c-format
msgid "node %d already processed, skipping\n"
msgstr ""
-#: revision.cc:1436
+#: revision.cc:1440
#, c-format
msgid "node %d is a root node\n"
msgstr ""
-#: revision.cc:1452 revision.cc:1535
+#: revision.cc:1456 revision.cc:1539
#, c-format
msgid "parent node %d = revision %s\n"
msgstr ""
-#: revision.cc:1514
+#: revision.cc:1518
#, c-format
msgid "processing edge from child %d -> parent %d\n"
msgstr ""
-#: revision.cc:1552
+#: revision.cc:1556
#, c-format
msgid "mapped node %d to revision %s\n"
msgstr ""
-#: revision.cc:1558
+#: revision.cc:1562
#, c-format
msgid "skipping already existing revision %s\n"
msgstr ""
-#: revision.cc:1570
+#: revision.cc:1574
msgid "rebuilding revision graph from existing graph\n"
msgstr ""
-#: revision.cc:1603
+#: revision.cc:1607
msgid "rebuilding revision graph from manifest certs\n"
msgstr ""
-#: sanity.cc:36
+#: sanity.cc:37
#, c-format
msgid "started up on %s\n"
msgstr ""
-#: transforms.cc:542
+#: sanity.cc:246
+msgid "ignoring request to give last gasp; already in process of dumping\n"
+msgstr ""
+
+#: sanity.cc:250
#, c-format
+msgid "saving current work set: %i items"
+msgstr ""
+
+#: sanity.cc:252
+#, c-format
+msgid "Current work set: %i items\n"
+msgstr ""
+
+#: sanity.cc:265 sanity.cc:270
+msgid "ignoring error trigged by saving work set to debug log"
+msgstr ""
+
+#: sanity.cc:274
+msgid "finished saving work set"
+msgstr ""
+
+#: sanity.hh:231
+#, c-format
+msgid "----- begin '%s' (in %s, at %s:%d)\n"
+msgstr ""
+
+#: sanity.hh:235
+#, c-format
+msgid "----- end '%s' (in %s, at %s:%d)\n"
+msgstr ""
+
+#: schema_migration.cc:260
+#, c-format
+msgid "database schema %s is unknown; cannot perform migration"
+msgstr ""
+
+#: schema_migration.cc:265
+#, c-format
+msgid "no migration performed; database schema already up-to-date at %s\n"
+msgstr ""
+
+#: transforms.cc:523
+#, c-format
msgid "converting %d bytes from %s to %s\n"
msgstr ""
-#: transforms.cc:548
+#: transforms.cc:529
#, c-format
msgid "failed to convert string from %s to %s: '%s'"
msgstr ""
-#: transforms.cc:596
+#: transforms.cc:577
#, c-format
msgid "converting %d bytes from IDNA ACE to UTF-8\n"
msgstr ""
-#: transforms.cc:599 transforms.cc:613
+#: transforms.cc:580 transforms.cc:594
#, c-format
msgid "error converting %d UTF-8 bytes to IDNA ACE: %s"
msgstr ""
-#: transforms.cc:610
+#: transforms.cc:591
#, c-format
msgid "converting %d bytes from UTF-8 to IDNA ACE\n"
msgstr ""
-#: transforms.cc:864
+#: transforms.cc:845
#, c-format
msgid "doing linesep conversion to %s\n"
msgstr ""
-#: transforms.cc:1140
+#: transforms.cc:1121
#, c-format
msgid "ACE-encoded %s: '%s'\n"
msgstr ""
-#: ui.cc:125
+#: ui.cc:126
#, c-format
msgid "%.1f%s"
msgstr ""
-#: ui.cc:129
+#: ui.cc:130
#, c-format
msgid "%d"
msgstr ""
@@ -3936,7 +4059,7 @@
msgid "%s has unacceptable test results\n"
msgstr ""
-#: update.cc:158
+#: update.cc:160
msgid "cannot determine branch for update"
msgstr ""
@@ -4005,171 +4128,171 @@
msgid "prohibited book-keeping path in '%s'"
msgstr ""
-#: work.cc:61
+#: work.cc:60
#, c-format
msgid "skipping ignorable file %s\n"
msgstr ""
-#: work.cc:67
+#: work.cc:66
#, c-format
msgid "skipping %s, already accounted for in working copy\n"
msgstr ""
-#: work.cc:71
+#: work.cc:70
#, c-format
msgid "adding %s to working copy add set\n"
msgstr ""
-#: work.cc:99 work.cc:205
+#: work.cc:98 work.cc:204
msgid "invalid path ''"
msgstr ""
-#: work.cc:101
+#: work.cc:100
#, c-format
msgid "path %s does not exist\n"
msgstr ""
-#: work.cc:138
+#: work.cc:137
#, c-format
msgid "adding attribute '%s' to file %s to %s\n"
msgstr ""
-#: work.cc:209
+#: work.cc:208
#, c-format
msgid "skipping %s, not currently tracked\n"
msgstr ""
-#: work.cc:213
+#: work.cc:212
#, c-format
msgid "adding %s to working copy delete set\n"
msgstr ""
-#: work.cc:217
+#: work.cc:216
#, c-format
msgid ""
"sorry -- 'drop ' is currently broken.\n"
"try 'find %s -type f | monotone drop address@hidden'\n"
msgstr ""
-#: work.cc:229
+#: work.cc:228
#, c-format
msgid "dropped attributes for file %s from %s\n"
msgstr ""
-#: work.cc:252
+#: work.cc:251
msgid "invalid source path ''"
msgstr ""
-#: work.cc:253
+#: work.cc:252
msgid "invalid destination path ''"
msgstr ""
-#: work.cc:264
+#: work.cc:263
#, c-format
msgid "%s does not exist in current revision\n"
msgstr ""
-#: work.cc:267
+#: work.cc:266
#, c-format
msgid "%s already exists in current revision\n"
msgstr ""
-#: work.cc:269
+#: work.cc:268
#, c-format
msgid "adding %s -> %s to working copy rename set\n"
msgstr ""
-#: work.cc:289
+#: work.cc:288
#, c-format
msgid "%s has existing attributes in %s; clean them up first"
msgstr ""
-#: work.cc:298
+#: work.cc:297
#, c-format
msgid "moving attributes for %s to %s\n"
msgstr ""
-#: work.cc:317
+#: work.cc:316
#, c-format
msgid "work path is %s\n"
msgstr ""
-#: work.cc:326
+#: work.cc:325
#, c-format
msgid "checking for un-committed work file %s\n"
msgstr ""
-#: work.cc:330
+#: work.cc:329
#, c-format
msgid "read rearrangement from %s\n"
msgstr ""
-#: work.cc:334
+#: work.cc:333
#, c-format
msgid "no un-committed work file %s\n"
msgstr ""
-#: work.cc:371
+#: work.cc:370
#, c-format
msgid "revision path is %s\n"
msgstr ""
-#: work.cc:381
+#: work.cc:380
#, c-format
msgid "working copy is corrupt: %s does not exist\n"
msgstr ""
-#: work.cc:384
+#: work.cc:383
#, c-format
msgid "loading revision id from %s\n"
msgstr ""
-#: work.cc:391
+#: work.cc:390
#, c-format
msgid "Problem with working directory: %s is unreadable"
msgstr ""
-#: work.cc:400
+#: work.cc:399
#, c-format
msgid "writing revision id to %s\n"
msgstr ""
-#: work.cc:419
+#: work.cc:418
#, c-format
msgid "base revision %s does not exist in database\n"
msgstr ""
-#: work.cc:422
+#: work.cc:421
#, c-format
msgid "old manifest is %s\n"
msgstr ""
-#: work.cc:425
+#: work.cc:424
#, c-format
msgid "base manifest %s does not exist in database\n"
msgstr ""
-#: work.cc:430
+#: work.cc:429
#, c-format
msgid "old manifest has %d entries\n"
msgstr ""
-#: work.cc:451
+#: work.cc:450
#, c-format
msgid "user log path is %s\n"
msgstr ""
-#: work.cc:500
+#: work.cc:499
#, c-format
msgid "options path is %s\n"
msgstr ""
-#: work.cc:547
+#: work.cc:546
#, c-format
msgid "local dump path is %s\n"
msgstr ""
-#: work.cc:599
+#: work.cc:598
#, c-format
msgid "attribute map path is %s\n"
msgstr ""