Skip to content

Re-instate ability to provide multiple revs eg diffuse -r v1 -r v2 file #248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bhepple wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Re-instate ability to provide multiple revs eg diffuse -r v1 -r v2 file #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0fd5a7
Re-instate ability to provide multiple revs eg diffuse -r v1 -r v2 file
bhepple Apr 25, 2025
8a75d9d
Remove debug
bhepple Apr 25, 2025
0e3c14d
chore(docs): update CHANGELOG.md
MightyCreak Mar 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 3 additions & 2 deletions src/diffuse/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>'),
'rev',
)
Expand Down Expand Up @@ -287,7 +287,8 @@ def do_command_line(self, command_line):
mode = 'modified'
if 'revision' in options:
# specified revision
revs.append((options['revision'], encoding))
for i in options['revision']:
revs.append((i, encoding))
if 'separate' in options:
funcs[mode](specs, labels, opts)
specs, labels, opts = [], [], {}
Expand Down