Add conserve versions --utc

This should fix tests that assumed they were run
in a particular timezone.

Author: sourcefrog

NEWS.md

@@ -8,6 +8,8 @@
 
 - Better display of deletion stats.
 
+- New `conserve versions --utc` option.
+
 ## v0.6.10 2020-12-30
 
 ### Features

src/bin/conserve.rs

@@ -148,6 +148,9 @@ enum Command {
         /// Show size of stored trees.
         #[structopt(long, short = "z", conflicts_with = "short")]
         sizes: bool,
+        /// Show times in UTC.
+        #[structopt(long)]
+        utc: bool,
     },
 }
 
@@ -355,13 +358,14 @@ impl Command {
                 archive,
                 short,
                 sizes,
+                utc,
             } => {
                 ui::enable_progress(false);
                 let archive = Archive::open_path(archive)?;
                 if *short {
                     output::show_brief_version_list(&archive, &mut stdout)?;
                 } else {
-                    output::show_verbose_version_list(&archive, *sizes, &mut stdout)?;
+                    output::show_verbose_version_list(&archive, *sizes, *utc, &mut stdout)?;
                 }
             }
         }

src/output.rs

@@ -1,5 +1,5 @@
 // Conserve backup system.
-// Copyright 2018, 2020 Martin Pool.
+// Copyright 2018, 2020, 2021 Martin Pool.
 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -18,8 +18,6 @@
 
 use std::io::{BufWriter, Write};
 
-use chrono::Local;
-
 use crate::*;
 
 pub fn show_brief_version_list(archive: &Archive, w: &mut dyn Write) -> Result<()> {
@@ -29,9 +27,16 @@ pub fn show_brief_version_list(archive: &Archive, w: &mut dyn Write) -> Result<(
     Ok(())
 }
 
+/// Print a list of versions, one per line.
+///
+/// With `show_sizes` the (unpacked) size of the stored tree is included. This is
+/// slower because it requires walking the whole index.
+///
+/// With `utc_times`, times are shown in UTC rather than the local timezone.
 pub fn show_verbose_version_list(
     archive: &Archive,
     show_sizes: bool,
+    utc_times: bool,
     w: &mut dyn Write,
 ) -> Result<()> {
     for band_id in archive.list_band_ids()? {
@@ -54,10 +59,12 @@ pub fn show_verbose_version_list(
         } else {
             "incomplete"
         };
-        let start_time_str = info
-            .start_time
-            .with_timezone(&Local)
-            .format(crate::TIMESTAMP_FORMAT);
+        let start_time = info.start_time;
+        let start_time_str = if utc_times {
+            start_time.format(crate::TIMESTAMP_FORMAT)
+        } else {
+            start_time.with_timezone(&chrono::Local).format(crate::TIMESTAMP_FORMAT)
+        };
         let duration_str = info
             .end_time
             .and_then(|et| (et - info.start_time).to_std().ok())

tests/cli/versions.rs

@@ -11,25 +11,39 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 
+//! Tests of the `conserve versions` command.
+
 use assert_cmd::prelude::*;
+use predicates::function::function;
 
 use crate::run_conserve;
 
 #[test]
 fn versions() {
     run_conserve()
-        .args(&["versions", "testdata/archive/simple/v0.6.10"])
+        .args(&["versions", "--utc", "testdata/archive/simple/v0.6.10"])
         .assert()
         .success()
         .stdout(
             "\
-b0000                complete   2021-03-04 05:21:15     0:00
-b0001                complete   2021-03-04 05:21:30     0:00
-b0002                complete   2021-03-04 05:27:28     0:00
+b0000                complete   2021-03-04 13:21:15     0:00
+b0001                complete   2021-03-04 13:21:30     0:00
+b0002                complete   2021-03-04 13:27:28     0:00
 ",
         );
 }
 
+#[test]
+fn versions_in_local_time() {
+    // Without --utc we don't know exactly what times will be produced,
+    // and it's hard to control the timezone for tests on Windows.
+    run_conserve()
+        .args(&["versions", "testdata/archive/simple/v0.6.10"])
+        .assert()
+        .success()
+        .stdout(function(|s: &str| s.lines().count() == 3));
+}
+
 #[test]
 fn versions_short() {
     run_conserve()
@@ -48,14 +62,19 @@ b0002
 #[test]
 fn versions_sizes() {
     run_conserve()
-        .args(&["versions", "--sizes", "testdata/archive/simple/v0.6.10"])
+        .args(&[
+            "versions",
+            "--sizes",
+            "--utc",
+            "testdata/archive/simple/v0.6.10",
+        ])
         .assert()
         .success()
         .stdout(
             "\
-b0000                complete   2021-03-04 05:21:15     0:00           0 MB
-b0001                complete   2021-03-04 05:21:30     0:00           0 MB
-b0002                complete   2021-03-04 05:27:28     0:00           0 MB
+b0000                complete   2021-03-04 13:21:15     0:00           0 MB
+b0001                complete   2021-03-04 13:21:30     0:00           0 MB
+b0002                complete   2021-03-04 13:27:28     0:00           0 MB
 ",
         );
 }