The unified diff between revisions [016b3b68..] and [d5e684d1..] is displayed below. It can also be downloaded as a raw diff.
#
#
# patch "database.cc"
# from [61bac503d11d0d68da007b53ec4a7f31e0453cdc]
# to [ff7e9238c05f34284c4dd9bfcdc855dba1194a80]
#
# patch "enumerator.cc"
# from [05baab83e8b397403e54ed13a6c514c81feb7b4f]
# to [e897365e1dce39cc4a2261c09e2d172e237a5ff3]
#
# patch "schema.sql"
# from [c68ba3a5f158efdf6cae10d6b307a9cf0d35be44]
# to [4ea3e8c119ce7aa6d5c73666c5716d5a63dd1bd9]
#
# patch "schema_migration.cc"
# from [7d215b15eb77f65457092c0cc1553f4ab2689a4e]
# to [68c0d9e5c6352b9d5e7872c158dfe5ccaaec7d26]
#
============================================================
--- database.cc 61bac503d11d0d68da007b53ec4a7f31e0453cdc
+++ database.cc ff7e9238c05f34284c4dd9bfcdc855dba1194a80
@@ -128,7 +128,7 @@ database::database(system_path const & f
// non-alphabetic ordering of tables in sql source files. we could create
// a temporary db, write our intended schema into it, and read it back,
// but this seems like it would be too rude. possibly revisit this issue.
- schema("b0987b874c2d348e9720ec11cf9618509b002618"),
+ schema("e11e717741276b6969a186ac153a5f6e2012c000"),
__sql(NULL),
transaction_level(0)
{}
@@ -915,7 +915,7 @@ database::put(hexenc<id> const & ident,
string insert = "INSERT INTO " + table + " VALUES(?, ?, ?)";
execute(query(insert)
% text(ident())
- % blob(dat_packed()));
+ % blob(dat_packed())
% integer(dat_size));
}
void
@@ -938,7 +938,7 @@ database::put_delta(hexenc<id> const & i
execute(query(insert)
% text(ident())
% text(base())
- % blob(del_packed()));
+ % blob(del_packed())
% integer(parent_distance + 1)
% integer(parent_size + del_size)
% integer(del_size));
@@ -1752,7 +1752,7 @@ database::put_revision(revision_id const
execute(query("INSERT INTO revisions VALUES(?, ?, ?)")
% text(new_id.inner()())
- % blob(d_packed()));
+ % blob(d_packed())
% integer(d_size));
for (edge_map::const_iterator e = rev.edges.begin();
@@ -2881,7 +2881,7 @@ database::put_roster(revision_id const &
get_version(old_id, old_data, data_table, delta_table);
delta del;
diff(old_data, new_data, del);
- put_delta(new_id, old_id, del, delta_table);
+ put_version(old_id, new_id, del, new_data, data_table, delta_table);
delta_written = true;
break;
}
============================================================
--- enumerator.cc 05baab83e8b397403e54ed13a6c514c81feb7b4f
+++ enumerator.cc e897365e1dce39cc4a2261c09e2d172e237a5ff3
@@ -185,7 +185,7 @@ revision_enumerator::process_bunch()
{
bunch_files.insert(*f);
top_files.insert(*f);
- dst_files.insert(*f)
+ dst_files.insert(*f);
}
for (set<pair<file_id,file_id> >::const_iterator fd = del_files.begin();
============================================================
--- schema.sql c68ba3a5f158efdf6cae10d6b307a9cf0d35be44
+++ schema.sql 4ea3e8c119ce7aa6d5c73666c5716d5a63dd1bd9
@@ -21,16 +21,16 @@ CREATE TABLE files
CREATE TABLE files
(
- id primary key, -- strong hash of file contents
- data not null -- compressed contents of a file
+ id primary key, -- strong hash of file contents
+ data not null, -- compressed contents of a file
size integer not null -- length(data)
);
CREATE TABLE file_deltas
(
- id not null, -- strong hash of file contents
- base not null, -- joins with files.id or file_deltas.id
- delta not null, -- compressed rdiff to construct current from base
+ id not null, -- strong hash of file contents
+ base not null, -- joins with files.id or file_deltas.id
+ delta not null, -- compressed rdiff to construct current from base
path_dist integer not null, -- 1 if base is full, otherwise path_dist(base)+1
path_size integer not null, -- size + size of base
size integer not null, -- length(delta)
@@ -39,16 +39,16 @@ CREATE TABLE manifests
CREATE TABLE manifests
(
- id primary key, -- strong hash of all the entries in a manifest
- data not null, -- compressed, encoded contents of a manifest
+ id primary key, -- strong hash of all the entries in a manifest
+ data not null, -- compressed, encoded contents of a manifest
size integer not null -- length(data)
);
CREATE TABLE manifest_deltas
(
- id not null, -- strong hash of all the entries in a manifest
- base not null, -- joins with either manifest.id or manifest_deltas.id
- delta not null, -- rdiff to construct current from base
+ id not null, -- strong hash of all the entries in a manifest
+ base not null, -- joins with either manifest.id or manifest_deltas.id
+ delta not null, -- rdiff to construct current from base
path_dist integer not null, -- 1 if base is full, otherwise path_dist(base)+1
path_size integer not null, -- size + size of base
size integer not null, -- length(delta)
@@ -78,9 +78,9 @@ CREATE TABLE roster_deltas
CREATE TABLE roster_deltas
(
- id not null, -- strong hash of the roster
- base not null, -- joins with either rosters.id or roster_deltas.id
- delta not null, -- rdiff to construct current from base
+ id not null, -- strong hash of the roster
+ base not null, -- joins with either rosters.id or roster_deltas.id
+ delta not null, -- rdiff to construct current from base
path_dist integer not null, -- 1 if base is full, otherwise path_dist(base)+1
path_size integer not null, -- size + size of base
size integer not null, -- length(delta)
============================================================
--- schema_migration.cc 7d215b15eb77f65457092c0cc1553f4ab2689a4e
+++ schema_migration.cc 68c0d9e5c6352b9d5e7872c158dfe5ccaaec7d26
@@ -1072,7 +1072,6 @@ migrate_monotone_schema(sqlite3 *sql, ap
// also add a new migration test for the new schema version. See
// tests/t_migrate_schema.at for details.
- //m.migrate(sql, "1db80c7cee8fa966913db1a463ed50bf1b0e5b0e");
- //m.migrate(sql, "8cd14946f11ae66218240f332ce416801db1e453");
- m.migrate(sql, "b0987b874c2d348e9720ec11cf9618509b002618");
+ // XXX: there's no migration code to get to this.
+ m.migrate(sql, "e11e717741276b6969a186ac153a5f6e2012c000");
}