lp://staging/~pauljnixon/bzr/context_in_diffs
Created by
Paul Nixon
and last modified
Patiencediff (used by default for "bzr diff" command) includes the ability to control how many lines of context to output for each changed section. I made this accessible as an option to bzr diff, as "--context" so an example would be "bzr diff -r-2 --context 6"
I have also made this accessible to Loggerhead which I will propose for merging if this goes in.
This is the first time I have proposed anything for merging, if I'm doing something wrong just let me know and I'll fix it.
Only
Paul Nixon
can upload to this branch. If you are
Paul Nixon
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Martin Packman (community): Approve
- Jelmer Vernooij (community): Approve
-
Diff: 234 lines (+92/-12)4 files modifiedbzrlib/builtins.py (+7/-2)
bzrlib/diff.py (+18/-10)
bzrlib/tests/test_diff.py (+63/-0)
doc/en/release-notes/bzr-2.6.txt (+4/-0)
Branch information
Recent revisions
This branch has not been scanned yet.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/bzr