git-maintain 0.7.0 → 0.9.0rc1

data/lib/branch.rb

@@ -24,43 +24,45 @@ module GitMaintain
         ALL_BRANCHES_ACTIONS = [
             :create
         ]
-        ACTION_HELP = [
-            "* cp: Backport commits and eventually push them to github",
-            "* create: Create missing local branches from all the stable branches",
-            "* delete: Delete all local branches using the suffix",
-            "* steal: Steal commit from upstream that fixes commit in the branch or were tagged as stable",
-            "* list: List commit present in the branch but not in the stable branch",
-            "* list_stable: List commit present in the stable branch but not in the latest associated relase",
-            "* merge: Merge branch with suffix specified in -m <suff> into the main branch",
-            "* push: Push branches to github for validation",
-            "* monitor: Check the travis state of all branches",
-            "* push_stable: Push to stable repo",
-            "* monitor_stable: Check the travis state of all stable branches",
-            "* release: Create new release on all concerned branches",
-            "* reset: Reset branch against upstream",
-        ]
-
-        def self.load(repo, version, travis, branch_suff)
+        ACTION_HELP = {
+            :cp => "Backport commits and eventually push them to github",
+            :create => "Create missing local branches from all the stable branches",
+            :delete => "Delete all local branches using the suffix",
+            :steal => "Steal commit from upstream that fixes commit in the branch or were tagged as stable",
+            :list => "List commit present in the branch but not in the stable branch",
+            :list_stable => "List commit present in the stable branch but not in the latest associated relase",
+            :merge => "Merge branch with suffix specified in -m <suff> into the main branch",
+            :push => "Push branches to github for validation",
+            :monitor => "Check the CI state of all branches",
+            :push_stable => "Push to stable repo",
+            :monitor_stable => "Check the CI state of all stable branches",
+            :release => "Create new release on all concerned branches",
+            :reset => "Reset branch against upstream",
+        }
+
+        def self.load(repo, version, ci, branch_suff)
             repo_name = File.basename(repo.path)
-            return GitMaintain::loadClass(Branch, repo_name, repo, version, travis, branch_suff)
+            return GitMaintain::loadClass(Branch, repo_name, repo, version, ci, branch_suff)
         end
 
         def self.set_opts(action, optsParser, opts)
             opts[:base_ver] = 0
-            opts[:version] = /.*/
+            opts[:version] = []
             opts[:commits] = []
             opts[:do_merge] = false
             opts[:push_force] = false
-            opts[:no_travis] = false
-            opts[:all] = false
+            opts[:no_ci] = false
+            opts[:steal_base] = nil
             opts[:check_only] = false
             opts[:fetch] = nil
             opts[:watch] = false
+            opts[:delete_remote] = false
+            opts[:no_edit] = false
 
             optsParser.on("-v", "--base-version [MIN_VER]", Integer, "Older release to consider.") {
                 |val| opts[:base_ver] = val}
             optsParser.on("-V", "--version [regexp]", Regexp, "Regexp to filter versions.") {
-                |val| opts[:version] = val}
+                |val| opts[:version] << val}
 
             if  ALL_BRANCHES_ACTIONS.index(action) == nil &&
                 action != :merge &&
@@ -79,13 +81,16 @@ module GitMaintain
                 optsParser.banner += "-c <sha1> [-c <sha1> ...]"
                 optsParser.on("-c", "--sha1 [SHA1]", String, "Commit to cherry-pick. Can be used multiple time.") {
                     |val| opts[:commits] << val}
+            when :delete
+                optsParser.on("--remote", "Delete the remote staging branch instead of the local ones.") {
+                    |val| opts[:delete_remote] = true}
             when :merge
                 optsParser.banner += "-m <suffix>"
                 optsParser.on("-m", "--merge [SUFFIX]", "Merge branch with suffix.") {
                     |val| opts[:do_merge] = val}
             when :monitor, :monitor_stable
                 optsParser.on("-w", "--watch <PERIOD>", Integer,
-                              "Watch and refresh travis status every <PERIOD>.") {
+                              "Watch and refresh CI status every <PERIOD>.") {
                     |val| opts[:watch] = val}
             when :push
                 optsParser.banner += "[-f]"
