git-maintain 0.3.0 → 0.4.0.pre.3.ge7030b9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6594ab929337bee6a9a474f853a1178452693fbe3371b870d4463a34378bcce2
-  data.tar.gz: bb48d81f0c1284be76177468c66700d39a6ccffaec0d841b47dcaea8b319e52f
+  metadata.gz: 42036590702a7e9e20d4a04c98ec5eec4acc5595abdb6828a676ec3a0ce235ee
+  data.tar.gz: c107094b1d94181c4f973e0f0e22ac4e28a98b3163222c48659f89ba623fc23d
 SHA512:
-  metadata.gz: c336b76aa701aeb23a17c50249dda759722162d8966816c3e2dede05d6253fe06750ce4e01e5a2fbedd4841fe389abfc84829cb6535b80325d20ec75c1b29776
-  data.tar.gz: a4e3b8450484e8b01d316545e1d44035ee2905eb3464991abb02a1a2d1e5db0fbd1dcdd794c302aff979f7c8e933c4f6daf5de87a61fa16eeed433e729268fcf
+  metadata.gz: 4c46eafa55c9264d8b0c519c060d2778d7f09551a885dc1afdb1b61ee53f48047900ac602f7b7c231bc93310b439bdd79d84540b75430c460777b6532f36c359
+  data.tar.gz: 4c0c3bdd430b6cadd0d430818326ff86606cb62469392f7b7af0bd1fd214fef6097050f76b8c14f51369a1e75530764c6103d90d2926a259e5f6648a5e2bf677

data/CHANGELOG

@@ -1,3 +1,15 @@
+
+* Handle bad Fixes tag
+* Speed up steal feature by remembering last point checked
+* Add Upstream commit tag when cherry picking commits
+
+------------------
+0.4.0  (2018-10-15)
+------------------
+
+* Fix gemspec generation date
+* Fix cp command
+
 ------------------
 0.3.0  (2018-10-09)
 ------------------

data/lib/branch.rb

@@ -73,6 +73,11 @@ module GitMaintain
                 optsParser.banner += "[-T]"
                 optsParser.on("-T", "--no-travis", "Ignore Travis build status and push anyway.") {
                     |val| opts[:no_travis] = true}
+            when :steal
+                optsParser.banner += "[-a]"
+                optsParser.on("-a", "--all", "Check all commits from master. "+
+                                               "By default only new commits (since last successful run) are considered.") {
+                    |val| opts[:all] = true}
             end
         end
 
@@ -169,20 +174,44 @@ module GitMaintain
         end
 
         # Cherry pick an array of commits
-        def cherry_pick(opts)
-            if opts[:commits].length > 0 then
-                @repo.runGit("cherry-pick #{opts[:commits].join(" ")}")
+        def cp(opts)
+            opts[:commits].each(){|commit|
+                @repo.runGit("cherry-pick #{commit}")
                 if $? != 0 then
                     puts "Cherry pick failure. Starting bash for manual fixes. Exit shell to continue"
 			        @repo.runSystem("bash")
                     puts "Continuing..."
 		        end
-            end
+		        make_pretty(commit)
+            }
         end
 
         # Steal upstream commits that are not in the branch
         def steal(opts)
-             steal_all(opts, "#{@stable_base}..origin/master")
+            base_ref=@stable_base
+
+            # If we are not force checking everything,
+            # try to start from the last tag we steal upto
+            if opts[:all] != true then
+                sha = @repo.runGit("rev-parse 'git-maintain/steal/last/#{@stable_base}' 2>&1")
+                if $? == 0 then
+                    base_ref=sha
+                    puts "# INFO: Starting from last successfull run:"
+                    puts "# INFO: " + @repo.runGit("show --format=oneline #{base_ref}")
+                end
+            end
+
+            master_sha=@repo.runGit("rev-parse origin/master")
+            res = steal_all(opts, "#{base_ref}..#{master_sha}")
+
+            # If we picked all the commits (or nothing happened)
+            # Mark the current master as the last checked point so we
+            # can just steal from this point on the next run
+            if res == true then
+                @repo.runGit("tag -f 'git-maintain/steal/last/#{@stable_base}' origin/master")
+                puts "# INFO: Marking new last successfull run at:"
+                puts "# INFO: " + @repo.runGit("show --format=oneline #{master_sha}")
+         end
         end
 
         # List commits in the branch that are no in the stable branch
@@ -295,11 +324,12 @@ module GitMaintain
             `rm -f #{msg_path}`
         end
 
-        def is_in_tree?(commit)
-	        fullhash=@repo.runGit("rev-parse #{commit}")
+        def is_in_tree?(commit, src_commit=commit)
+	        fullhash=@repo.runGit("rev-parse --verify --quiet #{commit}")
 	        # This might happen if someone pointed to a commit that doesn't exist in our
 	        # tree.
 	        if $? != 0 then
+                puts "# WARNING: Commit #{src_commit} points to a SHA #{commit} not in tree"
 		        return false
 	        end
 
@@ -335,7 +365,7 @@ module GitMaintain
 	        # If this commit fixes anything, but the broken commit isn't in our branch we don't
 	        # need this commit either.
 	        if fixescmt != "" then
-		          if is_in_tree?(fixescmt) then
+		          if is_in_tree?(fixescmt, commit) then
                       return true
                   else
                       return false
@@ -435,12 +465,12 @@ module GitMaintain
 
 		    # If the commit doesn't apply for us, skip it
 		    if is_relevant?(orig_cmt) != true
-                return
+                return true
 		    end
 
 		    if is_in_tree?(orig_cmt) == true
 		        # Commit is already in the stable branch, skip
-                return
+                return true
 		    end
 
 		    # Check if it's not blacklisted by a git-notes
@@ -448,18 +478,18 @@ module GitMaintain
 		        # Commit is blacklisted
 			    puts "Skipping 'blacklisted' commit " +
                      @repo.runGit("show --format=oneline --no-patch --no-decorate #{orig_cmt}")
-                return
+                return true
 		    end
 
             do_cp = confirm_one(opts, orig_cmt)
-            return if do_cp != true
+            return false if do_cp != true
 
             begin
 		        pick_one(commit)
             rescue CherryPickErrorException => e
 			    puts "Cherry pick failed. Fix, commit (or reset) and exit."
 			    @repo.runSystem("/bin/bash")
-                return
+                return false
             end
 
 		    # If we didn't find the commit upstream then this must be a custom commit
@@ -474,9 +504,11 @@ module GitMaintain
         end
 
         def steal_all(opts, range)
+            res = true
  	        @repo.runGit("log --no-merges --format=\"%H\" #{range} | tac").split("\n").each(){|commit|
-                steal_one(opts, commit)
+                res &= steal_one(opts, commit)
             }
+            return res
        end
     end
 end

data/lib/repo.rb

@@ -126,7 +126,7 @@ module GitMaintain
             new_tags = local_tags - remote_tags
             if new_tags.empty? then
                 puts "All tags are already submitted."
-                #                return
+                return
             end
 
             puts "This will officially release these tags: #{new_tags.join(", ")}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-maintain
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0.pre.3.ge7030b9
 platform: ruby
 authors:
 - Nicolas Morey-Chaisemartin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-13 00:00:00.000000000 Z
+date: 2019-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-release
@@ -58,12 +58,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Your ultimate script for maintaining stable branches.