m-git 2.5.4

data/lib/m-git/workspace/path_helper.rb

@@ -0,0 +1,56 @@
+
+module MGit
+  class Workspace
+
+    # .mgit 目录下的文件路径
+    #
+    module PathHelper
+
+      # .mgit/config.yml
+      #
+      def config_file
+        File.join(root, Constants::MGIT_CONFIG_PATH)
+      end
+
+      # .mgit/hooks
+      #
+      def hooks_dir
+        File.join(root, Constants::PROJECT_DIR[:hooks])
+      end
+
+      # .mgit/snapshot
+      #
+      def snapshot_dir
+        File.join(root, Constants::PROJECT_DIR[:snapshot])
+      end
+
+      # .mgit/source-config
+      #
+      def source_config_dir
+        File.join(root, Constants::PROJECT_DIR[:source_config])
+      end
+
+      # .mgit/source-git
+      def source_git_dir
+        File.join(root, Constants::PROJECT_DIR[:source_git])
+      end
+      ########################### manifest ##########################
+
+      def manifest_path
+        manifest_name = Constants::CONFIG_FILE_NAME[:manifest]
+        File.join(source_config_dir, manifest_name)
+      end
+
+      def local_manifest_path
+        manifest_name = Constants::CONFIG_FILE_NAME[:local_manifest]
+        File.join(source_config_dir, manifest_name)
+      end
+
+      def cache_manifest_path
+        file_name = Constants::CONFIG_FILE_NAME[:manifest_cache]
+        File.join(source_config_dir, file_name)
+      end
+
+    end
+  end
+end

data/lib/m-git/workspace/workspace_helper.rb

