#
#
# patch "ChangeLog"
# from [2d5df0e78d7078432c18bd807269c1f7f648bbef]
# to [ac9340c6c4fa7b480c46f7239e4e1d81e5cfc5c1]
#
# patch "app_state.cc"
# from [18045740e735562c70e3a482927003729014844f]
# to [d6bd147ff69418001cff7cfd08e7ec18deca23ab]
#
# patch "app_state.hh"
# from [7fa51b357c748547e5d71dbc84fb35077c148177]
# to [7fb16348486ca507f22a99d6aca9ba2dc4a658c0]
#
# patch "commands.cc"
# from [fcdf6b54a899e0273098115c0cdf496f39edaaa1]
# to [0ddca22048a95d54a1a45230c3f8f6cb2a7e6f0a]
#
# patch "monotone.cc"
# from [92399bda2cd0fba92739636d7b0955c1c43bea23]
# to [be4b86d0b45dd8e7878dab48d35da8fb9df8d327]
#
# patch "monotone.texi"
# from [0d7dfe06bd5f010a0d27fe896ed945fc9c0adbfd]
# to [9b606b6966a813c818fab81aba89367aa0644533]
#
# patch "options.hh"
# from [6dc48543e2cb20ea82ded241dc5bb6088c3cb09c]
# to [e8d50e333b5dd4045c96a414a83ce7cc9e48f551]
#
============================================================
--- ChangeLog 2d5df0e78d7078432c18bd807269c1f7f648bbef
+++ ChangeLog ac9340c6c4fa7b480c46f7239e4e1d81e5cfc5c1
@@ -1,3 +1,13 @@
+2006-02-18 Matthew Gregan
+
+ * app_state.cc, app_state.hh, commands.cc, monotone.cc,
+ options.hh: Add '--no-files' option to log to allow users to
+ exclude the list of files changed in each revision from the log
+ output.
+
+ * monotone.texi: Document '--no-files', and '--next' and '--diffs'
+ while there.
+
2006-02-17 Matthew Gregan
* lua.cc, lua.hh, monotone.texi, std_hooks.lua, test_hooks.lua,
============================================================
--- app_state.cc 18045740e735562c70e3a482927003729014844f
+++ app_state.cc d6bd147ff69418001cff7cfd08e7ec18deca23ab
@@ -36,7 +36,7 @@
depth(-1), last(-1), next(-1), diff_format(unified_diff), diff_args_provided(false),
use_lca(false), execute(false), bind_address(""), bind_port(""),
missing(false), unknown(false),
- confdir(get_default_confdir()), have_set_key_dir(false)
+ confdir(get_default_confdir()), have_set_key_dir(false), no_files(false)
{
db.set_app(this);
lua.set_app(this);
============================================================
--- app_state.hh 7fa51b357c748547e5d71dbc84fb35077c148177
+++ app_state.hh 7fb16348486ca507f22a99d6aca9ba2dc4a658c0
@@ -73,6 +73,7 @@
system_path confdir;
bool have_set_key_dir;
std::set attrs_to_drop;
+ bool no_files;
std::map explicit_option_map; // set if the value of the flag was explicitly given on the command line
void set_is_explicit_option (int option_id);
============================================================
--- commands.cc fcdf6b54a899e0273098115c0cdf496f39edaaa1
+++ commands.cc 0ddca22048a95d54a1a45230c3f8f6cb2a7e6f0a
@@ -3536,7 +3536,8 @@
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_MERGES %
+ OPT_NO_FILES)
{
if (app.revision_selectors.size() == 0)
app.require_workspace("try passing a --revision to start at");
@@ -3711,7 +3712,7 @@
log_certs(app, rid, branch_name, "Branch: ", false);
log_certs(app, rid, tag_name, "Tag: ", false);
- if (! csum.cs.empty())
+ if (!app.no_files && !csum.cs.empty())
{
cout << endl;
csum.print(cout, 70);
============================================================
--- monotone.cc 92399bda2cd0fba92739636d7b0955c1c43bea23
+++ monotone.cc be4b86d0b45dd8e7878dab48d35da8fb9df8d327
@@ -74,6 +74,7 @@
{"unknown", 0, POPT_ARG_NONE, NULL, OPT_UNKNOWN, gettext_noop("perform the operations for unknown files from workspace"), NULL},
{"key-to-push", 0, POPT_ARG_STRING, &argstr, OPT_KEY_TO_PUSH, gettext_noop("push the specified key even if it hasn't signed anything"), NULL},
{"drop-attr", 0, POPT_ARG_STRING, &argstr, OPT_DROP_ATTR, gettext_noop("when rosterifying, drop attrs entries with the given key"), NULL},
+ {"no-files", 0, POPT_ARG_NONE, NULL, OPT_NO_FILES, gettext_noop("exclude files when printing logs"), NULL},
{ NULL, 0, 0, NULL, 0, NULL, NULL }
};
@@ -519,6 +520,10 @@
app.attrs_to_drop.insert(string(argstr));
break;
+ case OPT_NO_FILES:
+ app.no_files = true;
+ break;
+
case OPT_HELP:
default:
requested_help = true;
============================================================
--- monotone.texi 0d7dfe06bd5f010a0d27fe896ed945fc9c0adbfd
+++ monotone.texi 9b606b6966a813c818fab81aba89367aa0644533
@@ -4139,26 +4139,37 @@
to files changed within the current subdirectory of the workspace.
@item monotone log
address@hidden monotone log address@hidden address@hidden [...]] [--brief] [--merges] address@hidden [...]]
address@hidden monotone log address@hidden address@hidden address@hidden [...]] [--brief] [--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
-comment information associated with a revision.
+comment information associated with a revision.
If @code{--brief} is given, the output consists of one line per revision
with the revision ID, the author, the date and the branches (separated
with commas).
-If @address@hidden is given, at most that many log entries will be
+If @address@hidden is given, at most @var{n} log entries will be
given.
-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.
+If @address@hidden is given, at most @var{n} log entries towards
+the current head revision will be given from the workspace's base
+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.
+
+If @code{--no-files} is given, the log output excludes the list of
+files changed in each revision.
+
+Specifying @code{--diffs} causes the log output to include a unified
+diff of the changes in each revision.
+
If one or more revision IDs are given, the command starts tracing back
-through history from these revisions, otherwise it starts from the base
-revision of your workspace.
+through history from these revisions, otherwise it starts from the
+base revision of your workspace.
If one or more files are given, the command will only log the revisions
where those files are changed.
============================================================
--- options.hh 6dc48543e2cb20ea82ded241dc5bb6088c3cb09c
+++ options.hh e8d50e333b5dd4045c96a414a83ce7cc9e48f551
@@ -51,3 +51,4 @@
#define OPT_KEY_TO_PUSH 42
#define OPT_CONF_DIR 43
#define OPT_DROP_ATTR 44
+#define OPT_NO_FILES 45