takeltau 0.36.1 → 0.36.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 401a6ec84063daaad2d0b2ba91232b5d3f0322a2675ecc61eef9998d22867378
-  data.tar.gz: c79e35f420922cd660ea5e80504f6cb909b4387aedefa7fffeb3db97c6d4c847
+  metadata.gz: b2465bad2b7f3f05a0989db146bcd4aeebccb1157c03ccd54a34e2dc6653ad46
+  data.tar.gz: 5a5a34f4ca5c59e66ef99e6814aea3c07f8f591f9511ee24484473462fe9083c
 SHA512:
-  metadata.gz: ff29b7c25e3955263a0bd1d0fa74f1ee5e43af8759d1d6daf3680084659aaae8c9610976e73524eea1d875738b161b2abaa7e9a0bff1c478dc33ddf945cd6b1a
-  data.tar.gz: 7e5fc47759b9488e4f18019cce0eaf2221864ba7a08b8ab70dc3279eaa2f975a64f7e93130f305256c4f8a868f8960fed27d96a1940b436098af3c151afb6623
+  metadata.gz: a2ce4ee0a6cbf779b3f0066f46e4ad4a9ec500b704661b9e93b3b27c230246a129552d9dedbafa1ee858bc9482ec13d03b499b915914593799fbd3616cd10f91
+  data.tar.gz: d1bc6aa9527413db818055b1f6aecc0654352a41fbca79d1c461329b71d2d5ea1d6d2427b0795b268da856c1eab217e3aefdef71b32f9129e68db5f8e708ff78

data/lib/takeltau/default.yml

@@ -24,6 +24,7 @@ cmd_git_check_hg_get_git_branch: 'git symbolic-ref HEAD'
 cmd_git_check_workspace_git_repo: 'git -C %{dir} rev-parse'
 cmd_git_check_workspace_pwd: 'pwd'
 cmd_git_lib_git_add_all: 'git add --all'
+cmd_git_lib_git_add_hg_dirs: 'git add \*/.hg/\*'
 cmd_git_lib_git_commit: 'git commit --message="%{message}"'
 cmd_git_lib_git_pull_origin: 'git pull origin %{main}'
 cmd_git_lib_git_push_origin: 'git push origin %{main}'

data/lib/takeltau/git/lib.rb

@@ -20,6 +20,18 @@ module GitLib
     _git_lib_git_push_origin_hg
   end
 
+  # Push git workspace.
+  def git_lib_push_hg_dirs
+    log.info 'Pushing git workspace'
+
+    message = '"Update .hg mercurial directories'
+
+    return false unless _git_lib_git_add_hg_dirs
+    return false unless _git_lib_git_commit message
+
+    _git_lib_git_push_origin_hg
+  end
+
   private
 
   # git add all.
@@ -34,6 +46,18 @@ module GitLib
     false
   end
 
+  # git add hg dirs.
+  def _git_lib_git_add_hg_dirs
+    log.debug 'Adding all .hg mercurial dirs to git'
+
+    cmd_git_add_hg_dirs = config.active['cmd_git_lib_git_add_hg_dirs']
+
+    return true if try cmd_git_add_hg_dirs
+
+    log.error 'Unable to add all .hg mercurial dirs to git'
+    false
+  end
+
   # git commit.
   def _git_lib_git_commit(message)
     log.debug "Committing to git with message \"#{message}\""

data/lib/takeltau/hg/pull.rb

@@ -3,6 +3,7 @@
 # tau hg pull
 module HgPull
   # Backend method for hg pull.
+  # rubocop:disable Metrics/AbcSize
   # rubocop:disable Metrics/MethodLength
   def hg_pull
     log.debug 'Pull hg repos'
@@ -25,9 +26,14 @@ module HgPull
     end
 
     log.info _hg_pull_hg_pull_repos
-    true
+
+    return true if git_lib_push_hg_dirs
+
+    log.error 'Unable to push .hg mercurial directories'
+    false
   end
   # rubocop:enable Metrics/MethodLength
+  # rubocop:enable Metrics/AbcSize
 
   private
 

data/lib/takeltau/version

@@ -1 +1 @@
-0.36.1
+0.36.3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takeltau
 version: !ruby/object:Gem::Version
-  version: 0.36.1
+  version: 0.36.3
 platform: ruby
 authors:
 - Takelwerk