Fixed slip in `hglib.rb` introduced in commit e665031cade7 stx-8.0.0
authorJan Vrany <jan.vrany@fit.cvut.cz>
Tue, 22 Aug 2017 10:11:36 +0100
branchstx-8.0.0
changeset 186 8b97e4435ddd
parent 185 6551154a9af9
child 190 fcf5ed063bb3
Fixed slip in `hglib.rb` introduced in commit e665031cade7 A bad refactoring. (grafted from 3abc438b6c59c8ff8aacf863e808da945cb7740b)
rakelib/hglib.rb
--- a/rakelib/hglib.rb	Thu Oct 05 10:53:55 2017 +0100
+++ b/rakelib/hglib.rb	Tue Aug 22 10:11:36 2017 +0100
@@ -448,7 +448,7 @@
     def push(remote = 'default', user: nil, pass: nil, rev: nil, bookmarks: [])
       hg('push', remote, ssh: sshconf(remote), config: authconf(remote, user, pass), rev: rev, bookmark: bookmarks) do |status, stdout, stderr|
         STDOUT.puts stdout
-        unless status.exitstatus == 0 and status.exitstatus == 1
+        unless status.exitstatus == 0 or status.exitstatus == 1
           STDERR.puts stderr
           raise Exception.new("Failed to 'push' from #{remote} (exit code #{status.exitstatus})")
         end