git-scripts 0.9.1 → 0.9.2

data/man/feature-stashes.1.ronn

@@ -11,8 +11,6 @@ Show stashes saved on the current branch.  Display the relative time the stash
 was saved, the stash message, and instructions on viewing and applying the
 stash.
 
-Compatible with hotfix branches.
-
 ## OPTIONS
 
    * `-v`:

data/man/feature-status.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FEATURE\-STATUS" "1" "September 2013" "iFixit" ""
+.TH "FEATURE\-STATUS" "1" "November 2019" "iFixit" ""
 .
 .SH "NAME"
 \fBfeature\-status\fR \- Determine if the current branch is up\-to\-date with the remote branch\.
@@ -12,9 +12,6 @@
 .SH "DESCRIPTION"
 Determine if the current branch is up\-to\-date with the remote branch\. If there are differences, show a graphical git log between the two branches\.
 .
-.P
-Compatible with hotfix branches\.
-.
 .SH "COPYRIGHT"
 Copyright (c) 2012\-2013 iFixit\.
 .

data/man/feature-status.1.ronn

@@ -10,8 +10,6 @@ feature-status(1) - Determine if the current branch is up-to-date with the remot
 Determine if the current branch is up-to-date with the remote branch.  If there
 are differences, show a graphical git log between the two branches.
 
-Compatible with hotfix branches.
-
 ## COPYRIGHT
 
 Copyright (c) 2012-2013 iFixit.

data/man/feature-switch.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FEATURE\-SWITCH" "1" "September 2013" "" ""
+.TH "FEATURE\-SWITCH" "1" "November 2019" "iFixit" ""
 .
 .SH "NAME"
 \fBfeature\-switch\fR \- Switch to another feature branch\.
@@ -32,7 +32,7 @@ Pull the branch after switching to insure the local branch is up to date\.
 Copyright (c) 2012\-2013 iFixit\.
 .
 .SH "SEE ALSO"
-feature(1), hotfix\-switch(1)
+feature(1)
 .
 .SH "WWW"
 https://github\.com/iFixit/git\-scripts

data/man/feature-switch.1.ronn

@@ -25,7 +25,7 @@ Copyright (c) 2012-2013 iFixit.
 
 ## SEE ALSO
 
-feature(1), hotfix-switch(1)
+feature(1)
 
 ## WWW
 

data/man/feature-url.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FEATURE\-URL" "1" "August 2013" "iFixit" ""
+.TH "FEATURE\-URL" "1" "November 2019" "iFixit" ""
 .
 .SH "NAME"
 \fBfeature\-url\fR \- Grab the pull request url\.
@@ -16,7 +16,7 @@ Grab the url of the pull request for the current branch or the one specified\.
 Copyright (c) 2012\-2013 iFixit\.
 .
 .SH "SEE ALSO"
-feature(1), hotfix\-url(1)
+feature(1)
 .
 .SH "WWW"
 https://github\.com/iFixit/git\-scripts

data/man/feature-url.1.ronn

@@ -15,7 +15,7 @@ Copyright (c) 2012-2013 iFixit.
 
 ## SEE ALSO
 
-feature(1), hotfix-url(1)
+feature(1)
 
 ## WWW
 

data/man/feature.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FEATURE" "1" "February 2014" "iFixit" ""
+.TH "FEATURE" "1" "November 2019" "iFixit" ""
 .
 .SH "NAME"
 \fBfeature\fR \- Perform actions on a git feature branch\.
@@ -10,7 +10,7 @@
 \fBfeature\fR \fIcommand\fR [\fIargs\fR]
 .
 .SH "DESCRIPTION"
-\fBFeature\fR is a helper script for a modified git\-flow model, in which it and \fBhotfix\fR are the primary actors\.
+\fBFeature\fR is a helper script for a modified git\-flow model\.
 .
 .SH "COMMANDS"
 .
@@ -66,7 +66,7 @@ Test Github authentication\.
 Copyright (c) 2012\-2013 iFixit\.
 .
 .SH "SEE ALSO"
-hotfix(1), git(1)
+git(1)
 .
 .SH "WWW"
 https://github\.com/iFixit/git\-scripts

data/man/feature.1.ronn

@@ -7,8 +7,7 @@ feature(1) - Perform actions on a git feature branch.
 
 ## DESCRIPTION
 
-**Feature** is a helper script for a modified git-flow model, in which it and
-`hotfix` are the primary actors.
+**Feature** is a helper script for a modified git-flow model.
 
 ## COMMANDS
 
@@ -43,7 +42,7 @@ Copyright (c) 2012-2013 iFixit.
 
 ## SEE ALSO
 
-hotfix(1), git(1)
+git(1)
 
 ## WWW
 

data/man/index.txt

@@ -9,12 +9,5 @@ feature-status(1)       feature-status.1.ronn
 feature-stashes(1)      feature-stashes.1.ronn
 feature-github-test(1)  feature-github-test.1.ronn
 
