mercurial: comparison tests/test-simplemerge.py

equal deleted inserted replaced

-:a3ed6e7217c1
+:c1bc196e021d
 Given BASE, OTHER, THIS, tries to produce a combined text
 incorporating the changes from both BASE->OTHER and BASE->THIS.
 All three will typically be sequences of lines."""
 def __init__(self, base, a, b):
-basetext = '\n'.join([i.strip('\n') for i in base] + [''])
+basetext = b'\n'.join([i.strip(b'\n') for i in base] + [b''])
-atext = '\n'.join([i.strip('\n') for i in a] + [''])
+atext = b'\n'.join([i.strip(b'\n') for i in a] + [b''])
-btext = '\n'.join([i.strip('\n') for i in b] + [''])
+btext = b'\n'.join([i.strip(b'\n') for i in b] + [b''])
 if (stringutil.binary(basetext) or stringutil.binary(atext)
 or stringutil.binary(btext)):
-raise error.Abort("don't know how to merge binary files")
+raise error.Abort(b"don't know how to merge binary files")
 simplemerge.Merge3Text.__init__(self, basetext, atext, btext,
 base, a, b)
 CantReprocessAndShowBase = simplemerge.CantReprocessAndShowBase
 return util.stringio(t).readlines()
 ############################################################
 # test case data from the gnu diffutils manual
 # common base
-TZU = split_lines("""     The Nameless is the origin of Heaven and Earth;
+TZU = split_lines(b"""     The Nameless is the origin of Heaven and Earth;
 The named is the mother of all things.
 Therefore let there always be non-being,
 so we may see their subtlety,
 And let there always be being,
 They both may be called deep and profound.
 Deeper and more profound,
 The door of all subtleties!
 """)
-LAO = split_lines("""     The Way that can be told of is not the eternal Way;
+LAO = split_lines(b"""     The Way that can be told of is not the eternal Way;
 The name that can be named is not the eternal name.
 The Nameless is the origin of Heaven and Earth;
 The Named is the mother of all things.
 Therefore let there always be non-being,
 so we may see their subtlety,
 But after they are produced,
 they have different names.
 """)
-TAO = split_lines("""     The Way that can be told of is not the eternal Way;
+TAO = split_lines(b"""     The Way that can be told of is not the eternal Way;
 The name that can be named is not the eternal name.
 The Nameless is the origin of Heaven and Earth;
 The named is the mother of all things.
 Therefore let there always be non-being,
 -- The Way of Lao-Tzu, tr. Wing-tsit Chan
 """)
-MERGED_RESULT = split_lines("""\
+MERGED_RESULT = split_lines(b"""\
 The Way that can be told of is not the eternal Way;
 The name that can be named is not the eternal name.
 The Nameless is the origin of Heaven and Earth;
 The Named is the mother of all things.
 Therefore let there always be non-being,
 def log(self, msg):
 pass
 def test_no_changes(self):
 """No conflicts because nothing changed"""
-m3 = Merge3(['aaa', 'bbb'],
+m3 = Merge3([b'aaa', b'bbb'],
-['aaa', 'bbb'],
+[b'aaa', b'bbb'],
-['aaa', 'bbb'])
+[b'aaa', b'bbb'])
 self.assertEqual(m3.find_unconflicted(),
 [(0, 2)])
 self.assertEqual(list(m3.find_sync_regions()),
 0, 2,
 0, 2),
 (2, 2,  2, 2,  2, 2)])
 self.assertEqual(list(m3.merge_regions()),
-[('unchanged', 0, 2)])
+[(b'unchanged', 0, 2)])
 self.assertEqual(list(m3.merge_groups()),
-[('unchanged', ['aaa', 'bbb'])])
+[(b'unchanged', [b'aaa', b'bbb'])])
 def test_front_insert(self):
