13

I use Windows 10 Ubuntu bash, provided by Windows Subsystem for Linux. I want to use a visual diff/merge tool for git. I installed p4merge on Windows (followed this artice) and configured the git .gitconfig file with the following way (I adjusted the paths to be accessible from Windows 10 Ubuntu bash):

[merge]
    tool = p4merge
[mergetool "p4merge"]
    path = /mnt/c/Program Files/Perforce/p4merge.exe
[mergetool]
    prompt = false
[diff]
    tool = p4merge
[difftool "p4merge"]
    path = /mnt/c/Program Files/Perforce/p4merge.exe
[difftool]
    prompt = false

Additionally, I added the following folder to the bash PATH variable in .bashrc to make it callable from anywhere:

 export PATH=$PATH:"/mnt/c/Program Files/Perforce"

So my problem is that if I call git difftool in the bash - to investigate the changes with p4merge - I got the following messages

  • in bash: Unable to translate current working directory. Using C:\Windows\system32.
  • the p4merge application is started right after the call but gives the following message: Error: ... point to an invalid file.

If I understand right, this problem may emanate from the fact that a Windows program (namely p4merge) could not find a file that is referenced with a Linux file path (e.g. /mnt/c/..).

Is there any way to solve this kind of problem? (Maybe it is a more general problem: using Linux path from Windows application.)

Anyway, I do not insist on using p4merge but any similar visual tool to compare differences and to make merge possible.

Any information you can provide me would be greatly appreciated.

Fabio says Reinstate Monica
  • 5,271
  • 9
  • 40
  • 61
aszoke
  • 380
  • 3
  • 10

4 Answers4

19

Solution to this problem is simplified!

Thanks to the Windows 10 version 1903 update, accessing the Linux subsystem from Windows 10 is now possible. It is much more easier.

Just make sure that git config --global --list has these lines. That's all!

diff.tool=p4merge
merge.tool=p4merge
difftool.p4merge.cmd=/mnt/c/Program\ Files/Perforce/p4merge.exe "$(wslpath -aw $LOCAL)" "$(wslpath -aw $REMOTE)"
mergetool.p4merge.cmd=/mnt/c/Program\ Files/Perforce/p4merge.exe "$(wslpath -aw $BASE)" "$(wslpath -aw $LOCAL)" "$(wslpath -aw $REMOTE)" "$(wslpath -aw $MERGED)"
mergetool.p4merge.trustexitcode=false

Takeaways:

  • Linux subsystem now resides at \\wsl$\{distro name}\ path.
  • Which means you can access the tmp folder at \\wsl$\Ubuntu\tmp\. Even from the File Explorer!
  • wslpath -aw command does the heavy lifting for you.
  • The command now properly translates Linux relative /tmp/whatever path to a Windows 10 relative path.
Neesarg
  • 191
  • 1
  • 5
  • Thanks a lot for this answer. The only addition is that you most probably want to use `wslpath -am` to convert `\ ` to `/` – Vasiliy Aug 06 '19 at 17:01
  • In my experience, it didn't need -am. But defiantly, you can add it just in case. Thanks for pointing out! – Neesarg Mar 22 '20 at 17:18
  • I've added the flag to force the unix line ending on p4merge `p4merge.exe -le unix`. If not it kept changing the line endings. – fbiagi Jan 29 '21 at 16:26
8

For Beyond Compare 4, add these lines to your .gitconfig file:

[merge]
    tool = BeyondCompare4
    guitool = BeyondCompare4
[diff]
    guitool = beyondcompare4
[difftool "beyondcompare4"]
    cmd = /mnt/c/Program\\ Files/Beyond\\ Compare\\ 4/bcomp.exe "$(wslpath -aw $LOCAL)" "$(wslpath -aw $REMOTE)"
[mergetool "BeyondCompare4"]
    cmd = /mnt/c/Program\\ Files/Beyond\\ Compare\\ 4/bcomp.exe "$(wslpath -aw $LOCAL)" "$(wslpath -aw $REMOTE)" "$(wslpath -aw $BASE)" "$(wslpath -aw $MERGED)"
Mahmood Dehghan
  • 7,761
  • 5
  • 54
  • 71
4

Create file p4mergebash.sh and set $PATH:

mkdir -p ~/bin
touch ~/bin/p4mergebash.sh
chmod +x ~/bin/p4mergebash.sh
echo 'export PATH=$PATH:/mnt/c/Program\ Files/Perforce' >> ~/.bashrc
source ~/.bashrc

p4mergebash.sh content:

#!/bin/sh

LOCAL="$1"
REMOTE="$2"

case "$LOCAL"
in
    *)
    L=$(echo "C:/Users/<username>/AppData/Local/lxss/rootfs${LOCAL}" | sed 's,/,\\\\,g')
    ;;
esac

case "$REMOTE"
in
    *)
    R=$(echo `git rev-parse --show-toplevel`/"$REMOTE" | sed 's,/mnt/c/,C:/,g' | sed 's,/,\\\\,g')
    ;;
esac

echo "$L"
echo "$R"
p4merge.exe "$L" "$R"

Above script assumes your AppData and your git repo are on C: drive. Insert your username into the angle brackets (i.e. <username>).

Note: Ensure there are no CRLF's in p4mergebash.sh.

Then set git config:

git config --global diff.tool p4mergebash
git config --global difftool.p4mergebash.cmd '~/bin/p4mergebash.sh $LOCAL $REMOTE'
git config --global difftool.prompt false
rofrol
  • 14,438
  • 7
  • 79
  • 77
  • Worked very well for me. (Using meld) In my case however, I had to slightly change the contents of p4mergebash.sh to make it match the LOCAL so that it would fetch from my tmp directory for remote as well. R=$(echo "C:/Users//AppData/Local/lxss/rootfs${REMOTE}" | sed 's,/,\\\\,g') – helios456 Jan 03 '19 at 13:45
  • @rofrol `L=$(echo "C:/Users/ysuh/AppData/Local/Packages/CanonicalGroupLimited.UbuntuonWindows_79rhkp1fndgsc/LocalState/rootfs${LOCAL}" | sed 's,/,\\\\,g')` I had to update the bash script's value for L. `/mnt/c/Program\ Files/Perforce/p4merge.exe "$L" "$R"` I also had to hardcode the executable path. I couldn't get it to work with just updating the PATH via .bash_profile. – airpower44 Apr 22 '19 at 18:04
0

Here are the .gitconfig lines I use for p4merge for merge and diff tool. Also to use VS code as commit message editor:

[diff]
    tool = p4merge
[merge]
    tool = p4merge
[difftool "p4merge"]
    cmd = /mnt/c/Program\\ Files/Perforce/p4merge.exe \"$(wslpath -aw $LOCAL)\" \"$(wslpath -aw $REMOTE)\"
[mergetool "p4merge"]
    cmd = /mnt/c/Program\\ Files/Perforce/p4merge.exe -le unix \"$(wslpath -aw $BASE)\" \"$(wslpath -aw $LOCAL)\" \"$(wslpath -aw $REMOTE)\" \"$(wslpath -aw $MERGED)\"
    trustexitcode = false
    keepBackup = false
[core]
    editor = code -w

I like BeyondCompare better for 3-way merge, but p4merge is the best free option in my opinion. To get VS Code working with wsl, see this tutorial.

fbiagi
  • 766
  • 6
  • 11