#
# add_file "tests/README"
#
# add_file "tests/t_add_stomp_file.at"
#
# add_file "tests/t_add_vs_commit.at"
#
# add_file "tests/t_cvsimport2.at"
#
# add_file "tests/t_database_check_minor.at"
#
# add_file "tests/t_db_kill_rev_locally.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 [48363e3c336bf23f49dcd9cc07f1461ec464695e]
# to [61efab75094672d58484e63167b5c48a21d0e5c4]
#
# patch "ChangeLog"
# from [b3e7d29d85bd050938da01d54c0d1a5139f9b317]
# to [a8c8177d569d38b1854e9b99413352ae7b1950d7]
#
# patch "app_state.cc"
# from [63120a266ad19ebd72022cf172ccbd0c299aa413]
# to [b821fb66100e7626444a2f1e4bc2af4d572880b1]
#
# patch "app_state.hh"
# from [a239548498beda52f5c4c4488917ef2516cf2fd8]
# to [cb2e94d501a33cfe4d861f8ece44f68a626b9b54]
#
# patch "cert.cc"
# from [f5dc319c1553610d1246dd94f7397669ab09a77f]
# to [f680bae9dd64dcfa40eef9a38038a160f5ddadcc]
#
# patch "cert.hh"
# from [4b8178c3e7303d3465932f7d44039e8315f850a6]
# to [e2b1d86c8f2610e854afed7ab661c4c2554e7004]
#
# patch "change_set.cc"
# from [f45da9e6d6bc784324d6f606a12d21c34a6f306d]
# to [514f646e5cc061ba8bf85e92eebd65357b4c85bf]
#
# patch "commands.cc"
# from [958cd3bbc982aef81f63b90b24dcebaddf135166]
# to [180e64e3feece8d9611ce2ab1eaaf85e44375cca]
#
# patch "commands.hh"
# from [f2f45ab20f37d33f52054ae343a0b1a099494a35]
# to [cce382e66cf7064f56e731f8e9a48fe8be62d71c]
#
# patch "contrib/README"
# from [6d1db875fa3a286389a8c19eee3b19bf1772a3d6]
# to [41748f8afac99a87841c3f94004bbfc6f4295611]
#
# patch "contrib/monotone-notify.pl"
# from [7b80bc10043bcd080e0a98742cd49a3c8aa7b8df]
# to [5fe63044551809be3609ccdd179c51b68109ffb1]
#
# patch "database.cc"
# from [221715fff7bde7114e97c033876cfd103d9e84ce]
# to [2f0d694a3ff58c86f98ae425dba01c9f0e467578]
#
# patch "database.hh"
# from [90a982ae9ae9e6ef58d778958e64735ba93b5029]
# to [7c532dedbdcb9c8dd9a19b7a80c3ce63a855f3c9]
#
# patch "database_check.cc"
# from [4cd1803a15f7248d15530e9a1b9f1440655341cf]
# to [3f9cec85909aa49e0da47732370e6ec427f2f4ba]
#
# patch "diff_patch.cc"
# from [c080a1bd6428d24243c0fc224414be6eb0fb7949]
# to [ef0c0571db4382835b2fa73475bd23cbe6a6ea33]
#
# patch "manifest.cc"
# from [3d231ab4795853b737dc33a8dcb2dd4d50361fbc]
# to [aefd8d086360ea7349a541e2dfc0f4f7c28d9913]
#
# patch "monotone.1"
# from [7ce55a7b2b6ec659e94edd7947ee9ce6c62053e1]
# to [33e5e256e415dd185535ac1331d44a9de3f243cc]
#
# patch "monotone.cc"
# from [65759f227bc57b92883f785551586f30039721cc]
# to [4c79e9536eda561c30ef51c3e03d08a154a2c40f]
#
# patch "monotone.texi"
# from [82e309cffe8832da1e871c00c9795af49531f1df]
# to [38e796ddafa66c78001fb53209d8c7e0dd8c0b75]
#
# patch "netsync.cc"
# from [177a062ed520ffe6ba1b92a07fbc6f7d8bcb2c0f]
# to [ec1c826c7bd7e01ce30946a1b9a7cce2d8be6b8e]
#
# patch "packet.cc"
# from [d5c6132eb05a5c5f64c504e465d825bf8a7e17d0]
# to [7f4cc56b5a4fd62495fcec98bcc2e67c6ddb96a8]
#
# patch "rcs_import.cc"
# from [4e0b292289773a83cad888d88a347d0423f1ad69]
# to [60f5ef2fcd089c3f6bde86d3dcca879dabe58d5b]
#
# patch "revision.cc"
# from [c2d18cfa9db45131465b2d6a7e569c7c96532528]
# to [bac73f865fd7cdfe7fd183a428fbffb27613e4bd]
#
# patch "sanity.cc"
# from [2fd252fa148582b35ba95b8ae368e2c500d4b01f]
# to [87f3bbf0785ac602b26fc8f36ff4efdf475db220]
#
# patch "sanity.hh"
# from [e7e2010f734f9e54499e14c700017b4f0577e9ac]
# to [952408e83f22dc43392c7afcffc6e556cfd80d6b]
#
# patch "tests/README"
# from []
# to [fdbb3d9f63642092343e0ea58b7ee937f910103a]
#
# patch "tests/t_add_stomp_file.at"
# from []
# to [ff7f16f34c202ec044ad232af78786bd119b5e98]
#
# patch "tests/t_add_vs_commit.at"
# from []
# to [7fd4b57e97609427e699e0cf3cca5c984ffd1330]
#
# patch "tests/t_cvsimport2.at"
# from []
# to [4641874ff2fbedf55b84c1169dd86e4d2354c36b]
#
# patch "tests/t_database_check.at"
# from [a5bf8e5ed630bd268f71307fd95a23e7affbd5ff]
# to [208a81e56219fc72a6db6330841255baab90824b]
#
# patch "tests/t_database_check_minor.at"
# from []
# to [eaba52f05e60be3f4bfc420af0722fd5ed63df02]
#
# patch "tests/t_db_kill_rev_locally.at"
# from []
# to [7833b3652bf45b72b9fb6490b86fe2b66d7105ee]
#
# 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 [78e75421c02747bc50d1966394370014a1e16858]
#
# patch "transforms.cc"
# from [012bff62d5ad1dc8bba4123b2b366b02de6fbb75]
# to [3c627fa48277dc799dd2fc2eccb8d7b9ca93688b]
#
# patch "transforms.hh"
# from [0886fc260e3989244f914da25c26e8b6ffc8342f]
# to [10ff93cf2f434ffbd5476823a28d883269f9d417]
#
# patch "vocab.hh"
# from [17d5f1d1a5d0cbd5c7edb41ba42e8023273b0e99]
# to [8748cf40dd076dd813dbdab8d722b6da167218f0]
#
# patch "vocab_terms.hh"
# from [45c113192d19c5615f5d9822d76c686c8a301849]
# to [e1637d600ff20487c2c87a9f46a5291a49c09b50]
#
# 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,3 +1,219 @@
+2005-04-17 Matt Johnston
+
+ * vocab_terms.hh: remove commented out lines.
+
+2005-04-17 Matt Johnston
+
+ * Move base64 code as close to the database as possible,
+ to avoid unnecessary inflating and deflating.
+
+2005-04-17 Nathaniel Smith
+
+ * monotone.texi (Branching and Merging): A few small edits.
+
+2005-04-17 Nathaniel Smith
+
+ * change_set.cc (path_item, sanity_check_path_item): Mark things
+ inline.
+
+2005-04-17 Henrik Holmboe
+
+ * contrib/monotone-notify.pl: Add signal handlers. Correct some
+ typos.
+ (my_exit): New function that does a cleanup and exit.
+
+2005-04-17 Olivier Andrieu
+
+ * transforms.cc: fix glob_to_regexp assertions
+
+2005-04-17 Sebastian Spaeth
+
+ * tests/t_db_kill_rev_locally.at: new test;
+ make sure that db kill_rev_locally works as intended
+
+2005-04-17 Sebastian Spaeth
+
+ * commands.cc,database.cc: add 'db kill_rev_locally ' command
+ still missing: documentation and autotests. Otherwise seems ok.
+
+2005-04-17 Richard Levitte
+
+ * transforms.cc: Remove tabs and make sure emacs doesn't add
+ them.
+
+2005-04-17 Nathaniel Smith
+
+ * sanity.{hh,cc} (E, error_failure): New sort of invariant.
+ * netsync.cc (process_hello_cmd): Make initial pull message
+ more clear and friendly.
+ Also, if the key has changed, that is an error, not naughtiness.
+ * database_check.cc (check_db): Database problems are also errors,
+ not naughtiness. Revamp output in case of errors, to better
+ distinguish non-serious errors and serious errors.
+ * tests/t_database_check.at: Update accordingly.
+ * tests/t_database_check_minor.at: New test.
+ * testsuite.at: Add it.
+
+2005-04-17 Richard Levitte
+
+ * transforms.cc (glob_to_regexp): New function that takes a glob
+ expression and transforms it into a regexp. This will be useful
+ for globbing branch expressions when collections are exchanged to
+ branch globs and regexps.
+ (glob_to_regexp_test): A unit test for glob_to_regexp().
+
+2005-04-16 Emile Snyder
+
+ * tests/t_add_stomp_file.at: New test for failing case.
+ If you have a file foo in your working dir (not monotone
+ controlled) and someone else adds a file foo and commits,
+ update should at least warn you before stomping your
+ non-recoverable foo file.
+ * testsuite.at: Add it.
+
+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
+ that were using noticable CPU time.
+
2005-04-15 Olivier Andrieu
* diff_patch.cc(guess_binary): do not use '\x00' as first
@@ -2796,7 +3012,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
@@ -37,6 +37,8 @@
bool rcfiles;
options_map options;
utf8 message;
+ utf8 date;
+ utf8 author;
utf8 search_root;
std::vector revision_selectors;
std::vector extra_rcfiles;
@@ -78,6 +80,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