mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 00:14:35 +03:00
merge with crew-stable
This commit is contained in:
commit
1640028059
@ -57,10 +57,13 @@ def ignore(root, files, warn):
|
||||
warn(_("%s: ignoring invalid syntax '%s'\n") % (f, s))
|
||||
continue
|
||||
pat = syntax + line
|
||||
for s in syntaxes.values():
|
||||
if line.startswith(s):
|
||||
for s, rels in syntaxes.items():
|
||||
if line.startswith(rels):
|
||||
pat = line
|
||||
break
|
||||
elif line.startswith(s+':'):
|
||||
pat = rels + line[len(s)+1:]
|
||||
break
|
||||
pats[f].append(pat)
|
||||
except IOError, inst:
|
||||
if f != files[0]:
|
||||
|
@ -40,12 +40,15 @@ echo "--" ; hg status 2>&1 | sed -e 's/abort: .*\.hgignore:/abort: .hgignore:/'
|
||||
echo ".*\.o" > .hgignore
|
||||
echo "--" ; hg status
|
||||
|
||||
# XXX: broken
|
||||
#echo "glob:**.o" > .hgignore
|
||||
#echo "--" ; hg status
|
||||
#
|
||||
#echo "glob:*.o" > .hgignore
|
||||
#echo "--" ; hg status
|
||||
echo "glob:**.o" > .hgignore
|
||||
echo "--" ; hg status
|
||||
|
||||
echo "glob:*.o" > .hgignore
|
||||
echo "--" ; hg status
|
||||
|
||||
echo "syntax: glob" > .hgignore
|
||||
echo "re:.*\.o" >> .hgignore
|
||||
echo "--" ; hg status
|
||||
|
||||
echo "syntax: invalid" > .hgignore
|
||||
echo "--" ; hg status 2>&1 | sed -e 's/.*\.hgignore:/.hgignore:/'
|
||||
|
@ -14,6 +14,21 @@ A dir/b.o
|
||||
? a.c
|
||||
? syntax
|
||||
--
|
||||
A dir/b.o
|
||||
? .hgignore
|
||||
? a.c
|
||||
? syntax
|
||||
--
|
||||
A dir/b.o
|
||||
? .hgignore
|
||||
? a.c
|
||||
? syntax
|
||||
--
|
||||
A dir/b.o
|
||||
? .hgignore
|
||||
? a.c
|
||||
? syntax
|
||||
--
|
||||
.hgignore: ignoring invalid syntax 'invalid'
|
||||
A dir/b.o
|
||||
? .hgignore
|
||||
|
Loading…
Reference in New Issue
Block a user