diff --git a/mrhlpr/frontend.py b/mrhlpr/frontend.py index d6757a8e7e62f317e7c46749c4b5871506890386..76d4900ceb443ddc9f4af90ed7dfece1eb30dcd3 100644 --- a/mrhlpr/frontend.py +++ b/mrhlpr/frontend.py @@ -187,12 +187,11 @@ def print_status(mr_id: int, no_cache: bool = False) -> None: if len(commits) > 1: print_error( - f"* {len(commits)} commits: consider squashing" - f" ('git rebase -i origin/{target_branch}')" + f"* {len(commits)} commits: consider squashing ('git rebase -i origin/{target_branch}')" ) if not is_rebased: - print_error(f"* Rebase on {target_branch} ('git" f" rebase origin/{target_branch}')") + print_error(f"* Rebase on {target_branch} ('git rebase origin/{target_branch}')") print_error("* Check again ('mrhlpr status')") return @@ -220,7 +219,7 @@ def get_parser() -> argparse.ArgumentParser: "-v", "--verbose", action="store_true", - help="display debug log: all git commands and" " locations of http cache files", + help="display debug log: all git commands and locations of http cache files", ) parser.add_argument( "-V", "--version", action="version", version=version.get_full_version_information() @@ -239,7 +238,7 @@ def get_parser() -> argparse.ArgumentParser: "--no-fetch", action="store_false", dest="fetch", - help="do not fetch the remote and origin" " repositories", + help="do not fetch the remote and origin repositories", ) checkout.add_argument( "-o", diff --git a/mrhlpr/mr.py b/mrhlpr/mr.py index fbd07e28bed101b27f4609c81a616e25821ce232..da1de03c886831a84da5edfe44f0a342dbb8e831 100644 --- a/mrhlpr/mr.py +++ b/mrhlpr/mr.py @@ -226,7 +226,7 @@ def checkout( git.run(["remote", "set-url", remote_local, url]) git.run(["remote", "set-url", "--push", remote_local, url_push]) else: - print("ERROR: Remote '" + remote_local + "' already exists and has" " a different URL.") + print("ERROR: Remote '" + remote_local + "' already exists and has a different URL.") print() print("existing: " + existing) print("expected: " + url) @@ -275,7 +275,7 @@ def checkout( # Check existing branch remote_existing = git.branch_remote(branch_local) if remote_existing != remote_local: - print("Branch '" + branch_local + "' exists, but points to a" " different remote.") + print("Branch '" + branch_local + "' exists, but points to a different remote.") print() print("existing remote: " + str(remote_existing)) print("expected remote: " + remote_local) diff --git a/mrhlpr/pipeline.py b/mrhlpr/pipeline.py index f4972033acfaad30559b24fefb0d3b1b32e9ceda..e018624b753be50c8211fb9ca3b107f7ec744ab5 100644 --- a/mrhlpr/pipeline.py +++ b/mrhlpr/pipeline.py @@ -51,7 +51,7 @@ class PipelineMetadata: job = self._get_build_job(api_pipeline_jobs) if not job: logging.error( - "ERROR: could not find build job with device's architecture in the" " pipeline." + "ERROR: could not find build job with device's architecture in the pipeline." ) exit(1) diff --git a/mrtest/frontend.py b/mrtest/frontend.py index d8f98c9555800cd38849efc2edd95162a916d91a..fabfd0ad752546b727e35b7f49604e072ddc2fff 100644 --- a/mrtest/frontend.py +++ b/mrtest/frontend.py @@ -56,7 +56,7 @@ def get_parser() -> argparse.ArgumentParser: "-v", "--verbose", action="store_true", - help="display debug log: all commands and locations of" " http cache files", + help="display debug log: all commands and locations of http cache files", ) parser.add_argument( "-V", "--version", action="version", version=mrhlpr.version.get_full_version_information()