subversion-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Andre Colomb <acol...@schickhardt.org>
Subject Re: [PATCH] Support SVN 1.7 working copies in psvn.el
Date Mon, 27 Aug 2012 15:43:11 GMT
Here we go again :)

After some more testing, I have found another problem with the
svn-status mode in psvn.el. The attached patches extend on the previous
one to also make ediff-mode work again with psvn.el.

Andre Colomb <acolomb@schickhardt.org> wrote on 2012-08-17 19:25
> The current HEAD version of the Emacs SVN status mode, psvn.el does not
> properly support working copies in SVN 1.7 format. It expects each
> directory to have a .svn subdirectory, which is no longer the case.

The previously proposed patch by Koji Nakamaru addressed an error when
trying to invoke svn-status from a non-top-level working copy directory.
In addition, I discovered some errors when trying to use
svn-status-ediff-with-revision.

The lisp function svn-status-get-specific-revision-internal included a
short-cut for accessing the BASE revision of a specific working copy
file. In working copies before SVN 1.7, the BASE revision could be
retrieved from "./.svn/text-base/<filename>.svn-base". In SVN 1.7, it is
much more complicated to find this data in the top-level .svn/pristine/
directory.

Therefore the attached patch psvn.el_svn1.7-BASE.diff adresses this by
eliminating the shortcut. It treats BASE like any other revision and
asks the subversion client for it via "svn cat". This still works even
for offline operation, when the repository can not be accessed. The
subversion CLI extracts the correct file content from its store for us.

Also attached is the previous patch by Koji Nakamaru, renamed as
psvn.el_svn1.7-dotsvn.diff, as well as a combination of the two named
psvn.el_svn1.7.diff.

Note that using svn cat on the BASE revision instead of opening it from
text-base/ will trigger another bug in psvn.el, where the line endings
might be misinterpreted. I have already identified the cause and sent a
patch for this in another mail to this list.

Feel free to ask for any feedback concerning the changes. I would be
very happy if this could be committed to trunk and land in the next release.

If you accept my patches, I could take care of forwarding them to any
distributions already shipping SVN 1.7 with psvn.el that I know of, so
they can fix the problem in their subversion emacs packages.

Kind regards
André
-- 
Greetings...
From: Andre Colomb <acolomb@schickhardt.org>

Mime
View raw message