GNU bug report logs - #4144
23.1.50; VC Annotate for bzr files broken

Previous Next

Full log

View this message in rfc822 format

From: Óscar Fuentes <ofv <at> wanadoo.es>
To: 4144 <at> debbugs.gnu.org
Subject: bug#4144: 23.1.50; VC Annotate for bzr files broken
Date: Mon, 07 Sep 2009 07:17:34 +0200

The breakage is caused by commits with empty `committer' field (in this
case coming from conversions from other VCS). This confuses the regexp
used by vc-bzr-annotate-command for determining revision id, author and
date.

Some experimentation shows that this regexp works on the case of empty
committer field too:

*** /usr/local/share/emacs/23.1.50/lisp/vc-bzr.el.gz
--- /tmp/buffer-content-191724Q
***************
*** 547,553 ****
      ;; to allow saving space by sharing the text properties.
      (setq vc-bzr-annotation-table (make-hash-table :test 'equal))
      (goto-char (point-min))
!     (while (re-search-forward "^\\( *[0-9.]+ *\\) \\([^\n ]+\\) +\\([0-9]\\{8\\}\\) |"
                                nil t)
        (let* ((rev (match-string 1))
               (author (match-string 2))
--- 547,554 ----
      ;; to allow saving space by sharing the text properties.
      (setq vc-bzr-annotation-table (make-hash-table :test 'equal))
      (goto-char (point-min))
!     ;;; `author' field may be empty:
!     (while (re-search-forward "^\\( *[0-9.]+\\) *\\([^\n ]* *?\\) +\\([0-9]\\{8\\}\\) |"
                                nil t)
        (let* ((rev (match-string 1))
               (author (match-string 2))

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.