1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
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
161
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
199
200
201
202
203
204
205
206
207
208
209
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
245
246
247
248
249
250
251
252
253
254
255
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
291
292
293
294
295
296
297
298
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
334
335
336
337
338
339
340
341
342
343
344
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
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
|
require 'securerandom'
module Gitlab
module Git
# These are monkey patches on top of the vendored version of Repository.
class Repository
include Gitlab::Git::RepositoryMirroring
include Gitlab::Git::Popen
include Gitlab::EncodingHelper
include Gitlab::Utils::StrongMemoize
ALLOWED_OBJECT_DIRECTORIES_VARIABLES = %w[
GIT_OBJECT_DIRECTORY
GIT_ALTERNATE_OBJECT_DIRECTORIES
].freeze
ALLOWED_OBJECT_RELATIVE_DIRECTORIES_VARIABLES = %w[
GIT_OBJECT_DIRECTORY_RELATIVE
GIT_ALTERNATE_OBJECT_DIRECTORIES_RELATIVE
].freeze
# In https://gitlab.com/gitlab-org/gitaly/merge_requests/698
# We copied these two prefixes into gitaly-go, so don't change these
# or things will break! (REBASE_WORKTREE_PREFIX and SQUASH_WORKTREE_PREFIX)
REBASE_WORKTREE_PREFIX = 'rebase'.freeze
SQUASH_WORKTREE_PREFIX = 'squash'.freeze
AM_WORKTREE_PREFIX = 'am'.freeze
GITALY_INTERNAL_URL = 'ssh://gitaly/internal.git'.freeze
AUTOCRLF_VALUES = { 'true' => true, 'false' => false, 'input' => :input }.freeze
RUGGED_KEY = :rugged_list
GIT_ALLOW_SHA_UPLOAD = 'uploadpack.allowAnySHA1InWant=true'.freeze
NoRepository = Class.new(StandardError)
InvalidRef = Class.new(StandardError)
GitError = Class.new(StandardError)
DeleteBranchError = Class.new(StandardError)
TagExistsError = Class.new(StandardError)
class CreateTreeError < StandardError
attr_reader :error
def initialize(error)
@error = error
end
end
class << self
def from_gitaly(gitaly_repository, call)
new(
gitaly_repository,
GitalyServer.repo_path(call),
GitalyServer.gl_repository(call),
Gitlab::Git::GitlabProjects.from_gitaly(gitaly_repository, call),
GitalyServer.repo_alt_dirs(call)
)
end
def from_gitaly_with_block(gitaly_repository, call)
repository = from_gitaly(gitaly_repository, call)
result = yield repository
repository.cleanup
result
end
end
attr_reader :path
# Directory name of repo
attr_reader :name
attr_reader :gitlab_projects, :storage, :gl_repository, :relative_path
def initialize(gitaly_repository, path, gl_repository, gitlab_projects, combined_alt_dirs = "")
@gitaly_repository = gitaly_repository
@alternate_object_directories = combined_alt_dirs
.split(File::PATH_SEPARATOR)
.map { |d| File.join(path, d) }
@storage = gitaly_repository.storage_name
@relative_path = gitaly_repository.relative_path
@path = path
@gl_repository = gl_repository
@gitlab_projects = gitlab_projects
end
def ==(other)
[storage, relative_path] == [other.storage, other.relative_path]
end
def add_branch(branch_name, user:, target:)
target_object = Ref.dereference_object(lookup(target))
raise InvalidRef, "target not found: #{target}" unless target_object
OperationService.new(user, self).add_branch(branch_name, target_object.oid)
find_branch(branch_name)
rescue Rugged::ReferenceError => ex
raise InvalidRef, ex
end
attr_reader :gitaly_repository
attr_reader :alternate_object_directories
def sort_branches(branches, sort_by)
case sort_by
when 'name'
branches.sort_by(&:name)
when 'updated_desc'
branches.sort do |a, b|
b.dereferenced_target.committed_date <=> a.dereferenced_target.committed_date
end
when 'updated_asc'
branches.sort do |a, b|
a.dereferenced_target.committed_date <=> b.dereferenced_target.committed_date
end
else
branches
end
end
def exists?
File.exist?(File.join(path, 'refs'))
end
def root_ref
@root_ref ||= discover_default_branch
end
def rugged
@rugged ||= begin
Rugged::Repository.new(path, alternates: alternate_object_directories).tap do |repo|
Thread.current[RUGGED_KEY] << repo if Thread.current[RUGGED_KEY]
end
end
rescue Rugged::RepositoryError, Rugged::OSError
raise NoRepository, 'no repository for such path'
end
def branch_names
branches.map(&:name)
end
def branches
branches_filter
end
def local_branches(sort_by: nil)
branches_filter(filter: :local, sort_by: sort_by)
end
# Git repository can contains some hidden refs like:
# /refs/notes/*
# /refs/git-as-svn/*
# /refs/pulls/*
# This refs by default not visible in project page and not cloned to client side.
def has_visible_content?
strong_memoize(:has_visible_content) do
branches_filter(filter: :local).any? do |ref|
begin
ref.name && ref.target # ensures the branch is valid
true
rescue Rugged::ReferenceError
false
end
end
end
end
def tags
rugged.references.each("refs/tags/*").map do |ref|
message = nil
if ref.target.is_a?(Rugged::Tag::Annotation)
tag_message = ref.target.message
message = tag_message.chomp if tag_message.respond_to?(:chomp)
end
target_commit = Gitlab::Git::Commit.find(self, ref.target)
Gitlab::Git::Tag.new(self,
name: ref.name,
target: ref.target,
target_commit: target_commit,
message: message)
end.sort_by(&:name)
end
# Discovers the default branch based on the repository's available branches
#
# - If no branches are present, returns nil
# - If one branch is present, returns its name
# - If two or more branches are present, returns current HEAD or master or first branch
def discover_default_branch
names = branch_names
return if names.empty?
return names[0] if names.length == 1
if rugged_head
extracted_name = Ref.extract_branch_name(rugged_head.name)
return extracted_name if names.include?(extracted_name)
end
if names.include?('master')
'master'
else
names[0]
end
end
def write_config(full_path:)
return unless full_path.present?
raise NoRepository, 'repository does not exist' unless exists?
rugged.config['gitlab.fullpath'] = full_path
end
def ancestor?(from, to)
return false if from.nil? || to.nil?
merge_base(from, to) == from
rescue Rugged::OdbError
false
end
def add_tag(tag_name, user:, target:, message: nil)
target_object = Ref.dereference_object(lookup(target))
raise InvalidRef, "target not found: #{target}" unless target_object
options = nil # Use nil, not the empty hash. Rugged cares about this.
if message
options = {
message: message,
tagger: Gitlab::Git.committer_hash(email: user.email, name: user.name)
}
end
Gitlab::Git::OperationService.new(user, self).add_tag(tag_name, target_object.oid, options)
find_tag(tag_name)
rescue Rugged::ReferenceError => ex
raise InvalidRef, ex
rescue Rugged::TagError
raise TagExistsError
end
def update_branch(branch_name, user:, newrev:, oldrev:)
OperationService.new(user, self).update_branch(branch_name, newrev, oldrev)
end
def rm_branch(branch_name, user:)
branch = find_branch(branch_name)
raise InvalidRef, "branch not found: #{branch_name}" unless branch
OperationService.new(user, self).rm_branch(branch)
end
def rm_tag(tag_name, user:)
tag = find_tag(tag_name)
raise InvalidRef, "tag not found: #{tag_name}" unless tag
Gitlab::Git::OperationService.new(user, self).rm_tag(tag)
end
def find_tag(name)
name_b = name.b
tags.find { |tag| tag.name.b == name_b }
end
def merge_to_ref(user, source_sha, branch, target_ref, message, first_parent_ref)
ref = if first_parent_ref.present?
find_ref(first_parent_ref)
else
find_branch(branch)
end
raise InvalidRef unless ref
OperationService.new(user, self).commit_ref(target_ref, source_sha, from_ref: ref) do
our_commit = ref.target
their_commit = source_sha
create_merge_commit(user, our_commit, their_commit, message)
end
rescue Rugged::ReferenceError, InvalidRef
raise ArgumentError, 'Invalid merge source'
end
def merge(user, source_sha, target_branch, message)
OperationService.new(user, self).with_branch(target_branch) do |start_commit|
our_commit = start_commit.sha
their_commit = source_sha
commit_id = create_merge_commit(user, our_commit, their_commit, message)
yield commit_id
commit_id
end
rescue Gitlab::Git::CommitError # when merge_index.conflicts?
nil
end
def ff_merge(user, source_sha, target_branch)
OperationService.new(user, self).with_branch(target_branch) do |our_commit|
raise ArgumentError, 'Invalid merge target' unless our_commit
source_sha
end
rescue Rugged::ReferenceError, InvalidRef
raise ArgumentError, 'Invalid merge source'
end
def revert(user:, commit:, branch_name:, message:, start_branch_name:, start_repository:)
OperationService.new(user, self).with_branch(
branch_name,
start_branch_name: start_branch_name,
start_repository: start_repository
) do |start_commit|
revert_tree_id = check_revert_content(commit, start_commit.sha)
committer = user_to_committer(user)
create_commit(message: message,
author: committer,
committer: committer,
tree: revert_tree_id,
parents: [start_commit.sha])
end
end
def cherry_pick(user:, commit:, branch_name:, message:, start_branch_name:, start_repository:)
args = {
user: user,
commit: commit,
branch_name: branch_name,
message: message,
start_branch_name: start_branch_name,
start_repository: start_repository
}
rugged_cherry_pick(args)
end
def diff_exists?(sha1, sha2)
rugged.diff(sha1, sha2).size.positive?
end
def rebase(user, rebase_id, branch:, branch_sha:, remote_repository:, remote_branch:)
worktree = Gitlab::Git::Worktree.new(path, REBASE_WORKTREE_PREFIX, rebase_id)
env = git_env.merge(user.git_env)
if remote_repository.is_a?(RemoteRepository)
env.merge!(remote_repository.fetch_env)
remote_repo_path = GITALY_INTERNAL_URL
else
remote_repo_path = remote_repository.path
end
with_worktree(worktree, branch, env: env) do
run_git!(
%W[pull --rebase #{remote_repo_path} #{remote_branch}],
chdir: worktree.path, env: env, include_stderr: true
)
rebase_sha = run_git!(%w[rev-parse HEAD], chdir: worktree.path, env: env).strip
yield rebase_sha if block_given?
update_branch(branch, user: user, newrev: rebase_sha, oldrev: branch_sha)
rebase_sha
end
end
def squash(user, squash_id, branch:, start_sha:, end_sha:, author:, message:)
worktree = Gitlab::Git::Worktree.new(path, SQUASH_WORKTREE_PREFIX, squash_id)
env = git_env.merge(user.git_env).merge(
'GIT_AUTHOR_NAME' => author.name,
'GIT_AUTHOR_EMAIL' => author.email
)
diff_range = "#{start_sha}...#{end_sha}"
diff_files = run_git!(
%W[diff --name-only --diff-filter=ar --binary #{diff_range}]
).chomp
with_worktree(worktree, branch, sparse_checkout_files: diff_files, env: env) do
# Apply diff of the `diff_range` to the worktree
diff = run_git!(%W[diff --binary #{diff_range}])
run_git!(%w[apply --index --3way --whitespace=nowarn], chdir: worktree.path, env: env, include_stderr: true) do |stdin|
stdin.binmode
stdin.write(diff)
end
# Commit the `diff_range` diff
run_git!(%W[commit --no-verify --message #{message}], chdir: worktree.path, env: env, include_stderr: true)
# Return the squash sha. May print a warning for ambiguous refs, but
# we can ignore that with `--quiet` and just take the SHA, if present.
# HEAD here always refers to the current HEAD commit, even if there is
# another ref called HEAD.
run_git!(
%w[rev-parse --quiet --verify HEAD], chdir: worktree.path, env: env
).chomp
end
end
def commit_patches(start_point, patches, extra_env: {})
worktree = Gitlab::Git::Worktree.new(path, AM_WORKTREE_PREFIX, SecureRandom.hex)
env = git_env.merge(extra_env)
with_worktree(worktree, start_point, env: env) do
result, status = run_git(%w[am --quiet --3way], chdir: worktree.path, env: env) do |stdin|
loop { stdin.write(patches.next) }
end
raise Gitlab::Git::PatchError, result unless status == 0
run_git!(
%w[rev-parse --quiet --verify HEAD], chdir: worktree.path, env: env
).chomp
end
end
def update_submodule(submodule_path, commit_sha, branch, committer, message)
target = rugged.rev_parse(branch)
raise CommitError, 'Invalid branch' unless target.is_a?(Rugged::Commit)
current_entry = rugged_submodule_entry(target, submodule_path)
raise CommitError, 'Invalid submodule path' unless current_entry
raise CommitError, "The submodule #{submodule_path} is already at #{commit_sha}" if commit_sha == current_entry[:oid]
commit_tree = target.tree.update([action: :upsert,
oid: commit_sha,
filemode: 0o160000,
path: submodule_path])
options = {
parents: [target.oid],
tree: commit_tree,
message: message,
author: committer,
committer: committer
}
create_commit(options).tap do |result|
raise CommitError, 'Failed to create commit' unless result
end
end
# rubocop:disable Metrics/ParameterLists
def multi_action(user, branch_name:, message:, actions:,
author_email: nil, author_name: nil,
start_branch_name: nil, start_sha: nil, start_repository: self, force: false)
OperationService.new(user, self).with_branch(
branch_name,
start_branch_name: start_branch_name,
start_sha: start_sha,
start_repository: start_repository,
force: force
) do |start_commit|
index = Gitlab::Git::Index.new(self)
parents = []
if start_commit
index.read_tree(start_commit.rugged_commit.tree)
parents = [start_commit.sha]
end
actions.each { |opts| index.apply(opts.delete(:action), opts) }
committer = user_to_committer(user)
author = Gitlab::Git.committer_hash(email: author_email, name: author_name) || committer
options = {
tree: index.write_tree,
message: message,
parents: parents,
author: author,
committer: committer
}
create_commit(options)
end
end
# rubocop:enable Metrics/ParameterLists
def with_repo_branch_commit(start_repository, start_ref)
start_repository = RemoteRepository.new(start_repository) unless start_repository.is_a?(RemoteRepository)
if start_repository.empty?
return yield nil
elsif start_repository.same_repository?(self)
# Directly return the commit from this repository
return yield commit(start_ref)
end
# Find the commit from the remote repository (this triggers an RPC)
commit_id = start_repository.commit_id(start_ref)
return yield nil unless commit_id
if existing_commit = commit(commit_id)
# Commit is already present (e.g. in a fork, or through a previous fetch)
yield existing_commit
else
fetch_sha(start_repository, commit_id)
yield commit(commit_id)
end
end
def fetch_source_branch!(source_repository, source_branch, local_ref)
rugged_fetch_source_branch(source_repository, source_branch, local_ref)
end
# Directly find a branch with a simple name (e.g. master)
#
# force_reload causes a new Rugged repository to be instantiated
#
# This is to work around a bug in libgit2 that causes in-memory refs to
# be stale/invalid when packed-refs is changed.
# See https://gitlab.com/gitlab-org/gitlab-ce/issues/15392#note_14538333
def find_branch(name, force_reload = false)
reload_rugged if force_reload
rugged_ref = rugged.branches[name]
if rugged_ref
target_commit = Gitlab::Git::Commit.find(self, rugged_ref.target)
Gitlab::Git::Branch.new(self, rugged_ref.name, rugged_ref.target, target_commit)
end
end
def find_ref(name)
rugged_ref = rugged.references[name]
return unless rugged_ref
Gitlab::Git::Ref.new(self, rugged_ref.name, rugged_ref.target, rugged_ref.target_id)
end
# Delete the specified branch from the repository
def delete_branch(branch_name)
rugged.branches.delete(branch_name)
rescue Rugged::ReferenceError => e
raise DeleteBranchError, e
end
def delete_refs(*ref_names)
git_delete_refs(*ref_names)
end
# Returns an Array of all ref names, except when it's matching pattern
#
# regexp - The pattern for ref names we don't want
def all_ref_names_except(prefixes)
rugged.references.reject do |ref|
prefixes.any? { |p| ref.name.start_with?(p) }
end.map(&:name)
end
# Returns true if the given branch exists
#
# name - The name of the branch as a String.
def branch_exists?(name)
rugged.branches.exists?(name)
# If the branch name is invalid (e.g. ".foo") Rugged will raise an error.
# Whatever code calls this method shouldn't have to deal with that so
# instead we just return `false` (which is true since a branch doesn't
# exist when it has an invalid name).
rescue Rugged::ReferenceError
false
end
def merge_base(from, to)
rugged.merge_base(from, to)
rescue Rugged::ReferenceError
nil
end
def user_to_committer(user)
Gitlab::Git.committer_hash(email: user.email, name: user.name)
end
def write_ref(ref_path, ref, old_ref: nil)
raise ArgumentError, "invalid ref_path #{ref_path.inspect}" if ref_path.include?(' ')
raise ArgumentError, "invalid ref #{ref.inspect}" if ref.include?("\x00")
raise ArgumentError, "invalid old_ref #{old_ref.inspect}" if !old_ref.nil? && old_ref.include?("\x00")
if ref_path == 'HEAD'
run_git!(%W[symbolic-ref #{ref_path} #{ref}])
else
input = "update #{ref_path}\x00#{ref}\x00#{old_ref}\x00"
run_git!(%w[update-ref --stdin -z]) { |stdin| stdin.write(input) }
end
end
# Fetch a commit from the given source repository
def fetch_sha(source_repository, sha)
source_repository = RemoteRepository.new(source_repository) unless source_repository.is_a?(RemoteRepository)
env = source_repository.fetch_env(git_config_options: [GIT_ALLOW_SHA_UPLOAD])
args = %W[fetch --no-tags #{GITALY_INTERNAL_URL} #{sha}]
message, status = run_git(args, env: env, include_stderr: true)
raise Gitlab::Git::CommandError, message unless status.zero?
sha
end
# Lookup for rugged object by oid or ref name
def lookup(oid_or_ref_name)
rugged.rev_parse(oid_or_ref_name)
end
def commit_index(user, branch_name, index, options)
committer = user_to_committer(user)
OperationService.new(user, self).with_branch(branch_name) do
commit_params = options.merge(
tree: index.write_tree(rugged),
author: committer,
committer: committer
)
create_commit(commit_params)
end
end
# Return the object that +revspec+ points to. If +revspec+ is an
# annotated tag, then return the tag's target instead.
def rev_parse_target(revspec)
obj = rugged.rev_parse(revspec)
Ref.dereference_object(obj)
end
def add_remote(remote_name, url, mirror_refmap: nil)
rugged.remotes.create(remote_name, url)
set_remote_as_mirror(remote_name, refmap: mirror_refmap) if mirror_refmap
rescue Rugged::ConfigError
remote_update(remote_name, url: url)
end
def remove_remote(remote_name)
# When a remote is deleted all its remote refs are deleted too, but in
# the case of mirrors we map its refs (that would usually go under
# [remote_name]/) to the top level namespace. We clean the mapping so
# those don't get deleted.
rugged.config.delete("remote.#{remote_name}.fetch") if rugged.config["remote.#{remote_name}.mirror"]
rugged.remotes.delete(remote_name)
true
rescue Rugged::ConfigError
false
end
# Update the specified remote using the values in the +options+ hash
#
# Example
# repo.update_remote("origin", url: "path/to/repo")
def remote_update(remote_name, url:)
# TODO: Implement other remote options
rugged.remotes.set_url(remote_name, url)
nil
end
def commit(ref = 'HEAD')
Gitlab::Git::Commit.find(self, ref)
end
def empty?
!has_visible_content?
end
def autocrlf
AUTOCRLF_VALUES[rugged.config['core.autocrlf']]
end
def autocrlf=(value)
rugged.config['core.autocrlf'] = AUTOCRLF_VALUES.invert[value]
end
def blob_at(sha, path)
Gitlab::Git::Blob.find(self, sha, path) unless Gitlab::Git.blank_ref?(sha)
end
def fetch_repository_as_mirror(repository)
remote_name = "tmp-#{SecureRandom.hex}"
repository = RemoteRepository.new(repository) unless repository.is_a?(RemoteRepository)
add_remote(remote_name, GITALY_INTERNAL_URL, mirror_refmap: :all_refs)
fetch_remote(remote_name, env: repository.fetch_env)
ensure
remove_remote(remote_name)
end
def fetch_remote(remote_name = 'origin', env: nil)
run_git(['fetch', remote_name], env: env).last.zero?
end
def rev_list(including: [], excluding: [], options: [], objects: false, &block)
args = ['rev-list']
args.push(*rev_list_param(including))
exclude_param = *rev_list_param(excluding)
if exclude_param.any?
args.push('--not')
args.push(*exclude_param)
end
args.push('--objects') if objects
args.push(*options) if options.any?
run_git!(args, lazy_block: block)
end
def cleanup
# Opening a repository may be expensive, and we only need to close it
# if it's been open.
rugged&.close if defined?(@rugged)
end
private
def create_merge_commit(user, our_commit, their_commit, message)
raise 'Invalid merge target' unless our_commit
raise 'Invalid merge source' unless their_commit
committer = user_to_committer(user)
merge_index = rugged.merge_commits(our_commit, their_commit)
return if merge_index.conflicts?
options = {
parents: [our_commit, their_commit],
tree: merge_index.write_tree(rugged),
author: committer,
committer: committer,
message: message
}
create_commit(options)
end
def run_git(args, chdir: path, env: {}, nice: false, include_stderr: false, lazy_block: nil, &block)
cmd = [Gitlab.config.git.bin_path, *args]
cmd.unshift("nice") if nice
object_directories = alternate_object_directories
env['GIT_ALTERNATE_OBJECT_DIRECTORIES'] = object_directories.join(File::PATH_SEPARATOR) if object_directories.any?
popen(cmd, chdir, env, include_stderr: include_stderr, lazy_block: lazy_block, &block)
end
def run_git!(args, chdir: path, env: {}, nice: false, include_stderr: false, lazy_block: nil, &block)
output, status = run_git(args, chdir: chdir, env: env, nice: nice, include_stderr: include_stderr, lazy_block: lazy_block, &block)
raise GitError, output unless status.zero?
output
end
def git_env
{
'GL_PROTOCOL' => Gitlab::Git::Hook::GL_PROTOCOL,
'GL_REPOSITORY' => gl_repository
}
end
def check_revert_content(target_commit, source_sha)
args = [target_commit.sha, source_sha]
args << { mainline: 1 } if target_commit.merge_commit?
revert_index = rugged.revert_commit(*args)
raise CreateTreeError, :conflict if revert_index.conflicts?
tree_id = revert_index.write_tree(rugged)
raise CreateTreeError, :empty unless diff_exists?(source_sha, tree_id)
tree_id
end
def branches_filter(filter: nil, sort_by: nil)
branches = rugged.branches.each(filter).map do |rugged_ref|
begin
target_commit = Gitlab::Git::Commit.find(self, rugged_ref.target)
Gitlab::Git::Branch.new(self, rugged_ref.name, rugged_ref.target, target_commit)
rescue Rugged::ReferenceError
# Omit invalid branch
end
end.compact
sort_branches(branches, sort_by)
end
def git_delete_refs(*ref_names)
instructions = ref_names.map do |ref|
"delete #{ref}\x00\x00"
end
message, status = run_git(%w[update-ref --stdin -z], include_stderr: true) do |stdin|
stdin.write(instructions.join)
end
raise GitError, "Could not delete refs #{ref_names}: #{message}" unless status.zero?
end
def rugged_cherry_pick(user:, commit:, branch_name:, message:, start_branch_name:, start_repository:)
OperationService.new(user, self).with_branch(
branch_name,
start_branch_name: start_branch_name,
start_repository: start_repository
) do |start_commit|
cherry_pick_tree_id = check_cherry_pick_content(commit, start_commit.sha)
committer = user_to_committer(user)
create_commit(message: message,
author: {
email: commit.author_email,
name: commit.author_name,
time: commit.authored_date
},
committer: committer,
tree: cherry_pick_tree_id,
parents: [start_commit.sha])
end
end
def check_cherry_pick_content(target_commit, source_sha)
args = [target_commit.sha, source_sha]
args << 1 if target_commit.merge_commit?
cherry_pick_index = rugged.cherrypick_commit(*args)
raise CreateTreeError, :conflict if cherry_pick_index.conflicts?
tree_id = cherry_pick_index.write_tree(rugged)
raise CreateTreeError, :empty unless diff_exists?(source_sha, tree_id)
tree_id
end
def create_commit(params = {})
params[:message].delete!("\r")
Rugged::Commit.create(rugged, params)
end
def rugged_head
rugged.head
rescue Rugged::ReferenceError
nil
end
def with_worktree(worktree, branch, sparse_checkout_files: nil, env:)
base_args = %w[worktree add --detach]
run_git!(%w[config core.splitIndex false])
# Note that we _don't_ want to test for `.present?` here: If the caller
# passes an non nil empty value it means it still wants sparse checkout
# but just isn't interested in any file, perhaps because it wants to
# checkout files in by a changeset but that changeset only adds files.
if sparse_checkout_files
# Create worktree without checking out
run_git!(base_args + ['--no-checkout', worktree.path], env: env)
worktree_git_path = run_git!(%w[rev-parse --git-dir], chdir: worktree.path).chomp
configure_sparse_checkout(worktree_git_path, sparse_checkout_files)
# After sparse checkout configuration, checkout `branch` in worktree
run_git!(%W[checkout --detach #{branch}], chdir: worktree.path, env: env)
else
# Create worktree and checkout `branch` in it
run_git!(base_args + [worktree.path, branch], env: env)
end
yield
ensure
run_git(%W[worktree remove -f #{worktree.name}])
end
# Adding a worktree means checking out the repository. For large repos,
# this can be very expensive, so set up sparse checkout for the worktree
# to only check out the files we're interested in.
def configure_sparse_checkout(worktree_git_path, files)
run_git!(%w[config core.sparseCheckout true], include_stderr: true)
return if files.empty?
worktree_info_path = File.join(worktree_git_path, 'info')
FileUtils.mkdir_p(worktree_info_path)
File.write(File.join(worktree_info_path, 'sparse-checkout'), files)
end
def rugged_fetch_source_branch(source_repository, source_branch, local_ref)
with_repo_branch_commit(source_repository, source_branch) do |commit|
if commit
write_ref(local_ref, commit.sha)
true
else
false
end
end
end
def gitlab_projects_error
raise CommandError, @gitlab_projects.output
end
def rev_list_param(spec)
spec == :all ? ['--all'] : spec
end
def rugged_submodule_entry(target, submodule_path)
parent_dir = File.dirname(submodule_path)
parent_dir = '' if parent_dir == '.'
parent_tree = rugged.rev_parse("#{target.oid}^{tree}:#{parent_dir}")
return unless parent_tree.is_a?(Rugged::Tree)
current_entry = parent_tree[File.basename(submodule_path)]
valid_submodule_entry?(current_entry) ? current_entry : nil
end
def valid_submodule_entry?(entry)
entry && entry[:type] == :commit
end
end
end
end
|