Login | Register
My pages Projects Community openCollabNet

Discussions > dev [DISABLED] > Re: Changed order when diffing with --depth option

subversion
Discussion topic

Hide all messages in topic

All messages in topic

Re: [PATCH v3] issue 1493 - use libsvndiff for diffing properties

Author Daniel Shahaf <d dot s at daniel dot shahaf dot name>
Full name Daniel Shahaf <d dot s at daniel dot shahaf dot name>
Date 2009-08-04 17:18:01 PDT
Message Daniel Näslund wrote on Tue, 4 Aug 2009 at 19:55 +0200:
> > In the future, please take more care about indentation. It takes
> > a lot of time to fix it up, and the less time your patches take
> > to process, the quicker they will get committed.
>
> Sorry about all the indentations and other style fixes you had to do.
> I'm a beginnner and as such enthusiastic but sometimes careless. I will
> try hard to save time for my tutors in my work to come. Perhaps there is
> some script to use for checking style in the code? I use the c.vim file
> from the tools directory but unfortunately it has its flaws. can not
> just do a ggvG= and everything is adjusted to meet the GNU standard.
>

I've posted about my configuration before[1]; the relevant line is

    setlocal textwidth=79 tabstop=2 shiftwidth=2 expandtab cindent cinoptions=>2sn-s{s^-s:s

though I never tested it with gg=G; I'm only sure that it takes care of
formatting correctly the code as it's written.


(It's not perfect.. it probably wants +=t0(0, and maybe others)


[1] http://article.gmane​.org/gmane.comp.vers​ion-control.subversi​on.devel/105238

[PATCH v3] issue 1493 - use libsvndiff for diffing properties

Author Daniel Näslund <daniel at longitudo dot com>
Full name Daniel Näslund <daniel at longitudo dot com>
Date 2009-08-04 10:55:32 PDT
Message
Attachments

Re: Changed order when diffing with --depth option

Author stsp
Full name Stefan Sperling
Date 2009-08-04 04:30:47 PDT
Message On Tue, Aug 04, 2009 at 01:00:51PM +0200, Daniel Näslund wrote:
> > Hi Daniel,
> >
> > I've attached an updated patch this time which includes my suggested
> > changes. Please check my version of the patch to see if you are happy
> > with it.
> >
> >
> > I've slightly tested the attached patch now and produces splendid
> > diffs for multi-line property values. Thanks a lot! :)
> >
> > Before we commit this, as a final verification step, can you take the
> > time to run 'make check' on the patch and clean up any fallout in the
> > test suite? Or have you run the regression tests on this already?
> >
> > Thanks,
> > Stefan
>
> When running depth_tests.py 19 and diff_tests.py 42 I get failures.
> Theese two test uses the --depth option for diffing. The tests display
> the diffs for each target from the top of the tree and downward. That
> is:
>
> top_dir -
> | file
> |--subdir
>
> will be displayed in order top_dir-file-subdir if depth is set to
> infinity. But after applying the patch for issue 1493 the order is
> subdir-file-top_dir. How can that be? AFAIK I haven't touch anything
> that handles the depth. Using other the other depth options (empty,
> files, immediates) produces the same result. The targets are displayed
> from bottom up instead of up to down.

If I remember correctly the order which 'svn diff' uses for its
files is undefined. Julian wanted to fix this ages ago but for some
reason his patch wasn't applied.

So if the test assumes a fixed order, it's broken.

Stefan

Changed order when diffing with --depth option

Author Daniel Näslund <daniel at longitudo dot com>
Full name Daniel Näslund <daniel at longitudo dot com>
Date 2009-08-04 04:00:57 PDT
Message
Attachments

Re: [PATCH] issue 1493 - use libsvn_diff for diffing props

Author stsp
Full name Stefan Sperling
Date 2009-08-03 10:23:59 PDT
Message
Attachments

Re: [PATCH] issue 1493 - use libsvn_diff for diffing props

Author stsp
Full name Stefan Sperling
Date 2009-07-28 10:05:43 PDT
Message
Attachments

Re: [PATCH] issue 1493 - use libsvn_diff for diffing props

Author glasser
Full name David Glasser
Date 2009-07-27 18:21:24 PDT
Message On Fri, Jul 24, 2009 at 11:07 AM, Daniel Näslund<daniel@lo​ngitudo.com> wrote:
> Hey!
>
> This is my first attempt as a Subversion coder. Please be nice to me!
>
> It works for patch(1) but I haven't tried it on any other patch programs.
>
> Some background on the subject:
> http://subversion.ti​gris.org/ds/viewMess​age.do?dsMessageId=9​77146&dsForumId=​462
>
> / Daniel Näslund
> [[[
> Fix part of issue 1493: Property diffs/merge should use libsvn_diff.
> For properties I have removed the diff headers and replaced the @@-characters
> with ##.

Out of curiosity... why? Aren't people used to seeing "@@" for diff
headers? Shouldn't the "file-level" headers make it clear that it's a
prop diff?

--dave

> *subversion/libsvn_d​iff/diff_memory.c
> (output_unified_flush_hunk2): Added parameter for choosing delimiter, for
> instance '##' instead of '@@'.
>
> *subversion/libsvn_d​iff/diff_memory.c
> (svn_diff_mem_string​_output_unified2): Added parameter for choosing if the diff
> should be formatted as a property diff, '##' as delimiters.
>
> *subversion/include/svn_diff.h
> (output_unified_flush_hunk2): Declaration
> (svn_diff_mem_string​_output_unified2): Declaration
>
> *subversion/libsvn_c​lient/diff.c
> (append_eol): Appends an end of line character if missing.
>
> *subversion/libsvn_c​lient/diff.c
> (display_prop_diffs): Use libsvn_diff for diffing properties.
> ]]]
>
> --------------------​--------------------​--------------
> http://subversion.ti​gris.org/ds/viewMess​age.do?dsForumId=462​&dsMessageId=237​5349



--
glasser at davidglasser dot net | langtonlabs.org | flickr.com/photos/glasser/

Re: [PATCH] issue 1493 - use libsvn_diff for diffing props

Author Daniel Näslund <daniel at longitudo dot com>
Full name Daniel Näslund <daniel at longitudo dot com>
Date 2009-07-27 03:48:33 PDT
Message
Attachments

Re: [PATCH] issue 1493 - use libsvn_diff for diffing props

Author Daniel Näslund <daniel at longitudo dot com>
Full name Daniel Näslund <daniel at longitudo dot com>
Date 2009-07-24 14:03:20 PDT
Message
Attachments

Re: [PATCH] issue 1493 - use libsvn_diff for diffing props

Author stsp
Full name Stefan Sperling
Date 2009-07-24 12:13:46 PDT
Message
Attachments

[PATCH] issue 1493 - use libsvn_diff for diffing props

Author Daniel Näslund <daniel at longitudo dot com>
Full name Daniel Näslund <daniel at longitudo dot com>
Date 2009-07-24 11:07:21 PDT
Message Hey!

This is my first attempt as a Subversion coder. Please be nice to me!

It works for patch(1) but I haven't tried it on any other patch programs.

Some background on the subject:
http://subversion.ti​gris.org/ds/viewMess​age.do?dsMessageId=9​77146&dsForumId=​462

/ Daniel Näslund
[[[
Fix part of issue 1493: Property diffs/merge should use libsvn_diff.
For properties I have removed the diff headers and replaced the @@-characters
with ##.

*subversion/libsvn_d​iff/diff_memory.c
(output_unified_flush_hunk2): Added parameter for choosing delimiter, for
instance '##' instead of '@@'.

*subversion/libsvn_d​iff/diff_memory.c
(svn_diff_mem_string​_output_unified2): Added parameter for choosing if the diff
should be formatted as a property diff, '##' as delimiters.

*subversion/include/svn_diff.h
(output_unified_flush_hunk2): Declaration
(svn_diff_mem_string​_output_unified2): Declaration

*subversion/libsvn_c​lient/diff.c
(append_eol): Appends an end of line character if missing.

*subversion/libsvn_c​lient/diff.c
(display_prop_diffs): Use libsvn_diff for diffing properties.
]]]
Attachments
Messages per page: