Add conserve versions --newest

Merge branch 'main' of https://github.com/tkuestner/conserve into newest

Closes #159, #121

Author: sourcefrog

NEWS.md

@@ -10,6 +10,8 @@
 
 - New `conserve versions --utc` option.
 
+- New `conserve versions --newest` option (thanks to tkuestner@).
+
 ## v0.6.10 2020-12-30
 
 ### Features

src/bin/conserve.rs

@@ -145,6 +145,9 @@ enum Command {
         /// Show only version names.
         #[structopt(long, short = "q")]
         short: bool,
+        /// Sort bands to show most recent first.
+        #[structopt(long, short = "n")]
+        newest: bool,
         /// Show size of stored trees.
         #[structopt(long, short = "z", conflicts_with = "short")]
         sizes: bool,
@@ -357,15 +360,22 @@ impl Command {
             Command::Versions {
                 archive,
                 short,
+                newest,
                 sizes,
                 utc,
             } => {
                 ui::enable_progress(false);
                 let archive = Archive::open_path(archive)?;
                 if *short {
-                    output::show_brief_version_list(&archive, &mut stdout)?;
+                    output::show_brief_version_list(&archive, *newest, &mut stdout)?;
                 } else {
-                    output::show_verbose_version_list(&archive, *sizes, *utc, &mut stdout)?;
+                    output::show_verbose_version_list(
+                        &archive,
+                        *sizes,
+                        *utc,
+                        *newest,
+                        &mut stdout,
+                    )?;
                 }
             }
         }

src/output.rs

@@ -20,8 +20,16 @@ use std::io::{BufWriter, Write};
 
 use crate::*;
 
-pub fn show_brief_version_list(archive: &Archive, w: &mut dyn Write) -> Result<()> {
-    for band_id in archive.list_band_ids()? {
+pub fn show_brief_version_list(
+    archive: &Archive,
+    newest_first: bool,
+    w: &mut dyn Write,
+) -> Result<()> {
+    let mut band_ids = archive.list_band_ids()?;
+    if newest_first {
+        band_ids.reverse();
+    }
+    for band_id in band_ids {
         writeln!(w, "{}", band_id)?
     }
     Ok(())
@@ -37,9 +45,14 @@ pub fn show_verbose_version_list(
     archive: &Archive,
     show_sizes: bool,
     utc_times: bool,
+    newest_first: bool,
     w: &mut dyn Write,
 ) -> Result<()> {
-    for band_id in archive.list_band_ids()? {
+    let mut band_ids = archive.list_band_ids()?;
+    if newest_first {
+        band_ids.reverse();
+    }
+    for band_id in band_ids {
         let band = match Band::open(&archive, &band_id) {
             Ok(band) => band,
             Err(e) => {
@@ -63,7 +76,9 @@ pub fn show_verbose_version_list(
         let start_time_str = if utc_times {
             start_time.format(crate::TIMESTAMP_FORMAT)
         } else {
-            start_time.with_timezone(&chrono::Local).format(crate::TIMESTAMP_FORMAT)
+            start_time
+                .with_timezone(&chrono::Local)
+                .format(crate::TIMESTAMP_FORMAT)
         };
         let duration_str = info
             .end_time

tests/cli/main.rs

@@ -485,3 +485,31 @@ fn size_exclude() {
         .success()
         .stdout("10\n");
 }
+
+#[test]
+fn brief_versions_sort_recent_first() {
+    let af = ScratchArchive::new();
+    af.store_two_versions();
+
+    run_conserve()
+        .args(&["versions", "--short", "--newest"])
+        .arg(af.path())
+        .assert()
+        .success()
+        .stderr(predicate::str::is_empty())
+        .stdout("b0001\nb0000\n");
+}
+
+#[test]
+fn verbose_versions_sort_recent_first() {
+    let af = ScratchArchive::new();
+    af.store_two_versions();
+
+    run_conserve()
+        .args(&["versions", "--newest"])
+        .arg(af.path())
+        .assert()
+        .success()
+        .stderr(predicate::str::is_empty())
+        .stdout(predicate::str::is_match("b0001.*\nb0000.*").unwrap());
+}