android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: Update codebase to expect Python 3.6

Browse Source 
- Bump minimum version to Python 3.6.
- Use f-strings in a lot of places.

Change-Id: I2aa70197230fcec2eff8e7c8eb754f20c08075bb
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/389034
Tested-by: Jason R. Coombs <jaraco@google.com>
Reviewed-by: Mike Frysinger <vapier@google.com>
Commit-Queue: Jason R. Coombs <jaraco@google.com>
This commit is contained in:
Jason R. Coombs 2023-09-29 11:04:49 -04:00 committed by LUCI
parent b99272c601
commit b32ccbb66b
33 changed files with 169 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
color.py
View File

@ -194,7 +194,7 @@ class Coloring:
if not opt: if not opt:
return _Color(fg, bg, attr) return _Color(fg, bg, attr)
v = self._config.GetString("%s.%s" % (self._section, opt)) v = self._config.GetString(f"{self._section}.{opt}")
if v is None: if v is None:
return _Color(fg, bg, attr) return _Color(fg, bg, attr)

4
editor.py
View File

@ -104,9 +104,7 @@ least one of these before using this command.""", # noqa: E501
try: try:
rc = subprocess.Popen(args, shell=shell).wait() rc = subprocess.Popen(args, shell=shell).wait()
except OSError as e: except OSError as e:
raise EditorError( raise EditorError(f"editor failed, {str(e)}: {editor} {path}")
"editor failed, %s: %s %s" % (str(e), editor, path)
)
if rc != 0: if rc != 0:
raise EditorError( raise EditorError(
"editor failed with exit status %d: %s %s" "editor failed with exit status %d: %s %s"

14
git_command.py
View File

@ -196,12 +196,10 @@ class UserAgent:
def git(self): def git(self):
"""The UA when running git.""" """The UA when running git."""
if self._git_ua is None: if self._git_ua is None:
self._git_ua = "git/%s (%s) git-repo/%s" % ( self._git_ua = (
git.version_tuple().full, f"git/{git.version_tuple().full} ({self.os}) "
self.os, f"git-repo/{RepoSourceVersion()}"
RepoSourceVersion(),
) )
return self._git_ua return self._git_ua
@ -216,7 +214,7 @@ def git_require(min_version, fail=False, msg=""):
need = ".".join(map(str, min_version)) need = ".".join(map(str, min_version))
if msg: if msg:
msg = " for " + msg msg = " for " + msg
error_msg = "fatal: git %s or later required%s" % (need, msg) error_msg = f"fatal: git {need} or later required{msg}"
logger.error(error_msg) logger.error(error_msg)
raise GitRequireError(error_msg) raise GitRequireError(error_msg)
return False return False
@ -243,7 +241,7 @@ def _build_env(
env["GIT_SSH"] = ssh_proxy.proxy env["GIT_SSH"] = ssh_proxy.proxy
env["GIT_SSH_VARIANT"] = "ssh" env["GIT_SSH_VARIANT"] = "ssh"
if "http_proxy" in env and "darwin" == sys.platform: if "http_proxy" in env and "darwin" == sys.platform:
s = "'http.proxy=%s'" % (env["http_proxy"],) s = f"'http.proxy={env['http_proxy']}'"
p = env.get("GIT_CONFIG_PARAMETERS") p = env.get("GIT_CONFIG_PARAMETERS")
if p is not None: if p is not None:
s = p + " " + s s = p + " " + s
@ -468,7 +466,7 @@ class GitCommand:
) )
except Exception as e: except Exception as e:
raise GitPopenCommandError( raise GitPopenCommandError(
message="%s: %s" % (command[1], e), message=f"{command[1]}: {e}",
project=self.project.name if self.project else None, project=self.project.name if self.project else None,
command_args=self.cmdv, command_args=self.cmdv,
) )

20
git_config.py
View File

@ -418,7 +418,7 @@ class GitConfig:
if p.Wait() == 0: if p.Wait() == 0:
return p.stdout return p.stdout
else: else:
raise GitError("git config %s: %s" % (str(args), p.stderr)) raise GitError(f"git config {str(args)}: {p.stderr}")
class RepoConfig(GitConfig): class RepoConfig(GitConfig):
@ -651,13 +651,11 @@ class Remote:
userEmail, host, port userEmail, host, port
) )
except urllib.error.HTTPError as e: except urllib.error.HTTPError as e:
raise UploadError("%s: %s" % (self.review, str(e))) raise UploadError(f"{self.review}: {str(e)}")
except urllib.error.URLError as e: except urllib.error.URLError as e:
raise UploadError("%s: %s" % (self.review, str(e))) raise UploadError(f"{self.review}: {str(e)}")
except http.client.HTTPException as e: except http.client.HTTPException as e:
raise UploadError( raise UploadError(f"{self.review}: {e.__class__.__name__}")
"%s: %s" % (self.review, e.__class__.__name__)
)
REVIEW_CACHE[u] = self._review_url REVIEW_CACHE[u] = self._review_url
return self._review_url + self.projectname return self._review_url + self.projectname
@ -666,7 +664,7 @@ class Remote:
username = self._config.GetString("review.%s.username" % self.review) username = self._config.GetString("review.%s.username" % self.review)
if username is None: if username is None:
username = userEmail.split("@")[0] username = userEmail.split("@")[0]
return "ssh://%s@%s:%s/" % (username, host, port) return f"ssh://{username}@{host}:{port}/"
def ToLocal(self, rev): def ToLocal(self, rev):
"""Convert a remote revision string to something we have locally.""" """Convert a remote revision string to something we have locally."""
@ -715,11 +713,11 @@ class Remote:
self._Set("fetch", list(map(str, self.fetch))) self._Set("fetch", list(map(str, self.fetch)))
def _Set(self, key, value): def _Set(self, key, value):
key = "remote.%s.%s" % (self.name, key) key = f"remote.{self.name}.{key}"
return self._config.SetString(key, value) return self._config.SetString(key, value)
def _Get(self, key, all_keys=False): def _Get(self, key, all_keys=False):
key = "remote.%s.%s" % (self.name, key) key = f"remote.{self.name}.{key}"
return self._config.GetString(key, all_keys=all_keys) return self._config.GetString(key, all_keys=all_keys)
@ -762,11 +760,11 @@ class Branch:
fd.write("\tmerge = %s\n" % self.merge) fd.write("\tmerge = %s\n" % self.merge)
def _Set(self, key, value): def _Set(self, key, value):
key = "branch.%s.%s" % (self.name, key) key = f"branch.{self.name}.{key}"
return self._config.SetString(key, value) return self._config.SetString(key, value)
def _Get(self, key, all_keys=False): def _Get(self, key, all_keys=False):
key = "branch.%s.%s" % (self.name, key) key = f"branch.{self.name}.{key}"
return self._config.GetString(key, all_keys=all_keys) return self._config.GetString(key, all_keys=all_keys)

5
git_trace2_event_log_base.py
View File

@ -76,9 +76,8 @@ class BaseEventLog:
# Save both our sid component and the complete sid. # Save both our sid component and the complete sid.
# We use our sid component (self._sid) as the unique filename prefix and # We use our sid component (self._sid) as the unique filename prefix and
# the full sid (self._full_sid) in the log itself. # the full sid (self._full_sid) in the log itself.
self._sid = "repo-%s-P%08x" % ( self._sid = (
self.start.strftime("%Y%m%dT%H%M%SZ"), f"repo-{self.start.strftime('%Y%m%dT%H%M%SZ')}-P{os.getpid():08x}"
os.getpid(),
) )
if add_init_count: if add_init_count:

11
hooks.py
View File

@ -180,7 +180,7 @@ class RepoHook:
abort_if_user_denies was passed to the consturctor. abort_if_user_denies was passed to the consturctor.
""" """
hooks_config = self._hooks_project.config hooks_config = self._hooks_project.config
git_approval_key = "repo.hooks.%s.%s" % (self._hook_type, subkey) git_approval_key = f"repo.hooks.{self._hook_type}.{subkey}"
# Get the last value that the user approved for this hook; may be None. # Get the last value that the user approved for this hook; may be None.
old_val = hooks_config.GetString(git_approval_key) old_val = hooks_config.GetString(git_approval_key)
@ -193,7 +193,7 @@ class RepoHook:
else: else:
# Give the user a reason why we're prompting, since they last # Give the user a reason why we're prompting, since they last
# told us to "never ask again". # told us to "never ask again".
prompt = "WARNING: %s\n\n" % (changed_prompt,) prompt = f"WARNING: {changed_prompt}\n\n"
else: else:
prompt = "" prompt = ""
@ -241,9 +241,8 @@ class RepoHook:
return self._CheckForHookApprovalHelper( return self._CheckForHookApprovalHelper(
"approvedmanifest", "approvedmanifest",
self._manifest_url, self._manifest_url,
"Run hook scripts from %s" % (self._manifest_url,), f"Run hook scripts from {self._manifest_url}",
"Manifest URL has changed since %s was allowed." f"Manifest URL has changed since {self._hook_type} was allowed.",
% (self._hook_type,),
) )
def _CheckForHookApprovalHash(self): def _CheckForHookApprovalHash(self):
@ -262,7 +261,7 @@ class RepoHook:
"approvedhash", "approvedhash",
self._GetHash(), self._GetHash(),
prompt % (self._GetMustVerb(), self._script_fullpath), prompt % (self._GetMustVerb(), self._script_fullpath),
"Scripts have changed since %s was allowed." % (self._hook_type,), f"Scripts have changed since {self._hook_type} was allowed.",
) )
@staticmethod @staticmethod

7
main.py
View File

@ -198,9 +198,8 @@ class _Repo:
if short: if short:
commands = " ".join(sorted(self.commands)) commands = " ".join(sorted(self.commands))
wrapped_commands = textwrap.wrap(commands, width=77) wrapped_commands = textwrap.wrap(commands, width=77)
print( help_commands = "".join(f"\n {x}" for x in wrapped_commands)
"Available commands:\n %s" % ("\n ".join(wrapped_commands),) print(f"Available commands:{help_commands}")
)
print("\nRun `repo help <command>` for command-specific details.") print("\nRun `repo help <command>` for command-specific details.")
print("Bug reports:", Wrapper().BUG_URL) print("Bug reports:", Wrapper().BUG_URL)
else: else:
@ -236,7 +235,7 @@ class _Repo:
if name in self.commands: if name in self.commands:
return name, [] return name, []
key = "alias.%s" % (name,) key = f"alias.{name}"
alias = RepoConfig.ForRepository(self.repodir).GetString(key) alias = RepoConfig.ForRepository(self.repodir).GetString(key)
if alias is None: if alias is None:
alias = RepoConfig.ForUser().GetString(key) alias = RepoConfig.ForUser().GetString(key)

36
manifest_xml.py
View File

@ -114,9 +114,7 @@ def XmlInt(node, attr, default=None):
try: try:
return int(value) return int(value)
except ValueError: except ValueError:
raise ManifestParseError( raise ManifestParseError(f'manifest: invalid {attr}="{value}" integer')
'manifest: invalid %s="%s" integer' % (attr, value)
)
class _Default: class _Default:
@ -810,7 +808,7 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
ret.setdefault(child.nodeName, []).append(element) ret.setdefault(child.nodeName, []).append(element)
else: else:
raise ManifestParseError( raise ManifestParseError(
'Unhandled element "%s"' % (child.nodeName,) f'Unhandled element "{child.nodeName}"'
) )
append_children(element, child) append_children(element, child)
@ -1258,12 +1256,10 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
try: try:
root = xml.dom.minidom.parse(path) root = xml.dom.minidom.parse(path)
except (OSError, xml.parsers.expat.ExpatError) as e: except (OSError, xml.parsers.expat.ExpatError) as e:
raise ManifestParseError( raise ManifestParseError(f"error parsing manifest {path}: {e}")
"error parsing manifest %s: %s" % (path, e)
)
if not root or not root.childNodes: if not root or not root.childNodes:
raise ManifestParseError("no root node in %s" % (path,)) raise ManifestParseError(f"no root node in {path}")
for manifest in root.childNodes: for manifest in root.childNodes:
if ( if (
@ -1272,7 +1268,7 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
): ):
break break
else: else:
raise ManifestParseError("no <manifest> in %s" % (path,)) raise ManifestParseError(f"no <manifest> in {path}")
nodes = [] nodes = []
for node in manifest.childNodes: for node in manifest.childNodes:
@ -1282,7 +1278,7 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
msg = self._CheckLocalPath(name) msg = self._CheckLocalPath(name)
if msg: if msg:
raise ManifestInvalidPathError( raise ManifestInvalidPathError(
'<include> invalid "name": %s: %s' % (name, msg) f'<include> invalid "name": {name}: {msg}'
) )
include_groups = "" include_groups = ""
if parent_groups: if parent_groups:
@ -1314,7 +1310,7 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
raise raise
except Exception as e: except Exception as e:
raise ManifestParseError( raise ManifestParseError(
"failed parsing included manifest %s: %s" % (name, e) f"failed parsing included manifest {name}: {e}"
) )
else: else:
if parent_groups and node.nodeName == "project": if parent_groups and node.nodeName == "project":
@ -1765,13 +1761,13 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
msg = self._CheckLocalPath(name) msg = self._CheckLocalPath(name)
if msg: if msg:
raise ManifestInvalidPathError( raise ManifestInvalidPathError(
'<submanifest> invalid "name": %s: %s' % (name, msg) f'<submanifest> invalid "name": {name}: {msg}'
) )
else: else:
msg = self._CheckLocalPath(path) msg = self._CheckLocalPath(path)
if msg: if msg:
raise ManifestInvalidPathError( raise ManifestInvalidPathError(
'<submanifest> invalid "path": %s: %s' % (path, msg) f'<submanifest> invalid "path": {path}: {msg}'
) )
submanifest = _XmlSubmanifest( submanifest = _XmlSubmanifest(
@ -1806,7 +1802,7 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
msg = self._CheckLocalPath(name, dir_ok=True) msg = self._CheckLocalPath(name, dir_ok=True)
if msg: if msg:
raise ManifestInvalidPathError( raise ManifestInvalidPathError(
'<project> invalid "name": %s: %s' % (name, msg) f'<project> invalid "name": {name}: {msg}'
) )
if parent: if parent:
name = self._JoinName(parent.name, name) name = self._JoinName(parent.name, name)
@ -1816,7 +1812,7 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
remote = self._default.remote remote = self._default.remote
if remote is None: if remote is None:
raise ManifestParseError( raise ManifestParseError(
"no remote for project %s within %s" % (name, self.manifestFile) f"no remote for project {name} within {self.manifestFile}"
) )
revisionExpr = node.getAttribute("revision") or remote.revision revisionExpr = node.getAttribute("revision") or remote.revision
@ -1837,7 +1833,7 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
msg = self._CheckLocalPath(path, dir_ok=True, cwd_dot_ok=True) msg = self._CheckLocalPath(path, dir_ok=True, cwd_dot_ok=True)
if msg: if msg:
raise ManifestInvalidPathError( raise ManifestInvalidPathError(
'<project> invalid "path": %s: %s' % (path, msg) f'<project> invalid "path": {path}: {msg}'
) )
rebase = XmlBool(node, "rebase", True) rebase = XmlBool(node, "rebase", True)
@ -2094,7 +2090,7 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
if not cwd_dot_ok or parts != ["."]: if not cwd_dot_ok or parts != ["."]:
for part in set(parts): for part in set(parts):
if part in {".", "..", ".git"} or part.startswith(".repo"): if part in {".", "..", ".git"} or part.startswith(".repo"):
return "bad component: %s" % (part,) return f"bad component: {part}"
if not dir_ok and resep.match(path[-1]): if not dir_ok and resep.match(path[-1]):
return "dirs not allowed" return "dirs not allowed"
@ -2130,7 +2126,7 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
msg = cls._CheckLocalPath(dest) msg = cls._CheckLocalPath(dest)
if msg: if msg:
raise ManifestInvalidPathError( raise ManifestInvalidPathError(
'<%s> invalid "dest": %s: %s' % (element, dest, msg) f'<{element}> invalid "dest": {dest}: {msg}'
) )
# |src| is the file we read from or path we point to for symlinks. # |src| is the file we read from or path we point to for symlinks.
@ -2141,7 +2137,7 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
) )
if msg: if msg:
raise ManifestInvalidPathError( raise ManifestInvalidPathError(
'<%s> invalid "src": %s: %s' % (element, src, msg) f'<{element}> invalid "src": {src}: {msg}'
) )
def _ParseCopyFile(self, project, node): def _ParseCopyFile(self, project, node):
@ -2185,7 +2181,7 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
v = self._remotes.get(name) v = self._remotes.get(name)
if not v: if not v:
raise ManifestParseError( raise ManifestParseError(
"remote %s not defined in %s" % (name, self.manifestFile) f"remote {name} not defined in {self.manifestFile}"
) )
return v return v

4
platform_utils.py
View File

@ -57,8 +57,8 @@ def _validate_winpath(path):
if _winpath_is_valid(path): if _winpath_is_valid(path):
return path return path
raise ValueError( raise ValueError(
'Path "{}" must be a relative path or an absolute ' f'Path "{path}" must be a relative path or an absolute '
"path starting with a drive letter".format(path) "path starting with a drive letter"
) )

12
platform_utils_win32.py
View File

@ -186,9 +186,7 @@ def _create_symlink(source, link_name, dwFlags):
error_desc = FormatError(code).strip() error_desc = FormatError(code).strip()
if code == ERROR_PRIVILEGE_NOT_HELD: if code == ERROR_PRIVILEGE_NOT_HELD:
raise OSError(errno.EPERM, error_desc, link_name) raise OSError(errno.EPERM, error_desc, link_name)
_raise_winerror( _raise_winerror(code, f'Error creating symbolic link "{link_name}"')
code, 'Error creating symbolic link "{}"'.format(link_name)
)
def islink(path): def islink(path):
@ -210,7 +208,7 @@ def readlink(path):
) )
if reparse_point_handle == INVALID_HANDLE_VALUE: if reparse_point_handle == INVALID_HANDLE_VALUE:
_raise_winerror( _raise_winerror(
get_last_error(), 'Error opening symbolic link "{}"'.format(path) get_last_error(), f'Error opening symbolic link "{path}"'
) )
target_buffer = c_buffer(MAXIMUM_REPARSE_DATA_BUFFER_SIZE) target_buffer = c_buffer(MAXIMUM_REPARSE_DATA_BUFFER_SIZE)
n_bytes_returned = DWORD() n_bytes_returned = DWORD()
@ -227,7 +225,7 @@ def readlink(path):
CloseHandle(reparse_point_handle) CloseHandle(reparse_point_handle)
if not io_result: if not io_result:
_raise_winerror( _raise_winerror(
get_last_error(), 'Error reading symbolic link "{}"'.format(path) get_last_error(), f'Error reading symbolic link "{path}"'
) )
rdb = REPARSE_DATA_BUFFER.from_buffer(target_buffer) rdb = REPARSE_DATA_BUFFER.from_buffer(target_buffer)
if rdb.ReparseTag == IO_REPARSE_TAG_SYMLINK: if rdb.ReparseTag == IO_REPARSE_TAG_SYMLINK:
@ -236,11 +234,11 @@ def readlink(path):
return rdb.MountPointReparseBuffer.PrintName return rdb.MountPointReparseBuffer.PrintName
# Unsupported reparse point type. # Unsupported reparse point type.
_raise_winerror( _raise_winerror(
ERROR_NOT_SUPPORTED, 'Error reading symbolic link "{}"'.format(path) ERROR_NOT_SUPPORTED, f'Error reading symbolic link "{path}"'
) )
def _raise_winerror(code, error_desc): def _raise_winerror(code, error_desc):
win_error_desc = FormatError(code).strip() win_error_desc = FormatError(code).strip()
error_desc = "{0}: {1}".format(error_desc, win_error_desc) error_desc = f"{error_desc}: {win_error_desc}"
raise WinError(code, error_desc) raise WinError(code, error_desc)

6
progress.py
View File

@ -52,11 +52,11 @@ def duration_str(total):
uses microsecond resolution. This makes for noisy output. uses microsecond resolution. This makes for noisy output.
""" """
hours, mins, secs = convert_to_hms(total) hours, mins, secs = convert_to_hms(total)
ret = "%.3fs" % (secs,) ret = f"{secs:.3f}s"
if mins: if mins:
ret = "%im%s" % (mins, ret) ret = f"{mins}m{ret}"
if hours: if hours:
ret = "%ih%s" % (hours, ret) ret = f"{hours}h{ret}"
return ret return ret

69
project.py
View File

@ -365,19 +365,19 @@ def _SafeExpandPath(base, subpath, skipfinal=False):
for part in components: for part in components:
if part in {".", ".."}: if part in {".", ".."}:
raise ManifestInvalidPathError( raise ManifestInvalidPathError(
'%s: "%s" not allowed in paths' % (subpath, part) f'{subpath}: "{part}" not allowed in paths'
) )
path = os.path.join(path, part) path = os.path.join(path, part)
if platform_utils.islink(path): if platform_utils.islink(path):
raise ManifestInvalidPathError( raise ManifestInvalidPathError(
"%s: traversing symlinks not allow" % (path,) f"{path}: traversing symlinks not allow"
) )
if os.path.exists(path): if os.path.exists(path):
if not os.path.isfile(path) and not platform_utils.isdir(path): if not os.path.isfile(path) and not platform_utils.isdir(path):
raise ManifestInvalidPathError( raise ManifestInvalidPathError(
"%s: only regular files & directories allowed" % (path,) f"{path}: only regular files & directories allowed"
) )
if skipfinal: if skipfinal:
@ -409,11 +409,11 @@ class _CopyFile:
if platform_utils.isdir(src): if platform_utils.isdir(src):
raise ManifestInvalidPathError( raise ManifestInvalidPathError(
"%s: copying from directory not supported" % (self.src,) f"{self.src}: copying from directory not supported"
) )
if platform_utils.isdir(dest): if platform_utils.isdir(dest):
raise ManifestInvalidPathError( raise ManifestInvalidPathError(
"%s: copying to directory not allowed" % (self.dest,) f"{self.dest}: copying to directory not allowed"
) )
# Copy file if it does not exist or is out of date. # Copy file if it does not exist or is out of date.
@ -957,15 +957,11 @@ class Project:
f_status = "-" f_status = "-"
if i and i.src_path: if i and i.src_path:
line = " %s%s\t%s => %s (%s%%)" % ( line = (
i_status, f" {i_status}{f_status}\t{i.src_path} => {p} ({i.level}%)"
f_status,
i.src_path,
p,
i.level,
) )
else: else:
line = " %s%s\t%s" % (i_status, f_status, p) line = f" {i_status}{f_status}\t{p}"
if i and not f: if i and not f:
out.added("%s", line) out.added("%s", line)
@ -1157,7 +1153,7 @@ class Project:
if dest_branch.startswith(R_HEADS): if dest_branch.startswith(R_HEADS):
dest_branch = dest_branch[len(R_HEADS) :] dest_branch = dest_branch[len(R_HEADS) :]
ref_spec = "%s:refs/for/%s" % (R_HEADS + branch.name, dest_branch) ref_spec = f"{R_HEADS + branch.name}:refs/for/{dest_branch}"
opts = [] opts = []
if auto_topic: if auto_topic:
opts += ["topic=" + branch.name] opts += ["topic=" + branch.name]
@ -1182,7 +1178,7 @@ class Project:
GitCommand(self, cmd, bare=True, verify_command=True).Wait() GitCommand(self, cmd, bare=True, verify_command=True).Wait()
if not dryrun: if not dryrun:
msg = "posted to %s for %s" % (branch.remote.review, dest_branch) msg = f"posted to {branch.remote.review} for {dest_branch}"
self.bare_git.UpdateRef( self.bare_git.UpdateRef(
R_PUB + branch.name, R_HEADS + branch.name, message=msg R_PUB + branch.name, R_HEADS + branch.name, message=msg
) )
@ -1444,7 +1440,7 @@ class Project:
return self.bare_git.rev_list(self.revisionExpr, "-1")[0] return self.bare_git.rev_list(self.revisionExpr, "-1")[0]
except GitError: except GitError:
raise ManifestInvalidRevisionError( raise ManifestInvalidRevisionError(
"revision %s in %s not found" % (self.revisionExpr, self.name) f"revision {self.revisionExpr} in {self.name} not found"
) )
def GetRevisionId(self, all_refs=None): def GetRevisionId(self, all_refs=None):
@ -1461,7 +1457,7 @@ class Project:
return self.bare_git.rev_parse("--verify", "%s^0" % rev) return self.bare_git.rev_parse("--verify", "%s^0" % rev)
except GitError: except GitError:
raise ManifestInvalidRevisionError( raise ManifestInvalidRevisionError(
"revision %s in %s not found" % (self.revisionExpr, self.name) f"revision {self.revisionExpr} in {self.name} not found"
) )
def SetRevisionId(self, revisionId): def SetRevisionId(self, revisionId):
@ -1773,9 +1769,7 @@ class Project:
raise DeleteDirtyWorktreeError(msg, project=self) raise DeleteDirtyWorktreeError(msg, project=self)
if not quiet: if not quiet:
print( print(f"{self.RelPath(local=False)}: Deleting obsolete checkout.")
"%s: Deleting obsolete checkout." % (self.RelPath(local=False),)
)
# Unlock and delink from the main worktree. We don't use git's worktree # Unlock and delink from the main worktree. We don't use git's worktree
# remove because it will recursively delete projects -- we handle that # remove because it will recursively delete projects -- we handle that
@ -1968,7 +1962,7 @@ class Project:
# target branch, but otherwise take no other action. # target branch, but otherwise take no other action.
_lwrite( _lwrite(
self.work_git.GetDotgitPath(subpath=HEAD), self.work_git.GetDotgitPath(subpath=HEAD),
"ref: %s%s\n" % (R_HEADS, name), f"ref: {R_HEADS}{name}\n",
) )
return True return True
@ -2277,7 +2271,7 @@ class Project:
self.config.SetString("core.repositoryFormatVersion", str(version)) self.config.SetString("core.repositoryFormatVersion", str(version))
# Enable the extension! # Enable the extension!
self.config.SetString("extensions.%s" % (key,), value) self.config.SetString(f"extensions.{key}", value)
def ResolveRemoteHead(self, name=None): def ResolveRemoteHead(self, name=None):
"""Find out what the default branch (HEAD) points to. """Find out what the default branch (HEAD) points to.
@ -2447,7 +2441,7 @@ class Project:
old_packed_lines = [] old_packed_lines = []
for r in sorted(all_refs): for r in sorted(all_refs):
line = "%s %s\n" % (all_refs[r], r) line = f"{all_refs[r]} {r}\n"
tmp_packed_lines.append(line) tmp_packed_lines.append(line)
if r not in tmp: if r not in tmp:
old_packed_lines.append(line) old_packed_lines.append(line)
@ -2617,7 +2611,7 @@ class Project:
# one. # one.
if not verbose and gitcmd.stdout: if not verbose and gitcmd.stdout:
print( print(
"\n%s:\n%s" % (self.name, gitcmd.stdout), f"\n{self.name}:\n{gitcmd.stdout}",
end="", end="",
file=output_redir, file=output_redir,
) )
@ -2752,7 +2746,7 @@ class Project:
proc = None proc = None
with Trace("Fetching bundle: %s", " ".join(cmd)): with Trace("Fetching bundle: %s", " ".join(cmd)):
if verbose: if verbose:
print("%s: Downloading bundle: %s" % (self.name, srcUrl)) print(f"{self.name}: Downloading bundle: {srcUrl}")
stdout = None if verbose else subprocess.PIPE stdout = None if verbose else subprocess.PIPE
stderr = None if verbose else subprocess.STDOUT stderr = None if verbose else subprocess.STDOUT
try: try:
@ -2810,7 +2804,7 @@ class Project:
if GitCommand(self, cmd).Wait() != 0: if GitCommand(self, cmd).Wait() != 0:
if self._allrefs: if self._allrefs:
raise GitError( raise GitError(
"%s checkout %s " % (self.name, rev), project=self.name f"{self.name} checkout {rev} ", project=self.name
) )
def _CherryPick(self, rev, ffonly=False, record_origin=False): def _CherryPick(self, rev, ffonly=False, record_origin=False):
@ -2824,7 +2818,7 @@ class Project:
if GitCommand(self, cmd).Wait() != 0: if GitCommand(self, cmd).Wait() != 0:
if self._allrefs: if self._allrefs:
raise GitError( raise GitError(
"%s cherry-pick %s " % (self.name, rev), project=self.name f"{self.name} cherry-pick {rev} ", project=self.name
) )
def _LsRemote(self, refs): def _LsRemote(self, refs):
@ -2841,9 +2835,7 @@ class Project:
cmd.append("--") cmd.append("--")
if GitCommand(self, cmd).Wait() != 0: if GitCommand(self, cmd).Wait() != 0:
if self._allrefs: if self._allrefs:
raise GitError( raise GitError(f"{self.name} revert {rev} ", project=self.name)
"%s revert %s " % (self.name, rev), project=self.name
)
def _ResetHard(self, rev, quiet=True): def _ResetHard(self, rev, quiet=True):
cmd = ["reset", "--hard"] cmd = ["reset", "--hard"]
@ -2852,7 +2844,7 @@ class Project:
cmd.append(rev) cmd.append(rev)
if GitCommand(self, cmd).Wait() != 0: if GitCommand(self, cmd).Wait() != 0:
raise GitError( raise GitError(
"%s reset --hard %s " % (self.name, rev), project=self.name f"{self.name} reset --hard {rev} ", project=self.name
) )
def _SyncSubmodules(self, quiet=True): def _SyncSubmodules(self, quiet=True):
@ -2871,18 +2863,14 @@ class Project:
cmd.extend(["--onto", onto]) cmd.extend(["--onto", onto])
cmd.append(upstream) cmd.append(upstream)
if GitCommand(self, cmd).Wait() != 0: if GitCommand(self, cmd).Wait() != 0:
raise GitError( raise GitError(f"{self.name} rebase {upstream} ", project=self.name)
"%s rebase %s " % (self.name, upstream), project=self.name
)
def _FastForward(self, head, ffonly=False): def _FastForward(self, head, ffonly=False):
cmd = ["merge", "--no-stat", head] cmd = ["merge", "--no-stat", head]
if ffonly: if ffonly:
cmd.append("--ff-only") cmd.append("--ff-only")
if GitCommand(self, cmd).Wait() != 0: if GitCommand(self, cmd).Wait() != 0:
raise GitError( raise GitError(f"{self.name} merge {head} ", project=self.name)
"%s merge %s " % (self.name, head), project=self.name
)
def _InitGitDir(self, mirror_git=None, force_sync=False, quiet=False): def _InitGitDir(self, mirror_git=None, force_sync=False, quiet=False):
init_git_dir = not os.path.exists(self.gitdir) init_git_dir = not os.path.exists(self.gitdir)
@ -3171,8 +3159,9 @@ class Project:
"--force-sync not enabled; cannot overwrite a local " "--force-sync not enabled; cannot overwrite a local "
"work tree. If you're comfortable with the " "work tree. If you're comfortable with the "
"possibility of losing the work tree's git metadata," "possibility of losing the work tree's git metadata,"
" use `repo sync --force-sync {0}` to " " use "
"proceed.".format(self.RelPath(local=False)), f"`repo sync --force-sync {self.RelPath(local=False)}` "
"to proceed.",
project=self.name, project=self.name,
) )
@ -3686,12 +3675,12 @@ class Project:
config = kwargs.pop("config", None) config = kwargs.pop("config", None)
for k in kwargs: for k in kwargs:
raise TypeError( raise TypeError(
"%s() got an unexpected keyword argument %r" % (name, k) f"{name}() got an unexpected keyword argument {k!r}"
) )
if config is not None: if config is not None:
for k, v in config.items(): for k, v in config.items():
cmdv.append("-c") cmdv.append("-c")
cmdv.append("%s=%s" % (k, v)) cmdv.append(f"{k}={v}")
cmdv.append(name) cmdv.append(name)
cmdv.extend(args) cmdv.extend(args)
p = GitCommand( p = GitCommand(

94
repo
View File

@ -33,7 +33,7 @@ import sys
# bit more flexible with older systems. See that file for more details on the # bit more flexible with older systems. See that file for more details on the
# versions we select. # versions we select.
MIN_PYTHON_VERSION_SOFT = (3, 6) MIN_PYTHON_VERSION_SOFT = (3, 6)
MIN_PYTHON_VERSION_HARD = (3, 5) MIN_PYTHON_VERSION_HARD = (3, 6)
# Keep basic logic in sync with repo_trace.py. # Keep basic logic in sync with repo_trace.py.
@ -96,7 +96,7 @@ def check_python_version():
# bridge the gap. This is the fallback anyways so perf isn't critical. # bridge the gap. This is the fallback anyways so perf isn't critical.
min_major, min_minor = MIN_PYTHON_VERSION_SOFT min_major, min_minor = MIN_PYTHON_VERSION_SOFT
for inc in range(0, 10): for inc in range(0, 10):
reexec("python{}.{}".format(min_major, min_minor + inc)) reexec(f"python{min_major}.{min_minor + inc}")
# Fallback to older versions if possible. # Fallback to older versions if possible.
for inc in range( for inc in range(
@ -105,7 +105,7 @@ def check_python_version():
# Don't downgrade, and don't reexec ourselves (which would infinite loop). # Don't downgrade, and don't reexec ourselves (which would infinite loop).
if (min_major, min_minor - inc) <= (major, minor): if (min_major, min_minor - inc) <= (major, minor):
break break
reexec("python{}.{}".format(min_major, min_minor - inc)) reexec(f"python{min_major}.{min_minor - inc}")
# Try the generic Python 3 wrapper, but only if it's new enough. If it # Try the generic Python 3 wrapper, but only if it's new enough. If it
# isn't, we want to just give up below and make the user resolve things. # isn't, we want to just give up below and make the user resolve things.
@ -566,8 +566,7 @@ def run_command(cmd, **kwargs):
return output.decode("utf-8") return output.decode("utf-8")
except UnicodeError: except UnicodeError:
print( print(
"repo: warning: Invalid UTF-8 output:\ncmd: %r\n%r" f"repo: warning: Invalid UTF-8 output:\ncmd: {cmd!r}\n{output}",
% (cmd, output),
file=sys.stderr, file=sys.stderr,
) )
return output.decode("utf-8", "backslashreplace") return output.decode("utf-8", "backslashreplace")
@ -590,20 +589,17 @@ def run_command(cmd, **kwargs):
# If things failed, print useful debugging output. # If things failed, print useful debugging output.
if check and ret.returncode: if check and ret.returncode:
print( print(
'repo: error: "%s" failed with exit status %s' f'repo: error: "{cmd[0]}" failed with exit status {ret.returncode}',
% (cmd[0], ret.returncode),
file=sys.stderr,
)
print(
" cwd: %s\n cmd: %r" % (kwargs.get("cwd", os.getcwd()), cmd),
file=sys.stderr, file=sys.stderr,
) )
cwd = kwargs.get("cwd", os.getcwd())
print(f" cwd: {cwd}\n cmd: {cmd!r}", file=sys.stderr)
def _print_output(name, output): def _print_output(name, output):
if output: if output:
print( print(
" %s:\n >> %s" f" {name}:"
% (name, "\n >> ".join(output.splitlines())), + "".join(f"\n >> {x}" for x in output.splitlines()),
file=sys.stderr, file=sys.stderr,
) )
@ -719,7 +715,7 @@ def _Init(args, gitc_init=False):
except OSError as e: except OSError as e:
if e.errno != errno.EEXIST: if e.errno != errno.EEXIST:
print( print(
"fatal: cannot make %s directory: %s" % (repodir, e.strerror), f"fatal: cannot make {repodir} directory: {e.strerror}",
file=sys.stderr, file=sys.stderr,
) )
# Don't raise CloneFailure; that would delete the # Don't raise CloneFailure; that would delete the
@ -817,7 +813,7 @@ def _CheckGitVersion():
if ver_act < MIN_GIT_VERSION: if ver_act < MIN_GIT_VERSION:
need = ".".join(map(str, MIN_GIT_VERSION)) need = ".".join(map(str, MIN_GIT_VERSION))
print( print(
"fatal: git %s or later required; found %s" % (need, ver_act.full), f"fatal: git {need} or later required; found {ver_act.full}",
file=sys.stderr, file=sys.stderr,
) )
raise CloneFailure() raise CloneFailure()
@ -836,7 +832,8 @@ def SetGitTrace2ParentSid(env=None):
KEY = "GIT_TRACE2_PARENT_SID" KEY = "GIT_TRACE2_PARENT_SID"
now = datetime.datetime.now(datetime.timezone.utc) now = datetime.datetime.now(datetime.timezone.utc)
value = "repo-%s-P%08x" % (now.strftime("%Y%m%dT%H%M%SZ"), os.getpid()) timestamp = now.strftime("%Y%m%dT%H%M%SZ")
value = f"repo-{timestamp}-P{os.getpid():08x}"
# If it's already set, then append ourselves. # If it's already set, then append ourselves.
if KEY in env: if KEY in env:
@ -880,8 +877,7 @@ def SetupGnuPG(quiet):
except OSError as e: except OSError as e:
if e.errno != errno.EEXIST: if e.errno != errno.EEXIST:
print( print(
"fatal: cannot make %s directory: %s" f"fatal: cannot make {home_dot_repo} directory: {e.strerror}",
% (home_dot_repo, e.strerror),
file=sys.stderr, file=sys.stderr,
) )
sys.exit(1) sys.exit(1)
@ -891,15 +887,15 @@ def SetupGnuPG(quiet):
except OSError as e: except OSError as e:
if e.errno != errno.EEXIST: if e.errno != errno.EEXIST:
print( print(
"fatal: cannot make %s directory: %s" % (gpg_dir, e.strerror), f"fatal: cannot make {gpg_dir} directory: {e.strerror}",
file=sys.stderr, file=sys.stderr,
) )
sys.exit(1) sys.exit(1)
if not quiet: if not quiet:
print( print(
"repo: Updating release signing keys to keyset ver %s" "repo: Updating release signing keys to keyset ver "
% (".".join(str(x) for x in KEYRING_VERSION),) + ".".join(str(x) for x in KEYRING_VERSION),
) )
# NB: We use --homedir (and cwd below) because some environments (Windows) do # NB: We use --homedir (and cwd below) because some environments (Windows) do
# not correctly handle full native paths. We avoid the issue by changing to # not correctly handle full native paths. We avoid the issue by changing to
@ -951,7 +947,7 @@ def _GetRepoConfig(name):
return None return None
else: else:
print( print(
"repo: error: git %s failed:\n%s" % (" ".join(cmd), ret.stderr), f"repo: error: git {' '.join(cmd)} failed:\n{ret.stderr}",
file=sys.stderr, file=sys.stderr,
) )
raise RunError() raise RunError()
@ -1064,7 +1060,7 @@ def _Clone(url, cwd, clone_bundle, quiet, verbose):
os.mkdir(cwd) os.mkdir(cwd)
except OSError as e: except OSError as e:
print( print(
"fatal: cannot make %s directory: %s" % (cwd, e.strerror), f"fatal: cannot make {cwd} directory: {e.strerror}",
file=sys.stderr, file=sys.stderr,
) )
raise CloneFailure() raise CloneFailure()
@ -1104,7 +1100,7 @@ def resolve_repo_rev(cwd, committish):
ret = run_git( ret = run_git(
"rev-parse", "rev-parse",
"--verify", "--verify",
"%s^{commit}" % (committish,), f"{committish}^{{commit}}",
cwd=cwd, cwd=cwd,
check=False, check=False,
) )
@ -1117,7 +1113,7 @@ def resolve_repo_rev(cwd, committish):
rev = resolve("refs/remotes/origin/%s" % committish) rev = resolve("refs/remotes/origin/%s" % committish)
if rev is None: if rev is None:
print( print(
'repo: error: unknown branch "%s"' % (committish,), f'repo: error: unknown branch "{committish}"',
file=sys.stderr, file=sys.stderr,
) )
raise CloneFailure() raise CloneFailure()
@ -1130,7 +1126,8 @@ def resolve_repo_rev(cwd, committish):
rev = resolve(remote_ref) rev = resolve(remote_ref)
if rev is None: if rev is None:
print( print(
'repo: error: unknown tag "%s"' % (committish,), file=sys.stderr f'repo: error: unknown tag "{committish}"',
file=sys.stderr,
) )
raise CloneFailure() raise CloneFailure()
return (remote_ref, rev) return (remote_ref, rev)
@ -1138,12 +1135,12 @@ def resolve_repo_rev(cwd, committish):
# See if it's a short branch name. # See if it's a short branch name.
rev = resolve("refs/remotes/origin/%s" % committish) rev = resolve("refs/remotes/origin/%s" % committish)
if rev: if rev:
return ("refs/heads/%s" % (committish,), rev) return (f"refs/heads/{committish}", rev)
# See if it's a tag. # See if it's a tag.
rev = resolve("refs/tags/%s" % committish) rev = resolve(f"refs/tags/{committish}")
if rev: if rev:
return ("refs/tags/%s" % (committish,), rev) return (f"refs/tags/{committish}", rev)
# See if it's a commit. # See if it's a commit.
rev = resolve(committish) rev = resolve(committish)
@ -1152,7 +1149,8 @@ def resolve_repo_rev(cwd, committish):
# Give up! # Give up!
print( print(
'repo: error: unable to resolve "%s"' % (committish,), file=sys.stderr f'repo: error: unable to resolve "{committish}"',
file=sys.stderr,
) )
raise CloneFailure() raise CloneFailure()
@ -1168,8 +1166,8 @@ def verify_rev(cwd, remote_ref, rev, quiet):
if not quiet: if not quiet:
print(file=sys.stderr) print(file=sys.stderr)
print( print(
"warning: '%s' is not signed; falling back to signed release '%s'" f"warning: '{remote_ref}' is not signed; "
% (remote_ref, cur), f"falling back to signed release '{cur}'",
file=sys.stderr, file=sys.stderr,
) )
print(file=sys.stderr) print(file=sys.stderr)
@ -1222,7 +1220,7 @@ def _ExpandAlias(name):
if name in {"gitc-init", "help", "init"}: if name in {"gitc-init", "help", "init"}:
return name, [] return name, []
alias = _GetRepoConfig("alias.%s" % (name,)) alias = _GetRepoConfig(f"alias.{name}")
if alias is None: if alias is None:
return name, [] return name, []
@ -1318,18 +1316,20 @@ class Requirements:
hard_ver = tuple(self._get_hard_ver(pkg)) hard_ver = tuple(self._get_hard_ver(pkg))
if curr_ver < hard_ver: if curr_ver < hard_ver:
print( print(
'repo: error: Your version of "%s" (%s) is unsupported; ' f'repo: error: Your version of "{pkg}" '
"Please upgrade to at least version %s to continue." f"({self._format_ver(curr_ver)}) is unsupported; "
% (pkg, self._format_ver(curr_ver), self._format_ver(soft_ver)), "Please upgrade to at least version "
f"{self._format_ver(soft_ver)} to continue.",
file=sys.stderr, file=sys.stderr,
) )
sys.exit(1) sys.exit(1)
if curr_ver < soft_ver: if curr_ver < soft_ver:
print( print(
'repo: warning: Your version of "%s" (%s) is no longer supported; ' f'repo: error: Your version of "{pkg}" '
"Please upgrade to at least version %s to avoid breakage." f"({self._format_ver(curr_ver)}) is no longer supported; "
% (pkg, self._format_ver(curr_ver), self._format_ver(soft_ver)), "Please upgrade to at least version "
f"{self._format_ver(soft_ver)} to continue.",
file=sys.stderr, file=sys.stderr,
) )
@ -1390,20 +1390,18 @@ def _Help(args):
def _Version(): def _Version():
"""Show version information.""" """Show version information."""
print("<repo not installed>") print("<repo not installed>")
print("repo launcher version %s" % (".".join(str(x) for x in VERSION),)) print(f"repo launcher version {'.'.join(str(x) for x in VERSION)}")
print(" (from %s)" % (__file__,)) print(f" (from {__file__})")
print("git %s" % (ParseGitVersion().full,)) print(f"git {ParseGitVersion().full}")
print("Python %s" % sys.version) print(f"Python {sys.version}")
uname = platform.uname() uname = platform.uname()
if sys.version_info.major < 3: if sys.version_info.major < 3:
# Python 3 returns a named tuple, but Python 2 is simpler. # Python 3 returns a named tuple, but Python 2 is simpler.
print(uname) print(uname)
else: else:
print("OS %s %s (%s)" % (uname.system, uname.release, uname.version)) print(f"OS {uname.system} {uname.release} ({uname.version})")
print( processor = uname.processor if uname.processor else "unknown"
"CPU %s (%s)" print(f"CPU {uname.machine} ({processor})")
% (uname.machine, uname.processor if uname.processor else "unknown")
)
print("Bug reports:", BUG_URL) print("Bug reports:", BUG_URL)
sys.exit(0) sys.exit(0)

2
ssh.py
View File

@ -165,7 +165,7 @@ class ProxyManager:
# Check to see whether we already think that the master is running; if # Check to see whether we already think that the master is running; if
# we think it's already running, return right away. # we think it's already running, return right away.
if port is not None: if port is not None:
key = "%s:%s" % (host, port) key = f"{host}:{port}"
else: else:
key = host key = host

4
subcmds/__init__.py
View File

@ -37,9 +37,7 @@ for py in os.listdir(my_dir):
try: try:
cmd = getattr(mod, clsn) cmd = getattr(mod, clsn)
except AttributeError: except AttributeError:
raise SyntaxError( raise SyntaxError(f"{__name__}/{py} does not define class {clsn}")
"%s/%s does not define class %s" % (__name__, py, clsn)
)
name = name.replace("_", "-") name = name.replace("_", "-")
cmd.NAME = name cmd.NAME = name

4
subcmds/abandon.py
View File

@ -117,7 +117,7 @@ It is equivalent to "git branch -D <branchname>".
all_projects, all_projects,
callback=_ProcessResults, callback=_ProcessResults,
output=Progress( output=Progress(
"Abandon %s" % (nb,), len(all_projects), quiet=opt.quiet f"Abandon {nb}", len(all_projects), quiet=opt.quiet
), ),
) )
@ -152,4 +152,4 @@ It is equivalent to "git branch -D <branchname>".
_RelPath(p) for p in success[br] _RelPath(p) for p in success[br]
) )
) )
print("%s%s| %s\n" % (br, " " * (width - len(br)), result)) print(f"{br}{' ' * (width - len(br))}| {result}\n")

2
subcmds/branches.py
View File

@ -174,7 +174,7 @@ is shown, then the branch appears in all projects.
if _RelPath(p) not in have: if _RelPath(p) not in have:
paths.append(_RelPath(p)) paths.append(_RelPath(p))
s = " %s %s" % (in_type, ", ".join(paths)) s = f" {in_type} {', '.join(paths)}"
if not i.IsSplitCurrent and (width + 7 + len(s) < 80): if not i.IsSplitCurrent and (width + 7 + len(s) < 80):
fmt = out.current if i.IsCurrent else fmt fmt = out.current if i.IsCurrent else fmt
fmt(s) fmt(s)

2
subcmds/checkout.py
View File

@ -96,7 +96,7 @@ The command is equivalent to:
all_projects, all_projects,
callback=_ProcessResults, callback=_ProcessResults,
output=Progress( output=Progress(
"Checkout %s" % (nb,), len(all_projects), quiet=opt.quiet f"Checkout {nb}", len(all_projects), quiet=opt.quiet
), ),
) )

24
subcmds/diffmanifests.py
View File

@ -87,25 +87,17 @@ synced and their revisions won't be found.
def _printRawDiff(self, diff, pretty_format=None, local=False): def _printRawDiff(self, diff, pretty_format=None, local=False):
_RelPath = lambda p: p.RelPath(local=local) _RelPath = lambda p: p.RelPath(local=local)
for project in diff["added"]: for project in diff["added"]:
self.printText( self.printText(f"A {_RelPath(project)} {project.revisionExpr}")
"A %s %s" % (_RelPath(project), project.revisionExpr)
)
self.out.nl() self.out.nl()
for project in diff["removed"]: for project in diff["removed"]:
self.printText( self.printText(f"R {_RelPath(project)} {project.revisionExpr}")
"R %s %s" % (_RelPath(project), project.revisionExpr)
)
self.out.nl() self.out.nl()
for project, otherProject in diff["changed"]: for project, otherProject in diff["changed"]:
self.printText( self.printText(
"C %s %s %s" f"C {_RelPath(project)} {project.revisionExpr} "
% ( f"{otherProject.revisionExpr}"
_RelPath(project),
project.revisionExpr,
otherProject.revisionExpr,
)
) )
self.out.nl() self.out.nl()
self._printLogs( self._printLogs(
@ -118,12 +110,8 @@ synced and their revisions won't be found.
for project, otherProject in diff["unreachable"]: for project, otherProject in diff["unreachable"]:
self.printText( self.printText(
"U %s %s %s" f"U {_RelPath(project)} {project.revisionExpr} "
% ( f"{otherProject.revisionExpr}"
_RelPath(project),
project.revisionExpr,
otherProject.revisionExpr,
)
) )
self.out.nl() self.out.nl()

2
subcmds/help.py
View File

@ -150,7 +150,7 @@ Displays detailed usage information about a command.
def _PrintAllCommandHelp(self): def _PrintAllCommandHelp(self):
for name in sorted(all_commands): for name in sorted(all_commands):
cmd = all_commands[name](manifest=self.manifest) cmd = all_commands[name](manifest=self.manifest)
self._PrintCommandHelp(cmd, header_prefix="[%s] " % (name,)) self._PrintCommandHelp(cmd, header_prefix=f"[{name}] ")
def _Options(self, p): def _Options(self, p):
p.add_option( p.add_option(

2
subcmds/info.py
View File

@ -248,7 +248,7 @@ class Info(PagedCommand):
for commit in commits: for commit in commits:
split = commit.split() split = commit.split()
self.text("{0:38}{1} ".format("", "-")) self.text(f"{'':38}{'-'} ")
self.sha(split[0] + " ") self.sha(split[0] + " ")
self.text(" ".join(split[1:])) self.text(" ".join(split[1:]))
self.out.nl() self.out.nl()

2
subcmds/init.py
View File

@ -215,7 +215,7 @@ to update the working directory files.
if not opt.quiet: if not opt.quiet:
print() print()
print("Your identity is: %s <%s>" % (name, email)) print(f"Your identity is: {name} <{email}>")
print("is this correct [y/N]? ", end="", flush=True) print("is this correct [y/N]? ", end="", flush=True)
a = sys.stdin.readline().strip().lower() a = sys.stdin.readline().strip().lower()
if a in ("yes", "y", "t", "true"): if a in ("yes", "y", "t", "true"):

2
subcmds/list.py
View File

@ -131,7 +131,7 @@ This is similar to running: repo forall -c 'echo "$REPO_PATH : $REPO_PROJECT"'.
elif opt.path_only and not opt.name_only: elif opt.path_only and not opt.name_only:
lines.append("%s" % (_getpath(project))) lines.append("%s" % (_getpath(project)))
else: else:
lines.append("%s : %s" % (_getpath(project), project.name)) lines.append(f"{_getpath(project)} : {project.name}")
if lines: if lines:
lines.sort() lines.sort()

4
subcmds/prune.py
View File

@ -83,9 +83,7 @@ class Prune(PagedCommand):
) )
if not branch.base_exists: if not branch.base_exists:
print( print(f"(ignoring: tracking branch is gone: {branch.base})")
"(ignoring: tracking branch is gone: %s)" % (branch.base,)
)
else: else:
commits = branch.commits commits = branch.commits
date = branch.date date = branch.date

2
subcmds/start.py
View File

@ -130,7 +130,7 @@ revision specified in the manifest.
all_projects, all_projects,
callback=_ProcessResults, callback=_ProcessResults,
output=Progress( output=Progress(
"Starting %s" % (nb,), len(all_projects), quiet=opt.quiet f"Starting {nb}", len(all_projects), quiet=opt.quiet
), ),
) )

2
subcmds/sync.py
View File

@ -1394,7 +1394,7 @@ later is required to fix a server side protocol bug.
if username and password: if username and password:
manifest_server = manifest_server.replace( manifest_server = manifest_server.replace(
"://", "://%s:%s@" % (username, password), 1 "://", f"://{username}:{password}@", 1
) )
transport = PersistentTransport(manifest_server) transport = PersistentTransport(manifest_server)

35
subcmds/version.py
View File

@ -42,35 +42,28 @@ class Version(Command, MirrorSafeCommand):
# These might not be the same. Report them both. # These might not be the same. Report them both.
src_ver = RepoSourceVersion() src_ver = RepoSourceVersion()
rp_ver = rp.bare_git.describe(HEAD) rp_ver = rp.bare_git.describe(HEAD)
print("repo version %s" % rp_ver) print(f"repo version {rp_ver}")
print(" (from %s)" % rem.url) print(f" (from {rem.url})")
print(" (tracking %s)" % branch.merge) print(f" (tracking {branch.merge})")
print(" (%s)" % rp.bare_git.log("-1", "--format=%cD", HEAD)) print(f" ({rp.bare_git.log('-1', '--format=%cD', HEAD)})")
if self.wrapper_path is not None: if self.wrapper_path is not None:
print("repo launcher version %s" % self.wrapper_version) print(f"repo launcher version {self.wrapper_version}")
print(" (from %s)" % self.wrapper_path) print(f" (from {self.wrapper_path})")
if src_ver != rp_ver: if src_ver != rp_ver:
print(" (currently at %s)" % src_ver) print(f" (currently at {src_ver})")
print("repo User-Agent %s" % user_agent.repo) print(f"repo User-Agent {user_agent.repo}")
print("git %s" % git.version_tuple().full) print(f"git {git.version_tuple().full}")
print("git User-Agent %s" % user_agent.git) print(f"git User-Agent {user_agent.git}")
print("Python %s" % sys.version) print(f"Python {sys.version}")
uname = platform.uname() uname = platform.uname()
if sys.version_info.major < 3: if sys.version_info.major < 3:
# Python 3 returns a named tuple, but Python 2 is simpler. # Python 3 returns a named tuple, but Python 2 is simpler.
print(uname) print(uname)
else: else:
print( print(f"OS {uname.system} {uname.release} ({uname.version})")
"OS %s %s (%s)" % (uname.system, uname.release, uname.version) processor = uname.processor if uname.processor else "unknown"
) print(f"CPU {uname.machine} ({processor})")
print(
"CPU %s (%s)"
% (
uname.machine,
uname.processor if uname.processor else "unknown",
)
)
print("Bug reports:", Wrapper().BUG_URL) print("Bug reports:", Wrapper().BUG_URL)

7
tests/test_git_command.py
View File

@ -19,12 +19,7 @@ import os
import re import re
import subprocess import subprocess
import unittest import unittest
from unittest import mock
try:
from unittest import mock
except ImportError:
import mock
import git_command import git_command
import wrapper import wrapper

2
tests/test_git_config.py
View File

@ -100,7 +100,7 @@ class GitConfigReadOnlyTests(unittest.TestCase):
("intg", 10737418240), ("intg", 10737418240),
) )
for key, value in TESTS: for key, value in TESTS:
self.assertEqual(value, self.config.GetInt("section.%s" % (key,))) self.assertEqual(value, self.config.GetInt(f"section.{key}"))
class GitConfigReadWriteTests(unittest.TestCase): class GitConfigReadWriteTests(unittest.TestCase):

2
tests/test_git_superproject.py
View File

@ -34,7 +34,7 @@ class SuperprojectTestCase(unittest.TestCase):
PARENT_SID_KEY = "GIT_TRACE2_PARENT_SID" PARENT_SID_KEY = "GIT_TRACE2_PARENT_SID"
PARENT_SID_VALUE = "parent_sid" PARENT_SID_VALUE = "parent_sid"
SELF_SID_REGEX = r"repo-\d+T\d+Z-.*" SELF_SID_REGEX = r"repo-\d+T\d+Z-.*"
FULL_SID_REGEX = r"^%s/%s" % (PARENT_SID_VALUE, SELF_SID_REGEX) FULL_SID_REGEX = rf"^{PARENT_SID_VALUE}/{SELF_SID_REGEX}"
def setUp(self): def setUp(self):
"""Set up superproject every time.""" """Set up superproject every time."""

2
tests/test_git_trace2_event_log.py
View File

@ -61,7 +61,7 @@ class EventLogTestCase(unittest.TestCase):
PARENT_SID_KEY = "GIT_TRACE2_PARENT_SID" PARENT_SID_KEY = "GIT_TRACE2_PARENT_SID"
PARENT_SID_VALUE = "parent_sid" PARENT_SID_VALUE = "parent_sid"
SELF_SID_REGEX = r"repo-\d+T\d+Z-.*" SELF_SID_REGEX = r"repo-\d+T\d+Z-.*"
FULL_SID_REGEX = r"^%s/%s" % (PARENT_SID_VALUE, SELF_SID_REGEX) FULL_SID_REGEX = rf"^{PARENT_SID_VALUE}/{SELF_SID_REGEX}"
def setUp(self): def setUp(self):
"""Load the event_log module every time.""" """Load the event_log module every time."""

6
tests/test_manifest_xml.py
View File

@ -198,13 +198,13 @@ class ValueTests(unittest.TestCase):
def test_bool_true(self): def test_bool_true(self):
"""Check XmlBool true values.""" """Check XmlBool true values."""
for value in ("yes", "true", "1"): for value in ("yes", "true", "1"):
node = self._get_node('<node a="%s"/>' % (value,)) node = self._get_node(f'<node a="{value}"/>')
self.assertTrue(manifest_xml.XmlBool(node, "a")) self.assertTrue(manifest_xml.XmlBool(node, "a"))
def test_bool_false(self): def test_bool_false(self):
"""Check XmlBool false values.""" """Check XmlBool false values."""
for value in ("no", "false", "0"): for value in ("no", "false", "0"):
node = self._get_node('<node a="%s"/>' % (value,)) node = self._get_node(f'<node a="{value}"/>')
self.assertFalse(manifest_xml.XmlBool(node, "a")) self.assertFalse(manifest_xml.XmlBool(node, "a"))
def test_int_default(self): def test_int_default(self):
@ -220,7 +220,7 @@ class ValueTests(unittest.TestCase):
def test_int_good(self): def test_int_good(self):
"""Check XmlInt numeric handling.""" """Check XmlInt numeric handling."""
for value in (-1, 0, 1, 50000): for value in (-1, 0, 1, 50000):
node = self._get_node('<node a="%s"/>' % (value,)) node = self._get_node(f'<node a="{value}"/>')
self.assertEqual(value, manifest_xml.XmlInt(node, "a")) self.assertEqual(value, manifest_xml.XmlInt(node, "a"))
def test_int_invalid(self): def test_int_invalid(self):

2
tests/test_project.py
View File

@ -151,7 +151,7 @@ class CopyLinkTestCase(unittest.TestCase):
# "". # "".
break break
result = os.path.exists(path) result = os.path.exists(path)
msg.append("\tos.path.exists(%s): %s" % (path, result)) msg.append(f"\tos.path.exists({path}): {result}")
if result: if result:
msg.append("\tcontents: %r" % os.listdir(path)) msg.append("\tcontents: %r" % os.listdir(path))
break break