@@ -93,15 +98,21 @@ module GitMaintain
                     |val| opts[:push_force] = val}
             when :push_stable
                 optsParser.banner += "[-T]"
-                optsParser.on("-T", "--no-travis", "Ignore Travis build status and push anyway.") {
-                    |val| opts[:no_travis] = true}
+                optsParser.on("-T", "--no-ci", "Ignore CI build status and push anyway.") {
+                    |val| opts[:no_ci] = true}
                 optsParser.on("-c", "--check", "Check if there is something to be pushed.") {
                     |val| opts[:check_only] = true}
+            when :release
+                 optsParser.on("--no-edit", "Do not edit release commit nor tag.") {
+                     opts[:no_edit] = true }
             when :steal
-                optsParser.banner += "[-a]"
+                optsParser.banner += "[-a][-b <HEAD>]"
                 optsParser.on("-a", "--all", "Check all commits from master. "+
                                                "By default only new commits (since last successful run) are considered.") {
-                    |val| opts[:all] = true}
+                    |val| opts[:steal_base] = :all}
+                optsParser.on("-b", "--base <HEAD>", "Check all commits from this commit. "+
+                                               "By default only new commits (since last successful run) are considered.") {
+                    |val| opts[:steal_base] = val}
             end
         end
 
@@ -112,18 +123,19 @@ module GitMaintain
                     raise "Action #{opts[:action]} can only be done on 'master' suffixed branches"
                 end
             end
-            if opts[:action] == :delete then
+            if opts[:action] == :delete && opts[:delete_remote] != true then
                 if opts[:br_suff] == "master" then
                     raise "Action #{opts[:action]} can NOT be done on 'master' suffixed branches"
                 end
             end
+            opts[:version] = [ /.*/ ] if opts[:version].length == 0
         end
 
         def self.execAction(opts, action)
             repo   = Repo::load()
-            travis = TravisChecker::load(repo)
+            ci = CI::load(repo)
             opts[:repo] = repo
-            opts[:travis] = travis
+            opts[:ci] = ci
             brClass = GitMaintain::getClass(self, repo.name)
 
             if NO_FETCH_ACTIONS.index(action) == nil && opts[:fetch] != false then
@@ -140,7 +152,7 @@ module GitMaintain
                     unfilteredList = repo.getBranchList(opts[:br_suff])
                 end
                 branchList = unfilteredList.map(){|br|
-                    branch = Branch::load(repo, br, travis, opts[:br_suff])
+                    branch = Branch::load(repo, br, ci, opts[:br_suff])
                     case branch.is_targetted?(opts)
                     when :too_old
                         GitMaintain::log(:VERBOSE, "Skipping older v#{branch.version}")
@@ -153,7 +165,7 @@ module GitMaintain
                     branch
                 }.compact()
             else
-                branchList = [ Branch::load(repo, opts[:manual_branch], travis, opts[:br_suff]) ]
+                branchList = [ Branch::load(repo, opts[:manual_branch], ci, opts[:br_suff]) ]
             end
 
             loop do
@@ -178,15 +190,15 @@ module GitMaintain
 
                 break if opts[:watch] == false
                 sleep(opts[:watch])
-                travis.emptyCache()
+                ci.emptyCache()
             end
         end
 
-        def initialize(repo, version, travis, branch_suff)
+        def initialize(repo, version, ci, branch_suff)
             GitMaintain::checkDirectConstructor(self.class)
 
             @repo          = repo
-            @travis        = travis
+            @ci            = ci
             @version       = version
             @branch_suff   = branch_suff
 
@@ -223,10 +235,10 @@ module GitMaintain
             if @version.to_i < opts[:base_ver] then
                 return :too_old
             end
-            if @version !~ opts[:version] then
-                return :no_match
-            end
-            return true
+            opts[:version].each() {|regexp|
+                return true if @version =~ regexp
+            }
+            return :no_match
         end
 
         # Checkout the repo to the given branch
