#
#
# patch "ChangeLog"
# from [261744ccd65bd189628ec9d9a8cf37d6f4cb0de5]
# to [6bd050ab8bde29d7ecedb01a73f60cd42438d6d2]
#
# patch "database.hh"
# from [81c7eeb032d7b54ffa52b8fb1893c388554557a0]
# to [ecaa2ff0d3b4a335ae680c3e92ba33b33ddfd194]
#
# patch "key_store.cc"
# from [75549872a8c7373ded03d254298fc75fa975a6c2]
# to [5df53c5db38d4a3fa7048bc03e046714c8b72ca8]
#
# patch "packet.cc"
# from [81a12cedd7ba7e345c3f2fed3b0336fd8e731de8]
# to [9667969d6ba25d0a899e35634c1a0dbe4ecda87c]
#
# patch "packet.hh"
# from [a867141b8452808a088f3bface7fbeba42a80e72]
# to [8fafc3cfc98a943ab838e3cb3ebb52543c66b244]
#
============================================================
--- ChangeLog 261744ccd65bd189628ec9d9a8cf37d6f4cb0de5
+++ ChangeLog 6bd050ab8bde29d7ecedb01a73f60cd42438d6d2
@@ -1,5 +1,14 @@
2006-01-10 Nathaniel Smith
+ * packet.cc (consume_file_reverse_delta)
+ (struct feed_packet_consumer): Remove support for nonexistent
+ "frdelta" packet type.
+ * database.{hh,cc} (put_reverse_version)
+ (put_file_reverse_version): Remove unused methods.
+ * key_store.cc (struct keyreader): Remove obsolete methods.
+
+2006-01-10 Nathaniel Smith
+
* database.cc (set_filename): Simplify slightly.
(delta_exists): Remove unused 3-argument version.
============================================================
--- database.hh 81c7eeb032d7b54ffa52b8fb1893c388554557a0
+++ database.hh ecaa2ff0d3b4a335ae680c3e92ba33b33ddfd194
@@ -149,11 +149,6 @@
void remove_version(hexenc const & target_id,
std::string const & data_table,
std::string const & delta_table);
- void put_reverse_version(hexenc const & new_id,
- hexenc const & old_id,
- delta const & reverse_del,
- std::string const & data_table,
- std::string const & delta_table);
void get_keys(std::string const & table, std::vector & keys);
@@ -250,12 +245,6 @@
file_id const & new_id,
file_delta const & del);
- // load in a "direct" new -> old reverse edge (used during
- // netsync and CVS load-in)
- void put_file_reverse_version(file_id const & old_id,
- file_id const & new_id,
- file_delta const & del);
-
// get plain version if it exists, or reconstruct version
// from deltas (if they exist).
void get_manifest_version(manifest_id const & id,
============================================================
--- key_store.cc 75549872a8c7373ded03d254298fc75fa975a6c2
+++ key_store.cc 5df53c5db38d4a3fa7048bc03e046714c8b72ca8
@@ -18,25 +18,7 @@
file_id const & id_new,
file_delta const & del)
{E(false, F("Extraneous data in key store."));}
- virtual void consume_file_reverse_delta(file_id const & id_new,
- file_id const & id_old,
- file_delta const & del)
- {E(false, F("Extraneous data in key store."));}
-
- virtual void consume_manifest_data(manifest_id const & ident,
- manifest_data const & dat)
- {E(false, F("Extraneous data in key store."));}
- virtual void consume_manifest_delta(manifest_id const & id_old,
- manifest_id const & id_new,
- manifest_delta const & del)
- {E(false, F("Extraneous data in key store."));}
- virtual void consume_manifest_reverse_delta(manifest_id const & id_new,
- manifest_id const & id_old,
- manifest_delta const & del)
- {E(false, F("Extraneous data in key store."));}
-
-
virtual void consume_revision_data(revision_id const & ident,
revision_data const & dat)
{E(false, F("Extraneous data in key store."));}
============================================================
--- packet.cc 81a12cedd7ba7e345c3f2fed3b0336fd8e731de8
+++ packet.cc 9667969d6ba25d0a899e35634c1a0dbe4ecda87c
@@ -127,44 +127,6 @@
guard.commit();
}
-void
-packet_db_writer::consume_file_reverse_delta(file_id const & new_id,
- file_id const & old_id,
- file_delta const & del)
-{
- transaction_guard guard(app.db);
-
- if (app.db.file_version_exists(old_id))
- {
- L(F("file version '%s' already exists in db\n") % old_id);
- return;
- }
-
- if (!app.db.file_version_exists(new_id))
- {
- W(F("file reverse-preimage '%s' missing in db") % new_id);
- W(F("dropping reverse-delta '%s' -> '%s'") % new_id % old_id);
- return;
- }
-
- file_id confirm;
- file_data new_dat;
- data old_dat;
- app.db.get_file_version(new_id, new_dat);
- patch(new_dat.inner(), del.inner(), old_dat);
- calculate_ident(file_data(old_dat), confirm);
- if (confirm == old_id)
- {
- app.db.put_file_reverse_version(new_id, old_id, del);
- }
- else
- {
- W(F("reconstructed file from reverse delta '%s' -> '%s' has wrong id '%s'\n")
- % new_id % old_id % confirm);
- }
- guard.commit();
-}
-
void
packet_db_writer::consume_revision_data(revision_id const & ident,
revision_data const & dat)
@@ -194,7 +156,7 @@
for (std::map::const_iterator a
= edge_changes(i).files_added.begin();
- a != edge_changes(i).files_added.end(); ++a)
+ a != edge_changes(i).files_added.end(); ++a)
{
if (! app.db.file_version_exists(a->second))
{
@@ -346,19 +308,6 @@
}
void
-packet_writer::consume_file_reverse_delta(file_id const & new_id,
- file_id const & old_id,
- file_delta const & del)
-{
- base64 > packed;
- pack(del.inner(), packed);
- ost << "[frdelta " << new_id.inner()() << endl
- << " " << old_id.inner()() << "]" << endl
- << trim_ws(packed()) << endl
- << "[end]" << endl;
-}
-
-void
packet_writer::consume_revision_data(revision_id const & ident,
revision_data const & dat)
{
@@ -453,7 +402,7 @@
else
throw oops("matched impossible data packet with head '" + type + "'");
}
- else if (regex_match(type, regex("fr?delta")))
+ else if (type == "fdelta")
{
L(F("read delta packet"));
match_results matches;
@@ -464,17 +413,9 @@
base64 > body_packed(trim_ws(body));
delta contents;
unpack(body_packed, contents);
- if (type == "fdelta")
- cons.consume_file_delta(file_id(hexenc(src_id)),
- file_id(hexenc(dst_id)),
- file_delta(contents));
- else if (type == "frdelta")
- cons.consume_file_reverse_delta(file_id(hexenc(src_id)),
- file_id(hexenc(dst_id)),
- file_delta(contents));
- else
- throw oops("matched impossible delta packet with head '"
- + type + "'");
+ cons.consume_file_delta(file_id(hexenc(src_id)),
+ file_id(hexenc(dst_id)),
+ file_delta(contents));
}
else if (type == "rcert")
{
============================================================
--- packet.hh a867141b8452808a088f3bface7fbeba42a80e72
+++ packet.hh 8fafc3cfc98a943ab838e3cb3ebb52543c66b244
@@ -58,10 +58,6 @@
virtual void consume_file_delta(file_id const & id_old,
file_id const & id_new,
file_delta const & del) = 0;
- virtual void consume_file_reverse_delta(file_id const & id_new,
- file_id const & id_old,
- file_delta const & del) = 0;
-
virtual void consume_revision_data(revision_id const & ident,
revision_data const & dat) = 0;
@@ -86,9 +82,6 @@
virtual void consume_file_delta(file_id const & id_old,
file_id const & id_new,
file_delta const & del);
- virtual void consume_file_reverse_delta(file_id const & id_new,
- file_id const & id_old,
- file_delta const & del);
virtual void consume_revision_data(revision_id const & ident,
revision_data const & dat);
@@ -119,9 +112,6 @@
file_id const & id_new,
file_delta const & del,
bool write_full);
- virtual void consume_file_reverse_delta(file_id const & id_new,
- file_id const & id_old,
- file_delta const & del);
virtual void consume_revision_data(revision_id const & ident,
revision_data const & dat);