Mercurial > hg > pyhgsh
diff mercurial/hg.py @ 419:28511fc21073
[PATCH] file seperator handling for the other 'OS'
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] file seperator handling for the other 'OS'
From: K Thananchayan <thananck@yahoo.com>
The following patch maintains repo root relative source file names in
canonical form (with '/' as file seperator).
Mercurial calls os.path.join, os.path.normpath, os.path.walk that use
platform's file seperator. This patch does not change seperator in
these circumstances (except when the result refer to source files).
manifest hash: 2fbb4cb0d3d0bc4f4de5c7c8803fb738072ec6c5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCuNuBywK+sNU5EO8RAhAZAKCV8cz11+rdof9n1tHb0uDScF34GgCeITNi
4aVikToPXqXyReN9kFP5pnY=
=xcV5
-----END PGP SIGNATURE-----
| author | mpm@selenic.com |
|---|---|
| date | Tue, 21 Jun 2005 19:31:13 -0800 |
| parents | 0446f698d38e |
| children | dbe86d465e09 |
line wrap: on
line diff
--- a/mercurial/hg.py Tue Jun 21 19:28:53 2005 -0800 +++ b/mercurial/hg.py Tue Jun 21 19:31:13 2005 -0800 @@ -6,6 +6,7 @@ # of the GNU General Public License, incorporated herein by reference. import sys, struct, os +import util from revlog import * from demandload import * demandload(globals(), "re lock urllib urllib2 transaction time socket") @@ -389,7 +390,7 @@ l = file(self.wjoin(".hgignore")) for pat in l: if pat != "\n": - self.ignorelist.append(re.compile(pat[:-1])) + self.ignorelist.append(re.compile(util.pconvert(pat[:-1]))) except IOError: pass for pat in self.ignorelist: if pat.search(f): return True @@ -639,7 +640,7 @@ if ".hg" in subdirs: subdirs.remove(".hg") for f in files: - fn = os.path.join(d, f) + fn = util.pconvert(os.path.join(d, f)) try: s = os.stat(os.path.join(self.root, fn)) except: continue if fn in dc: