From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Gutov 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: Wed, 31 Jul 2013 15:26:45 +0300 Message-ID: <51F90285.9050702@yandex.ru> 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; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1375273703 28178 80.91.229.3 (31 Jul 2013 12:28:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 31 Jul 2013 12:28:23 +0000 (UTC) Cc: 14989-done@debbugs.gnu.org To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jul 31 14:28:24 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 1V4VVw-0002BX-5s for geb-bug-gnu-emacs@m.gmane.org; Wed, 31 Jul 2013 14:28:24 +0200 Original-Received: from localhost ([::1]:50046 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4VVv-0000Pv-PS for geb-bug-gnu-emacs@m.gmane.org; Wed, 31 Jul 2013 08:28:23 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37564) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4VVk-0000Bg-M4 for bug-gnu-emacs@gnu.org; Wed, 31 Jul 2013 08:28:20 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V4VVd-0007DV-NT for bug-gnu-emacs@gnu.org; Wed, 31 Jul 2013 08:28:12 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:37727) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4VVd-0007DJ-FZ for bug-gnu-emacs@gnu.org; Wed, 31 Jul 2013 08:28:05 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1V4VVc-0003SS-Dh for bug-gnu-emacs@gnu.org; Wed, 31 Jul 2013 08:28:04 -0400 Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Wed, 31 Jul 2013 12:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 14989 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Mail-Followup-To: 14989@debbugs.gnu.org, dgutov@yandex.ru, dgutov@yandex.ru Original-Received: via spool by 14989-done@debbugs.gnu.org id=D14989.137527362313131 (code D ref 14989); Wed, 31 Jul 2013 12:28:02 +0000 Original-Received: (at 14989-done) by debbugs.gnu.org; 31 Jul 2013 12:27:03 +0000 Original-Received: from localhost ([127.0.0.1]:60273 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1V4VUc-0003PX-CR for submit@debbugs.gnu.org; Wed, 31 Jul 2013 08:27:02 -0400 Original-Received: from forward17.mail.yandex.net ([95.108.253.142]:53481) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1V4VUX-0003Oy-9M for 14989-done@debbugs.gnu.org; Wed, 31 Jul 2013 08:26:59 -0400 Original-Received: from smtp19.mail.yandex.net (smtp19.mail.yandex.net [95.108.252.19]) by forward17.mail.yandex.net (Yandex) with ESMTP id 2B52D10607FC; Wed, 31 Jul 2013 16:26:50 +0400 (MSK) Original-Received: from smtp19.mail.yandex.net (localhost [127.0.0.1]) by smtp19.mail.yandex.net (Yandex) with ESMTP id EAE30BE031C; Wed, 31 Jul 2013 16:26:49 +0400 (MSK) Original-Received: from 93-245-142.netrun.cytanet.com.cy (93-245-142.netrun.cytanet.com.cy [93.109.245.142]) by smtp19.mail.yandex.net (nwsmtp/Yandex) with ESMTP id ZR6rAdik3S-QmnmdWlN; Wed, 31 Jul 2013 16:26:49 +0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1375273609; bh=5EapriWyXDL6eNmAndseNLnWdXxlJIfpDFXnG+xaOr8=; h=Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject: References:In-Reply-To:Content-Type:Content-Transfer-Encoding; b=dQz7uBR3FevagO493+kmmlMLU8u+6HMwTbPy4pMrkDpN/HpxZGCxoj2yw47SN1wIF ca5V4kXQS0OsuiNgtkZfuQwdWGY9sF9a4pcMC5ypadDoo/UN/ZaxdxAmm/h13TYLJ0 7LeZegFETe5u1wQHBgMPweMR/3GLZ7Iz97tVkQo4= Authentication-Results: smtp19.mail.yandex.net; dkim=pass header.i=@yandex.ru User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130623 Thunderbird/17.0.7 In-Reply-To: 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:76852 Archived-At: Done! On 31.07.2013 04:38, Stefan Monnier wrote: >> 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.