CVS update by didierv packages/xemacs-packages/xemacs-devel/texi,
ChangeLog ...
xemacs-cvs at xemacs.org
xemacs-cvs at xemacs.org
Mon Sep 17 05:26:06 EDT 2007
User: didierv
Date: 07/09/17 11:26:06
Modified: packages/xemacs-packages/xemacs-devel/texi patcher.texi
ChangeLog
Log:
Patcher 3.9 is released
Revision Changes Path
1.24 +34 -37 XEmacs/packages/xemacs-packages/xemacs-devel/patcher.el
Index: patcher.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xemacs-devel/patcher.el,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- patcher.el 2005/07/26 14:20:07 1.23
+++ patcher.el 2007/09/17 09:26:01 1.24
@@ -1,13 +1,12 @@
;;; patcher.el --- Utility for mailing patch information
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Didier Verna.
+;; Copyright (C) 2007 Didier Verna.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Didier Verna.
-;; PRCS: $Id: patcher.el 1.16.1.60.1.17 Tue, 26 Jul 2005 15:53:03 +0200 didier $
-
;; Author: Didier Verna <didier at xemacs.org>
;; Maintainer: Didier Verna <didier at xemacs.org>
;; Created: Tue Sep 28 18:12:43 1999
-;; Last Revision: Tue Aug 31 14:14:48 2004
+;; Last Revision: Mon Sep 17 09:45:22 2007
;; Keywords: maint
;; This file is part of Patcher.
@@ -169,26 +168,8 @@
;; Version management
;; ===========================================================================
-;; $Format: "(defconst patcher-prcs-major-version \"$ProjectMajorVersion$\")"$
-(defconst patcher-prcs-major-version "version-3-8")
-;; $Format: "(defconst patcher-prcs-minor-version \"$ProjectMinorVersion$\")"$
-(defconst patcher-prcs-minor-version "1")
-(defconst patcher-version
- (let ((level patcher-prcs-minor-version)
- major minor status)
- (string-match "\\(branch\\|version\\)-\\([0-9]+\\)-\\([0-9]+\\)"
- patcher-prcs-major-version)
- (setq major (match-string 2 patcher-prcs-major-version)
- minor (match-string 3 patcher-prcs-major-version)
- status (match-string 1 patcher-prcs-major-version))
- (cond ((string= status "version")
- (setq level (int-to-string (1- (string-to-int level))))
- (if (string-equal level "0")
- (concat major "." minor)
- (concat major "." minor "." level)))
- ((string= status "branch")
- (concat major "." minor "-b" level)))
- ))
+(defconst patcher-version "3.9"
+ "Current version of Patcher")
;;;###autoload
(defun patcher-version ()
@@ -366,7 +347,7 @@ see how it's done for the built-in metho
If not defined, `user-full-name' is used."
:group 'patcher-default
:type '(choice (const :tag "user-full-name" nil)
- string))
+ string))
(defcustom patcher-default-user-mail nil
"*Default user mail address to use when sending a Patcher mail.
@@ -374,7 +355,7 @@ If not defined, `user-full-name' is used
If not defined, `user-mail-address' is used."
:group 'patcher-default
:type '(choice (const :tag "user-mail-address" nil)
- string))
+ string))
(defcustom patcher-default-to-address "xemacs-patches at xemacs.org"
"*Default To: header value to use when sending a Patcher mail.
@@ -394,7 +375,7 @@ you had typed `C-u a' in the group buffe
defined, it is prompted for."
:group 'patcher-default
:type '(choice (const :tag "Ask" nil)
- string))
+ string))
(defcustom patcher-default-subject-prefix "[PATCH]"
"*Default prefix for the subject of Patcher mails.
@@ -753,7 +734,7 @@ This is a list of theme names (symbols)
:format "%{%t%}: %v"
(const :tag "" :value :user-mail)
(choice (const :tag "user-mail-address" nil)
- string))
+ string))
(list :inline t :tag "To address"
:format "%{%t%}: %v"
(const :tag "" :value :to-address)
@@ -1793,13 +1774,17 @@ doing.
(narrow-to-region (or min (point-min)) (or max (point-max)))
(patch-to-change-log
default-directory
- :my-name (patcher-project-option patcher-project
- :change-logs-user-name)
- :my-email (patcher-project-option patcher-project
- :change-logs-user-mail)
+ :my-name (or (patcher-project-option patcher-project
+ :change-logs-user-name)
+ (patcher-project-option patcher-project
+ :user-name))
+ :my-email (or (patcher-project-option patcher-project
+ :change-logs-user-mail)
+ (patcher-project-option patcher-project
+ :user-mail))
:keep-source-files
(not (patcher-project-option patcher-project
- :kill-source-files-after-diffing))
+ :kill-source-files-after-diffing))
:extent-property 'patcher
:extent-property-value mailbuf)))
;; patch-to-change-log has the unfortunate side effect of burying all
@@ -1926,8 +1911,20 @@ project option"
(setq beg (point))
(skip-chars-forward "^/")
(forward-char 1)
- (delete-region beg (point)))
- )
+ (delete-region beg (point))))
+
+(defun patcher-darcs-diff-convert (&optional beg end)
+ "Patcher post-processor for Darcs diffs.
+This function removes the Darcs repository-specific path in front of
+filenames to turn the output into a standard diff output.
+This function is meant to be used as part of the :after-diff-hook
+project option"
+ (goto-char (or beg (point-min)))
+ (while (re-search-forward "^\\(---\\|\\+\+\\+\\) " end t)
+ (setq beg (point))
+ (skip-chars-forward "^/")
+ (forward-char 1)
+ (delete-region beg (point))))
(defun patcher-run-after-diff-hook (buffer &optional beg end)
;; If any, call the after-diff hooks on BUFFER (auxiliary or mail
@@ -1936,7 +1933,7 @@ project option"
;; #### buffers.
(with-current-buffer buffer
(let ((after-diff-hook (patcher-project-option patcher-project
- :after-diff-hook)))
+ :after-diff-hook)))
(when after-diff-hook
(patcher-with-progression "Running after diff hooks"
(save-excursion
@@ -2913,7 +2910,7 @@ variable `patcher-mail-run-gnus'). Poss
- nil: start Gnus in the current frame,
- t: start Gnus in a new frame,
- 'follow: start Gnus in a new frame, and also use this frame to prepare
- the new Patcher message."
+ the new Patcher message."
:group 'patcher-mail
:type '(radio (const :tag "Use current frame" nil)
(const :tag "Create new frame" t)
1.110 +13 -5 XEmacs/packages/xemacs-packages/xemacs-devel/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xemacs-devel/ChangeLog,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- ChangeLog 2006/08/14 08:32:40 1.109
+++ ChangeLog 2007/09/17 09:26:02 1.110
@@ -1,3 +1,11 @@
+2007-09-17 Didier Verna <didier at lrde.epita.fr>
+
+ Patcher 3.9 is released.
+
+ * patcher.el (patcher-darcs-diff-convert): New.
+ * patcher.el (patcher-generate-change-logs): Make
+ :change-logs-user-[name|mail] default to :user-[name|mail].
+
2006-08-14 Norbert Koch <viteno at xemacs.org>
* Makefile (VERSION): XEmacs package 1.75 released.
@@ -7,8 +15,8 @@
* find-func.el (find-function-C-source):
Change the regexp for a subr definition to also accept
DEFUN_NORETURN, DEFUN_MANY and the other alternatives available in
- lisp.h.
-
+ lisp.h.
+
2006-07-11 Norbert Koch <viteno at xemacs.org>
* Makefile (VERSION): XEmacs package 1.74 released.
@@ -19,7 +27,7 @@
Prefer source-directory to source-root, check that the
corresponding variables exist before using them--fixes an error on
21.4.
-
+
2006-07-10 Norbert Koch <viteno at xemacs.org>
* Makefile (VERSION): XEmacs package 1.73 released.
@@ -676,10 +684,10 @@
* ielm.el (ielm-eval-input): Change `:', `::', `:::' to `!'...,
since the `:' is special syntax now for keyword variables.
- (several other occurances also changed.) I chose !, because shells
+ (several other occurances also changed.) I chose !, because shells
use that character for history expansion.
(ielm-eval-input): Check that `ielm-string' is not null.
- Integrated reversed patch from Gregory Neil Shapiro
+ Integrated reversed patch from Gregory Neil Shapiro
<gshapiro at sendmail.org>.
1998-08-15 SL Baur <steve at altair.xemacs.org>
1.14 +25 -16 XEmacs/packages/xemacs-packages/xemacs-devel/texi/patcher.texi
Index: patcher.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xemacs-devel/texi/patcher.texi,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- patcher.texi 2005/07/26 14:20:11 1.13
+++ patcher.texi 2007/09/17 09:26:05 1.14
@@ -2,15 +2,13 @@
@c patcher.texi --- Patcher documentation
- at c Copyright (C) 2002, 2003, 2004 Didier Verna.
+ at c Copyright (C) 2002, 2003, 2004, 2007 Didier Verna.
- at c PRCS: $Id: patcher.texi,v 1.13 2005/07/26 14:20:11 didierv Exp $
+ at c Author: Didier Verna <didier at xemacs.org>
+ at c Maintainer: Didier Verna <didier at xemacs.org>
+ at c Created: Sun Apr 21 21:34:06 2002 under XEmacs 21.5
+ at c Last Revision: Mon Sep 17 09:51:41 2007
- at c Author: Didier Verna <didier at lrde.epita.fr>
- at c Maintainer: Didier Verna <didier at lrde.epita.fr>
- at c Created: Sun Apr 21 21:34:06 2002 under XEmacs 21.5 (beta 1)
- at c Last Revision: Tue Aug 31 14:14:48 2004
-
@c This file is part of Patcher.
@c Patcher is free software; you can redistribute it and/or modify
@@ -52,8 +50,8 @@
@c ====================================================================
@c Definitions
@c ====================================================================
- at set VERSION 3.8
- at set COPYRIGHT_DATE 1999, 2000, 2001, 2002, 2003, 2004, 2005
+ at set VERSION 3.9
+ at set COPYRIGHT_DATE 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007
@c ====================================================================
@@ -188,11 +186,11 @@ Foundation, Inc., 675 Mass Ave, Cambridg
When a project becomes important in size, or when the development is
performed cooperatively by several people across the Internet, it is a
common practice to help maintaining it by using a development control
-system. Such tools (CVS, PRCS, to name a few) usually work by
-maintaining a centralized project archive (also called a repository)
-that keeps track of the history of the changes, lets you develop
-different ``branches'' at the same time and perform operations like
-merges between these different project branches.
+system. Such tools (CVS, SVN, PRCS, Darcs to name a few) usually work
+by maintaining a centralized project archive (also called a
+repository) that keeps track of the history of the changes, lets you
+develop different ``branches'' at the same time and perform operations
+like merges between these different project branches.
In such ``archive-based'' maintenance models, making the project evolve
usually involves repeatedly the same few steps, some of which can be
@@ -754,7 +752,7 @@ Projects might share options for differe
(@code{To:} address, @code{From:} address, diff and commit commands and
so on) because they both relate to XEmacs. On the other hand I have
personal but totally unrelated projects that share the same commands
-because they are all handled through a local PRCS archive.
+because they are all handled through a common system: Darcs.
In other words, you should rather use the inheritance mechanism when
projects relate to each other, and the theme mechanism for settings that
@@ -1107,6 +1105,11 @@ Note: Patcher provides a special functio
@code{patcher-prcs-diff-convert} that can be used in this hook in order
to convert PRCS diff output to a traditional one.
+ at findex patcher-prcs-darcs-convert
+Note: Patcher provides a special function named
+ at code{patcher-prcs-darcs-convert} that can be used in this hook in order
+to convert Darcs diff output to a traditional one.
+
@node Diff Line Filter, Patch Restriction, After Diff Hook, Patch Generation
@comment node-name, next, previous, up
@@ -1333,8 +1336,12 @@ ChangeLog entries, and won't expect that
@vindex patcher-default-change-logs-user-name
@vindex :change-logs-user-name
+ at vindex patcher-default-user-name
+ at vindex:user-name
@vindex patcher-default-change-logs-user-mail
@vindex :change-logs-user-mail
+ at vindex patcher-default-user-mail
+ at vindex:user-mail
@findex patch-to-change-log
@vindex user-full-name
@vindex user-mail-address
@@ -1342,7 +1349,9 @@ If you're working in @code{automatic} up
other project options that give you some control on the created entries:
@code{:change-logs-user-name} and @code{:change-logs-user-mail}. As you
might expect, these are strings defining your name and mail address for
-ChangeLog entries'headers. When @code{nil}, Patcher lets the function
+ChangeLog entries'headers. When @code{nil}, Patcher falls back to
+(respectively) the @code{:user-name} and @code{:user-mail} project
+options. If in turn set to nil, Patcher lets the function
@code{patch-to-change-log} decide what to use (most probably what the
user options @code{user-full-name} and @code{user-mail-address} say).
1.14 +9 -0 XEmacs/packages/xemacs-packages/xemacs-devel/texi/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xemacs-devel/texi/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ChangeLog 2005/07/26 14:20:11 1.13
+++ ChangeLog 2007/09/17 09:26:06 1.14
@@ -1,3 +1,12 @@
+2007-09-17 Didier Verna <didier at lrde.epita.fr>
+
+ Patcher 3.9 is released.
+
+ * patcher.texi (After Diff Hook): Describe
+ `patcher-darcs-diff-convert'.
+ * patcher.texi (ChangeLogs Updating): Update description of
+ user-name and user-mail behavior.
+
2005-07-26 Didier Verna <didier at xemacs.org>
* Patcher 3.8 is released.
More information about the XEmacs-CVS
mailing list