m-git 2.5.4

data/lib/m-git/command/checkout.rb

@@ -0,0 +1,106 @@
+#coding=utf-8
+
+module MGit
+
+  # @!scope [command] checkout
+  # follow git checkout
+  # eg: mgit checkout master
+  #
+  class Checkout < BaseCommand
+
+    def execute(argv)
+      Output.puts_start_cmd
+
+      # 优先checkout配置仓库
+      config_repo = generate_config_repo
+      checkout_config_repo(argv.cmd, argv.git_opts, config_repo)
+
+      do_repos = []
+      dirty_repos = []
+
+      Output.puts_processing_message("检查各仓库状态...")
+      Workspace.serial_enumerate_with_progress(all_repos) { |repo|
+        if !config_repo.nil? && repo.name == config_repo.name
+          next
+        elsif repo.status_checker.status != Repo::Status::GIT_REPO_STATUS[:dirty]
+          do_repos.push(repo)
+        else
+          dirty_repos.push(repo)
+        end
+      }
+      Output.puts_success_message("检查完成！\n")
+
+      if dirty_repos.length > 0
+        remind_repos = []
+        remind_repos.push(['有本地改动', dirty_repos.map { |e| e.name }]) if dirty_repos.length > 0
+        Output.interact_with_multi_selection_combined_repos(remind_repos, "以上仓库状态异常", ['a: 跳过并继续', 'b: 强制执行', 'c: 终止']) { |input|
+          if input == 'b'
+            do_repos += dirty_repos
+            do_repos.uniq! { |repo| repo.name }
+          elsif input == 'c' || input != 'a'
+            Output.puts_cancel_message
+            return
+          end
+        }
+      end
+
+      if do_repos.length == 0
+        if config_repo.nil?
+          Output.puts_nothing_to_do_cmd
+        else
+          Output.puts_succeed_cmd(argv.absolute_cmd)
+        end
+      else
+        Output.puts_processing_message("开始checkout子仓库...")
+        _, error_repos = Workspace.execute_git_cmd_with_repos(argv.cmd, argv.git_opts, do_repos)
+        Output.puts_succeed_cmd(argv.absolute_cmd) if error_repos.length == 0
+      end
+    end
+
+    def checkout_config_repo(cmd, opts, repo)
+      return if repo.nil?
+      if repo.status_checker.status == Repo::Status::GIT_REPO_STATUS[:dirty]
+        remind_config_repo_fail("主仓库\"#{repo.name}\"有改动，无法执行！")
+      else
+        Output.puts_processing_message("开始checkout主仓库...")
+        success, output = repo.execute_git_cmd(cmd, opts)
+        if !success
+          remind_config_repo_fail("主仓库\"#{repo.name}\"执行\"#{cmd}\"失败：\n#{output}")
+        else
+          Output.puts_success_message("主仓库checkout成功！\n")
+        end
+
+        # 刷新配置表
+        Workspace.update_config { |missing_repos|
+          if missing_repos.length > 0
+            all_repos.concat(missing_repos)
+            # missing_repos包含新下载的和当前分支已有的新仓库，其中已有仓库包含在@all_repos内，需要去重
+            all_repos.uniq! { |repo| repo.name }
+          end
+        }
+
+      end
+    end
+
+    def remind_config_repo_fail(msg)
+      Output.puts_fail_message(msg)
+      return if Output.continue_with_user_remind?("是否继续操作其余仓库？")
+      Output.puts_cancel_message
+      exit
+    end
+
+    def enable_repo_selection
+      true
+    end
+
+    def self.description
+      "切换分支或恢复工作区改动。"
+    end
+
+    def self.usage
+      "mgit checkout [<git-checkout-option>] [(--mrepo|--el-mrepo) <repo>...] [--help]"
+    end
+
+  end
+
+end

data/lib/m-git/command/clean.rb

