# HG changeset patch # User Yuya Nishihara # Date 1398736960 -32400 # Node ID a2f4ea82d6d36bf5e8256bac5c5f098f749fbd61 # Parent 2606e7f227f679e63373ab399dc4e4ac65d13713 match: fix NameError 'pat' on overflow of regex pattern length 'pat' was renamed to 'regex' in 9d28fd795215. diff -r 2606e7f227f6 -r a2f4ea82d6d3 mercurial/match.py --- a/mercurial/match.py Sun Apr 27 15:09:48 2014 +0900 +++ b/mercurial/match.py Tue Apr 29 11:02:40 2014 +0900 @@ -343,7 +343,7 @@ raise regexa, a = _buildregexmatch(kindpats[:l//2], globsuffix) regexb, b = _buildregexmatch(kindpats[l//2:], globsuffix) - return pat, lambda s: a(s) or b(s) + return regex, lambda s: a(s) or b(s) except re.error: for k, p in kindpats: try: diff -r 2606e7f227f6 -r a2f4ea82d6d3 tests/test-walk.t --- a/tests/test-walk.t Sun Apr 27 15:09:48 2014 +0900 +++ b/tests/test-walk.t Tue Apr 29 11:02:40 2014 +0900 @@ -331,3 +331,14 @@ f mammals/skunk mammals/skunk exact $ cd .. + +Test split patterns on overflow + + $ cd t + $ echo fennel > overflow.list + $ python -c "for i in xrange(20000 / 100): print 'x' * 100" >> overflow.list + $ echo fenugreek >> overflow.list + $ hg debugwalk 'listfile:overflow.list' 2>&1 | grep -v '^xxx' + f fennel fennel exact + f fenugreek fenugreek exact + $ cd ..