-m3 = Merge3(['zz'],
+m3 = Merge3([b'zz'],
-['aaa', 'bbb', 'zz'],
+[b'aaa', b'bbb', b'zz'],
-['zz'])
+[b'zz'])
 # todo: should use a sentinel at end as from get_matching_blocks
 # to match without zz
 self.assertEqual(list(m3.find_sync_regions()),
 [(0, 1,  2, 3,  0, 1),
 (1, 1,  3, 3,  1, 1)])
 self.assertEqual(list(m3.merge_regions()),
-[('a', 0, 2),
+[(b'a', 0, 2),
-('unchanged', 0, 1)])
+(b'unchanged', 0, 1)])
 self.assertEqual(list(m3.merge_groups()),
-[('a', ['aaa', 'bbb']),
+[(b'a', [b'aaa', b'bbb']),
-('unchanged', ['zz'])])
+(b'unchanged', [b'zz'])])
 def test_null_insert(self):
 m3 = Merge3([],
-['aaa', 'bbb'],
+[b'aaa', b'bbb'],
 [])
 # todo: should use a sentinel at end as from get_matching_blocks
 # to match without zz
 self.assertEqual(list(m3.find_sync_regions()),
 [(0, 0,  2, 2,  0, 0)])
 self.assertEqual(list(m3.merge_regions()),
-[('a', 0, 2)])
+[(b'a', 0, 2)])
 self.assertEqual(list(m3.merge_lines()),
-['aaa', 'bbb'])
+[b'aaa', b'bbb'])
 def test_no_conflicts(self):
 """No conflicts because only one side changed"""
-m3 = Merge3(['aaa', 'bbb'],
+m3 = Merge3([b'aaa', b'bbb'],
-['aaa', '111', 'bbb'],
+[b'aaa', b'111', b'bbb'],
-['aaa', 'bbb'])
+[b'aaa', b'bbb'])
 self.assertEqual(m3.find_unconflicted(),
 [(0, 1), (1, 2)])
 self.assertEqual(list(m3.find_sync_regions()),
 [(0, 1,  0, 1,  0, 1),
 (1, 2,  2, 3,  1, 2),
 (2, 2,  3, 3,  2, 2)])
 self.assertEqual(list(m3.merge_regions()),
-[('unchanged', 0, 1),
+[(b'unchanged', 0, 1),
-('a', 1, 2),
+(b'a', 1, 2),
-('unchanged', 1, 2)])
+(b'unchanged', 1, 2)])
 def test_append_a(self):
-m3 = Merge3(['aaa\n', 'bbb\n'],
+m3 = Merge3([b'aaa\n', b'bbb\n'],
-['aaa\n', 'bbb\n', '222\n'],
+[b'aaa\n', b'bbb\n', b'222\n'],
-['aaa\n', 'bbb\n'])
+[b'aaa\n', b'bbb\n'])
-self.assertEqual(''.join(m3.merge_lines()),
+self.assertEqual(b''.join(m3.merge_lines()),
-'aaa\nbbb\n222\n')
+b'aaa\nbbb\n222\n')
 def test_append_b(self):
-m3 = Merge3(['aaa\n', 'bbb\n'],
+m3 = Merge3([b'aaa\n', b'bbb\n'],
-['aaa\n', 'bbb\n'],
+[b'aaa\n', b'bbb\n'],
-['aaa\n', 'bbb\n', '222\n'])
+[b'aaa\n', b'bbb\n', b'222\n'])
-self.assertEqual(''.join(m3.merge_lines()),
+self.assertEqual(b''.join(m3.merge_lines()),
-'aaa\nbbb\n222\n')
+b'aaa\nbbb\n222\n')
 def test_append_agreement(self):
-m3 = Merge3(['aaa\n', 'bbb\n'],
+m3 = Merge3([b'aaa\n', b'bbb\n'],
-['aaa\n', 'bbb\n', '222\n'],
+[b'aaa\n', b'bbb\n', b'222\n'],
-['aaa\n', 'bbb\n', '222\n'])
+[b'aaa\n', b'bbb\n', b'222\n'])
-self.assertEqual(''.join(m3.merge_lines()),
+self.assertEqual(b''.join(m3.merge_lines()),
-'aaa\nbbb\n222\n')
+b'aaa\nbbb\n222\n')
 def test_append_clash(self):
