# # patch "ChangeLog" # from [f472f74007e16692ff52735d9afaaba88f5f8dc9] # to [ae8ba19f3e7aa1ed597b26359a2d320d98d01efe] # # patch "commands.cc" # from [0b37c574ff4f24aa3ef783d34654c53a4e067818] # to [9bd8efa9851b45da733ea27333a77e285a035c80] # # patch "tests/t_restrictions.at" # from [29c03a97f2a73304df7c28aac78c7b2e37195267] # to [be72348a94c89d89703de67b40c886edc2bef302] # --- ChangeLog +++ ChangeLog @@ -1,3 +1,8 @@ +2005-06-10 Joel Reed + + * commands.cc (CMD(cdiff)): Add OPT_DEPTH to command options. + * t_restrictions.at: Add to testcase. + 2005-06-09 Joel Reed * commands.cc (CMD(diff)): Add OPT_DEPTH back in, as it is used. --- commands.cc +++ commands.cc @@ -2687,7 +2687,7 @@ "If one revision is given, the diff between the working directory and\n" "that revision is shown. If two revisions are given, the diff between\n" "them is given.", - OPT_BRANCH_NAME % OPT_REVISION) + OPT_BRANCH_NAME % OPT_REVISION % OPT_DEPTH) { do_diff(name, app, args, context_diff); } --- tests/t_restrictions.at +++ tests/t_restrictions.at @@ -170,6 +170,12 @@ AT_CHECK(MONOTONE diff --depth=2 . , [], [stdout], [ignore]) AT_CHECK(grep fileA stdout, [0], [ignore]) +AT_CHECK(MONOTONE cdiff --depth=0 . , [], [stdout], [ignore]) +AT_CHECK(grep fileAB stdout, [1], [ignore]) + +AT_CHECK(MONOTONE cdiff --depth=2 . , [], [stdout], [ignore]) +AT_CHECK(grep fileA stdout, [0], [ignore]) + # include both source and target of rename AT_CHECK(MONOTONE diff work/fileX work/file1, [], [stdout], [ignore])