git-stash-commit 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e343c2e5d62e8bc807ccc0db3784c1ade1719ac7
+  data.tar.gz: 9eec3df1ac935fdacc50c6d07a31cc5b1341db0d
+SHA512:
+  metadata.gz: 45d04be095fab1b66912e26d42b333868c95970cfafb89b8bd28b5253d02fe6a607b584b50e18dafe3e0c9f2d259316abc8d2ffe43b81cb64658d9fb8fb9f97c
+  data.tar.gz: 98594ecedeed9e16ea4ea5dd5fc06cdfccde8dde5427f450a3ac645c1486fab748f62d258b1f768f8ae5f55e5b43f187ac1c3663f2784d39d62f8794b736e746

data/.gitignore

@@ -0,0 +1,9 @@
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,74 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at wordijp@gmail.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in git-stash-commit.gemspec
+gemspec

data/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 wordi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -0,0 +1,128 @@
+# git-stash-commit
+==================
+
+git sub command made in ruby, stash change files as commit of branch.
+when have the change files, commit to 'stash-commit' branch, and restore it. this command is instead of the 'git stash'
+
+
+## Installation
+
+    $ gem install git-stash-commit
+
+
+## stash-commit branches
+
+when run 'git stash-commit --to NAME', change files commit to prefixed with 'stash-commit/' and postfixed with '@NAME' branch('stash-commit/from_branch@NAME').
+commit, and make a new stash-commit/*topic*@NAME branch point to it.
+
+    --- * --- * --- *          <-- topic
+                     \
+                      *        <-- stash-commit/topic@NAME
+
+the second time, if when run 'git stash-commit', --to is serial number(default, start is 0).
+
+    --- * --- * --- *          <-- topic
+                    |\
+                    | *        <-- stash-commit/topic@NAME
+                     \ 
+                      *        <-- stash-commit/topic@0
+
+
+the third time, when run 'git stash-commit', next serial number is '1'.
+
+    --- * --- * --- *          <-- topic
+                    |\
+                    | *        <-- stash-commit/topic@NAME
+                    |\  
+                    | *        <-- stash-commit/topic@0
+                     \
+                      *        <-- stash-commit/topic@1
+
+the fourth time, when run 'git stash-commit --to 0', growth commit to 'stash-commit/topic@0'.
+
+    --- * --- * --- *          <-- topic
+                    |\
+                    | *        <-- stash-commit/topic@NAME
+                    |\  
+                    | * --- *  <-- stash-commit/topic@0
+                     \
+                      *        <-- stash-commit/topic@1
+
+
+unstash branch, if when run 'git stash-commit --from NAME', apply 'stash-commit/topic@NAME' branch on top of the current working tree state.
+
+    --- * --- * --- *          <-- topic
+                    |\  
+                    | * --- *  <-- stash-commit/topic@0
+                     \
+                      *        <-- stash-commit/topic@1
+
+if use the '--patch' option, only patch is commit.
+
+
+## git-stash-commit commands
+
+show command help
+
+    $ git stash-commit help
+
+```
+usage)
+  git stash-commit [--to (index | name)] [-m <commit message>] [-a | -p]
+    options : --to              default: unused index
+              -m | --message    default: "WIP on <branch>: <hash> <title>"
+              -a | --all        default
+              -p | --patch
+    NOTE : --all   equal 'git commit --all'
+           --patch equal 'git commit --patch'
+  git stash-commit --from (index | name) [--no-reset]
+    NOTE : --no-reset rebase only
+  git stash-commit --continue
+  git stash-commit --skip
+  git stash-commit --abort
+  git stash-commit --rename <oldname> <newname>
+    NOTE : stash-commit/<oldname>@to stash-commit/<newname>@to
+  git stash-commit -l [-a]
+    options : -l | --list       listup stash-commit branch, in this group
+              -a | --all        listup stash-commit branch all
+  git stash-commit help
+  git stash-commit <any args> [-d]
+    options : -d | --debug      debug mode, show backtrace
+```
+
+## if CONFLICT
+
+if conflict of 'stash-commit [--to N] [-p]' command, working branch remains.
+
+* stash-commit/*topic*@backup
+  - backup branch of this time, contains commit all change files
+  - delete on complete
+* stash-commit/*topic*@*to*-progresstmp
+  - growth commit branch, contains change files of 'commit --patch', it add to '--to' target branch
+  - delete on add finish
+* stash-commit/*topic*@*to*-progresstmp-patch-remain
+  - commit remain branch, contains remain change files of 'commit --patch', it apply the current orking tree state
+
+if fixed CONFLICT, add to it and run 'git stash-commit --continue'
+if cancel this time, run 'git stash-commit --abort'
+if skip this time, run 'git stash-commit --skip'
+
+these options behave like rebase.
+
+the conflict of '--from' is also the same.
+
+
+## if renamed branch name
+
+if renamed branch 'topic' to 'renamed_topic', please run 'git stash-commit --rename topic renamed_topic'.
+
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/wordijp/git-stash-commit.
+
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+

data/Rakefile

@@ -0,0 +1,2 @@
+require "bundler/gem_tasks"
+task :default => :spec

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "git/stash/commit"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start

data/bin/git-stash-commit

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'git-stash-commit' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("git-stash-commit", "git-stash-commit")

data/bin/rake

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rake", "rake")

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/exe/git-stash-commit

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+
+require "git/stash/commit"

data/git-stash-commit.gemspec

@@ -0,0 +1,35 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'git/stash/commit/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "git-stash-commit"
+  spec.version       = Git::Stash::Commit::VERSION
+  spec.authors       = ["wordi"]
+  spec.email         = ["wordijp@gmail.com"]
+
+  spec.summary       = %q{git sub command, stash change files as commit of branch}
+  spec.description   = %q{when have the change files, commit to 'stash-commit' branch, and restore it. this command is instead of the 'git stash'}
+  spec.homepage      = "https://github.com/wordijp/git-stash-commit"
+  spec.license       = "MIT"
+
+  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
+  # to allow pushing to a single host or delete this section to allow pushing to any host.
+#  if spec.respond_to?(:metadata)
+#    spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
+#  else
+#    raise "RubyGems 2.0 or newer is required to protect against " \
+#      "public gem pushes."
+#  end
+
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.13"
+  spec.add_development_dependency "rake", "~> 10.0"
+end

data/lib/git/stash/commit.rb

@@ -0,0 +1,726 @@
+require "git/stash/commit/version"
+
+$:.unshift File.dirname(__FILE__)
+require 'sclib/branch.rb'
+require 'sclib/command.rb'
+require 'sclib/define.rb'
+
+if !Cmd::gitdirExist?
+  puts 'git dir is not found'
+  Kernel.exit false
+end
+
+MAX = 5
+
+G = Struct.new(:tmp, :patch, :backup)
+$g = G.new(
+  BranchFactory::find(Cmd::getTmp),
+  BranchFactory::find(Cmd::getPatchRemain),
+  BranchFactory::find(Cmd::getBackup))
+
+# --------------------------------------------------
+
+def validateRebase
+  return true if $g.tmp
+  return true if Cmd::rebaseInProgress?
+  return true if $g.patch
+
+  puts 'stash-commit (--continue | --skip | --abort) is not need'
+  return false
+end
+
+def validateFromTo(fromto)
+  # 数値 or ブランチ名
+  if fromto == ''
+    puts 'target name is empty'
+    return false
+  end
+  if fromto.match(/^#{PREFIX}/)
+    puts "/^#{PREFIX}/ is reserved words"
+    return false
+  end
+  if fromto.match(/#{TMP_SUFFIX}$/)
+    puts "/#{TMP_SUFFIX}$/ is reserved words"
+    return false
+  end
+  if fromto.match(/#{PATCH_REMAIN_SUFFIX}$/)
+    puts "/#{PATCH_REMAIN_SUFFIX}$/ is reserved words"
+    return false
+  end
+  if fromto.match(/#{BACKUP_SUFFIX}$/)
+    puts "/#{BACKUP_SUFFIX}$/ is reserved words"
+    return false
+  end
+  if fromto.match(/@/)
+    puts '@ is used in delimiter'
+    return false
+  end
+
+  return true
+end
+
+def validateStashCommitFromTo(branch)
+  if Cmd::rebaseInProgress?
+    puts 'now rebase in progress, please fix it'
+    return false
+  end
+  if $g.tmp
+    puts 'find tmp branch, please fix it'
+    return false
+  end
+  if $g.patch
+    puts 'find patch branch, please fix it'
+    return false
+  end
+  if $g.backup
+    puts'find backup branch, please fix it'
+    return false
+  end
+
+  if branch.match(/^#{PREFIX}/)
+    puts "can't work in stash-commit branch" # ネストはややこしい
+    return false
+  end
+
+  return true
+end
+
+def validateRename(branch, renameOld, renameNew)
+  return false if !validateStashCommitFromTo branch # 同じ
+  return false if !validateFromTo renameOld
+  return false if !validateFromTo renameNew
+  if renameOld == renameNew
+    puts "old:\"#{renameOld}\" new:\"#{renameNew}\" is same"
+    return false
+  end
+
+  return true
+end
+
+def validateStashCommitFrom(branch)
+  if Cmd::changesCount != '0'
+    puts 'find editing files, please fix it'
+    return false
+  end
+  return false if !validateStashCommitFromTo branch
+
+  return true
+end
+
+def validateStashCommitTo(branch)
+  if Cmd::changesCount == '0'
+    puts 'not need'
+    return false
+  end
+  return false if !validateStashCommitFromTo branch
+
+  return true
+end
+
+# --------------------------------------------------
+
+def createBackup(_branch)
+  retBackup = DetachBranch.new Cmd::stashName(_branch, BACKUP_SUFFIX), _branch
+  branch = BranchFactory::find _branch
+  retBackup.commit Branch::CommitMode::ALL, <<-EOS
+backup from #{_branch}: #{Cmd::revision _branch}
+
+*** backup commit ***
+'stash-commit --to' working backup commit
+EOS
+  branch.cherryPickNoCommit retBackup.name
+  branch.reset # cancel 'git add'
+
+  retBackup
+end
+
+def _tryCommit(stash, mode, commitMessage, &onFail)
+  root = BranchFactory::find stash.name.match(/^#{PREFIX}\/(.+)@.+$/)[1]
+  stash.commit(mode, commitMessage){
+    # commit --patchのキャンセル時ここに来る
+    root.checkout
+    $g.backup.delete
+    onFail.call
+  }
+
+  if Cmd::changesCount != '0'
+    remain = DetachBranch.new "#{stash.name}-#{PATCH_REMAIN_SUFFIX}", stash.name
+    remain.commit Branch::CommitMode::ALL, <<-EOS
+patch-remain from #{Cmd::revision stash.name}: #{hash}
+
+*** patch remain ***
+'stash-commit --patch' working patch remain commit.
+
+please fix conflicts without '#{stash.name}' contents
+EOS
+    $g.patch = remain
+  end
+
+  return true
+end
+def tryCommitAll(stash, commitMessage, &onFail)
+  _tryCommit(stash, Branch::CommitMode::ALL, commitMessage){onFail.call}
+end
+def tryCommitPatch(stash, commitMessage, &onFail)
+  _tryCommit(stash, Branch::CommitMode::PATCH, commitMessage){onFail.call}
+end
+
+def tryStashCommitToInternal(stash, commitMessage, commit, reset=true, backup=true)
+  root = BranchFactory::find stash.name.match(/^#{PREFIX}\/(.+)@.+$/)[1]
+
+  $g.backup = createBackup root.name if backup
+
+  case commit
+  when Commit::ALL
+    return false if !tryCommitAll(stash, commitMessage){stash.delete}
+    root.checkout
+  when Commit::PATCH
+    return false if !tryCommitPatch(stash, commitMessage){stash.delete}
+
+    if $g.patch
+      $g.patch.rebaseOnto root.name, "#{$g.patch.name}~"
+
+      if reset
+        revision = Cmd::revision root.name
+        root.rebase $g.patch.name
+        $g.patch.delete
+        root.reset revision
+      else
+        root.checkout
+      end
+    else
+      root.checkout
+    end
+  end
+
+  $g.backup.delete if backup
+
+  return true
+end
+
+def tryStashCommitTo(stashBranch, commitMessage, commit, reset=true, backup=true)
+  rootBranch = stashBranch.match(/^#{PREFIX}\/(.+)@.+$/)[1]
+  stash = Branch::new stashBranch, rootBranch
+  tryStashCommitToInternal stash, commitMessage, commit, reset, backup
+end
+
+def tryStashCommitToGrow(branch, to, commitMessage, commit)
+  stashBranch = Cmd::stashName branch, to
+  root = BranchFactory::find stashBranch.match(/^#{PREFIX}\/(.+)@.+$/)[1]
+
+  $g.backup = createBackup root.name
+
+  if !Cmd::branchExist? stashBranch
+    # 新規作成
+    stash = Branch.new stashBranch, root.name
+    return false if !tryStashCommitToInternal stash, commitMessage, commit, true, false
+  else
+    # 存在してるので、そのブランチへ追加する
+    # 一端新規作成し
+    tmp = DetachBranch.new "#{stashBranch}-#{TMP_SUFFIX}", root.name
+    return false if !tryStashCommitToInternal tmp, commitMessage, commit, false, false
+
+    stash = BranchFactory::find stashBranch
+
+    # rebaseで追加
+    tmp.rebase stash.name
+    stash.rebase tmp.name
+    tmp.delete
+
+    root.checkout
+
+    case commit
+    when Commit::ALL
+      # no-op
+    when Commit::PATCH
+      if $g.patch
+        revision = Cmd::revision root.name
+        root.rebase $g.patch.name
+        $g.patch.delete
+        root.reset revision
+      end
+    end
+  end
+
+  $g.backup.delete
+
+  return true
+end
+
+# --------------------------------------------------
+
+def tryStashCommitFrom(_branch, from)
+  stash = BranchFactory::find (Cmd::stashName _branch, from)
+  branch = BranchFactory::find _branch
+
+  baseHash = Cmd::mergeBaseHash branch.name, stash.name
+  stash.rebaseOnto branch.name, baseHash
+
+  # ここまでくれば安心
+  revision = Cmd::revision branch.name
+  branch.rebase stash.name
+  stash.delete
+  branch.reset revision
+
+  return true
+end
+
+# --------------------------------------------------
+
+def tryStashCommitContinueTo(tmp, patch)
+  # rebase --continue前かもしれない
+  Cmd::exec('git rebase --continue') if Cmd::rebaseInProgress?
+
+  if patch
+    root = BranchFactory::find patch.name.match(/^#{PREFIX}\/(.+)@.+-#{PATCH_REMAIN_SUFFIX}$/)[1]
+    # rebase --skip後かもしれない
+    if Cmd::sameBranch? patch.name, root.name
+      puts "stop, '#{PATCH_REMAIN_SUFFIX}' rebase --skip found, from starting stash-commit --patch"
+      raise
+    end
+    # rebase --abort後かもしれない
+    if !Cmd::parentChildBranch? patch.name, root.name
+      patch.rebaseOnto root.name, "#{patch.name}~"
+    end
+  end
+  if tmp
+    stash = BranchFactory::find tmp.name.match(/^(#{PREFIX}\/.+)-#{TMP_SUFFIX}$/)[1]
+    # rebase --skip後かもしれない
+    if Cmd::sameBranch? tmp.name, stash.name
+      puts "stop, '#{TMP_SUFFIX}' rebase --skip found, from starting stash-commit --to"
+      raise
+    end
+    # rebase --abort後かもしれない
+    if !Cmd::parentChildBranch? tmp.name, stash.name
+      tmp.rebaseOnto stash.name, "#{tmp.name}~"
+    end
+  end
+
+  # ここまでくれば安心
+  if tmp
+    root = BranchFactory::find tmp.name.match(/^#{PREFIX}\/(.+)@.+-#{TMP_SUFFIX}$/)[1]
+    stash = BranchFactory::find tmp.name.match(/^(#{PREFIX}\/.+)-#{TMP_SUFFIX}$/)[1]
+
+    tmp.rebase stash.name
+    stash.rebase tmp.name
+    tmp.delete
+    root.checkout
+  end
+  if patch
+    root = BranchFactory::find patch.name.match(/^#{PREFIX}\/(.+)@.+-#{PATCH_REMAIN_SUFFIX}$/)[1]
+    revision = Cmd::revision root.name
+
+    root.rebase patch.name
+    patch.delete
+    root.reset revision
+  end
+
+  return true
+end
+
+def tryStashCommitContinueFrom(branch)
+  # tmpが無いので、rebase中の時のみ継続
+  return false if !Cmd::rebaseInProgress?
+
+  stashMatch = branch.match(/.+rebasing (#{PREFIX}\/.+)\)$/)
+  rootMatch = branch.match(/.+rebasing #{PREFIX}\/(.+)@.+\)$/)
+  return false if !stashMatch
+  return false if !Cmd::execRet 'git rebase --continue'
+
+  # ここまでくれば安心
+  stash = BranchFactory::find stashMatch[1]
+  root = BranchFactory::find rootMatch[1]
+  revision = Cmd::revision root.name
+  root.rebase stash.name
+  stash.delete
+  root.reset revision
+
+  return true
+end
+
+def tryStashCommitContinue(branch)
+  if $g.tmp or $g.patch
+    return false if !tryStashCommitContinueTo $g.tmp, $g.patch
+    $g.backup.delete if $g.backup
+  else
+    return false if !tryStashCommitContinueFrom branch
+  end
+
+  return true
+end
+
+# --------------------------------------------------
+
+def tryStashCommitSkipTo(tmp, patch)
+  # rebase --skip前かもしれない
+  Cmd::exec('git rebase --skip') if Cmd::rebaseInProgress?
+
+  if patch
+    root = BranchFactory::find patch.name.match(/^#{PREFIX}\/(.+)@.+-#{PATCH_REMAIN_SUFFIX}$/)[1]
+    # rebase --continue後かもしれない
+    if Cmd::parentChildBranch? patch.name, root.name
+      puts "stop, '#{PATCH_REMAIN_SUFFIX}' rebase --continue found, from starting stash-commit --patch"
+      raise
+    end
+    # rebase --abort後はスルー
+  end
+  if tmp
+    stash = BranchFactory::find tmp.name.match(/^(#{PREFIX}\/.+)-#{TMP_SUFFIX}$/)[1]
+    # rebase --continue後かもしれない
+    if Cmd::parentChildBranch? tmp.name, stash.name
+      puts "stop, '#{TMP_SUFFIX}' rebase --continue found, from starting stash-commit --to"
+      raise
+    end
+    # rebase --abort後はスルー
+  end
+
+  # ここまでくれば安心
+  if tmp
+    root = BranchFactory::find tmp.name.match(/^#{PREFIX}\/(.+)@.+-#{TMP_SUFFIX}$/)[1]
+    root.checkout
+    tmp.delete # skipなので捨てる
+  end
+  if patch
+    root = BranchFactory::find patch.name.match(/^#{PREFIX}\/(.+)@.+-#{PATCH_REMAIN_SUFFIX}$/)[1]
+    root.checkout
+    patch.delete # skipなので捨てる
+
+    # もしかしたらtmpとして削除済み
+    patchParent = BranchFactory::find patch.name.match(/^(#{PREFIX}\/.+)-#{PATCH_REMAIN_SUFFIX}$/)[1]
+    if patchParent
+      patchParent.delete
+    end
+  end
+
+  return true
+end
+
+def tryStashCommitSkipFrom(branch)
+  # tmpが無いので、rebase中の時のみ継続
+  return false if !Cmd::rebaseInProgress?
+
+  stashMatch = branch.match(/.+rebasing (#{PREFIX}\/.+)\)$/)
+  rootMatch = branch.match(/.+rebasing #{PREFIX}\/(.+)@.+\)$/)
+  return false if !stashMatch
+  return false if !Cmd::execRet 'git rebase --skip'
+
+  # ここまでくれば安心
+  stash = BranchFactory::find stashMatch[1]
+  root = BranchFactory::find rootMatch[1]
+  root.rebase stash.name
+  stash.delete
+
+  return true
+end
+
+def tryStashCommitSkip(branch)
+  if $g.tmp or $g.patch
+    return false if !tryStashCommitSkipTo $g.tmp, $g.patch
+    $g.backup.delete if $g.backup
+  else
+    return false if !tryStashCommitSkipFrom branch
+  end
+
+  return true
+end
+
+# --------------------------------------------------
+
+def tryStashCommitAbortTo(tmp, patch)
+  if !$g.backup
+    puts "stop, '#{BACKUP_SUFFIX}' is not found, from starting stash-commit --to"
+    return false
+  end
+
+  # rebase --abort前かもしれない
+  Cmd::exec 'git rebase --abort' if Cmd::rebaseInProgress?
+
+  if tmp
+    root = BranchFactory::find tmp.name.match(/^#{PREFIX}\/(.+)@.+-#{TMP_SUFFIX}$/)[1]
+    root.checkout
+    tmp.delete
+  end
+  if patch
+    root = BranchFactory::find patch.name.match(/^#{PREFIX}\/(.+)@.+-#{PATCH_REMAIN_SUFFIX}$/)[1]
+    root.checkout
+    patch.delete
+
+    # もしかしたらtmpとして削除済み
+    patchParent = BranchFactory::find patch.name.match(/^(#{PREFIX}\/.+)-#{PATCH_REMAIN_SUFFIX}$/)[1]
+    if patchParent
+      patchParent.delete
+    end
+  end
+
+  # ここまでくれば安心
+  root = BranchFactory::find $g.backup.name.match(/^#{PREFIX}\/(.+)@#{BACKUP_SUFFIX}$/)[1]
+  root.checkout
+  root.cherryPickNoCommit $g.backup.name
+  root.reset # cancel 'git add'
+
+  return true
+end
+
+def tryStashCommitAbortFrom(branch)
+  # tmpが無いので、rebase中の時のみ継続
+  return false if !Cmd::rebaseInProgress?
+
+  rootMatch = branch.match(/.+rebasing #{PREFIX}\/(.+)@.+\)$/)
+  return false if !rootMatch
+  return false if !Cmd::execRet 'git rebase --abort'
+
+  # ここまでくれば安心
+  root = BranchFactory::find rootMatch[1]
+  root.checkout
+
+  return true
+end
+
+def tryStashCommitAbort(branch)
+  if $g.tmp or $g.patch
+    return false if !tryStashCommitAbortTo $g.tmp, $g.patch
+    $g.backup.delete if $g.backup
+  else
+    return false if !tryStashCommitAbortFrom branch
+  end
+
+  return true
+end
+
+# --------------------------------------------------
+
+def tryStashCommitRename(branch, renameOld, renameNew)
+  Cmd::stashCommitRename renameOld, renameNew
+end
+
+# --------------------------------------------------
+
+def usage
+  print <<-EOS
+usage)
+  git stash-commit [--to (index | name)] [-m <commit message>] [-a | -p]
+    options : --to              default: unused index
+              -m | --message    default: "WIP on <branch>: <hash> <title>"
+              -a | --all        default
+              -p | --patch
+    NOTE : --all   equal 'git commit --all'
+           --patch equal 'git commit --patch'
+  git stash-commit --from (index | name) [--no-reset]
+    NOTE : --no-reset rebase only
+  git stash-commit --continue
+  git stash-commit --skip
+  git stash-commit --abort
+  git stash-commit --rename <oldname> <newname>
+    NOTE : #{PREFIX}/<oldname>@to #{PREFIX}/<newname>@to
+  git stash-commit -l [-a]
+    options : -l | --list       listup stash-commit branch, in this group
+              -a | --all        listup stash-commit branch all
+  git stash-commit help
+  git stash-commit <any args> [-d]
+    options : -d | --debug      debug mode, show backtrace
+EOS
+end
+
+# --------------------------------------------------
+
+class ArgvIterator
+  def initialize(argv)
+    @argv = argv
+    @index = 0
+  end
+
+  def next?
+    @index < @argv.length
+  end
+
+  def next
+    if @index < @argv.length
+      ret = @argv[@index]
+      @index += 1
+      return ret
+    else
+      puts '* error: argument is not enoufh'
+      usage
+      raise
+    end
+  end
+end
+
+module Rebase
+  CONTINUE = '--continue'
+  SKIP     = '--skip'
+  ABORT    = '--abort'
+end
+
+module Commit
+  ALL   = '--all'
+  PATCH = '--patch'
+end
+
+$debugMode = false
+
+def main(argv)
+  hash = Cmd::revision
+  branch = Cmd::branchName
+  title = Cmd::title
+
+  commitMessage = "WIP on #{branch}: #{hash} #{title}" # default
+  to = nil
+  from = nil
+  rebase = nil
+  commit = Commit::ALL
+  renameOld = nil
+  renameNew = nil
+
+  listup = false
+  listupAll = false
+
+  # parse argv
+  # ----------
+  itArgv = ArgvIterator.new(argv)
+  while itArgv.next? do
+    arg = itArgv.next
+    case arg
+    when '-m', '--message'
+      commitMessage = itArgv.next
+    when '--to'
+      to = itArgv.next
+    when '--from'
+      from = itArgv.next
+    when '-a', '--all'
+      commit = Commit::ALL
+      listupAll = true
+    when '-p', '--patch'
+      commit = Commit::PATCH
+    when '--continue'
+      rebase = Rebase::CONTINUE
+    when '--skip'
+      rebase = Rebase::SKIP
+    when '--abort'
+      rebase = Rebase::ABORT
+    when '--rename'
+      renameOld = itArgv.next
+      renameNew = itArgv.next
+    when '-l', '--list'
+      listup = true
+    when 'help'
+      usage
+      Kernel.exit true
+    when '-d', '--debug'
+      $debugMode = true
+    else
+      puts "* error: unknown option:#{arg}"
+      usage
+      raise
+    end
+  end
+
+  # --list [--all]
+  if listup
+    Cmd::listup branch, listupAll
+    Kernel.exit true
+  end
+
+  # --continue | --skip | --abort
+  # -----------------------------
+  if rebase != nil
+    begin
+      raise if !validateRebase
+      case rebase
+      when Rebase::CONTINUE
+        raise if !tryStashCommitContinue branch
+      when Rebase::SKIP
+        raise if !tryStashCommitSkip branch
+      when Rebase::ABORT
+        raise if !tryStashCommitAbort branch
+      end
+      return true
+    rescue => e
+      puts "* failed: stash-commit #{rebase}"
+      raise e
+    end
+  end
+
+  # --rename
+  # --------
+  if renameOld != nil
+    begin
+      raise if !validateRename branch, renameOld, renameNew
+      raise if !tryStashCommitRename branch, renameOld, renameNew
+      return true
+    rescue => e
+      puts '* failed: stash-commit --rename'
+      raise e
+    end
+  end
+
+  # --from | --to
+  # -------------
+  if from != nil
+    begin
+      raise if !validateFromTo from or !validateStashCommitFrom branch
+      raise if !tryStashCommitFrom branch, from
+      return true
+    rescue => e
+      puts '* failed: stash-commit --from (index | name)'
+      raise e
+    end
+  elsif to != nil
+    # --to 指定がある時
+    begin
+      raise if !validateFromTo to or !validateStashCommitTo branch
+      raise if !tryStashCommitToGrow branch, to, commitMessage, commit
+      return true
+    rescue => e
+      puts '* failed: stash-commit --to (index | name)'
+      raise e
+    end
+  else
+    # --to 指定がない時
+    begin
+      raise if !validateStashCommitTo branch
+      (MAX+1).times do |i|
+        if i == MAX
+          puts '* error: branch is too many'
+          raise
+        end
+
+        stashBranch = Cmd::stashName branch, i
+        if Cmd::branchExist? stashBranch
+          puts "\"#{stashBranch}\" is already exist"
+          next
+        end
+
+        raise if !tryStashCommitTo stashBranch, commitMessage, commit
+        return true
+      end
+    rescue => e
+      puts '* failed: stash-commit'
+      raise e
+    end
+  end
+
+  raise 'logic error' # ここには来ないはず
+end
+
+# -----------------------------------------------
+
+module Git
+module Stash
+module Commit
+
+begin
+  raise if !main ARGV
+  puts 'done!'
+rescue => e
+  if $debugMode
+    puts "* error: #{e}" if !e.message.empty?
+    puts e.backtrace
+  end
+  puts 'failed'
+  Kernel.exit false
+end
+
+end
+end
+end