Mercurial > python-hglib
annotate tests/test_diff.py @ 227:484b56ac4aec default tip
hglib: cat accepts a template argument
author | Julien Cristau <jcristau@mozilla.com> |
---|---|
date | Mon, 17 Jun 2024 17:17:58 +0200 |
parents | a2afbf236ca8 |
children |
rev | line source |
---|---|
148
c1b966866ed7
hglib: make all imports absolute (issue4520)
Brett Cannon <brett@python.org>
parents:
143
diff
changeset
|
1 from tests 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 | 3 |
4 class test_diff(common.basetest): | |
5 def test_basic(self): | |
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 | 9 --- /dev/null |
10 +++ b/a | |
11 @@ -0,0 +1,1 @@ | |
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 """) |
221
a2afbf236ca8
hglib tests: remove deprecated constructions
Mathias De Mare <mathias.de_mare@nokia.com>
parents:
219
diff
changeset
|
14 self.assertEqual(diff1, self.client.diff(nodates=True)) |
a2afbf236ca8
hglib tests: remove deprecated constructions
Mathias De Mare <mathias.de_mare@nokia.com>
parents:
219
diff
changeset
|
15 self.assertEqual(diff1, self.client.diff([b('a')], 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
|
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 | 18 --- /dev/null |
19 +++ b/a | |
20 @@ -0,0 +1,1 @@ | |
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 """) |
221
a2afbf236ca8
hglib tests: remove deprecated constructions
Mathias De Mare <mathias.de_mare@nokia.com>
parents:
219
diff
changeset
|
23 self.assertEqual(diff2, self.client.diff(change=rev0, nodates=True)) |
37 | 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 | 27 --- a/a |
28 +++ b/a | |
29 @@ -1,1 +1,2 @@ | |
30 a | |
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 """) |
221
a2afbf236ca8
hglib tests: remove deprecated constructions
Mathias De Mare <mathias.de_mare@nokia.com>
parents:
219
diff
changeset
|
33 self.assertEqual(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 | 36 --- a/a |
37 +++ b/a | |
38 @@ -1,1 +1,2 @@ | |
39 a | |
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 """) |
221
a2afbf236ca8
hglib tests: remove deprecated constructions
Mathias De Mare <mathias.de_mare@nokia.com>
parents:
219
diff
changeset
|
42 self.assertEqual(diff4, self.client.diff(revs=[rev0, rev1], |
134 | 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): |
221
a2afbf236ca8
hglib tests: remove deprecated constructions
Mathias De Mare <mathias.de_mare@nokia.com>
parents:
219
diff
changeset
|
46 with open('.hg/hgrc', 'a') as f: |
a2afbf236ca8
hglib tests: remove deprecated constructions
Mathias De Mare <mathias.de_mare@nokia.com>
parents:
219
diff
changeset
|
47 f.write('[defaults]\ndiff=--git\n') |
105
86ff8611a8fa
client: always set HGPLAIN=1 (issue3502)
Siddharth Agarwal <sid0@fb.com>
parents:
37
diff
changeset
|
48 self.test_basic() |