hwright_at_tigris.org wrote on Tue, 16 Sep 2008 at 22:10 -0700:
> Author: hwright
> Date: Tue Sep 16 22:10:46 2008
> New Revision: 33117
>
> Log:
> On the ignore-mergeinfo branch:
> Teach the client diff APIs to honor the --ignore-mergeinfo flag. This
> does not yet implement this for 'diff --summarize', so we error out
> for that condition.
>
Short(er) option for this? Maybe --no-g alias?
Daniel
> * subversion/tests/cmdline/diff_tests.py
> (diff_ignore_mergeinfo): New test.
> (test_list): Run the new test.
>
> * subversion/libsvn_client/diff.c
> (display_prop_diffs): Accept an ignored_props parameter, and filter
> the displayed properties based on it. Lazily print the property
> diff section header and footer.
> (diff_cmd_baton): Add ignored_props hash.
> (diff_props_changed): Pass the ignored_props when displaying the prop
> diffs.
> (diff_parameters): Remove the ignored_props hash.
> (svn_client_diff5, svn_client_diff_peg5): Put the ignored_props in the
> correct baton.
> (svn_client_diff_summarize3, svn_client_diff_summarize_peg3): Error if
> attempting to ignore mergeinfo, because it is not yet supported.
>
> Modified:
> branches/ignore-mergeinfo/subversion/libsvn_client/diff.c
> branches/ignore-mergeinfo/subversion/tests/cmdline/diff_tests.py
>
.....
> + # Run and check vanilla diff
> + expected_output = [
> + "\n",
> + "Property changes on: A/B/E/beta\n",
> + "___________________________________________________________________\n",
> + "Added: svn:mergeinfo\n",
> + " Merged bar:r1-2\n",
> + "\n",
> + "Property changes on: iota\n",
> + "___________________________________________________________________\n",
> + "Added: svn:bar\n",
> + " + foo\n",
> + "\n",
> + ]
> + svntest.actions.run_and_verify_svn(None, expected_output, [], 'diff')
> + # Run and check --ignore-mergeinfo diff
> + expected_output = [
> + "\n",
> + "Property changes on: A/D/G/rho\n",
> + "___________________________________________________________________\n",
> + "Added: svn:bar\n",
> + " + foo\n",
> + "\n",
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-09-17 08:53:27 CEST