# # # patch "cmd_ws_commit.cc" # from [c7d6e3540bce1c1d5896a198376a4553c4df8654] # to [7ca0be6df2171cbcb5c60f24883a83c1e3d3f471] # # patch "std_hooks.lua" # from [32781b7b525432e0e230aaa2ece7e24e6a8ef7ec] # to [d69d19dd15b34170839af4ff78d5aa1ea0282ef9] # ============================================================ --- cmd_ws_commit.cc c7d6e3540bce1c1d5896a198376a4553c4df8654 +++ cmd_ws_commit.cc 7ca0be6df2171cbcb5c60f24883a83c1e3d3f471 @@ -237,7 +237,7 @@ get_log_message_interactively(lua_hooks if (!is_date_fmt_valid) { - W(F("date format '%s' cannot be used for commit; using default instead") % date_fmt); + W(F("date format '%s' cannot be parsed; using default instead") % date_fmt); revision_header(rid, rev, author, date, branch, changelog, null_date_fmt, header); } else @@ -845,9 +845,6 @@ CMD(status, "status", "", CMD_REF(inform app.lua.hook_get_date_format_spec(date_time_long, date_fmt); } - if (!date_fmt_valid(date_fmt)) - W(F("date format '%s' cannot be used for commit") % date_fmt); - work.get_parent_rosters(db, old_rosters); work.get_current_roster_shape(db, nis, new_roster); ============================================================ --- std_hooks.lua 32781b7b525432e0e230aaa2ece7e24e6a8ef7ec +++ std_hooks.lua d69d19dd15b34170839af4ff78d5aa1ea0282ef9 @@ -1248,6 +1248,14 @@ function get_default_command_options(com function get_default_command_options(command) local default_args = {} + local ostype = get_ostype() + + -- Dates are never parseable on Win32 (see win32/parse_date.cc), + -- so don't warn about that, just use the default format. + if (command[1] == "commit") and string.find(ostype, "Windows") then + table.insert(default_args, "--no-format-dates") + end + return default_args end