From: Tino Calancha <tino.calancha@gmail.com>
To: Dmitry Gutov <dgutov@yandex.ru>
Cc: 24725@debbugs.gnu.org, tino.calancha@gmail.com
Subject: bug#24725: 25.1.50; vc-region-history may exceed max line number of file in repository
Date: Thu, 20 Oct 2016 13:22:10 +0900 [thread overview]
Message-ID: <8737jrejkd.fsf@gmail.com> (raw)
In-Reply-To: <ada88f2b-f14b-2cc9-5d91-d785e60543c1@yandex.ru> (Dmitry Gutov's message of "Thu, 20 Oct 2016 02:22:32 +0300")
Dmitry Gutov <dgutov@yandex.ru> writes:
> Hi!
>
> On 18.10.2016 17:27, Tino Calancha wrote:
>>
>> emacs -Q lisp/vc/vc.el
>> C-x h
>> M-x vc-region-history RET
>> fatal: file vc.el has only 2921 lines
>> ;; vc.el has 2922 lines but Git ignores the last empty line.
>
> With your patch, what will happen if the file does not end with a
> newline (which can be some people's or tools' preference)?
In that case my patch is wrong: it excludes the last line from the region.
> Currently, in that case the above scenario works fine. Maybe we need a
> different check, rather than substracting.
>
> Or try (line-number-at-pos (1- (point-max))) instead of (1-
> (line-number-at-pos (point-max))).
Thank you. Your suggestion handle both cases correctly.
Following is the new patch:
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
From c9ce3a54f572549ea2027108694eb556b5cbe8f3 Mon Sep 17 00:00:00 2001
From: Tino Calancha <tino.calancha@gmail.com>
Date: Thu, 20 Oct 2016 12:22:51 +0900
Subject: [PATCH] vc-region-history: Do not exceed the file maximum line number
The last empty line in a file is not part of the Git repository.
* lisp/vc/vc.el (vc-region-history): Exclude the last empty line
from the region (Bug#24725).
---
lisp/vc/vc-git.el | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 9eac5b2..c6a9064 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -1016,6 +1016,8 @@ vc-git-region-history
;; FIXME: Maybe this should be done in vc.el (i.e. for all backends), but
;; since Git is the only backend to support this operation so far, it's hard
;; to tell.
+ (when (> lto (line-number-at-pos (1- (point-max))))
+ (setq lto (line-number-at-pos (1- (point-max)))))
(with-temp-buffer
(vc-call-backend 'git 'diff file "HEAD" nil (current-buffer))
(goto-char (point-min))
--
2.9.3
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
In GNU Emacs 25.1.50.1 (x86_64-pc-linux-gnu, GTK+ Version 3.22.1)
of 2016-10-20
Repository revision: 8988327d548db7b69f30ea15496ccb0726fa4502
next prev parent reply other threads:[~2016-10-20 4:22 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-18 14:27 bug#24725: 25.1.50; vc-region-history may exceed max line number of file in repository Tino Calancha
2016-10-19 23:22 ` Dmitry Gutov
2016-10-20 4:22 ` Tino Calancha [this message]
2016-10-20 7:27 ` Andreas Schwab
2016-10-20 8:09 ` Tino Calancha
2016-10-20 10:21 ` Dmitry Gutov
2016-10-20 10:44 ` Tino Calancha
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=8737jrejkd.fsf@gmail.com \
--to=tino.calancha@gmail.com \
--cc=24725@debbugs.gnu.org \
--cc=dgutov@yandex.ru \
/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).