diff hgext/extdiff.py @ 7570:e05aa73ce2b7

use repo.wjoin(f) instead of os.path.join(repo.root, f)
author Martin Geisler <mg@daimi.au.dk>
date Fri, 02 Jan 2009 22:53:33 +0100
parents bd979854a388
children 7bf7c073375e
line wrap: on
line diff
--- a/hgext/extdiff.py	Wed Dec 31 18:00:35 2008 -0600
+++ b/hgext/extdiff.py	Fri Jan 02 22:53:33 2009 +0100
@@ -80,9 +80,7 @@
     '''snapshot files from working directory.
     if not using snapshot, -I/-X does not work and recursive diff
     in tools like kdiff3 and meld displays too many files.'''
-    repo_root = repo.root
-
-    dirname = os.path.basename(repo_root)
+    dirname = os.path.basename(repo.root)
     if dirname == "":
         dirname = "root"
     base = os.path.join(tmproot, dirname)
@@ -105,8 +103,7 @@
             fp.write(chunk)
         fp.close()
 
-        fns_and_mtime.append((dest, os.path.join(repo_root, fn),
-            os.path.getmtime(dest)))
+        fns_and_mtime.append((dest, repo.wjoin(fn), os.path.getmtime(dest)))
 
 
     return dirname, fns_and_mtime