Skip to content

Commit 5d8638b

Browse files
authored
Merge pull request #248 from bhepple/multiple-revs
Re-instate ability to provide multiple revs eg diffuse -r v1 -r v2 file
2 parents ce364d4 + 380717b commit 5d8638b

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1414
### Fixed
1515

1616
- fix(cicd): update Github CI/CD script (@MightyCreak)
17+
- Fix [#246](https://github.com/MightyCreak/diffuse/issues/246): Re-instate ability
18+
to provide multiple revs eg diffuse -r v1 -r v2 file (@bhepple)
1719

1820
## [0.10.0] - 2025-05-24
1921

src/diffuse/main.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ def __init__(self, sysconfigdir: str):
113113
'revision',
114114
ord('r'),
115115
GLib.OptionFlags.NONE,
116-
GLib.OptionArg.STRING,
116+
GLib.OptionArg.STRING_ARRAY,
117117
_('File revision <rev>'),
118118
'rev',
119119
)
@@ -287,7 +287,8 @@ def do_command_line(self, command_line):
287287
mode = 'modified'
288288
if 'revision' in options:
289289
# specified revision
290-
revs.append((options['revision'], encoding))
290+
for i in options['revision']:
291+
revs.append((i, encoding))
291292
if 'separate' in options:
292293
funcs[mode](specs, labels, opts)
293294
specs, labels, opts = [], [], {}

0 commit comments

Comments
 (0)