mirror of
https://github.com/HeyPuter/firefox.git
synced 2026-11-15 17:55:15 -10:00
This reverts commit779b2feecd. Revert "Bug 1899960 - P2: Imply an unavailable state if focusable is in unavailable subtree. r=Jamie" This reverts commit6e4b35e663. Revert "Bug 1899960 - P1: Don't cache implicit states. r=Jamie" This reverts commiteacb22ed13. Revert "Bug 1967813 - Check menu's frame IsOpen to determine if menu is active. r=ayeddi" This reverts commitf1f8ac785d. Revert "Bug 1934096 - Minimize differences between `site.py` and `python.py` implementations of `pip_command` functions r=ahal" This reverts commite5ef1c9835. Revert "Bug 1934096 - Use `uv` in `mozharness/base/python.py` r=ahal" This reverts commit48b3d309b5. Revert "Bug 1968593 - Upgrade `uv` toolchain version to `0.7.2` r=firefox-build-system-reviewers,sergesanspaille" This reverts commit8b828d5f58. Revert "Bug 1968592 - Fix `test_site_activation.py` test in CI after `uv` enable r=firefox-build-system-reviewers,sergesanspaille" This reverts commit8cfd9ee70b. Revert "Bug 1968592: Enable `use-uv` by default for `test` and `source-test` kinds r=ahal,taskgraph-reviewers" This reverts commit994220ef5d. Revert "Bug 1962485 - Fix `jj` tests in `mozversioncontrol` r=sfink,ahal" This reverts commit52e5f009bd. Revert "Bug 1962485 - Add `jj` toolchain to `mozversioncontrol` Python source test r=firefox-build-system-reviewers,nalexander" This reverts commitf0c553f479. Revert "Bug 1962485 - Add `jj` toolchain tasks r=firefox-build-system-reviewers,nalexander" This reverts commit166ddbd3fe. Revert "Bug 1967634 - Bump vendored `pyyaml` version to `6.0.2` to match mozharness and grizzly r=ahal,mach-reviewers" This reverts commit495e3e0a95. Revert "Bug 1969203 - Fix `.gitignore` pattern regarding `.egg-info` for vendored packages in `jj` r=ahal" This reverts commitb993509711. Revert "Bug 1967634 - Apply fixes from `python-sites` lint r=ahal,mach-reviewers" This reverts commit5953da8cb8. Revert "Bug 1967634 - Add `python-sites` lint to facilitate adding rules specific to `python/sites/` r=ahal" This reverts commit83917ff26d. Revert "Bug 1965907 - Re-enable `test_vendor.py` r=ahal" This reverts commit6777024795.
116 lines
3.1 KiB
Python
116 lines
3.1 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 datetime import datetime
|
|
from pathlib import Path
|
|
|
|
import mozunit
|
|
|
|
from mozversioncontrol import get_repository_object
|
|
|
|
STEPS = {
|
|
"hg": [
|
|
"",
|
|
"""
|
|
echo "bar" >> bar
|
|
echo "baz" > foo
|
|
""",
|
|
],
|
|
"git": [
|
|
"",
|
|
"""
|
|
echo "bar" >> bar
|
|
echo "baz" > foo
|
|
""",
|
|
],
|
|
"jj": [
|
|
"""
|
|
jj describe -m 'Ignore file for testing'
|
|
echo foo > .gitignore
|
|
jj new
|
|
""",
|
|
"""
|
|
echo "bar" >> bar
|
|
echo "baz" > foo
|
|
""",
|
|
],
|
|
}
|
|
|
|
|
|
def test_commit(repo):
|
|
vcs = get_repository_object(repo.dir)
|
|
assert vcs.working_directory_clean()
|
|
|
|
# Setup step for jj to allow untracked changes.
|
|
repo.execute_next_step()
|
|
|
|
# Modify both foo and bar
|
|
repo.execute_next_step()
|
|
if repo.vcs != "jj":
|
|
# jj never has a dirty working directory.
|
|
assert not vcs.working_directory_clean()
|
|
|
|
date_string = "2017-07-14 02:40:00 +0000"
|
|
|
|
# Commit just bar
|
|
vcs.commit(
|
|
message="Modify bar\n\nbut not baz",
|
|
author="Testing McTesterson <[email protected]>",
|
|
date=date_string,
|
|
paths=["bar"],
|
|
)
|
|
|
|
original_date = datetime.strptime(date_string, "%Y-%m-%d %H:%M:%S %z")
|
|
date_from_vcs = vcs.get_last_modified_time_for_file(Path("bar"))
|
|
|
|
assert original_date == date_from_vcs
|
|
|
|
# We only committed bar, so foo is still keeping the working dir dirty. jj
|
|
# always treats the working directory as clean, because the top commit holds
|
|
# any changes in it.
|
|
if repo.vcs == "jj":
|
|
assert vcs.working_directory_clean()
|
|
else:
|
|
assert not vcs.working_directory_clean()
|
|
|
|
if repo.vcs == "git":
|
|
log_cmd = ["log", "-1", "--format=%an,%ae,%aD,%B"]
|
|
patch_cmd = ["log", "-1", "-p"]
|
|
elif repo.vcs == "hg":
|
|
log_cmd = [
|
|
"log",
|
|
"-l",
|
|
"1",
|
|
"-T",
|
|
"{person(author)},{email(author)},{date|rfc822date},{desc}",
|
|
]
|
|
patch_cmd = ["log", "-l", "1", "-p"]
|
|
elif repo.vcs == "jj":
|
|
log_cmd = [
|
|
"log",
|
|
"-n1",
|
|
"--no-graph",
|
|
"-r@-",
|
|
"-T",
|
|
'separate(",", author.name(), author.email(), commit_timestamp(self).format("%a, %d %b %Y %H:%M:%S %z"), description)',
|
|
]
|
|
patch_cmd = ["show", "@-", "--git"]
|
|
|
|
# Verify commit metadata (we rstrip to normalize trivial differences)
|
|
log = vcs._run(*log_cmd).rstrip()
|
|
assert log == (
|
|
"Testing McTesterson,[email protected],Fri, 14 "
|
|
"Jul 2017 02:40:00 +0000,Modify bar\n\nbut not baz"
|
|
)
|
|
|
|
# Verify only the intended file was added to the commit
|
|
patch = vcs._run(*patch_cmd)
|
|
diffs = [line for line in patch.splitlines() if "diff --git" in line]
|
|
assert len(diffs) == 1
|
|
assert diffs[0] == "diff --git a/bar b/bar"
|
|
|
|
|
|
if __name__ == "__main__":
|
|
mozunit.main()
|