[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r985735 - in /subversion/trunk/subversion: libsvn_client/repos_diff_summarize.c tests/cmdline/diff_tests.py

From: Hyrum K. Wright <hyrum_wright_at_mail.utexas.edu>
Date: Mon, 16 Aug 2010 14:26:45 -0500

On Sun, Aug 15, 2010 at 2:04 PM, <sbutler_at_apache.org> wrote:
> Author: sbutler
> Date: Sun Aug 15 19:04:54 2010
> New Revision: 985735
>
> URL: http://svn.apache.org/viewvc?rev=985735&view=rev
> Log:
> Eliminate 'AM' in 'svn diff --summarize' output, for items added with
> properties.  Print 'A ' instead, which is consistent with 'svn status'.

There is another place where this same inconsistency appears: using
the pre-populated log message when committing (basically running 'svn
ci' without -m or -F).

>
> The bug existed since 1.6 (or mayber earlier) over ra_file and ra_svn
> only.  Dunno why ra_dav wasn't affected.
>
> * subversion/libsvn_client/repos_diff_summarize.c:
>  (change_prop): Set prop_changed only if not added.
>
> * subversion/tests/cmdline/diff_tests.py:
>  (basic_diff_summarize): Tweak expectations to eliminate prop-
>   mod for added items.
>  (test_list): Remove conditional Skip() for basic_diff_summarize.
>
> Modified:
>    subversion/trunk/subversion/libsvn_client/repos_diff_summarize.c
>    subversion/trunk/subversion/tests/cmdline/diff_tests.py
>
> Modified: subversion/trunk/subversion/libsvn_client/repos_diff_summarize.c
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/repos_diff_summarize.c?rev=985735&r1=985734&r2=985735&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/libsvn_client/repos_diff_summarize.c (original)
> +++ subversion/trunk/subversion/libsvn_client/repos_diff_summarize.c Sun Aug 15 19:04:54 2010
> @@ -298,7 +298,9 @@ change_prop(void *entry_baton,
>   if (svn_property_kind(NULL, name) == svn_prop_regular_kind)
>     {
>       ensure_summarize(ib);
> -      ib->summarize->prop_changed = TRUE;
> +
> +      if (ib->summarize->summarize_kind != svn_client_diff_summarize_kind_added)
> +        ib->summarize->prop_changed = TRUE;
>     }
>
>   return SVN_NO_ERROR;
>
> Modified: subversion/trunk/subversion/tests/cmdline/diff_tests.py
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/diff_tests.py?rev=985735&r1=985734&r2=985735&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/tests/cmdline/diff_tests.py (original)
> +++ subversion/trunk/subversion/tests/cmdline/diff_tests.py Sun Aug 15 19:04:54 2010
> @@ -2640,11 +2640,11 @@ def basic_diff_summarize(sbox):
>     'A/mu':           Item(status='M '),
>     'iota':           Item(status=' M'),
>     'A/D/G/tau':      Item(status='MM'),
> -    'newfile':        Item(status='AM'),
> +    'newfile':        Item(status='A '),
>     'newfile2':       Item(status='A '),
> -    'P':              Item(status='AM'),
> +    'P':              Item(status='A '),
>     'Q':              Item(status='A '),
> -    'Q/newfile':      Item(status='AM'),
> +    'Q/newfile':      Item(status='A '),
>     'Q/R':            Item(status='A '),
>     'Q/R/newfile':    Item(status='A '),
>     'A/B/lambda':     Item(status='D '),
> @@ -2668,10 +2668,10 @@ def basic_diff_summarize(sbox):
>  #    'Q/R':            Item(status='D '),
>  #    'Q/R/newfile':    Item(status='D '),
>     'A/B/lambda':     Item(status='A '),
> -    'A/C':            Item(status='AM'),
> -    'A/D/gamma':      Item(status='AM'),
> +    'A/C':            Item(status='A '),
> +    'A/D/gamma':      Item(status='A '),
>     'A/D/H':          Item(status='A '),
> -    'A/D/H/chi':      Item(status='AM'),
> +    'A/D/H/chi':      Item(status='A '),
>     'A/D/H/psi':      Item(status='A '),
>     'A/D/H/omega':    Item(status='A '),
>     })
> @@ -3686,8 +3686,7 @@ test_list = [ None,
>               diff_repos_working_added_dir,
>               diff_base_repos_moved,
>               diff_added_subtree,
> -              Skip(basic_diff_summarize,
> -                   svntest.main.is_ra_type_dav),
> +              basic_diff_summarize,
>               diff_weird_author,
>               diff_ignore_whitespace,
>               diff_ignore_eolstyle,
>
>
>
Received on 2010-08-16 21:27:26 CEST

This is an archived mail posted to the Subversion Dev mailing list.