# # patch "ChangeLog" # from [6130ffc24ae50a332bed1370193316acfda2ebf4] # to [f472f74007e16692ff52735d9afaaba88f5f8dc9] # # patch "commands.cc" # from [649e91dd9a739cda36beabe5ec90482eb4ff529a] # to [0b37c574ff4f24aa3ef783d34654c53a4e067818] # # patch "tests/t_restrictions.at" # from [d3500f6e212de48b798b050de730f4762e378b2e] # to [29c03a97f2a73304df7c28aac78c7b2e37195267] # --- ChangeLog +++ ChangeLog @@ -1,3 +1,9 @@ +2005-06-09 Joel Reed + + * commands.cc (CMD(diff)): Add OPT_DEPTH back in, as it is used. + * t_restrictions.at: Add to testcase to increase likelihood of + keeping it around :) + 2005-06-10 Richard Levitte * commands.cc (CMD(diff)): Remove OPT_DEPTH, as it was never --- commands.cc +++ commands.cc @@ -2697,7 +2697,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, unified_diff); } --- tests/t_restrictions.at +++ tests/t_restrictions.at @@ -93,6 +93,12 @@ AT_DATA(work/file3, [version 2 of file3 with some changes ]) +AT_DATA(work/A/fileA, [version 2 of fileA with some changes +]) + +AT_DATA(work/A/B/fileAB, [version 2 of fileAB with some changes +]) + AT_CHECK(MONOTONE rename work/fileX work/file1, [], [ignore], [ignore]) AT_CHECK(MONOTONE drop work/file2, [], [ignore], [ignore]) AT_CHECK(MONOTONE add work/file4, [], [ignore], [ignore]) @@ -158,6 +164,12 @@ AT_CHECK(MONOTONE diff, [], [stdout], [ignore]) AT_CHECK(INCLUDED(X 1 2 3 4), [0], [ignore]) +AT_CHECK(MONOTONE diff --depth=0 . , [], [stdout], [ignore]) +AT_CHECK(grep fileAB stdout, [1], [ignore]) + +AT_CHECK(MONOTONE diff --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])