takeltau 0.36.1 → 0.37.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 401a6ec84063daaad2d0b2ba91232b5d3f0322a2675ecc61eef9998d22867378
-  data.tar.gz: c79e35f420922cd660ea5e80504f6cb909b4387aedefa7fffeb3db97c6d4c847
+  metadata.gz: 293a71b537a49394f198b0a1479285f57e43d899ccaffdcf64f18e91a95a4445
+  data.tar.gz: 00e04f3a868ac61e81660b4e37e74a83d055c72d591ca53be88e04c48b32e488
 SHA512:
-  metadata.gz: ff29b7c25e3955263a0bd1d0fa74f1ee5e43af8759d1d6daf3680084659aaae8c9610976e73524eea1d875738b161b2abaa7e9a0bff1c478dc33ddf945cd6b1a
-  data.tar.gz: 7e5fc47759b9488e4f18019cce0eaf2221864ba7a08b8ab70dc3279eaa2f975a64f7e93130f305256c4f8a868f8960fed27d96a1940b436098af3c151afb6623
+  metadata.gz: 4f259593b1df8171bcd2400ba152a55c430b3c535e8c8f5abe6cbc3e66c4484947e32472d0ff612e848f0429ee96424306329f0a7abc063f116c9610396fb628
+  data.tar.gz: b71b36fcba29683483fa39e35e46293dac09c61c6b1603977605ab0eacf16eefe12867058160544ac21774b05a0f34b95c24baf7b915c18530a60cebb3fe3dcc

data/README.md

