Mercurial > public > mercurial-scm > python-hglib

comparison tests/test-summary.py @ 88:3bbf6a3266f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-summary: fix test due to bookmarks being separated from tags in hg >= 2.0
author Idan Kamara <idankk86@gmail.com>
date Fri, 18 Nov 2011 00:49:47 +0200
parents c52383a550fb
children 4359cabcb0cc
comparison
equal deleted inserted replaced
87:5661d5f7e39b 88:3bbf6a3266f4
72 d['remote'] = (1, 1, 0, 0) 72 d['remote'] = (1, 1, 0, 0)
73 self.assertEquals(other.summary(remote=True), d) 73 self.assertEquals(other.summary(remote=True), d)
74 74
75 other.bookmark('bmother') 75 other.bookmark('bmother')
76 d['remote'] = (1, 1, 0, 1) 76 d['remote'] = (1, 1, 0, 1)
77 d['parent'] = [(0, node[:12], 'tip bmother', 'first')] 77 if self.client.version < (2, 0, 0):
78 d['parent'] = [(0, node[:12], 'tip bmother', 'first')]
79 else:
80 d['bookmarks'] = '*bmother'
78 self.assertEquals(other.summary(remote=True), d) 81 self.assertEquals(other.summary(remote=True), d)
79 82
80 self.append('other/a', 'a') 83 self.append('other/a', 'a')
81 rev, node = other.commit('second in other') 84 rev, node = other.commit('second in other')
82 85
83 d['remote'] = (1, 1, 1, 1) 86 d['remote'] = (1, 1, 1, 1)
84 d['parent'] = [(1, node[:12], 'tip bmother', 'second in other')] 87 if self.client.version < (2, 0, 0):
88 tags = 'tip bmother'
89 else:
90 tags = 'tip'
91 d['parent'] = [(1, node[:12], tags, 'second in other')]
85 92
86 self.assertEquals(other.summary(remote=True), d) 93 self.assertEquals(other.summary(remote=True), d)
87 94
88 def test_two_parents(self): 95 def test_two_parents(self):
89 self.append('a', 'a') 96 self.append('a', 'a')