# # patch "ChangeLog" # from [1bb1d1b5f0dbf6a68f0ba4e15f3eb0ac025bafff] # to [166dfee227e61c5ca0f1ebe84a792a4316c00549] # # patch "change_set.cc" # from [a0c21c3a857155cbd78f8dcd7b38afcd70ea9c22] # to [0d8fbd60bb97a9a1c6c598f310af7da400009224] # --- ChangeLog +++ ChangeLog @@ -1,993 +1,3 @@ -<<<<<<< variant A -2005-04-25 Nathaniel Smith - - * automate.cc (automate_parents, automate_children) - (automate_graph): New automate commands. - (automate_command): Add them. - * commands.cc (automate): Synopsisfy them. - * monotone.texi (Automation): Document them. - * tests/t_automate_graph.at, test/t_parents_children.at: Test - them. - * testsuite.at: Add the tests. - - * tests/t_automate_ancestors.at: Remove obsolete comment. - -2005-04-24 Derek Scherger - - * tests/t_rename_file_to_dir.at: - * tests/t_replace_file_with_dir.at: - * tests/t_replace_dir_with_file.at: new bug reports - * testsuite.at: include new tests - -2005-04-24 Derek Scherger - - * app_state.{cc,hh} (app_state): add all_files flag to the constructor - (set_all_files): new method for setting flag - - * basic_io.{cc,hh} (escape): expose public method to quote and - escape file_paths - (push_str_pair): use it internally - - * commands.cc (calculate_restricted_rearrangement): new function - factored out of calculate_restricted_revision - (calculate_restricted_revision): use new function - (struct unknown_itemizer): rename to ... - (struct file_itemizer): ... this; use a path_set rather than a - manifest map; build path sets of unknown and ignored files, rather - than simply printing them - (ls_unknown): adjust to compensate for itemizer changes - (print_inventory): new functions for printing inventory lines from - path sets and rename maps - (inventory): new command for printing inventory of working copy - files - - * manifest.cc (inodeprint_unchanged): new function factored out - from build_restricted_manifest_map - (classify_paths): new function to split paths from an old manifest - into unchanged, changed or missing sets for inventory - (build_restricted_manifest_map): adjust to use - inodeprint_unchanged - * manifest.hh (classify_paths): new public function - - * monotone.1: document new inventory command and associated - --all-files option - - * monotone.cc: add new --all-files option which will be specific - to the inventory command asap - - * monotone.texi (Informative): document new inventory command - (Commands): add manpage entry for inventory - (OPTIONS): add entries for --xargs, -@ and --all-files - - * tests/t_status_missing.at: remove bug priority flag - * tests/t_inventory.at: new test - * testsuite.at: include new test - -2005-04-24 Nathaniel Smith - - * monotone.texi (Database): Document 'db kill_rev_locally'. - -2005-04-24 Nathaniel Smith - - * ChangeLog: Fixup after merge. - -2005-04-24 Nathaniel Smith - - * manifest.cc (build_restricted_manifest_map): Careful to only - stat things once on the inodeprints fast-path. - (read_manifest_map): Hand-code a parser, instead of using - boost::regex. - * inodeprint.cc (read_inodeprint_map): Likewise. - -2005-04-23 Derek Scherger - - * (calculate_restricted_revision): remove redundant variables, - avoiding path_rearrangement assignments and associated sanity - checks - (calculate_current_revision): rename empty to empty_args for - clarity - -2005-04-23 Derek Scherger - - * commands.cc (calculate_base_revision): rename to ... - (get_base_revision): ... this, since it's not calculating anything - (calculate_base_manifest): rename to ... - (get_base_manifest): ... this, and call get_base_revision - (calculate_restricted_revision): call get_base_revision and remove - missing files stuff - (add): - (drop): - (rename): - (attr): call get_base_manifest - (ls_missing): - (revert): call get_base_revision - * manifest.{cc,hh} (build_restricted_manifest_map): don't return - missing files and don't produce invalid manifests; do report on - all missing files before failing - -2005-04-23 Derek Scherger - - * app_state.cc: - * database.cc: - * file_io.{cc, hh}: fix bad merge - -2005-04-23 Nathaniel Smith - - * database.cc (put_key): Check for existence of keys with - conflicting key ids, give more informative message than former SQL - constraint error. - -2005-04-23 Nathaniel Smith - - * transforms.cc (filesystem_is_ascii_extension_impl): Add EUC to - the list of ascii-extending encodings. - - * tests/t_multiple_heads_msg.at: Make more robust, add tests for - branching. - -2005-04-23 Nathaniel Smith - - * app_state.cc (restriction_includes): Remove some L()'s that were - taking 5-6% of time in large tree diff. - -2005-04-23 Nathaniel Smith - - * file_io.{cc,hh} (localized): Move from here... - * transforms.{cc,hh} (localized): ...to here. Add lots of gunk to - avoid calling iconv whenever possible. - -2005-04-22 Christof Petig - - * sqlite/*: update to sqlite 3.2.1 - -2005-04-22 Nathaniel Smith - - * manifest.cc (build_restricted_manifest_map): Fixup after merge - -- use file_exists instead of fs::exists. - -2005-04-22 Derek Scherger - - * manifest.{cc,hh} (build_restricted_manifest_map): keep and - return a set of missing files rather than failing on first missing - file - * commands.cc (calculate_restricted_revision): handle set of - missing files - * revision.hh: update comment on the format of a revision - * tests/t_status_missing.at: un-XFAIL and add a few tests - -2005-04-22 Nathaniel Smith - - * vocab.cc (verify(file_path), verify(local_path)): Normalize - paths on the way in. - * tests/t_normalized_filenames.at: Fix to match behavior - eventually declared "correct". - -2005-04-22 Nathaniel Smith - - * vocab.{cc,hh}: Make verify functions public, make ATOMIC(foo)'s - verify function a friend of foo, add ATOMIC_NOVERIFY macro, add - long comment explaining all this. - * vocab_terms.hh: Add _NOVERIFY to some types. - -2005-04-22 Nathaniel Smith - - * file_io.{cc,hh} (localized): Take file_path/local_path instead - of string; expose in public interface. Adjust rest of file to - match. - (walk_tree): Don't convert the (OS-supplied) current directory - from UTF-8 to current locale. - - * transforms.{cc,hh} (charset_convert): Be more informative on - error. - (calculate_ident): Localize the filename, even on the fast-path. - Also assert file exists and is not a directory, since Crypto++ - will happily hash directories. (They are like empty files, - apparently.) - - * manifest.cc (build_restricted_manifest_map): Use file_exists - instead of fs::exists, to handle localized paths. - * {win32,unix}/inodeprint.cc (inodeprint_file): Use localized - filenames to stat. - - * tests/t_i18n_file.at: Rewrite to work right. - - * tests/t_normalized_filenames.at: New test. - * testsuite.at: Add it. - * vocab.cc (test_file_path_verification): MT/path is not a valid - file_path either. - (test_file_path_normalization): New unit-test. - -2005-04-23 Matthew Gregan - - * tests/t_diff_currev.at: Use CHECK_SAME_STDOUT. - -2005-04-23 Matthew Gregan - - * tests/t_diff_currev.at: New test. - * testsuite.at: Add new test. - -2005-04-22 Joel Reed - - * work.cc (build_deletions) : on drop FILE also drop attributes. - * tests/t_drop_attr.at : test for success now, fixed bug. - -2005-04-22 Jon Bright - * monotone.texi: Changed all quoting of example command lines to - use " instead of ', since this works everywhere, but ' doesn't - work on Win32 - -2005-04-21 Jeremy Cowgar - - * tests/t_multiple_heads_msg.at: Now checks to ensure 'multiple head' - message does not occur on first commit (which creates a new head - but not multiple heads). - * commands.cc (CMD(commit)): renamed head_size to better described - old_head_size, now checks that old_head_size is larger than 0 as - well otherwise, on commit of a brand new project, a new head was - detected and a divergence message was displayed. - -2005-04-21 Richard Levitte - - * commands.cc (ALIAS): refactor so you don't have to repeat all - the strings given to the original command. - (ALIAS(ci)): added as a short form for CMD(commit). - - * Makefile.am (%.eps): create .eps files directly from .ps files, - using ps2eps. - -2005-04-21 Sebastian Spaeth - - * monotone.texi: add command reference docs about kill_rev_locally - -2005-04-21 Nathaniel Smith - - * change_set.cc (apply_path_rearrangement_can_fastpath) - (apply_path_rearrangement_fastpath) - (apply_path_rearrangement_slowpath, apply_path_rearrangement): - Refactor into pieces, so all versions of apply_path_rearrangement - can take a fast-path when possible. - -2005-04-21 Jeremy Cowgar - - * commands.cc: Renamed maybe_show_multiple_heads to - notify_if_multiple_heads, renamed headSize to head_size for - coding standards/consistency. - * tests/t_multiple_heads_msg.at: Added to monotone this time. - -2005-04-20 Jeremy Cowgar - - * commands.cc: Added maybe_show_multiple_heads, update now notifies - user of multiple heads if they exist, commit now notifies user - if their commit created a divergence. - * tests/t_multiple_heads_msg.at: Added - * testsuite.at: Added above test - -2005-04-20 Nathaniel Smith - - * Makefile.am (EXTRA_DIST): Put $(wildcard) around "debian/*", so - it will actually work. - -2005-04-20 Nathaniel Smith - - * Makefile.am (EXTRA_DIST): Include tests, even when not building - packages out in the source directory. - -2005-04-20 Matthew Gregan - - * commands.cc (kill_rev_locally): Move up with rest of non-CMD() - functions. Mark static. Minor whitespace cleanup. - * commands.hh (kill_rev_locally): Declaration not needed now. - -2005-04-20 Sebastian Spaeth - * automate.cc: fix typo, add sanity check to avoid empty r_id's - bein passed in. The automate version was bumped to 0.2 due to - popular request of a single person. - * t_automate_ancestors.at: adapt test; it passes now - -2005-04-20 Sebastian Spaeth - * testuite.at: - * t_automate_ancestors.at: new test; automate ancestors. This is still - _failing_ as a) it outputs empty newlines when no ancestor exists and - b) does not output all ancestors if multiple ids are supplied as input - -2005-04-20 Sebastian Spaeth - - * commands.cc: - * automate.cc: new command: automate ancestors - * monotone.texi: adapt documentation - -2005-04-20 Nathaniel Smith - - * tests/t_log_depth_single.at: - * tests/t_add_stomp_file.at: - * tests/t_log_depth.at: Shorten blurbs. - -2005-04-20 Nathaniel Smith - - * std_hooks.lua (ignore_file): Ignore compiled python files. - -2005-04-20 Jon Bright - * tests/t_sticky_branch.at: Really fix this test - -2005-04-20 Jon Bright - * tests/t_sticky_branch.at: Canonicalise stdout before comparison - * tests/t_setup_checkout_modify_new_dir.at: Ditto - * tests/t_netsync_largish_file.at: Check the file out rather - than catting it, so that canonicalisation is unneeded. - Canonicalisation is bad here, because the file is random - binary data, not text with line-ending conventions - -2005-04-20 Richard Levitte - - * contrib/monotone.el: define-after-key's KEY argument has to be a - vector with only one element. The code I used is taken directly - from the Emacs Lisp Reference Manual, section "Modifying Menus". - -2005-04-20 Nathaniel Smith - - * commands.cc (mdelta, mdata, fdelta, fdata, rdata): Check for - existence of command line arguments. - - * lua.{cc,hh} (hook_use_inodeprints): New hook. - * std_hooks.lua (use_inodeprints): Default definition. - * monotone.texi (Inodeprints): New section. - (Reserved Files): Document MT/inodeprints. - (Hook Reference): Document use_inodeprints. - * work.{cc,hh} (enable_inodeprints): New function. - * app_state.cc (create_working_copy): Maybe call - enable_inodeprints. - - * tests/t_inodeprints_hook.at: New test. - * tests/t_bad_packets.at: New test. - * testsuite.at: Add them. - -2005-04-20 Nathaniel Smith - - * AUTHORS: Actually add Joel Reed (oops). - -2005-04-20 Nathaniel Smith - - Most of this patch from Joel Reed, with only small tweaks myself. - - * AUTHORS: Add Joel Reed. - - * platform.hh (is_executable): New function. - * {unix,win32}/process.cc: Define it. - - * lua.cc (monotone_is_executable_for_lua): New function. - (lua_hooks): Register it. - (Lua::push_nil): New method. - (lua_hooks::hook_init_attributes): New hook. - * lua.hh: Declare it. - * monotone.texi (Hook Reference): Document it. - - * work.cc (addition_builder): Call new hook, collect attributes - for added files. - (build_additions): Set attributes on new files. - - * tests/t_attr_init.at: New test. - * tests/t_add_executable.at: New test. - * testsuite.at: Add them. - -2005-04-19 Nathaniel Smith - - * file_io.cc (read_localized_data, write_localized_data): Remove - logging of complete file contents. - * tests/t_lf_crlf.at: Remove --debugs, clean up, test more. - -2005-04-19 Emile Snyder - - * file_io.cc: Fix bugs with read/write_localized_data when using - CRLF line ending conversion. - * transforms.cc: Fix line_end_convert to add correct end of line - string if the split_into_lines() call causes us to lose one from - the end. - * tests/t_lf_crlf.at: Clean up and no longer XFAIL. - -2005-04-19 Sebastian Spaeth - - * monotone.texi: modified documentation to match changes due to - previous checking. - * AUTHORS: Adding myself - -2005-04-19 Sebastian Spaeth - - * automate.cc: make BRANCH optional in "automate heads BRANCH" - we use the default branch as given in MT/options if not specified - * commands.cc: BRANCH -> [BRANCH] in cmd description - -2005-04-19 Richard Levitte - - * contrib/monotone-import.pl (my_exit): As in monotone-notify.pl, - my_exit doesn't close any network connections. - - * testsuite.at (REVERT_TO): Make it possible to revert to a - specific branch. This is useful to resolve ambiguities. - * tests/t_merge_add_del.at: Use it. - -2005-04-19 Matthew Gregan - - * sanity.hh: Mark {naughty,error,invariant,index}_failure methods - as NORETURN. - * commands.cc (string_to_datetime): Drop earlier attempt at - warning fix, it did not work with Boost 1.31.0. Warning fixed by - change to sanity.hh. - -2005-04-19 Matthew Gregan - - * lua.cc (default_rcfilename): Use ~/.monotone/monotonerc. This - change is to prepare for the upcoming support for storing user - keys outside of the database (in ~/.monotone/keys/). - * app_state.cc (load_rcfiles): Refer to new rc file location in - comments. - * monotone.cc (options): Refer to new rc file location. - * monotone.texi: Refer to new rc file location. Also change bare - references to the rc file from '.monotonerc' to 'monotonerc'. - -2005-04-19 Matthew Gregan - - * commands.cc (log): 'depth' option did not handle the single file - case correctly. Also a couple of minor cleanups. - * tests/t_log_depth_single.at: New test. - * testsuite.at: Add test. - -2005-04-18 Matthew Gregan - - * commands.cc (string_to_datetime): Fix warning. - -2005-04-18 Richard Levitte - - * Makefile.am (EXTRA_DIST): Add contrib/monotone-import.pl. - - * contrib/monotone-import.pl: New script to mimic "cvs import". - * contrib/README: describe it. - - * commands.cc (CMD(attr)): Make it possible to drop file - attributes. - - * contrib/monotone-notify.pl (my_exit): The comment was incorrect, - there are no network connections to close gracefully. - Implement --ignore-merges, which is on by default, and changes the - behavior to not produce diffs on merges and propagates where the - ancestors hve already been shown. - - * tests/t_attr_drop.at: New test to check that 'attr drop' - correctly drops the given entry. - * tests/t_drop_attr.at: New test, similar to t_rename_attr.at. - * testsuite.at: Add them. - -2005-04-18 Nathaniel Smith - - * monotone.texi (Dealing with a Fork): Clarify (hopefully) what we - mean when we say that "update" is a dangerous command. - -2005-04-17 Matt Johnston - - * change_set.cc (confirm_proper_tree): remove incorrect code - setting confirmed nodes. - -2005-04-17 Matt Johnston - - * change_set.cc (confirm_proper_tree): use a std::set rather than - dynamic_bitset for the ancestor list, improving performance for - common tree structures. - * basic_io.cc: reserve() a string - -2005-04-17 Matt Johnston - - * packet.cc: fix up unit test compilation. - * transforms.cc: fix up unit test compilation. - -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 - character of a C string ... - -2005-04-15 Sebastian Spaeth - - * ui.cc: print byte progress to one decimal place - in k or M. - * netsync.cc: update dot ticker every 1024 bytes. - -2005-04-15 Matt Johnston - - * change_set.cc (confirm_proper_tree): use bitsets rather than maps - for tracking set membership. - * smap.hh: return reverse iterators properly, iterate over the vector - rather than self in ensure_sort() - -2005-04-14 Derek Scherger - - * database_check.cc (check_db): fail with N(...) when problems are - detected to exit with a non-zero status - -2005-04-14 Derek Scherger - - * monotone.texi (Informative): update description of 'diff' with - two revision arguments - -2005-04-14 Matthew Gregan - - * win32/process.cc: Fix build on MingW 3.2.0-rc[123] by adding - include. - -2005-04-14 Jon Bright - * win32/process.cc (process_spawn): Add some extra debug info - * std_hooks.lua (execute): If pid is -1, don't try and wait on - the process - -2005-04-14 Matt Johnston - - * change_set.cc (confirm_unique_entries_in_directories): use a - std::vector rather than std::map for better performance (only sort - once). - * smap.hh: an invariant - -2005-04-14 Nathaniel Smith - - * tests/t_vcheck.at: Update notes. - -2005-04-14 Jeremy Cowgar - - * monotone.texi (Making Changes): Fixed duplicate paragraph - * NEWS: Corrected spelling error in my name. - -2005-04-13 Nathaniel Smith - - * monotone.texi (Informative): 'diff' with two revision arguments - can now be filtered by file. - - * constants.cc (netcmd_payload_limit): Bump to 256 megs. - -2005-04-14 Olivier Andrieu - - * Makefile.am: silence cmp - -2005-04-14 Matthew Gregan - - * win32/terminal.cc (have_smart_terminal): Implement for Win32. - -2005-04-13 Matthew Gregan - - * tests/t_netsync_largish_file.at: Add test for netsyncing largish - (32MB) files. This test is failing at present. - * testsuite.at: Add new test. - -2005-04-13 Nathaniel Smith - - * tests/t_setup_checkout_modify_new_dir.at: - * tests/t_update_off_branch.at: New tests. - * testsuite.at: Add them. - - * commands.cc (checkout): Tweak branch checking logic. - (update): Make user explicitly switch branches. - -2005-04-13 Nathaniel Smith - - * rcs_import.cc (import_cvs_repo): Check that user isn't trying to - import a whole CVS repo. - * tests/t_cvsimport.at: Test new check. - -2005-04-13 Richard Levitte - - * contrib/Notify.pl: Rename ... - * contrib/monotone-notify.pl: ... to this. - * Makefile.am (EXTRA_DIST): Take note of the change. - * debian/docs: Distribute the contributions as well. - * debian/compat, debian/files, debian/monotone.1: Remove, since - they are self-generated by debhelper. They were obviously added - by mistake. - -2005-04-13 Nathaniel Smith - - * cert.cc (guess_branch): Call app.set_branch. - * app_state.cc (create_working_copy): Call make_branch_sticky - here... - * commands.cc (checkout): ...instead of here. - (approve, disapprove, fcommit, commit): Don't call app.set_branch - on guess_branch's output. - (checkout): Call guess_branch. - - * tests/t_sticky_branch.at: - * tests/t_checkout_id_sets_branch.at: New tests. - * testsuite.at: Add them. - -2005-04-12 Florian Weimer - - * app_state.cc (app_state::allow_working_copy): Only update - branch_name from the options file if it has not yet been set. Log - the branch name. - (app_state::set_branch): No longer update the options map. - (app_state::make_branch_sticky): New function which copies the - stored branch name to the options map. Only commands which call - this function change the branch default stored in the working - copy. - - * commands.cc (CMD(checkout)): Mark branch argument as sticky. - (CMD(commit)): Likewise. - (CMD(update)): Likewise. - - * monotone.texi (Working Copy): Mention that the "commit" and - "update" commands update the stored default branch ("checkout" - does, too, but this one should be obvious). - -2005-04-13 Matthew Gregan - * cryptopp/integer.h: Fix detection of GCC version for SSE2 - builds. - -2005-04-12 Jon Bright - * rcs_import.cc (find_key_and_state): Fix stupid bug in storing the - list of files a cvs_key contains. CVS delta invariant failure now - really fixed. The rearrangement failure still exists, though. - -2005-04-12 Jon Bright - * tests/t_cvsimport_samelog.at: Add test for the deltas.find - cvs import problem as sent to the ML by Emile Snyder. - * testsuite.at: Call it - * rcs_import.cc (cvs_key): Add an ID for debug output purposes, - sprinkle a little more debug output about what's being compared to - what - * rcs_import.cc (cvs_key): Maintain a map of file paths and CVS - versions appearing in this CVS key. - (cvs_key::similar_enough): A key is only similar enough if it doesn't - include a different version of the same file path. - (cvs_history::find_key_and_state): Add files to cvs_keys as - appropriate - -2005-04-12 Matthew Gregan - - * win32/terminal.cc (terminal_width): Use - GetConsoleScreenBufferInfo to request width information for - terminals. - -2005-04-12 Nathaniel Smith - - * ChangeLog: Fixup after merge. - -2005-04-12 Nathaniel Smith - - * platform.hh (terminal_width): New function. - * {unix,win32}/have_smart_terminal.cc: Rename to... - * {unix,win32}/terminal.cc: ...these. Implement terminal_width. - * ui.cc (write_ticks): Call it. - * Makefile.am: Update for renames. - -2005-04-11 Matt Johnston - - * ui.{cc,hh}, netsync.cc: netsync progress ticker in kilobytes to - avoid wrapping. - -2005-04-11 Jon Bright - * Makefile.am (EXTRA_DIST): Add debian/* - -2005-04-11 Jon Bright - * Makefile.am (EXTRA_DIST): Add win32/monotone.iss, PNG_FIGURES - (PNG_FIGURES): Add, constructing in same way as EPS_FIGURES - (monotone.html): Use .perlbak workaround so that this works on Win32 - -2005-04-10 Nathaniel Smith - - * Makefile.am (BUILT_SOURCES_CLEAN): Add package_revision.txt. - - This is the 0.18 release. - -2005-04-11 Matthew Gregan - - * unix/inodeprint.cc, configure.ac: Use nanosecond time resolution for - inodeprints on BSDs and other platforms if available. - -2005-04-10 Derek Scherger - - * monotone.texi (Informative): fix typo in ls known docs - -2005-04-10 Nathaniel Smith - - * Makefile.am: Use pdftops instead of acroread. - (EXTRA_DIST): Include new contrib/ files, and fix wildcards. - * NEWS: Update for 0.18. - * configure.ac: Bump version number. - * debian/changelog: Mention new release. - * debian/copyright: Update from AUTHORS. - * monotone.spec: Mention new release. - * po/monotone.pot: Regenerate. - -2005-04-10 Florian Weimer - - * monotone.texi (Commands): Use "working copy" instead of "working - directory", to match the rest of the manual. - -2005-04-10 Florian Weimer - - * commands.cc (ls_known): New function which prints all known - files in the working copy. - (CMD(list)): Invoke ls_known for "list known". Update help - message. - (ALIAS(ls)): Update help message. - - * monotone.texi: Document "list known". - * tests/t_ls_known.at: New file. - * testsuite.at: Include it. - -2005-04-10 Richard Levitte - - * contrib/Notify.pl: Count the number of messages sent, and - display the count at the end. - Version bumped to 1.0. - -2005-04-10 Matt Johnston - - * unix/inodeprint.cc, configure.ac: don't use the nsec time - on non-Linux-style systems (quick compile fix for OS X and probably - others, can be made generic later). - -2005-04-10 Olivier Andrieu - - * contrib/monotone.el: Some elisp code for running monotone from - inside Emacs. Supports diff, status, add, drop, revert and commit. - -2005-04-09 Richard Levitte - - * contrib/Notify.pl: Allow globbing branches. Make the revision - records branch specific. Show what records you would have updated - even with --noupdate. Add --before and --since, so users can - select datetime ranges to create logs for. Remove --to and add - --difflogs-to and --nodifflogs-to to send logs with diffs to one - address and logs without diffs to another (both can be given at - once). More and better documentation. - -2005-04-08 Nathaniel Smith - - * change_set.cc (basic_change_set): Remove problematic - rename_dir/add combination, until directory semantics are - fixed. - -2005-04-08 Nathaniel Smith - - * commands.cc (revert): Call maybe_update_inodeprints. - * app_state.cc (set_restriction): Clear any old restrictions - first. - -2005-04-08 Jon Bright - * testsuite.at (NOT_ON_WIN32): Add a function to prevent tests from - running on Win32 (for cases where the functionality being tested - makes no sense on Win32. Not for cases where the functionality - just isn't there yet on Win32.) - * tests/t_final_space.at: Use NOT_ON_WIN32. The filenames "a b" - and "a b " refer to the same file on Win32, obviating this test - -2005-04-08 Jon Bright - * win32/inodeprint.cc (inodeprint_file): Still close the file if - getting its time failed. - * tests/t_netsync_sigpipe.at: Don't bother doing a kill -PIPE on - Win32. There is no real SIGPIPE on Win32 and sockets don't get this - signal if their pipe goes away. MinGW's kill seems to translate - -PIPE to some signal that *does* kill monotone, so it seems like the - easiest solution is just not to send the signal in the first place - here. - * tests/t_automate_ancestry_difference.at: Remove old - CHECK_SAME_STDOUT call which I'd left by accident. - * tests/t_automate_leaves.at: Canonicalise monotone output before - passing to CHECK_SAME_STDOUT - * tests/t_log_depth.at: Check line count with arithmetic comparison - rather than autotest's string comparison - ->>>>>>> variant B 2005-04-27 Matt Johnston * change_set.cc (confirm_proper_tree): move things out of the loops @@ -1003,15 +13,15 @@ * monotone.texi: fix mashed up merge of docs for kill_rev_locally and db check. +2005-04-26 Richard Levitte + + * monotone.cc, commands.cc: Make some more options global. + 2005-04-25 Nathaniel Smith * tests/t_i18n_file_data.at: New test. * testsuite.at: Add it. -2005-04-26 Richard Levitte - - * monotone.cc, commands.cc: Make some more options global. - 2005-04-25 Nathaniel Smith * automate.cc (automate_parents, automate_children) @@ -1187,6 +197,10 @@ * tests/t_sticky_branch.at: and neither did 'log'... * tests/t_update_missing.at: nor did 'add'... +2005-04-22 Christof Petig + + * sqlite/*: update to sqlite 3.2.1 + 2005-04-22 Nathaniel Smith * manifest.cc (build_restricted_manifest_map): Fixup after merge @@ -2034,8 +1048,6 @@ * tests/t_log_depth.at: Check line count with arithmetic comparison rather than autotest's string comparison -####### Ancestor -======= end 2005-04-08 Nathaniel Smith * inodeprint.cc (operator<<): Typo. @@ -4506,13 +3518,7 @@ * AUTHORS: Mention Wojciech and Neil. * revision.cc (calculate_ancestors_from_graph): Make non-recursive. -<<<<<<< variant A -2005-01-17 Wojciech MiÂÃ…Â‚kowski ->>>>>>> variant B -2005-01-17 Wojciech MiÂ‚kowski -####### Ancestor -2005-01-17 Wojciech MiÃ…Â‚kowski -======= end +2005-01-17 Wojciech Mi‚kowski * std_hooks.lua: Teach about meld. --- change_set.cc +++ change_set.cc @@ -514,7 +514,6 @@ static void confirm_proper_tree(path_state const & ps) { -<<<<<<< variant A if (ps.empty()) return; @@ -533,23 +532,6 @@ tid curr; path_item item; ->>>>>>> variant B - if (ps.empty()) - return; - - I(ps.find(root_tid) == ps.end()); // Note that this find() also ensures - // sortedness of ps. - - tid min_tid = ps.begin()->first; - tid max_tid = ps.rbegin()->first; - size_t tid_range = max_tid - min_tid + 1; - - boost::dynamic_bitset<> confirmed(tid_range); - -####### Ancestor - std::map confirmed; - I(ps.find(root_tid) == ps.end()); -======= end for (path_state::const_iterator i = ps.begin(); i != ps.end(); ++i) { ancs.clear();