Merge commit 'remi/master'

This commit is contained in:
Marius Vollmer 2009-03-08 03:50:29 +02:00
commit d9f86642ec
2 changed files with 73 additions and 18 deletions

View file

@ -110,7 +110,7 @@ Setting this to nil will make it do nothing, setting it to t will arrange things
"Require acknowledgement before cancelling the log edit buffer."
:group 'magit
:type 'boolean)
(defface magit-header
'((t))
"Face for generic header lines.
@ -422,7 +422,7 @@ Many Magit faces inherit from this one by default."
(if (stringp range)
(format "%s in %s" things range)
(if (cdr range)
(format "%s from %s to %s" things
(format "%s from %s to %s" things
(magit-rev-describe (car range))
(magit-rev-describe (cdr range)))
(format "%s at %s" things (magit-rev-describe (car range))))))
@ -612,7 +612,7 @@ Many Magit faces inherit from this one by default."
(magit-section-children
section)))
(magit-next-section section))))
(if next
(progn
(goto-char (magit-section-beginning next))
@ -1008,7 +1008,7 @@ Many Magit faces inherit from this one by default."
(defun magit-run-git (&rest args)
(magit-with-refresh
(magit-run* (append (cons magit-git-executable
(magit-run* (append (cons magit-git-executable
magit-git-standard-options)
args))))
@ -1018,7 +1018,7 @@ Many Magit faces inherit from this one by default."
(defun magit-run-git-with-input (input &rest args)
(magit-with-refresh
(magit-run* (append (cons magit-git-executable
(magit-run* (append (cons magit-git-executable
magit-git-standard-options)
args)
nil nil nil nil input)))
@ -1030,7 +1030,7 @@ Many Magit faces inherit from this one by default."
cmd))))
(defun magit-run-git-async (&rest args)
(magit-run* (append (cons magit-git-executable
(magit-run* (append (cons magit-git-executable
magit-git-standard-options)
args)
nil nil nil t))
@ -1085,7 +1085,6 @@ Many Magit faces inherit from this one by default."
(define-key map (kbd "U") 'magit-unstage-all)
(define-key map (kbd "i") 'magit-ignore-item)
(define-key map (kbd "I") 'magit-ignore-item-locally)
(define-key map (kbd "i") 'magit-ignore-item)
(define-key map (kbd "?") 'magit-describe-item)
(define-key map (kbd ".") 'magit-mark-item)
(define-key map (kbd "=") 'magit-diff-with-mark)
@ -1112,6 +1111,7 @@ Many Magit faces inherit from this one by default."
(define-key map (kbd "B") 'magit-create-branch)
(define-key map (kbd "m") 'magit-manual-merge)
(define-key map (kbd "M") 'magit-automatic-merge)
(define-key map (kbd "e") 'magit-interactive-resolve-item)
(define-key map (kbd "N r") 'magit-svn-rebase)
(define-key map (kbd "N c") 'magit-svn-dcommit)
(define-key map (kbd "R") 'magit-rebase-step)
@ -1175,6 +1175,7 @@ Many Magit faces inherit from this one by default."
["Create branch" magit-create-branch t]
["Merge" magit-automatic-merge t]
["Merge (no commit)" magit-manual-merge t]
["Interactive resolve" magit-interactive-resolve-item t]
["Rebase" magit-rebase-step t]
("Git SVN"
["Rebase" magit-svn-rebase (magit-svn-enabled)]
@ -1527,7 +1528,7 @@ Please see the manual for a complete description of Magit.
diff))
(defun magit-diff-item-insert-header (diff buf)
(let ((beg (save-excursion
(let ((beg (save-excursion
(goto-char (magit-section-beginning diff))
(forward-line)
(point)))
@ -1537,7 +1538,7 @@ Please see the manual for a complete description of Magit.
(magit-insert-region beg end buf)))
(defun magit-insert-diff-item-patch (diff buf)
(let ((beg (save-excursion
(let ((beg (save-excursion
(goto-char (magit-section-beginning diff))
(forward-line)
(point)))
@ -2328,7 +2329,7 @@ Prefix arg means justify as well."
(defun magit-log-edit-cancel-log-message ()
(interactive)
(when (or (not magit-log-edit-confirm-cancellation)
(yes-or-no-p
(yes-or-no-p
"Really cancel editing the log (any changes will be lost)?"))
(erase-buffer)
(bury-buffer)
@ -2524,7 +2525,7 @@ Prefix arg means justify as well."
(t
(magit-log-edit-append
(magit-format-commit commit "%s%n%n%b"))
(magit-log-edit-set-field
(magit-log-edit-set-field
'author
(magit-format-commit commit "%an <%ae>, %ai")))))
success))
@ -2643,7 +2644,7 @@ Prefix arg means justify as well."
(let* ((topdir (magit-get-top-dir default-directory))
(args (magit-rev-to-git head)))
(switch-to-buffer "*magit-reflog*")
(magit-mode-init topdir 'reflog
(magit-mode-init topdir 'reflog
#'magit-refresh-reflog-buffer head args))))
(defun magit-reflog-head ()
@ -2710,7 +2711,7 @@ Prefix arg means justify as well."
head b))
(section
(let ((magit-section-hidden-default t))
(magit-git-section
(magit-git-section
(cons b 'wazzup)
(format "%s unmerged commits in %s%s"
n b
@ -2729,7 +2730,7 @@ Prefix arg means justify as well."
(interactive "P")
(let* ((topdir (magit-get-top-dir default-directory)))
(switch-to-buffer "*magit-wazzup*")
(magit-mode-init topdir 'wazzup
(magit-mode-init topdir 'wazzup
#'magit-refresh-wazzup-buffer
(magit-get-current-branch) all)))
@ -2897,4 +2898,58 @@ Prefix arg means justify as well."
(erase-buffer)
(shell-command (concat magit-git-executable " branch -va") t t)))
(defvar magit-ediff-file)
(defvar magit-ediff-windows)
(defun magit-interactive-resolve (file)
(let ((merge-status (magit-git-string "ls-files -u -- %s" file))
(base-buffer (generate-new-buffer (concat file ".base")))
(our-buffer (generate-new-buffer (concat file ".current")))
(their-buffer (generate-new-buffer (concat file ".merged")))
(windows (current-window-configuration)))
(if (null merge-status)
(error "Cannot resolge %s" file))
(with-current-buffer base-buffer
(if (string-match "^[0-9]+ [0-9a-f]+ 1" merge-status)
(insert (magit-git-string "cat-file blob :1:%s" file))))
(with-current-buffer our-buffer
(if (string-match "^[0-9]+ [0-9a-f]+ 2" merge-status)
(insert (magit-git-string "cat-file blob :2:%s" file))))
(with-current-buffer their-buffer
(if (string-match "^[0-9]+ [0-9a-f]+ 3" merge-status)
(insert (magit-git-string "cat-file blob :3:%s" file))))
;; We have now created the 3 buffer with ours, theirs and the ancestor files
(with-current-buffer (ediff-merge-buffers-with-ancestor our-buffer their-buffer base-buffer)
(make-local-variable 'magit-ediff-file)
(setq magit-ediff-file file)
(make-local-variable 'magit-ediff-windows)
(setq magit-ediff-windows windows)
(make-local-variable 'ediff-quit-hook)
(add-hook 'ediff-quit-hook
(lambda ()
(let ((buffer-A ediff-buffer-A)
(buffer-B ediff-buffer-B)
(buffer-C ediff-buffer-C)
(buffer-Ancestor ediff-ancestor-buffer)
(file magit-ediff-file)
(windows magit-ediff-windows))
(ediff-cleanup-mess)
(find-file file)
(erase-buffer)
(insert-buffer-substring buffer-C)
(kill-buffer buffer-A)
(kill-buffer buffer-B)
(kill-buffer buffer-C)
(when (bufferp buffer-Ancestor) (kill-buffer buffer-Ancestor))
(set-window-configuration windows)
(message "Conflict resolution finished; you may save the buffer")))))))
(defun magit-interactive-resolve-item ()
(interactive)
(magit-section-action (item info "resolv")
((diff)
(magit-interactive-resolve (cadr info)))))
(provide 'magit)

View file

@ -471,10 +471,10 @@ one parent). If you want to abort a manual merge, just do a hard
reset to HEAD with @kbd{X}.
Merges can fail if the two branches you merge want to introduce
conflicting changes. In that case, the automatic merge stops before
the commit, essentially falling back to a manual merge. You need to
resolve the conflicts and stage the resolved files, for example with
@kbd{S}.
conflicting changes. In that case, the automatic merge stops before the
commit, essentially falling back to a manual merge. You need to resolve
the conflicts for example with @kbd{e} and stage the resolved files, for
example with @kbd{S}.
You can not stage individual hunks one by one as you resolve them, you
can only stage whole files once all conflicts in them have been