git-maintain 0.4.0.pre.3.ge7030b9 → 0.5.0.pre.2.g67ac144

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.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG +6 -0
  3. data/lib/branch.rb +14 -0
  4. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 42036590702a7e9e20d4a04c98ec5eec4acc5595abdb6828a676ec3a0ce235ee
4
- data.tar.gz: c107094b1d94181c4f973e0f0e22ac4e28a98b3163222c48659f89ba623fc23d
3
+ metadata.gz: 37459a0823f1386afbc6d3f756f8e92760bd096aa6e0ad7608820df4ecfb6d64
4
+ data.tar.gz: abdb7db87ba388e5b46a55f3271ad51626a66ea030c5acf072dd259590dfb196
5
5
  SHA512:
6
- metadata.gz: 4c46eafa55c9264d8b0c519c060d2778d7f09551a885dc1afdb1b61ee53f48047900ac602f7b7c231bc93310b439bdd79d84540b75430c460777b6532f36c359
7
- data.tar.gz: 4c0c3bdd430b6cadd0d430818326ff86606cb62469392f7b7af0bd1fd214fef6097050f76b8c14f51369a1e75530764c6103d90d2926a259e5f6648a5e2bf677
6
+ metadata.gz: be6186cebcd42e1c6c2d05c2065845c6a1cd348094a85051300f711123162555b51c36a7dfa96e35b38bfd0e9a40a3d0d5ffcd1a65bce88bbf243c23400cb619
7
+ data.tar.gz: bbabbba9ec3b17ccc46cc73f73ebe7cd65f77ad167f9a9f1ee48c15289e60c6d7d92b42aff99046600b68940c2784dc5ce78883987ddf4917993d0d6fb030f73
data/CHANGELOG CHANGED
@@ -1,3 +1,9 @@
1
+ * Speed up push_stable
2
+ * Add --check option for push_stable
3
+
4
+ ------------------
5
+ 0.5.0 (2019-02-05)
6
+ ------------------
1
7
 
2
8
  * Handle bad Fixes tag
3
9
  * Speed up steal feature by remembering last point checked
data/lib/branch.rb CHANGED
@@ -73,6 +73,8 @@ module GitMaintain
73
73
  optsParser.banner += "[-T]"
74
74
  optsParser.on("-T", "--no-travis", "Ignore Travis build status and push anyway.") {
75
75
  |val| opts[:no_travis] = true}
76
+ optsParser.on("-c", "--check", "Check if there is something to be pushed.") {
77
+ |val| opts[:check_only] = true}
76
78
  when :steal
77
79
  optsParser.banner += "[-a]"
78
80
  optsParser.on("-a", "--all", "Check all commits from master. "+
@@ -271,6 +273,18 @@ module GitMaintain
271
273
  puts "Build is not passed on travis. Skipping push to stable"
272
274
  return
273
275
  end
276
+ c1=@repo.runGit("rev-parse --verify --quiet #{@local_branch}")
277
+ c2=@repo.runGit("rev-parse --verify --quiet #{@remote_ref}")
278
+ if c1 == c2 then
279
+ puts "Stable is already up-to-date"
280
+ return
281
+ end
282
+
283
+ if opts[:check_only] == true then
284
+ GitMaintain::checkLog(opts, @local_branch, @remote_ref, "")
285
+ return
286
+ end
287
+
274
288
  rep = GitMaintain::checkLog(opts, @local_branch, @remote_ref, "submit")
275
289
  if rep == "y" then
276
290
  @repo.runGit("push #{@repo.stable_repo} #{@local_branch}:#{@remote_branch}")
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: git-maintain
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.0.pre.3.ge7030b9
4
+ version: 0.5.0.pre.2.g67ac144
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nicolas Morey-Chaisemartin