mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-14 09:39:42 +00:00
Code Issues Releases Activity

When VC detects a conflict, specify which file

Browse Source 
* lisp/vc/vc.el (vc-message-unresolved-conflicts): New function.
* lisp/vc/vc-svn.el (vc-svn-find-file-hook):
* lisp/vc/vc-hg.el (vc-hg-find-file-hook):
* lisp/vc/vc-bzr.el (vc-bzr-find-file-hook):
* lisp/vc/vc-git.el (vc-git-find-file-hook): Use above new function
  to display a standard message that specifies the conflicted file.

Before this change, the message VC used for indicating a conflicted
file was just "There are unresolved conflicts in this file" without
naming the file (and this language was duplicated in several places).
After this change, it's "There are unresolved conflicts in file FOO"
(and this language is now centralized in one function in vc.el).

Justification: It's important for the message to name the conflicted
file because the moment when VC realizes a file is conflicted does not
always come interactively.  For example, some people automatically
find a set of Org Mode files on startup, and may keep those .org files
under version control.  If any of the files are conflicted, the user
just sees some messages fly by, and might later check the "*Messages*"
buffer to find out what files were conflicted.  I'm not saying this
happened to me or anything; it's a purely hypothetical example.
This commit is contained in:
Karl Fogel 2015-11-09 15:57:23 -06:00
parent 86c19714b0
commit 3c3aad7335
5 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/vc/vc-bzr.el
View File

@ -517,7 +517,7 @@ in the branch repository (or whose status not be determined)."
;; elisp function to remerge from the .BASE/OTHER/THIS files.
(smerge-start-session)
(add-hook 'after-save-hook 'vc-bzr-resolve-when-done nil t)
(message "There are unresolved conflicts in this file")))
(vc-message-unresolved-conflicts buffer-file-name)))
(defun vc-bzr-version-dirstate (dir)
"Try to return as a string the bzr revision ID of directory DIR.

2
lisp/vc/vc-git.el
View File

@ -841,7 +841,7 @@ This prompts for a branch to merge from."
(smerge-start-session)
(when vc-git-resolve-conflicts
(add-hook 'after-save-hook 'vc-git-resolve-when-done nil 'local))
(message "There are unresolved conflicts in this file")))
(vc-message-unresolved-conflicts buffer-file-name)))
;;; HISTORY FUNCTIONS

2
lisp/vc/vc-hg.el
View File

@ -535,7 +535,7 @@ REV is the revision to check out into WORKFILE."
(vc-file-setprop buffer-file-name 'vc-state 'conflict)
(smerge-start-session)
(add-hook 'after-save-hook 'vc-hg-resolve-when-done nil t)
(message "There are unresolved conflicts in this file")))
(vc-message-unresolved-conflicts buffer-file-name)))
;; Modeled after the similar function in vc-bzr.el

2
lisp/vc/vc-svn.el
View File

@ -686,7 +686,7 @@ and that it passes `vc-svn-global-switches' to it before FLAGS."
;; use conflict markers in which case we don't really know what to do.
;; So let's just punt for now.
nil)
(message "There are unresolved conflicts in this file")))
(vc-message-unresolved-conflicts buffer-file-name)))
(defun vc-svn-parse-status (&optional filename)
"Parse output of \"svn status\" command in the current buffer.

7
lisp/vc/vc.el
View File

@ -2067,6 +2067,13 @@ changes from the current branch."
(smerge-mode 1)
(message "File contains conflicts.")))
;;;###autoload
(defun vc-message-unresolved-conflicts (filename)
"Display a message indicating unresolved conflicts in FILENAME."
;; This enables all VC backends to give a standard, recognizeable
;; conflict message that indicates which file is conflicted.
(message "There are unresolved conflicts in %s" filename))
;;;###autoload
(defalias 'vc-resolve-conflicts 'smerge-ediff)