difftools should be merged into bzr core
Bug #279916 reported by
Martin Pool
This bug report is a duplicate of:
Bug #537270: bzr diff --using should support comparing whole trees like difftools..
Edit
Remove
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Bazaar |
Confirmed
|
Medium
|
Unassigned | ||
| Bazaar Difftools Plugin |
New
|
Undecided
|
Unassigned | ||
Bug Description
Running external diff programs would be a reasonable feature to have builtin to bzr.
Related branches
| Changed in bzr: | |
| importance: | Undecided → Medium |
| status: | New → Confirmed |
Revision history for this message
| Alexey Stukalov (astukalov) wrote | #1 |
| tags: | added: diff |
To post a comment you must log in.
Thinking about the requirements of this feature:
1. Both merge and diff external tools should be supported.
2. diff/merge_options should support conventional (TSVN-like) metaarguments: %base %bname %mine %yname %theirs %tname %merged %mname + some bzr-specific for a tree/folder comparison.
3. Tool behavior (interactive, cleans-up, non-recursive etc) could be specified (to a reasonable extent) from bzr command line. So that the bzr alias could be written to run any external tool. (IMO, no need to hardcode supported tools in the code, just provide a list of known tool configurations in the documentation).
4. Since 'bzr diff' behaviour (file or tree comparison) depends on the arguments provided, it's not clear how to combine 3 with this. Maybe provide separate 'treediff_options', 'filediff_options' etc? (If treediff_options is not specified - that means the tool doesn't support folder tree comparison etc).