summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--git_command.py12
-rw-r--r--manifest_xml.py38
-rw-r--r--run_tests.vpython314
-rw-r--r--subcmds/diffmanifests.py6
-rw-r--r--tests/test_manifest_xml.py2
5 files changed, 36 insertions, 36 deletions
diff --git a/git_command.py b/git_command.py
index 55216b1c..04844079 100644
--- a/git_command.py
+++ b/git_command.py
@@ -238,9 +238,9 @@ def _build_env(
238 s = p + " " + s 238 s = p + " " + s
239 env["GIT_CONFIG_PARAMETERS"] = s 239 env["GIT_CONFIG_PARAMETERS"] = s
240 if "GIT_ALLOW_PROTOCOL" not in env: 240 if "GIT_ALLOW_PROTOCOL" not in env:
241 env[ 241 env["GIT_ALLOW_PROTOCOL"] = (
242 "GIT_ALLOW_PROTOCOL" 242 "file:git:http:https:ssh:persistent-http:persistent-https:sso:rpc"
243 ] = "file:git:http:https:ssh:persistent-http:persistent-https:sso:rpc" 243 )
244 env["GIT_HTTP_USER_AGENT"] = user_agent.git 244 env["GIT_HTTP_USER_AGENT"] = user_agent.git
245 245
246 if objdir: 246 if objdir:
@@ -350,9 +350,9 @@ class GitCommand:
350 "Project": e.project, 350 "Project": e.project,
351 "CommandName": command_name, 351 "CommandName": command_name,
352 "Message": str(e), 352 "Message": str(e),
353 "ReturnCode": str(e.git_rc) 353 "ReturnCode": (
354 if e.git_rc is not None 354 str(e.git_rc) if e.git_rc is not None else None
355 else None, 355 ),
356 "IsError": log_as_error, 356 "IsError": log_as_error,
357 } 357 }
358 ) 358 )
diff --git a/manifest_xml.py b/manifest_xml.py
index 347ae5ef..60d126fb 100644
--- a/manifest_xml.py
+++ b/manifest_xml.py
@@ -1014,9 +1014,9 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
1014 1014
1015 def SetManifestOverride(self, path): 1015 def SetManifestOverride(self, path):
1016 """Override manifestFile. The caller must call Unload()""" 1016 """Override manifestFile. The caller must call Unload()"""
1017 self._outer_client.manifest.manifestFileOverrides[ 1017 self._outer_client.manifest.manifestFileOverrides[self.path_prefix] = (
1018 self.path_prefix 1018 path
1019 ] = path 1019 )
1020 1020
1021 @property 1021 @property
1022 def UseLocalManifests(self): 1022 def UseLocalManifests(self):
@@ -2112,22 +2112,22 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
2112 # implementation: 2112 # implementation:
2113 # https://eclipse.googlesource.com/jgit/jgit/+/9110037e3e9461ff4dac22fee84ef3694ed57648/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectChecker.java#884 2113 # https://eclipse.googlesource.com/jgit/jgit/+/9110037e3e9461ff4dac22fee84ef3694ed57648/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectChecker.java#884
2114 BAD_CODEPOINTS = { 2114 BAD_CODEPOINTS = {
2115 "\u200C", # ZERO WIDTH NON-JOINER 2115 "\u200c", # ZERO WIDTH NON-JOINER
2116 "\u200D", # ZERO WIDTH JOINER 2116 "\u200d", # ZERO WIDTH JOINER
2117 "\u200E", # LEFT-TO-RIGHT MARK 2117 "\u200e", # LEFT-TO-RIGHT MARK
2118 "\u200F", # RIGHT-TO-LEFT MARK 2118 "\u200f", # RIGHT-TO-LEFT MARK
2119 "\u202A", # LEFT-TO-RIGHT EMBEDDING 2119 "\u202a", # LEFT-TO-RIGHT EMBEDDING
2120 "\u202B", # RIGHT-TO-LEFT EMBEDDING 2120 "\u202b", # RIGHT-TO-LEFT EMBEDDING
2121 "\u202C", # POP DIRECTIONAL FORMATTING 2121 "\u202c", # POP DIRECTIONAL FORMATTING
2122 "\u202D", # LEFT-TO-RIGHT OVERRIDE 2122 "\u202d", # LEFT-TO-RIGHT OVERRIDE
2123 "\u202E", # RIGHT-TO-LEFT OVERRIDE 2123 "\u202e", # RIGHT-TO-LEFT OVERRIDE
2124 "\u206A", # INHIBIT SYMMETRIC SWAPPING 2124 "\u206a", # INHIBIT SYMMETRIC SWAPPING
2125 "\u206B", # ACTIVATE SYMMETRIC SWAPPING 2125 "\u206b", # ACTIVATE SYMMETRIC SWAPPING
2126 "\u206C", # INHIBIT ARABIC FORM SHAPING 2126 "\u206c", # INHIBIT ARABIC FORM SHAPING
2127 "\u206D", # ACTIVATE ARABIC FORM SHAPING 2127 "\u206d", # ACTIVATE ARABIC FORM SHAPING
2128 "\u206E", # NATIONAL DIGIT SHAPES 2128 "\u206e", # NATIONAL DIGIT SHAPES
2129 "\u206F", # NOMINAL DIGIT SHAPES 2129 "\u206f", # NOMINAL DIGIT SHAPES
2130 "\uFEFF", # ZERO WIDTH NO-BREAK SPACE 2130 "\ufeff", # ZERO WIDTH NO-BREAK SPACE
2131 } 2131 }
2132 if BAD_CODEPOINTS & path_codepoints: 2132 if BAD_CODEPOINTS & path_codepoints:
2133 # This message is more expansive than reality, but should be fine. 2133 # This message is more expansive than reality, but should be fine.
diff --git a/run_tests.vpython3 b/run_tests.vpython3
index b2b5ce48..e4c62c11 100644
--- a/run_tests.vpython3
+++ b/run_tests.vpython3
@@ -56,40 +56,40 @@ wheel: <
56 56
57wheel: < 57wheel: <
58 name: "infra/python/wheels/black-py3" 58 name: "infra/python/wheels/black-py3"
59 version: "version:23.1.0" 59 version: "version:25.1.0"
60> 60>
61 61
62# Required by black==23.1.0 62# Required by black==25.1.0
63wheel: < 63wheel: <
64 name: "infra/python/wheels/mypy-extensions-py3" 64 name: "infra/python/wheels/mypy-extensions-py3"
65 version: "version:0.4.3" 65 version: "version:0.4.3"
66> 66>
67 67
68# Required by black==23.1.0 68# Required by black==25.1.0
69wheel: < 69wheel: <
70 name: "infra/python/wheels/tomli-py3" 70 name: "infra/python/wheels/tomli-py3"
71 version: "version:2.0.1" 71 version: "version:2.0.1"
72> 72>
73 73
74# Required by black==23.1.0 74# Required by black==25.1.0
75wheel: < 75wheel: <
76 name: "infra/python/wheels/platformdirs-py3" 76 name: "infra/python/wheels/platformdirs-py3"
77 version: "version:2.5.2" 77 version: "version:2.5.2"
78> 78>
79 79
80# Required by black==23.1.0 80# Required by black==25.1.0
81wheel: < 81wheel: <
82 name: "infra/python/wheels/pathspec-py3" 82 name: "infra/python/wheels/pathspec-py3"
83 version: "version:0.9.0" 83 version: "version:0.9.0"
84> 84>
85 85
86# Required by black==23.1.0 86# Required by black==25.1.0
87wheel: < 87wheel: <
88 name: "infra/python/wheels/typing-extensions-py3" 88 name: "infra/python/wheels/typing-extensions-py3"
89 version: "version:4.3.0" 89 version: "version:4.3.0"
90> 90>
91 91
92# Required by black==23.1.0 92# Required by black==25.1.0
93wheel: < 93wheel: <
94 name: "infra/python/wheels/click-py3" 94 name: "infra/python/wheels/click-py3"
95 version: "version:8.0.3" 95 version: "version:8.0.3"
diff --git a/subcmds/diffmanifests.py b/subcmds/diffmanifests.py
index 88b697b6..3eee3f94 100644
--- a/subcmds/diffmanifests.py
+++ b/subcmds/diffmanifests.py
@@ -233,9 +233,9 @@ synced and their revisions won't be found.
233 ) 233 )
234 self.printRevision = self.out.nofmt_printer("revision", fg="yellow") 234 self.printRevision = self.out.nofmt_printer("revision", fg="yellow")
235 else: 235 else:
236 self.printProject = ( 236 self.printProject = self.printAdded = self.printRemoved = (
237 self.printAdded 237 self.printRevision
238 ) = self.printRemoved = self.printRevision = self.printText 238 ) = self.printText
239 239
240 manifest1 = RepoClient(self.repodir) 240 manifest1 = RepoClient(self.repodir)
241 manifest1.Override(args[0], load_local_manifests=False) 241 manifest1.Override(args[0], load_local_manifests=False)
diff --git a/tests/test_manifest_xml.py b/tests/test_manifest_xml.py
index 3d1fde96..ebc0ce58 100644
--- a/tests/test_manifest_xml.py
+++ b/tests/test_manifest_xml.py
@@ -51,7 +51,7 @@ INVALID_FS_PATHS = (
51 "foo~", 51 "foo~",
52 "blah/foo~", 52 "blah/foo~",
53 # Block Unicode characters that get normalized out by filesystems. 53 # Block Unicode characters that get normalized out by filesystems.
54 "foo\u200Cbar", 54 "foo\u200cbar",
55 # Block newlines. 55 # Block newlines.
56 "f\n/bar", 56 "f\n/bar",
57 "f\r/bar", 57 "f\r/bar",