mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
Merge with crew-stable.
This commit is contained in:
commit
0bf2bda86a
@ -66,6 +66,8 @@ class dirstate(object):
|
||||
syntaxes = {'re': 'relre:', 'regexp': 'relre:', 'glob': 'relglob:'}
|
||||
def parselines(fp):
|
||||
for line in fp:
|
||||
if not line.endswith('\n'):
|
||||
line += '\n'
|
||||
escape = False
|
||||
for i in xrange(len(line)):
|
||||
if escape: escape = False
|
||||
|
@ -1,6 +1,25 @@
|
||||
#!/bin/sh
|
||||
|
||||
hg init
|
||||
|
||||
# Test issue 562: .hgignore requires newline at end
|
||||
touch foo
|
||||
touch bar
|
||||
touch baz
|
||||
cat > makeignore.py <<EOF
|
||||
f = open(".hgignore", "w")
|
||||
f.write("ignore\n")
|
||||
f.write("foo\n")
|
||||
# No EOL here
|
||||
f.write("bar")
|
||||
f.close()
|
||||
EOF
|
||||
|
||||
python makeignore.py
|
||||
echo % should display baz only
|
||||
hg status
|
||||
rm foo bar baz .hgignore makeignore.py
|
||||
|
||||
touch a.o
|
||||
touch a.c
|
||||
touch syntax
|
||||
|
@ -1,3 +1,5 @@
|
||||
% should display baz only
|
||||
? baz
|
||||
--
|
||||
A dir/b.o
|
||||
? a.c
|
||||
|
Loading…
Reference in New Issue
Block a user