#
# add_file "tests/README"
#
# add_file "tests/t_add_vs_commit.at"
#
# add_file "tests/t_cvsimport2.at"
#
# add_file "tests/t_lf_crlf.at"
#
# add_file "tests/t_override_author_date.at"
#
# add_file "tests/t_rcs_import.at"
#
# add_file "tests/t_rename_dir_add_dir_with_old_name.at"
#
# add_file "tests/t_update_nonexistent.at"
#
# patch ".mt-attrs"
# from [f9b65d9f157beb7932b20e4a85eb65487949ade9]
# to [d916e2d789f2c0f4e92f983099b16ec904a2379b]
#
# patch "AUTHORS"
# from [97910e402895c8bbae9ad72fad2e58c9f8965508]
# to [e3730a36bbd3ebd44b05f6d93750bb83022d5572]
#
# patch "ChangeLog"
# from [ae276c04af2b010374e324a49ddc03a5ab1af41e]
# to [e490fd28c27b7d4735dfbfc5f5a1a253d0867257]
#
# patch "app_state.cc"
# from [63120a266ad19ebd72022cf172ccbd0c299aa413]
# to [b821fb66100e7626444a2f1e4bc2af4d572880b1]
#
# patch "app_state.hh"
# from [9cfdb7a5976dc31edda11e99ee74046fdc318469]
# to [27b58d6683bc026b41c07308738952067bf82926]
#
# patch "cert.cc"
# from [451241f5ac6f41b70211dc92aa500e36688579af]
# to [07be077e4c0d53abd9cac0bbdf201e808cf221a5]
#
# patch "cert.hh"
# from [4b8178c3e7303d3465932f7d44039e8315f850a6]
# to [e2b1d86c8f2610e854afed7ab661c4c2554e7004]
#
# patch "commands.cc"
# from [3631712a17c33704a410a734fe2492c899b8ba6e]
# to [82e7eeb431c5bd765fd43da20f96c28b2b9b4814]
#
# patch "contrib/README"
# from [6d1db875fa3a286389a8c19eee3b19bf1772a3d6]
# to [41748f8afac99a87841c3f94004bbfc6f4295611]
#
# patch "database.cc"
# from [ab5914166d2a27c9c3f04f18594cc600e3c95f00]
# to [5d62241bcc64569576fd10f45db8bf559d8c1769]
#
# patch "database_check.cc"
# from [56b4ee811e023ae71548557652e1da4410429ffd]
# to [924b949941d72064a292451e72c28bfb2e80755c]
#
# patch "monotone.1"
# from [7ce55a7b2b6ec659e94edd7947ee9ce6c62053e1]
# to [33e5e256e415dd185535ac1331d44a9de3f243cc]
#
# patch "monotone.cc"
# from [2419f27fdb3cba77c658c0f4eac4d0b5026e1884]
# to [daff288cbe075dc65c3dfd45e89ea3e71d438ed8]
#
# patch "monotone.texi"
# from [82e309cffe8832da1e871c00c9795af49531f1df]
# to [939f56de6aac68a630492031939ce4654f093203]
#
# patch "netsync.cc"
# from [af29d63f695bfb5b0ade7e9d50e098773266f211]
# to [6c6cd98bcb3fe5a9c3c45af45cc47074f9e77fb8]
#
# patch "tests/README"
# from []
# to [fdbb3d9f63642092343e0ea58b7ee937f910103a]
#
# patch "tests/t_add_vs_commit.at"
# from []
# to [7fd4b57e97609427e699e0cf3cca5c984ffd1330]
#
# patch "tests/t_cvsimport2.at"
# from []
# to [4641874ff2fbedf55b84c1169dd86e4d2354c36b]
#
# patch "tests/t_diff_binary.at"
# from [651f781bf58848169446baee444f3f1418b7b24f]
# to [de45d9dca34e5765bd998968752d25368c8238e1]
#
# patch "tests/t_lf_crlf.at"
# from []
# to [5c7f37f18e1ae4e195a4f7581145705d390e1747]
#
# patch "tests/t_netsync_defaults.at"
# from [8f37b7de81c532b83851011586762f8c7fd91083]
# to [09eba929e451e94f6075bd99fe75fc0469ba84e1]
#
# patch "tests/t_netsync_single.at"
# from [1fa271a852629b392339705a3b6d5e143b7948c3]
# to [faa5253849ae86d140b67fb93609d191456b0ec3]
#
# patch "tests/t_no_rename_overwrite.at"
# from [345db00bfc31ac8c23f0735fe890c4d869e37448]
# to [1fe86d8eeda1180521602e9b66628aadad9b75ac]
#
# patch "tests/t_override_author_date.at"
# from []
# to [0f0499f19e887a4dbe83663f5e704110ca270bb3]
#
# patch "tests/t_rcs_import.at"
# from []
# to [a77bf74fb559cc91d3167022f6595e2fb471bac4]
#
# patch "tests/t_rename_dir_add_dir_with_old_name.at"
# from []
# to [b005c1839d019fa629d02fa1373f391715937594]
#
# patch "tests/t_update_nonexistent.at"
# from []
# to [a7f5255b645f8be25c40d15a62f9f5279bf2aa59]
#
# patch "testsuite.at"
# from [14b8600c48fdafc19eba6942e2270738b4bd8c71]
# to [63f222bf1549f1b5ea773c38860809fd131a88e4]
#
# patch "work.cc"
# from [2edb3fc960fee8c34b1abb13dff648ec63eeb40f]
# to [dd1b1800d78f63c9f5615622d7c638c01c2f7459]
#
--- .mt-attrs
+++ .mt-attrs
@@ -1,4 +1,4 @@
- file "contrib/Notify.pl"
+ file "contrib/monotone-notify.pl"
execute "true"
file "contrib/ciabot_monotone.py"
--- AUTHORS
+++ AUTHORS
@@ -52,6 +52,8 @@
Jon Bright
Corey Halpin
Jeremy Cowgar
+ Martin Dvorak
+ Emile Snyder
supporting files:
--- ChangeLog
+++ ChangeLog
@@ -1,8 +1,146 @@
2005-04-17 Matt Johnston
* Move base64 code as close to the database as possible,
to avoid unnecessary inflating and deflating.
+2005-04-17 Matt Johnston
+
+ * commands.cc: warn that dropkey won't truly erase the privkey
+ from the database
+ * monotone.texi: same
+
+2005-04-17 Matt Johnston
+
+ * database.cc: mention that it could be the filesystem that
+ is full in the SQLITE_FULL error message
+
+2005-04-16 Derek Scherger
+
+ * work.cc (known_preimage_path): rename to...
+ (known_path): this, since it's image agnostic
+ (build_deletions): update for renamed function
+ (build_rename): ensure rename source exists in current revision
+ and rename target does not exist in current revision
+
+ * tests/t_no_rename_overwrite.at: un-XFAIL
+
+2005-04-16 Nathaniel Smith
+
+ * app_state.{cc,hh} (set_author, set_date): New methods.
+ * cert.cc (cert_revision_date): Rename to...
+ (cert_revision_date_time): ...an overloaded version of this.
+ (cert_revision_author_default): Check app.date.
+ * cert.hh: Expose cert_revision_date_time.
+ * commands.cc (commit): Handle --date.
+ * main.cc: Parse --date and --author options.
+ * monotone.1: Document --date, --author.
+ * monotone.texi (Working Copy, OPTIONS): Likewise.
+
+ * tests/t_override_author_date.at: New test.
+ * testsuite.at: Add it.
+
+ This commit heavily based on a patch by Markus Schiltknecht
+ .
+
+2005-04-16 Nathaniel Smith
+
+ * ChangeLog: Fixup after merge.
+
+2005-04-17 Matthew Gregan
+
+ * monotone.cc: Fix warnings: add missing initializers.
+ * netsync.cc: Fix warnings: inline static vs static inline.
+
+2005-04-16 Nathaniel Smith
+
+ * tests/t_update_nonexistent.at: New test.
+ * testsuite.at: Add it.
+
+ * commands.cc (update): Verify that user's requested revision
+ exists.
+
+2005-04-16 Nathaniel Smith
+
+ * ChangeLog: Fixup after merge.
+
+2005-04-16 Emile Snyder
+
+ * tests/t_add_vs_commit.at: New test for failing case. If you
+ add a file in you working dir, someone else adds the same file
+ and commits, then you do an update it messes up your working
+ directory.
+ * testsuite.at: Add it.
+
+2005-04-16 Nathaniel Smith
+
+ * commands.cc (checkout): Move check for existence of revision
+ earlier.
+
+ * tests/t_netsync_defaults.at, tests/t_netsync_single.at:
+ Don't hard-code netsync port.
+
+2005-04-16 Nathaniel Smith
+
+ * testsuite.at: Use a random server port.
+
+ * .mt-attrs, contrib/README: Update for Notify.pl ->
+ monotone-notify.pl rename.
+
+ * monotone.1: Warn people off rcs_import.
+ * monotone.texi (Commands): Likewise.
+
+2005-04-16 Nathaniel Smith
+
+ * AUTHORS: Add Emile Snyder .
+
+2005-04-16 Nathaniel Smith
+
+ * tests/t_lf_crlf.at: New test from Emile Snyder
+ , with tweaks.
+ * testsuite.at: Add it.
+
+2005-04-16 Nathaniel Smith
+
+ * ChangeLog: Small fixups.
+
+2005-04-16 Sebastian Spaeth
+
+ * tests/t_cvsimport2.at: new test; CVS Attic files fail test
+ reported by: address@hidden 15.04.2005 02:45
+
+2005-04-16 Sebastian Spaeth
+
+ * tests/t_rcs_import.at: new test; problematic CVS import as
+ reported in the list. However it works just fine here, so it
+ really tests for a successful pass
+
+2005-04-16 Sebastian Spaeth
+
+ * tests/README: new file, on how to create/run tests
+
+2005-04-16 Nathaniel Smith
+
+ * tests/t_rename_dir_add_dir_with_old_name.at: XFAIL.
+
+2005-04-16 Nathaniel Smith
+
+ * tests/t_diff_binary.at: Un-XFAIL.
+
+2005-04-16 Nathaniel Smith
+
+ * monotone.texi (Network Service): Rewrite to include former
+ Exchanging Keys section.
+ (Branching and Merging): New tutorial section, inspired by a patch
+ from Martin Kihlgren .
+ (CVS Phrasebook): Add "Importing a New Project".
+
+ * AUTHORS: Add Martin Dvorak.
+
+2005-04-15 Martin Dvorak
+
+ * tests/t_rename_dir_add_dir_with_old_name.at: New test.
+ * testsuite.at: Add it.
+
2005-04-16 Matt Johnston
* change_set.cc (compose_rearrangement): remove logging statements
@@ -2771,7 +2909,7 @@
* AUTHORS: Mention Wojciech and Neil.
* revision.cc (calculate_ancestors_from_graph): Make non-recursive.
-2005-01-17 Wojciech MiÃ
Âkowski
+2005-01-17 Wojciech MiÅkowski
* std_hooks.lua: Teach about meld.
--- app_state.cc
+++ app_state.cc
@@ -273,6 +273,18 @@
}
void
+app_state::set_date(utf8 const & d)
+{
+ date = d;
+}
+
+void
+app_state::set_author(utf8 const & a)
+{
+ author = a;
+}
+
+void
app_state::set_depth(long d)
{
N(d > 0,
--- app_state.hh
+++ app_state.hh
@@ -33,6 +33,8 @@
bool rcfiles;
options_map options;
utf8 message;
+ utf8 date;
+ utf8 author;
utf8 search_root;
std::vector revision_selectors;
std::vector extra_rcfiles;
@@ -62,6 +64,8 @@
void set_signing_key(utf8 const & key);
void set_root(utf8 const & root);
void set_message(utf8 const & message);
+ void set_date(utf8 const & date);
+ void set_author(utf8 const & author);
void set_depth(long depth);
void add_revision(utf8 const & selector);
--- cert.cc
+++ cert.cc
@@ -566,11 +566,11 @@
string const testresult_cert_name = "testresult";
-static void
-cert_revision_date(revision_id const & m,
- boost::posix_time::ptime t,
- app_state & app,
- packet_consumer & pc)
+void
+cert_revision_date_time(revision_id const & m,
+ boost::posix_time::ptime t,
+ app_state & app,
+ packet_consumer & pc)
{
string val = boost::posix_time::to_iso_extended_string(t);
put_simple_revision_cert(m, date_cert_name, val, app, pc);
@@ -585,7 +585,7 @@
// make sure you do all your CVS conversions by 2038!
boost::posix_time::ptime tmp(boost::gregorian::date(1970,1,1),
boost::posix_time::seconds(static_cast(t)));
- cert_revision_date(m, tmp, app, pc);
+ cert_revision_date_time(m, tmp, app, pc);
}
void
@@ -593,7 +593,7 @@
app_state & app,
packet_consumer & pc)
{
- cert_revision_date(m, boost::posix_time::second_clock::universal_time(), app, pc);
+ cert_revision_date_time(m, boost::posix_time::second_clock::universal_time(), app, pc);
}
void
@@ -620,8 +620,7 @@
% app.branch_name);
author = key();
}
- put_simple_revision_cert(m, author_cert_name,
- author, app, pc);
+ cert_revision_author(m, author, app, pc);
}
void
--- cert.hh
+++ cert.hh
@@ -12,6 +12,7 @@
#include