From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Tom Tromey Newsgroups: gmane.emacs.bugs Subject: bug#28466: 26.0.50; diff in vc-outgoing doesn't work properly Date: Sat, 16 Sep 2017 15:53:57 -0600 Message-ID: <8760ciwbre.fsf@tromey.com> References: <87h8w4shq5.fsf@tromey.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1505598912 6156 195.159.176.226 (16 Sep 2017 21:55:12 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 16 Sep 2017 21:55:12 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: 28466@debbugs.gnu.org To: Tom Tromey Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Sep 16 23:55:06 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 1dtL3J-0001Lt-Ds for geb-bug-gnu-emacs@m.gmane.org; Sat, 16 Sep 2017 23:55:05 +0200 Original-Received: from localhost ([::1]:58716 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dtL3Q-0007Yr-PY for geb-bug-gnu-emacs@m.gmane.org; Sat, 16 Sep 2017 17:55:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35662) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dtL3L-0007XW-7A for bug-gnu-emacs@gnu.org; Sat, 16 Sep 2017 17:55:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dtL3G-00071V-8g for bug-gnu-emacs@gnu.org; Sat, 16 Sep 2017 17:55:07 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:35642) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dtL3G-00071J-4u for bug-gnu-emacs@gnu.org; Sat, 16 Sep 2017 17:55:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dtL3F-0007TY-Tn for bug-gnu-emacs@gnu.org; Sat, 16 Sep 2017 17:55:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Tom Tromey Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 16 Sep 2017 21:55:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 28466 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-Cc: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.150559888328702 (code B ref -1); Sat, 16 Sep 2017 21:55:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 16 Sep 2017 21:54:43 +0000 Original-Received: from localhost ([127.0.0.1]:44323 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dtL2w-0007Ss-Nd for submit@debbugs.gnu.org; Sat, 16 Sep 2017 17:54:42 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:44556) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dtL2u-0007Sc-HZ for submit@debbugs.gnu.org; Sat, 16 Sep 2017 17:54:41 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dtL2o-0006s4-IC for submit@debbugs.gnu.org; Sat, 16 Sep 2017 17:54:35 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:58444) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dtL2o-0006rw-FJ for submit@debbugs.gnu.org; Sat, 16 Sep 2017 17:54:34 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35525) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dtL2n-0007Ue-99 for bug-gnu-emacs@gnu.org; Sat, 16 Sep 2017 17:54:34 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dtL2i-0006pg-CV for bug-gnu-emacs@gnu.org; Sat, 16 Sep 2017 17:54:33 -0400 Original-Received: from gproxy7-pub.mail.unifiedlayer.com ([70.40.196.235]:59995) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dtL2i-0006d5-2V for bug-gnu-emacs@gnu.org; Sat, 16 Sep 2017 17:54:28 -0400 Original-Received: from cmgw2 (unknown [10.0.90.83]) by gproxy7.mail.unifiedlayer.com (Postfix) with ESMTP id 94D31215C52 for ; Sat, 16 Sep 2017 15:54:05 -0600 (MDT) Original-Received: from box522.bluehost.com ([74.220.219.122]) by cmgw2 with id AMu21w0012f2jeq01Mu5Aw; Sat, 16 Sep 2017 15:54:05 -0600 X-Authority-Analysis: v=2.2 cv=dZfw5Tfe c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=2JCJgTwv5E4A:10 a=vUH1JksB0ihlV9GU8jEA:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=NwSFZzyBPoorZijM1yP8Vdwk4FZDUyogF9JRv+/kMzA=; b=WclhJHLfdSwSKJBxWWAhmtYkMn Uv4C0h+h1D2mdAqbcMcLbpjtBOxQ6NXXIQ2VVJcOfU3h7H+VVASKLaiGjI/0SO4RW4A7gWIx7fbio QXhNG21TU+k75XDS4l+S7KwaP; Original-Received: from 75-166-76-94.hlrn.qwest.net ([75.166.76.94]:39496 helo=bapiya) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.87) (envelope-from ) id 1dtL2H-004EfK-Oi; Sat, 16 Sep 2017 15:54:01 -0600 X-Attribution: Tom In-Reply-To: <87h8w4shq5.fsf@tromey.com> (Tom Tromey's message of "Thu, 14 Sep 2017 22:34:10 -0600") X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box522.bluehost.com X-AntiAbuse: Original Domain - gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 75.166.76.94 X-Exim-ID: 1dtL2H-004EfK-Oi X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-76-94.hlrn.qwest.net (bapiya) [75.166.76.94]:39496 X-Source-Auth: tom+tromey.com X-Email-Count: 2 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== X-Local-Domain: yes X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x 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:137019 Archived-At: Tom> I was expecting to see a diff showing the combined contents of all 3 of Tom> my outgoing patches. Tom> However, the generated diff is missing the oldest patch in the series. The appended patch fixes this for me. I'll put it on the Emacs 26 branch after a few days, unless there are comments. Tom diff --git a/lisp/vc/log-view.el b/lisp/vc/log-view.el index 52f56ed..d6963d0 100644 --- a/lisp/vc/log-view.el +++ b/lisp/vc/log-view.el @@ -608,10 +608,16 @@ log-view-diff-changeset (log-view-diff-common beg end t))) (defun log-view-diff-common (beg end &optional whole-changeset) - (let ((to (log-view-current-tag beg)) - (fr (log-view-current-tag end))) - (when (string-equal fr to) - ;; TO and FR are the same, look at the previous revision. + (let* ((to (log-view-current-tag beg)) + (fr-entry (log-view-current-entry end)) + (fr (cadr fr-entry))) + ;; When TO and FR are the same, or when point is on a line after + ;; the last entry, look at the previous revision. + (when (or (string-equal fr to) + (>= (point) + (save-excursion + (goto-char (car fr-entry)) + (forward-line)))) (setq fr (vc-call-backend log-view-vc-backend 'previous-revision nil fr))) (vc-diff-internal t (list log-view-vc-backend