@@ -261,17 +273,27 @@ module GitMaintain
 
             # 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
-                    log(:VERBOSE, "Starting from last successfull run:")
-                    log(:VERBOSE, @repo.getCommitHeadline(base_ref))
-                end
+            case opts[:steal_base]
+                when nil
+                    sha = @repo.runGit("rev-parse 'git-maintain/steal/last/#{@stable_base}' 2>&1")
+                    if $? == 0 then
+                        base_ref=sha
+                        log(:VERBOSE, "Starting from last successfull run:")
+                        log(:VERBOSE, @repo.getCommitHeadline(base_ref))
+                    end
+                when :all
+                    base_ref=@stable_base
+                else
+                    sha = @repo.runGit("rev-parse #{opts[:steal_base]} 2>&1")
+                    if $? == 0 then
+                        base_ref=sha
+                        log(:VERBOSE, "Starting from base:")
+                        log(:VERBOSE, @repo.getCommitHeadline(base_ref))
+                    end
             end
 
             master_sha=@repo.runGit("rev-parse origin/master")
-            res = steal_all(opts, "#{base_ref}..#{master_sha}")
+            res = steal_all(opts, "#{base_ref}..#{master_sha}", true)
 
             # If we picked all the commits (or nothing happened)
             # Mark the current master as the last checked point so we
@@ -328,8 +350,9 @@ module GitMaintain
 
         # Push the branch to the validation repo
         def push(opts)
-            if same_sha?(@local_branch, @repo.valid_repo + "/" + @local_branch) then
-                log(:INFO, "Nothing to push")
+            if same_sha?(@local_branch, @repo.valid_repo + "/" + @local_branch) ||
+               same_sha?(@local_branch, @remote_ref) then
+                log(:INFO, "Nothing to push on #{@local_branch}")
                 return
             end
             return "#{@local_branch}:#{@local_branch}"
@@ -345,22 +368,22 @@ module GitMaintain
                                "#{opts[:repo].valid_repo} #{branches.join(" ")}")
         end
 
-        # Monitor the build status on Travis
+        # Monitor the build status on CI
         def monitor(opts)
-            st = @travis.getValidState(head)
+            st = @ci.getValidState(self, @head)
             suff=""
             case st
             when "started"
-                suff= " started at #{@travis.getValidTS(head)}"
+                suff= " started at #{@ci.getValidTS(self, @head)}"
             end
             log(:INFO, "Status for v#{@version}: " + st + suff)
-            if (st == "failed" || st == "errored") && opts[:watch] == false
+            if @ci.isErrored(self, st) && opts[:watch] == false
                 rep = "y"
                 suff=""
                 while rep == "y"
                     rep = GitMaintain::confirm(opts, "see the build log#{suff}")
                     if rep == "y" then
-                        log = @travis.getValidLog(head)
+                        log = @ci.getValidLog(self, @head)
                         tmp = `mktemp`.chomp()
                         tmpfile = File.open(tmp, "w+")
                         tmpfile.puts(log)
@@ -375,14 +398,14 @@ module GitMaintain
 
         # Push branch to the stable repo
         def push_stable(opts)
-            if (opts[:no_travis] != true && @NO_TRAVIS != true) &&
-               @travis.checkValidState(@head) != true then
-                log(:WARNING, "Build is not passed on travis. Skipping push to stable")
+            if same_sha?(@local_branch, @remote_ref) then
+                log(:INFO, "Stable is already up-to-date")
                 return
             end
 
-            if same_sha?(@local_branch, @remote_ref) then
-                log(:INFO, "Stable is already up-to-date")
+            if (opts[:no_ci] != true && @NO_CI != true) &&
+               @ci.checkValidState(self, @head) != true then
+                log(:WARNING, "Build is not passed on CI. Skipping push to stable")
                 return
             end
 
@@ -408,13 +431,13 @@ module GitMaintain
             return if branches.length == 0
             opts[:repo].runGit("push #{opts[:repo].stable_repo} #{branches.join(" ")}")
         end
