File tree 2 files changed +5
-3
lines changed
2 files changed +5
-3
lines changed Original file line number Diff line number Diff line change @@ -50,6 +50,7 @@ def ssh_capture(*params)
50
50
# i.e., executes 'ssh git@localhost <command>'
51
51
#
52
52
# Returns stdout, stderr and the exit code
53
+ #
53
54
def ssh_shell ( *params )
54
55
cmd = ssh . concat ( params )
55
56
execute ( cmd )
@@ -105,6 +106,7 @@ def ssh
105
106
# * (-p <gitolite_server_port>) Use port from settings
106
107
# * (-o BatchMode=yes) Never ask for a password
107
108
# * <gitolite_user>@<gitolite_server_host> (see +gitolite_url+)
109
+ #
108
110
def ssh_shell_params
109
111
[
110
112
'-T' ,
@@ -153,14 +155,14 @@ def hash_content(content)
153
155
154
156
# Return the content of a local (Redmine side) file.
155
157
#
156
- def local_content ( file )
158
+ def content_from_redmine_side ( file )
157
159
File . read ( file )
158
160
end
159
161
160
162
161
163
# Return the content of a file on Gitolite side.
162
164
#
163
- def distant_content ( destination_path )
165
+ def content_from_gitolite_side ( destination_path )
164
166
sudo_cat ( destination_path )
165
167
end
166
168
Original file line number Diff line number Diff line change @@ -135,7 +135,7 @@ def sudo_cat(file)
135
135
# Test if file content has changed
136
136
#
137
137
def sudo_file_changed? ( source_file , dest_file )
138
- hash_content ( local_content ( source_file ) ) != hash_content ( distant_content ( dest_file ) )
138
+ hash_content ( content_from_redmine_side ( source_file ) ) != hash_content ( content_from_gitolite_side ( dest_file ) )
139
139
end
140
140
141
141
end
You can’t perform that action at this time.
0 commit comments