Bojan Nikolic <[EMAIL PROTECTED]> writes: > Hi Stefan, > > Thanks for the diagnostics. It looks like the regular expression to > parse the output of "bzr annotate" is not matching any of the lines on > your machine.
Does it depend on the bzr version? I use the installed package on ubuntu gutsy: # bzr --version Bazaar (bzr) 0.90.0 Python interpreter: /usr/bin/python 2.5.1.final.0 Python standard library: /usr/lib/python2.5 bzrlib: /usr/lib/python2.5/site-packages/bzrlib Bazaar configuration: /home/stefan/.bazaar Bazaar log file: /home/stefan/.bzr.log > I have tried annotating on my machine both the file bzr-dvc.el and the > output in your email and they both seem to work fine. > > Perhaps this is related to the locale that you have set. Besides my > normal en_GB.utf8 I have tried de_DE.utf8 and that also works on my > machine. Could you tell me what locale you have set? # locale LANG=en_GB.UTF-8 LC_CTYPE="en_GB.UTF-8" LC_NUMERIC="en_GB.UTF-8" LC_TIME="en_GB.UTF-8" LC_COLLATE="en_GB.UTF-8" LC_MONETARY="en_GB.UTF-8" LC_MESSAGES="en_GB.UTF-8" LC_PAPER="en_GB.UTF-8" LC_NAME="en_GB.UTF-8" LC_ADDRESS="en_GB.UTF-8" LC_TELEPHONE="en_GB.UTF-8" LC_MEASUREMENT="en_GB.UTF-8" LC_IDENTIFICATION="en_GB.UTF-8" LC_ALL= > In the mean time I have revised the regular expression that parses the > output so that it uses syntax classes (i.e. \\s- and \\S- ) to match > whitespace. I've committed this to : > > http://bazaar.launchpad.net/~bojan-bnikolic/+junk/dvc-bzr-ann > > Could you give it a try? It is still the same :-( But I am not sure, if the bzr merge works as it should. Could you try to merge from my branch and integrate your changes. I get a conflict when I merge from your branch. I would like to ensure, that this conflict is not the root for the not working bzr annotate coloring. Stefan. _______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
