# # # patch "NEWS" # from [f76a1c6eef85248185d82e27a78d8c10f73d6b29] # to [7e0c3945a6cd7f5491d2dfd6fb1ee09c4fc141f2] # # patch "cmd_files.cc" # from [f53028c22e50756661830346f369c948f26567b8] # to [b27d724ed5811101b9a33fc6a0cb597c92fd33bb] # # patch "monotone.texi" # from [873f16832743a07b056fd1ecc3512d3b94e4a01d] # to [3c6f569d7f0b5845794ac5c0bdec504f78a08e29] # # patch "options_list.hh" # from [44bb545b06f4a7d22e4a5440283b7ac329903137] # to [019848585281b6bdd70bd2d0a03b8a7dacff6458] # # patch "tests/alias_command/__driver__.lua" # from [55a16e110fd2e8d79fed209d6a61e0e54c369a7d] # to [26efffb04bee267732493e69aaa84f8c5db054d1] # # patch "tests/annotate_accidental_clean_merge/__driver__.lua" # from [63b05cf0e5ab7d9455d89b319d505071d9672063] # to [f05fc9bf8af5630df1a97ac3594ebf3bb3c2b1c6] # # patch "tests/annotate_file_whose_name_changed/__driver__.lua" # from [2d20d0616dbfbd86dac99b2a70a049889ca93a79] # to [6b566d90f54c88a279fe6fd060f039b5bf99babb] # # patch "tests/annotate_where_line_splits/__driver__.lua" # from [c29bd0e809ca8396bee102f52b97a2d96ecdc4de] # to [0bbf5c9a101ee66a732e8e3e649f5a425924f054] # # patch "tests/annotate_where_lineage_depends_on_traversal/__driver__.lua" # from [ad8dc37c489544dc5437769b1479111f56c7fe50] # to [238379173a13eee723eae1c2c88f6072fb34699a] # # patch "tests/annotate_where_one_parent_is_full_copy/__driver__.lua" # from [33d7561d689738a899e4e1b98cf0941cf6b1de91] # to [b5c1f5d68ed4dda1c620d516fdd2759e32b06616] # # patch "tests/test_annotate_command/__driver__.lua" # from [b0c643f1034a5b7ff9ae61b4473aae3adba4cb87] # to [f9a63106c67781c7c40bc1851a1ddba686c447d6] # ============================================================ --- NEWS f76a1c6eef85248185d82e27a78d8c10f73d6b29 +++ NEWS 7e0c3945a6cd7f5491d2dfd6fb1ee09c4fc141f2 @@ -9,6 +9,9 @@ of this particular revision back to the workspace to allow easy re-committing afterwards + - the "--brief" switch for mtn annotate has been renamed to + "--revs-only" for clarity + Bugs fixed - mtn automate heads called without a branch argument now properly @@ -19,6 +22,12 @@ roster already exists, i.e. was left behind by the command `mtn db kill_rev_locally REV` (savannah #18990) + Documentation changes + + - the documentation of the "--revs-only" (formerly "--brief") + switch for the annotate command didn't match its actual + behavior, this has been fixed + Other - contrib/usher.cc has been removed. Please use the ============================================================ --- cmd_files.cc f53028c22e50756661830346f369c948f26567b8 +++ cmd_files.cc b27d724ed5811101b9a33fc6a0cb597c92fd33bb @@ -124,7 +124,7 @@ CMD(annotate, "annotate", "", CMD_REF(in N_("Prints an annotated copy of a file"), N_("Calculates and prints an annotated copy of the given file from " "the specified REVISION."), - options::opts::revision | options::opts::brief) + options::opts::revision | options::opts::revs_only) { revision_id rid; @@ -185,7 +185,7 @@ CMD(annotate, "annotate", "", CMD_REF(in file_t file_node = downcast_to_file_t(node); L(FL("annotate for file_id %s") % file_node->self); - do_annotate(app, file_node, rid, !app.opts.brief); + do_annotate(app, file_node, rid, app.opts.revs_only); } CMD(identify, "identify", "", CMD_REF(debug), N_("[PATH]"), ============================================================ --- monotone.texi 873f16832743a07b056fd1ecc3512d3b94e4a01d +++ monotone.texi 3c6f569d7f0b5845794ac5c0bdec504f78a08e29 @@ -4814,18 +4814,17 @@ @section Informative where those files are changed. @item mtn annotate @var{file} address@hidden mtn annotate address@hidden [--brief] @var{file} address@hidden mtn annotate address@hidden [--revs-only] @var{file} -Dumps an annotated copy of the file to stdout. In the absence of the address@hidden flag, each line of the file -is translated to : in the output, where -is the revision in which that line of the file was last edited. +Dumps an annotated copy of the file to stdout. The output is in the form +.. by : Only the first 8 +characters of the revision id are displayed, the author cert value is +truncated at the first @code{@@} or space character and the date field +is truncated to remove the time of day. -If @option{--brief} is specified, the output is in the form -.. by : -Only the first 8 characters of the revision id are displayed, the -author cert value is truncated at the first @code{@@} or space -character and the date field is truncated to remove the time of day. +If @option{--revs-only} is specified, each line of the file is +translated to : in the output, where +is the revision in which that line of the file was last edited. @item mtn complete file @var{partial-id} @itemx mtn complete [--brief] key @var{partial-id} ============================================================ --- options_list.hh 44bb545b06f4a7d22e4a5440283b7ac329903137 +++ options_list.hh 019848585281b6bdd70bd2d0a03b8a7dacff6458 @@ -78,6 +78,14 @@ OPT(brief, "brief", bool, false, } #endif +OPT(revs_only, "revs-only", bool, false, + gettext_noop("annotate using full revision ids only")) +#ifdef option_bodies +{ + revs_only = true; +} +#endif + GOPT(conf_dir, "confdir", system_path, get_default_confdir(), gettext_noop("set location of configuration directory")) #ifdef option_bodies ============================================================ --- tests/alias_command/__driver__.lua 55a16e110fd2e8d79fed209d6a61e0e54c369a7d +++ tests/alias_command/__driver__.lua 26efffb04bee267732493e69aaa84f8c5db054d1 @@ -56,7 +56,7 @@ rev_f = base_revision() commit() rev_f = base_revision() -check(mtn("praise", "foo", "--brief", "--rcfile=extra_rc"), 0, true, true) +check(mtn("praise", "foo", "--revs-only", "--rcfile=extra_rc"), 0, true, true) check(qgrep(rev_a .. ": first", "stdout")) check(qgrep(rev_e1 .. ": second", "stdout") @@ -65,7 +65,7 @@ check(qgrep(rev_f .. ": fourth", "stdout check(qgrep(rev_a .. ": third", "stdout")) check(qgrep(rev_f .. ": fourth", "stdout")) -check(mtn("blame", "foo", "--brief", "--rcfile=extra_rc"), 0, true, true) +check(mtn("blame", "foo", "--revs-only", "--rcfile=extra_rc"), 0, true, true) check(qgrep(rev_a .. ": first", "stdout")) check(qgrep(rev_e1 .. ": second", "stdout") ============================================================ --- tests/annotate_accidental_clean_merge/__driver__.lua 63b05cf0e5ab7d9455d89b319d505071d9672063 +++ tests/annotate_accidental_clean_merge/__driver__.lua f05fc9bf8af5630df1a97ac3594ebf3bb3c2b1c6 @@ -54,7 +54,7 @@ rev_f = base_revision() commit() rev_f = base_revision() -check(mtn("annotate", "foo", "--brief"), 0, true, true) +check(mtn("annotate", "foo", "--revs-only"), 0, true, true) check(qgrep(rev_a .. ": first", "stdout")) check(qgrep(rev_e1 .. ": second", "stdout") ============================================================ --- tests/annotate_file_whose_name_changed/__driver__.lua 2d20d0616dbfbd86dac99b2a70a049889ca93a79 +++ tests/annotate_file_whose_name_changed/__driver__.lua 6b566d90f54c88a279fe6fd060f039b5bf99babb @@ -1,3 +1,4 @@ +-- -*-lua-*- mtn_setup() revs = {} @@ -34,5 +35,5 @@ revs.merged = base_revision() -- right: x -- -check(mtn("annotate", "--brief", "foo.new"), 0, true, false) +check(mtn("annotate", "--revs-only", "foo.new"), 0, true, false) check(greplines("stdout", {revs.base, revs.base, revs.right})) ============================================================ --- tests/annotate_where_line_splits/__driver__.lua c29bd0e809ca8396bee102f52b97a2d96ecdc4de +++ tests/annotate_where_line_splits/__driver__.lua 0bbf5c9a101ee66a732e8e3e649f5a425924f054 @@ -1,3 +1,4 @@ +-- -*-lua-*- mtn_setup() revs = {} @@ -50,5 +51,5 @@ L("revs.d = ", revs.d, "\n") -- REVD: d -- -check(mtn("--debug", "annotate", "--brief", "foo"), 0, true, true) +check(mtn("--debug", "annotate", "--revs-only", "foo"), 0, true, true) check(greplines("stdout", {revs.a, revs.a, revs.b, revs.c, revs.a, revs.d})) ============================================================ --- tests/annotate_where_lineage_depends_on_traversal/__driver__.lua ad8dc37c489544dc5437769b1479111f56c7fe50 +++ tests/annotate_where_lineage_depends_on_traversal/__driver__.lua 238379173a13eee723eae1c2c88f6072fb34699a @@ -1,3 +1,4 @@ +-- -*-lua-*- mtn_setup() revs = {} @@ -49,5 +50,5 @@ L("revs.d = ", revs.d, "\n") -- REVD: added line -- -check(mtn("--debug", "annotate", "--brief", "foo"), 0, true, true) +check(mtn("--debug", "annotate", "--revs-only", "foo"), 0, true, true) check(greplines("stdout", {revs.a, revs.a, revs.b, revs.c, revs.a, revs.d})) ============================================================ --- tests/annotate_where_one_parent_is_full_copy/__driver__.lua 33d7561d689738a899e4e1b98cf0941cf6b1de91 +++ tests/annotate_where_one_parent_is_full_copy/__driver__.lua b5c1f5d68ed4dda1c620d516fdd2759e32b06616 @@ -1,3 +1,4 @@ +-- -*-lua-*- mtn_setup() @@ -45,5 +46,5 @@ revs.d = base_revision() -- REVA: c -- -check(mtn("annotate", "--brief", "foo"), 0, true, false) +check(mtn("annotate", "--revs-only", "foo"), 0, true, false) check(greplines("stdout", {revs.a, revs.a, revs.b, revs.b, revs.a})) ============================================================ --- tests/test_annotate_command/__driver__.lua b0c643f1034a5b7ff9ae61b4473aae3adba4cb87 +++ tests/test_annotate_command/__driver__.lua f9a63106c67781c7c40bc1851a1ddba686c447d6 @@ -1,3 +1,4 @@ +-- -*-lua-*- mtn_setup() revs = {} @@ -36,14 +37,14 @@ check(mtn("annotate", "."), 1, false, fa -- REV0: b -- REV1: x -check(mtn("annotate", "--brief", "foo0"), 0, true, false) +check(mtn("annotate", "--revs-only", "foo0"), 0, true, false) check(greplines("stdout", {revs[1], revs[0], revs[0], revs[1]})) -- -- unchanged should have all (3) lines from REV0 -- -check(mtn("annotate", "--brief", "unchanged"), 0, true, false) +check(mtn("annotate", "--revs-only", "unchanged"), 0, true, false) check(greplines("stdout", {revs[0], revs[0], revs[0]})) -- @@ -52,7 +53,7 @@ check(greplines("stdout", {revs[0], revs -- REV2: 11 -- REV3: 22 -check(mtn("annotate", "--brief", "bar0"), 0, true, false) +check(mtn("annotate", "--revs-only", "bar0"), 0, true, false) check(greplines("stdout", {revs[1], revs[2], revs[3]})) @@ -71,10 +72,10 @@ revs[4] = base_revision() -- -- Now the previous annotate results should be reversed -- -check(mtn("annotate", "--brief", "bar0"), 0, true, false) +check(mtn("annotate", "--revs-only", "bar0"), 0, true, false) check(greplines("stdout", {revs[1], revs[0], revs[0], revs[1]})) -check(mtn("annotate", "--brief", "foo0"), 0, true, false) +check(mtn("annotate", "--revs-only", "foo0"), 0, true, false) check(greplines("stdout", {revs[1], revs[2], revs[3]})) -- @@ -111,5 +112,5 @@ check(mtn("merge"), 0, false, false) -- REV9: changed on the -- REV8: right fork -check(mtn("annotate", "--brief", "forkfile"), 0, true, false) +check(mtn("annotate", "--revs-only", "forkfile"), 0, true, false) check(greplines("stdout", {revs[8], revs[9], revs[8]}))