From fb172ad09e0f1c9a074d439e98b0f1009bb09fbb Mon Sep 17 00:00:00 2001
From: Alexander Weiss <alex@weissfam.de>
Date: Mon, 20 Feb 2023 22:29:44 +0100
Subject: [PATCH] group-by: default to host,label,path

---
 src/commands/backup.rs    | 4 ++--
 src/commands/forget.rs    | 4 ++--
 src/commands/snapshots.rs | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/commands/backup.rs b/src/commands/backup.rs
index 68ce4cd..2f05937 100644
--- a/src/commands/backup.rs
+++ b/src/commands/backup.rs
@@ -31,7 +31,7 @@ pub(super) struct Opts {
     #[merge(strategy = merge::bool::overwrite_false)]
     dry_run: bool,
 
-    /// Group snapshots by any combination of host,label,paths,tags to find a suitable parent (default: host,paths)
+    /// Group snapshots by any combination of host,label,paths,tags to find a suitable parent (default: host,label,paths)
     #[clap(long, short = 'g', value_name = "CRITERION")]
     group_by: Option<SnapshotGroupCriterion>,
 
@@ -218,7 +218,7 @@ pub(super) fn execute(
             &snap,
             &opts
                 .group_by
-                .unwrap_or_else(|| SnapshotGroupCriterion::from_str("host,paths").unwrap()),
+                .unwrap_or_else(|| SnapshotGroupCriterion::from_str("host,label,paths").unwrap()),
         );
 
         let parent = match (backup_stdin, opts.force, opts.parent.clone()) {
diff --git a/src/commands/forget.rs b/src/commands/forget.rs
index db90bec..98a54cd 100644
--- a/src/commands/forget.rs
+++ b/src/commands/forget.rs
@@ -41,7 +41,7 @@ pub(super) struct Opts {
 #[clap(global_setting(AppSettings::DeriveDisplayOrder))]
 #[serde(default, rename_all = "kebab-case")]
 struct ConfigOpts {
-    /// Group snapshots by any combination of host,label,paths,tags (default: "host,paths")
+    /// Group snapshots by any combination of host,label,paths,tags (default: "host,label,paths")
     #[clap(long, short = 'g', value_name = "CRITERION")]
     #[serde_as(as = "Option<DisplayFromStr>")]
     group_by: Option<SnapshotGroupCriterion>,
@@ -70,7 +70,7 @@ pub(super) fn execute(
     let group_by = opts
         .config
         .group_by
-        .unwrap_or_else(|| SnapshotGroupCriterion::from_str("host,paths").unwrap());
+        .unwrap_or_else(|| SnapshotGroupCriterion::from_str("host,label,paths").unwrap());
 
     let groups = match opts.ids.is_empty() {
         true => SnapshotFile::group_from_backend(be, &opts.config.filter, &group_by)?,
diff --git a/src/commands/snapshots.rs b/src/commands/snapshots.rs
index 826965b..4d074b6 100644
--- a/src/commands/snapshots.rs
+++ b/src/commands/snapshots.rs
@@ -22,7 +22,7 @@ pub(super) struct Opts {
         long,
         short = 'g',
         value_name = "CRITERION",
-        default_value = "host,paths"
+        default_value = "host,label,paths"
     )]
     group_by: SnapshotGroupCriterion,