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

Re: [PATCH] Unexpected behavior from psvn.el

From: Kalle Olavi Niemitalo <kon_at_iki.fi>
Date: 2005-08-03 13:51:32 CEST

Joshua Varner <jlvarner@gmail.com> writes:

> I'll make a new patch, it will just take some time -- I want to get
> more comfortable with the code for the mode before making a more
> extensive patch. I'm, also, on 12 hour days at work until the 27th so
> that will cause a delay. But it is on my TODO list.

Don't bother, I made a new patch myself. This is for revision
15394 and I don't know whether it works correctly with r15539.
I am nowadays mostly offline (due to lightning damage) so it
would be good if someone else (Stefan Reichör?) could test this
with XEmacs and perhaps commit.

There is a known bug: this code assumes that svn diff
-non-recursive DIRECTORY shows diffs only for (the properties of)
the directory itself, but it actually shows diffs also for the
files in the directory. Thus, if you have marked a directory
(and thus normally also the files in it), you get the same diffs
twice. I don't yet know what would be the best way to fix this.
Possibilities include:

(a) Change svn diff --non-recursive to diff only the directory.

(b) Define a new option that diffs only the directory.

(c) Make psvn remove the extra diffs itself when it calls svn
    diff --non-recursive on a directory. This wastes CPU time,
    although perhaps not too much.

(d) Make psvn detect duplicate diffs in the concatenated output
    and filter them out. This too wastes CPU time and would
    still display diffs for the files even if only the directory
    was marked; but perhaps users prefer that.

(e) Put both the directory and the files as arguments for the
    same svn diff command and hope that it won't repeat the
    diffs. I don't know whether this actually works, and anyway
    it too would still display diffs for the files even if only
    the directory was marked.

(f) Document the bug as a feature.

In the short run, I think I'd prefer option (c); it can later be
switched to (b) with no change in the user interface, if the svn
committee agrees.

I have also been working on some other changes to psvn, but I'll
post them in a separate thread.

  • application/pgp-signature attachment: stored
Received on Wed Aug 3 13:50:34 2005

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.