Andrew Halberstadt
719ae3ef46
Currently `vcs.head_ref` is actually the revision for hg and git, but the change id for jj. This inconsistency makes it tricky to find the right thing across all three. In reality, this property is simply wrong for Git and Hg. A ref is not a revision. To clear things up, this renames `head_ref` -> `head_rev` (implementing it for jj). Then adds new implementations for `head_ref` that actually return a ref. This is basically the same as `vcs.branch` but with a fallback if no branch or bookmark is active. Differential Revision: https://phabricator.services.mozilla.com/D294177
80 lines
1.7 KiB
Python
80 lines
1.7 KiB
Python
# 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_rev
|
|
|
|
# Create a commit with modified `foo` and `bar`.
|
|
repo.execute_next_step()
|
|
rev1 = vcs.head_rev
|
|
assert rev0 != rev1
|
|
|
|
if repo.vcs == "hg":
|
|
vcs.update(".~1")
|
|
elif repo.vcs == "git":
|
|
vcs.update("HEAD~1")
|
|
elif repo.vcs == "jj":
|
|
vcs.update("@--")
|
|
assert vcs.head_rev == rev0
|
|
|
|
vcs.update(rev1)
|
|
assert vcs.head_rev == 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_rev == rev1
|
|
else:
|
|
# jj doesn't have a "dirty working directory".
|
|
pass
|
|
|
|
|
|
if __name__ == "__main__":
|
|
mozunit.main()
|