Re: [PATCH] calendar syncs with Emacs CVS
Adrian Aichner writes:
Hello Jeff, thanks for taking over maintainership of calendar for
XEmacs!
Thanks! And thanks for taking a look at the changes I've submitted so
far. Another pair of eyes is always good.
Here are a few issues I would like to bring up.
1.
My local calendar workspace shows many conflicts stemming from
whitespace diffs.
It appears that the repository contains quite a bit of end-of-line
whitespace in the caleandar sources.
Other conflicts stem from mixed SPACE and TAB indenting, again in the
repository.
I use following hook to adapt to current tabs indentation mode for
each file:
(defun apa-find-file-hook ()
"Adrian's hook to set up editing customizations based on buffer-file-name and
file content."
(save-excursion
;; Only use indent-tabs-mode, if the buffer already has
;; some.
;; simplified in #emacs on 2004-11-02 with bojohan.
(setq indent-tabs-mode
(and (search-forward-regexp "^\t" nil t) t))))
Well, the end-of-line whitespace is easy enough to take care of. I've
added nuke-trailing-whitespace to my write-file-hooks.
I've generally been diff'ing against Emacs CVS using the -ubw flags,
which is probably why I don't see all the whitespace problems you do.
What is the generally accepted practice? Match Emacs
space-for-space, tab-for-tab? Tabify the files? Untabify?
2.
You're using indented ChangeLog entries for your syncing.
I have not found any other use of indented ChangeLog entries (for
syncing activity) in all of the XEmacs packages repository.
I'm concerned about commiting to introduce this practice lightly.
(info "(standards)Change Log Concepts")
does not mention this practice either.
Usually it is just mentioned in the ChangeLog what is being synced to.
Ok, I can change that. I guess I was just trying to show what changes
I had made but also indicate who the original authors were. Since I
was including the original commit dates in Emacs CVS, I didn't want to
confuse them with my commit dates.
I'll clean these up.
3.
In my previous sync work I have spend a lot of time marking any
XEmacs-related changes I made.
This is very useful (and often the only thing to go by) in future sync
activity, in order to evaluate discrepancies.
I've tried to mark any XEmacs related changes I've been adding. I
haven't gone back and marked any that previously existed and weren't
marked ( with one or two exceptions). Are there any in particular
that are causing problems?
4.
I'm having a hard time understanding the local changes in my
workspace, so anything of the above that you could address would be
helpful.
The ChangeLog style is not a problem in evaluating my local conflicts
and changes, but the indentation style, the EOL whitespace, and the
missing
;; XEmacs change
markers are.
I am attaching my current cvs-diffs as of today and would be greatful
for any of these you may be able to resolve.
Hopefully I will be able to chip in with a few contributions of my own
(I have some timeclock.el improvements in the queue).
Thanks in advance!
I believe most, if not all your cvs-diffs will get in. Maybe it will
help if I explain my modus-operandi. I don't claim to be an expert at
lisp or understand every detail of the calendar package. It's big and
it can do a lot of stuff. So I've just been looking at each Emacs
commit and trying to understand what was going on before I add them to
our package. Doing these little syncs is relatively easy and easier
to test If I tried to just do a whole-sale sync to whatever is the
current CVS snapshot, I'm sure I'd screw something up. In fact, I've
tried that in the past, and I have screwed things up. :) So, I'm
trying baby-steps this time, doing incremental commits so that I
always have a working package to get back to
Unfortunately, I won't be able to fix any of these problems until next
weekend. I have to go out of town again tomorrow for most of the
week.
--
Jeff Miller
jmiller(a)cablespeed.com