Mercurial > public > mercurial-scm > python-hglib

comparison tests/test-merge.py @ 143:4359cabcb0cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hglib: move string literals in the test code to util.b() (issue4520)
author Brett Cannon <brett@python.org>
date Mon, 09 Mar 2015 18:26:25 -0400
parents ebcc5d7dd528
children c1b966866ed7
comparison
equal deleted inserted replaced
142:fe74d5599539 143:4359cabcb0cc
1 import common, hglib 1 import common, hglib
2 from hglib.util import b
2 3
3 class test_merge(common.basetest): 4 class test_merge(common.basetest):
4 def setUp(self): 5 def setUp(self):
5 common.basetest.setUp(self) 6 common.basetest.setUp(self)
6 7
7 self.append('a', 'a') 8 self.append('a', 'a')
8 rev, self.node0 = self.client.commit('first', addremove=True) 9 rev, self.node0 = self.client.commit(b('first'), addremove=True)
9 10
10 self.append('a', 'a') 11 self.append('a', 'a')
11 rev, self.node1 = self.client.commit('change') 12 rev, self.node1 = self.client.commit(b('change'))
12 13
13 def test_basic(self): 14 def test_basic(self):
14 self.client.update(self.node0) 15 self.client.update(self.node0)
15 self.append('b', 'a') 16 self.append('b', 'a')
16 rev, node2 = self.client.commit('new file', addremove=True) 17 rev, node2 = self.client.commit(b('new file'), addremove=True)
17 self.client.merge(self.node1) 18 self.client.merge(self.node1)
18 rev, node = self.client.commit('merge') 19 rev, node = self.client.commit(b('merge'))
19 diff = """diff -r %s -r %s a 20 diff = b("diff -r ") + node2[:12] + b(" -r ") + node[:12] + b(""" a
20 --- a/a 21 --- a/a
21 +++ b/a 22 +++ b/a
22 @@ -1,1 +1,1 @@ 23 @@ -1,1 +1,1 @@
23 -a 24 -a
24 \ No newline at end of file 25 \ No newline at end of file
25 +aa 26 +aa
26 \ No newline at end of file 27 \ No newline at end of file
27 """ % (node2[:12], node[:12]) 28 """)
28 29
29 self.assertEquals(diff, self.client.diff(change=node, nodates=True)) 30 self.assertEquals(diff, self.client.diff(change=node, nodates=True))
30 31
31 def test_merge_prompt_abort(self): 32 def test_merge_prompt_abort(self):
32 self.client.update(self.node0) 33 self.client.update(self.node0)
33 self.client.remove('a') 34 self.client.remove(b('a'))
34 self.client.commit('remove') 35 self.client.commit(b('remove'))
35 36
36 self.assertRaises(hglib.error.CommandError, self.client.merge) 37 self.assertRaises(hglib.error.CommandError, self.client.merge)
37 38
38 def test_merge_prompt_noninteractive(self): 39 def test_merge_prompt_noninteractive(self):
39 self.client.update(self.node0) 40 self.client.update(self.node0)
40 self.client.remove('a') 41 self.client.remove(b('a'))
41 rev, node = self.client.commit('remove') 42 rev, node = self.client.commit(b('remove'))
42 43
43 self.client.merge(cb=hglib.merge.handlers.noninteractive) 44 self.client.merge(cb=hglib.merge.handlers.noninteractive)
44 45
45 diff = """diff -r %s a 46 diff = b("diff -r ") + node[:12] + b(""" a
46 --- /dev/null 47 --- /dev/null
47 +++ b/a 48 +++ b/a
48 @@ -0,0 +1,1 @@ 49 @@ -0,0 +1,1 @@
49 +aa 50 +aa
50 \ No newline at end of file 51 \ No newline at end of file
51 """ % node[:12] 52 """)
52 self.assertEquals(diff, self.client.diff(nodates=True)) 53 self.assertEquals(diff, self.client.diff(nodates=True))
53 54
54 def test_merge_prompt_cb(self): 55 def test_merge_prompt_cb(self):
55 self.client.update(self.node0) 56 self.client.update(self.node0)
56 self.client.remove('a') 57 self.client.remove(b('a'))
57 rev, node = self.client.commit('remove') 58 rev, node = self.client.commit(b('remove'))
58 59
59 def cb(output): 60 def cb(output):
60 return 'c' 61 return b('c')
61 62
62 self.client.merge(cb=cb) 63 self.client.merge(cb=cb)
63 64
64 diff = """diff -r %s a 65 diff = b("diff -r ") + node[:12] + b(""" a
65 --- /dev/null 66 --- /dev/null
66 +++ b/a 67 +++ b/a
67 @@ -0,0 +1,1 @@ 68 @@ -0,0 +1,1 @@
68 +aa 69 +aa
69 \ No newline at end of file 70 \ No newline at end of file
70 """ % node[:12] 71 """)
71 self.assertEquals(diff, self.client.diff(nodates=True)) 72 self.assertEquals(diff, self.client.diff(nodates=True))