-hotfix(1)               hotfix.1.ronn
-hotfix-list(1)          hotfix-list.1.ronn
-hotfix-start(1)         hotfix-start.1.ronn
-hotfix-switch(1)        hotfix-switch.1.ronn
-hotfix-finish(1)        hotfix-finish.1.ronn
-hotfix-merge(1)         hotfix-merge.1.ronn
-
 git(1)   https://www.kernel.org/pub/software/scm/git/docs/
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-scripts
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Daniel Beardsley
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-20 00:00:00.000000000 Z
+date: 2019-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -57,7 +57,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
-description: User scripts for managing feature branches and hotfixes.
+description: User scripts for managing and merging feature branches.
 email:
 - daniel@ifixit.com
 - james@ifixit.com
@@ -67,7 +67,6 @@ email:
 - robin@ifixit.com
 executables:
 - feature
-- hotfix
 extensions: []
 extra_rdoc_files:
 - COPYING
@@ -77,9 +76,7 @@ files:
 - README.md
 - Rakefile
 - bin/feature
-- bin/hotfix
 - completion/_feature
-- completion/_hotfix
 - completion/bash_completion.sh
 - lib/git.rb
 - lib/github.rb
@@ -134,22 +131,6 @@ files:
 - man/feature.1.html
 - man/feature.1.markdown
 - man/feature.1.ronn
-- man/hotfix-finish-issue.1
-- man/hotfix-finish-issue.1.ronn
-- man/hotfix-finish.1
-- man/hotfix-finish.1.ronn
-- man/hotfix-list.1
-- man/hotfix-list.1.ronn
-- man/hotfix-merge.1
-- man/hotfix-merge.1.ronn
-- man/hotfix-start.1
-- man/hotfix-start.1.ronn
-- man/hotfix-switch.1
-- man/hotfix-switch.1.ronn
-- man/hotfix-url.1
-- man/hotfix-url.1.ronn
-- man/hotfix.1
-- man/hotfix.1.ronn
 - man/index.html
 - man/index.txt
 homepage: http://ifixit.github.com/git-scripts/
@@ -174,5 +155,5 @@ rubyforge_project:
 rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
-summary: User scripts for managing feature branches and hotfixes.
+summary: User scripts for managing and merging feature branches.
 test_files: []

data/bin/hotfix

