[Monotone-commits-diffs] net.venge.monotone.issue-218: b6e5e573f77b5e7efb333dabf5cef5c64b22a08d

[code]

revision:            b6e5e573f77b5e7efb333dabf5cef5c64b22a08d
date:                2012-12-11T21:32:59
author:              address@hidden
branch:              net.venge.monotone.issue-218
changelog:
- Fix #218 : added date format handling in cmd_list for 'ls certs' command
- Added test case

manifest:
format_version "1"

new_manifest [30b9efaa4fb6b2a24cf3c87d51b894cdd8eef64f]

old_revision [76c1b2d9bf6e58326e66f63395db2cc0a8f36076]

patch "src/cmd_list.cc"
 from [a0103f85cfb0c0e36fe33f3bad41e321cf1d5dcc]
   to [15fc8e9458e87d7629e4104ef5c31e6f606a0441]

patch "test/func/date_formatting/__driver__.lua"
 from [69b27686e2336bae0ef015111d784239f64e33df]
   to [ea83e9245b0cfb23fde94551eb16a582dde33e94]
============================================================
--- src/cmd_list.cc	a0103f85cfb0c0e36fe33f3bad41e321cf1d5dcc
+++ src/cmd_list.cc	15fc8e9458e87d7629e4104ef5c31e6f606a0441
@@ -23,6 +23,7 @@
 #include "cmd.hh"
 #include "roster.hh"
 #include "database.hh"
+#include "date_format.hh"
 #include "globish.hh"
 #include "keys.hh"
 #include "key_store.hh"
@@ -113,6 +114,8 @@ CMD(certs, "certs", "", CMD_REF(list), "
 
   transaction_guard guard(db, false);
 
+  string date_fmt = get_date_format(app.opts, app.lua, date_time_long);
+  
   revision_id ident;
   complete(app.opts, app.lua,  project, idx(args, 0)(), ident);
   vector<cert> ts;
@@ -184,6 +187,18 @@ CMD(certs, "certs", "", CMD_REF(list), "
       split_into_lines(washed, lines);
       std::string value_first_line = lines.empty() ? "" : idx(lines, 0);
 
+      if (idx(certs, i).name == date_cert_name)
+        {
+          if (!date_fmt.empty())
+            {
+              value_first_line = date_t(value_first_line).as_formatted_localtime(date_fmt);
+            }
+          else
+            {
+              value_first_line = date_t(value_first_line).as_iso_8601_extended();
+            }
+        }
+
       key_identity_info identity;
       identity.id = idx(certs, i).key;
       project.complete_key_identity_from_id(keys, app.lua, identity);
============================================================
--- test/func/date_formatting/__driver__.lua	69b27686e2336bae0ef015111d784239f64e33df
+++ test/func/date_formatting/__driver__.lua	ea83e9245b0cfb23fde94551eb16a582dde33e94
@@ -68,3 +68,8 @@ test_tz_fmt("ZZT-12:00", "%Y-%m-%d %H:%M
 test_tz_fmt("ZZT-10:00", "%Y-%m-%d %H:%M %Z%z", "1999-12-31 23:00 ZZT+1000")
 test_tz_fmt("ZZT-11:00", "%Y-%m-%d %H:%M %Z%z", "2000-01-01 00:00 ZZT+1100")
 test_tz_fmt("ZZT-12:00", "%Y-%m-%d %H:%M %Z%z", "2000-01-01 01:00 ZZT+1200")
+
+-- Warning, "expected" must match the last test_tz_fmt as timezone was changed
+check(get("expected"))
+check(mtn("ls", "certs", "--date-format=%Y-%m-%dT%H:%M:%S%z", rev), 0, false, false)
+check(samefile("expected", "ts-stdout"))
\ No newline at end of file