m-git 2.5.4

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

@@ -0,0 +1,99 @@
+#coding=utf-8
+
+module MGit
+
+  # @!scope [command] delete 删除某个仓库的`所有`文件，包括工作区、暂存区和版本库
+  #
+  # eg: mgit delete subA
+  #
+  class Delete < BaseCommand
+
+    # --- 覆写前后hook，不需要预设操作 ---
+    def pre_exec
+      MGit::DurationRecorder.start
+      Workspace.setup_multi_repo_root
+      # 配置log
+      MGit::Loger.config(Workspace.root)
+      MGit::Loger.info("~~~ #{@argv.absolute_cmd} ~~~")
+      Workspace.setup_config
+    end
+
+    def post_exec
+      # 打点结束
+      duration = MGit::DurationRecorder.end
+      MGit::Loger.info("~~~ #{@argv.absolute_cmd}, 耗时：#{duration} s ~~~")
+    end
+    # --------------------------------
+
+    def execute(argv)
+      delete_repo_names = parse_repo_name(argv)
+      include_central = Workspace.config.light_repos.find do |e|
+        delete_repo_names.include?(e.name.downcase) && e.is_config_repo
+      end
+      Foundation.help!("禁止删除配置仓库=> #{include_central.name}") if include_central
+
+      Output.puts_start_cmd
+      delete_light_repos = Workspace.config.light_repos.select { |e| delete_repo_names.include?(e.name.downcase) }
+      extra_repo_names = delete_repo_names - delete_light_repos.map { |e| e.name.downcase}
+      if delete_light_repos.length > 0
+        error_repos = {}
+        delete_light_repos.each { |light_repo|
+          begin
+            git_dir = light_repo.git_store_dir(Workspace.root)
+            repo_dir = light_repo.abs_dest(Workspace.root)
+            if !Dir.exist?(git_dir) && !Dir.exist?(repo_dir)
+              Output.puts_remind_message("#{light_repo.name}本地不存在，已跳过。")
+            end
+
+            # 删除git实体
+            if Dir.exist?(git_dir)
+              Output.puts_processing_message("删除仓库#{light_repo.name}的.git实体...")
+              FileUtils.remove_dir(git_dir, true)
+            end
+
+            # 删除工作区文件
+            if Dir.exist?(repo_dir)
+              Output.puts_processing_message("删除仓库#{light_repo.name}工作区文件...")
+              FileUtils.remove_dir(repo_dir, true)
+            end
+          rescue => e
+            error_repos[light_repo.name] = e.message
+          end
+        }
+        if error_repos.length > 0
+          Workspace.show_error(error_repos)
+        else
+          Output.puts_succeed_cmd(argv.absolute_cmd)
+        end
+      end
+
+      if extra_repo_names.length > 0
+        Output.puts_fail_block(extra_repo_names, "以上仓库配置表中未定义，请重试！")
+      end
+    end
+
+    def parse_repo_name(argv)
+      return if argv.git_opts.nil?
+
+      repos = argv.git_opts.split(' ')
+      extra_opts = repos.select { |e| argv.is_option?(e) }
+      Foundation.help!("输入非法参数：#{extra_opts.join('，')}。请通过\"mgit #{argv.cmd} --help\"查看用法。") if extra_opts.length > 0
+      Foundation.help!("未输入查询仓库名！请使用这种形式查询：mgit info repo1 repo2 ...") if repos.length == 0
+      repos.map { |e| e.downcase }
+    end
+
+    def enable_short_basic_option
+      true
+    end
+
+    def self.description
+      "删除指定单个或多个仓库（包含被管理的.git文件和工程文件以及跟该.git关联的所有缓存）。"
+    end
+
+    def self.usage
+      "mgit delete <repo1> <repo2>... [-h]"
+    end
+
+  end
+
+end

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

