git-stash-commit 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e343c2e5d62e8bc807ccc0db3784c1ade1719ac7
-  data.tar.gz: 9eec3df1ac935fdacc50c6d07a31cc5b1341db0d
+  metadata.gz: 20ac3cd1968e1f48667a321a7386d5c7b6e21af2
+  data.tar.gz: 6d0d3ad2d2433db4278424118e738f48d91c5cae
 SHA512:
-  metadata.gz: 45d04be095fab1b66912e26d42b333868c95970cfafb89b8bd28b5253d02fe6a607b584b50e18dafe3e0c9f2d259316abc8d2ffe43b81cb64658d9fb8fb9f97c
-  data.tar.gz: 98594ecedeed9e16ea4ea5dd5fc06cdfccde8dde5427f450a3ac645c1486fab748f62d258b1f768f8ae5f55e5b43f187ac1c3663f2784d39d62f8794b736e746
+  metadata.gz: 60e6a345db6e3c68013d9b15c638c6c1ae340c2d4cd5a601b3f348bbd719a765c17d7da3b2e036a293536bc3699268d39b71134e0f4c3b09447ae46de65fd125
+  data.tar.gz: b84aa04040528f214ea51ee7d8765edc2d117183df23a336e4e01bbbd3340d82cde6fd4b94e100a49bb1911d5a3ac6af913d42724e681363cc432b8d1ac081f7

data/README.md

@@ -57,8 +57,6 @@ unstash branch, if when run 'git stash-commit --from NAME', apply 'stash-commit/
                      \
                       *        <-- stash-commit/topic@1
 
-if use the '--patch' option, only patch is commit.
-
 
 ## git-stash-commit commands
 
@@ -99,12 +97,13 @@ if conflict of 'stash-commit [--to N] [-p]' command, working branch remains.
   - 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
