Mercurial > public > mercurial-scm > python-hglib

comparison tests/test_diff.py @ 221:a2afbf236ca8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hglib tests: remove deprecated constructions This mostly removes usage of 'assertEquals' (replaced with 'assertEqual'), as well as opening files without closing them (fixed using a 'with' statement).
author Mathias De Mare <mathias.de_mare@nokia.com>
date Thu, 09 Mar 2023 14:00:02 +0100
parents 8341f2494b3f
children
comparison
equal deleted inserted replaced
220:ae6427d1c8f7 221:a2afbf236ca8
9 --- /dev/null 9 --- /dev/null
10 +++ b/a 10 +++ b/a
11 @@ -0,0 +1,1 @@ 11 @@ -0,0 +1,1 @@
12 +a 12 +a
13 """) 13 """)
14 self.assertEquals(diff1, self.client.diff(nodates=True)) 14 self.assertEqual(diff1, self.client.diff(nodates=True))
15 self.assertEquals(diff1, self.client.diff([b('a')], nodates=True)) 15 self.assertEqual(diff1, self.client.diff([b('a')], nodates=True))
16 rev0, node0 = self.client.commit(b('first')) 16 rev0, node0 = self.client.commit(b('first'))
17 diff2 = b("""diff -r 000000000000 -r """) + node0[:12] + b(""" a 17 diff2 = b("""diff -r 000000000000 -r """) + node0[:12] + b(""" a
18 --- /dev/null 18 --- /dev/null
19 +++ b/a 19 +++ b/a
20 @@ -0,0 +1,1 @@ 20 @@ -0,0 +1,1 @@
21 +a 21 +a
22 """) 22 """)
23 self.assertEquals(diff2, self.client.diff(change=rev0, nodates=True)) 23 self.assertEqual(diff2, self.client.diff(change=rev0, nodates=True))
24 self.append('a', 'a\n') 24 self.append('a', 'a\n')
25 rev1, node1 = self.client.commit(b('second')) 25 rev1, node1 = self.client.commit(b('second'))
26 diff3 = b("""diff -r """) + node0[:12] + b(""" a 26 diff3 = b("""diff -r """) + node0[:12] + b(""" a
27 --- a/a 27 --- a/a
28 +++ b/a 28 +++ b/a
29 @@ -1,1 +1,2 @@ 29 @@ -1,1 +1,2 @@
30 a 30 a
31 +a 31 +a
32 """) 32 """)
33 self.assertEquals(diff3, self.client.diff(revs=[rev0], nodates=True)) 33 self.assertEqual(diff3, self.client.diff(revs=[rev0], nodates=True))
34 diff4 = b("""diff -r """) + node0[:12] + b(" -r ") + node1[:12] + b( 34 diff4 = b("""diff -r """) + node0[:12] + b(" -r ") + node1[:12] + b(
35 """ a 35 """ a
36 --- a/a 36 --- a/a
37 +++ b/a 37 +++ b/a
38 @@ -1,1 +1,2 @@ 38 @@ -1,1 +1,2 @@
39 a 39 a
40 +a 40 +a
41 """) 41 """)
42 self.assertEquals(diff4, self.client.diff(revs=[rev0, rev1], 42 self.assertEqual(diff4, self.client.diff(revs=[rev0, rev1],
43 nodates=True)) 43 nodates=True))
44 44
45 def test_basic_plain(self): 45 def test_basic_plain(self):
46 open('.hg/hgrc', 'a').write('[defaults]\ndiff=--git\n') 46 with open('.hg/hgrc', 'a') as f:
47 f.write('[defaults]\ndiff=--git\n')
47 self.test_basic() 48 self.test_basic()