Change all pull-* commands to pr-*.

Author: ingydotnet

ReadMe.pod

@@ -635,11 +635,11 @@ Close an issue. You can also use C<issue-edit> to close an issue.
 
 Add a comment to an issue and then close it.
 
-=item C<< pulls [<owner>/<repo>] >>
+=item C<< pr-list [<owner>/<repo>] >>
 
 List the pull requests for a repo.
 
-=item C<< pull-request [<issue-id-number>] [<options>] >>
+=item C<< pr-new [<issue-id-number>] [<options>] >>
 
 Create a new pull request for a repository based on the current branch. If an
 issue ID number is given, this command will attach the pull request to the
@@ -651,19 +651,19 @@ default branch of the default remote itself. Use C<--remote>, C<--branch>, C<--
 parent>, and C<--base> options to change the default source remote, source
 branch, target remote and target branch (respectively).
 
-=item C<< pull-diff [<owner>/<repo>] <issue-id-number> >>
+=item C<< pr-diff [<owner>/<repo>] <issue-id-number> >>
 
 Show the diff for a pull request.
 
-=item C<< pull-fetch [<owner>/<repo>] <issue-id-number> >>
+=item C<< pr-fetch [<owner>/<repo>] <issue-id-number> >>
 
 Fetches a pull request to a local C<review/$number> branch
 
-=item C<< pull-merge [<owner>/<repo>] <issue-id-number> >>
+=item C<< pr-merge [<owner>/<repo>] <issue-id-number> >>
 
 Merge and close a pull request.
 