-         # Monitor the build status of the stable branch on Travis
+         # Monitor the build status of the stable branch on CI
         def monitor_stable(opts)
-            st = @travis.getStableState(@stable_head)
+            st = @ci.getStableState(self, @stable_head)
             suff=""
             case st
             when "started"
-                suff= " started at #{@travis.getStableTS(@stable_head)}"
+                suff= " started at #{@ci.getStableTS(self, @stable_head)}"
             end
             log(:INFO, "Status for v#{@version}: " + st + suff)
         end
@@ -446,14 +469,41 @@ module GitMaintain
         end
 
         def delete(opts)
-            rep = GitMaintain::confirm(opts, "delete branch #{@local_branch}")
+            if opts[:delete_remote] == true then
+                @repo.runGit("rev-parse --verify --quiet #{@repo.valid_repo}/#{@local_branch}")
+                if $? != 0 then
+                    log(:DEBUG, "Skipping non existing remote branch #{@local_branch}.")
+                    return
+                end
+                msg = "delete remote branch #{@repo.valid_repo}/#{@local_branch}"
+            else
+                msg = "delete branch #{@local_branch}"
+            end
+            rep = GitMaintain::confirm(opts, msg)
             if rep == "y" then
-                @repo.runGit("branch -D #{@local_branch}")
+                return @local_branch
             else
                 log(:INFO, "Skipping deletion")
                 return
             end
         end
+        def self.delete_epilogue(opts, branches)
+            # Compact to remove empty entries
+            branches.compact!()
+
+            return if branches.length == 0
+            puts "Deleting #{opts[:delete_remote] == true ? "remote" : "local"} branches: #{branches.join(" ")}"
+            rep = GitMaintain::confirm(opts, "continue", true)
+            if rep != "y" then
+                log(:INFO, "Cancelling")
+                return
+            end
+            if opts[:delete_remote] == true then
+                opts[:repo].runGit("push #{opts[:repo].valid_repo} #{branches.map(){|x| ":" + x}.join(" ")}")
+            else
+                opts[:repo].runGit("branch -D  #{branches.join(" ")}")
+            end
+        end
 
         private
         def add_blacklist(commit)
@@ -532,13 +582,15 @@ module GitMaintain
 	        end
 
 	        # Let's see if there's a version tag in this commit