@@ -0,0 +1,32 @@
+#coding=utf-8
+
+module MGit
+
+  # @!scope [command] fetch
+  # follow git fetch
+  # eg: mgit fetch
+  #
+  class Fetch < BaseCommand
+    def execute(argv)
+      Output.puts_start_cmd
+      _, error_repos = Workspace.execute_git_cmd_with_repos(argv.cmd, argv.git_opts, all_repos)
+      if error_repos.length == 0
+        Output.puts_succeed_cmd(argv.absolute_cmd)
+        Timer.show_time_consuming_repos
+      end
+    end
+
+    def enable_repo_selection
+      true
+    end
+
+    def self.description
+      "与远程仓库同步分支引用和数据对象。"
+    end
+
+    def self.usage
+      "mgit fetch [<git-fetch-option>] [(--mrepo|--el-mrepo) <repo>...] [--help]"
+    end
+  end
+
+end

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

@@ -0,0 +1,81 @@
+#coding=utf-8
+
+module MGit
+
+  # @!scope [command] forall 对管理的仓库依次执行shell命令
+  #
+  # eg: mgit forall -c 'git status'
+  #
+  class Forall < BaseCommand
+
+    OPT_LIST = {
+      :command      => '--command',
+      :command_s    => '-c',
+      :concurrent   => '--concurrent',
+      :concurrent_s => '-n',
+    }.freeze
+
+    def options
+      return [
+          ARGV::Opt.new(OPT_LIST[:command],
+                        short_key:OPT_LIST[:command_s],
+                        info:'必须参数，指定需要执行的shell命令，如："mgit forall -c \'git status -s\'"（注意要带引号）。',
+                        type: :string),
+          ARGV::Opt.new(OPT_LIST[:concurrent],
+                        short_key:OPT_LIST[:concurrent_s],
+                        info:'可选参数，若指定，则shell命令以多线程方式执行。',
+                        type: :boolean)
+      ].concat(super)
+    end
+
+    def validate(argv)
+      Foundation.help!("输入非法参数：#{argv.git_opts}。请通过\"mgit #{argv.cmd} --help\"查看用法。") if argv.git_opts.length > 0
+      Foundation.help!("请输入必须参数--command，示例：mgit forall -c 'git status'") if argv.opt(OPT_LIST[:command]).nil?
+    end
+
+    def execute(argv)
+      # 校验分支统一
+      Workspace.check_branch_consistency
+
+      Output.puts_start_cmd
+      for_all_cmd = argv.opt(OPT_LIST[:command]).value
+
+      use_concurrent = !argv.opt(OPT_LIST[:concurrent]).nil?
+      if use_concurrent
+        succeed_repos, error_repos = Workspace.execute_common_cmd_with_repos_concurrent(for_all_cmd, all_repos)
+      else
+        succeed_repos, error_repos = Workspace.execute_common_cmd_with_repos(for_all_cmd, all_repos)
+      end
+
+      no_output_repos = []
+      succeed_repos.each { |repo_name, output|
+        if output.length > 0
+          puts Output.generate_title_block(repo_name) { output } + "\n"
+        else
+          no_output_repos.push(repo_name)
+        end
+      }
+
+      Output.puts_remind_block(no_output_repos, "以上仓库无输出！") if no_output_repos.length > 0
+      Output.puts_succeed_cmd(argv.absolute_cmd) if error_repos.length == 0
+    end
+
+    def enable_repo_selection
+      true
+    end
+
+    def enable_short_basic_option
+      true
+    end
+
+    def self.description
+      "对多仓库批量执行指令。"
+    end
+
+    def self.usage
+      "mgit forall -c '<instruction>' [(-m|-e) <repo>...] [-n] [-h]"
+    end
+
+  end
+
+end

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

