From unknown Mon Aug 18 17:56:47 2025 X-Loop: owner@emacsbugs.donarmstrong.com Subject: bug#2872: diff from log-view not working for bzr Reply-To: Dan Nicolaescu , 2872@debbugs.gnu.org Resent-From: Dan Nicolaescu Resent-To: bug-submit-list@lists.donarmstrong.com Resent-CC: Emacs Bugs Resent-Date: Fri, 03 Apr 2009 02:20:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-Emacs-PR-Message: report 2872 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Received: via spool by submit@emacsbugs.donarmstrong.com id=B.12387247164160 (code B ref -1); Fri, 03 Apr 2009 02:20:03 +0000 Received: (at submit) by emacsbugs.donarmstrong.com; 3 Apr 2009 02:11:56 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=-3.0 required=4.0 tests=X_DEBBUGS_NO_ACK autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n332BrM1004153 for ; Thu, 2 Apr 2009 19:11:54 -0700 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LpYsq-0006xV-Tc for bug-gnu-emacs@gnu.org; Thu, 02 Apr 2009 22:11:52 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LpYsl-0006xA-GM for bug-gnu-emacs@gnu.org; Thu, 02 Apr 2009 22:11:51 -0400 Received: from [199.232.76.173] (port=40772 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LpYsl-0006x7-AP for bug-gnu-emacs@gnu.org; Thu, 02 Apr 2009 22:11:47 -0400 Received: from barrelv2.ics.uci.edu ([128.195.1.114]:51803) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60) (envelope-from ) id 1LpYsk-0005bn-Q5 for bug-gnu-emacs@gnu.org; Thu, 02 Apr 2009 22:11:47 -0400 Received: from godzilla.ics.uci.edu (godzilla.ics.uci.edu [128.195.10.101]) by barrelv2.ics.uci.edu (8.13.8+Sun/8.13.8) with ESMTP id n3329vYo001028 for ; Thu, 2 Apr 2009 19:09:57 -0700 (PDT) Received: (from dann@localhost) by godzilla.ics.uci.edu (8.13.8+Sun/8.13.6/Submit) id n3329uQj012191; Thu, 2 Apr 2009 19:09:56 -0700 (PDT) Date: Thu, 2 Apr 2009 19:09:56 -0700 (PDT) Message-Id: <200904030209.n3329uQj012191@godzilla.ics.uci.edu> From: Dan Nicolaescu To: bug-gnu-emacs Lines: 30 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-ICS-MailScanner-Information: Please contact the ISP for more information X-ICS-MailScanner-ID: n3329vYo001028 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (score=-1.363, required 5, autolearn=disabled, ALL_TRUSTED -1.44, TW_BZ 0.08) X-ICS-MailScanner-From: dann@godzilla.ics.uci.edu X-detected-operating-system: by monty-python.gnu.org: Solaris 10 (beta) Do a C-x v l on any file under bzr. Put the point on some random log entry and type d And empty *vc-diff* window will appear. The problem is that vc-bzr-diff gets called with the arguments REV1 == REV2. And that happens because of this code in log-view-diff: (log-view-msg-next) (setq to (log-view-current-tag)) [1] Given a log entry like this: ------------------------------------------------------------ revno: 295 `log-view-msg-next' puts the point at the beginning of the ---- line and `log-view-current-tag' returns the version of the _previous_ log entry. It happens because `log-view-current-tag' first does a (forward-line 1) --> point will be at "revno" after that. And then (re-search-backward log-view-message-re nil t) which will find the current log entry. So in conclusion code [1] fails to advance and find the next log entry. From cyd@stupidchicken.com Fri Apr 3 08:17:11 2009 Received: (at control) by emacsbugs.donarmstrong.com; 3 Apr 2009 15:17:12 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=-2.0 required=4.0 tests=VALID_BTS_CONTROL autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from cyd.mit.edu (CYD.MIT.EDU [18.115.2.24]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n33FH9no027082 for ; Fri, 3 Apr 2009 08:17:10 -0700 Received: by cyd.mit.edu (Postfix, from userid 1000) id 5D6B657E245; Fri, 3 Apr 2009 11:18:46 -0400 (EDT) From: Chong Yidong To: control@debbugs.gnu.org Subject: severity 2872 serious Date: Fri, 03 Apr 2009 11:18:46 -0400 Message-ID: <87vdplvk89.fsf@cyd.mit.edu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii severity 2872 serious thanks From unknown Mon Aug 18 17:56:47 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.420 (Entity 5.420) X-Loop: owner@emacsbugs.donarmstrong.com From: help-debbugs@gnu.org (Emacs bug Tracking System) To: Dan Nicolaescu Subject: bug#2872 closed by Chong Yidong (Re: diff from log-view not working for bzr) Message-ID: References: <87k55x8c4o.fsf@cyd.mit.edu> <200904030209.n3329uQj012191@godzilla.ics.uci.edu> X-Emacs-PR-Message: they-closed 2872 X-Emacs-PR-Package: emacs Reply-To: 2872@debbugs.gnu.org Date: Tue, 07 Apr 2009 01:55:05 +0000 Content-Type: multipart/mixed; boundary="----------=_1239069305-25886-1" This is a multi-part message in MIME format... ------------=_1239069305-25886-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This is an automatic notification regarding your bug report which was filed against the emacs package: #2872: diff from log-view not working for bzr It has been closed by Chong Yidong . Their explanation is attached below along with your original report. If this explanation is unsatisfactory and you have not received a better one in a separate message then please contact Chong Yidong by replying to this email. --=20 2872: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D2872 Emacs Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1239069305-25886-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 2872-done) by emacsbugs.donarmstrong.com; 7 Apr 2009 01:49:42 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=0.0 required=4.0 tests=none autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from cyd.mit.edu (CYD.MIT.EDU [18.115.2.24]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n371ndl1024572 for <2872-done@emacsbugs.donarmstrong.com>; Mon, 6 Apr 2009 18:49:40 -0700 Received: by cyd.mit.edu (Postfix, from userid 1000) id 7521957E18A; Mon, 6 Apr 2009 21:51:19 -0400 (EDT) From: Chong Yidong To: Dan Nicolaescu Cc: 2872-done@debbugs.gnu.org Subject: Re: diff from log-view not working for bzr Date: Mon, 06 Apr 2009 21:51:19 -0400 Message-ID: <87k55x8c4o.fsf@cyd.mit.edu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii > Do a C-x v l on any file under bzr. > > Put the point on some random log entry and type > d > And empty *vc-diff* window will appear. I've checked in a fix. ------------=_1239069305-25886-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by emacsbugs.donarmstrong.com; 3 Apr 2009 02:11:56 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=-3.0 required=4.0 tests=X_DEBBUGS_NO_ACK autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n332BrM1004153 for ; Thu, 2 Apr 2009 19:11:54 -0700 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LpYsq-0006xV-Tc for bug-gnu-emacs@gnu.org; Thu, 02 Apr 2009 22:11:52 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LpYsl-0006xA-GM for bug-gnu-emacs@gnu.org; Thu, 02 Apr 2009 22:11:51 -0400 Received: from [199.232.76.173] (port=40772 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LpYsl-0006x7-AP for bug-gnu-emacs@gnu.org; Thu, 02 Apr 2009 22:11:47 -0400 Received: from barrelv2.ics.uci.edu ([128.195.1.114]:51803) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60) (envelope-from ) id 1LpYsk-0005bn-Q5 for bug-gnu-emacs@gnu.org; Thu, 02 Apr 2009 22:11:47 -0400 Received: from godzilla.ics.uci.edu (godzilla.ics.uci.edu [128.195.10.101]) by barrelv2.ics.uci.edu (8.13.8+Sun/8.13.8) with ESMTP id n3329vYo001028 for ; Thu, 2 Apr 2009 19:09:57 -0700 (PDT) Received: (from dann@localhost) by godzilla.ics.uci.edu (8.13.8+Sun/8.13.6/Submit) id n3329uQj012191; Thu, 2 Apr 2009 19:09:56 -0700 (PDT) Date: Thu, 2 Apr 2009 19:09:56 -0700 (PDT) Message-Id: <200904030209.n3329uQj012191@godzilla.ics.uci.edu> From: Dan Nicolaescu To: bug-gnu-emacs Subject: diff from log-view not working for bzr X-Debbugs-No-Ack: yes Lines: 30 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-ICS-MailScanner-Information: Please contact the ISP for more information X-ICS-MailScanner-ID: n3329vYo001028 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (score=-1.363, required 5, autolearn=disabled, ALL_TRUSTED -1.44, TW_BZ 0.08) X-ICS-MailScanner-From: dann@godzilla.ics.uci.edu X-detected-operating-system: by monty-python.gnu.org: Solaris 10 (beta) Do a C-x v l on any file under bzr. Put the point on some random log entry and type d And empty *vc-diff* window will appear. The problem is that vc-bzr-diff gets called with the arguments REV1 == REV2. And that happens because of this code in log-view-diff: (log-view-msg-next) (setq to (log-view-current-tag)) [1] Given a log entry like this: ------------------------------------------------------------ revno: 295 `log-view-msg-next' puts the point at the beginning of the ---- line and `log-view-current-tag' returns the version of the _previous_ log entry. It happens because `log-view-current-tag' first does a (forward-line 1) --> point will be at "revno" after that. And then (re-search-backward log-view-message-re nil t) which will find the current log entry. So in conclusion code [1] fails to advance and find the next log entry. ------------=_1239069305-25886-1-- From unknown Mon Aug 18 17:56:47 2025 X-Loop: owner@emacsbugs.donarmstrong.com Subject: bug#2872: diff from log-view not working for bzr Reply-To: Dan Nicolaescu , 2872@debbugs.gnu.org Resent-From: Dan Nicolaescu Resent-To: bug-submit-list@lists.donarmstrong.com Resent-CC: Emacs Bugs Resent-Date: Tue, 07 Apr 2009 02:35:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-Emacs-PR-Message: followup 2872 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Received: via spool by 2872-submit@emacsbugs.donarmstrong.com id=B2872.12390713763675 (code B ref 2872); Tue, 07 Apr 2009 02:35:04 +0000 Received: (at 2872) by emacsbugs.donarmstrong.com; 7 Apr 2009 02:29:36 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=-3.0 required=4.0 tests=X_DEBBUGS_NO_ACK autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from barrelv2.ics.uci.edu (barrelv2.ics.uci.edu [128.195.1.114]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n372TXdb003662 for <2872@emacsbugs.donarmstrong.com>; Mon, 6 Apr 2009 19:29:34 -0700 Received: from godzilla.ics.uci.edu (godzilla.ics.uci.edu [128.195.10.101]) by barrelv2.ics.uci.edu (8.13.8+Sun/8.13.8) with ESMTP id n372TJdl014139; Mon, 6 Apr 2009 19:29:19 -0700 (PDT) Received: (from dann@localhost) by godzilla.ics.uci.edu (8.13.8+Sun/8.13.6/Submit) id n372TJxQ011804; Mon, 6 Apr 2009 19:29:19 -0700 (PDT) Date: Mon, 6 Apr 2009 19:29:19 -0700 (PDT) Message-Id: <200904070229.n372TJxQ011804@godzilla.ics.uci.edu> From: Dan Nicolaescu To: Chong Yidong Cc: 2872@debbugs.gnu.org References: <87k55x8c4o.fsf@cyd.mit.edu> In-Reply-To: <87k55x8c4o.fsf@cyd.mit.edu> (Chong Yidong's message of "Mon, 06 Apr 2009 21:51:19 -0400") Lines: 24 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-ICS-MailScanner-Information: Please contact the ISP for more information X-ICS-MailScanner-ID: n372TJdl014139 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (score=-1.363, required 5, autolearn=disabled, ALL_TRUSTED -1.44, TW_BZ 0.08) X-ICS-MailScanner-From: dann@godzilla.ics.uci.edu Chong Yidong writes: > > Do a C-x v l on any file under bzr. > > > > Put the point on some random log entry and type > > d > > And empty *vc-diff* window will appear. > > I've checked in a fix. The fix was too radical, log entries for merges don't work anymore. They have a format like: ------------------------------------------------------------ revno: 123.1.4 committer: branch nick: blah timestamp: blah message: blah ------------------------------------------------------------ revno: 12.3.123 From unknown Mon Aug 18 17:56:47 2025 X-Loop: owner@emacsbugs.donarmstrong.com Subject: bug#2872: diff from log-view not working for bzr Reply-To: Chong Yidong , 2872@debbugs.gnu.org Resent-From: Chong Yidong Resent-To: bug-submit-list@lists.donarmstrong.com Resent-CC: Emacs Bugs Resent-Date: Tue, 07 Apr 2009 04:15:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-Emacs-PR-Message: followup 2872 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Received: via spool by 2872-submit@emacsbugs.donarmstrong.com id=B2872.1239077291733 (code B ref 2872); Tue, 07 Apr 2009 04:15:03 +0000 Received: (at 2872) by emacsbugs.donarmstrong.com; 7 Apr 2009 04:08:11 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=0.0 required=4.0 tests=none autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from cyd.mit.edu (CYD.MIT.EDU [18.115.2.24]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n3748862000727 for <2872@emacsbugs.donarmstrong.com>; Mon, 6 Apr 2009 21:08:09 -0700 Received: by cyd.mit.edu (Postfix, from userid 1000) id 4258157E18A; Tue, 7 Apr 2009 00:09:48 -0400 (EDT) From: Chong Yidong To: Dan Nicolaescu Cc: 2872@debbugs.gnu.org References: <87k55x8c4o.fsf@cyd.mit.edu> <200904070229.n372TJxQ011804@godzilla.ics.uci.edu> Date: Tue, 07 Apr 2009 00:09:48 -0400 In-Reply-To: <200904070229.n372TJxQ011804@godzilla.ics.uci.edu> (Dan Nicolaescu's message of "Mon, 6 Apr 2009 19:29:19 -0700 (PDT)") Message-ID: <87tz51xfxv.fsf@cyd.mit.edu> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.91 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Dan Nicolaescu writes: > The fix was too radical, log entries for merges don't work anymore. > > ------------------------------------------------------------ > revno: 123.1.4 > committer: > branch nick: blah > timestamp: blah > message: > blah > ------------------------------------------------------------ > revno: 12.3.123 OK. I tweaked log-view-message-re to allow for spaces before the "revno" string.