Mercurial > hg > mercurial-crew-with-dirclash
view mercurial/osutil.py @ 5429:77cafe8f89e0
findcopies: fix rename bug
We've fiddled with this line several times, and an old bug has
reappeared from it. Let's take a peek at the history.
The original "or" (rev 3674, in 0.9.2 and 0.9.3):
http://www.selenic.com/hg/rev/9103dab96093
Then I changed it to an "and" to fix a bug (rev 4304):
http://www.selenic.com/hg/rev/4787e2b0dd03
Then for reasons now lost in the mists of time, I dropped half (rev 4399):
http://www.selenic.com/hg/rev/93652499bed3
Then we added back the "or" (rev 4416, in 0.9.4):
http://www.selenic.com/hg/rev/bb1800a7d7e1
So it seems it ought to be "and".
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 08 Oct 2007 18:47:22 -0500 |
parents | 5105b119edd2 |
children |
line wrap: on
line source
import os, stat def _mode_to_kind(mode): if stat.S_ISREG(mode): return stat.S_IFREG if stat.S_ISDIR(mode): return stat.S_IFDIR if stat.S_ISLNK(mode): return stat.S_IFLNK if stat.S_ISBLK(mode): return stat.S_IFBLK if stat.S_ISCHR(mode): return stat.S_IFCHR if stat.S_ISFIFO(mode): return stat.S_IFIFO if stat.S_ISSOCK(mode): return stat.S_IFSOCK return mode def listdir(path, stat=False): '''listdir(path, stat=False) -> list_of_tuples Return a sorted list containing information about the entries in the directory. If stat is True, each element is a 3-tuple: (name, type, stat object) Otherwise, each element is a 2-tuple: (name, type) ''' result = [] prefix = path + os.sep names = os.listdir(path) names.sort() for fn in names: st = os.lstat(prefix + fn) if stat: result.append((fn, _mode_to_kind(st.st_mode), st)) else: result.append((fn, _mode_to_kind(st.st_mode))) return result