Patchwork [Bug,3966] New: convert uses wrong TZ when writing .hgtags

login
register
mail settings
Submitter mercurial-bugs@selenic.com
Date June 18, 2013, 3:03 p.m.
Message ID <bug-3966-285@http.bz.selenic.com/>
Download mbox | patch
Permalink /patch/1732/
State Changes Requested
Headers show

Comments

mercurial-bugs@selenic.com - June 18, 2013, 3:03 p.m.
http://bz.selenic.com/show_bug.cgi?id=3966

          Priority: normal
            Bug ID: 3966
                CC: mercurial-devel@selenic.com
          Assignee: bugzilla@selenic.com
           Summary: convert uses wrong TZ when writing .hgtags
          Severity: bug
    Classification: Unclassified
                OS: Linux
          Reporter: john.peacock@messagesystems.com
          Hardware: PC
            Status: UNCONFIRMED
           Version: 2.5.4
         Component: convert
           Product: Mercurial

Using convert to isolate a given directory tree (using filemap), I see that the
date is wrong in the automatic commit to fix up .hgtags:

changeset: [draft] 543:45ecef7efaf3
author:    convert-repo
date:      Tue, 18 Jun 2013 19:08:32 +0000 (4 hours from now)
summary:   update tags

A .hgtags

That should -0400 where I am located (all of the other timestamps are correct).

This seems like the appropriate fix:

Patch

diff --git a/hgext/convert/hg.py b/hgext/convert/hg.py
--- a/hgext/convert/hg.py
+++ b/hgext/convert/hg.py
@@ -203,7 +203,7 @@ 
             return context.memfilectx(f, data, False, False, None)

         self.ui.status(_("updating tags\n"))
-        date = "%s 0" % int(time.mktime(time.gmtime()))
+        date = "%s 0" % int(time.mktime(time.localtime()))
         extra = {'branch': self.tagsbranch}
         ctx = context.memctx(self.repo, (tagparent, None), "update tags",
                              [".hgtags"], getfilectx, "convert-repo", date,