Module: GitCli::Delta
- Included in:
- Workspace
- Defined in:
- lib/git_cli/delta.rb
Defined Under Namespace
Classes: ConflictedDir, ConflictedFile, DeletedDir, DeletedFile, GitDeltaError, ModifiedDir, ModifiedFile, NewDir, NewFile, StagedDir, StagedFile, VCSItem
Instance Method Summary
collapse
Instance Method Details
#calculate_distance(from, to) ⇒ Object
If remote is ahead of local git rev-list HEAD..origin/main –count
if local is ahead of remote git rev-list origin/main..HEAD –count
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
|
# File 'lib/git_cli/delta.rb', line 438
def calculate_distance(from, to)
check_vcs
cmd = []
cmd << "cd"
cmd << @wsPath
cmd << "&&"
cmd << @vcs.exe_path
cmd << "rev-list #{from}..#{to} --count"
cmdln = cmd.join(" ")
log_debug "Calculate distance between two repos : #{cmdln}"
res = os_exec(cmdln) do |st, res|
[st.success?, res]
end
end
|
#cftFiles ⇒ Object
248
249
250
|
# File 'lib/git_cli/delta.rb', line 248
def cftFiles
conflicted.first
end
|
#conflicted ⇒ Object
245
246
247
|
# File 'lib/git_cli/delta.rb', line 245
def conflicted
conflicted_files.reverse
end
|
#conflicted_files ⇒ Object
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
|
# File 'lib/git_cli/delta.rb', line 210
def conflicted_files
check_vcs
cmd = []
cmd << "cd"
cmd << @wsPath
cmd << "&&"
cmd << @vcs.exe_path
cmd << "diff --name-only --diff-filter=U"
cmdln = cmd.join(" ")
log_debug "Conflicted files : #{cmdln}"
dirs = []
files = []
res = os_exec(cmdln) do |st, res|
if not st.success?
raise GitDeltaError, res
else
res.each_line do |l|
l.chomp!
full = File.join(@wsPath,l)
if File.directory?(full)
dirs << ConflictedDir.new(l, full)
else
files << ConflictedFile.new(l, full)
end
end
[dirs.sort, files.sort]
end
end
end
|
#deleted ⇒ Object
334
335
336
|
# File 'lib/git_cli/delta.rb', line 334
def deleted
deleted_files.reverse
end
|
#deleted_files ⇒ Object
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
|
# File 'lib/git_cli/delta.rb', line 299
def deleted_files
check_vcs
cmd = []
cmd << "cd"
cmd << @wsPath
cmd << "&&"
cmd << @vcs.exe_path
cmd << "ls-files -d"
cmdln = cmd.join(" ")
log_debug "Deleted files : #{cmdln}"
dirs = []
files = []
res = os_exec(cmdln) do |st, res|
if not st.success?
raise GitDeltaError, res
else
res.each_line do |l|
l.chomp!
full = File.join(@wsPath,l)
if File.directory?(full)
dirs << DeletedDir.new(l,full)
else
files << DeletedFile.new(l,full)
end
end
[dirs.sort, files.sort]
end
end
end
|
#delFiles ⇒ Object
337
338
339
|
# File 'lib/git_cli/delta.rb', line 337
def delFiles
deleted.first
end
|
#has_conflicted_file? ⇒ Boolean
Also known as:
has_conflicted_files?
251
252
253
|
# File 'lib/git_cli/delta.rb', line 251
def has_conflicted_file?
ctfFiles.length > 0
end
|
#has_deleted_file? ⇒ Boolean
Also known as:
has_deleted_files?
340
341
342
|
# File 'lib/git_cli/delta.rb', line 340
def has_deleted_file?
delFiles.length > 0
end
|
#has_modified_file? ⇒ Boolean
Also known as:
has_modified_files?
205
206
207
|
# File 'lib/git_cli/delta.rb', line 205
def has_modified_file?
modFiles.length > 0
end
|
#has_new_file? ⇒ Boolean
Also known as:
has_new_files?
294
295
296
|
# File 'lib/git_cli/delta.rb', line 294
def has_new_file?
newFiles.length >0
end
|
#has_staged_file? ⇒ Boolean
Also known as:
has_staged_files?
386
387
388
|
# File 'lib/git_cli/delta.rb', line 386
def has_staged_file?
stgFiles.length > 0
end
|
#is_local_ahead_of_remote?(remote_name, branch = "main") ⇒ Boolean
457
458
459
460
461
462
463
464
465
466
467
|
# File 'lib/git_cli/delta.rb', line 457
def is_local_ahead_of_remote?(remote_name, branch = "main")
st, res = calculate_distance("#{remote_name}/#{branch}", "HEAD")
if st
res.to_i > 0
else
true
end
end
|
#is_remote_ahead_of_local?(remote_name, branch = "main") ⇒ Boolean
469
470
471
472
473
474
475
476
477
478
|
# File 'lib/git_cli/delta.rb', line 469
def is_remote_ahead_of_local?(remote_name, branch = "main")
st, res = calculate_distance("HEAD","#{remote_name}/#{branch}")
if st
res.to_i > 0
else
true
end
end
|
#modFiles ⇒ Object
202
203
204
|
# File 'lib/git_cli/delta.rb', line 202
def modFiles
modified.first
end
|
#modified ⇒ Object
199
200
201
|
# File 'lib/git_cli/delta.rb', line 199
def modified
modified_files.reverse
end
|
#modified_files ⇒ Object
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
|
# File 'lib/git_cli/delta.rb', line 162
def modified_files
check_vcs
cmd = []
cmd << "cd"
cmd << @wsPath
cmd << "&&"
cmd << @vcs.exe_path
cmd << "diff --name-only --diff-filter=M"
cmdln = cmd.join(" ")
log_debug "Modified files : #{cmdln}"
dirs = []
files = []
res = os_exec(cmdln) do |st, res|
if not st.success?
raise GitDeltaError, res
else
res.each_line do |l|
l.chomp!
full = File.join(@wsPath,l)
if File.directory?(full)
dirs << ModifiedDir.new(l,full)
else
files << ModifiedFile.new(l,full)
end
end
[dirs.sort, files.sort]
end
end
end
|
#new_files ⇒ Object
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
|
# File 'lib/git_cli/delta.rb', line 256
def new_files
check_vcs
cmd = []
cmd << "cd"
cmd << @wsPath
cmd << "&&"
cmd << @vcs.exe_path
cmd << "ls-files --others --exclude-standard --directory"
cmdln = cmd.join(" ")
log_debug "New Files : #{cmdln}"
dirs = []
files = []
res = os_exec(cmdln) do |st, res|
if not st.success?
raise GitDeltaError, res
else
res.each_line do |l|
l.chomp!
full = File.join(@wsPath,l)
if File.directory?(full)
dirs << NewDir.new(l,full)
else
files << NewFile.new(l,full)
end
end
[dirs.sort, files.sort]
end
end
end
|
#newFiles ⇒ Object
291
292
293
|
# File 'lib/git_cli/delta.rb', line 291
def newFiles
new_files.reverse.first
end
|
#reset_all_changes ⇒ Object
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
|
# File 'lib/git_cli/delta.rb', line 413
def reset_all_changes
check_vcs
cmd = []
cmd << "cd"
cmd << @wsPath
cmd << "&&"
cmd << @vcs.exe_path
cmd << "reset --hard"
cmdln = cmd.join(" ")
log_debug "Reset all local changes (permanent) : #{cmdln}"
res = os_exec(cmdln) do |st, res|
[st.success?, res]
end
end
|
#reset_file_changes(path) ⇒ Object
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
|
# File 'lib/git_cli/delta.rb', line 391
def reset_file_changes(path)
raise_if_empty(path, "Path cannot be empty for reset file changes operation", GitDeltaError)
check_vcs
cmd = []
cmd << "cd"
cmd << @wsPath
cmd << "&&"
cmd << @vcs.exe_path
cmd << "checkout --"
cmd << path
cmdln = cmd.join(" ")
log_debug "Reset file changes local changes (given file permanent) : #{cmdln}"
res = os_exec(cmdln) do |st, res|
[st.success?, res]
end
end
|
#staged ⇒ Object
380
381
382
|
# File 'lib/git_cli/delta.rb', line 380
def staged
staged_files.reverse
end
|
#staged_files ⇒ Object
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
|
# File 'lib/git_cli/delta.rb', line 345
def staged_files
check_vcs
cmd = []
cmd << "cd"
cmd << @wsPath
cmd << "&&"
cmd << @vcs.exe_path
cmd << "diff --name-only --cached"
cmdln = cmd.join(" ")
log_debug "Staged Files : #{cmdln}"
dirs = []
files = []
res = os_exec(cmdln) do |st, res|
if not st.success?
raise GitDeltaError, res
else
res.each_line do |l|
l.chomp!
full = File.join(@wsPath,l)
if File.directory?(full)
dirs << StagedDir.new(l,full)
else
files << StagedFile.new(l,full)
end
end
[dirs.sort, files.sort]
end
end
end
|
#status ⇒ Object
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
|
# File 'lib/git_cli/delta.rb', line 133
def status
check_vcs
cmd = []
cmd << "cd"
cmd << @wsPath
cmd << "&&"
cmd << @vcs.exe_path
cmd << "status"
cmdln = cmd.join(" ")
log_debug "Status : #{cmdln}"
res = os_exec(cmdln) do |st, res|
if not st.success?
raise GitDeltaError, res
else
res
end
end
end
|
#stgFiles ⇒ Object
383
384
385
|
# File 'lib/git_cli/delta.rb', line 383
def stgFiles
staged.first
end
|