You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sb...@apache.org on 2010/08/15 21:04:54 UTC
svn commit: r985735 - in /subversion/trunk/subversion:
libsvn_client/repos_diff_summarize.c tests/cmdline/diff_tests.py
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'.
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,
Re: svn commit: r985735 - in /subversion/trunk/subversion:
libsvn_client/repos_diff_summarize.c tests/cmdline/diff_tests.py
Posted by "Hyrum K. Wright" <hy...@mail.utexas.edu>.
On Sun, Aug 15, 2010 at 2:04 PM, <sb...@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,
>
>
>
RE: svn commit: r985735 - in /subversion/trunk/subversion: libsvn_client/repos_diff_summarize.c tests/cmdline/diff_tests.py
Posted by Bert Huijben <be...@vmoo.com>.
> -----Original Message-----
> From: sbutler@apache.org [mailto:sbutler@apache.org]
> Sent: zondag 15 augustus 2010 12:05
> To: commits@subversion.apache.org
> Subject: svn commit: r985735 - in /subversion/trunk/subversion:
> libsvn_client/repos_diff_summarize.c tests/cmdline/diff_tests.py
>
> 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'.
>
> The bug existed since 1.6 (or mayber earlier) over ra_file and ra_svn
> only. Dunno why ra_dav wasn't affected.
Can you differentiate between added and copied (aka added with history) here?
For added nodes property differences are not interesting, but for copied node the fact that a property changed (after the copy) is.
If not for 'svn', it certainly is for library users.
Bert
Re: svn commit: r985735 - in /subversion/trunk/subversion:
libsvn_client/repos_diff_summarize.c tests/cmdline/diff_tests.py
Posted by "Hyrum K. Wright" <hy...@mail.utexas.edu>.
On Sun, Aug 15, 2010 at 2:04 PM, <sb...@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,
>
>
>