[PATCH 1 of 2] templater: move templatefilters.func into the same place as the other funcs

Matt Mackall mpm at selenic.com
Thu May 23 16:32:35 CDT 2013


On Tue, 2013-05-21 at 19:50 -0300, Wagner Bruna wrote:
> Em 21-05-2013 17:42, Sean Farley escreveu:
> > 
> > Wagner Bruna writes:
> > 
> >> Em 20-05-2013 18:45, Sean Farley escreveu:
> >>> # HG changeset patch
> >>> # User Sean Farley <sean.michael.farley at gmail.com>
> >>> # Date 1365638198 18000
> >>> #      Wed Apr 10 18:56:38 2013 -0500
> >>> # Node ID 4edf5b7dddd1a3ab5350590256f5145b54ea1e30
> >>> # Parent  0ec31231afad3fc171f882226aae50d4737559b5
> >>> templater: move templatefilters.func into the same place as the other funcs
> >>>
> >>> diff --git a/mercurial/templatefilters.py b/mercurial/templatefilters.py
> >>> --- a/mercurial/templatefilters.py
> >>> +++ b/mercurial/templatefilters.py
> >>> @@ -3,13 +3,12 @@
> >>>  # Copyright 2005-2008 Matt Mackall <mpm at selenic.com>
> >>>  #
> >>>  # This software may be used and distributed according to the terms of the
> >>>  # GNU General Public License version 2 or any later version.
> >>>  
> >>> -from i18n import _
> >>>  import cgi, re, os, time, urllib
> >>> -import encoding, node, util, error
> >>> +import encoding, node, util
> >>
> >> The module still needs those, for error reporting (which suggests it also
> >> needs a few (doc)tests).
> > 
> > Huh, really? Even if there is no use of the module in that file?
> 
> Huh, my mistake; I probably didn't apply the patch correctly here. These
> changes are fine.

Ok, I've queued them for default, thanks.

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list