Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
journal: use fm.formatdate() to pass date tuple in appropriate type (BC)
authorYuya Nishihara <yuya@tcha.org>
Sun, 31 Jul 2016 17:11:48 +0900
changeset 29679 e54bdd3aa23b
parent 29678 2f3f18ad55a2
child 29680 2f034a21778c
journal: use fm.formatdate() to pass date tuple in appropriate type (BC)
hgext/journal.py file | annotate | diff | comparison | revisions
tests/test-journal.t file | annotate | diff | comparison | revisions 
--- a/hgext/journal.py	Sun Jul 31 17:07:29 2016 +0900
+++ b/hgext/journal.py	Sun Jul 31 17:11:48 2016 +0900
@@ -488,7 +488,7 @@
             opts.get('all') or name.startswith('re:'),
             'name', '  %-8s', entry.name)
 
-        timestring = util.datestr(entry.timestamp, '%Y-%m-%d %H:%M %1%2')
+        timestring = fm.formatdate(entry.timestamp, '%Y-%m-%d %H:%M %1%2')
         fm.condwrite(ui.verbose, 'date', ' %s', timestring)
         fm.write('command', '  %s\n', entry.command)
 
--- a/tests/test-journal.t	Sun Jul 31 17:07:29 2016 +0900
+++ b/tests/test-journal.t	Sun Jul 31 17:11:48 2016 +0900
@@ -146,7 +146,7 @@
   [
    {
     "command": "up",
-    "date": "1970-01-01 00:00 +0000",
+    "date": [5.0, 0],
     "name": ".",
     "newhashes": ["1e6c11564562b4ed919baca798bc4338bd299d6a"],
     "oldhashes": ["cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b"],
@@ -154,7 +154,7 @@
    },
    {
     "command": "up 0",
-    "date": "1970-01-01 00:00 +0000",
+    "date": [2.0, 0],
     "name": ".",
     "newhashes": ["cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b"],
     "oldhashes": ["1e6c11564562b4ed919baca798bc4338bd299d6a"],
@@ -162,7 +162,7 @@
    },
    {
     "command": "commit -Aqm b",
-    "date": "1970-01-01 00:00 +0000",
+    "date": [1.0, 0],
     "name": ".",
     "newhashes": ["1e6c11564562b4ed919baca798bc4338bd299d6a"],
     "oldhashes": ["cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b"],
@@ -170,7 +170,7 @@
    },
    {
     "command": "commit -Aqm a",
-    "date": "1970-01-01 00:00 +0000",
+    "date": [0.0, 0],
     "name": ".",
     "newhashes": ["cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b"],
     "oldhashes": ["0000000000000000000000000000000000000000"],
@@ -183,6 +183,7 @@
   > j = "{oldhashes % '{node|upper}'} -> {newhashes % '{node|upper}'}
   >      - user: {user}
   >      - command: {command}
+  >      - date: {date|rfc3339date}
   >      - newhashes: {newhashes}
   >      - oldhashes: {oldhashes}
   >      "
@@ -192,6 +193,7 @@
   CB9A9F314B8B07BA71012FCDBC544B5A4D82FF5B -> 1E6C11564562B4ED919BACA798BC4338BD299D6A
   - user: foobar
   - command: up
+  - date: 1970-01-01T00:00:05+00:00
   - newhashes: 1e6c11564562b4ed919baca798bc4338bd299d6a
   - oldhashes: cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
Mercurial