From 2c384dbd87f6998ec75c96ebc3d3e37399a60a24 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 18 Jul 2023 19:30:30 +0000 Subject: [PATCH] repo_launcher: sync with upstream Bug: b/272513582 Change-Id: I3da351286caa5bb359aaf841238990f3a0c27d9d Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4696173 Auto-Submit: Mike Frysinger Reviewed-by: Anuj Jamwal Commit-Queue: Anuj Jamwal --- repo_launcher | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/repo_launcher b/repo_launcher index cd20fb1fc..5f04b8701 100755 --- a/repo_launcher +++ b/repo_launcher @@ -149,7 +149,7 @@ if not REPO_REV: BUG_URL = 'https://issues.gerritcodereview.com/issues/new?component=1370071' # increment this whenever we make important changes to this script -VERSION = (2, 32) +VERSION = (2, 35) # increment this if the MAINTAINER_KEYS block is modified KEYRING_VERSION = (2, 3) @@ -506,10 +506,10 @@ def gitc_parse_clientdir(gitc_fs_path): """Parse a path in the GITC FS and return its client name. Args: - gitc_fs_path: A subdirectory path within the GITC_FS_ROOT_DIR. + gitc_fs_path: A subdirectory path within the GITC_FS_ROOT_DIR. Returns: - The GITC client name. + The GITC client name. """ if gitc_fs_path == GITC_FS_ROOT_DIR: return None @@ -942,14 +942,14 @@ def resolve_repo_rev(cwd, committish): * xxx: Branch or tag or commit. Args: - cwd: The git checkout to run in. - committish: The REPO_REV argument to resolve. + cwd: The git checkout to run in. + committish: The REPO_REV argument to resolve. Returns: - A tuple of (remote ref, commit) as makes sense for the committish. - For branches, this will look like ('refs/heads/stable', ). - For tags, this will look like ('refs/tags/v1.0', ). - For commits, this will be (, ). + A tuple of (remote ref, commit) as makes sense for the committish. + For branches, this will look like ('refs/heads/stable', ). + For tags, this will look like ('refs/tags/v1.0', ). + For commits, this will be (, ). """ def resolve(committish): ret = run_git('rev-parse', '--verify', '%s^{commit}' % (committish,), @@ -1104,7 +1104,7 @@ class Requirements(object): """Initialize. Args: - requirements: A dictionary of settings. + requirements: A dictionary of settings. """ self.requirements = requirements