git-maintain 0.13.0 → 1.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG +18 -0
- data/lib/git-maintain/addons/git-maintain.rb +14 -0
- data/lib/git-maintain/branch.rb +9 -4
- data/lib/git-maintain/repo.rb +4 -2
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: e75c0d819dd93d2a04da7557818ab2384aa193938c10968ab5956860da1a927a
|
|
4
|
+
data.tar.gz: abb92e652de1c72b0d6934d2264f0bd9f4552e34b3402abb0becec6aee36fa0b
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 2ff31ac0ed8c09dc538efcd90f5509cae94b8ae7c606bc46c39146abf6d5754b63d99a8f83fe8605bab5a22ce9735a3d357935e02afd0461fabaf03f1c7d5fcf
|
|
7
|
+
data.tar.gz: 546ac7c74275d81c877b0e22e9acdc926ff915d2a148300fb3b6d7a8398f5f2d3f35865fb3348048b57dbdaf0e2c4dcedcebe2a7435bb1a32cd77e565a84e46f
|
data/CHANGELOG
CHANGED
|
@@ -1,3 +1,21 @@
|
|
|
1
|
+
------------------
|
|
2
|
+
1.0.0 (2026-09-09)
|
|
3
|
+
------------------
|
|
4
|
+
|
|
5
|
+
* Update to cli_class_tool 1.0.0
|
|
6
|
+
|
|
7
|
+
------------------
|
|
8
|
+
0.14.2 (2026-09-09)
|
|
9
|
+
------------------
|
|
10
|
+
|
|
11
|
+
------------------
|
|
12
|
+
0.14.1 (2026-09-09)
|
|
13
|
+
------------------
|
|
14
|
+
|
|
15
|
+
------------------
|
|
16
|
+
0.14.0 (2026-09-09)
|
|
17
|
+
------------------
|
|
18
|
+
|
|
1
19
|
------------------
|
|
2
20
|
0.13.0 (2026-09-09)
|
|
3
21
|
------------------
|
|
@@ -124,4 +124,18 @@ mv CHANGELOG.new CHANGELOG")
|
|
|
124
124
|
{ GitMaintain::Branch => CLIClassToolBranch,
|
|
125
125
|
GitMaintain::Repo => CLIClassToolRepo})
|
|
126
126
|
|
|
127
|
+
# Subclass of GitMaintainBranch for cli_class_workEnv repository.
|
|
128
|
+
class WorkEnvBranch < GitMaintainBranch
|
|
129
|
+
# Repository name constant for cli_class_tool.
|
|
130
|
+
REPO_NAME = "workEnv"
|
|
131
|
+
end
|
|
132
|
+
|
|
133
|
+
# Subclass of GitMaintainRepo for workEnv repository.
|
|
134
|
+
class WorkEnvRepo < GitMaintainRepo
|
|
135
|
+
end
|
|
136
|
+
|
|
137
|
+
GitMaintain::registerCustom(WorkEnvBranch::REPO_NAME,
|
|
138
|
+
{ GitMaintain::Branch => WorkEnvBranch,
|
|
139
|
+
GitMaintain::Repo => WorkEnvRepo})
|
|
140
|
+
|
|
127
141
|
end
|
data/lib/git-maintain/branch.rb
CHANGED
|
@@ -588,7 +588,7 @@ module GitMaintain
|
|
|
588
588
|
delete_list = opts[:delete_branches] || []
|
|
589
589
|
return if delete_list.length == 0
|
|
590
590
|
puts "Deleting #{opts[:delete_remote] == true ? "remote" : "local"} branches: #{delete_list.join(" ")}"
|
|
591
|
-
rep = confirm(opts, "continue", true)
|
|
591
|
+
rep = confirm(opts, "continue", ignored_default: true)
|
|
592
592
|
if rep != "y" then
|
|
593
593
|
log(:INFO, "Cancelling")
|
|
594
594
|
return
|
|
@@ -748,7 +748,10 @@ module GitMaintain
|
|
|
748
748
|
runGitInteractive("diff")
|
|
749
749
|
log( :INFO, "Entering subshell to fix conflicts. Exit when done")
|
|
750
750
|
runSystem("PS1_WARNING='CP FIX' bash", false)
|
|
751
|
-
rep = confirm(opts, "continue with scp
|
|
751
|
+
rep = confirm(opts, "continue with scp",
|
|
752
|
+
ignore_default: true,
|
|
753
|
+
allowed_reps: ["y", "n", "s"],
|
|
754
|
+
usage: "[y]es, [n]o, [s]kip")
|
|
752
755
|
case rep
|
|
753
756
|
when "n"
|
|
754
757
|
runGitInteractive("cherry-pick --abort")
|
|
@@ -807,8 +810,10 @@ module GitMaintain
|
|
|
807
810
|
commit_desc = @repo.getCommitHeadline(commit)
|
|
808
811
|
rep = "t"
|
|
809
812
|
while rep != "y"
|
|
810
|
-
rep = confirm(opts, "pick commit '#{commit_desc}' up
|
|
811
|
-
false,
|
|
813
|
+
rep = confirm(opts, "pick commit '#{commit_desc}' up",
|
|
814
|
+
ignore_default: false,
|
|
815
|
+
allowed_reps: ["y", "n", "?", "b"],
|
|
816
|
+
usage: " ([y]es, [n]o, show[?], [b]lacklist")
|
|
812
817
|
|
|
813
818
|
case rep
|
|
814
819
|
when "y"
|
data/lib/git-maintain/repo.rb
CHANGED
|
@@ -416,7 +416,8 @@ module GitMaintain
|
|
|
416
416
|
end
|
|
417
417
|
|
|
418
418
|
log(:WARNING, "This will officially release these tags: #{new_tags.join(", ")}")
|
|
419
|
-
rep = confirm(opts, "release them",
|
|
419
|
+
rep = confirm(opts, "release them",
|
|
420
|
+
ignore_default: true)
|
|
420
421
|
if rep != 'y' then
|
|
421
422
|
raise GitMaintainError.new("Aborting..")
|
|
422
423
|
end
|
|
@@ -426,7 +427,8 @@ module GitMaintain
|
|
|
426
427
|
end
|
|
427
428
|
|
|
428
429
|
log(:WARNING, "Last chance to cancel before submitting")
|
|
429
|
-
rep= confirm(opts, "submit these releases",
|
|
430
|
+
rep= confirm(opts, "submit these releases",
|
|
431
|
+
ignore_default: true)
|
|
430
432
|
if rep != 'y' then
|
|
431
433
|
raise GitMaintainError.new("Aborting..")
|
|
432
434
|
end
|