Mercurial 1.8.4 released!
Satish Balay
balay at fastmail.fm
Thu Jun 2 08:52:02 CDT 2011
On Thu, 2 Jun 2011, Neal Becker wrote:
> On Thursday, June 02, 2011, Mads Kiilerich wrote:
> > Neal Becker wrote, On 06/02/2011 02:51 AM:
> > > Neal Becker wrote:
> > >> Matt Mackall wrote:
> > >>> Full details here:
> > >>>
> > >>> http://mercurial.selenic.com/wiki/WhatsNew
> > >>>
> > >>> Available for download at:
> > >>>
> > >>> http://mercurial.selenic.com/release/mercurial-1.8.4.tar.gz
> > >>>
> > >>> Binaries releases to follow shortly.
> > >>
> > >> Build failed on linux fedora 16 (rawhide):
> > >>
> > >> make -C doc
> > >> make[1]: Entering directory `/builddir/build/BUILD/mercurial-1.8.4/doc'
> > >> python gendoc.py> hg.1.gendoc.txt.tmp
> > >> mv hg.1.gendoc.txt.tmp hg.1.gendoc.txt
> > >> touch hg.1.txt
> > >> python runrst hgmanpage --halt warning \
> > >>
> > >> --strip-elements-with-class htmlonly hg.1.txt hg.1
> > >>
> > >> TypeError: get_language() takes exactly 2 arguments (1 given)
> > >> Exiting due to error. Use "--traceback" to diagnose.
> > >> Please report errors to<docutils-users at lists.sf.net>.
> > >> Include "--traceback" output, Docutils version (0.8 [repository]),
> > >> Python version (2.7.1), your OS type& version, and the
> > >> command line used.
> > >
> > > Same error on fedora f15.
> >
> > Some research will show that 1.8.3 also suddenly started to fail, so we
> > can't blame Mercurial for that.
> >
> > Fedora python-docutils is a pre-0.8 svn snapshot from May 17th.
> > Mercurial works fine when that package is downgraded to 0.7.
> >
> > You can file a Fedora python-docutils bug for changing the API, but that
> > message should obviously go upstream. Martin might have some upstream
> > contacts. If they insist on the change Mercurial will have to implement
> > some workarounds.
> >
> > /Mads
>
> 1. Trying to fight it would be difficult and might not succeed (since F15 is
> already released)
> 2. If this is the direction docutils is going that only postpones the
> inevitable.
>
> Is is difficult to work around? That seems preferable to me.
The following change gets the [rpm] build going for me on F15 [and
works on EL5 aswell]. Can't say if the generated doc is bugfree or
not..
Satish
------------------------
diff -r 6c54df68d1de doc/hgmanpage.py
--- a/doc/hgmanpage.py Thu Jun 02 08:41:01 2011 -0500
+++ b/doc/hgmanpage.py Thu Jun 02 08:45:18 2011 -0500
@@ -48,6 +48,7 @@
from docutils import nodes, writers, languages
import roman
+import inspect
FIELD_LIST_INDENT = 7
DEFINITION_LIST_INDENT = 7
@@ -160,7 +161,11 @@
nodes.NodeVisitor.__init__(self, document)
self.settings = settings = document.settings
lcode = settings.language_code
- self.language = languages.get_language(lcode)
+ arglen=len(inspect.getargspec(languages.get_language)[0])
+ if arglen == 2:
+ self.language = languages.get_language(lcode,self.document.reporter)
+ else:
+ self.language = languages.get_language(lcode)
self.head = []
self.body = []
self.foot = []
More information about the Mercurial
mailing list