From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Masatake YAMATO Newsgroups: gmane.emacs.bugs Subject: bug#7171: error at vc-mtn-mode-line-string of vc-mtn.el Date: Thu, 07 Oct 2010 19:53:11 +0900 (JST) Organization: Red Hat Japan, Inc. Message-ID: <20101007.195311.697425208822821860.yamato@redhat.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Trace: dough.gmane.org 1286449937 20456 80.91.229.12 (7 Oct 2010 11:12:17 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 7 Oct 2010 11:12:17 +0000 (UTC) To: 7171@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Oct 07 13:12:15 2010 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1P3oOR-0002ml-R2 for geb-bug-gnu-emacs@m.gmane.org; Thu, 07 Oct 2010 13:12:12 +0200 Original-Received: from localhost ([127.0.0.1]:47369 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P3oOR-0008Re-48 for geb-bug-gnu-emacs@m.gmane.org; Thu, 07 Oct 2010 07:12:11 -0400 Original-Received: from [140.186.70.92] (port=44148 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P3oOF-0008Pb-Bw for bug-gnu-emacs@gnu.org; Thu, 07 Oct 2010 07:12:00 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P3oOE-0005YE-3l for bug-gnu-emacs@gnu.org; Thu, 07 Oct 2010 07:11:59 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:57014) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P3oOE-0005YA-1p for bug-gnu-emacs@gnu.org; Thu, 07 Oct 2010 07:11:58 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1P3o3y-00062U-Mt; Thu, 07 Oct 2010 06:51:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Masatake YAMATO Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 07 Oct 2010 10:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 7171 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.128644861023202 (code B ref -1); Thu, 07 Oct 2010 10:51:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 7 Oct 2010 10:50:10 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1P3o37-00062B-In for submit@debbugs.gnu.org; Thu, 07 Oct 2010 06:50:09 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1P3o34-00061k-Jv for submit@debbugs.gnu.org; Thu, 07 Oct 2010 06:50:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P3o6B-0001nn-Ci for submit@debbugs.gnu.org; Thu, 07 Oct 2010 06:53:20 -0400 Original-Received: from lists.gnu.org ([199.232.76.165]:33897) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P3o6B-0001nj-9z for submit@debbugs.gnu.org; Thu, 07 Oct 2010 06:53:19 -0400 Original-Received: from [140.186.70.92] (port=47542 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P3o69-0001sw-Kk for bug-gnu-emacs@gnu.org; Thu, 07 Oct 2010 06:53:19 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P3o67-0001mL-RD for bug-gnu-emacs@gnu.org; Thu, 07 Oct 2010 06:53:17 -0400 Original-Received: from mx1.redhat.com ([209.132.183.28]:16304) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P3o67-0001ld-Kb for bug-gnu-emacs@gnu.org; Thu, 07 Oct 2010 06:53:15 -0400 Original-Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o97ArDpY020588 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 7 Oct 2010 06:53:14 -0400 Original-Received: from localhost (beach.nrt.redhat.com [10.64.200.71]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o97ArC6l004891 for ; Thu, 7 Oct 2010 06:53:12 -0400 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Thu, 07 Oct 2010 06:51:02 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) 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: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:40744 Archived-At: When I tried to open a file under monotone version control system, emacs reports an error because vc-mtn-workfile-branch in vc-mtn-mode-line-string retruns nil. Backtrace ------------------------------------------------------------------------ Debugger entered--Lisp error: (wrong-type-argument stringp nil) string-match("\\`[^:/#]*[:/#]" nil) (if (string-match (car rule) branch) (setq branch (replace-match (cdr rule) t nil branch))) (while --cl-dolist-temp-- (setq rule (car --cl-dolist-temp--)) (if (string-match (car rule) branch) (setq branch (replace-match (cdr rule) t nil branch))) (setq --cl-dolist-temp-- (cdr --cl-dolist-temp--))) (let ((--cl-dolist-temp-- vc-mtn-mode-line-rewrite) rule) (while --cl-dolist-temp-- (setq rule (car --cl-dolist-temp--)) (if (string-match (car rule) branch) (setq branch (replace-match (cdr rule) t nil branch))) (setq --cl-dolist-temp-- (cdr --cl-dolist-temp--))) nil) (catch (quote --cl-block-nil--) (let ((--cl-dolist-temp-- vc-mtn-mode-line-rewrite) rule) (while --cl-dolist-temp-- (setq rule (car --cl-dolist-temp--)) (if (string-match (car rule) branch) (setq branch (replace-match (cdr rule) t nil branch))) (setq --cl-dolist-temp-- (cdr --cl-dolist-temp--))) nil)) (cl-block-wrapper (catch (quote --cl-block-nil--) (let ((--cl-dolist-temp-- vc-mtn-mode-line-rewrite) rule) (while --cl-dolist-temp-- (setq rule (car --cl-dolist-temp--)) (if (string-match (car rule) branch) (setq branch (replace-match (cdr rule) t nil branch))) (setq --cl-dolist-temp-- (cdr --cl-dolist-temp--))) nil))) (block nil (let ((--cl-dolist-temp-- vc-mtn-mode-line-rewrite) rule) (while --cl-dolist-temp-- (setq rule (car --cl-dolist-temp--)) (if (string-match (car rule) branch) (setq branch (replace-match (cdr rule) t nil branch))) (setq --cl-dolist-temp-- (cdr --cl-dolist-temp--))) nil)) (dolist (rule vc-mtn-mode-line-rewrite) (if (string-match (car rule) branch) (setq branch (replace-match (cdr rule) t nil branch)))) (let ((branch (vc-mtn-workfile-branch file))) (dolist (rule vc-mtn-mode-line-rewrite) (if (string-match (car rule) branch) (setq branch (replace-match (cdr rule) t nil branch)))) (format "Mtn%c%s" (case (vc-state file) ((up-to-date needs-update) 45) (added 64) (t 58)) branch)) vc-mtn-mode-line-string("/tmp/net.venge.monotone/AUTHORS") apply(vc-mtn-mode-line-string "/tmp/net.venge.monotone/AUTHORS") vc-call-backend(Mtn mode-line-string "/tmp/net.venge.monotone/AUTHORS") vc-mode-line("/tmp/net.venge.monotone/AUTHORS" Mtn) vc-find-file-hook() run-hooks(find-file-hook) after-find-file(nil t) find-file-noselect-1(# "/tmp/net.venge.monotone/AUTHORS" nil nil "/tmp/net.venge.monotone/AUTHORS" (1205380 64768)) find-file-noselect("/tmp/net.venge.monotone/AUTHORS" nil nil t) find-file("/tmp/net.venge.monotone/AUTHORS" t) call-interactively(find-file nil nil) ------------------------------------------------------------------------ Software version ------------------------------------------------------------------------ GNU Emacs 24.0.50.1 (x86_64-unknown-linux-gnu, GTK+ Version 2.20.1) of 2010-10-07 on dhcp-193-209.nrt.redhat.com mtn --version monotone 0.48 (base revision: 844268c137aaa783aa800a9c16ae61edda80ecea) ------------------------------------------------------------------------ How to reproduce ------------------------------------------------------------------------ 1. Prepare source code under monotone vcs cd /tmp mtn clone monotone://code.monotone.ca/monotone net.venge.monotone ... 2. open a source code with \C-x\C-f \C-x\C-f Find file: /tmp/net.venge.monotone/AUTHORS You will got if: Wrong type argument: stringp, nil at *Message* ------------------------------------------------------------------------ My analysis ------------------------------------------------------------------------ An regular expression, "Current branch: \\(.*\\)\nChanges against parent \\(.*\\)" in `vc-mtn-workfile-branch' doesn't match to the output of mtn status: $ cd /tmp/net.venge.monotone $ mtn status at /tmp/net.venge.monotone ---------------------------------------------------------------------- Revision: 40f634fe2e8124dfa567a2ca805824dcfaf6f2c2 Parent: e50b098f9f507bd83207365c7893058fbd01635a Author: ??? Date: 10/07/2010 07:48:45 PM Branch: net.venge.monotone Changes against parent e50b098f9f507bd83207365c7893058fbd01635a no changes No "Current branch: ..." line is found. I propose following patch but I'm not sure this patch is correct or not because I'm too new to monotone. 2010-10-07 Masatake YAMATO * vc/vc-mtn.el (vc-mtn-working-revision): Use an empty string as the result of 'vc-mtn-working-revision' if it returns nil. === modified file 'lisp/vc/vc-mtn.el' *** lisp/vc/vc-mtn.el 2010-08-29 16:17:13 +0000 --- lisp/vc/vc-mtn.el 2010-10-07 10:35:52 +0000 *************** *** 156,162 **** (defun vc-mtn-mode-line-string (file) "Return string for placement in modeline by `vc-mode-line' for FILE." ! (let ((branch (vc-mtn-workfile-branch file))) (dolist (rule vc-mtn-mode-line-rewrite) (if (string-match (car rule) branch) (setq branch (replace-match (cdr rule) t nil branch)))) --- 156,162 ---- (defun vc-mtn-mode-line-string (file) "Return string for placement in modeline by `vc-mode-line' for FILE." ! (let ((branch (or (vc-mtn-workfile-branch file) ""))) (dolist (rule vc-mtn-mode-line-rewrite) (if (string-match (car rule) branch) (setq branch (replace-match (cdr rule) t nil branch)))) Masatake YAMATO