On Tue, Jan 13, 2009 at 10:29 PM, TK Soh <[email protected]> wrote:

> On Wed, Jan 14, 2009 at 3:20 AM, Steve Borho <[email protected]> wrote:
> > # HG changeset patch
> > # User Steve Borho <[email protected]>
> > # Date 1231903007 21600
> > # Node ID 50d8e21ba7f9c77df1acb2b951cbf465d06202dd
> > # Parent  7335932c6d07feef59e112bd8d3919de21f3de5a
> > nautilus: directly use util.datestr()
> >
> > More cut-pase :)
> >
> > diff --git a/contrib/nautilus-thg.py b/contrib/nautilus-thg.py
> > --- a/contrib/nautilus-thg.py
> > +++ b/contrib/nautilus-thg.py
> > @@ -12,7 +12,7 @@
> >  import gconf
> >  import gtk
> >  import gobject
> > -from mercurial import hg, ui, repo, match
> > +from mercurial import hg, ui, repo, match, util
> >  from mercurial.node import short
> >  import nautilus
> >  import os
> > @@ -21,7 +21,6 @@
> >  import tempfile
> >  import time
> >  import urllib
> > -from hggtk.hglib import displaytime
> >
> >  TORTOISEHG_PATH = '~/tools/tortoisehg-dev'
> >  TERMINAL_KEY = '/desktop/gnome/applications/terminal/exec'
> > @@ -514,7 +513,7 @@
> >              rev = ctx.rev()
> >          ctx = repo.changectx(rev)
> >          node = short(ctx.node())
> > -        date = displaytime(ctx.date())
> > +        date = util.datestr(ctx.date(), '%Y-%m-%d %H:%M:%S %1%2')
> >          parents = '\n'.join([short(p.node()) for p in ctx.parents()])
> >          description = ctx.description()
> >          user = ctx.user()
>
> I'll go with Steve's patch. Unless Steve disagree somehow.
>


No, feel free to apply this.

BTW: Matt just pushed a number of Exception refactors, moving most of them
into
error.py to avoid a lot of expensive demandimports.  I have a change in my
local repo
that makes hggtk and hgtk work again, but it's not backwards compatible in
any way.
After you publish 0.6, I can give you this fix (or you can make a stab at
doing it in a backward compatible way).
------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
Tortoisehg-develop mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop

Reply via email to