diff mercurial/hg.py @ 64:b3e2ddff0159

Diff in subdirectories from Jake Edge Dates in diff Fix O(n^2) behaviour of manifest diff Add a/ and b/ to work with patch -p1
author mpm@selenic.com
date Thu, 12 May 2005 17:54:55 -0800
parents e32fdbd97839
children d40cc5aacc31
line wrap: on
line diff
--- a/mercurial/hg.py	Thu May 12 01:23:51 2005 -0800
+++ b/mercurial/hg.py	Thu May 12 17:54:55 2005 -0800
@@ -499,7 +499,7 @@
             dc = dict.fromkeys(mf)
 
         def fcmp(fn):
-            t1 = file(fn).read()
+            t1 = file(os.path.join(self.root, fn)).read()
             t2 = self.file(fn).revision(mf[fn])
             return cmp(t1, t2)
 
@@ -509,7 +509,7 @@
             
             for f in files:
                 fn = os.path.join(d, f)
-                try: s = os.stat(fn)
+                try: s = os.stat(os.path.join(self.root, fn))
                 except: continue
                 if fn in dc:
                     c = dc[fn]