git.el: Use git-add-file for unmerged files, remove git-resolve-file

PATCH In review Martin Nordholts 3 participants 6 messages Jun 15, 2016

Share & tools

Martin Nordholts

author

2016-06-15 22:47 UTC #0 lore raw

PATCH 1/1 git.el: Use git-add-file for unmerged files, remove git-resolve-file

Use git-add-file' to mark unmerged files as resolved in the *git-status* buffer to be consistent with git's CLI instructions. Also remove git-resolve-file' to make it clear that that "R" is a now a free keybinding.

Signed-off-by Martin Nordholts <[email protected]>

---
 contrib/emacs/git.el |   13 +------------
 1 files changed, 1 insertions(+), 12 deletions(-)

contrib/emacs/git.el +1 ~~-12~~

index 8c70ad8..214930a 100644
@@ -1046,7 +1046,7 @@ The FILES list must be sorted."
 (defun git-add-file ()
   "Add marked file(s) to the index cache."
   (interactive)
-  (let ((files (git-get-filenames (git-marked-files-state 'unknown 'ignored))))
+  (let ((files (git-get-filenames (git-marked-files-state 'unknown 'ignored 'unmerged))))
     ;; FIXME: add support for directories
     (unless files
       (push (file-relative-name (read-file-name "File to add: " nil nil t)) files))

@@ -1119,15 +1119,6 @@ The FILES list must be sorted."
               (when buffer (with-current-buffer buffer (revert-buffer t t t)))))
           (git-success-message "Reverted" names))))))
 