-m3 = Merge3(['aaa\n', 'bbb\n'],
+m3 = Merge3([b'aaa\n', b'bbb\n'],
-['aaa\n', 'bbb\n', '222\n'],
+[b'aaa\n', b'bbb\n', b'222\n'],
-['aaa\n', 'bbb\n', '333\n'])
+[b'aaa\n', b'bbb\n', b'333\n'])
-ml = m3.merge_lines(name_a='a',
+ml = m3.merge_lines(name_a=b'a',
-name_b='b',
+name_b=b'b',
-start_marker='<<',
+start_marker=b'<<',
-mid_marker='--',
+mid_marker=b'--',
-end_marker='>>')
+end_marker=b'>>')
-self.assertEqual(''.join(ml),
+self.assertEqual(b''.join(ml),
-'aaa\n'
+b'aaa\n'
-'bbb\n'
+b'bbb\n'
-'<< a\n'
+b'<< a\n'
-'222\n'
+b'222\n'
-'--\n'
+b'--\n'
-'333\n'
+b'333\n'
-'>> b\n'
+b'>> b\n'
 )
 def test_insert_agreement(self):
-m3 = Merge3(['aaa\n', 'bbb\n'],
+m3 = Merge3([b'aaa\n', b'bbb\n'],
-['aaa\n', '222\n', 'bbb\n'],
+[b'aaa\n', b'222\n', b'bbb\n'],
-['aaa\n', '222\n', 'bbb\n'])
+[b'aaa\n', b'222\n', b'bbb\n'])
-ml = m3.merge_lines(name_a='a',
+ml = m3.merge_lines(name_a=b'a',
-name_b='b',
+name_b=b'b',
-start_marker='<<',
+start_marker=b'<<',
-mid_marker='--',
+mid_marker=b'--',
-end_marker='>>')
+end_marker=b'>>')
-self.assertEqual(''.join(ml), 'aaa\n222\nbbb\n')
+self.assertEqual(b''.join(ml), b'aaa\n222\nbbb\n')
 def test_insert_clash(self):
 """Both try to insert lines in the same place."""
-m3 = Merge3(['aaa\n', 'bbb\n'],
+m3 = Merge3([b'aaa\n', b'bbb\n'],
-['aaa\n', '111\n', 'bbb\n'],
+[b'aaa\n', b'111\n', b'bbb\n'],
-['aaa\n', '222\n', 'bbb\n'])
+[b'aaa\n', b'222\n', b'bbb\n'])
 self.assertEqual(m3.find_unconflicted(),
 [(0, 1), (1, 2)])
 self.assertEqual(list(m3.find_sync_regions()),
 [(0, 1,  0, 1,  0, 1),
 (1, 2,  2, 3,  2, 3),
 (2, 2,  3, 3,  3, 3)])
 self.assertEqual(list(m3.merge_regions()),
-[('unchanged', 0, 1),
+[(b'unchanged', 0, 1),
-('conflict', 1, 1,  1, 2,  1, 2),
+(b'conflict', 1, 1,  1, 2,  1, 2),
-('unchanged', 1, 2)])
+(b'unchanged', 1, 2)])
 self.assertEqual(list(m3.merge_groups()),
-[('unchanged', ['aaa\n']),
+[(b'unchanged', [b'aaa\n']),
-('conflict', [], ['111\n'], ['222\n']),
+(b'conflict', [], [b'111\n'], [b'222\n']),
-('unchanged', ['bbb\n']),
+(b'unchanged', [b'bbb\n']),
 ])
-ml = m3.merge_lines(name_a='a',
+ml = m3.merge_lines(name_a=b'a',
-name_b='b',
+name_b=b'b',
-start_marker='<<',
+start_marker=b'<<',
-mid_marker='--',
+mid_marker=b'--',
-end_marker='>>')
+end_marker=b'>>')
-self.assertEqual(''.join(ml),
+self.assertEqual(b''.join(ml),
-'''aaa
+b'''aaa
 << a
 111
 --
 222
 >> b
 bbb
 ''')
 def test_replace_clash(self):
 """Both try to insert lines in the same place."""
-m3 = Merge3(['aaa', '000', 'bbb'],
+m3 = Merge3([b'aaa', b'000', b'bbb'],
-['aaa', '111', 'bbb'],
+[b'aaa', b'111', b'bbb'],
-['aaa', '222', 'bbb'])
+[b'aaa', b'222', b'bbb'])
 self.assertEqual(m3.find_unconflicted(),
 [(0, 1), (2, 3)])
 self.assertEqual(list(m3.find_sync_regions()),
 [(0, 1,  0, 1,  0, 1),
 (2, 3,  2, 3,  2, 3),
 (3, 3,  3, 3,  3, 3)])
 def test_replace_multi(self):
 """Replacement with regions of different size."""
-m3 = Merge3(['aaa', '000', '000', 'bbb'],
+m3 = Merge3([b'aaa', b'000', b'000', b'bbb'],
-['aaa', '111', '111', '111', 'bbb'],
+[b'aaa', b'111', b'111', b'111', b'bbb'],
-['aaa', '222', '222', '222', '222', 'bbb'])
+[b'aaa', b'222', b'222', b'222', b'222', b'bbb'])
 self.assertEqual(m3.find_unconflicted(),
 [(0, 1), (3, 4)])
 (4, 4,  5, 5,  6, 6)])
 def test_merge_poem(self):
 """Test case from diff3 manual"""
 m3 = Merge3(TZU, LAO, TAO)
-ml = list(m3.merge_lines('LAO', 'TAO'))
+ml = list(m3.merge_lines(b'LAO', b'TAO'))
-self.log('merge result:')
+self.log(b'merge result:')
-self.log(''.join(ml))
+self.log(b''.join(ml))
 self.assertEqual(ml, MERGED_RESULT)
 def test_binary(self):
 with self.assertRaises(error.Abort):
-Merge3(['\x00'], ['a'], ['b'])
+Merge3([b'\x00'], [b'a'], [b'b'])
 def test_dos_text(self):
-base_text = 'a\r\n'
+base_text = b'a\r\n'
-this_text = 'b\r\n'
+this_text = b'b\r\n'
-other_text = 'c\r\n'
+other_text = b'c\r\n'
 m3 = Merge3(base_text.splitlines(True), other_text.splitlines(True),
 this_text.splitlines(True))
-m_lines = m3.merge_lines('OTHER', 'THIS')
+m_lines = m3.merge_lines(b'OTHER', b'THIS')
-self.assertEqual('<<<<<<< OTHER\r\nc\r\n=======\r\nb\r\n'
+self.assertEqual(b'<<<<<<< OTHER\r\nc\r\n=======\r\nb\r\n'
-'>>>>>>> THIS\r\n'.splitlines(True), list(m_lines))
+b'>>>>>>> THIS\r\n'.splitlines(True), list(m_lines))
 def test_mac_text(self):
-base_text = 'a\r'
+base_text = b'a\r'
-this_text = 'b\r'
+this_text = b'b\r'
-other_text = 'c\r'
+other_text = b'c\r'
 m3 = Merge3(base_text.splitlines(True), other_text.splitlines(True),
 this_text.splitlines(True))
-m_lines = m3.merge_lines('OTHER', 'THIS')
+m_lines = m3.merge_lines(b'OTHER', b'THIS')
-self.assertEqual('<<<<<<< OTHER\rc\r=======\rb\r'
+self.assertEqual(b'<<<<<<< OTHER\rc\r=======\rb\r'
-'>>>>>>> THIS\r'.splitlines(True), list(m_lines))
+b'>>>>>>> THIS\r'.splitlines(True), list(m_lines))
 if __name__ == '__main__':
 # hide the timer
 import time
 orig = time.time

changeset 37892	c1bc196e021d
parent 37891	a3ed6e7217c1
child 38645	02850baddadd