equal
deleted
inserted
replaced
1 from __future__ import absolute_import |
1 from __future__ import absolute_import |
2 |
2 |
3 import unittest |
3 import unittest |
4 from mercurial import error, mdiff |
4 from mercurial import error, mdiff |
|
5 from mercurial.utils import stringutil |
5 |
6 |
6 # for readability, line numbers are 0-origin |
7 # for readability, line numbers are 0-origin |
7 text1 = b''' |
8 text1 = b''' |
8 00 at OLD |
9 00 at OLD |
9 01 at OLD |
10 01 at OLD |
226 # Could be `with self.assertRaises(error.Abort)` but python2.6 |
227 # Could be `with self.assertRaises(error.Abort)` but python2.6 |
227 # does not have assertRaises context manager. |
228 # does not have assertRaises context manager. |
228 try: |
229 try: |
229 mdiff.blocksinrange(self.blocks, linerange2) |
230 mdiff.blocksinrange(self.blocks, linerange2) |
230 except exctype as exc: |
231 except exctype as exc: |
231 self.assertTrue('line range exceeds file size' in str(exc)) |
232 self.assertTrue( |
|
233 b'line range exceeds file size' |
|
234 in stringutil.forcebytestr(exc) |
|
235 ) |
232 else: |
236 else: |
233 self.fail('%s not raised' % exctype.__name__) |
237 self.fail('%s not raised' % exctype.__name__) |
234 |
238 |
235 |
239 |
236 if __name__ == '__main__': |
240 if __name__ == '__main__': |