##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

filemerge: add support for partial conflict resolution by external tool...
filemerge: add support for partial conflict resolution by external tool A common class of merge conflicts is in imports/#includes/etc. It's relatively easy to write a tool that can resolve these conflicts, perhaps by naively just unioning the statements and leaving any cleanup to other tools to do later [1]. Such specialized tools cannot generally resolve all conflicts in a file, of course. Let's therefore call them "partial merge tools". Note that the internal simplemerge algorithm is such a partial merge tool - one that only resolves trivial "conflicts" where one side is unchanged or both sides change in the same way. One can also imagine having smarter language-aware partial tools that merge the AST. It may be useful for such tools to interactively let the user resolve any conflicts it can't resolve itself. However, having the option of implementing it as a partial merge tool means that the developer doesn't *need* to create a UI for it. Instead, the user can resolve any remaining conflicts with their regular merge tool (e.g. `:merge3` or `meld). We don't currently have a way to let the user define such partial merge tools. That's what this patch addresses. It lets the user configure partial merge tools to run. Each tool can be configured to run only on files matching certain patterns (e.g. "*.py"). The tool takes three inputs (local, base, other) and resolves conflicts by updating these in place. For example, let's say the inputs are these: base: ``` import sys def main(): print('Hello') ``` local: ``` import os import sys def main(): print('Hi') ``` other: ``` import re import sys def main(): print('Howdy') ``` A partial merge tool could now resolve the conflicting imports by replacing the import statements in *all* files by the following snippet, while leaving the remainder of the files unchanged. ``` import os import re import sys ``` As a result, simplemerge and any regular merge tool that runs after the partial merge tool(s) will consider the imports to be non-conflicting and will only present the conflict in `main()` to the user. Differential Revision: https://phab.mercurial-scm.org/D12356
Raphaël Gomès - - Load All Authors

File last commit:

r47575:d4ba4d51 default
r49838:f3aafd78 default
Show More
hg-test-mode.el
97 lines | 3.6 KiB | text/x-common-lisp | EmacsLispLexer
/ contrib / hg-test-mode.el
History | Annotation | Raw |Copy content |Copy permalink
;; hg-test-mode.el - Major mode for editing Mercurial tests
;;
;; Copyright 2014 Olivia Mackall <olivia@selenic.com>
;; "I have no idea what I'm doing"
;;
;; This software may be used and distributed according to the terms of the
;; GNU General Public License version 2 or any later version.
;;
;; To enable, add something like the following to your .emacs:
;;
;; (if (file-exists-p "~/hg/contrib/hg-test-mode.el")
;; (load "~/hg/contrib/hg-test-mode.el"))
(defvar hg-test-mode-hook nil)
(defvar hg-test-mode-map
(let ((map (make-keymap)))
(define-key map "\C-j" 'newline-and-indent)
map)
"Keymap for hg test major mode")
(add-to-list 'auto-mode-alist '("\\.t\\'" . hg-test-mode))
(defconst hg-test-font-lock-keywords-1
(list
'("^ \\(\\$\\|>>>\\) " 1 font-lock-builtin-face)
'("^ \\(>\\|\\.\\.\\.\\) " 1 font-lock-constant-face)
'("^ \\([[][0-9]+[]]\\)$" 1 font-lock-warning-face)
'("^ \\(.*?\\)\\(\\( [(][-a-z]+[)]\\)*\\)$" 1 font-lock-string-face)
'("\\$?\\(HG\\|TEST\\)\\w+=?" . font-lock-variable-name-face)
'("^ \\(.*?\\)\\(\\( [(][-a-z]+[)]\\)+\\)$" 2 font-lock-type-face)
'("^#.*" . font-lock-preprocessor-face)
'("^\\([^ ].*\\)$" 1 font-lock-comment-face)
)
"Minimal highlighting expressions for hg-test mode")
(defvar hg-test-font-lock-keywords hg-test-font-lock-keywords-1
"Default highlighting expressions for hg-test mode")
(defvar hg-test-mode-syntax-table
(let ((st (make-syntax-table)))
(modify-syntax-entry ?\" "w" st) ;; disable standard quoting
st)
"Syntax table for hg-test mode")
(defun hg-test-mode ()
(interactive)
(kill-all-local-variables)
(use-local-map hg-test-mode-map)
(set-syntax-table hg-test-mode-syntax-table)
(set (make-local-variable 'font-lock-defaults) '(hg-test-font-lock-keywords))
(setq major-mode 'hg-test-mode)
(setq mode-name "hg-test")
(run-hooks 'hg-test-mode-hook))
(with-eval-after-load "compile"
;; Link to Python sources in tracebacks in .t failures.
(add-to-list 'compilation-error-regexp-alist-alist
'(hg-test-output-python-tb
"^\\+ +File ['\"]\\([^'\"]+\\)['\"], line \\([0-9]+\\)," 1 2))
(add-to-list 'compilation-error-regexp-alist 'hg-test-output-python-tb)
;; Link to source files in test-check-code.t violations.
(add-to-list 'compilation-error-regexp-alist-alist
'(hg-test-check-code-output
"\\+ \\([^:\n]+\\):\\([0-9]+\\):$" 1 2))
(add-to-list 'compilation-error-regexp-alist 'hg-test-check-code-output))
(defun hg-test-mode--test-one-error-line-regexp (test)
(erase-buffer)
(setq compilation-locs (make-hash-table))
(insert (car test))
(compilation-parse-errors (point-min) (point-max))
(let ((msg (get-text-property 1 'compilation-message)))
(should msg)
(let ((loc (compilation--message->loc msg))
(line (nth 1 test))
(file (nth 2 test)))
(should (equal (compilation--loc->line loc) line))
(should (equal (caar (compilation--loc->file-struct loc)) file)))
msg))
(require 'ert)
(ert-deftest hg-test-mode--compilation-mode-support ()
"Test hg-specific compilation-mode regular expressions"
(require 'compile)
(with-temp-buffer
(font-lock-mode -1)
(mapc 'hg-test-mode--test-one-error-line-regexp
'(
("+ contrib/debugshell.py:37:" 37 "contrib/debugshell.py")
("+ File \"/tmp/hg/mercurial/commands.py\", line 3115, in help_"
3115 "/tmp/hg/mercurial/commands.py")
("+ File \"mercurial/dispatch.py\", line 225, in dispatch"
225 "mercurial/dispatch.py")))))
(provide 'hg-test-mode)