+  - delete on complete
 * stash-commit/*topic*@*to*-progresstmp-patch-remain
-  - commit remain branch, contains remain change files of 'commit --patch', it apply the current orking tree state
+  - commit remain branch, contains remain change files of 'commit --patch', it apply the current working tree state
+  - delete on complete
 
-if fixed CONFLICT, add to it and run 'git stash-commit --continue'
-if cancel this time, run 'git stash-commit --abort'
+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.

data/bench/bench.rb

@@ -0,0 +1,43 @@
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'benchmark'
+require 'git/stash/sclib/command.rb'
+
+N = 20
+
+puts ":#{Cmd::branchName}:"
+puts ":#{Cmd::revision}:"
+puts ":#{Cmd::branchExist? 'develop'}:"
+puts ":#{Cmd::branchRefExist? 'develop'}:"
+puts ":#{Cmd::getTmp}:"
+puts ":#{Cmd::getPatchRemain}:"
+puts ":#{Cmd::getBackup}:"
+puts ":#{Cmd::changesCount}:"
+puts ":#{Cmd::parentChildBranch? 'HEAD', 'HEAD~'}:"
+puts ":#{Cmd::sameBranch? 'HEAD', 'HEAD'}:"
+puts ":#{Cmd::mergeBaseHash 'master~', 'master'}:"
+
+def registBench(r, title, &cb)
+  r.report title do
+    for i in 1..N-1
+      cb.call
+    end
+  end
+end
+
+Benchmark.bm 20 do |r|
+  # 目安: これが限界一番軽い
+  registBench(r, 'tune limit'       ){Cmd::tuneLimit}
+  #
+  registBench(r, 'branchName'       ){Cmd::branchName}
+  registBench(r, 'revision'         ){Cmd::revision}
+  registBench(r, 'branchExist'      ){Cmd::branchExist? 'develop'}
+  registBench(r, 'branchRefExist'   ){Cmd::branchRefExist? 'develop'}
+  registBench(r, 'getTmp'           ){Cmd::getTmp}
+  registBench(r, 'getPatchRemain'   ){Cmd::getPatchRemain}
+  registBench(r, 'getBackup'        ){Cmd::getBackup}
+  registBench(r, 'changesCount'     ){Cmd::changesCount}
+  registBench(r, 'parentChildBranch'){Cmd::parentChildBranch? 'HEAD', 'HEAD~'}
+  registBench(r, 'sameBranch'       ){Cmd::sameBranch? 'HEAD', 'HEAD'}
+  registBench(r, 'mergeBaseHash'    ){Cmd::mergeBaseHash 'master~', 'master'}
+end

data/lib/git/stash/commit.rb

@@ -276,7 +276,7 @@ def tryStashCommitContinueTo(tmp, patch)
     # rebase --skip後かもしれない
     if Cmd::sameBranch? patch.name, root.name
       puts "stop, '#{PATCH_REMAIN_SUFFIX}' rebase --skip found, from starting stash-commit --patch"
-      raise
+      raise ''
     end
     # rebase --abort後かもしれない
     if !Cmd::parentChildBranch? patch.name, root.name
@@ -288,7 +288,7 @@ def tryStashCommitContinueTo(tmp, patch)
     # rebase --skip後かもしれない
     if Cmd::sameBranch? tmp.name, stash.name
       puts "stop, '#{TMP_SUFFIX}' rebase --skip found, from starting stash-commit --to"
-      raise
+      raise ''
     end
     # rebase --abort後かもしれない
     if !Cmd::parentChildBranch? tmp.name, stash.name
@@ -360,7 +360,7 @@ def tryStashCommitSkipTo(tmp, patch)
     # rebase --continue後かもしれない
     if Cmd::parentChildBranch? patch.name, root.name
       puts "stop, '#{PATCH_REMAIN_SUFFIX}' rebase --continue found, from starting stash-commit --patch"
-      raise
+      raise ''
     end
     # rebase --abort後はスルー
   end
@@ -369,7 +369,7 @@ def tryStashCommitSkipTo(tmp, patch)
     # rebase --continue後かもしれない
     if Cmd::parentChildBranch? tmp.name, stash.name
       puts "stop, '#{TMP_SUFFIX}' rebase --continue found, from starting stash-commit --to"
-      raise
+      raise ''
     end
     # rebase --abort後はスルー
   end
@@ -541,7 +541,7 @@ class ArgvIterator
     else
       puts '* error: argument is not enoufh'
       usage
-      raise
+      raise ''
     end
   end
 end
@@ -611,7 +611,7 @@ def main(argv)
     else
       puts "* error: unknown option:#{arg}"
       usage
-      raise
+      raise ''
     end
   end
 
@@ -625,16 +625,16 @@ def main(argv)
   # -----------------------------
   if rebase != nil
     begin
-      raise if !validateRebase
+      raise '' if !validateRebase
       case rebase
       when Rebase::CONTINUE
-        raise if !tryStashCommitContinue branch
+        raise '' if !tryStashCommitContinue branch
       when Rebase::SKIP
-        raise if !tryStashCommitSkip branch
+        raise '' if !tryStashCommitSkip branch
       when Rebase::ABORT
-        raise if !tryStashCommitAbort branch
+        raise '' if !tryStashCommitAbort branch
       end
-      return true
+      return
     rescue => e
       puts "* failed: stash-commit #{rebase}"
       raise e
@@ -645,9 +645,9 @@ def main(argv)
   # --------
   if renameOld != nil
     begin
-      raise if !validateRename branch, renameOld, renameNew
-      raise if !tryStashCommitRename branch, renameOld, renameNew
-      return true
+      raise '' if !validateRename branch, renameOld, renameNew
+      raise '' if !tryStashCommitRename branch, renameOld, renameNew
+      return
     rescue => e
       puts '* failed: stash-commit --rename'
       raise e
@@ -658,9 +658,9 @@ def main(argv)
   # -------------
   if from != nil
     begin
-      raise if !validateFromTo from or !validateStashCommitFrom branch
-      raise if !tryStashCommitFrom branch, from
-      return true
+      raise '' if !validateFromTo from or !validateStashCommitFrom branch
+      raise '' if !tryStashCommitFrom branch, from
+      return
     rescue => e
       puts '* failed: stash-commit --from (index | name)'
       raise e
@@ -668,9 +668,9 @@ def main(argv)
   elsif to != nil
     # --to 指定がある時
     begin
-      raise if !validateFromTo to or !validateStashCommitTo branch
-      raise if !tryStashCommitToGrow branch, to, commitMessage, commit
-      return true
+      raise '' if !validateFromTo to or !validateStashCommitTo branch
+      raise '' if !tryStashCommitToGrow branch, to, commitMessage, commit
+      return
     rescue => e
       puts '* failed: stash-commit --to (index | name)'
       raise e
@@ -678,11 +678,11 @@ def main(argv)
   else
     # --to 指定がない時
     begin
-      raise if !validateStashCommitTo branch
+      raise '' if !validateStashCommitTo branch
       (MAX+1).times do |i|
         if i == MAX
           puts '* error: branch is too many'
-          raise
+          raise ''
         end
 
         stashBranch = Cmd::stashName branch, i
@@ -691,8 +691,8 @@ def main(argv)
           next
         end
 
-        raise if !tryStashCommitTo stashBranch, commitMessage, commit
-        return true
+        raise '' if !tryStashCommitTo stashBranch, commitMessage, commit
+        return
       end
     rescue => e
       puts '* failed: stash-commit'
@@ -710,7 +710,7 @@ module Stash
 module Commit
 
 begin
-  raise if !main ARGV
+  main ARGV
   puts 'done!'
 rescue => e
   if $debugMode

data/lib/git/stash/commit/version.rb

@@ -1,7 +1,7 @@
 module Git
   module Stash
     module Commit
-      VERSION = "1.0.0"
+      VERSION = "1.0.1"
     end
   end
 end

data/lib/git/stash/sclib/command.rb

@@ -2,6 +2,7 @@
 
 $:.unshift File.dirname(__FILE__)
 require 'define.rb'
+require 'util.rb'
 require 'open3'
 
 module Cmd
@@ -22,7 +23,8 @@ module Cmd
   end
 
   def execRetQuiet(cmd)
-    execRet "#{cmd} > /dev/null 2>&1"
+    return execRet "#{cmd} > /dev/null 2>&1" if !win?
+    execRet "#{cmd} > nul 2>%1"
   end
 
   # 他のコマンド
@@ -88,7 +90,13 @@ module Cmd
   end
   private
     def findFirstCommitStashRef(&pred)
-      `find #{gitdir}/refs/#{PREFIX} -type f 2> /dev/null`.each_line do |_line|
+      ret = ''
+      if !win? then
+        ret = `find #{gitdir}/refs/#{PREFIX} -type f 2> /dev/null`
+      else
+        ret = `find #{gitdir}/refs/#{PREFIX} -type f 2> nul`
+      end
+      ret.each_line do |_line|
         line = _line.strip
         line = line.sub(/^.*\.git\/refs\//, '')
         return line if pred.call line

data/lib/git/stash/sclib/util.rb

@@ -0,0 +1,24 @@
+require 'rbconfig'
+
+def os
+  @os ||= (
+    host_os = RbConfig::CONFIG['host_os']
+    case host_os
+    when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+      :windows
+    when /darwin|mac os/
+      :macosx
+    when /linux/
+      :linux
+    when /solaris|bsd/
+      :unix
+    else
+      :unknown
+    end
+  )
+end
+
+def win?
+  os == :windows
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-stash-commit
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - wordi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-30 00:00:00.000000000 Z
+date: 2017-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,6 +53,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bench/bench.rb
 - bin/console
 - bin/git-stash-commit
 - bin/rake
@@ -64,6 +65,7 @@ files:
 - lib/git/stash/sclib/branch.rb
 - lib/git/stash/sclib/command.rb
 - lib/git/stash/sclib/define.rb
+- lib/git/stash/sclib/util.rb
 homepage: https://github.com/wordijp/git-stash-commit
 licenses:
 - MIT
@@ -84,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: git sub command, stash change files as commit of branch