1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
|
import common
import hglib
class test_summary(common.basetest):
def test_empty(self):
d = {'parent' : [(-1, '000000000000', 'tip', None)],
'branch' : 'default',
'commit' : True,
'update' : 0}
self.assertEquals(self.client.summary(), d)
def test_basic(self):
self.append('a', 'a')
rev, node = self.client.commit('first', addremove=True)
d = {'parent' : [(0, node[:12], 'tip', 'first')],
'branch' : 'default',
'commit' : True,
'update' : 0}
self.assertEquals(self.client.summary(), d)
def test_commit_dirty(self):
self.append('a', 'a')
rev, node = self.client.commit('first', addremove=True)
self.append('a', 'a')
d = {'parent' : [(0, node[:12], 'tip', 'first')],
'branch' : 'default',
'commit' : False,
'update' : 0}
self.assertEquals(self.client.summary(), d)
def test_update(self):
self.append('a', 'a')
rev, node = self.client.commit('first', addremove=True)
self.append('a', 'a')
self.client.commit('second')
self.client.update(0)
d = {'parent' : [(0, node[:12], None, 'first')],
'branch' : 'default',
'commit' : True,
'update' : 1}
self.assertEquals(self.client.summary(), d)
def test_remote(self):
self.append('a', 'a')
rev, node = self.client.commit('first', addremove=True)
self.client.clone(dest='other')
other = hglib.open('other')
d = {'parent' : [(0, node[:12], 'tip', 'first')],
'branch' : 'default',
'commit' : True,
'update' : 0,
'remote' : (0, 0, 0, 0)}
self.assertEquals(other.summary(remote=True), d)
self.append('a', 'a')
self.client.commit('second')
d['remote'] = (1, 0, 0, 0)
self.assertEquals(other.summary(remote=True), d)
self.client.bookmark('bm')
d['remote'] = (1, 1, 0, 0)
self.assertEquals(other.summary(remote=True), d)
other.bookmark('bmother')
d['remote'] = (1, 1, 0, 1)
if self.client.version < (2, 0, 0):
d['parent'] = [(0, node[:12], 'tip bmother', 'first')]
else:
d['bookmarks'] = '*bmother'
self.assertEquals(other.summary(remote=True), d)
self.append('other/a', 'a')
rev, node = other.commit('second in other')
d['remote'] = (1, 1, 1, 1)
if self.client.version < (2, 0, 0):
tags = 'tip bmother'
else:
tags = 'tip'
d['parent'] = [(1, node[:12], tags, 'second in other')]
self.assertEquals(other.summary(remote=True), d)
def test_two_parents(self):
self.append('a', 'a')
rev0, node = self.client.commit('first', addremove=True)
self.append('a', 'a')
rev1, node1 = self.client.commit('second')
self.client.update(rev0)
self.append('b', 'a')
rev2, node2 = self.client.commit('third', addremove=True)
self.client.merge(rev1)
d = {'parent' : [(2, node2[:12], 'tip', 'third'),
(1, node1[:12], None, 'second')],
'branch' : 'default',
'commit' : False,
'update' : 0}
self.assertEquals(self.client.summary(), d)
|
