# 
# 
# patch "ChangeLog"
#  from [4d446a567c42ef0a8adef491d037b2576b1ae345]
#    to [59756589a4a8fe3b59168620afcdc83241ad0a90]
# 
# patch "cmd_diff_log.cc"
#  from [f6d42649c383f044795972dd578c1279f92ad487]
#    to [affe816395b210dbe0e632bc191f4dcd1d6a8177]
# 
# patch "tests/t_log_dir.at"
#  from [3893759bde1b1af1ad07dcf4cddb61e90f928924]
#    to [53f4cd7b11fcb5c7e3b3fb19a5ad5a19fee0c82c]
# 
============================================================
--- ChangeLog	4d446a567c42ef0a8adef491d037b2576b1ae345
+++ ChangeLog	59756589a4a8fe3b59168620afcdc83241ad0a90
@@ -1,3 +1,9 @@
+2006-04-24  Derek Scherger  <address@hidden>
+
+	* cmd_diff_log.cc (log): remove --recursive option from log;
+	directories are always recursive as with other restricted commands
+	* tests/t_log_dir.at: account for recursive directories
+
 2006-04-23  Nathaniel Smith  <address@hidden>
 
 	* commands.cc (attr): Use get_base_and_current_roster_shape
============================================================
--- cmd_diff_log.cc	f6d42649c383f044795972dd578c1279f92ad487
+++ cmd_diff_log.cc	affe816395b210dbe0e632bc191f4dcd1d6a8177
@@ -502,7 +502,7 @@
     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_NO_MERGES %
-    OPT_NO_FILES % OPT_RECURSIVE)
+    OPT_NO_FILES)
 {
   if (app.revision_selectors.size() == 0)
     app.require_workspace("try passing a --revision to start at");
@@ -558,7 +558,7 @@
           node_t n = todo.front();
           todo.pop_front();
           nodes.insert(n->self);
-          if (app.recursive && is_dir_t(n))
+          if (is_dir_t(n))
             {
               dir_t d = downcast_to_dir_t(n);
               for (dir_map::const_iterator i = d->children.begin();
============================================================
--- tests/t_log_dir.at	3893759bde1b1af1ad07dcf4cddb61e90f928924
+++ tests/t_log_dir.at	53f4cd7b11fcb5c7e3b3fb19a5ad5a19fee0c82c
@@ -71,16 +71,6 @@
 AT_CHECK(MTN log ., [], [stdout], [ignore])
 
 AT_CHECK(grep "^Revision: $REV1" stdout, [0], [ignore], [ignore])
-AT_CHECK(grep "^Revision: $REV2" stdout, [1], [ignore], [ignore])
-AT_CHECK(grep "^Revision: $REV3" stdout, [1], [ignore], [ignore])
-AT_CHECK(grep "^Revision: $REV4" stdout, [1], [ignore], [ignore])
-AT_CHECK(grep "^Revision: $REV5" stdout, [1], [ignore], [ignore])
-AT_CHECK(grep "^Revision: $REV6" stdout, [1], [ignore], [ignore])
-AT_CHECK(grep "^Revision: $REV7" stdout, [1], [ignore], [ignore])
-
-AT_CHECK(MTN log . -R, [], [stdout], [ignore])
-
-AT_CHECK(grep "^Revision: $REV1" stdout, [0], [ignore], [ignore])
 AT_CHECK(grep "^Revision: $REV2" stdout, [0], [ignore], [ignore])
 AT_CHECK(grep "^Revision: $REV3" stdout, [0], [ignore], [ignore])
 AT_CHECK(grep "^Revision: $REV4" stdout, [0], [ignore], [ignore])
@@ -88,7 +78,7 @@
 AT_CHECK(grep "^Revision: $REV6" stdout, [0], [ignore], [ignore])
 AT_CHECK(grep "^Revision: $REV7" stdout, [0], [ignore], [ignore])
 
-AT_CHECK(MTN log dir1 -R, [], [stdout], [ignore])
+AT_CHECK(MTN log dir1, [], [stdout], [ignore])
 
 AT_CHECK(grep "^Revision: $REV1" stdout, [1], [ignore], [ignore])
 AT_CHECK(grep "^Revision: $REV2" stdout, [0], [ignore], [ignore])
@@ -98,7 +88,7 @@
 AT_CHECK(grep "^Revision: $REV6" stdout, [1], [ignore], [ignore])
 AT_CHECK(grep "^Revision: $REV7" stdout, [1], [ignore], [ignore])
 
-AT_CHECK(MTN log dir2 -R, [], [stdout], [ignore])
+AT_CHECK(MTN log dir2, [], [stdout], [ignore])
 
 AT_CHECK(grep "^Revision: $REV1" stdout, [1], [ignore], [ignore])
 AT_CHECK(grep "^Revision: $REV2" stdout, [1], [ignore], [ignore])