summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHunor Csomortáni <csomh@redhat.com>2022-12-02 16:28:00 +0100
committerHunor Csomortáni <csomh@redhat.com>2022-12-06 14:08:37 +0100
commit3d083655f10ad6ff0eef1f4a628d5635890ab4f3 (patch)
treeb5a0a97793e8e6d3bee65a67c22423d0a12ada90
parentce4e58d118dae7d52ef375efc48e06e08ab3bfe4 (diff)
downloadmutter-3d083655f10ad6ff0eef1f4a628d5635890ab4f3.tar.gz
check-style: Improve the proposed git-rebase command
Include the sha used for the dry-run instead of using 'origin/main'. Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2733>
-rwxr-xr-xcheck-style.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/check-style.py b/check-style.py
index a4daefaa4..cabcbb7cc 100755
--- a/check-style.py
+++ b/check-style.py
@@ -120,7 +120,7 @@ def reformat_chunks(chunks, rewrite):
return changed
-parser = argparse.ArgumentParser(description='Check code style.')
+parser = argparse.ArgumentParser(description='Check code style. Needs uncrustify installed.')
parser.add_argument('--sha', metavar='SHA', type=str,
help='SHA for the commit to compare HEAD with')
parser.add_argument('--dry-run', '-d', type=bool,
@@ -146,7 +146,11 @@ if dry_run is not True and rewrite is True:
subprocess.run(["git", "commit", "--all", "--amend", "-C", "HEAD"], stdout=subprocess.DEVNULL)
os._exit(0)
elif dry_run is True and changed is True:
- print ("\nIssue the following command in your local tree to apply the suggested changes (needs uncrustify installed):\n\n $ git rebase origin/main --exec \"./check-style.py -r\" \n")
+ print(f"""
+Issue the following command in your local tree to apply the suggested changes:
+
+ $ git rebase {sha} --exec "./check-style.py -r"
+""")
os._exit(-1)
os._exit(0)