branch: master
commit 076d15cfb0109c999d7f145fd2a3108c5329e080
Author: Michael Albinus
Commit: Michael Albinus
Document patching from debbugs, and fix some bugs
* packages/debbugs/debbugs-gnu.el (debbugs-gnu-emacs-current-release):
Change value to "25.2".
(debbugs-gnu-emacs-blocking-reports): Rename from
`debbugs-gnu-blocking-reports'.
(debbugs-gnu-show-all-blocking-reports): Optional argument RELEASE.
(debbugs-gnu-current-directory): New defvar.
(debbugs-gnu-apply-patch, debbugs-gnu-find-contributor)
(debbugs-gnu-change-checkin): Use it.
* packages/debbugs/debbugs-ug.texi (Retrieving Bugs): Precise
commands to show patches.
(Presenting Bugs): Rename from "Layout".
(Tabulated Lists): Mention prefix variants of key strokes.
(TODO Items, Control Messages): Add index entries.
(Applying Patches): New section.
* packages/debbugs/debbugs.el (debbugs-search-est): Fix docstring.
---
packages/debbugs/debbugs-gnu.el | 145 +++---
packages/debbugs/debbugs-ug.info | 134 +++
packages/debbugs/debbugs-ug.texi | 64 ++---
packages/debbugs/debbugs.el |4 +-
4 files changed, 265 insertions(+), 82 deletions(-)
diff --git a/packages/debbugs/debbugs-gnu.el b/packages/debbugs/debbugs-gnu.el
index e868056..96b0f3a 100644
--- a/packages/debbugs/debbugs-gnu.el
+++ b/packages/debbugs/debbugs-gnu.el
@@ -336,7 +336,7 @@ a date, value is the cons cell \(BEFORE . AFTER\).")
The specification which bugs shall be suppressed is taken from
`debbugs-gnu-default-suppress-bugs'.")
-(defcustom debbugs-gnu-emacs-current-release "25.1"
+(defcustom debbugs-gnu-emacs-current-release "25.2"
"The current Emacs relase developped for."
:group 'debbugs-gnu
:type '(choice (const "24.5")
@@ -344,7 +344,7 @@ The specification which bugs shall be suppressed is taken
from
(const "25.2"))
:version "25.1")
-(defconst debbugs-gnu-blocking-reports
+(defconst debbugs-gnu-emacs-blocking-reports
'(("24.5" . 19758)
("25.1" . 19759)
("25.2" . 21966))
@@ -1091,19 +1091,24 @@ The following commands are available:
(message "Bug %d is not blocking any other bug" id)
(apply 'debbugs-gnu-bugs (cdr (assq 'blocks status))
-(defun debbugs-gnu-show-all-blocking-reports ()
- "Narrow the display to just the reports that are blocking a release."
- (interactive)
+(defun debbugs-gnu-show-all-blocking-reports (&optional release)
+ "Narrow the display to just the reports that are blocking an Emacs release."
+ (interactive
+ (list
+(if current-prefix-arg
+ (completing-read
+"Emacs release: "
+(mapcar 'identity debbugs-gnu-emacs-blocking-reports)
+nil t debbugs-gnu-emacs-current-release)
+ debbugs-gnu-emacs-current-release)))
+
(let ((blockers
(cdr
(assq
'blockedby
(car
(debbugs-get-status
-(cdr
- (assoc
- debbugs-gnu-emacs-current-release
- debbugs-gnu-blocking-reports)))
+(cdr (assoc release debbugs-gnu-emacs-blocking-reports)))
(id (debbugs-gnu-current-id t))
(inhibit-read-only t)
status)
@@ -1582,6 +1587,9 @@ The following commands are available:
(defvar debbugs-gnu-branch-directory "~/src/emacs/emacs-25/"
"The directory where the previous source tree lives.")
+(defvar debbugs-gnu-current-directory nil
+ "The current source tree directory.")
+
(defun debbugs-gnu-apply-patch (&optional branch)
"Apply the patch from the current message.
If given a prefix, patch in the branch directory instead."
@@ -1589,22 +1597,29 @@ If given a prefix, patch in the branch directory
instead."
(add-hook 'emacs-lisp-mode-hook 'debbugs-gnu-lisp-mode)
(add-hook 'diff-mode-hook 'debbugs-gnu-diff-mode)
(add-hook 'change-log-mode-hook 'debbugs-gnu-change-mode)
- (let ((rej "/tmp/debbugs-gnu.rej")
+ (let ((rej (expand-file-name "debbugs-gnu.rej" temporary-file-directory))
(output-buffer (get-buffer-create "*debbugs patch*"))
- (dir (if branch
-debbugs-gnu-branch-directory
- debbugs-gnu-trunk-directory))
(patch-buffers nil))
(when (file-exists-p rej)
(delete-file rej))
(with-current-buffer output-buffer
(erase-buffer))
+(setq debbugs-gnu-current-directory
+ (if branch
+ debbugs-gnu-branch-directory
+ debbugs-gnu-trunk-directory))
+(unless (file-directory-p debbugs-gnu-current-directory)
+ (setq debbugs-gnu-current-directory
+ (read-file-name
+"Emacs repository location: "
+debbugs-gnu-current-directory nil t nil 'file-directory-p)))
(gnus-summary-select-article nil t)
;; The patches are either in MIME attachements or the main article
;; buffer. Determine which.
(gnus-with-article-b
