Merge cdiff into diff
Bug #376594 reported by
Daniel Clemente
This bug affects 11 people
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Confirmed
|
Wishlist
|
Unassigned | ||
Breezy |
Fix Released
|
Wishlist
|
Jelmer Vernooij |
Bug Description
Coloured diff is nicer than coloruless diff for many users, and it has the option to disable it if the user doesn't want it. Therefore coloured diff could be the default one, and be available into „bzr diff“ with no need for bzrtools.
A good colour combination must be chosen, considering there are many colour blind for red/green, and that the colors must look nice (i.e. not only grey on white).
The colored diff could have --color=auto as default instead of --color=always, so that „bzr diff > file.patch“ doesn't produce garbage. „bzr diff --color=always | less -r“ would be used if you want colors in less (just like the GNU program ls: „ls --color=always | less -r“).
Related branches
lp://qastaging/~jelmer/brz/colordiff
Merged
into
lp://qastaging/brz
- Jelmer Vernooij: Approve
-
Diff: 393 lines (+336/-2)5 files modifiedbreezy/builtins.py (+25/-2)
breezy/colordiff.py (+197/-0)
breezy/terminal.py (+87/-0)
breezy/tests/blackbox/test_diff.py (+22/-0)
doc/en/release-notes/brz-3.1.txt (+5/-0)
Changed in bzr: | |
importance: | Undecided → Wishlist |
status: | New → Triaged |
Changed in bzr: | |
status: | Triaged → Confirmed |
tags: | added: check-for-breezy |
tags: | removed: check-for-breezy |
Changed in brz: | |
status: | New → Triaged |
importance: | Undecided → Wishlist |
Changed in brz: | |
status: | Triaged → In Progress |
assignee: | nobody → Jelmer Vernooij (jelmer) |
milestone: | none → 3.1.0 |
tags: | added: diff |
Changed in brz: | |
status: | In Progress → Fix Committed |
Changed in brz: | |
status: | Fix Committed → Fix Released |
To post a comment you must log in.
Bug #597626 - bzrlib should support color, is related.