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
|
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
from subprocess import CalledProcessError
import mozunit
import pytest
from mozversioncontrol import get_repository_object
STEPS = {
"hg": [
"""
echo "bar" >> bar
echo "baz" > foo
hg commit -m "second commit"
""",
"""
echo "foobar" > foo
""",
],
"git": [
"""
echo "bar" >> bar
echo "baz" > foo
git add *
git commit -m "second commit"
""",
"""
echo "foobar" > foo
""",
],
"jj": [
"""
echo "bar" >> bar
echo "baz" > foo
jj commit -m "second commit"
""",
"""
echo "foobar" > foo
""",
],
}
def test_update(repo):
vcs = get_repository_object(repo.dir)
rev0 = vcs.head_ref
# Create a commit with modified `foo` and `bar`.
repo.execute_next_step()
rev1 = vcs.head_ref
assert rev0 != rev1
if repo.vcs == "hg":
vcs.update(".~1")
elif repo.vcs == "git":
vcs.update("HEAD~1")
elif repo.vcs == "jj":
vcs.edit("@-")
assert vcs.head_ref == rev0
if repo.vcs != "jj":
vcs.update(rev1)
else:
vcs.update(rev0)
rev1 = vcs.head_ref
assert vcs.head_ref == rev1
# Modify `foo` and update. Should fail with dirty working directory.
repo.execute_next_step()
if repo.vcs != "jj":
with pytest.raises(CalledProcessError):
vcs.update(rev0)
assert vcs.head_ref == rev1
else:
# jj doesn't have a "dirty working directory".
pass
if __name__ == "__main__":
mozunit.main()
|
