Merge lp:~doxxx/bzr/bug939605 into lp:bzr
Status: | Rejected |
---|---|
Rejected by: | Martin Packman |
Proposed branch: | lp:~doxxx/bzr/bug939605 |
Merge into: | lp:bzr |
Diff against target: |
155 lines (+53/-21) 5 files modified
bzrlib/mergetools.py (+16/-7) bzrlib/osutils.py (+12/-9) bzrlib/tests/test_mergetools.py (+14/-5) bzrlib/tests/test_osutils.py (+8/-0) doc/en/release-notes/bzr-2.6.txt (+3/-0) |
To merge this branch: | bzr merge lp:~doxxx/bzr/bug939605 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Pool | Approve | ||
Martin Packman (community) | Needs Information | ||
Alexander Belchenko | Approve | ||
Review via email: mp+94488@code.launchpad.net |
Description of the change
Fixes bug 939605 by updating osutils.
The check_availability and invoke functions in mergetools use a small utility function, _get_executable
Unmerged revisions
- 6481. By Gordon Tyler
-
Re-removed unnecessary import.
- 6480. By Gordon Tyler
-
Improved readablity of check_availability.
- 6479. By Gordon Tyler
-
Removed unnecessary import.
- 6478. By Gordon Tyler
-
Updated mergetools.
_get_executable _path and improved test_invoke_ expands_ exe_path. - 6477. By Gordon Tyler
-
Changed osutils.
find_executable _on_path to search using win32utils. get_app_ path if the executable is not found using the PATH env var. - 6476. By Gordon Tyler
-
Updated release notes.
- 6475. By Gordon Tyler
-
Added _get_executable
_path function to mergetools module, which searches the PATH and App Path registry on win32.
Changed check_availability and invoke to use _get_executable_path.
Updated tests.
Looks OK for me, though I can't comment on your change to existing test. Maybe second voice from core dev is needed. I can say that I've tested it and it works. Thank you for fixing it so fast.
Also, I'd like to have this patch backported to bzr 2.5.1, because it clearly fixed bug and don't change anything public.
And you need NEWS message, I guess ;-)