blob: f3cb197e5876e1a667e97189fff71fd355ccab30 [file] [log] [blame]
David Aguilarbc7a96a2011-08-18 00:23:46 -07001diff_cmd () {
David Aguilar950b5682012-12-26 16:45:29 -08002 empty_file=
3
David Aguilar3facc602012-10-10 20:22:36 -07004 # p4merge does not like /dev/null
David Aguilar3facc602012-10-10 20:22:36 -07005 if test "/dev/null" = "$LOCAL"
6 then
David Aguilar950b5682012-12-26 16:45:29 -08007 LOCAL="$(create_empty_file)"
David Aguilar3facc602012-10-10 20:22:36 -07008 fi
9 if test "/dev/null" = "$REMOTE"
10 then
David Aguilar950b5682012-12-26 16:45:29 -080011 REMOTE="$(create_empty_file)"
David Aguilar3facc602012-10-10 20:22:36 -070012 fi
13
David Aguilarbc7a96a2011-08-18 00:23:46 -070014 "$merge_tool_path" "$LOCAL" "$REMOTE"
David Aguilar3facc602012-10-10 20:22:36 -070015
David Aguilar950b5682012-12-26 16:45:29 -080016 if test -n "$empty_file"
David Aguilar3facc602012-10-10 20:22:36 -070017 then
David Aguilar950b5682012-12-26 16:45:29 -080018 rm -f "$empty_file"
David Aguilar3facc602012-10-10 20:22:36 -070019 fi
David Aguilarbc7a96a2011-08-18 00:23:46 -070020}
21
Fernando Ramos980145f2022-03-30 21:19:09 +020022diff_cmd_help () {
23 echo "Use HelixCore P4Merge (requires a graphical session)"
24}
25
David Aguilarbc7a96a2011-08-18 00:23:46 -070026merge_cmd () {
Kevin Bracey45491622013-03-13 03:12:21 +020027 if ! $base_present
28 then
29 cp -- "$LOCAL" "$BASE"
30 create_virtual_base "$BASE" "$REMOTE"
31 fi
Kevin Braceyc699a7c2013-03-13 03:12:20 +020032 "$merge_tool_path" "$BASE" "$REMOTE" "$LOCAL" "$MERGED"
David Aguilarbc7a96a2011-08-18 00:23:46 -070033}
David Aguilar950b5682012-12-26 16:45:29 -080034
35create_empty_file () {
36 empty_file="${TMPDIR:-/tmp}/git-difftool-p4merge-empty-file.$$"
37 >"$empty_file"
38
David Aguilard272c842013-02-09 17:21:25 -080039 printf "%s" "$empty_file"
David Aguilar950b5682012-12-26 16:45:29 -080040}
Fernando Ramos980145f2022-03-30 21:19:09 +020041
42merge_cmd_help () {
43 echo "Use HelixCore P4Merge (requires a graphical session)"
44}