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

Re: augmented diff, draft now mature

From: Karl Fogel <kfogel_at_red-bean.com>
Date: 2007-07-04 20:36:10 CEST

It would be nice to include a comment syntax in the patch format, for
example, every line beginning with "#" is ignored. That way people
can annotate patches without affecting their semantics.

Regular patch format is open to this because it reserves the leftmost
column for metadata ("+", "-", etc). This is a very handy
characteristic; it might be good for svnpatch format to do the same.

(The question of whether standard 'patch' actually does handle that
comment syntax is complicated. The format is certainly open to it in
theory. Years ago I sent in a patch to 'patch' to make it ignore
lines beginning with "#". Paul Eggert responded favorably, and
tweaked my patch a bit, but I don't know if he ever integrated it into
the mainline GNU 'patch' program, which he may or may not have been
maintaining at the time. Ironically, I can't find my patch to 'patch'
anymore. If you see it anywhere, let me know :-) ).


"Charles Acknin" <charlesacknin@gmail.com> writes:
> I've wrote some more in the draft. I think it has come to a mature
> state now (part I excluded), it should be a solid basis to go on, and
> I want to make sure we reach consensus with this statement. (I tried
> to aggregate as much as possible advises I collected from the previous
> post.)
> This file documents the 'svnpatch' format that's used with both diff and patch
> subcommands.
> -------
> [remind the reasons behind the design of such a new format]
> (We want something that supports any change and suitable enough for code
> review.)
> -----------------------------
> First off, let's define it. svnpatch format is made of two ordered parts:
> * (a) human-readable: made of unidiff bytes
> * (b) computer-readable: made of svn protocol bytes (ra_svn), gzip'ed,
> base64-encoded
> But, as we're not in a client/server configuration:
> - (b) only uses the svn protocol's Editor Command Set, there's no need for
> the Main Command Set nor the Report Command Set
> - a client reads Editor Commands from the patch, i.e. the patch silently
> drives the client's editor
> - the only direction the information takes is from the patch to the client
> - svndiff1 is solely used instead of being able to choose between svndiff1
> and svndiff0 (e.g. binary-change needs svndiff)
> Such a format can be seen as a subset of the svn protocol which:
> - Capabilities and Edit Pipelining have nothing to do with as we can't adjust
> once the patch is rock-hard written in the file nor negotiate anything
> - commands are restricted to the Editor Command Set
> - lacks revision numbers (see VI FUZZING)
> For more about Command Sets, consult libsvn_ra_svn/protocol.
> --------------------------------
> Now since the svn protocol would be happy to handle just any change that a
> working copy comes with, rules have to be set up so that we meet our goals (see
> Concretely, what's in each part?
> In (a):
> - contextual differences
> - property-changes (in a similar way to 'svn diff')
> - new non-binary-file content
> In (b):
> - tree-changes ({add,del,move,copy}-directory, {add,del,move,copy}-file)
> - property-changes
> - binary-changes
> Consequences are we face cases where one change's representation lives in the
> two parts of the patch. e.g. a modified-file move: the move is represented
> within (b) while contextual differences within (a); a file add: an add-file
> Editor Command in (b) plus its content in (a).
> Furthermore, we never end up with redundant information but with
> property-changes. A file copy with modifications generates (a) contextual
> diff, (b) add-file w/ copy-path.
> The only thing that's left unreadable is tree-changes as defined above.
> However, a higher level layer (e.g. GUIs) would perfectly be able to
> base64-decode, uncompress and read operations to visually-render the changes.
> --------------------
> Because encoded and compressed, the computer-readable chunk (b) is not directly
> editable. Should it be in cleartext, the user would still have to go through
> svn protocol writing manually -- calculate checksums and strings length, and
> place tokens, assumed to be not so friendly for the end-user. However, there's
> a much easier workaround: apply the patch, and then start editing the working
> copy with regular svn subcommands.
> --------
> When it comes to applying an svnpatch patch (RAS syndrom), the 'svn patch'
> subcommand is a good friend. Here's what it does with the patch: (a) literally
> gets processed by /usr/bin/patch while (b) is handled with internal routines
> that read and drive editor functions out from it much like what's being
> performed by libsvn_ra_svn with a network stream.
> Now some words about the order to process (a) and (b). There might be cases
> when operations to a single file live in the two parts of the patch (see
> above). Because that's the way the svn protocol and 'svn diff' do, we stick
> with processing first (b) and then (a). This implies (a) provides diff against
> the most up-to-date indexes.
> When the Editor Command Set comes to be extended, 'svn patch' will face
> unexpected commands and/or syntax. As in libsvn_ra_svn, we warn the user with
> 'unsupported command' messages and ignore its application.
> -----------------------
> As long as we'll be using /usr/bin/patch to apply (a), we'll have to go with
> /usr/bin/patch fuzzing. So we're left with (b) (which we'll parse first).
> Well, the svn protocol is not very sensitive to fuzzing since most operations
> include a revision number. However, to stick with this policy would widely
> decrease the patch-application scope we're expecting. For instance, 'svn
> patch' would fail at deleting dir@REV when REV is different from the one that
> comes with the delete-entry Editor Command. Obviously we need loose here, and
> the solution is to free the svn protocol from revision numbers in our
> implementation. Now dealing with (b) patching is similar in many ways to
> (a)'s: we end up trying by all methods to drive the editor in the dark jungle,
> possibly failing in few cases shooting 'hunk failed' warnings.
> Cheers,
> Charles
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jul 4 20:36:01 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.