@@ -0,0 +1,159 @@
+#coding=utf-8
+
+module MGit
+  class Workspace
+    module WorkspaceHelper
+      # 弹出托管的.git实体
+      #
+      # @param root [String] mgit工程根目录
+      #
+      # @param light_repo [Manifest::LightRepo] 操作仓库的配置repo
+      #
+      def pop_git_entity(root, light_repo)
+        # 仓库工作区目录
+        repo_dir = light_repo.abs_dest(root)
+
+        # 仓库工作区.git软链接路径
+        workspace_git_link_path = File.join(repo_dir, '.git')
+
+        # 仓库.git实体托管路径
+        git_entity_path = File.join(light_repo.git_store_dir(root), '.git')
+
+        if Dir.exist?(git_entity_path) && Dir.exist?(workspace_git_link_path) && File.symlink?(workspace_git_link_path)
+          # 仓库工作区.git软链接指向路径
+          abs_link_point = File.join(repo_dir, File.readlink(workspace_git_link_path))
+
+          # 若指向路径就是.git实体托管路径，则删除工作区软链接，并把.git弹出
+          if Pathname.new(abs_link_point).realpath.to_s == git_entity_path
+            FileUtils.rm_f(workspace_git_link_path)
+            FileUtils.mv(git_entity_path, repo_dir)
+          end
+        end
+      end
+
+      # 压入（托管）.git实体
+      #
+      # @param root [String] mgit工程根目录
+      #
+      # @param light_repo [Manifest::LightRepo] 操作仓库的配置repo
+      #
+      def push_git_entity(root, light_repo)
+        # 仓库工作区目录
+        repo_dir = light_repo.abs_dest(root)
+        git_store_dir = light_repo.git_store_dir(root)
+
+        # 仓库工作区.git实体路径
+        workspace_git_entity_path = File.join(repo_dir, '.git')
+
+        # 仓库.git实体托管路径
+        cache_git_entity_path = File.join(git_store_dir, '.git')
+
+        # 工作区.git存在，且mgit没有已存在的托管的.git
+        if Dir.exist?(workspace_git_entity_path) && !Dir.exist?(cache_git_entity_path)
+          # 移动并链接
+          Utils.link_git(repo_dir, git_store_dir)
+        end
+      end
+
+      # 将缓存的仓库移动到工作区
+      #
+      # @param root [String] mgit工程根目录
+      #
+      # @param light_repo [Manifest::LightRepo] 操作仓库的配置repo
+      #
+      def pop(root, light_repo)
+        cache_path = File.join(light_repo.cache_store_dir(root), light_repo.name)
+        workspace_path = light_repo.abs_dest(root)
+        workspace_dir = File.dirname(workspace_path)
+        return if invalid_move?(cache_path, workspace_dir)
+
+        if Dir.exist?(cache_path) && !Dir.exist?(workspace_path)
+
+          # 工作区目录不存在则创建
+          FileUtils.mkdir_p(workspace_dir) if !Dir.exist?(workspace_dir)
+
+          begin
+            # 【注意】 FileUtils.mv(a,b) 如果b路径的basename不存在，那么自动创建b并将【a文件夹内的所有文件】拷贝到b(b/<content of a>)，如果basename存在，那么直接把a文件夹整个移动到b下(b/a/<content of a>)。
+            FileUtils.mv(cache_path, workspace_dir)
+          rescue => _
+          end
+        end
+      end
+
+      # 将工作区的仓库缓存起来
+      #
+      # @param root [String] mgit工程根目录
+      #
+      # @param light_repo [Manifest::LightRepo] 操作仓库的配置repo
+      #
+      def push(root, light_repo)
+        cache_dir = light_repo.cache_store_dir(root)
+        workspace_path = light_repo.abs_dest(root)
+        return if invalid_move?(workspace_path, cache_dir)
+
+        cache_path = File.join(cache_dir, light_repo.name)
+        if Dir.exist?(workspace_path)
+          # 缓存存在则删除缓存
+          FileUtils.rm_rf(cache_path) if Dir.exist?(cache_path)
+
+          # 缓存目录不存在则创建
+          FileUtils.mkdir_p(cache_dir) if !Dir.exist?(cache_dir)
+
+          begin
+            FileUtils.mv(workspace_path, cache_dir)
+          rescue => _
+          end
+        end
+      end
+
+      # 将工作区的仓库a替换为b
+      #
+      # @param root [String] mgit工程根目录
+      #
+      # @param light_repo_a [Manifest::LightRepo] 缓存仓库的配置repo
+      #
+      # @param light_repo_b [Manifest::LightRepo] 弹出仓库的配置repo
+      #
+      def replace(root, light_repo_a, light_repo_b)
+        push(root, light_repo_a)
+        pop(root, light_repo_b)
+      end
+
+      # 根据工作区仓库url和配置url来替换仓库
+      #
+      # @param root [String] mgit工程根目录
+      #
+      # @param light_repo [Manifest::LightRepo] 操作仓库的配置repo
+      #
+      def sync_workspace(root, light_repo)
+        name = light_repo.name
+        path = light_repo.abs_dest(root)
+
+        # 若工作区存在该仓库，且url与配置不匹配，则压入缓存，此时如果配置的url有对应缓存，则将其弹出
+        if Repo.is_git_repo?(path)
+          repo = Repo.new(name, path)
+          url = repo.status_checker.default_url
+          if !Utils.url_consist?(url, light_repo.url)
+            repo_config = Manifest::LightRepoGenerator.simple_init(name, path, url)
+            replace(root, repo_config, light_repo)
+          end
+
+          # 若工作区不存在该仓库，则弹出配置url对应缓存（如有缓存的话）
+        else
+          pop(root, light_repo)
+        end
+      end
+
+      # 判断是否可以移动目录，若目标目录包含源目录，则无法移动
+      #
+      # @param from_path [String] 源目录
+      #
+      # @param to_path [String] 目标目录
+      #
+      def invalid_move?(from_path, to_path)
+        return Pathname(to_path).cleanpath.to_s.include?(Pathname(from_path).cleanpath.to_s)
+      end
+
+    end
+  end
+end

data/m-git

@@ -0,0 +1 @@
+./mgit

data/mgit

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby -W0
+#coding=utf-8
+
+#
+# if $PROGRAM_NAME == __FILE__
+#   ENV['BUNDLE_GEMFILE'] = File.expand_path('../Gemfile', __FILE__)
+#   require 'bundler/setup'
+# end
+
+require_relative 'lib/m-git'
+
+
+module MGit
+  extend self
+
+  SRC_ROOT = __dir__
+end
+
+MGit.run(ARGV)

metadata

