From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id A5BBEDCCF for ; Mon, 5 Dec 2022 15:55:29 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8AA2726FFB for ; Mon, 5 Dec 2022 15:55:29 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 5 Dec 2022 15:55:28 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 0E8E3436CE for ; Mon, 5 Dec 2022 15:55:28 +0100 (CET) From: Lukas Wagner To: pbs-devel@lists.proxmox.com Date: Mon, 5 Dec 2022 15:55:11 +0100 Message-Id: <20221205145514.645111-1-l.wagner@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.016 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH v2 proxmox-backup 0/3] debug cli: improve output, optionally compare file content for `diff archive` X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Dec 2022 14:55:29 -0000 This patch series contains a few improvements for the `diff archive` tool, mainly based on Wolfgang's and Thomas' suggestions. First, the output of is now much more detailed and shows some relevant file attributes, including what has changed between snapshots. Changed attributes are highlighted by a "*" and are highlighted by colored text. For instance: $ proxmox-backup-debug diff archive ... --compare-content A f 644 10045 10000 0 B 2022-11-28 13:44:51 add.txt M f 644 10045 10000 6 B *2022-11-28 13:45:05 *content.txt D f 644 10045 10000 0 B 2022-11-28 13:17:09 deleted.txt M f 644 10045 *29 0 B 2022-11-28 13:16:20 gid.txt M f *777 10045 10000 0 B 2022-11-28 13:42:47 mode.txt M f 644 10045 10000 0 B *2022-11-28 13:44:33 mtime.txt M f 644 10045 10000 *7 B *2022-11-28 13:44:59 size.txt M f 644 *64045 10000 0 B 2022-11-28 13:16:18 uid.txt M *f 644 10045 10000 10 B 2022-11-28 13:44:59 type.txt Furthermore, there now exists the possiblity to pass the --compare-content flag to the tool. If the flag is passed, the tool will compare the file content instead of relying on mtime alone to detect modifications. This patch series adds new dependencies to the `termcolor` and `atty` crates. That being said, both crates were already pulled in by other crates as transitive dependencies. Changes from v1: - Made `changed indicator for file content` a bit less confusing. For regular files, it is now only displayed if - the --comapare-content flag is set and - the file contents *actually* differ - Removed unnecessesary namespace prefix for std::task::Pin in unit tests - Added color output, controllable via --color {always,auto,never} flag. Lukas Wagner (3): debug cli: show more file attributes for `diff archive` command debug cli: add 'compare-content' flag to `diff archive` command debug cli: add colored output to `diff archive` command Cargo.toml | 2 + debian/control | 2 + src/bin/proxmox_backup_debug/diff.rs | 604 ++++++++++++++++++++++++--- 3 files changed, 549 insertions(+), 59 deletions(-) -- 2.30.2