@@ -0,0 +1,74 @@
+#coding=utf-8
+
+module MGit
+
+  # @!scope 指定仓库的信息
+  #
+  class Info < BaseCommand
+
+    def execute(argv)
+      Output.puts_start_cmd
+
+      query_repo_names = parse_repo_name(argv)
+      quere_repos = (all_repos + locked_repos).select { |e| query_repo_names.include?(e.name.downcase) }
+      if quere_repos.length > 0
+        quere_repos.each { |repo|
+          puts Output.generate_title_block(repo.name) {
+            info = []
+            info.push(['仓库位置'.bold, ["#{repo.path}"]])
+            info.push(['占用磁盘大小'.bold, ["#{calculate_size(repo)}"]])
+            info.push(['创建时间'.bold, ["#{File.ctime(repo.path)}"]])
+
+            current_branch = repo.status_checker.current_branch(strict_mode:false)
+            branch_message = repo.status_checker.branch_message
+            info.push(['当前分支'.bold, ["#{current_branch.nil? ? '无' : current_branch}"]])
+            info.push(['分支状态'.bold, ["#{branch_message}"]])
+
+            info.push(['文件改动'.bold, ["#{repo.status_checker.status != Repo::Status::GIT_REPO_STATUS[:clean] ? '有本地改动,请用status指令查看细节' : '本地无修改'}"]])
+            info.push(['Stash状态'.bold, ["#{check_stash(repo)}"]])
+            Output.generate_table_combination(info) + "\n\n"
+          }
+        }
+        Output.puts_succeed_cmd(argv.absolute_cmd)
+      else
+        Output.puts_fail_message("未找到与输入仓库名匹配的仓库，请重试！")
+      end
+
+    end
+
+    def parse_repo_name(argv)
+      return nil if argv.git_opts.nil?
+      repos = argv.git_opts.split(' ')
+      extra_opts = repos.select { |e| argv.is_option?(e) }
+      Foundation.help!("输入非法参数：#{extra_opts.join('，')}。请通过\"mgit #{argv.cmd} --help\"查看用法。") if extra_opts.length > 0
+      Foundation.help!("未输入查询仓库名！请使用这种形式查询：mgit info repo1 repo2 ...") if repos.length == 0
+      repos.map { |e| e.downcase }
+    end
+
+    def calculate_size(repo)
+      success, output = repo.execute("du -sh #{repo.path} | awk '{print $1}'")
+      return '计算失败'.red unless success
+      output.chomp
+    end
+
+    def check_stash(repo)
+      success, output = repo.execute("git -C \"#{repo.path}\" stash list")
+      return "查询失败".red unless success
+      output.length > 0 ? '有内容' : '无内容'
+    end
+
+    def enable_short_basic_option
+      false
+    end
+
+    def self.description
+      "输出指定仓库的信息。"
+    end
+
+    def self.usage
+      "mgit info <repo>... [-h]"
+    end
+
+  end
+
+end

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

