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

Re: [PATCH] Fix svndiff-test and vdelta-test

From: Karl Fogel <kfogel_at_newton.ch.collab.net>
Date: 2002-02-19 19:03:38 CET

Daniel Berlin <dan@dberlin.org> writes:
> Here it is (With all other projects, since there's a changelog file in the
> dir, when i diff, the change message gets included, and i just edit out
> the +'s in front of the lines):

Ahh, gotcha.

If it's any help (and if you're an Emacs user), Ben and Mike and I all
use this code to take care of the automatable part of writing log
messages. It just lives in our .emacs files right now; if enough
people want to use it, it could move to svn-dev.el or something.
Simple usage summary: run "svn-log-message" from within a Subversion
source file, preferably where you just made a change. :-)

(You may want to modify the function `svn-log-message-file' if you
already have a particular file where you accumulate log message text.)

;;; Log messages.

(defun svn-log-path-derive (path)
  "Derive a relative directory path for absolute PATH, for a log entry."
    (let ((base (file-name-nondirectory path))
          (chop-spot (string-match
      (if chop-spot
            (setq path (substring path (match-end 0)))
            ;; Kluge for Subversion developers.
            (if (string-match "subversion/subversion" path)
                (substring path (+ (match-beginning 0) 11))
        (string-match (expand-file-name "~/") path)
        (substring path (match-end 0))))))

(defun svn-log-message-file ()
  "Return the name of the appropriate log message accumulation file.
Usually this is just the file `msg' in the current directory, but
certain areas are treated specially, for example, the Subversion
source tree."
    (if (string-match "subversion" default-directory)
        (concat (substring default-directory 0 (match-end 0)) "/msg")

(defun svn-log-message (full-context)
  "Add to an in-progress log message, based on context around point.
If prefix arg FULL-CONTEXT is non-nil, then use the full path to the
current file name in the log message, otherwise use just the
basename. The current defun name is always used, like so:

   - If the log message already contains material about this defun,
     then put point there, so adding to that material is easy.

   - Else if the log message already contains material about this
     file, put point there, and push onto the kill ring the defun name
     with log message dressing around it, plus the raw defun name, so
     yank and yank-next are both useful.

   - Else if there is no material about this defun nor file anywhere
     in the log message, then put point at the end of the message and
     insert a new entry for file with defun.

See also the function `svn-log-message-file'."
  (interactive "P")
  (let ((this-file (if full-context
                       (svn-log-path-derive buffer-file-name)
                     (file-name-nondirectory buffer-file-name)))
        (this-defun (or (add-log-current-defun)
                            (if (eq major-mode 'c-mode)
                                  (search-forward "(" nil t)
                                  (forward-char -1)
                                  (forward-sexp -1)
                                   (progn (forward-sexp 1) (point)))))))))
        (log-file (svn-log-message-file)))
    (find-file log-file)
    (goto-char (point-min))
    ;; Strip text properties from strings
    (set-text-properties 0 (length this-file) nil this-file)
    (set-text-properties 0 (length this-defun) nil this-defun)
    ;; If log message for defun already in progress, add to it
    (if (and
         this-defun ;; we have a defun to work with
         (search-forward this-defun nil t) ;; it's in the log msg already
         (save-excursion ;; and it's about the same file
             (if (re-search-backward ; Ick, I want a real filename regexp!
                  "^\\*\\s-+\\([a-zA-Z0-9-_.@=+^$/%!?(){}<>]+\\)" nil t)
                 (string-equal (match-string 1) this-file)
        (if (re-search-forward ":" nil t)
            (if (looking-at " ") (forward-char 1)))
      ;; Else no log message for this defun in progress...
      (goto-char (point-min))
      ;; But if log message for file already in progress, add to it.
      (if (search-forward this-file nil t)
            (if this-defun (progn
                             (kill-new (format "(%s): " this-defun))
                             (kill-new this-defun)))
            (search-forward ")" nil t)
            (if (looking-at " ") (forward-char 1)))
        ;; Found neither defun nor its file, so create new entry.
        (goto-char (point-max))
        (if (not (bolp)) (insert "\n"))
        (insert (format "\n* %s (%s): " this-file (or this-defun "")))
        ;; Finally, if no derived defun, put point where the user can
        ;; type it themselves.
        (if (not this-defun) (forward-char -3))))))

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:37:08 2006

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.