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
|
from tests import common
from hglib import error
from hglib.util import b, strtobytes
class test_update(common.basetest):
def setUp(self):
common.basetest.setUp(self)
self.append('a', 'a')
self.rev0, self.node0 = self.client.commit(b('first'), addremove=True)
self.append('a', 'a')
self.rev1, self.node1 = self.client.commit(b('second'))
def test_basic(self):
u, m, r, ur = self.client.update(self.rev0)
self.assertEquals(u, 1)
self.assertEquals(m, 0)
self.assertEquals(r, 0)
self.assertEquals(ur, 0)
def test_unresolved(self):
self.client.update(self.rev0)
self.append('a', 'b')
u, m, r, ur = self.client.update()
self.assertEquals(u, 0)
self.assertEquals(m, 0)
self.assertEquals(r, 0)
self.assertEquals(ur, 1)
self.assertTrue((b('M'), b('a')) in self.client.status())
def test_merge(self):
self.append('a', '\n\n\n\nb')
rev2, node2 = self.client.commit(b('third'))
self.append('a', 'b')
self.client.commit(b('fourth'))
self.client.update(rev2)
old = open('a').read()
f = open('a', 'wb')
f.write(b('a') + old.encode('latin-1'))
f.close()
u, m, r, ur = self.client.update()
self.assertEquals(u, 0)
self.assertEquals(m, 1)
self.assertEquals(r, 0)
self.assertEquals(ur, 0)
self.assertEquals(self.client.status(), [(b('M'), b('a'))])
def test_tip(self):
self.client.update(self.rev0)
u, m, r, ur = self.client.update()
self.assertEquals(u, 1)
self.assertEquals(self.client.parents()[0].node, self.node1)
self.client.update(self.rev0)
self.append('a', 'b')
rev2, node2 = self.client.commit(b('new head'))
self.client.update(self.rev0)
self.client.update()
self.assertEquals(self.client.parents()[0].node, node2)
def test_check_clean(self):
self.assertRaises(ValueError, self.client.update, clean=True,
check=True)
def test_clean(self):
old = open('a').read()
self.append('a', 'b')
self.assertRaises(error.CommandError, self.client.update, check=True)
u, m, r, ur = self.client.update(clean=True)
self.assertEquals(u, 1)
self.assertEquals(old, open('a').read())
def test_basic_plain(self):
f = open('.hg/hgrc', 'a')
f.write('[defaults]\nupdate=-v\n')
f.close()
self.test_basic()
def disabled_largefiles(self):
# we don't run reposetup after a session has started, so this
# test is broken
import os
f = open('.hg/hgrc', 'a')
f.write('[extensions]\nlargefiles=\n')
f.close()
self.append('b', 'a')
try:
self.client.rawcommand([b('add'), b('b'), b('--large')])
except error.CommandError:
return
rev2, node2 = self.client.commit(b('third'))
# Go back to 0
self.client.rawcommand([b('update'), strtobytes(self.rev0)],
# Keep the 'changed' version
prompt=lambda s, d: 'c\n')
u, m, r, ur = self.client.update(rev2, clean=True)
self.assertEquals(u, 2)
self.assertEquals(m, 0)
self.assertEquals(r, 0)
self.assertEquals(ur, 0)
|