@@ -0,0 +1,64 @@
+#coding=utf-8
+
+module MGit
+
+  # @!scope [command] clean 清除所有仓库中工作区的变更
+  # follow git combinatorial command
+  # eg: git add . && git reset --hard
+  #
+  class Clean < BaseCommand
+
+    def execute(argv)
+
+      Output.puts_start_cmd
+
+      # 清除中间态
+      OperationProgressManager::PROGRESS_TYPE.each { |type, type_value|
+        if OperationProgressManager.is_in_progress?(Workspace.root, type_value)
+          Output.puts_processing_message("清除#{type.to_s}中间态...")
+          OperationProgressManager.remove_progress(Workspace.root, type_value)
+          Output.puts_success_message("清除成功！")
+        end
+      }
+
+      do_repos = []
+      all_repos.each { |repo|
+        do_repos.push(repo) if repo.status_checker.status != Repo::Status::GIT_REPO_STATUS[:clean]
+      }
+
+      if do_repos.length > 0
+        Workspace.check_branch_consistency
+        Output.puts_processing_message("正在将改动加入暂存区...")
+        _, error_repos1 = Workspace.execute_git_cmd_with_repos('add', '.', do_repos)
+        Output.puts_processing_message("正在重置...")
+        _, error_repos2 = Workspace.execute_git_cmd_with_repos('reset', '--hard', do_repos)
+        Output.puts_succeed_cmd(argv.absolute_cmd) if error_repos1.length + error_repos2.length == 0
+      else
+        Output.puts_success_message("所有仓库均无改动，无须执行。")
+      end
+
+    end
+
+    def validate(argv)
+      Foundation.help!("输入非法参数：#{argv.git_opts}。请通过\"mgit #{argv.cmd} --help\"查看用法。") if argv.git_opts.length > 0
+    end
+
+    def enable_repo_selection
+      true
+    end
+
+    def enable_short_basic_option
+      true
+    end
+
+    def self.description
+      "强制清空暂存区和工作区，相当于对指定或所有仓库执行\"git add . && git reset --hard\"操作"
+    end
+
+    def self.usage
+      "mgit clean [(-m|-e) <repo>...] [-h]"
+    end
+
+  end
+
+end

data/lib/m-git/command/commit.rb

@@ -0,0 +1,84 @@
+#coding=utf-8
+
+module MGit
+
+  # @!scope [command] commit
+  # follow git commit
+  # eg: mgit commit -m 'Just for fun'
+  #
+  class Commit < BaseCommand
+
+    private def validate(argv)
+      super
+      # 禁用--amend
+      if argv.git_opts.include?('--amend')
+        Output.puts_fail_message("MGit不支持\"--amend\"操作,请重试。")
+        Output.puts_cancel_message
+        exit
+      end
+    end
+
+    def execute(argv)
+      Workspace.check_branch_consistency
+
+      Output.puts_start_cmd
+
+      do_repos = []
+      remind_repos = []
+      do_nothing_repos = []
+
+      Output.puts_processing_message("检查各仓库状态...")
+      Workspace.serial_enumerate_with_progress(all_repos) { |repo|
+        if repo.status_checker.status == Repo::Status::GIT_REPO_STATUS[:dirty]
+          index_dirty_mask = Repo::Status::GIT_REPO_STATUS_DIRTY_ZONE[:index]
+          # 仅在暂存区有未提交的改动时执行
+          if repo.status_checker.dirty_zone & index_dirty_mask == index_dirty_mask
+            do_repos.push(repo)
+          else
+            remind_repos.push(repo.name)
+          end
+        else
+          do_nothing_repos.push(repo.name)
+        end
+      }
+      Output.puts_success_message("检查完成！\n")
+
+      if remind_repos.length > 0 && !Output.continue_with_interact_repos?(remind_repos, "以上仓库暂存区无可提交内容，仅存在工作区改动或未跟踪文件，若需要提交这些改动请先add到暂存区。是否跳过并继续？")
+        Output.puts_cancel_message
+        return
+      end
+
+      if do_repos.length != 0
+        if argv.git_opts.include?('-m ') || !Output.continue_with_user_remind?("未添加\"-m\"参数，请使用如[ mgit commit -m \"my log\" ]的形式提交。是否取消执行并重新输入（若确实有意执行该指令请忽略本提示）？")
+
+          # commit前调用hook
+          HooksManager.execute_mgit_pre_exec_hook(argv.cmd, argv.pure_opts, do_repos.map { |e| e.config })
+
+          msg = "，另有#{do_nothing_repos.length}个仓库暂存区无待提交内容，无须执行" if do_nothing_repos.length > 0
+          Output.puts_remind_block(do_repos.map { |repo| repo.name }, "开始commit以上仓库#{msg}...")
+          _, error_repos = Workspace.execute_git_cmd_with_repos(argv.cmd, argv.git_opts, do_repos)
+          Output.puts_succeed_cmd(argv.absolute_cmd) if error_repos.length == 0
+        else
+          Output.puts_cancel_message
+          return
+        end
+      else
+        Output.puts_remind_message("所有仓库均无改动，无须执行！")
+      end
+    end
+
+    def enable_repo_selection
+      true
+    end
+
+    def self.description
+      "将修改记录到版本库。"
+    end
+
+    def self.usage
+      "mgit commit [<git-commit-option>] [(--mrepo|--el-mrepo) <repo>...] [--help]"
+    end
+
+  end
+
+end

