It's patchset not patch set

The Gerrit interface seems to prefer patchset over patch set, so get
consistent and just use the former in help texts and documentation.

Change-Id: I03d4b3c8fcdc0624dbf2dc48fcf8f21ecdb87135
This commit is contained in:
Jeremy Stanley 2024-03-12 23:16:20 +00:00
parent 1277c31e08
commit b65c3c201c
3 changed files with 6 additions and 6 deletions

View File

@ -82,7 +82,7 @@ No additional branch is created.
.Pp
This makes it possible to review a change without creating a local branch for
it. On the other hand, be aware: if you are not careful, this can easily result
in additional patch sets for dependent changes. Also, if the current branch is
in additional patchsets for dependent changes. Also, if the current branch is
different enough, the change may not apply at all or produce merge conflicts
that need to be resolved by hand.
.It Fl N Ar change , Fl \-cherrypickonly= Ns Ar change
@ -162,7 +162,7 @@ Submit review without topic.
.It Fl \-hashtags= Ns Ar taglist
Comma-separated list of hashtag strings for this change, no spaces allowed.
.It Fl \-message= Ns Ar message
Optional quoted message to include with the patch set.
Optional quoted message to include with the patchset.
.It Fl p , Fl \-private
Send patch as a private patch ready for review. Gerrit versions >= 2.15
.It Fl P , Fl \-remove\-private
@ -172,7 +172,7 @@ Send patch as work in progress for Gerrit versions >= 2.15
.It Fl W , Fl \-ready
Send patch that is already work in progress as ready for review. Gerrit versions >= 2.15
.It Fl \-reviewers Ar reviewer ...
Subscribe one or more reviewers to the uploaded patch sets. Reviewers should be identifiable by Gerrit (usually use their Gerrit username or email address).
Subscribe one or more reviewers to the uploaded patchsets. Reviewers should be identifiable by Gerrit (usually use their Gerrit username or email address).
.It Fl \-notify Ar type
Control to whom email notifications are sent. Possible values are NONE, OWNER, OWNER_REVIEWERS, ALL (the last one is the default).
.It Fl u , Fl \-update

View File

@ -1596,7 +1596,7 @@ additional information:
parser.add_argument("--hashtags", nargs="+",
help="Hashtags to submit branch to")
parser.add_argument("--reviewers", nargs="+",
help="Add reviewers to uploaded patch sets.")
help="Add reviewers to uploaded patchsets.")
parser.add_argument("-n", "--dry-run", dest="dry", action="store_true",
help="Don't actually submit the branch for review")
parser.add_argument("-i", "--new-changeid", dest="regenerate",
@ -1616,7 +1616,7 @@ additional information:
help="Control to whom email notifications are sent,"
" defaults to ALL.")
parser.add_argument("--message", dest="message",
help="Message to add to patch set description")
help="Message to add to patchset description")
rebase_group = parser.add_mutually_exclusive_group()
rebase_group.add_argument("-R", "--no-rebase", dest="rebase",

View File

@ -301,7 +301,7 @@ class GitReviewTestCase(tests.BaseGitReviewTestCase):
'reviewer2')
self.assertIn("new: 1", review_res)
# verify both reviewers are on patch set
# verify both reviewers are on patchset
head = self._run_git('rev-parse', 'HEAD')
change = self._run_gerrit_cli('query', '--format=JSON',
'--all-reviewers', head)