@@ -0,0 +1,218 @@
+--- !ruby/object:Gem::Specification
+name: m-git
+version: !ruby/object:Gem::Version
+  version: 2.5.4
+platform: ruby
+authors:
+- zhangyu81
+autorequire: 
+bindir: "./"
+cert_chain: []
+date: 2021-03-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: colored2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: peach
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: tty-pager
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.17'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.17'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.14.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.14.1
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.2
+description: A multi-repository management tool integrated with git. for detail see
+  home page
+email: 
+executables:
+- mgit
+- m-git
+extensions: []
+extra_rdoc_files: []
+files:
+- "./m-git"
+- "./mgit"
+- LICENSE
+- README.md
+- lib/m-git.rb
+- lib/m-git/argv.rb
+- lib/m-git/argv/opt.rb
+- lib/m-git/argv/opt_list.rb
+- lib/m-git/argv/parser.rb
+- lib/m-git/base_command.rb
+- lib/m-git/command/add.rb
+- lib/m-git/command/branch.rb
+- lib/m-git/command/checkout.rb
+- lib/m-git/command/clean.rb
+- lib/m-git/command/commit.rb
+- lib/m-git/command/config.rb
+- lib/m-git/command/delete.rb
+- lib/m-git/command/fetch.rb
+- lib/m-git/command/forall.rb
+- lib/m-git/command/info.rb
+- lib/m-git/command/init.rb
+- lib/m-git/command/log.rb
+- lib/m-git/command/merge.rb
+- lib/m-git/command/pull.rb
+- lib/m-git/command/push.rb
+- lib/m-git/command/rebase.rb
+- lib/m-git/command/reset.rb
+- lib/m-git/command/self.rb
+- lib/m-git/command/stash.rb
+- lib/m-git/command/status.rb
+- lib/m-git/command/sync.rb
+- lib/m-git/command/tag.rb
+- lib/m-git/command_manager.rb
+- lib/m-git/error.rb
+- lib/m-git/foundation.rb
+- lib/m-git/foundation/constants.rb
+- lib/m-git/foundation/dir.rb
+- lib/m-git/foundation/duration_recorder.rb
+- lib/m-git/foundation/git_message_parser.rb
+- lib/m-git/foundation/lock.rb
+- lib/m-git/foundation/loger.rb
+- lib/m-git/foundation/mgit_config.rb
+- lib/m-git/foundation/operation_progress_manager.rb
+- lib/m-git/foundation/timer.rb
+- lib/m-git/foundation/utils.rb
+- lib/m-git/hooks_manager.rb
+- lib/m-git/manifest.rb
+- lib/m-git/manifest/cache_manager.rb
+- lib/m-git/manifest/internal.rb
+- lib/m-git/manifest/light_repo.rb
+- lib/m-git/manifest/light_repo_generator.rb
+- lib/m-git/manifest/linter.rb
+- lib/m-git/open_api.rb
+- lib/m-git/open_api/script_download_info.rb
+- lib/m-git/output/output.rb
+- lib/m-git/plugin_manager.rb
+- lib/m-git/repo.rb
+- lib/m-git/repo/status.rb
+- lib/m-git/repo/sync_helper.rb
+- lib/m-git/template.rb
+- lib/m-git/template/local_manifest.rb
+- lib/m-git/template/manifest_hook.rb
+- lib/m-git/template/post_download_hook.rb
+- lib/m-git/template/post_hook.rb
+- lib/m-git/template/pre_exec_hook.rb
+- lib/m-git/template/pre_hook.rb
+- lib/m-git/template/pre_push_hook.rb
+- lib/m-git/version.rb
+- lib/m-git/workspace.rb
+- lib/m-git/workspace/path_helper.rb
+- lib/m-git/workspace/workspace_helper.rb
+homepage: https://github.com/baidu/m-git
+licenses:
+- MIT
+metadata:
+  allowed_push_host: https://rubygems.org
+  homepage_uri: https://github.com/baidu/m-git
+  source_code_uri: https://github.com/baidu/m-git/tree/master
+  changelog_uri: https://github.com/baidu/m-git/tree/master/CHANGELOG.md
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: 2.3.0
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubygems_version: 3.0.3
+signing_key: 
+specification_version: 4
+summary: A multi-repository management tool integrated with git.
+test_files: []