# HG changeset patch
# User jfh <jason@jasonfharris.com>
# Date 2011-03-21 16:03:16
# Node ID 5c0e1222e7c07c4ca3e26ad2f3e2a06f58f57e71
# Parent  043238abda949cb36909ecca0bc9a149f2c65f81

extdiff: use absolute paths for any temporary files

This allows the use of p4merge amongst possible other external tools.

diff --git a/hgext/extdiff.py b/hgext/extdiff.py
--- a/hgext/extdiff.py
+++ b/hgext/extdiff.py
@@ -187,14 +187,14 @@ def dodiff(ui, repo, diffcmd, diffopts, 
         # Handle bogus modifies correctly by checking if the files exist
         if len(common) == 1:
             common_file = util.localpath(common.pop())
-            dir1a = os.path.join(dir1a, common_file)
+            dir1a = os.path.join(tmproot, dir1a, common_file)
             label1a = common_file + rev1a
-            if not os.path.isfile(os.path.join(tmproot, dir1a)):
+            if not os.path.isfile(dir1a):
                 dir1a = os.devnull
             if do3way:
-                dir1b = os.path.join(dir1b, common_file)
+                dir1b = os.path.join(tmproot, dir1b, common_file)
                 label1b = common_file + rev1b
-                if not os.path.isfile(os.path.join(tmproot, dir1b)):
+                if not os.path.isfile(dir1b):
                     dir1b = os.devnull
             dir2 = os.path.join(dir2root, dir2, common_file)
             label2 = common_file + rev2