diff options
Diffstat (limited to 'subcmds')
-rw-r--r-- | subcmds/cherry_pick.py | 2 | ||||
-rw-r--r-- | subcmds/manifest.py | 6 | ||||
-rw-r--r-- | subcmds/rebase.py | 2 | ||||
-rw-r--r-- | subcmds/sync.py | 2 | ||||
-rw-r--r-- | subcmds/upload.py | 6 |
5 files changed, 9 insertions, 9 deletions
diff --git a/subcmds/cherry_pick.py b/subcmds/cherry_pick.py index f9ae3e32..3d219333 100644 --- a/subcmds/cherry_pick.py +++ b/subcmds/cherry_pick.py | |||
@@ -86,7 +86,7 @@ change id will be added. | |||
86 | p.Wait() | 86 | p.Wait() |
87 | except GitError as e: | 87 | except GitError as e: |
88 | logger.error(e) | 88 | logger.error(e) |
89 | logger.warn( | 89 | logger.warning( |
90 | "NOTE: When committing (please see above) and editing the " | 90 | "NOTE: When committing (please see above) and editing the " |
91 | "commit message, please remove the old Change-Id-line and " | 91 | "commit message, please remove the old Change-Id-line and " |
92 | "add:\n%s", | 92 | "add:\n%s", |
diff --git a/subcmds/manifest.py b/subcmds/manifest.py index 101240d1..bb6dc930 100644 --- a/subcmds/manifest.py +++ b/subcmds/manifest.py | |||
@@ -136,7 +136,7 @@ to indicate the remote ref to push changes to via 'repo upload'. | |||
136 | manifest.SetUseLocalManifests(not opt.ignore_local_manifests) | 136 | manifest.SetUseLocalManifests(not opt.ignore_local_manifests) |
137 | 137 | ||
138 | if opt.json: | 138 | if opt.json: |
139 | logger.warn("warning: --json is experimental!") | 139 | logger.warning("warning: --json is experimental!") |
140 | doc = manifest.ToDict( | 140 | doc = manifest.ToDict( |
141 | peg_rev=opt.peg_rev, | 141 | peg_rev=opt.peg_rev, |
142 | peg_rev_upstream=opt.peg_rev_upstream, | 142 | peg_rev_upstream=opt.peg_rev_upstream, |
@@ -163,13 +163,13 @@ to indicate the remote ref to push changes to via 'repo upload'. | |||
163 | if output_file != "-": | 163 | if output_file != "-": |
164 | fd.close() | 164 | fd.close() |
165 | if manifest.path_prefix: | 165 | if manifest.path_prefix: |
166 | logger.warn( | 166 | logger.warning( |
167 | "Saved %s submanifest to %s", | 167 | "Saved %s submanifest to %s", |
168 | manifest.path_prefix, | 168 | manifest.path_prefix, |
169 | output_file, | 169 | output_file, |
170 | ) | 170 | ) |
171 | else: | 171 | else: |
172 | logger.warn("Saved manifest to %s", output_file) | 172 | logger.warning("Saved manifest to %s", output_file) |
173 | 173 | ||
174 | def ValidateOptions(self, opt, args): | 174 | def ValidateOptions(self, opt, args): |
175 | if args: | 175 | if args: |
diff --git a/subcmds/rebase.py b/subcmds/rebase.py index 439557c2..db1b387c 100644 --- a/subcmds/rebase.py +++ b/subcmds/rebase.py | |||
@@ -113,7 +113,7 @@ branch but need to incorporate new upstream changes "underneath" them. | |||
113 | ) | 113 | ) |
114 | 114 | ||
115 | if len(args) == 1: | 115 | if len(args) == 1: |
116 | logger.warn( | 116 | logger.warning( |
117 | "note: project %s is mapped to more than one path", args[0] | 117 | "note: project %s is mapped to more than one path", args[0] |
118 | ) | 118 | ) |
119 | 119 | ||
diff --git a/subcmds/sync.py b/subcmds/sync.py index 85428b18..e1f7d019 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py | |||
@@ -1877,7 +1877,7 @@ def _PostRepoUpgrade(manifest, quiet=False): | |||
1877 | 1877 | ||
1878 | def _PostRepoFetch(rp, repo_verify=True, verbose=False): | 1878 | def _PostRepoFetch(rp, repo_verify=True, verbose=False): |
1879 | if rp.HasChanges: | 1879 | if rp.HasChanges: |
1880 | logger.warn("info: A new version of repo is available") | 1880 | logger.warning("info: A new version of repo is available") |
1881 | wrapper = Wrapper() | 1881 | wrapper = Wrapper() |
1882 | try: | 1882 | try: |
1883 | rev = rp.bare_git.describe(rp.GetRevisionId()) | 1883 | rev = rp.bare_git.describe(rp.GetRevisionId()) |
diff --git a/subcmds/upload.py b/subcmds/upload.py index 618a10e1..4bcdfaf9 100644 --- a/subcmds/upload.py +++ b/subcmds/upload.py | |||
@@ -72,16 +72,16 @@ def _VerifyPendingCommits(branches: List[ReviewableBranch]) -> bool: | |||
72 | # If any branch has many commits, prompt the user. | 72 | # If any branch has many commits, prompt the user. |
73 | if many_commits: | 73 | if many_commits: |
74 | if len(branches) > 1: | 74 | if len(branches) > 1: |
75 | logger.warn( | 75 | logger.warning( |
76 | "ATTENTION: One or more branches has an unusually high number " | 76 | "ATTENTION: One or more branches has an unusually high number " |
77 | "of commits." | 77 | "of commits." |
78 | ) | 78 | ) |
79 | else: | 79 | else: |
80 | logger.warn( | 80 | logger.warning( |
81 | "ATTENTION: You are uploading an unusually high number of " | 81 | "ATTENTION: You are uploading an unusually high number of " |
82 | "commits." | 82 | "commits." |
83 | ) | 83 | ) |
84 | logger.warn( | 84 | logger.warning( |
85 | "YOU PROBABLY DO NOT MEAN TO DO THIS. (Did you rebase across " | 85 | "YOU PROBABLY DO NOT MEAN TO DO THIS. (Did you rebase across " |
86 | "branches?)" | 86 | "branches?)" |
87 | ) | 87 | ) |