-	        full=@repo.runGit("show #{commit} | grep -i 'stable@'").gsub(/.* /, "")
+	        full=@repo.runGit("show #{commit} | grep -i 'stable@'").gsub(/.* #?/, "")
 
 	        # Sanity check our extraction
             if full =~ /stable/ then
                 return false
             end
 
+            full = @repo.runGit("rev-parse #{full}^{commit}")
+
 	        # Make sure our branch contains this version
 	        if @repo.runGit("merge-base #{@head} #{full}") == full then
 		        return true
@@ -578,13 +630,18 @@ module GitMaintain
 		    puts @repo.getCommitHeadline(commit)
 		    while rep != "y" do
 			    puts "Do you want to steal this commit ? (y/n/b/?)"
-                if opts[:no] == true then
+                case opts[:yn_default]
+                when :no
                     log(:INFO, "Auto-replying no due to --no option")
                     rep = 'n'
                     break
+                when :yes
+                    log(:INFO, "Auto-replying yes due to --yes option")
+                    rep = 'y'
                 else
                     rep = STDIN.gets.chomp()
                 end
+
 			    case rep
 				when "n"
 			        log(:INFO, "Skip this commit")
@@ -607,17 +664,23 @@ module GitMaintain
             return do_cp
         end
 
-        def steal_one(opts, commit)
-		    subj=@repo.getCommitSubj(commit)
-            subj.gsub!(/"/, '\"')
+        def steal_one(opts, commit, mainline=false)
 		    msg=''
-
-		    # Let's grab the mainline commit id, this is useful if the version tag
-		    # doesn't exist in the commit we're looking at but exists upstream.
-		    orig_cmt=@repo.runGit("log --no-merges --format=\"%H\" -F --grep \"#{subj}\" " +
-            "#{@stable_base}..origin/master | tail -n1")
-
-		    # If the commit doesn't apply for us, skip it
+            orig_cmt=commit
+
+            if mainline == false then
+		        subj=@repo.getCommitSubj(commit)
+                subj.gsub!(/"/, '\"')
+		        # Let's grab the mainline commit id, this is useful if the version tag
+		        # doesn't exist in the commit we're looking at but exists upstream.
+		        orig_cmt=@repo.runGit("log --no-merges --format=\"%H\" -F --grep \"#{subj}\" " +
+                                      "#{@stable_base}..origin/master | tail -n1")
+
+                if orig_cmt == "" then
+                    log(:WARNING, "Could not find commit #{commit} in mainline")
+                end
+            end
+            # If the commit doesn't apply for us, skip it
 		    if is_relevant?(orig_cmt) != true
                 return true
 		    end
@@ -663,10 +726,10 @@ module GitMaintain
             end
         end
 
-        def steal_all(opts, range)
+        def steal_all(opts, range, mainline = false)
             res = true
  	        @repo.runGit("log --no-merges --format=\"%H\" #{range} | tac").split("\n").each(){|commit|
-                res &= steal_one(opts, commit)
+                res &= steal_one(opts, commit, mainline)
             }
             return res
        end

data/lib/ci.rb

@@ -0,0 +1,88 @@
+module GitMaintain
+    class CI
+
+        def self.load(repo)
+            repo_name = File.basename(repo.path)
+            return GitMaintain::loadClass(CI, repo_name, repo)
+        end
+
+        def initialize(repo)
+            GitMaintain::checkDirectConstructor(self.class)
+
+            @repo = repo
+            @cachedJson={}
+        end
+
+        private
+        def log(lvl, str)
+            GitMaintain::log(lvl, str)
+        end
+
+        def fetch(uri_str, limit = 10)
+            # You should choose a better exception.
+            raise ArgumentError, 'too many HTTP redirects' if limit == 0
+
+            response = Net::HTTP.get_response(URI(uri_str))
+
+            case response
+            when Net::HTTPSuccess then
+                response
+            when Net::HTTPRedirection then
+                location = response['location']
+                fetch(location, limit - 1)
+            else
+                response.value
+            end
+        end
+        def getJson(base_url, query_label, query, json=true)
+            return @cachedJson[query_label] if @cachedJson[query_label] != nil
+            url = base_url + query
+            uri = URI(url)
+            log(:INFO, "Querying CI...")
+            log(:DEBUG_CI, url)
+            response = fetch(uri)
+            raise("CI request failed '#{url}'") if response.code.to_s() != '200'
+
+            if json == true
+                @cachedJson[query_label] = JSON.parse(response.body)
+            else
+                @cachedJson[query_label] = response.body
+            end
+            return @cachedJson[query_label]
+        end
+
+        public
+        def getValidState(br, sha1)
+            raise("Unimplemented")
+        end
+        def checkValidState(br, sha1)
+            raise("Unimplemented")
+        end
+        def getValidLog(br, sha1)
+            raise("Unimplemented")
+        end
+        def getValidTS(br, sha1)
+            raise("Unimplemented")
+        end
+
+        def getStableState(br, sha1)
+            raise("Unimplemented")
+        end
+        def checkStableState(br, sha1)
+            raise("Unimplemented")
+        end
+        def getStableLog(br, sha1)
+            raise("Unimplemented")
+        end
+        def getStableTS(br, sha1)
+            raise("Unimplemented")
+        end
+        def emptyCache()
+            @cachedJson={}
+        end
+
+        def isErrored(br, status)
+            raise("Unimplemented")
+        end
+    end
+end

data/lib/common.rb

@@ -1,6 +1,8 @@
 $LOAD_PATH.push(BACKPORT_LIB_DIR)
 
+require 'ci'
 require 'travis'
+require 'azure'
 require 'repo'
 require 'branch'
 
@@ -42,7 +44,7 @@ end
 module GitMaintain
     class Common
         ACTION_LIST = [ :list_actions ]
-        ACTION_HELP = []
+        ACTION_HELP = {}
         def self.execAction(opts, action)
             puts GitMaintain::getActionAttr("ACTION_LIST").join("\n")
         end
@@ -50,7 +52,7 @@ module GitMaintain
 
     ACTION_CLASS = [ Common, Branch, Repo ]
     @@custom_classes = {}
-
+    @@load_class = []
     @@verbose_log = false
 
     def registerCustom(repo_name, classes)
@@ -72,25 +74,31 @@ module GitMaintain
     module_function :getClass
 
     def loadClass(default_class, repo_name, *more)
-        return GitMaintain::getClass(default_class, repo_name).new(*more)
+        @@load_class.push(default_class)
+        obj = GitMaintain::getClass(default_class, repo_name).new(*more)
+        @@load_class.pop()
+        return obj
     end
     module_function :loadClass
 
     # Check that the constructor was called through loadClass
     def checkDirectConstructor(theClass)
-        # Look for the "new" in the calling tree
-        depth = 1
-        while caller_locations(depth, 1)[0].label != "new"
-            depth +=1
+        curLoad= @@load_class.last()
+        cl = theClass
+        while cl != Object
+            return if cl == curLoad
+            cl = cl.superclass
         end
-        # The function that called the constructer is just one step below
-        raise("Use GitMaintain::loadClass to construct a #{theClass} class") if
-                caller_locations(depth + 1, 1)[0].label != "loadClass"
+        raise("Use GitMaintain::loadClass to construct a #{theClass} class")
     end
     module_function :checkDirectConstructor
 
     def getActionAttr(attr)
-        return ACTION_CLASS.map(){|x| x.const_get(attr)}.flatten()
+        if Common.const_get(attr).class == Hash
+            return ACTION_CLASS.inject({}){|h, x| h.merge(x.const_get(attr))}
+        else
+            return ACTION_CLASS.map(){|x| x.const_get(attr)}.flatten()
+        end
     end
     module_function :getActionAttr
 
@@ -112,6 +120,7 @@ module GitMaintain
 
     def checkOpts(opts)
         ACTION_CLASS.each(){|x|
+            next if x::ACTION_LIST.index(opts[:action]) == nil
             next if x.singleton_methods().index(:check_opts) == nil
             x.check_opts(opts)
 
@@ -133,13 +142,17 @@ module GitMaintain
     end
     module_function :execAction
 
-    def confirm(opts, msg)
+    def confirm(opts, msg, ignore_default=false)
         rep = 't'
         while rep != "y" && rep != "n" && rep != '' do
             puts "Do you wish to #{msg} ? (y/N): "
-            if opts[:no] == true then
+            case (ignore_default == true ? nil : opts[:yn_default])
+            when :no
                 puts "Auto-replying no due to --no option"
                 rep = 'n'
+            when :yes
+                puts "Auto-replying yes due to --yes option"
+                rep = 'y'
             else
                 rep = STDIN.gets.chomp()
             end
@@ -150,7 +163,7 @@ module GitMaintain
 
     def checkLog(opts, br1, br2, action_msg)
         puts "Diff between #{br1} and #{br2}"
-        puts `git shortlog #{br1} ^#{br2}`
+        puts `git log --format=oneline #{br1} ^#{br2}`
         return "n" if action_msg.to_s() == ""
         rep = confirm(opts, "#{action_msg} this branch")
         return rep
@@ -173,8 +186,8 @@ module GitMaintain
         case lvl
         when :DEBUG
             _log("DEBUG".magenta(), str) if ENV["DEBUG"].to_s() != ""
-        when :DEBUG_TRAVIS
-            _log("DEBUG_TRAVIS".magenta(), str) if ENV["DEBUG_TRAVIS"].to_s() != ""
+        when :DEBUG_CI
+            _log("DEBUG_CI".magenta(), str) if ENV["DEBUG_CI"].to_s() != ""
         when :VERBOSE
             _log("INFO".blue(), str) if @@verbose_log == true
         when :INFO