@@ -1,230 +0,0 @@
-#!/usr/bin/env ruby
-require_relative '../lib/signal_handlers.rb'
-require_relative '../lib/github.rb'
-require_relative '../lib/git.rb'
-require_relative '../lib/helpers.rb'
-require_relative '../lib/plugins.rb'
-
-command=ARGV.first
-
-$0 = ARGV.join(" ")
-
-unless command == '--help' or command == '-h'
-   unless Git::in_a_repo
-      die("\nSwitch to a git repo. If you need help, use --help or -h.")
-   end
-end
-
-case command
-when 'start'
-   require_argument(:hotfix, :start)
-   hotfix = hotfix_branch(ARGV[1])
-   stable_branch = Git::get_branch('stable')
-
-   Plugins.invoke :before_start, :hotfix, hotfix
-
-   Git::run_safe([
-      "git checkout #{stable_branch}",
-      "git fetch",
-      "git rebase --preserve-merges origin/#{stable_branch}",
-      "git branch \"#{hotfix}\" #{stable_branch}",
-      "git checkout \"#{hotfix}\""
-   ])
-
-   Git::submodules_update
-
-   # Automatically setup remote tracking branch
-   Git::run_safe([
-      "git config branch.#{hotfix}.remote origin",
-      "git config branch.#{hotfix}.merge refs/heads/#{hotfix}",
-      "git config branch.#{hotfix}.rebase true"
-   ])
-
-   Plugins.invoke :after_start, :hotfix, hotfix
-
-when 'url'
-   require_argument(:hotfix, :url, min=1, max=2)
-   hotfix = ARGV[1] || Git::current_branch
-
-   url = Github::get_url(hotfix)
-   if url
-      puts url
-   else
-      abort "There is no pull request available for #{hotfix}.\n" +
-            'You can make one by using `hotfix finish`.'
-   end
-
-
-when 'switch'
-   require_argument(:hotfix, :switch, min=2, max=5)
-   hotfix = current_hotfix_branch
-
-   Git::switch_branch(hotfix)
-
-   optional_pull
-
-when 'finish'
-   hotfix = current_hotfix_branch
-
-   if !is_hotfix_branch hotfix
-      abort "This is a feature branch.  Please use feature-finish."
-   end
-
-   # Push commits to origin
-   Git::run_safe(["git push origin #{hotfix}:#{hotfix}"])
-
-   exit 1 unless confirm("Create a pull-request for hotfix branch named: '#{hotfix}' ?")
-   octokit = Github::api
-
-   Plugins.invoke :before_finish, :hotfix, hotfix
-
-   description = Github::get_pull_request_description(hotfix)
-   puts "Pull-request description:"
-   puts description[:title]
-   puts "#"
-   puts description[:body]
-
-   response = octokit.create_pull_request(
-      Github::get_github_repo,
-      Git::get_branch('stable'),
-      hotfix,
-      description[:title],
-      description[:body]
-   )
-
-   Plugins.invoke :after_finish, :hotfix, hotfix, response
-   puts "Successfully created pull-request ##{response[:number]}"
-   puts "   " + response[:html_url]
-
-when 'finish-issue'
-   require_argument(:hotfix, :'finish-issue')
-   issue = ARGV[1]
-   hotfix = Git::current_branch
-
-   if !is_hotfix_branch hotfix
-      abort "This is a feature branch.  Please use feature-finish-issue."
-   end
-
-   # Push commits to origin
-   Git::run_safe(["git push origin #{hotfix}:#{hotfix}"])
-
-   exit 1 unless confirm("Convert issue ##{issue} into a pull-request using " +
-    "hotfix branch named '#{hotfix}' ?")
-   octokit = Github::api
-
-   pull = octokit.create_pull_request_for_issue(
-      Github::get_github_repo,
-      Git::get_branch('stable'),
-      hotfix,
-      issue
-   )
-
-   # We've converted the issue to a pull request, now lets change the
-   # description to include the last commit message and prompt the user to
-   # confirm it.
-
-   last_commit_message = Git::commit_message(hotfix)
-
-   original_title = pull[:title].gsub("\r","")
-   original_body = pull[:body].gsub("\r","")
-
-   initial_message = <<-MESSAGE
-#{last_commit_message}
-
-----
-
-Original issue: #{original_title}
-----
-
-#{original_body}
-   MESSAGE
-
-   description = Github::open_title_body_editor(initial_message)
-
-   updated_pull = octokit.update_pull_request(
-      Github::get_github_repo,
-      issue,
-      description[:title],
-      description[:body]
-   )
-
-   puts "Successfully converted issue ##{issue} to a pull-request"
-   puts "   " + updated_pull[:html_url]
-
-when 'merge'
-   fail_on_local_changes
-   dev_branch = Git::get_branch('development')
-   stable_branch = Git::get_branch('stable')
-   hotfix = current_hotfix_branch
-
-   if !is_hotfix_branch hotfix
-      exit 1 unless confirm("It looks like this is a feature branch.  Are you sure you want to merge it into #{stable_branch}?")
-   end
-
-   Git::run_safe(["git fetch"])
-
-   pull_info = Github::get_pull_request_info_from_api(hotfix, stable_branch)
-
-   warning = Github::get_commit_status_warning(pull_info[:status])
-   unless warning.empty?
-      puts highlight(warning)
-   end
-
-   Plugins.invoke :before_merge, :hotfix, hotfix
-
-   exit 1 unless confirm("Merge hotfix named: '#{hotfix}' ?")
-
-   commit_message = Git::get_description_from_user(pull_info[:description])
-   commit_message_dev = commit_message.sub(stable_branch, dev_branch)
-
-   update = Git::submodules_update("get")
-
-   Git::run_safe([
-      # Checkout the branch to make sure we have it locally.
-      "git checkout #{hotfix.shellescape}",
-      "git rebase --preserve-merges origin/#{hotfix.shellescape}",
-      # Merge into stable.
-      "git checkout #{stable_branch}",
-      # Pull the latest changes and rebase the unpushed commits if any.
-      "git rebase --preserve-merges origin/#{stable_branch}",
-      # Merge the hotfix branch into stable.
-      "git merge --no-ff --no-edit -m #{commit_message.shellescape} \"#{hotfix}\"",
-      "#{update}",
-      # Merge into master.
-      "git checkout #{dev_branch}",
-      # Pull the latest changes and rebase the unpushed master commits if any.
-      "git rebase --preserve-merges origin/#{dev_branch}",
-      # Merge the hotfix branch into master.
-      "git merge --no-ff --no-edit -m #{commit_message_dev.shellescape} \"#{hotfix}\"",
-      # Init any submodules in the master branch. Note: no need to change.
-      # Directories before calling git submodule since we are already in the
-      # projects top-level directory.
-      "#{update}",
-      # Delete the local hotfix branch.
-      "git branch -d #{hotfix.shellescape}",
-      # Checkout stable branch.
-      "git checkout #{stable_branch}"
-   ])
-
-   Plugins.invoke :after_merge, :hotfix, hotfix
-
-   puts "Successfully merged hotfix branch: #{hotfix} into #{stable_branch} and #{dev_branch}"
-   puts "If you are satisfied with the result, do this:\n" + <<CMDS
-      git push
-      git checkout #{dev_branch}
-      git push
-CMDS
-
-when 'list'
-   options = {
-      :hotfix => Git::hotfix_branches(:unmerged)
-   }
-   if ARGV.include?('-v')
-      options[:merged] = Git::hotfix_branches(:merged)
-   end
-   Git.show_branch_list(options)
-else
-   display_hotfix_help
-end
-
-log_command("hotfix #{$0}")