You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Sander Striker <st...@apache.org> on 2003/03/17 19:45:07 UTC

Splitting diff functionality out of libsvn_delta

Hi,

Would anyone object me splitting the diff functionality out
of libsvn_delta into its own lib; libsvn_diff?

Currently the namespace protection* already suggests this is
the case.

What needs to happen is basically:

subversion/libsvn_delta/diff.c
subversion/libsvn_delta/diff_file.c

Move and expand to:

subversion/libsvn_diff/diff.h
subversion/libsvn_diff/diff.c
subversion/libsvn_diff/diff3.c
subversion/libsvn_diff/diff4.c
subversion/libsvn_diff/lcs.c
subversion/libsvn_diff/token.c
subversion/libsvn_diff/util.c
subversion/libsvn_diff/diff_file.c

Furthermore all tests related to diff in subversion/tests/libsvn_delta
move to subversion/tests/libsvn_diff.

subversion/tests/libsvn_diff/diff-test.c
subversion/tests/libsvn_diff/diff_test.dsp
subversion/tests/libsvn_diff/diff3-test.c
subversion/tests/libsvn_diff/diff3_test.dsp
subversion/tests/libsvn_diff/diff4-test.c
subversion/tests/libsvn_diff/diff4_test.dsp
subversion/tests/libsvn_diff/diff-diff3-test.c
subversion/tests/libsvn_diff/diff_diff3_test.dsp

And ofcourse build.conf needs a few tweaks.  I've already done
this in my working copy and everything keeps working as is.
I feel that this split would make the diff code easier to grasp
and maintain.

Thoughts?


Sander

*) Which has some inconsistencies that I'll solve later on.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: Splitting diff functionality out of libsvn_delta

Posted by Philip Martin <ph...@codematters.co.uk>.
"Sander Striker" <st...@apache.org> writes:

> Would anyone object me splitting the diff functionality out
> of libsvn_delta into its own lib; libsvn_diff?

One argument against doing this is that increasing the number of
shared libraries increases the startup time overhead incurred by
clients that use the libraries.

> Currently the namespace protection* already suggests this is
> the case.
> 
> What needs to happen is basically:
> 
> subversion/libsvn_delta/diff.c
> subversion/libsvn_delta/diff_file.c
> 
> Move and expand to:
> 
> subversion/libsvn_diff/diff.h
> subversion/libsvn_diff/diff.c
> subversion/libsvn_diff/diff3.c
> subversion/libsvn_diff/diff4.c
> subversion/libsvn_diff/lcs.c
> subversion/libsvn_diff/token.c
> subversion/libsvn_diff/util.c
> subversion/libsvn_diff/diff_file.c

A simple reorganisation like that will leave libsvn_diff depending on
libsvn_subr due to the svn_io_xxx calls.  Is that what you intended?

-- 
Philip Martin

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: Splitting diff functionality out of libsvn_delta

Posted by Zack Weinberg <za...@codesourcery.com>.
cmpilato@collab.net writes:
> Michael Price <mp...@atl.lmco.com> writes:
>> My point being, of course, that people who prefer to use a license
>> other than the viral GPL[1] will be very happy to have a diff library
>> sitting around ready for use.
>
> Ex*act*ly.  Sander, I'd rather you spend the time abstracting your
> diff stuff into an entirely separate project for the benefit of all
> the world than just into its own still-Subversion-specific library.

Just to underscore, OpenCM would very much like this -- they're using
libgdiff now (GPLed) and have headaches because of the combination of
that and libssl.

zw

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

RE: Splitting diff functionality out of libsvn_delta

Posted by Sander Striker <st...@apache.org>.
> From: cmpilato@collab.net [mailto:cmpilato@collab.net]
> Sent: Monday, March 17, 2003 9:51 PM

> Michael Price <mp...@atl.lmco.com> writes:
> 
> > My point being, of course, that people who prefer to use a license
> > other than the viral GPL[1] will be very happy to have a diff library
> > sitting around ready for use.
> 
> Ex*act*ly.  Sander, I'd rather you spend the time abstracting your
> diff stuff into an entirely separate project for the benefit of all
> the world than just into its own still-Subversion-specific library.

Baby steps, baby steps.  I don't have _that_ much spare time right now.
I just want to make my life a little easier and do a little pre massaging
for the future stand alone lib.  Selfish little me ;).  So, stand-alone,
yes, in due time.  For now, please let me keep it in SVN, but self-contained.

To address Philips question:
> A simple reorganisation like that will leave libsvn_diff depending on
> libsvn_subr due to the svn_io_xxx calls.  Is that what you intended?

I'd like to remove all the dependencies on other SVN libraries the upcomming
couple of weeks.  The dependency is also there because of the svn_error_xxx
calls.


Sander

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: Splitting diff functionality out of libsvn_delta

Posted by cm...@collab.net.
Michael Price <mp...@atl.lmco.com> writes:

> My point being, of course, that people who prefer to use a license
> other than the viral GPL[1] will be very happy to have a diff library
> sitting around ready for use.

