annotate tests/test-diff.py @ 147:98829bf71f10

util: define BytesIO in one place
author Matt Mackall <mpm@selenic.com>
date Fri, 13 Mar 2015 12:28:06 -0500
parents 4359cabcb0cc
children c1b966866ed7
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
37
5506a241c826 client: add diff command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
1 import common
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 134
diff changeset
2 from hglib.util import b
37
5506a241c826 client: add diff command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
3
5506a241c826 client: add diff command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
4 class test_diff(common.basetest):
5506a241c826 client: add diff command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
5 def test_basic(self):
5506a241c826 client: add diff command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
6 self.append('a', 'a\n')
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 134
diff changeset
7 self.client.add(b('a'))
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 134
diff changeset
8 diff1 = b("""diff -r 000000000000 a
37
5506a241c826 client: add diff command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
9 --- /dev/null
5506a241c826 client: add diff command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
10 +++ b/a
5506a241c826 client: add diff command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
11 @@ -0,0 +1,1 @@
5506a241c826 client: add diff command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
12 +a
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 134
diff changeset
13 """)
37
5506a241c826 client: add diff command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
14 self.assertEquals(diff1, self.client.diff(nodates=True))
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 134
diff changeset
15 self.assertEquals(diff1, self.client.diff([b('a')], nodates=True))
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 134
diff changeset
16 rev0, node0 = self.client.commit(b('first'))
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 134
diff changeset
17 diff2 = b("""diff -r 000000000000 -r """) + node0[:12] + b(""" a
37
5506a241c826 client: add diff command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
18 --- /dev/null
5506a241c826 client: add diff command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
19 +++ b/a
5506a241c826 client: add diff command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
20 @@ -0,0 +1,1 @@
5506a241c826 client: add diff command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
21 +a
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 134
diff changeset
22 """)
37
5506a241c826 client: add diff command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
23 self.assertEquals(diff2, self.client.diff(change=rev0, nodates=True))
5506a241c826 client: add diff command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
24 self.append('a', 'a\n')
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 134
diff changeset
25 rev1, node1 = self.client.commit(b('second'))
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 134
diff changeset
26 diff3 = b("""diff -r """) + node0[:12] + b(""" a
37
5506a241c826 client: add diff command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
27 --- a/a
5506a241c826 client: add diff command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
28 +++ b/a
5506a241c826 client: add diff command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
29 @@ -1,1 +1,2 @@
5506a241c826 client: add diff command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
30 a
5506a241c826 client: add diff command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
31 +a
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 134
diff changeset
32 """)
37
5506a241c826 client: add diff command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
33 self.assertEquals(diff3, self.client.diff(revs=[rev0], nodates=True))
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 134
diff changeset
34 diff4 = b("""diff -r """) + node0[:12] + b(" -r ") + node1[:12] + b(
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 134
diff changeset
35 """ a
37
5506a241c826 client: add diff command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
36 --- a/a
5506a241c826 client: add diff command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
37 +++ b/a
5506a241c826 client: add diff command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
38 @@ -1,1 +1,2 @@
5506a241c826 client: add diff command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
39 a
5506a241c826 client: add diff command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
40 +a
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 134
diff changeset
41 """)
134
1b47146a4a2c style: fix long lines
Matt Mackall <mpm@selenic.com>
parents: 105
diff changeset
42 self.assertEquals(diff4, self.client.diff(revs=[rev0, rev1],
1b47146a4a2c style: fix long lines
Matt Mackall <mpm@selenic.com>
parents: 105
diff changeset
43 nodates=True))
105
86ff8611a8fa client: always set HGPLAIN=1 (issue3502)
Siddharth Agarwal <sid0@fb.com>
parents: 37
diff changeset
44
86ff8611a8fa client: always set HGPLAIN=1 (issue3502)
Siddharth Agarwal <sid0@fb.com>
parents: 37
diff changeset
45 def test_basic_plain(self):
86ff8611a8fa client: always set HGPLAIN=1 (issue3502)
Siddharth Agarwal <sid0@fb.com>
parents: 37
diff changeset
46 open('.hg/hgrc', 'a').write('[defaults]\ndiff=--git\n')
86ff8611a8fa client: always set HGPLAIN=1 (issue3502)
Siddharth Agarwal <sid0@fb.com>
parents: 37
diff changeset
47 self.test_basic()