@@ -168,7 +168,21 @@ to overwrite defaults like:
 docker_repo: takelage-mock
 ```
 
-Furthermore, every external command can be reconfigured.
+- You may prefer to interact with 
+[mercurial](https://github.com/takelwerk/takelage-doc/blob/main/doc/tau/hg.md)
+through `tau hg`
+in a different branch than `main` in one project so you may add
+to your *takelage.yml*:
+
+
+```yaml
+---
+git_hg_repo: my_git_hg_branch
+```
+
+Furthermore, 
+[every external command](https://github.com/takelwerk/takelage-cli/blob/main/lib/takeltau/default.yml)
+can be reconfigured.
 
 ### Project Files
 

data/lib/takeltau/default.yml

@@ -23,13 +23,13 @@ cmd_git_check_clean_git_status: 'git status --porcelain'
 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}'
-cmd_hg_list_repos: 'cd %{root}; find * -type d -name ".hg" | parallel -k hg paths default -R {//} -T "hg\ clone\ {url}\ " \; echo {//}'
-cmd_hg_pull_repos: 'cd %{root}; find * -type d -name ".hg" | parallel -k echo \; cd {//} \; pwd \; hg pull --update'
-cmd_hg_push_repos: 'cd %{root}; find * -type d -name ".hg" | parallel -k echo \; cd {//} \; pwd \; hg commit --addremove --message "Update\ hg\ repos" \; hg bookmark -f main \; hg push'
+cmd_hg_list_repos: 'cd %{root}; find * -type d -name ".hg" | parallel --keep-order hg paths default --repository {//} --template "hg\ clone\ {url}\ " \; echo {//}'
+cmd_hg_pull_repos: 'cd %{root}; find * -type d -name ".hg" | parallel --keep-order echo \; cd {//} \; pwd \; hg pull --update'
+cmd_hg_push_repos: 'cd %{root}; find * -type d -name ".hg" | parallel --keep-order echo \; cd {//} \; pwd \; hg commit --addremove --message "Update\ hg\ repos" \; hg bookmarks --force main \; hg push'
 cmd_info_status_lib_git_name: 'git -C %{root} config user.name'
 cmd_info_status_lib_git_email: 'git -C %{root} config user.email'
 cmd_info_status_lib_git_signingkey: 'git -C %{root} config user.signingKey'

data/lib/takeltau/git/lib.rb

@@ -2,35 +2,56 @@
 
 # tau git lib
 module GitLib
-  # Pull git workspace.
-  def git_lib_pull_workspace
-    log.info 'Pulling git workspace'
+  # Prepare git workspace.
+  # rubocop:disable Metrics/MethodLength
+  def git_lib_prepare_git_workspace
+    log.debug 'Prepare git workspace'
 
-    _git_lib_git_pull_origin_hg
+    return false unless configured? %w[project_root_dir]
+
+    unless git_check_hg
+      log.error 'Not on git hg branch'
+      return false
+    end
+
+    unless git_check_clean
+      log.error 'No clean git workspace'
+      return false
+    end
+
+    return true if _git_lib_git_pull_origin_hg
+
+    log.error 'Unable to pull git workspace'
+    false
   end
+  # rubocop:enable Metrics/MethodLength
 
   # Push git workspace.
-  def git_lib_push_workspace(message)
+  def git_lib_push_hg_dirs
     log.info 'Pushing git workspace'
 
-    return false unless _git_lib_git_add_all
+    message = 'Update .hg mercurial directories'
+
+    return false unless _git_lib_git_add_hg_dirs
     return false unless _git_lib_git_commit message
-    return false unless _git_lib_git_pull_origin_hg
 
-    _git_lib_git_push_origin_hg
+    return true if _git_lib_git_push_origin_hg
+
+    log.error 'Unable to git push .hg mercurial directories'
+    false
   end
 
   private
 
-  # git add all.
-  def _git_lib_git_add_all
-    log.debug 'Adding all files to git'
+  # git add hg dirs.
+  def _git_lib_git_add_hg_dirs
+    log.debug 'Adding all .hg mercurial dirs to git'
 
-    cmd_git_add_all = config.active['cmd_git_lib_git_add_all']
+    cmd_git_add_hg_dirs = config.active['cmd_git_lib_git_add_hg_dirs']
 
-    return true if try cmd_git_add_all
+    return true if (try cmd_git_add_hg_dirs).exitstatus.zero?
 
-    log.error 'Unable to add all files to git'
+    log.error 'Unable to add all .hg mercurial dirs to git'
     false
   end
 
@@ -43,7 +64,7 @@ module GitLib
       message: message
     )
 
-    return true if try cmd_git_commit
+    return true if (try cmd_git_commit).exitstatus.zero?
 
     log.error 'Unable to commit to git'
     false

data/lib/takeltau/hg/pull.rb

@@ -3,31 +3,18 @@
 # tau hg pull
 module HgPull
   # Backend method for hg pull.
-  # rubocop:disable Metrics/MethodLength
   def hg_pull
     log.debug 'Pull hg repos'
 
-    return false unless configured? %w[project_root_dir]
+    return false unless git_lib_prepare_git_workspace
 
-    unless git_check_hg
-      log.error 'Not on git hg branch'
+    unless _hg_pull_hg_pull_repos
+      log.error 'Unable to tau hg pull'
       return false
     end
 
-    unless git_check_clean
-      log.error 'No clean git workspace'
-      return false
-    end
-
-    unless git_lib_pull_workspace
-      log.error 'Unable to pull git workspace'
-      return false
-    end
-
-    log.info _hg_pull_hg_pull_repos
-    true
+    git_lib_push_hg_dirs
   end
-  # rubocop:enable Metrics/MethodLength
 
   private
 
@@ -38,6 +25,8 @@ module HgPull
       root: config.active['project_root_dir']
     )
 
-    run cmd_hg_pull_repos
+    stdout, _, exitstatus = run_and_capture cmd_hg_pull_repos
+    log.info stdout
+    exitstatus.zero?
   end
 end

data/lib/takeltau/hg/push.rb

@@ -3,30 +3,18 @@
 # tau hg push
 module HgPush
   # Backend method for hg push.
-  # rubocop:disable Metrics/MethodLength
   def hg_push
     log.debug 'Push hg repos'
 
-    return false unless configured? %w[project_root_dir]
+    return false unless git_lib_prepare_git_workspace
 
-    unless git_check_hg
-      log.error 'Not on git hg branch'
+    unless _hg_push_hg_push_repos
+      log.error 'Unable to tau hg push'
       return false
     end
 
-    unless git_check_clean
-      log.error 'No clean git workspace'
-      return false
-    end
-
-    log.info _hg_push_hg_push_repos
-
-    return true if git_lib_push_workspace 'tau hg push'
-
-    log.error 'Unable to push git workspace'
-    false
+    git_lib_push_hg_dirs
   end
-  # rubocop:enable Metrics/MethodLength
 
   private
 
@@ -37,6 +25,8 @@ module HgPush
       root: config.active['project_root_dir']
     )
 
-    run cmd_hg_push_repos
+    stdout, _, exitstatus = run_and_capture cmd_hg_push_repos
+    log.info stdout
+    exitstatus.zero?
   end
 end

data/lib/takeltau/version

@@ -1 +1 @@
-0.36.1
+0.37.1

metadata

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