Ex*act*ly.  Sander, I'd rather you spend the time abstracting your
diff stuff into an entirely separate project for the benefit of all
the world than just into its own still-Subversion-specific library.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

[OT] license foo (was: Splitting diff functionality out of libsvn_delta)

Posted by Greg Stein <gs...@lyra.org>.
On Thu, Mar 20, 2003 at 07:53:33AM +0000, Colin Watson wrote:
>...
> > Since the Apache license is just a modified BSD license with 3 extra
> > clauses and the Subversion license is just a modified Apache license
> > that uses a phrase other than "Apache", I figured it would be less
> > confusing just to say BSD (even shorter than BSD-like) and be done with
> > it. :)
> 
> For those of us who *are* GPL types, calling the Apache licence BSD-like
> is pretty confusing; the modern BSD licence is compatible with the GPL,
> but the Apache licence isn't, due to the don't-use-our-name clause. (Not
> wishing to start a flamewar about that, though; it's been hashed out
> rather extensively elsewhere.)

But you *are* doing exactly that [flamewar]. The Apache license *is*
BSD-like in the sense that it gives users rights more similar to the BSD
license than any of the other licenses out there.

GPL compatibility doesn't make a license BSD-like or not. The rights granted
to users is the primary factor. At the highest level, the distinguishing
factor between BSD/Apache and GPL is the requirement to publish changes. In
that respect, the Apache license is BSD-ish.

*shrug*

Cheers,
-g

-- 
Greg Stein, http://www.lyra.org/

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: Splitting diff functionality out of libsvn_delta

Posted by Colin Watson <cj...@flatline.org.uk>.
On Mon, Mar 17, 2003 at 03:23:40PM -0500, Michael Price wrote:
> Branko ?ibej writes:
>  > Michael Price wrote:
>  > >Having it separate would make it easier for other BSD projects to use
>  > >the diff library which is reason enough in my mind.
>  >
>  > "Other BSD projects?" What other BSD projects? Do we have a BSD project
>  > here? :-)
> 
> Since the Apache license is just a modified BSD license with 3 extra
> clauses and the Subversion license is just a modified Apache license
> that uses a phrase other than "Apache", I figured it would be less
> confusing just to say BSD (even shorter than BSD-like) and be done with
> it. :)

For those of us who *are* GPL types, calling the Apache licence BSD-like
is pretty confusing; the modern BSD licence is compatible with the GPL,
but the Apache licence isn't, due to the don't-use-our-name clause. (Not
wishing to start a flamewar about that, though; it's been hashed out
rather extensively elsewhere.)

-- 
Colin Watson                                  [cjwatson@flatline.org.uk]

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: Splitting diff functionality out of libsvn_delta

Posted by Lele Gaifax <le...@seldati.it>.
>>>>> Michael Price l'ha dit:

    Michael> My point being, of course, that people who prefer to use
    Michael> a license other than the viral GPL[1] will be very happy
    Michael> to have a diff library sitting around ready for use.

    Michael> Michael

    Michael> [1] No offense to all of the GPL peeps out there :)

Why? The^H^H^HWe already have such a library, after all :)))

couldn't resist ;)
ciao, lele.
-- 
nickname: Lele Gaifax	| Quando vivrò di quello che ho pensato ieri
real: Emanuele Gaifas	| comincerò ad aver paura di chi mi copia.
email: lele@seldati.it	|		-- Fortunato Depero, 1929.


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: Splitting diff functionality out of libsvn_delta

Posted by Branko Čibej <br...@xbc.nu>.
Michael Price wrote:

>Branko ?ibej writes:
> > >Would anyone object me splitting the diff functionality out
> > >of libsvn_delta into its own lib; libsvn_diff?
> > 
> > I wouldn't mind, but do we actually need this? I can easily see all the
> > delta and diff code live in the same library.
>
>Having it separate would make it easier for other BSD projects to use
>the diff library which is reason enough in my mind.
>  
>
"Other BSD projects?" What other BSD projects? Do we have a BSD project
here? :-)


-- 
Brane Čibej   <br...@xbc.nu>   http://www.xbc.nu/brane/


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: Splitting diff functionality out of libsvn_delta

Posted by Branko Čibej <br...@xbc.nu>.
Sander Striker wrote:

>Hi,
>
>Would anyone object me splitting the diff functionality out
>of libsvn_delta into its own lib; libsvn_diff?
>
>Currently the namespace protection* already suggests this is
>the case.
>
>What needs to happen is basically:
>
[lots of fairly obvious stuff]

>And ofcourse build.conf needs a few tweaks.  I've already done
>this in my working copy and everything keeps working as is.
>I feel that this split would make the diff code easier to grasp
>and maintain.
>
>Thoughts?
>  
>

I wouldn't mind, but do we actually need this? I can easily see all the
delta and diff code live in the same library. OTOH, you don't need diff
stuff for the server, only for the client, right...

-- 
Brane Čibej   <br...@xbc.nu>   http://www.xbc.nu/brane/


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org