unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: Alexei Khlebnikov <alexei.khlebnikov@gmail.com>
To: 21559@debbugs.gnu.org
Cc: Michael Albinus <michael.albinus@gmx.de>,
	Dmitry Gutov <dgutov@yandex.ru>
Subject: bug#21559: 25.0.50; auto-revert-mode breaks git rebase
Date: Wed, 21 Feb 2018 23:07:17 +0100	[thread overview]
Message-ID: <CAJz13riRWq4Z2PepZRJ=5EA=L8=Sor3FE4K97uJAtuO=DK3A+Q@mail.gmail.com> (raw)
In-Reply-To: <bc1634f1-f27b-15ac-6353-baa706b23a9f@yandex.ru>


[-- Attachment #1.1: Type: text/plain, Size: 231 bytes --]

Here is version 4 of the patch.

"revert-buffer-in-progress-p" flag is set in "auto-revert-handler",
according to Michael's idea and then checked in "vc-git-command", according
to Dmitry's idea.

I have tested the patch, it works.

[-- Attachment #1.2: Type: text/html, Size: 323 bytes --]

[-- Attachment #2: v4-0001-Fix-for-25.0.50-auto-revert-mode-breaks-git-rebas.patch --]
[-- Type: text/x-patch, Size: 2062 bytes --]

From d6cffe9f7cb0c7827eb47b13b922291418ea8ebf Mon Sep 17 00:00:00 2001
From: Alexei Khlebnikov <alexei.khlebnikov@gmail.com>
Date: Wed, 21 Feb 2018 22:34:22 +0100
Subject: [PATCH v4] Fix for: "25.0.50; auto-revert-mode breaks git rebase"
 (Bug#21559)

* lisp/autorevert.el (auto-revert-handler):
  Set "revert-buffer-in-progress-p" flag
  before calling "vc-refresh-state".

* lisp/vc/vc-git.el (vc-git-command):
  If "revert-buffer-in-progress-p" flag is set,
  prepend "GIT_OPTIONAL_LOCKS=0" to "process-environment".
---
 lisp/autorevert.el | 3 ++-
 lisp/vc/vc-git.el  | 9 ++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index cf145e0ee3..0a9d3bef54 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -709,7 +709,8 @@ auto-revert-handler
     ;; `preserve-modes' avoids changing the (minor) modes.  But we do
     ;; want to reset the mode for VC, so we do it manually.
     (when (or revert auto-revert-check-vc-info)
-      (vc-refresh-state))))
+      (let ((revert-buffer-in-progress-p t))
+        (vc-refresh-state)))))
 
 (defun auto-revert-tail-handler (size)
   (let ((modified (buffer-modified-p))
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 47172dd52f..b1a57ab6f4 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -1566,7 +1566,14 @@ vc-git-command
          (or coding-system-for-read vc-git-log-output-coding-system))
 	(coding-system-for-write
          (or coding-system-for-write vc-git-commits-coding-system))
-        (process-environment (cons "GIT_DIR" process-environment)))
+        (process-environment
+         (append
+          `("GIT_DIR"
+            ;; Avoid repository locking during background operations
+            ;; (bug#21559).
+            ,@(when revert-buffer-in-progress-p
+                '("GIT_OPTIONAL_LOCKS=0")))
+          process-environment)))
     (apply 'vc-do-command (or buffer "*vc*") okstatus vc-git-program
 	   ;; https://debbugs.gnu.org/16897
 	   (unless (and (not (cdr-safe file-or-list))
-- 
2.15.1


  reply	other threads:[~2018-02-21 22:07 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-25 12:45 bug#21559: 25.0.50; auto-revert-mode breaks git rebase Ben Gamari
2015-09-26  7:41 ` Eli Zaretskii
2015-09-28 14:11   ` Ben Gamari
2015-09-28 14:35     ` Eli Zaretskii
2015-09-28 15:05       ` Ben Gamari
2015-09-29  8:47     ` Michael Albinus
2015-10-26 18:43 ` bug#21559: [PATCH] autorevert: Wait for repository to become idle before calling vc-find-file-hook Ben Gamari
2015-10-26 18:43   ` bug#21559: [PATCH] autorevert: Wait a while " Ben Gamari
2015-10-27  8:25     ` Michael Albinus
2015-10-28 11:59       ` Ben Gamari
2015-10-28 14:45         ` Michael Albinus
2015-10-28 17:05           ` Ben Gamari
2015-10-29  8:20             ` Michael Albinus
2016-02-06  0:01 ` bug#21559: 25.0.50; auto-revert-mode breaks git rebase Mitchel Humpherys
2016-02-06 12:34   ` Ben Gamari
2016-02-07  1:34     ` Mitchel Humpherys
2016-02-07  5:03       ` Mitchel Humpherys
2016-02-07  5:21         ` Mitchel Humpherys
2016-02-07 10:22           ` Ben Gamari
2016-02-07 10:55             ` Ben Gamari
2016-02-07 17:06               ` Mitchel Humpherys
2016-02-07 17:22                 ` Ben Gamari
2016-02-08 21:19               ` Daniel Colascione
2016-09-09 20:56 ` Jason Merrill
2018-02-14 10:08 ` Alexei Khlebnikov
2018-02-15 19:08   ` Alexei Khlebnikov
2018-02-15 22:32     ` Alexei Khlebnikov
2018-02-19 23:41     ` Dmitry Gutov
2018-02-20  0:06       ` Alexei Khlebnikov
2018-02-20  0:17         ` Dmitry Gutov
2018-02-20  4:07           ` Eli Zaretskii
2018-02-20  7:40       ` Michael Albinus
2018-02-20 11:37         ` Dmitry Gutov
2018-02-20 11:53           ` Michael Albinus
2018-02-20 22:28             ` Dmitry Gutov
2018-02-21 22:07               ` Alexei Khlebnikov [this message]
2018-02-22 11:24                 ` Michael Albinus
2018-02-22 11:45                   ` Dmitry Gutov
2018-02-19 10:24 ` bug#21559: PATCH review needed: lisp/vc/vc-git.el (vc-git-state, vc-git-conflicted-files) Alexei Khlebnikov
2018-02-19 12:39   ` Michael Albinus
2018-02-19 15:29   ` Eli Zaretskii
2018-02-19 18:39     ` Alexei Khlebnikov
2018-02-19 18:50       ` Michael Albinus
2018-02-19 19:05         ` Alexei Khlebnikov
2018-02-19 23:35         ` Dmitry Gutov
2018-09-25 12:23 ` bug#21559: additional patch needed to set GIT_OPTIONAL_LOCKS=0 in all cases Andrew Ruder
2018-09-26  3:16   ` Phil Sainty
2018-09-26  9:45     ` Michael Albinus
2018-09-29 11:16       ` Michael Albinus

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAJz13riRWq4Z2PepZRJ=5EA=L8=Sor3FE4K97uJAtuO=DK3A+Q@mail.gmail.com' \
    --to=alexei.khlebnikov@gmail.com \
    --cc=21559@debbugs.gnu.org \
    --cc=dgutov@yandex.ru \
    --cc=michael.albinus@gmx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).