-=item C<< pull-queue [<user>] [--count=#] [--all] >>
+=item C<< pr-queue [<user>] [--count=#] [--all] >>
 
 Show a user's Pull Request queue, for all repos. Shows the open PRs for any
 repo that has them. The C<--count> option tells how many repos to check. The

doc/git-hub-hack.swim

@@ -14,7 +14,7 @@ How to hack on `git-hub`.
   # … hack hack hack …
   make test
   make dev-test
-  git hub pull-request
+  git hub pr-new
 
 
 = Welcome Young Hacker

doc/git-hub.swim

@@ -507,10 +507,10 @@ interactions from the command line. They are installed by default.
 - `issue-resolve [<owner>/<repo>] <issue-id-number>`
   Add a comment to an issue and then close it.
 
-- `pulls [<owner>/<repo>]`
+- `pr-list [<owner>/<repo>]`
   List the pull requests for a repo.
 
-- `pull-request [<issue-id-number>] [<options>]`
+- `pr-new [<issue-id-number>] [<options>]`
   Create a new pull request for a repository based on the current branch.  If
   an issue ID number is given, this command will attach the pull request to the
   issue instead of creating a new one.
@@ -521,16 +521,16 @@ interactions from the command line. They are installed by default.
   `--parent`, and `--base` options to change the default source remote, source
   branch, target remote and target branch (respectively).
 
-- `pull-diff [<owner>/<repo>] <issue-id-number>`
+- `pr-diff [<owner>/<repo>] <issue-id-number>`
   Show the diff for a pull request.
 
-- `pull-fetch [<owner>/<repo>] <issue-id-number>`
+- `pr-fetch [<owner>/<repo>] <issue-id-number>`
   Fetches a pull request to a local `review/$number` branch
 
-- `pull-merge [<owner>/<repo>] <issue-id-number>`
+- `pr-merge [<owner>/<repo>] <issue-id-number>`
   Merge and close a pull request.
 
-- `pull-queue [<user>] [--count=#] [--all]`
+- `pr-queue [<user>] [--count=#] [--all]`
   Show a user's Pull Request queue, for all repos. Shows the open PRs for any
   repo that has them. The `--count` option tells how many repos to check. The
   `--all` option says to show closed as well as open PRs.

lib/git-hub

@@ -27,7 +27,7 @@ The most commonly used commands:
   user, orgs, org, teams, members, followers, following, follow, stars, star,
   clone, repos, repo, repo-new, repo-delete, forks, fork, collabs, trust,
   issues, issue, issue-update, issue-close, comment,
-  pull-request, pulls, pull-diff, pull-merge, search
+  pr-new, pr-list, pr-diff, pr-merge, pr-fetch
 
 See 'git hub help' for more help.
 
@@ -634,7 +634,7 @@ get-parent-remote-name() {
   }
   local value="$(JSON.get -a "/parent/full_name" -)"
   if [ -z "$value" ]; then
-    # parent for pull requests is self
+    # parent for PR is self
     get-default-remote-name
     parent_remote_name="$remote_name"
   else

lib/git-hub.d/git-hub-pull renamed to lib/git-hub.d/git-hub-pr

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-command:pull-request() {
+command:pr-new() {
   require-auth
   get-args "?number:'none'"
 
@@ -37,13 +37,13 @@ command:pull-request() {
   local url="/repos/$parent_owner_repo/pulls"
 
   if [[ "$number" =~ ^[0-9]+$ ]]; then
-    local prompt_msg="Attach pull-request $owner/$repo:$branch_name -> $parent_owner_repo:$parent_base to issue #$number? [yN]"
+    local prompt_msg="Attach PR $owner/$repo:$branch_name -> $parent_owner_repo:$parent_base to issue #$number? [yN]"
     local doit=$(prompt "$prompt_msg")
     if [[ "$doit" =~ ^[yY] ]]; then
       api-post "$url" "$(
         json-dump-object head "$head" base "$base" issue "$number"
       )"
-      msg_ok="Attached pull-request to issue: $(JSON.get -s /html_url -)"
+      msg_ok="Attached PR to issue: $(JSON.get -s /html_url -)"
     else
       msg_ok=0
     fi
@@ -81,14 +81,14 @@ $(git log $parent_remote_name/$parent_base..$branch_name)
         json-dump-object head "$head" base "$base" title "$title" body "$body"
     )"
     if OK; then
-      msg_ok="New pull-request created: $(JSON.get -a /html_url -)"
+      msg_ok="New PR created: $(JSON.get -a /html_url -)"
     else
-      msg_fail="New pull-request failed: $(JSON.get -a /errors/0/message -)"
+      msg_fail="New PR failed: $(JSON.get -a /errors/0/message -)"
     fi
   fi
 }
 
-command:pulls() {
+command:pr-list() {
   get-args '?owner:get-owner/repo:get-repo'
 
   state=open
@@ -101,7 +101,7 @@ command:pulls() {
     'number state title user/login created_at updated_at head/label base/label'
 }
 
-format-entry:pulls() {
+format-entry:pr-list() {
   if "$raw_output"; then
     echo "$2"
   else
@@ -110,12 +110,12 @@ format-entry:pulls() {
   fi
 }
 
-command:pull-diff() {
+command:pr-diff() {
   get-args '?owner:get-owner/repo:get-repo' number
   api-get "/repos/$owner/$repo/pulls/$number"
 }
 
-ok:pull-diff() {
+ok:pr-diff() {
   head_url="$(JSON.get -s /head/repo/ssh_url -)"
   head_sha="$(JSON.get -s /head/sha -)"
   head_ref="$(JSON.get -s /head/ref -)"
@@ -129,7 +129,7 @@ ok:pull-diff() {
   git diff "$base_sha" "$head_sha"
 }
 
-command:pull-fetch() {
+command:pr-fetch() {
   get-args '?owner:get-owner/repo:get-repo' number
   assert-inside-git-repo
   if [ -n "$(git branch | grep PR/$number)" ]; then
@@ -141,21 +141,21 @@ command:pull-fetch() {
   msg_ok=0
 }
 
-command:pull-merge() {
+command:pr-merge() {
   get-args '?owner:get-owner/repo:get-repo' number '?message'
   # TODO Support merge message
   local json='{}'
   api-put "/repos/$owner/$repo/pulls/$number/merge" "$json"
 }
 
-command:pull-queue() {
+command:pr-queue() {
   get-args '?user:get-user'
   local option1= option2=
   [ -n "$count_option" ] && option1=" --count=$count_option"
   $do_all && option2=" --all"
 
   for repo in `git hub repos $user -r$option1`; do
-    local pulls="`git hub pulls $repo$option2`"
+    local pulls="`git hub pr-list $repo$option2`"
     if [[ ! "$pulls" =~ --None-- ]]; then
       echo
       echo "$pulls"

lib/git-hub.d/help-functions.bash

@@ -42,12 +42,12 @@ org-edit             org-edit <org> <key-value-pairs>...
 org-get              org-get <org> <data-key>
 org-repos            org-repos <org>
 orgs                 orgs [<user>]
-pull-diff            pull-diff [<owner>/<repo>] <issue-id-number>
-pull-fetch           pull-fetch [<owner>/<repo>] <issue-id-number>
-pull-merge           pull-merge [<owner>/<repo>] <issue-id-number>
-pull-queue           pull-queue [<user>] [--count=#] [--all]
-pull-request         pull-request [<issue-id-number>] [<options>]
-pulls                pulls [<owner>/<repo>]
+pr-diff              pr-diff [<owner>/<repo>] <issue-id-number>
+pr-fetch             pr-fetch [<owner>/<repo>] <issue-id-number>
+pr-list              pr-list [<owner>/<repo>]
+pr-merge             pr-merge [<owner>/<repo>] <issue-id-number>
+pr-new               pr-new [<issue-id-number>] [<options>]
+pr-queue             pr-queue [<user>] [--count=#] [--all]
 repo                 repo [<repo>]
 repo-delete          repo-delete <owner>/<repo>
 repo-edit            repo-edit [<owner>/]<repo> <key-value-pair>...
@@ -436,52 +436,46 @@ help:orgs() {
 ...
 }
 
-help:pull-diff() {
+help:pr-diff() {
     cat <<'...'
 
-  Usage: git hub pull-diff [<owner>/<repo>] <issue-id-number>
+  Usage: git hub pr-diff [<owner>/<repo>] <issue-id-number>
 
   Show the diff for a pull request.
 ...
 }
 
-help:pull-fetch() {
+help:pr-fetch() {
     cat <<'...'
 
-  Usage: git hub pull-fetch [<owner>/<repo>] <issue-id-number>
+  Usage: git hub pr-fetch [<owner>/<repo>] <issue-id-number>
 
   Fetches a pull request to a local `review/$number` branch
 ...
 }
 
-help:pull-merge() {
+help:pr-list() {
     cat <<'...'
 
-  Usage: git hub pull-merge [<owner>/<repo>] <issue-id-number>
+  Usage: git hub pr-list [<owner>/<repo>]
 
-  Merge and close a pull request.
+  List the pull requests for a repo.
 ...
 }
 
-help:pull-queue() {
+help:pr-merge() {
     cat <<'...'
 
-  Usage: git hub pull-queue [<user>] [--count=#] [--all]
+  Usage: git hub pr-merge [<owner>/<repo>] <issue-id-number>
 
-  Show a user's Pull Request queue, for all repos. Shows the open PRs for any
-  repo that has them. The `--count` option tells how many repos to check. The
-  `--all` option says to show closed as well as open PRs.
-
-  Note: this command makes more API calls than most other commands and thus
-  runs slower. You might want to tee the output to a file, if you need to get
-  back to this data a lot.
+  Merge and close a pull request.
 ...
 }
 
-help:pull-request() {
+help:pr-new() {
     cat <<'...'
 
-  Usage: git hub pull-request [<issue-id-number>] [<options>]
+  Usage: git hub pr-new [<issue-id-number>] [<options>]
 
   Create a new pull request for a repository based on the current branch.  If
   an issue ID number is given, this command will attach the pull request to the
@@ -495,12 +489,18 @@ help:pull-request() {
 ...
 }
 
-help:pulls() {
+help:pr-queue() {
     cat <<'...'
 
-  Usage: git hub pulls [<owner>/<repo>]
+  Usage: git hub pr-queue [<user>] [--count=#] [--all]
 
-  List the pull requests for a repo.
+  Show a user's Pull Request queue, for all repos. Shows the open PRs for any
+  repo that has them. The `--count` option tells how many repos to check. The
+  `--all` option says to show closed as well as open PRs.
+
+  Note: this command makes more API calls than most other commands and thus
+  runs slower. You might want to tee the output to a file, if you need to get
+  back to this data a lot.
 ...
 }
 

man/man1/git-hub.1

@@ -70,8 +70,8 @@
 .rr rF
 .\" ========================================================================
 .\"
-.IX Title "IO::FILE=IO(0X18FA0F0) 1"
-.TH IO::FILE=IO(0X18FA0F0) 1 "2014-09-04" "perl v5.18.1" "User Contributed Perl Documentation"
+.IX Title "IO::FILE=IO(0XF7B0F0) 1"
+.TH IO::FILE=IO(0XF7B0F0) 1 "2014-09-04" "perl v5.18.1" "User Contributed Perl Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -684,13 +684,13 @@ Close an issue. You can also use \f(CW\*(C`issue\-edit\*(C'\fR to close an issue
 .el .IP "\f(CWissue\-resolve [<owner>/<repo>] <issue\-id\-number>\fR" 4
 .IX Item "issue-resolve [<owner>/<repo>] <issue-id-number>"
 Add a comment to an issue and then close it.
-.ie n .IP """pulls [<owner>/<repo>]""" 4
-.el .IP "\f(CWpulls [<owner>/<repo>]\fR" 4
-.IX Item "pulls [<owner>/<repo>]"
+.ie n .IP """pr\-list [<owner>/<repo>]""" 4
+.el .IP "\f(CWpr\-list [<owner>/<repo>]\fR" 4
+.IX Item "pr-list [<owner>/<repo>]"
 List the pull requests for a repo.
-.ie n .IP """pull\-request [<issue\-id\-number>] [<options>]""" 4
-.el .IP "\f(CWpull\-request [<issue\-id\-number>] [<options>]\fR" 4
-.IX Item "pull-request [<issue-id-number>] [<options>]"
+.ie n .IP """pr\-new [<issue\-id\-number>] [<options>]""" 4
+.el .IP "\f(CWpr\-new [<issue\-id\-number>] [<options>]\fR" 4
+.IX Item "pr-new [<issue-id-number>] [<options>]"
 Create a new pull request for a repository based on the current branch. If an
 issue \s-1ID\s0 number is given, this command will attach the pull request to the
 issue instead of creating a new one.
@@ -700,21 +700,21 @@ branch of the parent repository. Otherwise the pull request will target the
 default branch of the default remote itself. Use \f(CW\*(C`\-\-remote\*(C'\fR, \f(CW\*(C`\-\-branch\*(C'\fR, \f(CW\*(C`\-\-
 parent\*(C'\fR, and \f(CW\*(C`\-\-base\*(C'\fR options to change the default source remote, source
 branch, target remote and target branch (respectively).
-.ie n .IP """pull\-diff [<owner>/<repo>] <issue\-id\-number>""" 4
-.el .IP "\f(CWpull\-diff [<owner>/<repo>] <issue\-id\-number>\fR" 4
-.IX Item "pull-diff [<owner>/<repo>] <issue-id-number>"
+.ie n .IP """pr\-diff [<owner>/<repo>] <issue\-id\-number>""" 4
+.el .IP "\f(CWpr\-diff [<owner>/<repo>] <issue\-id\-number>\fR" 4
+.IX Item "pr-diff [<owner>/<repo>] <issue-id-number>"
 Show the diff for a pull request.
-.ie n .IP """pull\-fetch [<owner>/<repo>] <issue\-id\-number>""" 4
-.el .IP "\f(CWpull\-fetch [<owner>/<repo>] <issue\-id\-number>\fR" 4
-.IX Item "pull-fetch [<owner>/<repo>] <issue-id-number>"
+.ie n .IP """pr\-fetch [<owner>/<repo>] <issue\-id\-number>""" 4
+.el .IP "\f(CWpr\-fetch [<owner>/<repo>] <issue\-id\-number>\fR" 4
+.IX Item "pr-fetch [<owner>/<repo>] <issue-id-number>"
 Fetches a pull request to a local \f(CW\*(C`review/$number\*(C'\fR branch
-.ie n .IP """pull\-merge [<owner>/<repo>] <issue\-id\-number>""" 4
-.el .IP "\f(CWpull\-merge [<owner>/<repo>] <issue\-id\-number>\fR" 4
-.IX Item "pull-merge [<owner>/<repo>] <issue-id-number>"
+.ie n .IP """pr\-merge [<owner>/<repo>] <issue\-id\-number>""" 4
+.el .IP "\f(CWpr\-merge [<owner>/<repo>] <issue\-id\-number>\fR" 4
+.IX Item "pr-merge [<owner>/<repo>] <issue-id-number>"
 Merge and close a pull request.
-.ie n .IP """pull\-queue [<user>] [\-\-count=#] [\-\-all]""" 4
-.el .IP "\f(CWpull\-queue [<user>] [\-\-count=#] [\-\-all]\fR" 4
-.IX Item "pull-queue [<user>] [--count=#] [--all]"
+.ie n .IP """pr\-queue [<user>] [\-\-count=#] [\-\-all]""" 4
+.el .IP "\f(CWpr\-queue [<user>] [\-\-count=#] [\-\-all]\fR" 4
+.IX Item "pr-queue [<user>] [--count=#] [--all]"
 Show a user's Pull Request queue, for all repos. Shows the open PRs for any
 repo that has them. The \f(CW\*(C`\-\-count\*(C'\fR option tells how many repos to check. The
 \&\f(CW\*(C`\-\-all\*(C'\fR option says to show closed as well as open PRs.

note/Commands

@@ -24,10 +24,10 @@ org
 org-edit
 org-get
 orgs
-pull-diff
-pulls
-pull-merge
-pull-request
+pr-diff
+pr-list
+pr-merge
+pr-request
 repo
 repo-delete
 repo-edit

note/ToDo

@@ -187,6 +187,6 @@ x Chunk list json into an array of texts
 + Support @ as shorthand for login-name
 + Try loading git-hub-foo plugin for git-hub-foo-bar command
 + repo-delete repo (don't require user/repo)
-+ pull-list - list pull requests
-+ pull-request - issue a pull request
-+ pull-merge - merge a pull request
++ pr-list - list pull requests
++ pr-new - issue a pull request
++ pr-merge - merge a pull request