data/lib/m-git/command/config.rb

@@ -0,0 +1,202 @@
+#coding=utf-8
+
+module MGit
+
+  # @!scope [command] config 配置 .mgit/config.yml 文件信息
+  #
+  # eg: mgit config -s key 'value'
+  #
+  class Config < BaseCommand
+
+    OPT_LIST = {
+      :create_local          =>  '--create-local',
+      :create_local_s        =>  '-c',
+      :update_manifest       =>  '--update-manifest',
+      :update_manifest_s     =>  '-m',
+      :update_local          =>  '--update-local',
+      :update_local_s        =>  '-u',
+      :list                  =>  '--list',
+      :list_s                =>  '-l',
+      :set                   =>  '--set',
+      :set_s                 =>  '-s'
+    }.freeze
+
+    def options
+      return [
+          ARGV::Opt.new(OPT_LIST[:update_manifest],
+                        short_key:OPT_LIST[:update_manifest_s],
+                        info:"该指令用于更新mgit所使用的配置文件，如：\"mgit config -m <new_path>/manifest.json\"。",
+                        type: :boolean),
+          ARGV::Opt.new(OPT_LIST[:update_local],
+                        short_key:OPT_LIST[:update_local_s],
+                        info:"该指令用于更新mgit所使用的本地配置文件，如：\"mgit config -u <new_path>/local_manifest.json\"。",
+                        type: :boolean),
+          ARGV::Opt.new(OPT_LIST[:create_local],
+                        short_key:OPT_LIST[:create_local_s],
+                        info:"在指定目录下创建本地配置文件，若目录不存在则自动创建。如执行：\"mgit config -c /a/b/c\"，则生成本地配置文件：\"/a/b/c/local_manifest.json\"。如果未传入值，如：\"mgit config -c\"，那么若配置仓库存在的话，会在配置仓库中创建本地配置文件。",
+                        type: :string),
+          ARGV::Opt.new(OPT_LIST[:list],
+                        short_key:OPT_LIST[:list_s],
+                        info:"列出当前MGit所有配置，无参数，如：\"mgit config -l\"。",
+                        type: :boolean),
+          ARGV::Opt.new(OPT_LIST[:set],
+                        short_key:OPT_LIST[:set_s],
+                        info:"对MGit进行配置，遵守格式：\"mgit config -s <key> <value>\"，如：\"mgit config -s maxconcurrentcount 5\"。")
+      ].concat(super)
+    end
+
+    def validate(argv)
+      Foundation.help!("输入非法参数：#{argv.git_opts}。请通过\"mgit #{argv.cmd} --help\"查看用法。") if argv.git_opts.length > 0
+
+      if set_kv = argv.opt(OPT_LIST[:set])
+        Foundation.help!("参数#{OPT_LIST[:set]}格式错误，只需传入key和value两个值！") if set_kv.value.count != 2
+      end
+    end
+
+    # --- 覆写前后hook，不需要预设操作 ---
+    def pre_exec
+      # 开始计时
+      MGit::DurationRecorder.start
+      Workspace.setup_multi_repo_root
+      # 配置log
+      MGit::Loger.config(Workspace.root)
+      MGit::Loger.info("~~~ #{@argv.absolute_cmd} ~~~")
+    end
+
+    def post_exec
+      # 打点结束
+      duration = MGit::DurationRecorder.end
+      MGit::Loger.info("~~~ #{@argv.absolute_cmd}, 耗时：#{duration} s ~~~")
+    end
+    # --------------------------------
+
+    def execute(argv)
+      argv.enumerate_valid_opts { |opt|
+        if opt.key == OPT_LIST[:update_manifest]
+          update_mgit_config(opt.value)
+          return
+        elsif opt.key == OPT_LIST[:update_local]
+          update_local_config(opt.value)
+          return
+        elsif opt.key == OPT_LIST[:create_local]
+          dir = opt.value
+          if opt.value.is_a?(TrueClass)
+            Workspace.setup_config
+            if Workspace.config.config_repo.nil?
+              Foundation.help!("未找到配置仓库，请为参数\"--create-local\"或\"-c\"指定一个具体文件夹目录并重试！")
+            else
+              dir = Workspace.config.config_repo.abs_dest(Workspace.root)
+            end
+          end
+          create_local_config(dir)
+          return
+        elsif opt.key == OPT_LIST[:list]
+          dump_config
+        elsif opt.key == OPT_LIST[:set]
+          set_config(opt.value)
+        end
+      }
+    end
+
+    # 更新配置表软链接
+    def update_mgit_config(config_path)
+      config = Manifest.parse(Utils.expand_path(config_path))
+      Utils.execute_under_dir("#{File.join(Workspace.root, Constants::PROJECT_DIR[:source_config])}") {
+        mgit_managed_config_link_path = File.join(Dir.pwd, Constants::CONFIG_FILE_NAME[:manifest])
+        mgit_managed_config_cache_path = File.join(Dir.pwd, Constants::CONFIG_FILE_NAME[:manifest_cache])
+
+        # 在.mgit/source-config文件夹下创建原始配置文件的软连接
+        if config.path != mgit_managed_config_link_path
+          Utils.link(config.path, mgit_managed_config_link_path)
+        end
+
+        # 将配置缓存移动到.mgit/source-config文件夹下
+        if config.cache_path != mgit_managed_config_cache_path
+          FileUtils.rm_f(mgit_managed_config_cache_path) if File.exist?(mgit_managed_config_cache_path)
+          FileUtils.mv(config.cache_path, Dir.pwd)
+        end
+
+        Output.puts_success_message("配置文件更新完毕！")
+      }
+    end
+
+    # 更新本地配置表软链接
+    def update_local_config(config_path)
+      config_path = Utils.expand_path(config_path)
+      Utils.execute_under_dir("#{File.join(Workspace.root, Constants::PROJECT_DIR[:source_config])}") {
+        mgit_managed_local_config_link_path = File.join(Dir.pwd, Constants::CONFIG_FILE_NAME[:local_manifest])
+        # 在.mgit/source-config文件夹下创建原始本地配置文件的软连接
+        if config_path != mgit_managed_local_config_link_path
+          Utils.link(config_path, mgit_managed_local_config_link_path)
+        end
+
+        Output.puts_success_message("本地配置文件更新完毕！")
+      }
+    end
+
+    # 新建本地配置表软链接
+    def create_local_config(dir)
+      path = Utils.expand_path(File.join(dir, Constants::CONFIG_FILE_NAME[:local_manifest]))
+      if File.exist?(path) && !Output.continue_with_user_remind?("本地配置文件\"#{path}\"已经存在，是否覆盖？")
+        Output.puts_cancel_message
+        return
+      end
+
+      FileUtils.mkdir_p(dir)
+      file = File.new(path, 'w')
+      if !file.nil?
+        file.write(Template.default_template)
+        file.close
+      end
+
+      Utils.link(path, File.join(Workspace.root, Constants::PROJECT_DIR[:source_config], Constants::CONFIG_FILE_NAME[:local_manifest]))
+      Output.puts_success_message("本地配置文件生成完毕：#{path}")
+    end
+
+    # 列出所有配置
+    def dump_config
+      begin
+        MGitConfig.dump_config(Workspace.root)
+      rescue Error => e
+        Foundation.help!(e.msg)
+      end
+    end
+
+    # 设置配置
+    def set_config(key_value_arr)
+      key = key_value_arr.first
+      value = key_value_arr.last
+      begin
+        MGitConfig.update(Workspace.root) { |config|
+          if MGitConfig::CONFIG_KEY.keys.include?(key.to_sym)
+            valid_value = MGitConfig.to_suitable_value_for_key(Workspace.root, key, value)
+            if !valid_value.nil?
+              config[key] = valid_value
+            else
+              type = MGitConfig::CONFIG_KEY[key.to_sym][:type]
+              Foundation.help!("#{value}不匹配类型：#{type}，请重试。")
+            end
+          else
+            Foundation.help!("非法key值：#{key}。使用mgit config -l查看所有可配置字段。")
+          end
+        }
+        Output.puts_success_message("配置成功！")
+      rescue Error => e
+        Foundation.help!(e.msg)
+      end
+    end
+
+    # 允许使用短命令
+    def enable_short_basic_option
+      true
+    end
+
+    def self.description
+      "用于更新多仓库配置信息。"
+    end
+
+    def self.usage
+      "mgit config [-s <config_key> <config_value>] [-l]\nmgit config [(-m|-u) <path_to_manifest> | -c <dir_contains_local>]\nmgit config [-h]"
+    end
+  end
+end