Mercurial > dotfiles

changeset 445:b0264224e2ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
compilation tweaks: tried and failed to fix hg compilation stuff I can't figure out why it's not working, but it's at least a little more hackable now.
author Augie Fackler <raf@durin42.com>
date Sat, 30 Sep 2017 06:47:10 -0400
parents 957632211aa3
children b2be3e77b64a
files .elisp/settings/50.compilation-tweaks.el
diffstat 1 files changed, 37 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/.elisp/settings/50.compilation-tweaks.el
+++ b/.elisp/settings/50.compilation-tweaks.el
@@ -1,22 +1,40 @@
 (require 'compile)
 
-(pushnew
- '(mercurial-test-output-tb
-   "\+  File \".*/install/lib/python/\\([^\"]*\\)\", line \\([0-9]*\\)\\(, in .*\\)?$"
-    1 2) compilation-error-regexp-alist-alist)
-(pushnew
- '(mercurial-check-code-output-tb
-   "\+\\(/[^:]+\\):\\([0-9]+\\):$"
-    1 2) compilation-error-regexp-alist-alist)
-;; add to the end so this gets priority
-(setq compilation-error-regexp-alist
-      (append compilation-error-regexp-alist '(mercurial-test-output-tb)))
-(setq compilation-error-regexp-alist
-      (append compilation-error-regexp-alist '(mercurial-check-code-output-tb)))
+(setq af--hg-test-traceback
+      (rx
+       bol
+       "+  File \""
+       (one-or-more not-newline)
+       "/install/lib/python/"
+       (group (one-or-more (not (any "\""))))
+       ", line "
+       (group (one-or-more digit))
+       )
+      )
 
-;; Use the next s-exp to remove the last list element if you need to
-;; live-edit this regex
-;; (setq compilation-error-regexp-alist-alist
-;;         (cdr compilation-error-regexp-alist-alist))
-;; (setq compilation-error-regexp-alist
-;;         (reverse (cdr (reverse compilation-error-regexp-alist))))
+(setq compilation-error-regexp-alist-alist
+  (cons '(mercurial-test-output-tb af--hg-test-traceback 1 2)
+        (assq-delete-all 'mercurial-test-output-tb
+                         compilation-error-regexp-alist-alist)))
+
+(setq af--hg-check-code-error-re
+      (rx
+       bol
+       "+  "
+       (group (one-or-more not-newline))
+       ":"
+       (group (one-or-more digit))
+       ":"
+       )
+      )
+
+(setq compilation-error-regexp-alist-alist
+  (cons '(mercurial-check-code-output af--hg-check-code-error-re 1 2)
+        (assq-delete-all 'mercurial-check-code-output
+                          compilation-error-regexp-alist-alist)))
+
+(add-to-list 'compilation-error-regexp-alist 'mercurial-test-output-tb)
+(add-to-list 'compilation-error-regexp-alist 'mercurial-check-code-output)
+
+;; to debug:
+;;(setq compilation-error-regexp-alist '(mercurial-check-code-output))