`brz diff --using X --diff-options Y` not working

Bug #1977988 reported by Marcos Cruz
8
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Breezy
Fix Released
Medium
Jelmer Vernooij
3.2
In Progress
Medium
Matthew Fuller

Bug Description

I'm trying Breezy for the first time, version
3.2.2 installed with `pip3` in Debian 10.12.

I want to use some external diff tools (mainly Neovim), but I'm having
problems:

  brz diff --using sdiff --diff-options -s
  brz diff --using=sdiff --diff-options=-s
  brz diff --using=sdiff --diff-options="-s"

I always get this error:

  sdiff: extra operand 's'

When I try the long option instead:

  brz diff --using=sdiff --diff-options=--suppress-common-lines
  brz diff --using=sdiff --diff-options="--suppress-common-lines"

then the error is the following:

  sdiff: extra operand '-'

When I try Neovim or Vim:

  brz diff --using /usr/local/bin/nvim --diff-option -dR

then nothing happens, except the command line freezes until I hit
Ctrl-C.

I've defined also some alias in <~/.config/breezy/breezy.conf>:

  [ALIASES]
  ndiff = "diff --using /usr/local/bin/nvim --diff-option -dR"
  vdiff = "diff --using /usr/local/bin/vim --diff-option -dR"
  sdiff = "diff --using /usr/bin/sdiff --diff-option -Bs"
  ddiff = "diff --using /usr/bin/diff --diff-option -Bs"

but they make no difference: they cause the same errors.

It seems a bug, because also the following example from `brz help diff`
fails:

  brz diff --using /usr/bin/diff --diff-options -wu
  diff: extra operand 'w'

Related branches

Revision history for this message
Jelmer Vernooij (jelmer) wrote :

This was a weird regression when we ported Breezy to Python 3.

Changed in brz:
status: New → Fix Committed
assignee: nobody → Jelmer Vernooij (jelmer)
importance: Undecided → Medium
milestone: none → 3.2.3
Revision history for this message
Matthew Fuller (fullermd) wrote :

This should probably be merged back into the 3.2 branch; cherry-picking the head rev on the branch applies cleanly. It even seems to merge into 3.1 OK.

Revision history for this message
Jelmer Vernooij (jelmer) wrote :

I'm not planning to do more work on 3.1 and 3.2, since it's just myself at the moment. Happy to review MRs though.

Changed in brz:
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.