-(defun git-resolve-file ()
-  "Resolve conflicts in marked file(s)."
-  (interactive)
-  (let ((files (git-get-filenames (git-marked-files-state 'unmerged))))
-    (when files
-      (when (apply 'git-call-process-display-error "update-index" "--" files)
-        (git-update-status-files files)
-        (git-success-message "Resolved" files)))))
-
 (defun git-remove-handled ()
   "Remove handled files from the status list."
   (interactive)

@@ -1556,7 +1547,6 @@ amended version of it."
     (define-key map "P"   'git-prev-unmerged-file)
     (define-key map "q"   'git-status-quit)
     (define-key map "r"   'git-remove-file)
-    (define-key map "R"   'git-resolve-file)
     (define-key map "t"    toggle-map)
     (define-key map "T"   'git-toggle-all-marks)
     (define-key map "u"   'git-unmark-file)

@@ -1598,7 +1588,6 @@ amended version of it."
       ("Merge"
 	["Next Unmerged File" git-next-unmerged-file t]
 	["Prev Unmerged File" git-prev-unmerged-file t]
-	["Mark as Resolved" git-resolve-file t]
 	["Interactive Merge File" git-find-file-imerge t]
 	["Diff Against Common Base File" git-diff-file-base t]
 	["Diff Combined" git-diff-file-combined t]

Signature · 1 line

1.6.2.5

Junio C Hamano

2016-06-15 22:47 UTC #1 lore raw

Quoted 4 lines · Martin Nordholts

Use git-add-file' to mark unmerged files as resolved in the *git-status* buffer to be consistent with git's CLI instructions. Also remove git-resolve-file' to make it clear that that "R" is a now a free keybinding.

I do not know all the details of how Emacs keybinding works, but I had an impression that something-x sequence is triggered if you type something-X and you do not have an explicit binding for something-X but you do have a binding for something-x.

IOW, if I only have

(define-key global-map "\C-xc" 'compile)

then both "\C-xc" and "\C-xC" runs "compile", but in addition to the above if I also have

(define-key global-map "\C-xC" 'grep-find)

then I can invoke these two commands with lower- and upper- case 'c/C' after control-x.

If people have been relying on the historical behaviour that typing "R" marked the path resolved (which may internally have been implemented with whatever way), and if you are removing that binding, wouldn't that now expose them to whatever happens to be bound to "r"?

And worse, it is bound to git-remove-file. Shouldn't you at least rebind the "R" to something safer, like beep?

Am I grossly misunderstanding how Emacs keybindings work? Is the experiment I did in the initial part of the message with the global-map relying on some "magic" that only appears in global-map, and there is no problem doing this in the map this patch is about?

Quoted 53 lines

Signed-off-by Martin Nordholts <[email protected]>

Acked-by Alexandre Julliard <[email protected]>

---
 contrib/emacs/git.el |   13 +------------
 1 files changed, 1 insertions(+), 12 deletions(-)

contrib/emacs/git.el +1 ~~-12~~

index 8c70ad8..214930a 100644
@@ -1046,7 +1046,7 @@ The FILES list must be sorted."
 (defun git-add-file ()
   "Add marked file(s) to the index cache."
   (interactive)
-  (let ((files (git-get-filenames (git-marked-files-state 'unknown 'ignored))))
+  (let ((files (git-get-filenames (git-marked-files-state 'unknown 'ignored 'unmerged))))
     ;; FIXME: add support for directories
     (unless files
       (push (file-relative-name (read-file-name "File to add: " nil nil t)) files))

@@ -1119,15 +1119,6 @@ The FILES list must be sorted."
               (when buffer (with-current-buffer buffer (revert-buffer t t t)))))
           (git-success-message "Reverted" names))))))
 
-(defun git-resolve-file ()
-  "Resolve conflicts in marked file(s)."
-  (interactive)
-  (let ((files (git-get-filenames (git-marked-files-state 'unmerged))))
-    (when files
-      (when (apply 'git-call-process-display-error "update-index" "--" files)
-        (git-update-status-files files)
-        (git-success-message "Resolved" files)))))
-
 (defun git-remove-handled ()
   "Remove handled files from the status list."
   (interactive)

@@ -1556,7 +1547,6 @@ amended version of it."
     (define-key map "P"   'git-prev-unmerged-file)
     (define-key map "q"   'git-status-quit)
     (define-key map "r"   'git-remove-file)
-    (define-key map "R"   'git-resolve-file)
     (define-key map "t"    toggle-map)
     (define-key map "T"   'git-toggle-all-marks)
     (define-key map "u"   'git-unmark-file)

@@ -1598,7 +1588,6 @@ amended version of it."
       ("Merge"
 	["Next Unmerged File" git-next-unmerged-file t]
 	["Prev Unmerged File" git-prev-unmerged-file t]
-	["Mark as Resolved" git-resolve-file t]
 	["Interactive Merge File" git-find-file-imerge t]
 	["Diff Against Common Base File" git-diff-file-base t]
 	["Diff Combined" git-diff-file-combined t]

Signature · 1 line

1.6.2.5

Alexandre Julliard

2016-06-15 22:47 UTC #2 lore raw

Quoted 14 lines · Junio C Hamano

I do not know all the details of how Emacs keybinding works, but I had an impression that something-x sequence is triggered if you type something-X and you do not have an explicit binding for something-X but you do have a binding for something-x.
IOW, if I only have
(define-key global-map "\C-xc" 'compile)
then both "\C-xc" and "\C-xC" runs "compile", but in addition to the above if I also have
(define-key global-map "\C-xC" 'grep-find)

Quoted 7 lines

then I can invoke these two commands with lower- and upper- case 'c/C' after control-x.
If people have been relying on the historical behaviour that typing "R" marked the path resolved (which may internally have been implemented with whatever way), and if you are removing that binding, wouldn't that now expose them to whatever happens to be bound to "r"?

No, I don't claim to understand exactly how that works for the C-x case, but it doesn't apply here, "r" and "R" are two different bindings.

Signature · 2 lines

Alexandre Julliard
[email protected]

Junio C Hamano

2016-06-15 22:47 UTC #3 lore raw

Quoted 19 lines · Alexandre Julliard

Quoted 17 lines · Junio C Hamano
I do not know all the details of how Emacs keybinding works, but I had an impression that something-x sequence is triggered if you type something-X and you do not have an explicit binding for something-X but you do have a binding for something-x.
IOW, if I only have
(define-key global-map "\C-xc" 'compile)
then both "\C-xc" and "\C-xC" runs "compile", but in addition to the above if I also have
(define-key global-map "\C-xC" 'grep-find)
then I can invoke these two commands with lower- and upper- case 'c/C' after control-x.

Quoted 7 lines

Quoted 4 lines
If people have been relying on the historical behaviour that typing "R" marked the path resolved (which may internally have been implemented with whatever way), and if you are removing that binding, wouldn't that now expose them to whatever happens to be bound to "r"?
No, I don't claim to understand exactly how that works for the C-x case, but it doesn't apply here, "r" and "R" are two different bindings.

Thanks. I just wanted to make sure that a user who is used to typing "R" won't get the file removed with the new code.

Alexandre Julliard

Acked-by on v1 1/1

2016-06-15 22:47 UTC #4 lore raw

In reply to Martin Nordholts

Quoted 6 lines · Martin Nordholts

Use git-add-file' to mark unmerged files as resolved in the *git-status* buffer to be consistent with git's CLI instructions. Also remove git-resolve-file' to make it clear that that "R" is a now a free keybinding.
Signed-off-by Martin Nordholts <[email protected]>

Looks good, thanks.

Acked-by Alexandre Julliard <[email protected]>

Signature · 2 lines

Alexandre Julliard
[email protected]

Junio C Hamano

2016-06-15 22:47 UTC #5 lore raw

Quoted 7 lines · Alexandre Julliard

Quoted 5 lines · Martin Nordholts
Use git-add-file' to mark unmerged files as resolved in the *git-status* buffer to be consistent with git's CLI instructions. Also remove git-resolve-file' to make it clear that that "R" is a now a free keybinding.

Quoted 5 lines

Quoted 1 line
Signed-off-by Martin Nordholts <[email protected]>
Looks good, thanks.
Acked-by Alexandre Julliard <[email protected]>

Thanks, both.