Mercurial > python-hglib
annotate tests/test-diff.py @ 186:d06b48001662
package: update package url
Replace the package url which was pointing to the repository to the wiki page
instead. This way pypi users will directly see the basic usage and can easily
find the repository url on the wiki page.
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Wed, 19 Jul 2017 14:48:40 +0200 |
parents | c1b966866ed7 |
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 """) |
37 | 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 | 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 """) |
37 | 23 self.assertEquals(diff2, self.client.diff(change=rev0, nodates=True)) |
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 """) |
37 | 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 | 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 """) |
134 | 42 self.assertEquals(diff4, self.client.diff(revs=[rev0, rev1], |
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() |