From unknown Tue Sep 09 11:59:51 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#14216 <14216@debbugs.gnu.org> To: bug#14216 <14216@debbugs.gnu.org> Subject: Status: 24.2; vc-annotate for hg mistreats lines with ": " as partially bmeing part of the revision specification (with patch) Reply-To: bug#14216 <14216@debbugs.gnu.org> Date: Tue, 09 Sep 2025 18:59:51 +0000 retitle 14216 24.2; vc-annotate for hg mistreats lines with ": " as partial= ly bmeing part of the revision specification (with patch) reassign 14216 emacs submitter 14216 arne_bab@web.de severity 14216 normal tag 14216 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 16 13:27:29 2013 Received: (at submit) by debbugs.gnu.org; 16 Apr 2013 17:27:29 +0000 Received: from localhost ([127.0.0.1]:54994 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1US9fD-0004tI-21 for submit@debbugs.gnu.org; Tue, 16 Apr 2013 13:27:28 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51824) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1US9f8-0004sv-5q for submit@debbugs.gnu.org; Tue, 16 Apr 2013 13:27:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1US9au-0002nD-JE for submit@debbugs.gnu.org; Tue, 16 Apr 2013 13:23:03 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-102.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, USER_IN_WHITELIST autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([208.118.235.17]:60063) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1US9au-0002n9-Fv for submit@debbugs.gnu.org; Tue, 16 Apr 2013 13:23:00 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34870) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1US9am-0006pV-2X for bug-gnu-emacs@gnu.org; Tue, 16 Apr 2013 13:23:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1US9ai-0002im-Jr for bug-gnu-emacs@gnu.org; Tue, 16 Apr 2013 13:22:52 -0400 Received: from mout.web.de ([212.227.17.11]:55482) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1US9ai-0002iY-7b for bug-gnu-emacs@gnu.org; Tue, 16 Apr 2013 13:22:48 -0400 Received: from kaverne ([212.255.40.12]) by smtp.web.de (mrweb102) with ESMTPA (Nemesis) id 0LfzxX-1Uuw1u3hXf-00pHVg; Tue, 16 Apr 2013 19:22:46 +0200 From: Arne Babenhauserheide To: bug-gnu-emacs@gnu.org Subject: 24.2; vc-annotate for hg mistreats lines with ": " as partially bmeing part of the revision specification (with patch) Date: Tue, 16 Apr 2013 19:22:26 +0200 Message-ID: <87ip3mo0fh.fsf@web.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V02:K0:JYzDmwhRSkh/Fn09ZyksEoJ9diPpkd5TGplR48ftiEm Yd5cppQRxWMHmH1In0Ia6OvabDJ3qs/+L6o7t8EUgYSQLuu0B2 LS5vWTNiE4RdC9TUGScSN41BY4/ZSLBKY0CFq3XrX2lZjVq43F fefmxa+3PrhPrS4qJtP9vsujqVkukum5p5RBRzzJjFBbb5M88N m5Z0Q5iPGLR76OPbVnU7g== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 208.118.235.17 X-Spam-Score: -6.9 (------) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: arne_bab@web.de List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.9 (------) Dear Emacs Hackers, It long irked me that when I run vc-annotate in a Mercurial repository, som= e lines get treated as part of the revision spec. Example: # try this: <- that is part of the revision specification Now I fixed it. The change boiled down to a tiny addition to the vc-hg-annotate-re: instead of matching every char for the filename, match everything except for colons: . -> [^:] diff -c -L /home/arne/archiv/emacs-trunk/lisp/vc/vc-hg.el -L \#\ /home/arne/archiv/emacs-trunk/lisp/vc/vc-hg.el /tmp/buffer-content-15227ONN --- lisp/vc/vc-hg.el +++ # @@ -358,7 +358,7 @@ ;;215 Wed Jun 20 21:22:58 2007 -0700 foo.c: CONTENTS ;; i.e. VERSION_NUMBER DATE FILENAME: CONTENTS (defconst vc-hg-annotate-re - "^[ \t]*\\([0-9]+\\) \\(.\\{30\\}\\)\\(?:\\(: \\)\\|\\(?: +\\(.+\\): \\)\\)") + "^[ \t]*\\([0-9]+\\) \\(.\\{30\\}\\)\\(?:\\(: \\)\\|\\(?: +\\([^:]+\\): \\)\\)") =20 (defun vc-hg-annotate-time () (when (looking-at vc-hg-annotate-re) (I hope the linebreaks I see here don=E2=80=99t actually get added=E2=80=A6= the regexp should be on one line) Note: The change might break the lines for files which contain colons in the name. I tried using a more advanced regexp, but that produced unwanted side effects (ignoring some lines with long filenames): . -> \\([^:][^ ]\\) An alternative regexp which seems to work is this one, but for long filenames that also matches the whitespace before the file as part of the file (which should not matter, because the regexp is shy, but it still feels wrong): "^[ ]*\\([0-9]+\\) \\(.\\{30\\}\\)\\(?:\\(: \\)\\|\\(?: *\\(\\([^:][^ ]\\)+\\): \\)\\)" Best wishes, Arne In GNU Emacs 24.2.1 (x86_64-pc-linux-gnu, GTK+ Version 2.24.12) of 2012-12-14 on kaverne Configured using: `configure '--prefix=3D/usr' '--build=3Dx86_64-pc-linux-gnu' '--host=3Dx86_64-pc-linux-gnu' '--mandir=3D/usr/share/man' '--infodir=3D/usr/share/info' '--datadir=3D/usr/share' '--sysconfdir=3D/et= c' '--localstatedir=3D/var/lib' '--libdir=3D/usr/lib64' '--disable-dependency-tracking' '--program-suffix=3D-emacs-24' '--infodir=3D/usr/share/info/emacs-24' '--enable-locallisppath=3D/etc/emacs:/usr/share/emacs/site-lisp' '--with-crt-dir=3D/usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/../../../../lib64' '--with-gameuser=3Dgames' '--without-compress-info' '--disable-maintainer-mode' '--without-hesiod' '--without-kerberos' '--without-kerberos5' '--with-gpm' '--without-dbus' '--without-gnutls' '--without-xml2' '--without-selinux' '--without-wide-int' '--without-sound' '--with-x' '--without-ns' '--without-gconf' '--without-gsettings' '--without-toolkit-scroll-bars' '--without-gif' '--without-jpeg' '--without-png' '--without-rsvg' '--without-tiff' '--with-xpm' '--without-imagemagick' '--without-xft' '--without-libotf' '--without-m17n-flt' '--with-x-toolkit=3Dgtk' 'GENTOO_PACKAGE=3Dapp-editors/emacs-24.2' 'build_alias=3Dx86_64-pc-linux-gnu' 'host_alias=3Dx86_64-pc-linux-gnu' 'CFLAGS=3D-O2 -pipe -march=3Dnative' 'LDFLAGS=3D-Wl,-O1 -Wl,--as-needed' 'CPPFLAGS=3D'' Important settings: value of $LC_ALL: nil value of $LC_COLLATE: nil value of $LC_CTYPE: nil value of $LC_MESSAGES: nil value of $LC_MONETARY: nil value of $LC_NUMERIC: nil value of $LC_TIME: nil value of $LANG: nil value of $XMODIFIERS: nil locale-coding-system: utf-8 default enable-multibyte-characters: t Major mode: MIME-View Minor modes in effect: kde-default-keys-minor-mode: t global-ethan-wspace-mode: t real-global-auto-complete-mode: t global-auto-complete-mode: t shell-dirtrack-mode: t global-rudel-minor-mode: t savehist-mode: t show-paren-mode: t display-time-mode: t tooltip-mode: t mouse-wheel-mode: t menu-bar-mode: t file-name-shadow-mode: t global-font-lock-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t column-number-mode: t line-number-mode: t global-visual-line-mode: t transient-mark-mode: t Recent input: B ESC O B ESC O C ESC O C ESC O A ESC O C ESC O B ESC=20 O B ESC O B ESC O B ESC O B ESC O A ESC O B ESC O C=20 ESC O A ESC O C ESC O A ESC O C ESC O A ESC O C ESC=20 O A ESC O C ESC O A ESC O C ESC O A ESC O C ESC O A=20 ESC O C ESC O A ESC O C ESC O A ESC O C ESC O A ESC=20 O C ESC O A ESC O C ESC O A ESC O C ESC O A ESC O C=20 ESC O A ESC O C ESC O A ESC O C ESC O A ESC O C ESC=20 O A ESC O C ESC O A ESC O C ESC O B ESC O B ESC O B=20 ESC O B ESC O B ESC O B ESC O B ESC O B ESC O B ESC=20 O B ESC O B ESC O B ESC O B ESC O B ESC O B ESC O B=20 ESC O B ESC O B ESC O B ESC O B ESC O B ESC O B ESC=20 O B ESC O B ESC O B ESC O B ESC O C ESC O B ESC O B=20 ESC O B ESC O B ESC O B ESC O C ESC O A ESC O C ESC=20 O A ESC O C ESC O A ESC O C ESC O A ESC O C ESC O A=20 ESC O C ESC O A ESC O C ESC x r e p o r t - e m a TAB=20 b u TAB RET Recent messages: Checking folder diff...done Creating msgdb...done Inserting message...done Updating marks... Scoring...done Updated (-0/+15) message(s). Mark set name mismatch: "Arne Babenhauserheide" changed to "arne_bab" War is Peace =20 Load-path shadows: ~/.emacs.d/libs/bbdb-vcard/vcard hides ~/.emacs.d/libs/vcard /usr/share/emacs/site-lisp/lua-mode/lua-mode hides /usr/share/emacs/site-li= sp/monotone/lua-mode /usr/share/emacs/site-lisp/flim/hex-util hides /usr/share/emacs/24.2/lisp/h= ex-util /usr/share/emacs/site-lisp/flim/md4 hides /usr/share/emacs/24.2/lisp/md4 /usr/share/emacs/site-lisp/remember/remember hides /usr/share/emacs/24.2/li= sp/textmodes/remember /usr/share/emacs/site-lisp/org/ob-emacs-lisp hides /usr/share/emacs/24.2/li= sp/org/ob-emacs-lisp /usr/share/emacs/site-lisp/org/org-vm hides /usr/share/emacs/24.2/lisp/org/= org-vm /usr/share/emacs/site-lisp/org/org-footnote hides /usr/share/emacs/24.2/lis= p/org/org-footnote /usr/share/emacs/site-lisp/org/org-compat hides /usr/share/emacs/24.2/lisp/= org/org-compat /usr/share/emacs/site-lisp/org/org-remember hides /usr/share/emacs/24.2/lis= p/org/org-remember /usr/share/emacs/site-lisp/org/ob-org hides /usr/share/emacs/24.2/lisp/org/= ob-org /usr/share/emacs/site-lisp/org/org-irc hides /usr/share/emacs/24.2/lisp/org= /org-irc /usr/share/emacs/site-lisp/org/ob-latex hides /usr/share/emacs/24.2/lisp/or= g/ob-latex /usr/share/emacs/site-lisp/org/org-clock hides /usr/share/emacs/24.2/lisp/o= rg/org-clock /usr/share/emacs/site-lisp/org/org-habit hides /usr/share/emacs/24.2/lisp/o= rg/org-habit /usr/share/emacs/site-lisp/org/org-mac-message hides /usr/share/emacs/24.2/= lisp/org/org-mac-message /usr/share/emacs/site-lisp/org/ob-octave hides /usr/share/emacs/24.2/lisp/o= rg/ob-octave /usr/share/emacs/site-lisp/org/ob-awk hides /usr/share/emacs/24.2/lisp/org/= ob-awk /usr/share/emacs/site-lisp/org/org-id hides /usr/share/emacs/24.2/lisp/org/= org-id /usr/share/emacs/site-lisp/org/ob-C hides /usr/share/emacs/24.2/lisp/org/ob= -C /usr/share/emacs/site-lisp/org/ob-css hides /usr/share/emacs/24.2/lisp/org/= ob-css /usr/share/emacs/site-lisp/org/org-plot hides /usr/share/emacs/24.2/lisp/or= g/org-plot /usr/share/emacs/site-lisp/org/ob-ocaml hides /usr/share/emacs/24.2/lisp/or= g/ob-ocaml /usr/share/emacs/site-lisp/org/ob-picolisp hides /usr/share/emacs/24.2/lisp= /org/ob-picolisp /usr/share/emacs/site-lisp/org/ob-maxima hides /usr/share/emacs/24.2/lisp/o= rg/ob-maxima /usr/share/emacs/site-lisp/org/ob-scheme hides /usr/share/emacs/24.2/lisp/o= rg/ob-scheme /usr/share/emacs/site-lisp/org/org-faces hides /usr/share/emacs/24.2/lisp/o= rg/org-faces /usr/share/emacs/site-lisp/org/org-jsinfo hides /usr/share/emacs/24.2/lisp/= org/org-jsinfo /usr/share/emacs/site-lisp/org/org-gnus hides /usr/share/emacs/24.2/lisp/or= g/org-gnus /usr/share/emacs/site-lisp/org/org-special-blocks hides /usr/share/emacs/24= .2/lisp/org/org-special-blocks /usr/share/emacs/site-lisp/org/org-docview hides /usr/share/emacs/24.2/lisp= /org/org-docview /usr/share/emacs/site-lisp/org/org-html hides /usr/share/emacs/24.2/lisp/or= g/org-html /usr/share/emacs/site-lisp/org/ob-haskell hides /usr/share/emacs/24.2/lisp/= org/ob-haskell /usr/share/emacs/site-lisp/org/org-list hides /usr/share/emacs/24.2/lisp/or= g/org-list /usr/share/emacs/site-lisp/org/ob-js hides /usr/share/emacs/24.2/lisp/org/o= b-js /usr/share/emacs/site-lisp/org/org-info hides /usr/share/emacs/24.2/lisp/or= g/org-info /usr/share/emacs/site-lisp/org/ob-comint hides /usr/share/emacs/24.2/lisp/o= rg/ob-comint /usr/share/emacs/site-lisp/org/ob-gnuplot hides /usr/share/emacs/24.2/lisp/= org/ob-gnuplot /usr/share/emacs/site-lisp/org/org-latex hides /usr/share/emacs/24.2/lisp/o= rg/org-latex /usr/share/emacs/site-lisp/org/org-freemind hides /usr/share/emacs/24.2/lis= p/org/org-freemind /usr/share/emacs/site-lisp/org/org-attach hides /usr/share/emacs/24.2/lisp/= org/org-attach /usr/share/emacs/site-lisp/org/org-lparse hides /usr/share/emacs/24.2/lisp/= org/org-lparse /usr/share/emacs/site-lisp/org/org-icalendar hides /usr/share/emacs/24.2/li= sp/org/org-icalendar /usr/share/emacs/site-lisp/org/org-ascii hides /usr/share/emacs/24.2/lisp/o= rg/org-ascii /usr/share/emacs/site-lisp/org/org-rmail hides /usr/share/emacs/24.2/lisp/o= rg/org-rmail /usr/share/emacs/site-lisp/org/org-timer hides /usr/share/emacs/24.2/lisp/o= rg/org-timer /usr/share/emacs/site-lisp/org/ob-matlab hides /usr/share/emacs/24.2/lisp/o= rg/ob-matlab /usr/share/emacs/site-lisp/org/ob-R hides /usr/share/emacs/24.2/lisp/org/ob= -R /usr/share/emacs/site-lisp/org/org-ctags hides /usr/share/emacs/24.2/lisp/o= rg/org-ctags /usr/share/emacs/site-lisp/org/ob-lisp hides /usr/share/emacs/24.2/lisp/org= /ob-lisp /usr/share/emacs/site-lisp/org/org-odt hides /usr/share/emacs/24.2/lisp/org= /org-odt /usr/share/emacs/site-lisp/org/org-table hides /usr/share/emacs/24.2/lisp/o= rg/org-table /usr/share/emacs/site-lisp/org/ob-lilypond hides /usr/share/emacs/24.2/lisp= /org/ob-lilypond /usr/share/emacs/site-lisp/org/org-indent hides /usr/share/emacs/24.2/lisp/= org/org-indent /usr/share/emacs/site-lisp/org/org-inlinetask hides /usr/share/emacs/24.2/l= isp/org/org-inlinetask /usr/share/emacs/site-lisp/org/org-eshell hides /usr/share/emacs/24.2/lisp/= org/org-eshell /usr/share/emacs/site-lisp/org/org-xoxo hides /usr/share/emacs/24.2/lisp/or= g/org-xoxo /usr/share/emacs/site-lisp/org/ob-plantuml hides /usr/share/emacs/24.2/lisp= /org/ob-plantuml /usr/share/emacs/site-lisp/org/ob-dot hides /usr/share/emacs/24.2/lisp/org/= ob-dot /usr/share/emacs/site-lisp/org/ob-ref hides /usr/share/emacs/24.2/lisp/org/= ob-ref /usr/share/emacs/site-lisp/org/org-exp hides /usr/share/emacs/24.2/lisp/org= /org-exp /usr/share/emacs/site-lisp/org/org-publish hides /usr/share/emacs/24.2/lisp= /org/org-publish /usr/share/emacs/site-lisp/org/org-crypt hides /usr/share/emacs/24.2/lisp/o= rg/org-crypt /usr/share/emacs/site-lisp/org/org-taskjuggler hides /usr/share/emacs/24.2/= lisp/org/org-taskjuggler /usr/share/emacs/site-lisp/org/org-pcomplete hides /usr/share/emacs/24.2/li= sp/org/org-pcomplete /usr/share/emacs/site-lisp/org/ob-sass hides /usr/share/emacs/24.2/lisp/org= /ob-sass /usr/share/emacs/site-lisp/org/org-protocol hides /usr/share/emacs/24.2/lis= p/org/org-protocol /usr/share/emacs/site-lisp/org/org-mhe hides /usr/share/emacs/24.2/lisp/org= /org-mhe /usr/share/emacs/site-lisp/org/ob-perl hides /usr/share/emacs/24.2/lisp/org= /ob-perl /usr/share/emacs/site-lisp/org/ob-fortran hides /usr/share/emacs/24.2/lisp/= org/ob-fortran /usr/share/emacs/site-lisp/org/ob-sqlite hides /usr/share/emacs/24.2/lisp/o= rg/ob-sqlite /usr/share/emacs/site-lisp/org/org-install hides /usr/share/emacs/24.2/lisp= /org/org-install /usr/share/emacs/site-lisp/org/ob-shen hides /usr/share/emacs/24.2/lisp/org= /ob-shen /usr/share/emacs/site-lisp/org/ob-eval hides /usr/share/emacs/24.2/lisp/org= /ob-eval /usr/share/emacs/site-lisp/org/org-src hides /usr/share/emacs/24.2/lisp/org= /org-src /usr/share/emacs/site-lisp/org/ob-java hides /usr/share/emacs/24.2/lisp/org= /ob-java /usr/share/emacs/site-lisp/org/ob-asymptote hides /usr/share/emacs/24.2/lis= p/org/ob-asymptote /usr/share/emacs/site-lisp/org/ob hides /usr/share/emacs/24.2/lisp/org/ob /usr/share/emacs/site-lisp/org/org-macs hides /usr/share/emacs/24.2/lisp/or= g/org-macs /usr/share/emacs/site-lisp/org/ob-sh hides /usr/share/emacs/24.2/lisp/org/o= b-sh /usr/share/emacs/site-lisp/org/ob-ruby hides /usr/share/emacs/24.2/lisp/org= /ob-ruby /usr/share/emacs/site-lisp/org/ob-keys hides /usr/share/emacs/24.2/lisp/org= /ob-keys /usr/share/emacs/site-lisp/org/org-exp-blocks hides /usr/share/emacs/24.2/l= isp/org/org-exp-blocks /usr/share/emacs/site-lisp/org/org-capture hides /usr/share/emacs/24.2/lisp= /org/org-capture /usr/share/emacs/site-lisp/org/org-feed hides /usr/share/emacs/24.2/lisp/or= g/org-feed /usr/share/emacs/site-lisp/org/org-agenda hides /usr/share/emacs/24.2/lisp/= org/org-agenda /usr/share/emacs/site-lisp/org/org-mobile hides /usr/share/emacs/24.2/lisp/= org/org-mobile /usr/share/emacs/site-lisp/org/org-docbook hides /usr/share/emacs/24.2/lisp= /org/org-docbook /usr/share/emacs/site-lisp/org/org-entities hides /usr/share/emacs/24.2/lis= p/org/org-entities /usr/share/emacs/site-lisp/org/org-wl hides /usr/share/emacs/24.2/lisp/org/= org-wl /usr/share/emacs/site-lisp/org/org-mew hides /usr/share/emacs/24.2/lisp/org= /org-mew /usr/share/emacs/site-lisp/org/org-colview hides /usr/share/emacs/24.2/lisp= /org/org-colview /usr/share/emacs/site-lisp/org/ob-clojure hides /usr/share/emacs/24.2/lisp/= org/ob-clojure /usr/share/emacs/site-lisp/org/ob-tangle hides /usr/share/emacs/24.2/lisp/o= rg/ob-tangle /usr/share/emacs/site-lisp/org/org-datetree hides /usr/share/emacs/24.2/lis= p/org/org-datetree /usr/share/emacs/site-lisp/org/org-beamer hides /usr/share/emacs/24.2/lisp/= org/org-beamer /usr/share/emacs/site-lisp/org/ob-lob hides /usr/share/emacs/24.2/lisp/org/= ob-lob /usr/share/emacs/site-lisp/org/org-w3m hides /usr/share/emacs/24.2/lisp/org= /org-w3m /usr/share/emacs/site-lisp/org/org hides /usr/share/emacs/24.2/lisp/org/org /usr/share/emacs/site-lisp/org/ob-ditaa hides /usr/share/emacs/24.2/lisp/or= g/ob-ditaa /usr/share/emacs/site-lisp/org/ob-screen hides /usr/share/emacs/24.2/lisp/o= rg/ob-screen /usr/share/emacs/site-lisp/org/ob-python hides /usr/share/emacs/24.2/lisp/o= rg/ob-python /usr/share/emacs/site-lisp/org/ob-table hides /usr/share/emacs/24.2/lisp/or= g/ob-table /usr/share/emacs/site-lisp/org/org-bbdb hides /usr/share/emacs/24.2/lisp/or= g/org-bbdb /usr/share/emacs/site-lisp/org/ob-mscgen hides /usr/share/emacs/24.2/lisp/o= rg/ob-mscgen /usr/share/emacs/site-lisp/org/org-mouse hides /usr/share/emacs/24.2/lisp/o= rg/org-mouse /usr/share/emacs/site-lisp/org/ob-sql hides /usr/share/emacs/24.2/lisp/org/= ob-sql /usr/share/emacs/site-lisp/org/org-archive hides /usr/share/emacs/24.2/lisp= /org/org-archive /usr/share/emacs/site-lisp/org/ob-calc hides /usr/share/emacs/24.2/lisp/org= /ob-calc /usr/share/emacs/site-lisp/org/org-bibtex hides /usr/share/emacs/24.2/lisp/= org/org-bibtex /usr/share/emacs/site-lisp/org/ob-exp hides /usr/share/emacs/24.2/lisp/org/= ob-exp /usr/share/emacs/site-lisp/org/ob-ledger hides /usr/share/emacs/24.2/lisp/o= rg/ob-ledger /usr/share/emacs/site-lisp/org/org-mks hides /usr/share/emacs/24.2/lisp/org= /org-mks /usr/share/emacs/site-lisp/flim/hmac-md5 hides /usr/share/emacs/24.2/lisp/n= et/hmac-md5 /usr/share/emacs/site-lisp/flim/sasl-cram hides /usr/share/emacs/24.2/lisp/= net/sasl-cram /usr/share/emacs/site-lisp/flim/sasl hides /usr/share/emacs/24.2/lisp/net/s= asl /usr/share/emacs/site-lisp/flim/ntlm hides /usr/share/emacs/24.2/lisp/net/n= tlm /usr/share/emacs/site-lisp/flim/hmac-def hides /usr/share/emacs/24.2/lisp/n= et/hmac-def /usr/share/emacs/site-lisp/flim/sasl-ntlm hides /usr/share/emacs/24.2/lisp/= net/sasl-ntlm /usr/share/emacs/site-lisp/flim/sasl-digest hides /usr/share/emacs/24.2/lis= p/net/sasl-digest ~/.emacs.d/libs/wanderlust/elmo/utf7 hides /usr/share/emacs/24.2/lisp/gnus/= utf7 /usr/share/emacs/site-lisp/semi/smime hides /usr/share/emacs/24.2/lisp/gnus= /smime ~/.emacs.d/private/gnus hides /usr/share/emacs/24.2/lisp/gnus/gnus /usr/share/emacs/site-lisp/emms/tq hides /usr/share/emacs/24.2/lisp/emacs-l= isp/tq /usr/share/emacs/site-lisp/semi/pgg-gpg hides /usr/share/emacs/24.2/lisp/ob= solete/pgg-gpg /usr/share/emacs/site-lisp/semi/pgg-pgp hides /usr/share/emacs/24.2/lisp/ob= solete/pgg-pgp /usr/share/emacs/site-lisp/semi/pgg-parse hides /usr/share/emacs/24.2/lisp/= obsolete/pgg-parse /usr/share/emacs/site-lisp/semi/pgg-def hides /usr/share/emacs/24.2/lisp/ob= solete/pgg-def /usr/share/emacs/site-lisp/semi/pgg-pgp5 hides /usr/share/emacs/24.2/lisp/o= bsolete/pgg-pgp5 /usr/share/emacs/site-lisp/semi/pgg hides /usr/share/emacs/24.2/lisp/obsole= te/pgg /usr/share/emacs/24.2/lisp/mail/rfc2368 hides /home/arne/.emacs.d/libs/wand= erlust/utils/rfc2368 Features: (shadow sort mail-extr emacsbug message idna mml mml-sec mm-decode mm-bodies mm-encode gmm-utils mailheader wl-fldmgr tmm electric flow-fill mailalias help-mode view rect newcomment network-stream starttls modb-legacy smtp sasl sasl-anonymous sasl-login sasl-plain ffap misearch multi-isearch bbdb-gui wl-score elmo-internal mule-util ind-util mel-q-ccl modb-standard elmo-maildir wl-mime mime-play filename mime-edit pgg-parse pccl pccl-20 pgg-def signature markdown-mode thingatpt server activate-babenv reftex-parse reftex-vcr reftex-dcr reftex-auc reftex reftex-vars outline-magic ispell org-wl org-w3m org-vm org-rmail org-mhe org-mew org-irc org-jsinfo org-infojs org-html org-info org-gnus org-docview org-bibtex org-bbdb font-lock-tm5rc generic activate-wanderlust wl-demo wl-draft eword-encode wl-template elmo-net elmo-cache elmo-map elmo-dop wl-news wl-address wl-thread wl-action wl-summary wl-refile wl-message elmo-mime mmelmo-buffer mmelmo-imap mime-view mime-conf calist mmimap mime-parse mmbuffer mmgeneric wl-highlight elmo-multi wl-folder wl wl-e21 wl-util elmo-flag elmo-localdir wl-vars wl-version elmo elmo-signal elmo-msgdb modb modb-generic modb-entity mime elmo-util emu invisible inv-23 poem poem-e20 poem-e20_3 utf7 eword-decode mel mime-def std11 mcharset mcs-20 mcs-e20 pces pces-e20 pces-20 broken pcustom elmo-date elmo-vars elmo-version luna private-wanderlust-kaverne bbdb-wl bbdb-hooks mailcrypt rfc822 activate-private-data private-basic private-wanderlust smtpmail sendmail mail-utils w3m-search w3m browse-url doc-view jka-compr image-mode w3m-hist w3m-fb bookmark-w3m w3m-ems w3m-ccl ccl w3m-favicon w3m-image w3m-proc w3m-util kanban fortran-tools activate-python pydoc-info info-look info python-magic python-21 python stenochords key-chord activate-kde-default-keybindings activate-darkroom wc activate-identica identica-mode url-http tls url-auth mail-parse rfc2231 rfc2047 rfc2045 ietf-drums url-gw url url-proxy url-privacy url-expand url-methods url-history url-cookie mailcap longlines parse-time xml epa-file epa epg epg-config activate-german-spelling activate-ethan-wspace ethan-wspace popup-kill-ring pos-tip activate-auto-complete auto-complete-config auto-complete popup activate-markdown activate-latex-ide flymake compile ebib bibtex fic-ext-mode xub-mode org-location-google-maps google-maps google-maps-static derived url-util url-parse auth-source gnus-util password-cache url-vars mm-util mail-prsvr google-maps-geocode google-maps-base json org-latex org-export-latex org-beamer org-exp ob-exp org-exp-blocks org-agenda footnote ob-sh shell ob-python activate-emms emms-cache emms-info-ogginfo emms-info-mp3info emms-info later-do emms-playlist-mode emms-player-mplayer emms-player-simple emms-source-playlist emms-source-file dired emms-setup emms emms-compat edmacro kmacro control-lock htmlize rudel-mode rudel-display rudel rudel-icons rudel-interactive rudel-compat rudel-hooks rudel-operators rudel-overlay rudel-operations rudel-session-initiation rudel-util rudel-errors eieio-speedbar speedbar sb-image ezimage dframe assoc eieio-custom wid-edit eieio-base rudel-loaddefs rudel-backend eieio goto-chg journal activate-quick-note remember-bbdb remember ob-R org byte-opt warnings bytecomp byte-compile cconv macroexp ob-tangle ob-ref ob-lob ob-table org-footnote org-src ob-comint ob-keys org-pcomplete pcomplete comint ansi-color ring org-list org-faces org-entities noutline outline easy-mmode org-version ob-emacs-lisp ob org-compat org-macs ob-eval format-spec find-func cal-menu calendar cal-loaddefs bbdb-vcard bbdb-com mailabbrev cl vcard allout savehist ido cups easymenu printing ps-print ps-def lpr activate-base vc-hg bookmark pp saveplace time-date uniquify advice help-fns advice-preload paren time cus-start cus-load site-gentoo w3m-load mime-setup mail-mime-setup alist semi-setup path-util poe pym static apel-ver product semi-def org-install emms-auto bbdb-autoloads bbdb regexp-opt timezone tex-site auto-loads tooltip ediff-hook vc-hooks lisp-float-type mwheel x-win x-dnd tool-bar dnd fontset image fringe lisp-mode register page menu-bar rfn-eshadow timer select scroll-bar mouse jit-lock font-lock syntax facemenu font-core frame cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese case-table epa-hook jka-cmpr-hook help simple abbrev minibuffer loaddefs button faces cus-face files text-properties overlay sha1 md5 base64 format env code-pages mule custom widget hashtable-print-readable backquote make-network-process dynamic-setting move-toolbar gtk x-toolkit x multi-tty emacs) From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 16 20:56:08 2013 Received: (at 14216) by debbugs.gnu.org; 17 Apr 2013 00:56:08 +0000 Received: from localhost ([127.0.0.1]:55538 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1USGfQ-0007KH-9L for submit@debbugs.gnu.org; Tue, 16 Apr 2013 20:56:08 -0400 Received: from ironport2-out.teksavvy.com ([206.248.154.182]:45353) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1USGfN-0007K8-Pi for 14216@debbugs.gnu.org; Tue, 16 Apr 2013 20:56:06 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av8EABK/CFHO+LAd/2dsb2JhbABEvw4Xc4IeAQEEAVYjBQsLNAcLFA0LDSQTh38DCQaxH4YsDYlVjBKEeAOUN40PgzSBXoMT X-IPAS-Result: Av8EABK/CFHO+LAd/2dsb2JhbABEvw4Xc4IeAQEEAVYjBQsLNAcLFA0LDSQTh38DCQaxH4YsDYlVjBKEeAOUN40PgzSBXoMT X-IronPort-AV: E=Sophos;i="4.84,565,1355115600"; d="scan'208";a="7591491" Received: from 206-248-176-29.dsl.teksavvy.com (HELO pastel.home) ([206.248.176.29]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 16 Apr 2013 20:51:40 -0400 Received: by pastel.home (Postfix, from userid 20848) id 5E27D67BA3; Tue, 16 Apr 2013 20:51:42 -0400 (EDT) From: Stefan Monnier To: Arne Babenhauserheide Subject: Re: bug#14216: 24.2; vc-annotate for hg mistreats lines with ": " as partially bmeing part of the revision specification (with patch) Message-ID: References: <87ip3mo0fh.fsf@web.de> Date: Tue, 16 Apr 2013 20:51:42 -0400 In-Reply-To: <87ip3mo0fh.fsf@web.de> (Arne Babenhauserheide's message of "Tue, 16 Apr 2013 19:22:26 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 14216 Cc: 14216@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -1.9 (-) > It long irked me that when I run vc-annotate in a Mercurial > repository, some lines get treated as part of the revision > spec. Example: > # try this: <- that is part of the revision specification I installed the patch below which should still allow colon in names, except when followed by a space. Stefan === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-04-17 00:35:22 +0000 +++ lisp/ChangeLog 2013-04-17 00:49:44 +0000 @@ -1,3 +1,8 @@ +2013-04-17 Stefan Monnier + + * vc/vc-hg.el (vc-hg-annotate-re): Disallow ": " in file names + (bug#14216). + 2013-04-17 Jean-Philippe Gravel * progmodes/gdb-mi.el (gdbmi-bnf-incomplete-record-result): === modified file 'lisp/vc/vc-hg.el' --- lisp/vc/vc-hg.el 2013-02-01 17:19:24 +0000 +++ lisp/vc/vc-hg.el 2013-04-17 00:44:50 +0000 @@ -357,7 +357,7 @@ ;;215 Wed Jun 20 21:22:58 2007 -0700 foo.c: CONTENTS ;; i.e. VERSION_NUMBER DATE FILENAME: CONTENTS (defconst vc-hg-annotate-re - "^[ \t]*\\([0-9]+\\) \\(.\\{30\\}\\)\\(?:\\(: \\)\\|\\(?: +\\(.+\\): \\)\\)") + "^[ \t]*\\([0-9]+\\) \\(.\\{30\\}\\)\\(?:\\(: \\)\\|\\(?: +\\([^:\n]+\\(?::\\(?:[^: \n][^:\n]*\\)?\\)*\\): \\)\\)") (defun vc-hg-annotate-time () (when (looking-at vc-hg-annotate-re) From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 17 08:12:38 2013 Received: (at 14216) by debbugs.gnu.org; 17 Apr 2013 12:12:38 +0000 Received: from localhost ([127.0.0.1]:56400 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1USRE5-0005YC-6V for submit@debbugs.gnu.org; Wed, 17 Apr 2013 08:12:37 -0400 Received: from mout.web.de ([212.227.15.4]:57246) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1USRE3-0005Xt-6y for 14216@debbugs.gnu.org; Wed, 17 Apr 2013 08:12:36 -0400 Received: from kaverne.draketo.de ([212.255.39.77]) by smtp.web.de (mrweb002) with ESMTPA (Nemesis) id 0MLy84-1UTX5Z394O-0086Le; Wed, 17 Apr 2013 14:08:10 +0200 Date: Wed, 17 Apr 2013 14:08:09 +0200 Message-ID: <87li8h8imu.wl%arne_bab@web.de> From: Arne Babenhauserheide To: Stefan Monnier Subject: Re: bug#14216: 24.2; vc-annotate for hg mistreats lines with ": " as partially bmeing part of the revision specification (with patch) In-Reply-To: References: <87ip3mo0fh.fsf@web.de> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.2 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII X-Provags-ID: V02:K0:WDOGy8xnXlzyWnT+FJXlhpI7MDsF6MWowCzFAaYW3Pz It8So5MNsXoOYB/4hKE7dNZRyWZsRHeBdvBiXTgp1sLlGEitXW 4NRjxBg0sJFM8O9/6YpjtbLhbFA1zhzch7zugPCuLqQ74jZ2zV Cqmdu+EJJPnmICAKyKy0jv7jAli+TryiQsqqPTES1ul592NowK k6Ur/mEgvokZBPD3rV8aw== X-Spam-Score: 0.1 (/) X-Debbugs-Envelope-To: 14216 Cc: Arne Babenhauserheide , 14216@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: arne_bab@web.de List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -2.6 (--) At Tue, 16 Apr 2013 20:51:42 -0400, Stefan Monnier wrote: > > > It long irked me that when I run vc-annotate in a Mercurial > > repository, some lines get treated as part of the revision > > spec. Example: > > # try this: <- that is part of the revision specification > > I installed the patch below which should still allow colon in names, > except when followed by a space. Nice - thanks a lot! Best wishes, Arne From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 17 10:34:49 2013 Received: (at 14216-done) by debbugs.gnu.org; 17 Apr 2013 14:34:49 +0000 Received: from localhost ([127.0.0.1]:56777 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1USTRg-0004MI-Kx for submit@debbugs.gnu.org; Wed, 17 Apr 2013 10:34:48 -0400 Received: from ironport2-out.teksavvy.com ([206.248.154.182]:35280) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1USTRe-0004M7-62 for 14216-done@debbugs.gnu.org; Wed, 17 Apr 2013 10:34:46 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av4EABK/CFHO+LAd/2dsb2JhbABEvw4Xc4IeAQEEAVYjBQsLNAcLFBgNJIgeBsEtkQoDpHqBXoMT X-IPAS-Result: Av4EABK/CFHO+LAd/2dsb2JhbABEvw4Xc4IeAQEEAVYjBQsLNAcLFBgNJIgeBsEtkQoDpHqBXoMT X-IronPort-AV: E=Sophos;i="4.84,565,1355115600"; d="scan'208";a="7632363" Received: from 206-248-176-29.dsl.teksavvy.com (HELO pastel.home) ([206.248.176.29]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 17 Apr 2013 10:30:18 -0400 Received: by pastel.home (Postfix, from userid 20848) id C4B846787D; Wed, 17 Apr 2013 10:30:21 -0400 (EDT) From: Stefan Monnier To: Arne Babenhauserheide Subject: Re: bug#14216: 24.2; vc-annotate for hg mistreats lines with ": " as partially bmeing part of the revision specification (with patch) Message-ID: References: <87ip3mo0fh.fsf@web.de> <87li8h8imu.wl%arne_bab@web.de> Date: Wed, 17 Apr 2013 10:30:21 -0400 In-Reply-To: <87li8h8imu.wl%arne_bab@web.de> (Arne Babenhauserheide's message of "Wed, 17 Apr 2013 14:08:09 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 14216-done Cc: 14216-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -1.9 (-) > Nice - thanks a lot! Great, closed, Stefan From unknown Tue Sep 09 11:59:51 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 16 May 2013 11:24:03 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator