# # # rename "tests/t_log_nofiles_merges.at" # to "tests/t_log_nofiles_nomerges.at" # # patch "ChangeLog" # from [e130fcd32c009c5f7ad8b31d5736aed3e9f67c09] # to [fc521557f68a948cbe747181cd25ef2d1b221a01] # # patch "app_state.cc" # from [d6bd147ff69418001cff7cfd08e7ec18deca23ab] # to [4990c26751504dded9cef9b1c6ffa66bef0d2b32] # # patch "app_state.hh" # from [7fb16348486ca507f22a99d6aca9ba2dc4a658c0] # to [03afbc7ba543f0b26f8ddf70d97c05e872cdb36b] # # patch "commands.cc" # from [981960f6974af94a4f65c7a07441ee6cea47a677] # to [56402af73e434e13767e819a3768d8a48d2bf155] # # patch "contrib/color-logs.conf" # from [ffe3e7270a2952c508db2f2d9c3df82e05c859f4] # to [87e8ceac1e0a8d173e2a0da01e659d048824e9ed] # # patch "contrib/color-logs.sh" # from [90a0de6aa87b7f4b39f7947fd1d359a3cc936385] # to [4e04daeee4ee8ce8bf6ce45f074ba16faf50ccf9] # # patch "contrib/monotone-notify.pl" # from [aa93d7f9f601b51d607bd4d779e472067c41d5a2] # to [d7f551f0f332f56785aaa59e99ade7400c8da84a] # # patch "contrib/monotone.el" # from [3dc1c23d499d1aa015ed7f145416a241a55f054f] # to [9e1a1ec218b98cd38c6126c48f00a1d585e65a13] # # patch "monotone.cc" # from [6626e22d6ef4d9c8d3380a2f498599dd57bc6d3d] # to [29890d9e90e828fa96d845cb881bb024a8267d99] # # patch "monotone.texi" # from [1fcc35f2ac3ca9ba692509cd29f6f5ff01b6616a] # to [e07e949a22798b27c90eade3e80a87ac13dd3022] # # patch "options.hh" # from [16194449c59ae0307ab9bbf15ae879f0f8063fdd] # to [216cb82f6f82b63b0f1535b39bb985a237b43359] # # patch "tests/t_log_nofiles_nomerges.at" # from [958b5e4229b1afd2c7ec131d0a239b28d792815f] # to [dedc7b333ac5e779f29464a1f62285ec787b6dd4] # # patch "testsuite.at" # from [c8be08d87b48f90c833c326e708aaa06423b1b75] # to [502fc24beaf3a23cd7858204ba755a78c94a3867] # ============================================================ --- ChangeLog e130fcd32c009c5f7ad8b31d5736aed3e9f67c09 +++ ChangeLog fc521557f68a948cbe747181cd25ef2d1b221a01 @@ -1,3 +1,15 @@ +2006-02-23 Matthew Gregan + + * app_state.cc, app_state.hh, commands.cc, monotone.cc, + options.hh: Revert failed UI experiment: reenable logging merges + by default and rename --merges back to --no-merges. + + * contrib/color-logs.{conf,sh}, contrib/monotone-notify.pl, + contrib/monotone.el, tests/t_log_nofiles_nomerges.at, + testsuite.at: Handle --no-merges. + + * monotone.texi: Document --no-merges. + 2006-02-23 Matt Johnston * enumerator.{cc,hh}: avoid transferring deltas on both sides of merge ============================================================ --- app_state.cc d6bd147ff69418001cff7cfd08e7ec18deca23ab +++ app_state.cc 4990c26751504dded9cef9b1c6ffa66bef0d2b32 @@ -31,7 +31,7 @@ app_state::app_state() : branch_name(""), db(system_path()), keys(this), stdhooks(true), rcfiles(true), diffs(false), - merges(false), set_default(false), verbose(false), date_set(false), + no_merges(false), set_default(false), verbose(false), date_set(false), search_root("/"), depth(-1), last(-1), next(-1), diff_format(unified_diff), diff_args_provided(false), use_lca(false), execute(false), bind_address(""), bind_port(""), ============================================================ --- app_state.hh 7fb16348486ca507f22a99d6aca9ba2dc4a658c0 +++ app_state.hh 03afbc7ba543f0b26f8ddf70d97c05e872cdb36b @@ -40,7 +40,7 @@ bool stdhooks; bool rcfiles; bool diffs; - bool merges; + bool no_merges; bool set_default; bool verbose; options_map options; ============================================================ --- commands.cc 981960f6974af94a4f65c7a07441ee6cea47a677 +++ commands.cc 56402af73e434e13767e819a3768d8a48d2bf155 @@ -3537,7 +3537,7 @@ CMD(log, N_("informative"), N_("[FILE] ..."), N_("print history in reverse order (filtering by 'FILE'). If one or more\n" "revisions are given, use them as a starting point."), - OPT_LAST % OPT_NEXT % OPT_REVISION % OPT_BRIEF % OPT_DIFFS % OPT_MERGES % + OPT_LAST % OPT_NEXT % OPT_REVISION % OPT_BRIEF % OPT_DIFFS % OPT_NO_MERGES % OPT_NO_FILES) { if (app.revision_selectors.size() == 0) @@ -3685,7 +3685,7 @@ inserter(next_frontier, next_frontier.end())); } - if (!app.merges && rev.is_merge_node()) + if (app.no_merges && rev.is_merge_node()) print_this = false; if (print_this) ============================================================ --- contrib/color-logs.conf ffe3e7270a2952c508db2f2d9c3df82e05c859f4 +++ contrib/color-logs.conf 87e8ceac1e0a8d173e2a0da01e659d048824e9ed @@ -1,6 +1,6 @@ # # this is a colorization config for reading the output of "monotone log" -# or "monotone diff", or best of all "monotone log --diffs". +# or "monotone diff", or best of all "monotone log --no-merges --diffs". # # use with the "colorize" script in this dir, or color-logs.sh # ============================================================ --- contrib/color-logs.sh 90a0de6aa87b7f4b39f7947fd1d359a3cc936385 +++ contrib/color-logs.sh 4e04daeee4ee8ce8bf6ce45f074ba16faf50ccf9 @@ -1,5 +1,5 @@ #!/bin/sh -./monotone log --diffs $@ \ +./monotone log --diffs --no-merges $@ \ | ./contrib/colorize -c contrib/color-logs.conf \ | less -r -p ----------------------------------------------------------------- ============================================================ --- contrib/monotone-notify.pl aa93d7f9f601b51d607bd4d779e472067c41d5a2 +++ contrib/monotone-notify.pl d7f551f0f332f56785aaa59e99ade7400c8da84a @@ -268,7 +268,7 @@ foreach my $revision (keys %revisions) { $revision_data{$revision} = [ map { chomp; $_ } - my_backtick("$monotone$database log --last=1 --merges --revision=$revision") ]; + my_backtick("$monotone$database log --last=1 --revision=$revision") ]; my $date = (split(' ', (grep(/^Date:/, @{$revision_data{$revision}}))[0]))[1]; if (defined $before && $date ge $before) { @@ -582,7 +582,7 @@ if (!defined $$revision_data{$revision}) { $$revision_data{$revision} = [ map { chomp; $_ } - my_backtick("$monotone$database log --last=1 --merges --revision=$revision") ]; + my_backtick("$monotone$database log --last=1 --revision=$revision") ]; } map { ============================================================ --- contrib/monotone.el 3dc1c23d499d1aa015ed7f145416a241a55f054f +++ contrib/monotone.el 9e1a1ec218b98cd38c6126c48f00a1d585e65a13 @@ -686,7 +686,7 @@ (when (eq 'tree (monotone-arg-decode arg)) (error "monotone subtree log is busted")) ;; - (let ((cmds (list "log")) + (let ((cmds (list "log" "--no-merges")) (depth monotone-log-depth)) (when (and (numberp depth) (< 0 depth)) (setq cmds (append cmds (list (format "--last=%d" depth))))) ============================================================ --- monotone.cc 6626e22d6ef4d9c8d3380a2f498599dd57bc6d3d +++ monotone.cc 29890d9e90e828fa96d845cb881bb024a8267d99 @@ -60,7 +60,7 @@ {"pid-file", 0, POPT_ARG_STRING, &argstr, OPT_PIDFILE, gettext_noop("record process id of server"), NULL}, {"brief", 0, POPT_ARG_NONE, NULL, OPT_BRIEF, gettext_noop("print a brief version of the normal output"), NULL}, {"diffs", 0, POPT_ARG_NONE, NULL, OPT_DIFFS, gettext_noop("print diffs along with logs"), NULL}, - {"merges", 0, POPT_ARG_NONE, NULL, OPT_MERGES, gettext_noop("include merges when printing logs"), NULL}, + {"no-merges", 0, POPT_ARG_NONE, NULL, OPT_NO_MERGES, gettext_noop("exclude merges when printing logs"), NULL}, {"set-default", 0, POPT_ARG_NONE, NULL, OPT_SET_DEFAULT, gettext_noop("use the current arguments as the future default"), NULL}, {"exclude", 0, POPT_ARG_STRING, &argstr, OPT_EXCLUDE, gettext_noop("leave out anything described by its argument"), NULL}, {"unified", 0, POPT_ARG_NONE, NULL, OPT_UNIFIED_DIFF, gettext_noop("use unified diff format"), NULL}, @@ -426,8 +426,8 @@ app.diffs = true; break; - case OPT_MERGES: - app.merges = true; + case OPT_NO_MERGES: + app.no_merges = true; break; case OPT_SET_DEFAULT: ============================================================ --- monotone.texi 1fcc35f2ac3ca9ba692509cd29f6f5ff01b6616a +++ monotone.texi e07e949a22798b27c90eade3e80a87ac13dd3022 @@ -4139,7 +4139,7 @@ to files changed within the current subdirectory of the workspace. @item monotone log address@hidden monotone log address@hidden address@hidden address@hidden [...]] [--brief] [--merges] [--no-files] [--diffs] address@hidden [...]] address@hidden monotone log address@hidden address@hidden address@hidden [...]] [--brief] [--no-merges] [--no-files] [--diffs] address@hidden [...]] This command prints out a log, in reverse-ancestry order, of small history summaries. Each summary contains author, date, changelog and @@ -4157,9 +4157,9 @@ revision in forward-ancestry order. This is useful to review changes that will be applied to the workspace when @command{update} is run. -By default, the log entries for merge nodes are not shown; usually -they don't contain much interesting information. If @code{--merges} is -given, the log entries for these nodes will be included. +By default, the log entries for merge nodes are shown. If address@hidden is given, the log entries for these nodes will be +excluded. If @code{--no-files} is given, the log output excludes the list of files changed in each revision. ============================================================ --- options.hh 16194449c59ae0307ab9bbf15ae879f0f8063fdd +++ options.hh 216cb82f6f82b63b0f1535b39bb985a237b43359 @@ -32,7 +32,7 @@ #define OPT_MSGFILE 23 #define OPT_BRIEF 24 #define OPT_DIFFS 25 -#define OPT_MERGES 26 +#define OPT_NO_MERGES 26 #define OPT_LAST 27 #define OPT_NEXT 28 #define OPT_VERBOSE 29 ============================================================ --- tests/t_log_nofiles_merges.at 958b5e4229b1afd2c7ec131d0a239b28d792815f +++ tests/t_log_nofiles_nomerges.at dedc7b333ac5e779f29464a1f62285ec787b6dd4 @@ -30,12 +30,12 @@ AT_CHECK(MONOTONE update, [], [ignore], [ignore]) R2=`BASE_REVISION` -# check that merge is excluded from log output +# check that merge is included by default AT_CHECK(MONOTONE log, [], [stdout], [ignore]) -AT_CHECK(grep '^Revision' stdout | grep $R2, [1], [ignore]) +AT_CHECK(grep '^Revision' stdout | grep $R2, [], [ignore]) -# and that it has been included by --merges -AT_CHECK(MONOTONE log --merges, [], [stdout], [ignore]) -AT_CHECK(grep '^Revision' stdout | grep $R2, [], [ignore]) +# and that it is excluded by --no-merges +AT_CHECK(MONOTONE log --no-merges, [], [stdout], [ignore]) +AT_CHECK(grep '^Revision' stdout | grep $R2, [1], [ignore]) AT_CLEANUP ============================================================ --- testsuite.at c8be08d87b48f90c833c326e708aaa06423b1b75 +++ testsuite.at 502fc24beaf3a23cd7858204ba755a78c94a3867 @@ -776,6 +776,6 @@ m4_include(tests/t_ls_changed.at) m4_include(tests/t_revert_new_project.at) m4_include(tests/t_db_kill_rev_locally_2.at) -m4_include(tests/t_log_nofiles_merges.at) +m4_include(tests/t_log_nofiles_nomerges.at) m4_include(tests/t_cvsimport_branch.at) m4_include(tests/t_log_to_file.at)