[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/debbugs 78ad396 157/311: Further tweaks to the patch fi
From: |
Stefan Monnier |
Subject: |
[elpa] externals/debbugs 78ad396 157/311: Further tweaks to the patch fixer-upper (for a/erc.el) |
Date: |
Sun, 29 Nov 2020 18:42:01 -0500 (EST) |
branch: externals/debbugs
commit 78ad396a7b999b50a8777d737335e5dad1639977
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
Further tweaks to the patch fixer-upper (for a/erc.el)
---
debbugs-gnu.el | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/debbugs-gnu.el b/debbugs-gnu.el
index 296538a..034f6f6 100644
--- a/debbugs-gnu.el
+++ b/debbugs-gnu.el
@@ -1421,21 +1421,26 @@ If given a prefix, patch in the branch directory
instead."
(goto-char (point-min))
(re-search-forward diff-file-header-re nil t)
(goto-char (match-beginning 0))
- (let ((file-names (diff-hunk-file-names)))
- (when (and file-names
- (not (string-match "/" (car file-names))))
+ (let ((target-name (car (diff-hunk-file-names))))
+ (when (and target-name
+ (or (not (string-match "/" target-name))
+ (and (string-match "^[ab]/" target-name)
+ (not (file-exists-p
+ (expand-file-name (substring target-name 2)
+ dir))))))
;; We have a simple patch that refers to a file somewhere in the
;; tree. Find it.
(when-let ((files (directory-files-recursively
- dir (concat "^" (regexp-quote (car file-names))
+ dir (concat "^" (regexp-quote
+ (file-name-nondirectory target-name))
"$"))))
(when (re-search-forward (concat "^[+]+ "
- (regexp-quote (car file-names))
- "[ \t]")
+ (regexp-quote target-name)
+ "\\([ \t\n]\\)")
nil t)
(replace-match (concat "+++ a"
(substring (car files) (length dir))
- "\t")
+ (match-string 1))
nil t))))))
(defun debbugs-gnu-find-contributor (string)
- [elpa] externals/debbugs a0b4b2e 131/311: Require compile before using variables from that package, (continued)
- [elpa] externals/debbugs a0b4b2e 131/311: Require compile before using variables from that package, Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs c9989ec 133/311: New manual debbugs-ug.texi, Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs 9ba8dcc 139/311: Minor improvements to debbugs-reference.el, Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs 8de636e 140/311: Rename debbugs-reference.el to debbugs-browse.el, Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs 4c9f22b 148/311: Command to list blocking reports, Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs f4bc079 151/311: * debbugs-gnu.el (debbugs-gnu-narrow-to-status): Make narrowing to the severity work., Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs 6d52539 143/311: Support reading debbugs email exchange with Rmail, Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs 02fa6d4 144/311: Version: bump to 0.8 in debbugs files, Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs 23786a1 146/311: * debbugs-gnu.el (debbugs-gnu-select-report): Don't bug out on the, Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs ea69942 155/311: Allow patching from non-MIME articles, Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs 78ad396 157/311: Further tweaks to the patch fixer-upper (for a/erc.el),
Stefan Monnier <=
- [elpa] externals/debbugs 20cf154 160/311: Retrieve bugs asynchronously, Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs bd894ed 161/311: Move asynchronous calls in debbugs to SOAP function level., Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs 82ea47b 164/311: Consolidation in debbugs, Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs d0e991e 165/311: Cache and reuse bug entries in debbugs, Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs 9a8e852 168/311: Fix missing mail-header-separator, Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs a3f6bb8 169/311: * debbugs-gnu.el (debbugs-gnu-apply-patch): Really do QP decoding., Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs 938a990 175/311: Allow sending control messages offline, Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs 10f5c39 177/311: Add a command to save the bugs list, Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs ff02eb7 123/311: * debbugs/debbugs-gnu.el (debbugs-gnu-default-packages): Add auctex, mh-e., Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs 8f1d62a 141/311: Upgrade debbugs to 0.7, Stefan Monnier, 2020/11/29