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

Re: svn commit: r951871 - /subversion/trunk/subversion/libsvn_client/diff.c

From: Daniel Näslund <dannas_at_apache.org>
Date: Sun, 6 Jun 2010 21:24:10 +0200

On Sun, Jun 06, 2010 at 02:49:16PM -0000, dannas_at_apache.org wrote:
> Author: dannas
> Date: Sun Jun 6 14:49:15 2010
> New Revision: 951871
>
> URL: http://svn.apache.org/viewvc?rev=951871&view=rev
> Log:
> First small step towards using the 'git unidiff' format for 'svn diff'.
>
> The parts that writes to the output stream are ifdef'd with
> SVN_EXPERIMENTAL_PATCH since five diff-tests needs to be adjusted and I
> don't want to change the testsuite before we're 100 % certain that we
> want to use the git diff format as our standard format and not as an
> optional one.
>
> * subversion/libsvn_client/diff.c
> (print_git_diff_header): New.
> (diff_cmd_baton): Add field 'deleted'.

Dunno what I was thinking here. I'm using the diff_cmd_baton as if it is
a per path baton when in reality it, of course, is used for all paths
involved in the diff operation.

Working on a way to pass the needed information to
diff_content_changed() without using the baton.

> (diff_content_changed): Call print_git_diff_header() and adjust the
> labels before asking libsvn_diff to produce the actual diff.
> (diff_file_deleted_with_diff): Note in the diff_cmd_baton that we have
> a deleted path.
> (svn_client_diff5
> svn_client_diff_peg5): Initialize diff_cmd_baton.deleted to FALSE.
>
> Modified:
> subversion/trunk/subversion/libsvn_client/diff.c
>
> Modified: subversion/trunk/subversion/libsvn_client/diff.c
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=951871&r1=951870&r2=951871&view=diff

Daniel
Received on 2010-06-06 22:34:54 CEST

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