##// END OF EJS Templates
mq: Fix --qrefresh --short to work with --exclude and --include...
mq: Fix --qrefresh --short to work with --exclude and --include pmezard expects hg qref -s -X b to apply the -X to the list of files in the patch, and thus remove b from the patch. That's how it worked before f7fc5f5ecd62. That change seemed sensible, but it wasn't... mpm says (17:22:30) pmezard_: kiilerix1: do you mean that -X should be forbidden with -s ? (17:22:54) pmezard_: kiilerix1: and --include too (17:23:03) mpm: No because you should be able to say hg qref -s foo* -X foo-bar so mpm expects hg qref -s -X b * to apply the -X to the list of files in the working directory, and thus don't include b in the patch This patch tries to make both usecases work by creating a matchfn which uses the include/excludes but not the filelist.

File last commit:

r7057:094af6ee default
r7177:09ed32b7 default
Show More
osutil.py
40 lines | 1.1 KiB | text/x-python | PythonLexer
Benoit Boissinot
fix conflicting variables when no native osutil is available...
r7057 import os
import stat as _stat
Bryan O'Sullivan
Add osutil module, containing a listdir function....
r5396
def _mode_to_kind(mode):
Benoit Boissinot
fix conflicting variables when no native osutil is available...
r7057 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
Bryan O'Sullivan
Add osutil module, containing a listdir function....
r5396 return mode
Matt Mackall
listdir: add support for aborting if a certain path is found...
r7034 def listdir(path, stat=False, skip=None):
Bryan O'Sullivan
Add osutil module, containing a listdir function....
r5396 '''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)
Benoit Boissinot
fix conflicting variables when no native osutil is available...
r7057 if fn == skip and _stat.S_ISDIR(st.st_mode):
Matt Mackall
listdir: add support for aborting if a certain path is found...
r7034 return []
Bryan O'Sullivan
Add osutil module, containing a listdir function....
r5396 if stat:
result.append((fn, _mode_to_kind(st.st_mode), st))
else:
result.append((fn, _mode_to_kind(st.st_mode)))
return result