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
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
|
# 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/.
import os
import mozunit
from mozversioncontrol import get_repository_object
STEPS = {
"hg": [
"""
echo "bar" >> bar
echo "baz" > baz
hg add baz
hg rm foo
""",
"""
hg commit -m "Remove foo; modify bar; add baz"
""",
"""
echo ooka >> baz
echo newborn > baby
hg add baby
""",
"""
hg commit -m "Modify baz; add baby"
""",
],
"git": [
"""
echo "bar" >> bar
echo "baz" > baz
git add baz
git rm foo
""",
"""
git commit -am "Remove foo; modify bar; add baz"
""",
"""
echo ooka >> baz
echo newborn > baby
git add baz baby
""",
"""
git commit -m "Modify baz; add baby"
""",
],
"jj": [
# snapshot, since bug 1962245 suppresses automatic ones
"""
echo "bar" >> bar
echo "baz" > baz
rm foo
jj log -n0
""",
"""
jj commit -m "Remove foo; modify bar; add baz"
""",
"""
echo ooka >> baz
echo newborn > baby
jj log -n0
""",
"""
jj describe -m "Modify baz; add baby"
""",
],
}
def assert_files(actual, expected):
assert set(map(os.path.basename, actual)) == set(expected)
def test_workdir_outgoing(repo):
vcs = get_repository_object(repo.dir)
assert vcs.path == str(repo.dir)
remote_path = {
"hg": "../remoterepo",
"git": "upstream/master",
"jj": "master@upstream",
}[repo.vcs]
# Mutate files.
repo.execute_next_step()
assert_files(vcs.get_changed_files("A", "all"), ["baz"])
assert_files(vcs.get_changed_files("AM", "all"), ["bar", "baz"])
assert_files(vcs.get_changed_files("D", "all"), ["foo"])
if repo.vcs == "git":
assert_files(vcs.get_changed_files("AM", mode="staged"), ["baz"])
else:
# Mercurial and jj do not use a staging area (and ignore the mode
# parameter.)
assert_files(vcs.get_changed_files("AM", "unstaged"), ["bar", "baz"])
if repo.vcs != "jj":
# Everything is already committed in jj, and therefore outgoing.
assert_files(vcs.get_outgoing_files("AMD"), [])
assert_files(vcs.get_outgoing_files("AMD", remote_path), [])
# Create a commit.
repo.execute_next_step()
assert_files(vcs.get_changed_files("AMD", "all"), [])
assert_files(vcs.get_changed_files("AMD", "staged"), [])
assert_files(vcs.get_outgoing_files("AMD"), ["bar", "baz", "foo"])
assert_files(vcs.get_outgoing_files("AMD", remote_path), ["bar", "baz", "foo"])
# Mutate again.
repo.execute_next_step()
assert_files(vcs.get_changed_files("A", "all"), ["baby"])
assert_files(vcs.get_changed_files("AM", "all"), ["baby", "baz"])
assert_files(vcs.get_changed_files("D", "all"), [])
# Create a second commit.
repo.execute_next_step()
assert_files(vcs.get_outgoing_files("AM"), ["bar", "baz", "baby"])
assert_files(vcs.get_outgoing_files("AM", remote_path), ["bar", "baz", "baby"])
if repo.vcs == "git":
assert_files(vcs.get_changed_files("AM", rev="HEAD~1"), ["bar", "baz"])
assert_files(vcs.get_changed_files("AM", rev="HEAD"), ["baby", "baz"])
elif repo.vcs == "hg":
assert_files(vcs.get_changed_files("AM", rev=".^"), ["bar", "baz"])
assert_files(vcs.get_changed_files("AM", rev="."), ["baby", "baz"])
assert_files(vcs.get_changed_files("AM", rev=".^::"), ["bar", "baz", "baby"])
assert_files(vcs.get_changed_files("AM", rev="modifies(baz)"), ["baz", "baby"])
elif repo.vcs == "jj":
assert_files(vcs.get_changed_files("AM", rev="@-"), ["bar", "baz"])
assert_files(vcs.get_changed_files("AM", rev="@"), ["baby", "baz"])
assert_files(vcs.get_changed_files("AM", rev="@-::"), ["bar", "baz", "baby"])
# Currently no direct equivalent of `modifies(baz)`. `files(baz)` will
# also select changes that added or deleted baz, and the diff_filter
# will applied be too late.
assert_files(
vcs.get_changed_files("AMD", rev="files(baz)"),
["foo", "baz", "baby", "bar"],
)
if __name__ == "__main__":
mozunit.main()
|