@@ -0,0 +1,324 @@
+#coding=utf-8
+
+module MGit
+
+  # @!scope 初始化多仓库命令
+  #
+  class Init < BaseCommand
+
+    OPT_LIST = {
+      :git_source       =>  '--git-source',
+      :git_source_s     =>  '-g',
+      :config_source    =>  '--config-source',
+      :config_source_s  =>  '-f',
+      :branch           =>  '--branch',
+      :branch_s         =>  '-b',
+      :local_config     =>  '--local-config',
+      :local_config_s   =>  '-l',
+      :all              =>  '--all',
+      :all_s            =>  '-a'
+    }.freeze
+
+    def options
+      return [
+          ARGV::Opt.new(OPT_LIST[:git_source],
+                        short_key:OPT_LIST[:git_source_s],
+                        info:'通过包含多仓库配置表的git仓库来初始化，传入远程仓库地址，如："mgit init -g https://someone@bitbucket.org/someone"。不可与"-f"，"--config-source"同时指定。',
+                        type: :string),
+          ARGV::Opt.new(OPT_LIST[:config_source],
+                        short_key:OPT_LIST[:config_source_s],
+                        info:'通过本地的多仓库配置表来初始化，传入本地配置文件路径，如："mgit init -f <local_config_path>/manifest.json"。不可与"-g"，"--git-source"同时指定。',
+                        type: :string),
+          ARGV::Opt.new(OPT_LIST[:branch],
+                        short_key:OPT_LIST[:branch_s],
+                        info:'指定配置仓库克隆分支。',
+                        type: :string),
+          ARGV::Opt.new(OPT_LIST[:local_config],
+                        short_key:OPT_LIST[:local_config_s],
+                        info:'指定是否自动生成本地配置文件模版。指定后会在主仓库下生成名为local_manifest.json的本地配置文件，其内容只包含主仓库信息，并指定其余仓库不纳入mgit管理。初始化时指定该参数将只下载主仓库，若同时指定了"-a"或"--all"，则其余仓库也会被下载。',
+                        type: :boolean),
+          ARGV::Opt.new(OPT_LIST[:all],
+                        short_key:OPT_LIST[:all_s],
+                        info:'指定后会下载所有在配置表中配置了远程地址的仓库，无论该仓库是否被纳入mgit管理（无论是否指定"mgit_excluded:true"）。',
+                        type: :boolean)
+      ].concat(super)
+    end
+
+    def validate(argv)
+      Foundation.help!("输入非法参数：#{argv.git_opts}") if argv.git_opts.length > 0
+
+      git_source_opt = argv.opt(OPT_LIST[:git_source])
+      file_source_opt = argv.opt(OPT_LIST[:config_source])
+      if !git_source_opt.nil? && !file_source_opt.nil?
+        Foundation.help!("不能同时指定参数\"#{OPT_LIST[:git_source]}\"和\"#{OPT_LIST[:config_source]}!\"")
+      elsif git_source_opt.nil? && file_source_opt.nil?
+        Foundation.help!("缺失参数\"#{OPT_LIST[:git_source]}\"或\"#{OPT_LIST[:config_source]}!\"")
+      end
+    end
+
+    # --- 覆写前后hook，不需要预设操作 ---
+    def pre_exec
+      Output.puts_processing_message("开始初始化多仓库...")
+      # 开始计时
+      MGit::DurationRecorder.start
+
+      initial_multi_repo_root
+
+      # 配置log
+      MGit::Loger.config(Workspace.root)
+      MGit::Loger.info("~~~ #{@argv.absolute_cmd} ~~~")
+    end
+
+    def post_exec
+      Output.puts_success_message("多仓库初始化成功！")
+      # 打点结束
+      duration = MGit::DurationRecorder.end
+      MGit::Loger.info("~~~ #{@argv.absolute_cmd}, 耗时：#{duration} s ~~~")
+    end
+
+    # --------------------------------
+
+    def execute(argv)
+      init_dir
+
+      begin
+        git_url_opt = argv.opt(OPT_LIST[:git_source])
+        local_url_opt = argv.opt(OPT_LIST[:config_source])
+        clone_all = argv.opt_list.did_set_opt?(OPT_LIST[:all])
+        if !git_url_opt.nil?
+          git_url = git_url_opt.value
+          branch = argv.opt(OPT_LIST[:branch]).value if argv.opt_list.did_set_opt?(OPT_LIST[:branch])
+          use_local = argv.opt_list.did_set_opt?(OPT_LIST[:local_config])
+          clone_with_git_url(git_url, branch, use_local, clone_all)
+        elsif !local_url_opt.nil?
+          clone_with_local_config(local_url_opt.value, clone_all)
+        end
+      rescue Interrupt => e
+        terminate!(e.message)
+      end
+    end
+
+    def init_dir
+      Constants::PROJECT_DIR.each { |key, relative_dir|
+        abs_dir = File.join(Workspace.root, relative_dir)
+        FileUtils.mkdir_p(abs_dir)
+        if key == :hooks
+          setup_hooks(File.join(abs_dir, Constants::HOOK_NAME[:pre_hook]),
+          File.join(abs_dir, Constants::HOOK_NAME[:post_hook]),
+          File.join(abs_dir, Constants::HOOK_NAME[:manifest_hook]),
+          File.join(abs_dir, Constants::HOOK_NAME[:post_download_hook]))
+        end
+      }
+    end
+
+    def write_content(path, content)
+      file = File.new(path, 'w')
+      if !file.nil?
+        file.write(content)
+        file.close
+      end
+    end
+
+    def setup_hooks(pre_hook_path, post_hook_path, manifest_hook_path, post_download_hook)
+      write_content(pre_hook_path, Template::PRE_CUSTOMIZED_HOOK_TEMPLATE)
+      write_content(post_hook_path, Template::POST_CUSTOMIZED_HOOK_TEMPLATE)
+      write_content(manifest_hook_path, Template::MANIFEST_HOOK_TEMPLATE)
+      write_content(post_download_hook, Template::POST_DOWNLOAD_HOOK_TEMPLATE)
+    end
+
+    def initial_multi_repo_root
+
+      if exist_root = Workspace.multi_repo_root_path
+        Foundation.help!("当前已在多仓库目录下，请勿重复初始化！\n`#{exist_root}`")
+      end
+
+      @origin_root = Dir.pwd
+      tmp_root = Utils.generate_init_cache_path(@origin_root)
+      FileUtils.mkdir_p(tmp_root)
+      Workspace.setup_multi_repo_root(tmp_root)
+    end
+
+    def setup_local_config(path, config_repo, use_local)
+      if use_local
+        content = Template.local_config_template(config_repo)
+      else
+        content = Template.default_template
+      end
+
+      write_content(path, content)
+      Utils.link(path, File.join(Workspace.root, Constants::PROJECT_DIR[:source_config], Constants::CONFIG_FILE_NAME[:local_manifest]))
+    end
+
+    def clone_with_git_url(git_url, branch, use_local, clone_all)
+      # 先将主仓库clone到mgit root目录下
+      central_repo_temp_path = File.join(Workspace.root, Constants::CENTRAL_REPO)
+      Output.puts_processing_message("正在克隆主仓库...")
+      Utils.execute_shell_cmd("git clone -b #{branch.nil? ? 'master' : branch} -- #{git_url} #{central_repo_temp_path}") { |stdout, stderr, status|
+        if status.success?
+          # 获取主仓库中的配置文件
+          begin
+            config = Manifest.parse(central_repo_temp_path, strict_mode:false)
+          rescue Error => e
+            terminate!(e.msg)
+          end
+          central_light_repo = config.config_repo
+          terminate!("配置文件中未找到主仓库配置，请添加后重试！") if central_light_repo.nil?
+          terminate!("配置文件中主仓库url与传入的url不一致, 请处理后重试！") if git_url != central_light_repo.url
+
+          central_repo_dest_path = central_light_repo.abs_dest(Workspace.root)
+
+          # 如果不是子目录则删除已有
+          if Dir.exist?(central_repo_dest_path) && !central_repo_temp_path.include?(central_repo_dest_path)
+            FileUtils.remove_dir(central_repo_dest_path, true)
+          end
+          FileUtils.mkdir_p(central_repo_dest_path)
+          mv_cmd = "mv #{central_repo_temp_path + '/{*,.[^.]*}'} #{central_repo_dest_path}"
+
+          `#{mv_cmd}`
+          FileUtils.rm_rf(central_repo_temp_path)
+
+          # 链接.git实体
+          Utils.link_git(central_repo_dest_path, central_light_repo.git_store_dir(Workspace.root))
+          Output.puts_success_message("主仓库克隆完成！")
+
+          # 链接本地配置文件
+          setup_local_config(File.join(central_repo_dest_path, Constants::CONFIG_FILE_NAME[:local_manifest]), central_light_repo.name, use_local)
+
+          # 由于更新了名字和可能的位置移动，重新解析配置文件
+          begin
+            config = Manifest.parse(central_repo_dest_path, strict_mode:false)
+          rescue Error => e
+            terminate!(e.msg)
+          end
+
+          # clone其余仓库
+          clone_sub_repos(config.repo_list(exclusion:[config.config_repo.name], all:clone_all), branch)
+          finish_init(config)
+        else
+          terminate!("主仓库克隆失败，初始化停止，请重试：\n#{stderr}")
+        end
+      }
+    end
+
+    def clone_with_local_config(config_path, clone_all)
+      terminate!("指定路径\"#{config_path}\"文件不存在！") if !File.exist?(config_path)
+
+      begin
+        config = Manifest.parse(Utils.expand_path(config_path), strict_mode:false)
+      rescue Error => e
+        terminate!(e.msg)
+      end
+
+      if !config.config_repo.nil?
+        clone_list = config.repo_list(exclusion: [config.config_repo.name], all:clone_all)
+      else
+        clone_list = config.repo_list(all:clone_all)
+      end
+
+      clone_sub_repos(clone_list, 'master')
+      finish_init(config)
+    end
+
+    def clone_sub_repos(repo_list, default_branch)
+      if repo_list.length != 0
+        Output.puts_processing_message("正在克隆子仓库...")
+        try_repos = repo_list
+        retry_repos = []
+        error_repos = {}
+
+        mutex = Mutex.new
+        mutex_progress = Mutex.new
+
+        task_count = 0
+        total_try_count = 4
+        total_retry_count = total_try_count - 1
+        # 保证失败仓库有3次重新下载的机会
+        total_try_count.times { |try_count|
+          Workspace.concurrent_enumerate(try_repos) { |light_repo|
+            # 如果mainfest中指定了分支，就替换default branch
+            branch = light_repo.branch ? light_repo.branch : default_branch
+            Utils.execute_shell_cmd(light_repo.clone_url(Workspace.root, clone_branch:branch)) { |stdout, stderr, status|
+              repo_dir = light_repo.abs_dest(Workspace.root)
+              if status.success?
+                Utils.link_git(repo_dir, light_repo.git_store_dir(Workspace.root))
+
+                mutex_progress.lock
+                task_count += 1
+                Output.puts_success_message("(#{task_count}/#{try_repos.length}) \"#{light_repo.name}\"克隆完成！")
+                mutex_progress.unlock
+              else
+                Output.puts_remind_message("\"#{light_repo.name}\"克隆失败，已加入重试队列。") if try_count < total_retry_count
+                mutex.lock
+                retry_repos.push(light_repo)
+                error_repos[light_repo.name] = stderr
+                FileUtils.remove_dir(repo_dir, true) if Dir.exist?(repo_dir)
+                mutex.unlock
+              end
+            }
+          }
+
+          if retry_repos.length == 0 || try_count >= total_retry_count
+            break
+          else
+            Output.puts_processing_block(error_repos.keys, "以上仓库克隆失败，开始第#{try_count + 1}次重试(最多#{total_retry_count}次)...")
+            try_repos = retry_repos
+            retry_repos = []
+            error_repos = {}
+            task_count = 0
+          end
+        }
+
+        if error_repos.length > 0
+          Workspace.show_error(error_repos)
+          terminate!("初始化停止，请重试！")
+        end
+      end
+    end
+
+    def link_config(config_path, config_cache_path, root)
+      Utils.execute_under_dir("#{File.join(root, Constants::PROJECT_DIR[:source_config])}") {
+        # 在.mgit/source-config文件夹下创建原始配置文件的软连接
+        config_link_path = File.join(Dir.pwd, Constants::CONFIG_FILE_NAME[:manifest])
+        Utils.link(config_path, config_link_path) if config_path != config_link_path
+
+        # 将配置缓存移动到.mgit/source-config文件夹下
+        FileUtils.mv(config_cache_path, Dir.pwd) if File.dirname(config_cache_path) != Dir.pwd
+      }
+    end
+
+    def terminate!(msg)
+      Output.puts_fail_message(msg)
+      Output.puts_processing_message("删除缓存...")
+      FileUtils.remove_dir(Workspace.root, true) if Dir.exist?(Workspace.root)
+      Output.puts_success_message("删除完成！")
+      exit
+    end
+
+    def move_project_to_root
+      Dir.foreach(Workspace.root) { |item|
+        if item != '.' && item != '..' && item != '.DS_Store'
+          FileUtils.mv(File.join(Workspace.root, item), @origin_root)
+        end
+      }
+      FileUtils.remove_dir(Workspace.root, true) if Dir.exist?(Workspace.root)
+    end
+
+    def finish_init(config)
+      move_project_to_root
+      config_path, config_cache_path = config.path.sub(Workspace.root, @origin_root), config.cache_path.sub(Workspace.root, @origin_root)
+      link_config(config_path, config_cache_path, @origin_root)
+    end
+
+    def enable_short_basic_option
+      true
+    end
+
+    def self.description
+      "初始化多仓库目录。"
+    end
+
+    def self.usage
+      "mgit init (-f <path> | -g <url> [-b <branch>] [-l]) [-a]"
+    end
+  end
+end