From 0d2d44a95c7a0e53b2bbca0b97e3793ad1853911 Mon Sep 17 00:00:00 2001 From: Bob Hepple Date: Fri, 25 Apr 2025 21:46:37 +1000 Subject: [PATCH 1/3] Re-instate ability to provide multiple revs eg diffuse -r v1 -r v2 file --- src/diffuse/main.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/diffuse/main.py b/src/diffuse/main.py index 6a717a62..bf02c430 100644 --- a/src/diffuse/main.py +++ b/src/diffuse/main.py @@ -113,7 +113,7 @@ def __init__(self, sysconfigdir: str): 'revision', ord('r'), GLib.OptionFlags.NONE, - GLib.OptionArg.STRING, + GLib.OptionArg.STRING_ARRAY, _('File revision '), 'rev', ) @@ -287,7 +287,9 @@ def do_command_line(self, command_line): mode = 'modified' if 'revision' in options: # specified revision - revs.append((options['revision'], encoding)) + print(options['revision']) + for i in options['revision']: + revs.append((i, encoding)) if 'separate' in options: funcs[mode](specs, labels, opts) specs, labels, opts = [], [], {} From 18aecb9749374c2772db5e52886045af1bb720c9 Mon Sep 17 00:00:00 2001 From: Bob Hepple Date: Sat, 26 Apr 2025 08:19:49 +1000 Subject: [PATCH 2/3] Remove debug --- src/diffuse/main.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/diffuse/main.py b/src/diffuse/main.py index bf02c430..5e43ee4d 100644 --- a/src/diffuse/main.py +++ b/src/diffuse/main.py @@ -287,7 +287,6 @@ def do_command_line(self, command_line): mode = 'modified' if 'revision' in options: # specified revision - print(options['revision']) for i in options['revision']: revs.append((i, encoding)) if 'separate' in options: From 380717b91859ef16ea8204d1f098d09867f83c40 Mon Sep 17 00:00:00 2001 From: Romain Failliot Date: Tue, 10 Mar 2026 18:42:48 -0400 Subject: [PATCH 3/3] chore(docs): update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 480b89c1..5221c164 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - fix(cicd): update Github CI/CD script (@MightyCreak) +- Fix [#246](https://github.com/MightyCreak/diffuse/issues/246): Re-instate ability + to provide multiple revs eg diffuse -r v1 -r v2 file (@bhepple) ## [0.10.0] - 2025-05-24