From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.bugs Subject: bug#29366: gitmerge to handle NEWS better Date: Mon, 11 Dec 2017 18:33:32 -0500 Message-ID: <0gbmj4et6b.fsf@fencepost.gnu.org> References: <6rpo7lnkp5.fsf@fencepost.gnu.org> <87fu8g26ra.fsf@engster.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1513035253 1589 195.159.176.226 (11 Dec 2017 23:34:13 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 11 Dec 2017 23:34:13 +0000 (UTC) User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) Cc: 29366@debbugs.gnu.org, monnier@iro.umontreal.ca To: David Engster Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Dec 12 00:34:04 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eOXaF-0008QG-EJ for geb-bug-gnu-emacs@m.gmane.org; Tue, 12 Dec 2017 00:34:03 +0100 Original-Received: from localhost ([::1]:55966 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eOXaL-00015m-I9 for geb-bug-gnu-emacs@m.gmane.org; Mon, 11 Dec 2017 18:34:09 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51702) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eOXaF-00015U-RO for bug-gnu-emacs@gnu.org; Mon, 11 Dec 2017 18:34:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eOXaE-0001ss-I5 for bug-gnu-emacs@gnu.org; Mon, 11 Dec 2017 18:34:03 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:48737) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eOXaE-0001se-Eb for bug-gnu-emacs@gnu.org; Mon, 11 Dec 2017 18:34:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eOXaE-0001rq-3s for bug-gnu-emacs@gnu.org; Mon, 11 Dec 2017 18:34:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Glenn Morris Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 11 Dec 2017 23:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 29366 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 29366-submit@debbugs.gnu.org id=B29366.15130352297157 (code B ref 29366); Mon, 11 Dec 2017 23:34:02 +0000 Original-Received: (at 29366) by debbugs.gnu.org; 11 Dec 2017 23:33:49 +0000 Original-Received: from localhost ([127.0.0.1]:57418 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eOXa0-0001rN-Vn for submit@debbugs.gnu.org; Mon, 11 Dec 2017 18:33:49 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:60672) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eOXZz-0001r5-13 for 29366@debbugs.gnu.org; Mon, 11 Dec 2017 18:33:47 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eOXZs-0001jh-Io for 29366@debbugs.gnu.org; Mon, 11 Dec 2017 18:33:41 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:48510) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eOXZk-0001gQ-Ra; Mon, 11 Dec 2017 18:33:32 -0500 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1eOXZk-00018o-Bu; Mon, 11 Dec 2017 18:33:32 -0500 X-Spook: Abbas Suspicious substance Virual Hemorrhagic Fever Task X-Ran: na2?3+G)haaxnN9NQO,cpp#X!/J\(hWEZZ-vvPBs#F!Dz0G+;+n$\qEZD! (David Engster's message of "Tue, 12 Dec 2017 00:18:33 +0100") X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:140953 Archived-At: David Engster wrote: > I'm not sure about that smerge stuff either, that was something I took > over from bzrmerge. It may be that it is not functional. I hope I can > make time to take a look at this in the coming days. Thanks! Here's my revised patch for this. It just does a commit after a successful auto-conflict resolution. It seems to work... --- a/admin/gitmerge.el +++ b/admin/gitmerge.el @@ -316,11 +316,7 @@ gitmerge-resolve (gitmerge-emacs-version gitmerge--from)))) (file-exists-p temp) (or noninteractive - (and - (y-or-n-p "Try to fix NEWS conflict? ") - ;; FIXME - (y-or-n-p "This is buggy, really try? ") - ))) + (y-or-n-p "Try to fix NEWS conflict? "))) (let ((relfile (file-name-nondirectory file)) (tempfile (make-temp-file "gitmerge"))) (unwind-protect @@ -431,7 +427,9 @@ gitmerge-resolve-unmerged (setq conflicted t) ;; Mark as resolved (call-process "git" nil t nil "add" file))) - (when conflicted + (if (not conflicted) + (and files (not (gitmerge-commit)) + (error "Error committing resolution - fix it manually")) (with-current-buffer (get-buffer-create gitmerge-warning-buffer) (erase-buffer) (insert "For the following files, conflicts could\n" @@ -457,6 +455,12 @@ gitmerge-repo-clean "diff" "--name-only") (zerop (buffer-size)))) +(defun gitmerge-commit () + "Commit, and return non-nil if it succeeds." + (with-current-buffer (get-buffer-create gitmerge-output-buffer) + (erase-buffer) + (eq 0 (call-process "git" nil t nil "commit" "--no-edit")))) + (defun gitmerge-maybe-resume () "Check if we have to resume a merge. If so, add no longer conflicted files and commit." @@ -478,11 +482,8 @@ gitmerge-maybe-resume (gitmerge-resolve-unmerged) ;; Commit the merge. (when mergehead - (with-current-buffer (get-buffer-create gitmerge-output-buffer) - (erase-buffer) - (unless (zerop (call-process "git" nil t nil - "commit" "--no-edit")) - (error "Git error during merge - fix it manually")))) + (or (gitmerge-commit) + (error "Git error during merge - fix it manually"))) ;; Successfully resumed. t))))