From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#12747: 23.4; diff-auto-refine-mode process only last hunk in diff (must ALL). Date: Thu, 12 Jul 2018 09:28:57 -0400 Message-ID: References: <87y5iqbxqn.fsf@gavenkoa.example.com> <87601lb8lc.fsf@gmail.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1531410317 13310 195.159.176.226 (12 Jul 2018 15:45:17 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 12 Jul 2018 15:45:17 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: 12747@debbugs.gnu.org, Oleksandr Gavenko To: Noam Postavsky Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Jul 12 17:45:13 2018 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 1fddmK-0003MP-2W for geb-bug-gnu-emacs@m.gmane.org; Thu, 12 Jul 2018 17:45:12 +0200 Original-Received: from localhost ([::1]:60873 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fddoR-0007xU-6P for geb-bug-gnu-emacs@m.gmane.org; Thu, 12 Jul 2018 11:47:23 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43196) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fddo9-0007xF-Fk for bug-gnu-emacs@gnu.org; Thu, 12 Jul 2018 11:47:11 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fddo6-0004oM-EP for bug-gnu-emacs@gnu.org; Thu, 12 Jul 2018 11:47:05 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:49367) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fddo6-0004o9-9h for bug-gnu-emacs@gnu.org; Thu, 12 Jul 2018 11:47:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fddo6-0004zX-0S for bug-gnu-emacs@gnu.org; Thu, 12 Jul 2018 11:47:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 12 Jul 2018 15:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 12747 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: fixed Original-Received: via spool by 12747-submit@debbugs.gnu.org id=B12747.153141037719124 (code B ref 12747); Thu, 12 Jul 2018 15:47:01 +0000 Original-Received: (at 12747) by debbugs.gnu.org; 12 Jul 2018 15:46:17 +0000 Original-Received: from localhost ([127.0.0.1]:57264 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fddnN-0004yO-BP for submit@debbugs.gnu.org; Thu, 12 Jul 2018 11:46:17 -0400 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]:59789) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fddnJ-0004yB-Jl for 12747@debbugs.gnu.org; Thu, 12 Jul 2018 11:46:14 -0400 Original-Received: from ceviche.home (lechon.iro.umontreal.ca [132.204.27.242]) by chene.dit.umontreal.ca (8.14.7/8.14.1) with ESMTP id w6CFkqqx019142; Thu, 12 Jul 2018 11:46:52 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id A1ED166223; Thu, 12 Jul 2018 09:28:57 -0400 (EDT) In-Reply-To: <87601lb8lc.fsf@gmail.com> (Noam Postavsky's message of "Wed, 11 Jul 2018 20:28:47 -0400") X-NAI-Spam-Flag: NO X-NAI-Spam-Level: X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0.2 X-NAI-Spam-Rules: 3 Rules triggered NOFROM_SGMAIL=0.2, EDT_SA_DN_PASS=0, RV6328=0 X-NAI-Spam-Version: 2.3.0.9418 : core <6328> : inlines <6747> : streams <1792342> : uri <2672566> 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:148469 Archived-At: > I think you've implemented this now [1: f8b1e40fb6], though not quite in > the way you describe (I don't see any timers). Indeed, thanks. > This reminds that magit users found binding write-region-inhibit-fsync > around smerge-refine-regions made a noticable performance difference. > So should we add something like this? Sounds good, yes (tho I'm surprised it'd make much of a difference, when your /tmp is on some kind of tmpfs). If you can add a URL pointing to the discussion where they found the noticable performance difference, that'd be even better. Stefan > From e5f3cf973c37ddaca92cc819d95d896ca0d869c7 Mon Sep 17 00:00:00 2001 > From: Noam Postavsky > Date: Wed, 11 Jul 2018 20:13:25 -0400 > Subject: [PATCH] Speed up smerge-refine-regions by avoiding fsync > > * lisp/vc/smerge-mode.el (smerge-refine-regions): Bind > write-region-inhibit-fsync to t. > --- > lisp/vc/smerge-mode.el | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el > index cb51fbab8e..cb9880c80d 100644 > --- a/lisp/vc/smerge-mode.el > +++ b/lisp/vc/smerge-mode.el > @@ -1075,9 +1075,10 @@ smerge-refine-regions > (if smerge-refine-weight-hack (make-hash-table :test #'equal)))) > (unless (markerp beg1) (setq beg1 (copy-marker beg1))) > (unless (markerp beg2) (setq beg2 (copy-marker beg2))) > - ;; Chop up regions into smaller elements and save into files. > - (smerge--refine-chopup-region beg1 end1 file1 preproc) > - (smerge--refine-chopup-region beg2 end2 file2 preproc) > + (let ((write-region-inhibit-fsync t)) ; Don't fsync temp files. > + ;; Chop up regions into smaller elements and save into files. > + (smerge--refine-chopup-region beg1 end1 file1 preproc) > + (smerge--refine-chopup-region beg2 end2 file2 preproc)) > > ;; Call diff on those files. > (unwind-protect