From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#14989: 24.3.50; log-view-diff and log-view-diff-changeset default to different `to' revisions for git merge commits Date: Tue, 30 Jul 2013 21:38:03 -0400 Message-ID: References: <8738qv8ya6.fsf@axl.i-did-not-set--mail-host-address--so-tickle-me> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1375234761 6607 80.91.229.3 (31 Jul 2013 01:39:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 31 Jul 2013 01:39:21 +0000 (UTC) Cc: 14989@debbugs.gnu.org To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jul 31 03:39:22 2013 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1V4LNp-0003C2-Dk for geb-bug-gnu-emacs@m.gmane.org; Wed, 31 Jul 2013 03:39:21 +0200 Original-Received: from localhost ([::1]:38680 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4LNp-0006d2-2r for geb-bug-gnu-emacs@m.gmane.org; Tue, 30 Jul 2013 21:39:21 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46020) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4LNe-0006bm-PM for bug-gnu-emacs@gnu.org; Tue, 30 Jul 2013 21:39:18 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V4LNX-0004uf-E5 for bug-gnu-emacs@gnu.org; Tue, 30 Jul 2013 21:39:10 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:36872) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4LNX-0004uY-AT for bug-gnu-emacs@gnu.org; Tue, 30 Jul 2013 21:39:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1V4LNW-0008VK-T6 for bug-gnu-emacs@gnu.org; Tue, 30 Jul 2013 21:39:03 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 31 Jul 2013 01:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 14989 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 14989-submit@debbugs.gnu.org id=B14989.137523469332569 (code B ref 14989); Wed, 31 Jul 2013 01:39:02 +0000 Original-Received: (at 14989) by debbugs.gnu.org; 31 Jul 2013 01:38:13 +0000 Original-Received: from localhost ([127.0.0.1]:59421 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1V4LMi-0008TF-Py for submit@debbugs.gnu.org; Tue, 30 Jul 2013 21:38:13 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.182]:43172) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1V4LMg-0008St-9T for 14989@debbugs.gnu.org; Tue, 30 Jul 2013 21:38:10 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av8EABK/CFFFpZvt/2dsb2JhbABEuzWDWRdzgh4BAQQBViMFCwsOJgcLFBgNJIgeBrEfkA6RCgOkeoFegxM X-IPAS-Result: Av8EABK/CFFFpZvt/2dsb2JhbABEuzWDWRdzgh4BAQQBViMFCwsOJgcLFBgNJIgeBrEfkA6RCgOkeoFegxM X-IronPort-AV: E=Sophos;i="4.84,565,1355115600"; d="scan'208";a="20219542" Original-Received: from 69-165-155-237.dsl.teksavvy.com (HELO pastel.home) ([69.165.155.237]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 30 Jul 2013 21:37:57 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id CE06266EAF; Tue, 30 Jul 2013 21:38:03 -0400 (EDT) In-Reply-To: <8738qv8ya6.fsf@axl.i-did-not-set--mail-host-address--so-tickle-me> (Dmitry Gutov's message of "Wed, 31 Jul 2013 01:42:57 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.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-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:76837 Archived-At: > This fix is simple enough. Apply? Looks good, thanks. > The functions could also use some further cleanup: > 1) Swap the `to' and `fr' local variables. I think that would make sense, yes. > 2) Extract the function bodies to one function with a third argument > (called `whole-changeset', maybe), and make them call it. If that can be done without too much extra code, that sounds good. Stefan