GNU bug report logs - #6968
23.1; vc-hg-next-version fails if a custom style is used

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 6968 in the body.
You can then email your comments to 6968 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Kirk Kelsey <kirk.kelsey <at> 0x4b.net>
To: bug-gnu-emacs <at> gnu.org
Subject: 23.1; vc-hg-next-version fails if a custom style is used
Date: Wed, 1 Sep 2010 17:08:13 -0400

[Message part 1 (text/plain, inline)]

I've run into a problem with vc-hg-next-version and how it
identifies the maximum valid revision (the tip). Mercurial allows
for a templating of output for some commands, but
vc-hg-next-version identifies the tip using a regular expression
that only matches the "default" output style.

The patch below works by specifying the style explicitly.
Something similar is done for vc-hg-revision-table, where the
template for the log command is specified. FWIW, I took at look
at the other uses of vc-hg-command and didn't see any other cases
where the style seemed relevant. It is possible to work around
the issue by setting vc-hg-global-switches to include "--config
ui.style=default" (not using the --style option).



Thanks,
Kirk


--- /tmp/vc-hg.el       2010-09-01 16:48:56.000000000 -0400
+++ /tmp/vc-hg.fixed.el 2010-09-01 16:50:18.597813591 -0400
@@ -354,7 +354,7 @@
   (let ((newrev (1+ (string-to-number rev)))
         (tip-revision
          (with-temp-buffer
-           (vc-hg-command t 0 nil "tip")
+           (vc-hg-command t 0 nil "tip" "--style=default")
            (goto-char (point-min))
            (re-search-forward "^changeset:[ \t]*\\([0-9]+\\):")
            (string-to-number (match-string-no-properties 1)))))

[Message part 2 (text/html, inline)]

Message #8 received at 6968 <at> debbugs.gnu.org (full text, mbox):

From: Kirk Kelsey <kirk.kelsey <at> 0x4b.net>
To: 6968 <at> debbugs.gnu.org
Subject: 23.1; vc-hg-next-version fails if a custom style is used
Date: Wed, 1 Sep 2010 17:54:20 -0400

[Message part 1 (text/plain, inline)]

Well, I missed at least one other case where this can be a
problem. In vc-hg-working-revision, vc-hg-command isn't used.
In that case, the log output may be wrong, leading to failed
version identification. The work-around doesn't apply.

[Message part 2 (text/html, inline)]

Message #13 received at 6968-done <at> debbugs.gnu.org (full text, mbox):

From: Glenn Morris <rgm <at> gnu.org>
To: 6968-done <at> debbugs.gnu.org
Subject: Re: bug#6968: 23.1; vc-hg-next-version fails if a custom style is used
Date: Fri, 30 Nov 2012 21:12:15 -0500

Version: 24.3

Sorry for the horrendous delay; change applied to trunk. Thanks.

Kirk Kelsey wrote:

> Well, I missed at least one other case where this can be a
> problem. In vc-hg-working-revision, vc-hg-command isn't used.

Looks like this was independently changed in the meantime.

Previous Next

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