From e117a5bd19f03865e6863543cc8a21ec59950847 Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Mon, 4 Jul 2016 12:19:58 +0100 Subject: [PATCH 01/46] adds rename action to blob.rb --- lib/gitlab_git/.blob.rb.swp | Bin 0 -> 24576 bytes lib/gitlab_git/blob.rb | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 lib/gitlab_git/.blob.rb.swp diff --git a/lib/gitlab_git/.blob.rb.swp b/lib/gitlab_git/.blob.rb.swp new file mode 100644 index 0000000000000000000000000000000000000000..b08749de7612c6e07c1f48b64a9f5c8238e677ec GIT binary patch literal 24576 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 D6{d&6 literal 0 HcmV?d00001 diff --git a/lib/gitlab_git/blob.rb b/lib/gitlab_git/blob.rb index 4c6850e..3d0b45b 100644 --- a/lib/gitlab_git/blob.rb +++ b/lib/gitlab_git/blob.rb @@ -150,6 +150,14 @@ module Gitlab if action == :remove index.remove(filename) else + if action == :rename + old_path_name = PathHelper.normalize_path(file[:previous_path]) + raise Repository::InvalidBlobName.new("Invalid path") if path_name.each_filename.to_a.include?('..') + + old_filename = old_path_name.to_s + index.remove(old_filename) + end + mode = 0100644 file_entry = index.get(filename) @@ -207,6 +215,33 @@ module Gitlab def remove(repository, options) commit(repository, options, :remove) end + + + # Rename file from repository and return commit sha + # + # options should contain next structure: + # file: { + # previous_path: 'documents/old_story.txt' + # path: 'documents/story.txt' + # }, + # author: { + # email: 'user@example.com', + # name: 'Test User', + # time: Time.now + # }, + # committer: { + # email: 'user@example.com', + # name: 'Test User', + # time: Time.now + # }, + # commit: { + # message: 'Rename FILENAME', + # branch: 'master' + # } + # + def rename(repository, options) + commit(repository, options, :rename) + end end def initialize(options) -- GitLab From 98d542a6270064a74c6bd6028ce50203b9c876ec Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Mon, 4 Jul 2016 12:44:04 +0100 Subject: [PATCH 02/46] fixes accuracy of comments on rename method --- lib/gitlab_git/.blob.rb.swp | Bin 24576 -> 24576 bytes lib/gitlab_git/blob.rb | 2 ++ 2 files changed, 2 insertions(+) diff --git a/lib/gitlab_git/.blob.rb.swp b/lib/gitlab_git/.blob.rb.swp index b08749de7612c6e07c1f48b64a9f5c8238e677ec..02ca93df3597f403f8fc2553d007f24b33b081d1 100644 GIT binary patch delta 283 zcmXBPF-t;W6vpxM)=d$KZU`c@NO=h^qJc`#V1aN$qM*g1F|MnM;-Z6o0wG>-Y6x<2 zix*nEOD)>sQbW5CNRwMZ|LDLE4m|L1PCronK*g{3D&^DUekL!BE%JWSxrllX@dH~m z%(-o{>t6(umH)J1HjkpJHwcTg;NuJqEX+d`;0Z&tafvc=h~RTg<O4H|(M26q`0x<I z%o2IQGe)T45Cuz$l4sdL7(c5b-&o)cub85XD-^Kg{we<cxYKIexe4yIU2@Gv>Cw{Z R)Ru0hcJ*z=HH+g|;uq4_G>ZTL delta 262 zcmXBOze@sf9LDj_x4RSz@p}YEV8e}pa4H6eI;2AW3I`Y4Tf*g5wI!h~Xt6bJYS8ig zPEO~4&>Dfe4f!|ph8}pq1JClzw`#ss?tN+08+d_#B}9t^?Z>;%>)5Sn6`G+o#cW-P z<gEWSG*07GJuTBB3yjf40T;0Fof6sL9j};R03RM)9F9d27_6|w3;J+zf(-Vy$QsX> vVTuP^DsoF{qJc8<aG;U!HNp&4XymLoZYlFK{5mopH#_wfjV{e^=j{9sem5$1 diff --git a/lib/gitlab_git/blob.rb b/lib/gitlab_git/blob.rb index 3d0b45b..075bafa 100644 --- a/lib/gitlab_git/blob.rb +++ b/lib/gitlab_git/blob.rb @@ -223,6 +223,8 @@ module Gitlab # file: { # previous_path: 'documents/old_story.txt' # path: 'documents/story.txt' + # content: 'Lorem ipsum...', + # update: true # }, # author: { # email: 'user@example.com', -- GitLab From 0e4ac299b806fa4190c4928a1c1ed5372fffbb38 Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Mon, 4 Jul 2016 14:36:22 +0100 Subject: [PATCH 03/46] fixes bug regarding old_path_name in blob.rb's commit method --- lib/gitlab_git/blob.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gitlab_git/blob.rb b/lib/gitlab_git/blob.rb index 075bafa..3e186a1 100644 --- a/lib/gitlab_git/blob.rb +++ b/lib/gitlab_git/blob.rb @@ -152,7 +152,7 @@ module Gitlab else if action == :rename old_path_name = PathHelper.normalize_path(file[:previous_path]) - raise Repository::InvalidBlobName.new("Invalid path") if path_name.each_filename.to_a.include?('..') + raise Repository::InvalidBlobName.new("Invalid path") if old_path_name.each_filename.to_a.include?('..') old_filename = old_path_name.to_s index.remove(old_filename) -- GitLab From 0b9ab579512a68fc5a7bc98b392fb6f15c1c26b9 Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Tue, 5 Jul 2016 10:38:09 +0100 Subject: [PATCH 04/46] removes .swp file --- lib/gitlab_git/.blob.rb.swp | Bin 24576 -> 0 bytes lib/gitlab_git/blob.rb | 2 -- 2 files changed, 2 deletions(-) delete mode 100644 lib/gitlab_git/.blob.rb.swp diff --git a/lib/gitlab_git/.blob.rb.swp b/lib/gitlab_git/.blob.rb.swp deleted file mode 100644 index 02ca93df3597f403f8fc2553d007f24b33b081d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24576 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 TO!G~q#QXUq(+nWVHS50s-n_1q diff --git a/lib/gitlab_git/blob.rb b/lib/gitlab_git/blob.rb index 3e186a1..3ddcbf5 100644 --- a/lib/gitlab_git/blob.rb +++ b/lib/gitlab_git/blob.rb @@ -152,8 +152,6 @@ module Gitlab else if action == :rename old_path_name = PathHelper.normalize_path(file[:previous_path]) - raise Repository::InvalidBlobName.new("Invalid path") if old_path_name.each_filename.to_a.include?('..') - old_filename = old_path_name.to_s index.remove(old_filename) end -- GitLab From 18982ce44337ca0fc2b37280c41c3f2826749c2b Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Tue, 5 Jul 2016 11:23:23 +0100 Subject: [PATCH 05/46] adds tests for renaming a file --- spec/.blob_snippet_spec.rb.swp | Bin 0 -> 12288 bytes spec/.blob_spec.rb.swp | Bin 0 -> 28672 bytes spec/.spec_helper.rb.swp | Bin 0 -> 12288 bytes spec/blob_spec.rb | 48 +++++++++++++++++++++++++++++++++ 4 files changed, 48 insertions(+) create mode 100644 spec/.blob_snippet_spec.rb.swp create mode 100644 spec/.blob_spec.rb.swp create mode 100644 spec/.spec_helper.rb.swp diff --git a/spec/.blob_snippet_spec.rb.swp b/spec/.blob_snippet_spec.rb.swp new file mode 100644 index 0000000000000000000000000000000000000000..ddfee16af275096b2c18d97b3a746bd6d8f4ad99 GIT binary patch literal 12288 zcmeI2&uY|A6vl50ZiK4X7dVZJ%)m_28HLv1Y8DlRf?%r)m5@J&nLy^=G`VG}qV0?L z4B|WZ0Iqc9Bj^(-cy1@--xdq5D&K`KC%HNI%elX-LQcB=;LbK}1UHn7D@t7)J$txy z^Y!xEHKlBkjEzo><#J-&{Zq#F=w3hP{*FuU4}&t%CnvuA#V~B@EWBOVGD*Ynafl^^ zO~qN5mL`oGT~rm@*v$lWda@^GK>!5KN?=7@9}d=C_BC&fR<G`!bs_RV00ck)1V8`; zKmY_l00jO60=8OGhq905b}y@KT>34xmk1yL0w4eaAOHd&00JNY0w4eaAOHgAkU)|v z^=?I}%}Y|e{QqBk|9`%$)F;sg(R<Mw(JRrBXeb(pE{ML$x-X)Sq9f6v=&ooax+QYH z8zKx4009sH0T2KI5C8!X009sHf%8d#b*_l!#~+cXu=JexKw7qKr)}U4^28?Hz#8Jc zjyE&2$9lS-O}s9>P~zc6$+i=<>0L3Hw}nTM#3&j`Gx+^^FL<DN*72uFW4ZQw^vD-C ziN5pmpY&)T=Q1VT;=Xft)|t_k4=njr%?)cyWudw8DL3<nFShWP(o>FgQT}tq;?bkU z;g1q|TG^*R6-bnGlhsAa6gh~l=<hS9F*@E^&3pSr&E&b}`FO%*#kD70zw*X1lNWj% L(eBPxe^Y$}9_PtW literal 0 HcmV?d00001 diff --git a/spec/.blob_spec.rb.swp b/spec/.blob_spec.rb.swp new file mode 100644 index 0000000000000000000000000000000000000000..55948ef86f930d92ca44f0f38400a5a9ba0df0cd GIT binary patch literal 28672 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 literal 0 HcmV?d00001 diff --git a/spec/.spec_helper.rb.swp b/spec/.spec_helper.rb.swp new file mode 100644 index 0000000000000000000000000000000000000000..1246342965bda0d19fc0e816501ebebf323977e9 GIT binary patch literal 12288 zcmeI2PmkL~6u_rFfK(_TK%xf@v&+F7(Kzi=6%lC<*^=$9lx(8>Sq^9!jqR6Ys<Fq6 z$0>p3&xtDs1QL7(1SdWK2*GDS9QXoAd;mD`Y=`{=+a*14sPruTGP2*B@tfb+k)lj+ z<6y7LU-fS>Jf30f%J#c&^j`bs@(*i_IVGni35)|hGe!IXM|ZnlkDxv(((9YPmdW{v zADkJmk=d|uS2-<%#<Xk%HjONWu>24+&?#8o2Ir4PSIGbwcsK)B*(;kjZxnrAT3_SO zJv)B5?vzai$N(8217v^<kO4A42FSo8ZNR0M*oQcS%gb53ylgN1qg|d-Lk7qI86X2> zfDDiUGC&5%02v?yWPl7jf(B&7*u5)^Z9aj;<NyDE|Nj5|X~up=enP%SzCyl4K1V)7 zK0++=7IKK(MxIB0dy28|kS`F6bPx}D9C-}+<tmPee2aX72xJ|35xIuEfc*F*V;>_e z<WH>Y59C+mYvfa8fgB>Yk)rOK2pwdA43GgbKnBPF86X2>;QuiINyIo0O)^naKY)p` zu+fxS*Z6xJk}S6%GJq)K@1LZpB-D8Xe29VFa$D<3%-9Gl-{PK?Nn~R0Br;LjffY7S zcynUHJUa>DHG%gO_h*m@n1fxonM$Uj>H-mt=WGsaFvRV&epM`1#v{Xzs<R`;M(yE9 zbjPFCcBd@{?S4=6Tccg<x}!As_l!z5hU0#}HyD+H>wG=VoeVV8Eu_ZB-MZ_wYLNZj zpxf%KHb!DxJ&^X_gRD}4SM3z8V^epKxuOWK#!i=crv7p!@J@<qMJnBFqr4C)o5&b8 zgxJ}`sf$|eI`@3Pk>zP>Y%w6KR=N7*T!t=}+LyVT87qpud~2&*%>kNdHt(1?R<7A> zjYqq^f!G;$I%2=oZR3I+ca9;;<n#d@yY1nyb@xoZ!bLpq9(%8!8kMhY@kD975=$4( z%Jr>^J*w8e+3Xepu$dphL?ytR0f@QODiUE?HTJ=uYVdZh@X58HrBid@-qJ;*SZeR0 zcpfZ7piOX5QlO^GyIqu}W#(2$n<%?d9wecOikG6A=S6phICYB^^8S0I;?-a7T=$N( z;=5gLYgaBiu7Z21U7R|r9_(TZJoc-eyP=9x4R_4k&z!Ul7kRl%xH@GhG;@!E&HzK0 k1{S{(GXFkEyLLJm)2fii)P%S958m`fgVw>`&^u&*0gcb<CIA2c literal 0 HcmV?d00001 diff --git a/spec/blob_spec.rb b/spec/blob_spec.rb index 6998ea3..969d058 100644 --- a/spec/blob_spec.rb +++ b/spec/blob_spec.rb @@ -270,6 +270,54 @@ describe Gitlab::Git::Blob do end end + describe :rename do + let(:repository) { Gitlab::Git::Repository.new(TEST_NORMAL_REPO_PATH) } + + let(:commit_options) do + options = { + file: { + path: 'NEWREADME.md', + previous_path: 'README.md', + content: 'Lorem ipsum...', + update: true + }, + author: { + email: 'user@example.com', + name: 'Test User', + time: Time.now + }, + committer: { + email: 'user@example.com', + name: 'Test User', + time: Time.now + }, + commit: { + message: 'Rename readme', + branch: 'master' + } + } + end + + let!(:commit_sha) { Gitlab::Git::Blob.rename(repository, commit_options) } + let!(:commit) { repository.lookup(commit_sha) } + + it 'should rename the file with commit' do + # Commit message valid + expect(commit.message).to eq('Rename readme') + + # Previous file was removed + expect(commit.tree.to_a.any? do |tree| + tree[:name] == 'README.md' + end).to be_falsey + + # File was renamed + expect(commit.tree.to_a.any? do |tree| + tree[:name] == 'NEWREADME.md' + end).to be_truthy + + end + end + describe :remove do let(:repository) { Gitlab::Git::Repository.new(TEST_REPO_PATH) } -- GitLab From 7ca18bf5aa5ce7b08548680f7a0250650ab0fc63 Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Tue, 5 Jul 2016 12:11:28 +0100 Subject: [PATCH 06/46] removes swp files --- spec/.blob_snippet_spec.rb.swp | Bin 12288 -> 0 bytes spec/.blob_spec.rb.swp | Bin 28672 -> 0 bytes spec/.spec_helper.rb.swp | Bin 12288 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 spec/.blob_snippet_spec.rb.swp delete mode 100644 spec/.blob_spec.rb.swp delete mode 100644 spec/.spec_helper.rb.swp diff --git a/spec/.blob_snippet_spec.rb.swp b/spec/.blob_snippet_spec.rb.swp deleted file mode 100644 index ddfee16af275096b2c18d97b3a746bd6d8f4ad99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2&uY|A6vl50ZiK4X7dVZJ%)m_28HLv1Y8DlRf?%r)m5@J&nLy^=G`VG}qV0?L z4B|WZ0Iqc9Bj^(-cy1@--xdq5D&K`KC%HNI%elX-LQcB=;LbK}1UHn7D@t7)J$txy z^Y!xEHKlBkjEzo><#J-&{Zq#F=w3hP{*FuU4}&t%CnvuA#V~B@EWBOVGD*Ynafl^^ zO~qN5mL`oGT~rm@*v$lWda@^GK>!5KN?=7@9}d=C_BC&fR<G`!bs_RV00ck)1V8`; zKmY_l00jO60=8OGhq905b}y@KT>34xmk1yL0w4eaAOHd&00JNY0w4eaAOHgAkU)|v z^=?I}%}Y|e{QqBk|9`%$)F;sg(R<Mw(JRrBXeb(pE{ML$x-X)Sq9f6v=&ooax+QYH z8zKx4009sH0T2KI5C8!X009sHf%8d#b*_l!#~+cXu=JexKw7qKr)}U4^28?Hz#8Jc zjyE&2$9lS-O}s9>P~zc6$+i=<>0L3Hw}nTM#3&j`Gx+^^FL<DN*72uFW4ZQw^vD-C ziN5pmpY&)T=Q1VT;=Xft)|t_k4=njr%?)cyWudw8DL3<nFShWP(o>FgQT}tq;?bkU z;g1q|TG^*R6-bnGlhsAa6gh~l=<hS9F*@E^&3pSr&E&b}`FO%*#kD70zw*X1lNWj% L(eBPxe^Y$}9_PtW diff --git a/spec/.blob_spec.rb.swp b/spec/.blob_spec.rb.swp deleted file mode 100644 index 55948ef86f930d92ca44f0f38400a5a9ba0df0cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28672 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 diff --git a/spec/.spec_helper.rb.swp b/spec/.spec_helper.rb.swp deleted file mode 100644 index 1246342965bda0d19fc0e816501ebebf323977e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2PmkL~6u_rFfK(_TK%xf@v&+F7(Kzi=6%lC<*^=$9lx(8>Sq^9!jqR6Ys<Fq6 z$0>p3&xtDs1QL7(1SdWK2*GDS9QXoAd;mD`Y=`{=+a*14sPruTGP2*B@tfb+k)lj+ z<6y7LU-fS>Jf30f%J#c&^j`bs@(*i_IVGni35)|hGe!IXM|ZnlkDxv(((9YPmdW{v zADkJmk=d|uS2-<%#<Xk%HjONWu>24+&?#8o2Ir4PSIGbwcsK)B*(;kjZxnrAT3_SO zJv)B5?vzai$N(8217v^<kO4A42FSo8ZNR0M*oQcS%gb53ylgN1qg|d-Lk7qI86X2> zfDDiUGC&5%02v?yWPl7jf(B&7*u5)^Z9aj;<NyDE|Nj5|X~up=enP%SzCyl4K1V)7 zK0++=7IKK(MxIB0dy28|kS`F6bPx}D9C-}+<tmPee2aX72xJ|35xIuEfc*F*V;>_e z<WH>Y59C+mYvfa8fgB>Yk)rOK2pwdA43GgbKnBPF86X2>;QuiINyIo0O)^naKY)p` zu+fxS*Z6xJk}S6%GJq)K@1LZpB-D8Xe29VFa$D<3%-9Gl-{PK?Nn~R0Br;LjffY7S zcynUHJUa>DHG%gO_h*m@n1fxonM$Uj>H-mt=WGsaFvRV&epM`1#v{Xzs<R`;M(yE9 zbjPFCcBd@{?S4=6Tccg<x}!As_l!z5hU0#}HyD+H>wG=VoeVV8Eu_ZB-MZ_wYLNZj zpxf%KHb!DxJ&^X_gRD}4SM3z8V^epKxuOWK#!i=crv7p!@J@<qMJnBFqr4C)o5&b8 zgxJ}`sf$|eI`@3Pk>zP>Y%w6KR=N7*T!t=}+LyVT87qpud~2&*%>kNdHt(1?R<7A> zjYqq^f!G;$I%2=oZR3I+ca9;;<n#d@yY1nyb@xoZ!bLpq9(%8!8kMhY@kD975=$4( z%Jr>^J*w8e+3Xepu$dphL?ytR0f@QODiUE?HTJ=uYVdZh@X58HrBid@-qJ;*SZeR0 zcpfZ7piOX5QlO^GyIqu}W#(2$n<%?d9wecOikG6A=S6phICYB^^8S0I;?-a7T=$N( z;=5gLYgaBiu7Z21U7R|r9_(TZJoc-eyP=9x4R_4k&z!Ul7kRl%xH@GhG;@!E&HzK0 k1{S{(GXFkEyLLJm)2fii)P%S958m`fgVw>`&^u&*0gcb<CIA2c -- GitLab From f05627f00a9abf49d1d72ab736aa06efd998caba Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Tue, 5 Jul 2016 12:12:18 +0100 Subject: [PATCH 07/46] removes redundant empty line --- spec/.blob_spec.rb.swp | Bin 0 -> 24576 bytes spec/blob_spec.rb | 1 - 2 files changed, 1 deletion(-) create mode 100644 spec/.blob_spec.rb.swp diff --git a/spec/.blob_spec.rb.swp b/spec/.blob_spec.rb.swp new file mode 100644 index 0000000000000000000000000000000000000000..18e1c7e9ced827d737cf8ae4a2790989f9456be1 GIT binary patch literal 24576 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 a4?L1yO1U-0iF+k=BaZEk;U&*a(*FWE^rH&^ literal 0 HcmV?d00001 diff --git a/spec/blob_spec.rb b/spec/blob_spec.rb index 969d058..0d89582 100644 --- a/spec/blob_spec.rb +++ b/spec/blob_spec.rb @@ -314,7 +314,6 @@ describe Gitlab::Git::Blob do expect(commit.tree.to_a.any? do |tree| tree[:name] == 'NEWREADME.md' end).to be_truthy - end end -- GitLab From 23bd9eb76373b5645ebfa50bbae49e795370c799 Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Mon, 4 Jul 2016 12:19:58 +0100 Subject: [PATCH 08/46] adds rename action to blob.rb --- lib/gitlab_git/.blob.rb.swp | Bin 0 -> 24576 bytes lib/gitlab_git/blob.rb | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 lib/gitlab_git/.blob.rb.swp diff --git a/lib/gitlab_git/.blob.rb.swp b/lib/gitlab_git/.blob.rb.swp new file mode 100644 index 0000000000000000000000000000000000000000..b08749de7612c6e07c1f48b64a9f5c8238e677ec GIT binary patch literal 24576 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 D6{d&6 literal 0 HcmV?d00001 diff --git a/lib/gitlab_git/blob.rb b/lib/gitlab_git/blob.rb index 94c0307..cb220c0 100644 --- a/lib/gitlab_git/blob.rb +++ b/lib/gitlab_git/blob.rb @@ -150,6 +150,14 @@ module Gitlab if action == :remove index.remove(filename) else + if action == :rename + old_path_name = PathHelper.normalize_path(file[:previous_path]) + raise Repository::InvalidBlobName.new("Invalid path") if path_name.each_filename.to_a.include?('..') + + old_filename = old_path_name.to_s + index.remove(old_filename) + end + mode = 0o100644 file_entry = index.get(filename) @@ -207,6 +215,33 @@ module Gitlab def remove(repository, options) commit(repository, options, :remove) end + + + # Rename file from repository and return commit sha + # + # options should contain next structure: + # file: { + # previous_path: 'documents/old_story.txt' + # path: 'documents/story.txt' + # }, + # author: { + # email: 'user@example.com', + # name: 'Test User', + # time: Time.now + # }, + # committer: { + # email: 'user@example.com', + # name: 'Test User', + # time: Time.now + # }, + # commit: { + # message: 'Rename FILENAME', + # branch: 'master' + # } + # + def rename(repository, options) + commit(repository, options, :rename) + end end def initialize(options) -- GitLab From 3727fdcfac16459d36561740b39a5415a77801ff Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Mon, 4 Jul 2016 12:44:04 +0100 Subject: [PATCH 09/46] fixes accuracy of comments on rename method --- lib/gitlab_git/.blob.rb.swp | Bin 24576 -> 24576 bytes lib/gitlab_git/blob.rb | 2 ++ 2 files changed, 2 insertions(+) diff --git a/lib/gitlab_git/.blob.rb.swp b/lib/gitlab_git/.blob.rb.swp index b08749de7612c6e07c1f48b64a9f5c8238e677ec..02ca93df3597f403f8fc2553d007f24b33b081d1 100644 GIT binary patch delta 283 zcmXBPF-t;W6vpxM)=d$KZU`c@NO=h^qJc`#V1aN$qM*g1F|MnM;-Z6o0wG>-Y6x<2 zix*nEOD)>sQbW5CNRwMZ|LDLE4m|L1PCronK*g{3D&^DUekL!BE%JWSxrllX@dH~m z%(-o{>t6(umH)J1HjkpJHwcTg;NuJqEX+d`;0Z&tafvc=h~RTg<O4H|(M26q`0x<I z%o2IQGe)T45Cuz$l4sdL7(c5b-&o)cub85XD-^Kg{we<cxYKIexe4yIU2@Gv>Cw{Z R)Ru0hcJ*z=HH+g|;uq4_G>ZTL delta 262 zcmXBOze@sf9LDj_x4RSz@p}YEV8e}pa4H6eI;2AW3I`Y4Tf*g5wI!h~Xt6bJYS8ig zPEO~4&>Dfe4f!|ph8}pq1JClzw`#ss?tN+08+d_#B}9t^?Z>;%>)5Sn6`G+o#cW-P z<gEWSG*07GJuTBB3yjf40T;0Fof6sL9j};R03RM)9F9d27_6|w3;J+zf(-Vy$QsX> vVTuP^DsoF{qJc8<aG;U!HNp&4XymLoZYlFK{5mopH#_wfjV{e^=j{9sem5$1 diff --git a/lib/gitlab_git/blob.rb b/lib/gitlab_git/blob.rb index cb220c0..390bfb6 100644 --- a/lib/gitlab_git/blob.rb +++ b/lib/gitlab_git/blob.rb @@ -223,6 +223,8 @@ module Gitlab # file: { # previous_path: 'documents/old_story.txt' # path: 'documents/story.txt' + # content: 'Lorem ipsum...', + # update: true # }, # author: { # email: 'user@example.com', -- GitLab From b2a2273b83b9511ea94d36b2bb60592a4693078a Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Mon, 4 Jul 2016 14:36:22 +0100 Subject: [PATCH 10/46] fixes bug regarding old_path_name in blob.rb's commit method --- lib/gitlab_git/blob.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gitlab_git/blob.rb b/lib/gitlab_git/blob.rb index 390bfb6..c6a902c 100644 --- a/lib/gitlab_git/blob.rb +++ b/lib/gitlab_git/blob.rb @@ -152,7 +152,7 @@ module Gitlab else if action == :rename old_path_name = PathHelper.normalize_path(file[:previous_path]) - raise Repository::InvalidBlobName.new("Invalid path") if path_name.each_filename.to_a.include?('..') + raise Repository::InvalidBlobName.new("Invalid path") if old_path_name.each_filename.to_a.include?('..') old_filename = old_path_name.to_s index.remove(old_filename) -- GitLab From 95b684a3fec790dbcea16ae1a44a97e21e113bee Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Tue, 5 Jul 2016 10:38:09 +0100 Subject: [PATCH 11/46] removes .swp file --- lib/gitlab_git/.blob.rb.swp | Bin 24576 -> 0 bytes lib/gitlab_git/blob.rb | 2 -- 2 files changed, 2 deletions(-) delete mode 100644 lib/gitlab_git/.blob.rb.swp diff --git a/lib/gitlab_git/.blob.rb.swp b/lib/gitlab_git/.blob.rb.swp deleted file mode 100644 index 02ca93df3597f403f8fc2553d007f24b33b081d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24576 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 TO!G~q#QXUq(+nWVHS50s-n_1q diff --git a/lib/gitlab_git/blob.rb b/lib/gitlab_git/blob.rb index c6a902c..52d1138 100644 --- a/lib/gitlab_git/blob.rb +++ b/lib/gitlab_git/blob.rb @@ -152,8 +152,6 @@ module Gitlab else if action == :rename old_path_name = PathHelper.normalize_path(file[:previous_path]) - raise Repository::InvalidBlobName.new("Invalid path") if old_path_name.each_filename.to_a.include?('..') - old_filename = old_path_name.to_s index.remove(old_filename) end -- GitLab From 4caf1ff3e0be2adc27259d792e3412d37dcacf26 Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Tue, 5 Jul 2016 11:23:23 +0100 Subject: [PATCH 12/46] adds tests for renaming a file --- spec/.blob_snippet_spec.rb.swp | Bin 0 -> 12288 bytes spec/.blob_spec.rb.swp | Bin 0 -> 28672 bytes spec/.spec_helper.rb.swp | Bin 0 -> 12288 bytes spec/blob_spec.rb | 48 +++++++++++++++++++++++++++++++++ 4 files changed, 48 insertions(+) create mode 100644 spec/.blob_snippet_spec.rb.swp create mode 100644 spec/.blob_spec.rb.swp create mode 100644 spec/.spec_helper.rb.swp diff --git a/spec/.blob_snippet_spec.rb.swp b/spec/.blob_snippet_spec.rb.swp new file mode 100644 index 0000000000000000000000000000000000000000..ddfee16af275096b2c18d97b3a746bd6d8f4ad99 GIT binary patch literal 12288 zcmeI2&uY|A6vl50ZiK4X7dVZJ%)m_28HLv1Y8DlRf?%r)m5@J&nLy^=G`VG}qV0?L z4B|WZ0Iqc9Bj^(-cy1@--xdq5D&K`KC%HNI%elX-LQcB=;LbK}1UHn7D@t7)J$txy z^Y!xEHKlBkjEzo><#J-&{Zq#F=w3hP{*FuU4}&t%CnvuA#V~B@EWBOVGD*Ynafl^^ zO~qN5mL`oGT~rm@*v$lWda@^GK>!5KN?=7@9}d=C_BC&fR<G`!bs_RV00ck)1V8`; zKmY_l00jO60=8OGhq905b}y@KT>34xmk1yL0w4eaAOHd&00JNY0w4eaAOHgAkU)|v z^=?I}%}Y|e{QqBk|9`%$)F;sg(R<Mw(JRrBXeb(pE{ML$x-X)Sq9f6v=&ooax+QYH z8zKx4009sH0T2KI5C8!X009sHf%8d#b*_l!#~+cXu=JexKw7qKr)}U4^28?Hz#8Jc zjyE&2$9lS-O}s9>P~zc6$+i=<>0L3Hw}nTM#3&j`Gx+^^FL<DN*72uFW4ZQw^vD-C ziN5pmpY&)T=Q1VT;=Xft)|t_k4=njr%?)cyWudw8DL3<nFShWP(o>FgQT}tq;?bkU z;g1q|TG^*R6-bnGlhsAa6gh~l=<hS9F*@E^&3pSr&E&b}`FO%*#kD70zw*X1lNWj% L(eBPxe^Y$}9_PtW literal 0 HcmV?d00001 diff --git a/spec/.blob_spec.rb.swp b/spec/.blob_spec.rb.swp new file mode 100644 index 0000000000000000000000000000000000000000..55948ef86f930d92ca44f0f38400a5a9ba0df0cd GIT binary patch literal 28672 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 literal 0 HcmV?d00001 diff --git a/spec/.spec_helper.rb.swp b/spec/.spec_helper.rb.swp new file mode 100644 index 0000000000000000000000000000000000000000..1246342965bda0d19fc0e816501ebebf323977e9 GIT binary patch literal 12288 zcmeI2PmkL~6u_rFfK(_TK%xf@v&+F7(Kzi=6%lC<*^=$9lx(8>Sq^9!jqR6Ys<Fq6 z$0>p3&xtDs1QL7(1SdWK2*GDS9QXoAd;mD`Y=`{=+a*14sPruTGP2*B@tfb+k)lj+ z<6y7LU-fS>Jf30f%J#c&^j`bs@(*i_IVGni35)|hGe!IXM|ZnlkDxv(((9YPmdW{v zADkJmk=d|uS2-<%#<Xk%HjONWu>24+&?#8o2Ir4PSIGbwcsK)B*(;kjZxnrAT3_SO zJv)B5?vzai$N(8217v^<kO4A42FSo8ZNR0M*oQcS%gb53ylgN1qg|d-Lk7qI86X2> zfDDiUGC&5%02v?yWPl7jf(B&7*u5)^Z9aj;<NyDE|Nj5|X~up=enP%SzCyl4K1V)7 zK0++=7IKK(MxIB0dy28|kS`F6bPx}D9C-}+<tmPee2aX72xJ|35xIuEfc*F*V;>_e z<WH>Y59C+mYvfa8fgB>Yk)rOK2pwdA43GgbKnBPF86X2>;QuiINyIo0O)^naKY)p` zu+fxS*Z6xJk}S6%GJq)K@1LZpB-D8Xe29VFa$D<3%-9Gl-{PK?Nn~R0Br;LjffY7S zcynUHJUa>DHG%gO_h*m@n1fxonM$Uj>H-mt=WGsaFvRV&epM`1#v{Xzs<R`;M(yE9 zbjPFCcBd@{?S4=6Tccg<x}!As_l!z5hU0#}HyD+H>wG=VoeVV8Eu_ZB-MZ_wYLNZj zpxf%KHb!DxJ&^X_gRD}4SM3z8V^epKxuOWK#!i=crv7p!@J@<qMJnBFqr4C)o5&b8 zgxJ}`sf$|eI`@3Pk>zP>Y%w6KR=N7*T!t=}+LyVT87qpud~2&*%>kNdHt(1?R<7A> zjYqq^f!G;$I%2=oZR3I+ca9;;<n#d@yY1nyb@xoZ!bLpq9(%8!8kMhY@kD975=$4( z%Jr>^J*w8e+3Xepu$dphL?ytR0f@QODiUE?HTJ=uYVdZh@X58HrBid@-qJ;*SZeR0 zcpfZ7piOX5QlO^GyIqu}W#(2$n<%?d9wecOikG6A=S6phICYB^^8S0I;?-a7T=$N( z;=5gLYgaBiu7Z21U7R|r9_(TZJoc-eyP=9x4R_4k&z!Ul7kRl%xH@GhG;@!E&HzK0 k1{S{(GXFkEyLLJm)2fii)P%S958m`fgVw>`&^u&*0gcb<CIA2c literal 0 HcmV?d00001 diff --git a/spec/blob_spec.rb b/spec/blob_spec.rb index 6998ea3..969d058 100644 --- a/spec/blob_spec.rb +++ b/spec/blob_spec.rb @@ -270,6 +270,54 @@ describe Gitlab::Git::Blob do end end + describe :rename do + let(:repository) { Gitlab::Git::Repository.new(TEST_NORMAL_REPO_PATH) } + + let(:commit_options) do + options = { + file: { + path: 'NEWREADME.md', + previous_path: 'README.md', + content: 'Lorem ipsum...', + update: true + }, + author: { + email: 'user@example.com', + name: 'Test User', + time: Time.now + }, + committer: { + email: 'user@example.com', + name: 'Test User', + time: Time.now + }, + commit: { + message: 'Rename readme', + branch: 'master' + } + } + end + + let!(:commit_sha) { Gitlab::Git::Blob.rename(repository, commit_options) } + let!(:commit) { repository.lookup(commit_sha) } + + it 'should rename the file with commit' do + # Commit message valid + expect(commit.message).to eq('Rename readme') + + # Previous file was removed + expect(commit.tree.to_a.any? do |tree| + tree[:name] == 'README.md' + end).to be_falsey + + # File was renamed + expect(commit.tree.to_a.any? do |tree| + tree[:name] == 'NEWREADME.md' + end).to be_truthy + + end + end + describe :remove do let(:repository) { Gitlab::Git::Repository.new(TEST_REPO_PATH) } -- GitLab From 9a5634db1442099c41c7c26e78aad75b995b8d3b Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Tue, 5 Jul 2016 12:11:28 +0100 Subject: [PATCH 13/46] removes swp files --- spec/.blob_snippet_spec.rb.swp | Bin 12288 -> 0 bytes spec/.blob_spec.rb.swp | Bin 28672 -> 0 bytes spec/.spec_helper.rb.swp | Bin 12288 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 spec/.blob_snippet_spec.rb.swp delete mode 100644 spec/.blob_spec.rb.swp delete mode 100644 spec/.spec_helper.rb.swp diff --git a/spec/.blob_snippet_spec.rb.swp b/spec/.blob_snippet_spec.rb.swp deleted file mode 100644 index ddfee16af275096b2c18d97b3a746bd6d8f4ad99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2&uY|A6vl50ZiK4X7dVZJ%)m_28HLv1Y8DlRf?%r)m5@J&nLy^=G`VG}qV0?L z4B|WZ0Iqc9Bj^(-cy1@--xdq5D&K`KC%HNI%elX-LQcB=;LbK}1UHn7D@t7)J$txy z^Y!xEHKlBkjEzo><#J-&{Zq#F=w3hP{*FuU4}&t%CnvuA#V~B@EWBOVGD*Ynafl^^ zO~qN5mL`oGT~rm@*v$lWda@^GK>!5KN?=7@9}d=C_BC&fR<G`!bs_RV00ck)1V8`; zKmY_l00jO60=8OGhq905b}y@KT>34xmk1yL0w4eaAOHd&00JNY0w4eaAOHgAkU)|v z^=?I}%}Y|e{QqBk|9`%$)F;sg(R<Mw(JRrBXeb(pE{ML$x-X)Sq9f6v=&ooax+QYH z8zKx4009sH0T2KI5C8!X009sHf%8d#b*_l!#~+cXu=JexKw7qKr)}U4^28?Hz#8Jc zjyE&2$9lS-O}s9>P~zc6$+i=<>0L3Hw}nTM#3&j`Gx+^^FL<DN*72uFW4ZQw^vD-C ziN5pmpY&)T=Q1VT;=Xft)|t_k4=njr%?)cyWudw8DL3<nFShWP(o>FgQT}tq;?bkU z;g1q|TG^*R6-bnGlhsAa6gh~l=<hS9F*@E^&3pSr&E&b}`FO%*#kD70zw*X1lNWj% L(eBPxe^Y$}9_PtW diff --git a/spec/.blob_spec.rb.swp b/spec/.blob_spec.rb.swp deleted file mode 100644 index 55948ef86f930d92ca44f0f38400a5a9ba0df0cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28672 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 diff --git a/spec/.spec_helper.rb.swp b/spec/.spec_helper.rb.swp deleted file mode 100644 index 1246342965bda0d19fc0e816501ebebf323977e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2PmkL~6u_rFfK(_TK%xf@v&+F7(Kzi=6%lC<*^=$9lx(8>Sq^9!jqR6Ys<Fq6 z$0>p3&xtDs1QL7(1SdWK2*GDS9QXoAd;mD`Y=`{=+a*14sPruTGP2*B@tfb+k)lj+ z<6y7LU-fS>Jf30f%J#c&^j`bs@(*i_IVGni35)|hGe!IXM|ZnlkDxv(((9YPmdW{v zADkJmk=d|uS2-<%#<Xk%HjONWu>24+&?#8o2Ir4PSIGbwcsK)B*(;kjZxnrAT3_SO zJv)B5?vzai$N(8217v^<kO4A42FSo8ZNR0M*oQcS%gb53ylgN1qg|d-Lk7qI86X2> zfDDiUGC&5%02v?yWPl7jf(B&7*u5)^Z9aj;<NyDE|Nj5|X~up=enP%SzCyl4K1V)7 zK0++=7IKK(MxIB0dy28|kS`F6bPx}D9C-}+<tmPee2aX72xJ|35xIuEfc*F*V;>_e z<WH>Y59C+mYvfa8fgB>Yk)rOK2pwdA43GgbKnBPF86X2>;QuiINyIo0O)^naKY)p` zu+fxS*Z6xJk}S6%GJq)K@1LZpB-D8Xe29VFa$D<3%-9Gl-{PK?Nn~R0Br;LjffY7S zcynUHJUa>DHG%gO_h*m@n1fxonM$Uj>H-mt=WGsaFvRV&epM`1#v{Xzs<R`;M(yE9 zbjPFCcBd@{?S4=6Tccg<x}!As_l!z5hU0#}HyD+H>wG=VoeVV8Eu_ZB-MZ_wYLNZj zpxf%KHb!DxJ&^X_gRD}4SM3z8V^epKxuOWK#!i=crv7p!@J@<qMJnBFqr4C)o5&b8 zgxJ}`sf$|eI`@3Pk>zP>Y%w6KR=N7*T!t=}+LyVT87qpud~2&*%>kNdHt(1?R<7A> zjYqq^f!G;$I%2=oZR3I+ca9;;<n#d@yY1nyb@xoZ!bLpq9(%8!8kMhY@kD975=$4( z%Jr>^J*w8e+3Xepu$dphL?ytR0f@QODiUE?HTJ=uYVdZh@X58HrBid@-qJ;*SZeR0 zcpfZ7piOX5QlO^GyIqu}W#(2$n<%?d9wecOikG6A=S6phICYB^^8S0I;?-a7T=$N( z;=5gLYgaBiu7Z21U7R|r9_(TZJoc-eyP=9x4R_4k&z!Ul7kRl%xH@GhG;@!E&HzK0 k1{S{(GXFkEyLLJm)2fii)P%S958m`fgVw>`&^u&*0gcb<CIA2c -- GitLab From b9635e2d3d029bc7d782dd33efac708f10fcf4a2 Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Tue, 5 Jul 2016 12:12:18 +0100 Subject: [PATCH 14/46] removes redundant empty line --- spec/.blob_spec.rb.swp | Bin 0 -> 24576 bytes spec/blob_spec.rb | 1 - 2 files changed, 1 deletion(-) create mode 100644 spec/.blob_spec.rb.swp diff --git a/spec/.blob_spec.rb.swp b/spec/.blob_spec.rb.swp new file mode 100644 index 0000000000000000000000000000000000000000..18e1c7e9ced827d737cf8ae4a2790989f9456be1 GIT binary patch literal 24576 zcmeI34Uingb;rjTa2$iNaoI6APPJB5*^{~3o7wMOn}U<>h~?Z#^66wDVP(@h(|bE; zcV?NHy}LzUu@MfTATHy?NyYiH0h?fqOeHQ`F$qa*hon*kA|_B#oT411utOPAMm8y` z;!6JA^SxhpCkX+`Zq-kF+Uf4;dHwqJd#`({@<+DLkwPjf;qx|0I&}Mi-FJ?C<$_;O zB+1d~qG?o3hc)UZzdqnIw|U2e#wHec@riV*L5=<e562puv@Lb=mvpB=tCNf3tAejd zyT#PWYQwBn_+Kfj+P|&QuOkVJB(M$%w4K^S@lq+1R%BjlV`2k&$K|`$(ZHzaNCG1X zj3h9Uz(@ik35+B#lE6p;BMH3TCE&C!l#bvbF7O_NdEam7`o75fzaQGyx~^a7{r^_) z`^m2BZ}k5EE8h2B?*{&Tyq`y3BMFQoFp|JX0wW2GBruY|NCG1Xj3h9Uz(@ik35+E0 z3P^xzlJrir`)wYGWB=ce|6jOFlAZ@ogQvjPK^r(=FW3kY;3DwMTP5jXa2L2890j)k z6Kn_1T`Ecc0UiV<$bi$ANYdS)13m;cgDJ2PJo*+%`dhFJror366F)0SzYX?-4}dJl zfD6FAZ<eHcz%Gyg|M@eLbPU*FE4UI|4&Dxa^d__eehaif9V~(mg3}jE(u?43a5LzD z&EQJ#5)vRk1pf|Bfk(mhpaAmVV(>VUAdi8&!EP`IX2CeP5d0&OAb$t`3j8@Z4!!_( zfp>$GNWwe_ZU!B&4@`m=FgARAzBMRWLcCA4U8^yRTur7di*`~5TOM;yQs_6caUyS$ zf`a0F1%5?Y_XtM0jPG)JGcJ_Nb5qw>rl%IBD$`qc?wFn0Q`xz7?+m$$C|(1)Ly`@> zsXI1t>WtXDA+ts(X;5pCk(%CMNursev}zg-Tj3Sr*Th9MbbzoG9Q1I;EV^9by-hh* z+fb>)v}-n{9FtU8rA8Yz>ySf(>+mj!((I<Oe7>}4SXqra^aeSVQsjMpm4wA^YU>sw zA5GTu#L(Kh=2zOum^RN^X1P4yu6A6>ZJqWjH<&Y4_Md4J9<xWzDO?@1(15KwrqvlI z!y43>ty+4O5#A=3Eo8wAO-RK54u2u|cw!YI<&T_dFk{iF`@QGCSA^I^8@z@n+AyhB zp^Zj`*Vz#1pRYZ9@KtIMUXY+5;RVHTdkux%iFYCxBRs_i)~<J6tKznGrtXKzQ3wC% zP(Efm1m89_T!jnE25PnX^Lx5NNK_j|wV=n)s!(1i@7+g?apb}Qq9{sH&IBz61^O#M zO*gcNgrgd;#cX1JmCIYF#|d<@!R$%BNf+^zm$M~VDOIw0*-qWqT1@&HH*}_jgA)D~ zA09r8zH%g!{%Eg9D>ReY#4sJQ$Q;sSw#_usZjow7=t`(mQDy0oc~>_AQT7xJCt@-y zmui`UnytyXVm`;RwQ5=}s)d4*E#_)zMWN}mnpM-95LNfso!!vb`bzHr;74M&t4&jD zdzMh#G?aYz!w9*<&>4E8k9M6^4--w@wsm6>C+Pyi7HEoL8WU_q$1DnL_9{J1;h_Rc zn^0sqpUnpCt}=zvS;g1YJ|+3Ucbnz+q1Wn1jrXN&Y7e`MDrQS1REf}(h7)PXy<0Ri zjENMEA?k~UX|Z9qG-xxF!`iBZ-AiaSN;9=mL8X~Yfu&_7m!+j5RZE&&Wre(^X-Z91 zi)qn=bE>h4$v&M86oRV((G6mmn8wSxQzs2ZHK-4<8`Q3cGk35qk2J&)i$&^nt08Mu zkXKq8B97eJ>_s^1Lyv6B_H7F@+ZKGwGI%{Xr#8f0u`T$8lP$BwjHvbP^DI$S>Gu%Z zrsigbn6J>V^sDUpr03R%412yFV}hkn(=DMbgoKVP_kIR@vTjfy+%WEGGR<{Xc|-tj z3=5_2p+x=MsKYj(NL18G?m&934wmF(of;ZEEy9=KxL3Q1BgZ2x-f)?CO$s#&A5}N7 zq|gSBlU&!`jSd3ezh{N#afKTeh$wDhX6Hg>erCt^%8sdp4{}Wi+U^M}#2x&2CczKU zSL&?MVpamtHDU(U<o3Kw#DQRm$N$eF^ye`rkN^Gs`G*kK9|8x#hd~xd;C~R$KMRh7 z&w#^V3A6x@_jiI#;GN(ni1VKTe*%63906_MfGO}#i1m36U;!k+vxxH_26uv6!BOxL za0z$`asHFwVQ>^&4`#u&;2Q8|a1ycq{a_Dx5BLt^{rkW&Xo3c~0=yA?5ApurgHHhl z_JBDs3*H63kC^`<@T(vJP9nZP1`Y!U*dPHe0nhQ+9{e7-2{5n+Tn`f9G-CU20t*zt zi;(rB;4|P3a1<N{e%ud9|3CP+9)#~l_}}puw%bo$#kc5VS)&#qFNZd?PtlkY=o+|2 z&7S0cP3XoFrmvQ|S#L$0!aj{e%}Zi^RYNPD(25zQR8*>3v5+rh($!*)Dpgg@tE#Nv z0KbZGC!fw1Ys343-uD>IVEyaUcV6BMd%+FpYQ<Zoj`WV@W@=!UMW%+=@|K(Ua1!Dh zZ6ZEiVB1g1$)EvVGMUL#)mkm9sOe0aDoP<;plV*r=jE!Ft;%Y;N{je!MoW&z>P50E zk>7hvW=aI&L5Ya5_mWtI1dEz*idECHkh3C7%(8XUAayv&NW5YBaFb!xHu4g#%D6x9 zD-dnyF~tRQZuLA@7&>kP^t`33PTLAqy=5#8SFf0=ue)}rXNeqTnOwS*XG*P<Qx#S# z)tE*Vgp1iifobUy%_5L5xWN##L40~d)~)RcC0EGFh2rpscr|stkIeorsJ%Zqxak#B z;=Cz-HghJ5Pc5~sFNKQlP;0o(#1wzswIhmOE7D@As8!QSf#zs2$FyQKqos4zOjcF2 znxZLkDXV7l!@JY1_-nD-ua=qbBdyn^%DV=Bpr&&R6?o`kmBT~`Rs;+f@fOZ-K?oh7 z9?NzXDK{k(@p*b09<UOKL^Dq<NA#|zZfp{)sYX=svsxifYv`Sv(G*3_Bk4ueqMD;= zn$a=^O{-<nYMKt~K)2c_lu|Amwe~$-?y~iXY+BA^#Zk0$zNDyyBBjU@%PK3?($#b( zSCp%1wUkyhRn2BHSe@i_v5-xxa=MT$Wr|E*t#{qd5jM71#5W2@Jnk1oyrMv^(MfV< z&QL#BXt*QP>jni*5O-_|CBi2r-Rc}s{W2H1CkA_PtZ%q`YQavQBvyF*<5-N{Q0A(( zk6e8<NzTtqP0!7wnwl>UFZg$JH`qC33<-h?O;MwB4emz{@}CZR?QJC2@qRB;n^>%A zE-}q_Q{&C>tqW|m1e+oAqA==Et;vF&k&VPnEsLEF6nCW|ZUxOt+I6$t(7YRo^tzi* zb-NnQdq{c1SlRuRrvbuoN;OP#f4ep2UaQ!3>aT9mI_~d%w--gXWBW^9Q)bJ7*J|_T zc>KQs(dLH{fAaYMRxk2=4zd2d;2v-rSON@O1KtfT0WTxQ{|@*n_$>G&=m4Gr$bt8O z%fNs0SRZ^1JOJ(izYjhO=D?NU3h*Q30G<SY2>t-@yueP718)VFf*&Ina3A<%@JHY< z*bA-#&m#x$L+~l^>);4D3@8`}FCZuIJU9qu!DdhfS&#wm1y3M1a02`p_&m4^SYQ?; z!P~$^;52dskAa84?}9tQ3fKwq;Jx5-Ac5~9fAH7fYv368BKQK>4K@OvUpS3C!c*Y$ z;B(*zm<N;K=fJzbPmxPF0qzHPf!o1Ra0_UHF^~jr0WTxZ@B{D<;1Tcu_ynkfZD2DP z2N#1MVC)|Qe*=zz+d&gl!Co*AxPI&a+rjV;rfsk@O(OAQ^iS+6TGUYM$d}a^<za_E zp?Ph8M&W9F>P3P(SCh-+fFx@0e-1@1!*u989k+mgQ---5mLi0k6EwZRH;;GO%!<d1 ztV#6-F1K;zTDC%)tp-csZqZWi%@Oy$O82L2r*00rIbYbh^t#O@q{K~k*lo`e;24N2 zNMZB4t%RGhB-je#M;e06<oc7A(Urlqz-w6(uxvW@PB4PqYr?jf-9674x996w7PxX~ z!Lo4P7N#8*Thh(8?JX4RU!i!v&vb<nb@@Rav8;Ou4u1UL{H#*^_N%N?V(>$M$vp@J zWscdDz@#*(jky`MDBg-L3`$f|p~dL6Coyv}(3<ep1{#w!*pj}c<ow*a*NVjM+iqbC z1kc93)?o5^i7>;#GtXj&yh-$y-EO8*si=J<El-^*J%%WhI3eD}*aQx*pJzk0ZTtM( z)NFi{C2p^T;;iH36*C;Gb3>Uw2an)_!)7v0O%!suFcm5a_CJZo6O$Ejy;AK6Y4({Z zuHTE0ejI5^K5r|YS$A)~?}jp$^uA5LS>uB^xEMO(MIda2scnZ=`Qf96?a!x(bBkfd zD!Jqt4*rmKkCV%1X;&yL3Wl~NoY&!Ba3RD7-~qp@@P5f5zWHZS-DVYLS*A6XybiJz z!$KR}JMW+t4zt+r$FU=>yy7qtj;NW-3}=7N&EpRgo_kBgDMTc}y(trsmc?%5Ib*k+ zEuKFvoIV9aE1_7tbuC<j{TRVr6rlppvYKw$ju$lrF^tWR7^a*Rf4h^ANHnBEcsOtA z3&^{R+oscLg{oWTzxj&0kxb*rq{<r>F;!P9yeNd>s#+v86WhKAyvVF4!qZH(-GstJ zKEWnJd^PWm&UTy2IBccXy*sTlKBJm8eAzpL*vzjoI5cyG(q}6BGdD;Rgkv8rda+e6 z;z{c(6MSm<6O}7h#Fg%rQ)p>D$%S4a>cy6Vku#0uF3`-$a4tz)#NJ0FM^;%F&-0oV zJ24P3!)14>a_5`J|2$0n7k;)J@xS2(cV9+)Zvq2s0WTts{~U0D4SpG10eF1>Ch!Iz zf$t-Ze+29Wd%!P(lZe|N0!P5LfXDLBAYOkOJOv&E*MS*u8F(DA`n_NYOap%2|NY={ za35myF9I7(gP#Y_BOd<-_*3v@@BsK7&;bn0fJyK&9`v8V<KWxiTj0}RHy8&$MI8PU z@MG{a_$J`*0^A9BteywsfXC|_z)Oh9kApkFKClZcfU5wH+5Zc1`1in<z!A^}`@xMM z1)fFh{TJXj0gugZ1^d8OunD{a{43(^N5EIXm%#ntAlMA90MB9E{tbK=@G(3I{7)E% zhgPH~DatK|ze*&Ow2aTNyk>MiJ-yc4vY*k^js5ndW5QSmXJ-3sL-PgQ?@=-=ExGe7 ze3brK)5tx%8oXYzh7ELu<yBeE(tNR6;5+M?YB8V9<uqDic_e&U23yE6H#S^nLt}Y% zIa9mSY@mmPzt^A})avwegU;m`WriKO<!)ghX>Oa~=Lz}ogKHDE)4|Dy#kQ_7o^kb) zkE@N?pt{~@tZDrEwei{>O^YqI@rKJ845tVN);i^|S0WeJIqkaK__dBBJpRB72`veq zOuhri{~j7DxCLGtGw+P2+q#apa|1d=z<nm1I3o(}VJkQzy7oyHtsrqZuR28W8%d&y z_~*4^8>3Sw;;bZvPdhMC*kdeLd3~&p`HC-r>l*LukiqVAY;{=i=(3m4ZL?U+m3Y7= zOoKOEA_L3M#P;M~H}f~=#4)DGq7`|gY!*4OEs=MM68=HZ$?jWmorrJriHzXZo!cjP zm+;aRf=F*TqDuD)3<R<yYc-6S?67&q5A%wJPB+v>TVrF1Qy=^EsgK`r>SM=F-SUZ3 zA3uKTmfMEiDK<7ijdM3T{YR$vMgzuXOI<gRiCO#5bZh)7f?jn>Z6xz;oNvHudCR)W zUkEkuFBdw0J5OjDUIn8yWM#z*qas5=@S3Nm*5^QVVt#4l7*J2syjLlBIm~twCBFZY zIC1ZZzkK4?z-=eKe&RTJ;^>L5oH%~s8*5eztBv=pXmHZsd$cp3vHf+T>n;Nn!YdUj zMAV-8GvA-YzDMSNM<+G@9)1u%eEZRR;MHFk3<^e@?o~1T65aNR7Iw!l_Bv~iTRz|| z=FoSEHrU5hpIw7db&QB8cy#_-zl?9sJHb|aaS`u6@bY2TBR`^%c~QiDcRN+H%x1-X a4?L1yO1U-0iF+k=BaZEk;U&*a(*FWE^rH&^ literal 0 HcmV?d00001 diff --git a/spec/blob_spec.rb b/spec/blob_spec.rb index 969d058..0d89582 100644 --- a/spec/blob_spec.rb +++ b/spec/blob_spec.rb @@ -314,7 +314,6 @@ describe Gitlab::Git::Blob do expect(commit.tree.to_a.any? do |tree| tree[:name] == 'NEWREADME.md' end).to be_truthy - end end -- GitLab From 982c3e7052903f3946e901c824ded94c68645fc4 Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Tue, 5 Jul 2016 15:02:21 +0100 Subject: [PATCH 15/46] removes .swp file --- spec/.blob_spec.rb.swp | Bin 24576 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 spec/.blob_spec.rb.swp diff --git a/spec/.blob_spec.rb.swp b/spec/.blob_spec.rb.swp deleted file mode 100644 index 18e1c7e9ced827d737cf8ae4a2790989f9456be1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24576 zcmeI34Uingb;rjTa2$iNaoI6APPJB5*^{~3o7wMOn}U<>h~?Z#^66wDVP(@h(|bE; zcV?NHy}LzUu@MfTATHy?NyYiH0h?fqOeHQ`F$qa*hon*kA|_B#oT411utOPAMm8y` z;!6JA^SxhpCkX+`Zq-kF+Uf4;dHwqJd#`({@<+DLkwPjf;qx|0I&}Mi-FJ?C<$_;O zB+1d~qG?o3hc)UZzdqnIw|U2e#wHec@riV*L5=<e562puv@Lb=mvpB=tCNf3tAejd zyT#PWYQwBn_+Kfj+P|&QuOkVJB(M$%w4K^S@lq+1R%BjlV`2k&$K|`$(ZHzaNCG1X zj3h9Uz(@ik35+B#lE6p;BMH3TCE&C!l#bvbF7O_NdEam7`o75fzaQGyx~^a7{r^_) z`^m2BZ}k5EE8h2B?*{&Tyq`y3BMFQoFp|JX0wW2GBruY|NCG1Xj3h9Uz(@ik35+E0 z3P^xzlJrir`)wYGWB=ce|6jOFlAZ@ogQvjPK^r(=FW3kY;3DwMTP5jXa2L2890j)k z6Kn_1T`Ecc0UiV<$bi$ANYdS)13m;cgDJ2PJo*+%`dhFJror366F)0SzYX?-4}dJl zfD6FAZ<eHcz%Gyg|M@eLbPU*FE4UI|4&Dxa^d__eehaif9V~(mg3}jE(u?43a5LzD z&EQJ#5)vRk1pf|Bfk(mhpaAmVV(>VUAdi8&!EP`IX2CeP5d0&OAb$t`3j8@Z4!!_( zfp>$GNWwe_ZU!B&4@`m=FgARAzBMRWLcCA4U8^yRTur7di*`~5TOM;yQs_6caUyS$ zf`a0F1%5?Y_XtM0jPG)JGcJ_Nb5qw>rl%IBD$`qc?wFn0Q`xz7?+m$$C|(1)Ly`@> zsXI1t>WtXDA+ts(X;5pCk(%CMNursev}zg-Tj3Sr*Th9MbbzoG9Q1I;EV^9by-hh* z+fb>)v}-n{9FtU8rA8Yz>ySf(>+mj!((I<Oe7>}4SXqra^aeSVQsjMpm4wA^YU>sw zA5GTu#L(Kh=2zOum^RN^X1P4yu6A6>ZJqWjH<&Y4_Md4J9<xWzDO?@1(15KwrqvlI z!y43>ty+4O5#A=3Eo8wAO-RK54u2u|cw!YI<&T_dFk{iF`@QGCSA^I^8@z@n+AyhB zp^Zj`*Vz#1pRYZ9@KtIMUXY+5;RVHTdkux%iFYCxBRs_i)~<J6tKznGrtXKzQ3wC% zP(Efm1m89_T!jnE25PnX^Lx5NNK_j|wV=n)s!(1i@7+g?apb}Qq9{sH&IBz61^O#M zO*gcNgrgd;#cX1JmCIYF#|d<@!R$%BNf+^zm$M~VDOIw0*-qWqT1@&HH*}_jgA)D~ zA09r8zH%g!{%Eg9D>ReY#4sJQ$Q;sSw#_usZjow7=t`(mQDy0oc~>_AQT7xJCt@-y zmui`UnytyXVm`;RwQ5=}s)d4*E#_)zMWN}mnpM-95LNfso!!vb`bzHr;74M&t4&jD zdzMh#G?aYz!w9*<&>4E8k9M6^4--w@wsm6>C+Pyi7HEoL8WU_q$1DnL_9{J1;h_Rc zn^0sqpUnpCt}=zvS;g1YJ|+3Ucbnz+q1Wn1jrXN&Y7e`MDrQS1REf}(h7)PXy<0Ri zjENMEA?k~UX|Z9qG-xxF!`iBZ-AiaSN;9=mL8X~Yfu&_7m!+j5RZE&&Wre(^X-Z91 zi)qn=bE>h4$v&M86oRV((G6mmn8wSxQzs2ZHK-4<8`Q3cGk35qk2J&)i$&^nt08Mu zkXKq8B97eJ>_s^1Lyv6B_H7F@+ZKGwGI%{Xr#8f0u`T$8lP$BwjHvbP^DI$S>Gu%Z zrsigbn6J>V^sDUpr03R%412yFV}hkn(=DMbgoKVP_kIR@vTjfy+%WEGGR<{Xc|-tj z3=5_2p+x=MsKYj(NL18G?m&934wmF(of;ZEEy9=KxL3Q1BgZ2x-f)?CO$s#&A5}N7 zq|gSBlU&!`jSd3ezh{N#afKTeh$wDhX6Hg>erCt^%8sdp4{}Wi+U^M}#2x&2CczKU zSL&?MVpamtHDU(U<o3Kw#DQRm$N$eF^ye`rkN^Gs`G*kK9|8x#hd~xd;C~R$KMRh7 z&w#^V3A6x@_jiI#;GN(ni1VKTe*%63906_MfGO}#i1m36U;!k+vxxH_26uv6!BOxL za0z$`asHFwVQ>^&4`#u&;2Q8|a1ycq{a_Dx5BLt^{rkW&Xo3c~0=yA?5ApurgHHhl z_JBDs3*H63kC^`<@T(vJP9nZP1`Y!U*dPHe0nhQ+9{e7-2{5n+Tn`f9G-CU20t*zt zi;(rB;4|P3a1<N{e%ud9|3CP+9)#~l_}}puw%bo$#kc5VS)&#qFNZd?PtlkY=o+|2 z&7S0cP3XoFrmvQ|S#L$0!aj{e%}Zi^RYNPD(25zQR8*>3v5+rh($!*)Dpgg@tE#Nv z0KbZGC!fw1Ys343-uD>IVEyaUcV6BMd%+FpYQ<Zoj`WV@W@=!UMW%+=@|K(Ua1!Dh zZ6ZEiVB1g1$)EvVGMUL#)mkm9sOe0aDoP<;plV*r=jE!Ft;%Y;N{je!MoW&z>P50E zk>7hvW=aI&L5Ya5_mWtI1dEz*idECHkh3C7%(8XUAayv&NW5YBaFb!xHu4g#%D6x9 zD-dnyF~tRQZuLA@7&>kP^t`33PTLAqy=5#8SFf0=ue)}rXNeqTnOwS*XG*P<Qx#S# z)tE*Vgp1iifobUy%_5L5xWN##L40~d)~)RcC0EGFh2rpscr|stkIeorsJ%Zqxak#B z;=Cz-HghJ5Pc5~sFNKQlP;0o(#1wzswIhmOE7D@As8!QSf#zs2$FyQKqos4zOjcF2 znxZLkDXV7l!@JY1_-nD-ua=qbBdyn^%DV=Bpr&&R6?o`kmBT~`Rs;+f@fOZ-K?oh7 z9?NzXDK{k(@p*b09<UOKL^Dq<NA#|zZfp{)sYX=svsxifYv`Sv(G*3_Bk4ueqMD;= zn$a=^O{-<nYMKt~K)2c_lu|Amwe~$-?y~iXY+BA^#Zk0$zNDyyBBjU@%PK3?($#b( zSCp%1wUkyhRn2BHSe@i_v5-xxa=MT$Wr|E*t#{qd5jM71#5W2@Jnk1oyrMv^(MfV< z&QL#BXt*QP>jni*5O-_|CBi2r-Rc}s{W2H1CkA_PtZ%q`YQavQBvyF*<5-N{Q0A(( zk6e8<NzTtqP0!7wnwl>UFZg$JH`qC33<-h?O;MwB4emz{@}CZR?QJC2@qRB;n^>%A zE-}q_Q{&C>tqW|m1e+oAqA==Et;vF&k&VPnEsLEF6nCW|ZUxOt+I6$t(7YRo^tzi* zb-NnQdq{c1SlRuRrvbuoN;OP#f4ep2UaQ!3>aT9mI_~d%w--gXWBW^9Q)bJ7*J|_T zc>KQs(dLH{fAaYMRxk2=4zd2d;2v-rSON@O1KtfT0WTxQ{|@*n_$>G&=m4Gr$bt8O z%fNs0SRZ^1JOJ(izYjhO=D?NU3h*Q30G<SY2>t-@yueP718)VFf*&Ina3A<%@JHY< z*bA-#&m#x$L+~l^>);4D3@8`}FCZuIJU9qu!DdhfS&#wm1y3M1a02`p_&m4^SYQ?; z!P~$^;52dskAa84?}9tQ3fKwq;Jx5-Ac5~9fAH7fYv368BKQK>4K@OvUpS3C!c*Y$ z;B(*zm<N;K=fJzbPmxPF0qzHPf!o1Ra0_UHF^~jr0WTxZ@B{D<;1Tcu_ynkfZD2DP z2N#1MVC)|Qe*=zz+d&gl!Co*AxPI&a+rjV;rfsk@O(OAQ^iS+6TGUYM$d}a^<za_E zp?Ph8M&W9F>P3P(SCh-+fFx@0e-1@1!*u989k+mgQ---5mLi0k6EwZRH;;GO%!<d1 ztV#6-F1K;zTDC%)tp-csZqZWi%@Oy$O82L2r*00rIbYbh^t#O@q{K~k*lo`e;24N2 zNMZB4t%RGhB-je#M;e06<oc7A(Urlqz-w6(uxvW@PB4PqYr?jf-9674x996w7PxX~ z!Lo4P7N#8*Thh(8?JX4RU!i!v&vb<nb@@Rav8;Ou4u1UL{H#*^_N%N?V(>$M$vp@J zWscdDz@#*(jky`MDBg-L3`$f|p~dL6Coyv}(3<ep1{#w!*pj}c<ow*a*NVjM+iqbC z1kc93)?o5^i7>;#GtXj&yh-$y-EO8*si=J<El-^*J%%WhI3eD}*aQx*pJzk0ZTtM( z)NFi{C2p^T;;iH36*C;Gb3>Uw2an)_!)7v0O%!suFcm5a_CJZo6O$Ejy;AK6Y4({Z zuHTE0ejI5^K5r|YS$A)~?}jp$^uA5LS>uB^xEMO(MIda2scnZ=`Qf96?a!x(bBkfd zD!Jqt4*rmKkCV%1X;&yL3Wl~NoY&!Ba3RD7-~qp@@P5f5zWHZS-DVYLS*A6XybiJz z!$KR}JMW+t4zt+r$FU=>yy7qtj;NW-3}=7N&EpRgo_kBgDMTc}y(trsmc?%5Ib*k+ zEuKFvoIV9aE1_7tbuC<j{TRVr6rlppvYKw$ju$lrF^tWR7^a*Rf4h^ANHnBEcsOtA z3&^{R+oscLg{oWTzxj&0kxb*rq{<r>F;!P9yeNd>s#+v86WhKAyvVF4!qZH(-GstJ zKEWnJd^PWm&UTy2IBccXy*sTlKBJm8eAzpL*vzjoI5cyG(q}6BGdD;Rgkv8rda+e6 z;z{c(6MSm<6O}7h#Fg%rQ)p>D$%S4a>cy6Vku#0uF3`-$a4tz)#NJ0FM^;%F&-0oV zJ24P3!)14>a_5`J|2$0n7k;)J@xS2(cV9+)Zvq2s0WTts{~U0D4SpG10eF1>Ch!Iz zf$t-Ze+29Wd%!P(lZe|N0!P5LfXDLBAYOkOJOv&E*MS*u8F(DA`n_NYOap%2|NY={ za35myF9I7(gP#Y_BOd<-_*3v@@BsK7&;bn0fJyK&9`v8V<KWxiTj0}RHy8&$MI8PU z@MG{a_$J`*0^A9BteywsfXC|_z)Oh9kApkFKClZcfU5wH+5Zc1`1in<z!A^}`@xMM z1)fFh{TJXj0gugZ1^d8OunD{a{43(^N5EIXm%#ntAlMA90MB9E{tbK=@G(3I{7)E% zhgPH~DatK|ze*&Ow2aTNyk>MiJ-yc4vY*k^js5ndW5QSmXJ-3sL-PgQ?@=-=ExGe7 ze3brK)5tx%8oXYzh7ELu<yBeE(tNR6;5+M?YB8V9<uqDic_e&U23yE6H#S^nLt}Y% zIa9mSY@mmPzt^A})avwegU;m`WriKO<!)ghX>Oa~=Lz}ogKHDE)4|Dy#kQ_7o^kb) zkE@N?pt{~@tZDrEwei{>O^YqI@rKJ845tVN);i^|S0WeJIqkaK__dBBJpRB72`veq zOuhri{~j7DxCLGtGw+P2+q#apa|1d=z<nm1I3o(}VJkQzy7oyHtsrqZuR28W8%d&y z_~*4^8>3Sw;;bZvPdhMC*kdeLd3~&p`HC-r>l*LukiqVAY;{=i=(3m4ZL?U+m3Y7= zOoKOEA_L3M#P;M~H}f~=#4)DGq7`|gY!*4OEs=MM68=HZ$?jWmorrJriHzXZo!cjP zm+;aRf=F*TqDuD)3<R<yYc-6S?67&q5A%wJPB+v>TVrF1Qy=^EsgK`r>SM=F-SUZ3 zA3uKTmfMEiDK<7ijdM3T{YR$vMgzuXOI<gRiCO#5bZh)7f?jn>Z6xz;oNvHudCR)W zUkEkuFBdw0J5OjDUIn8yWM#z*qas5=@S3Nm*5^QVVt#4l7*J2syjLlBIm~twCBFZY zIC1ZZzkK4?z-=eKe&RTJ;^>L5oH%~s8*5eztBv=pXmHZsd$cp3vHf+T>n;Nn!YdUj zMAV-8GvA-YzDMSNM<+G@9)1u%eEZRR;MHFk3<^e@?o~1T65aNR7Iw!l_Bv~iTRz|| z=FoSEHrU5hpIw7db&QB8cy#_-zl?9sJHb|aaS`u6@bY2TBR`^%c~QiDcRN+H%x1-X a4?L1yO1U-0iF+k=BaZEk;U&*a(*FWE^rH&^ -- GitLab From 4bb6289cef140d4b2579d9cd2a0779f1f47797dc Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Wed, 6 Jul 2016 10:58:16 +0100 Subject: [PATCH 16/46] adds new test for rename method and refactors code for the test --- CHANGELOG | 1 + spec/blob_spec.rb | 34 +++++++++++++++++++++++++--------- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 6c97ded..faccc8a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,6 @@ v 10.3.0 (unreleased) - Remove Repository#format_patch + - Rename a repository file v 10.2.3 - Handle nil blob data diff --git a/spec/blob_spec.rb b/spec/blob_spec.rb index 0d89582..42d6e58 100644 --- a/spec/blob_spec.rb +++ b/spec/blob_spec.rb @@ -298,22 +298,35 @@ describe Gitlab::Git::Blob do } end + let!(:ref) { commit_options[:commit][:branch] } + let!(:prev_commit_count) { repository.commit_count(ref) } let!(:commit_sha) { Gitlab::Git::Blob.rename(repository, commit_options) } let!(:commit) { repository.lookup(commit_sha) } + let!(:commit_count) { repository.commit_count(ref) } + let!(:blob) { + commit.tree.to_a.any? do |tree| + tree[:name] == 'NEWREADME.md' + end + } + + let!(:previous_blob) { + commit.tree.to_a.any? do |tree| + tree[:name] == 'README.md' + end + } it 'should rename the file with commit' do # Commit message valid expect(commit.message).to eq('Rename readme') + #Only one commit was made + expect(commit_count).to eq(prev_commit_count + 1) + # Previous file was removed - expect(commit.tree.to_a.any? do |tree| - tree[:name] == 'README.md' - end).to be_falsey + expect(previous_blob).to be_falsey # File was renamed - expect(commit.tree.to_a.any? do |tree| - tree[:name] == 'NEWREADME.md' - end).to be_truthy + expect(blob).to be_truthy end end @@ -344,15 +357,18 @@ describe Gitlab::Git::Blob do let!(:commit_sha) { Gitlab::Git::Blob.remove(repository, commit_options) } let!(:commit) { repository.lookup(commit_sha) } + let!(:blob) { + commit.tree.to_a.any? do |tree| + tree[:name] == "README.md" + end + } it 'should remove file with commit' do # Commit message valid expect(commit.message).to eq('Remove readme') # File was removed - expect(commit.tree.to_a.any? do |tree| - tree[:name] == 'README.md' - end).to be_falsey + expect(blob).to be_falsey end end -- GitLab From cfb423fb576590525c4a978bc21cc98917c3334c Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Wed, 6 Jul 2016 10:59:29 +0100 Subject: [PATCH 17/46] changes tabs to spaces on CHANGELOG file --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index faccc8a..79567d5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,6 @@ v 10.3.0 (unreleased) - Remove Repository#format_patch - - Rename a repository file + - Rename a repository file v 10.2.3 - Handle nil blob data -- GitLab From 532164b1469d655da61d897a0a9fcf8c9692d4cd Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Wed, 6 Jul 2016 15:01:53 +0100 Subject: [PATCH 18/46] improves codestyle of test --- spec/blob_spec.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/spec/blob_spec.rb b/spec/blob_spec.rb index 42d6e58..f5f372b 100644 --- a/spec/blob_spec.rb +++ b/spec/blob_spec.rb @@ -299,10 +299,8 @@ describe Gitlab::Git::Blob do end let!(:ref) { commit_options[:commit][:branch] } - let!(:prev_commit_count) { repository.commit_count(ref) } let!(:commit_sha) { Gitlab::Git::Blob.rename(repository, commit_options) } let!(:commit) { repository.lookup(commit_sha) } - let!(:commit_count) { repository.commit_count(ref) } let!(:blob) { commit.tree.to_a.any? do |tree| tree[:name] == 'NEWREADME.md' @@ -319,8 +317,8 @@ describe Gitlab::Git::Blob do # Commit message valid expect(commit.message).to eq('Rename readme') - #Only one commit was made - expect(commit_count).to eq(prev_commit_count + 1) + # Only one commit was made + expect(commit_sha).to change { repository.commit_count(ref) }.by(1) # Previous file was removed expect(previous_blob).to be_falsey -- GitLab From e81f688bbf11bc75d23469c41d5b1573fc30bdec Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Wed, 6 Jul 2016 15:16:33 +0100 Subject: [PATCH 19/46] reverts back to old codestyle for rename test --- spec/blob_spec.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/spec/blob_spec.rb b/spec/blob_spec.rb index f5f372b..42d6e58 100644 --- a/spec/blob_spec.rb +++ b/spec/blob_spec.rb @@ -299,8 +299,10 @@ describe Gitlab::Git::Blob do end let!(:ref) { commit_options[:commit][:branch] } + let!(:prev_commit_count) { repository.commit_count(ref) } let!(:commit_sha) { Gitlab::Git::Blob.rename(repository, commit_options) } let!(:commit) { repository.lookup(commit_sha) } + let!(:commit_count) { repository.commit_count(ref) } let!(:blob) { commit.tree.to_a.any? do |tree| tree[:name] == 'NEWREADME.md' @@ -317,8 +319,8 @@ describe Gitlab::Git::Blob do # Commit message valid expect(commit.message).to eq('Rename readme') - # Only one commit was made - expect(commit_sha).to change { repository.commit_count(ref) }.by(1) + #Only one commit was made + expect(commit_count).to eq(prev_commit_count + 1) # Previous file was removed expect(previous_blob).to be_falsey -- GitLab From a7b5c0511a96824baeb70ebf08f42e820c3a74e1 Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Wed, 6 Jul 2016 16:47:34 +0100 Subject: [PATCH 20/46] fixes issues for MR acceptance --- spec/blob_spec.rb | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/spec/blob_spec.rb b/spec/blob_spec.rb index 42d6e58..7f4bb00 100644 --- a/spec/blob_spec.rb +++ b/spec/blob_spec.rb @@ -300,33 +300,24 @@ describe Gitlab::Git::Blob do let!(:ref) { commit_options[:commit][:branch] } let!(:prev_commit_count) { repository.commit_count(ref) } - let!(:commit_sha) { Gitlab::Git::Blob.rename(repository, commit_options) } - let!(:commit) { repository.lookup(commit_sha) } - let!(:commit_count) { repository.commit_count(ref) } - let!(:blob) { - commit.tree.to_a.any? do |tree| - tree[:name] == 'NEWREADME.md' - end - } - - let!(:previous_blob) { - commit.tree.to_a.any? do |tree| - tree[:name] == 'README.md' - end - } + let(:commit_sha) { Gitlab::Git::Blob.rename(repository, commit_options) } + let(:commit_count) { repository.commit_count(ref) } + let(:commit) { repository.lookup(commit_sha) } + let(:blob) { Gitlab::Git::Blob.find(repository, commit_sha, "NEWREADME.md") } + let(:removed_blob) { Gitlab::Git::Blob.find(repository, commit_sha, "README.md") } it 'should rename the file with commit' do # Commit message valid expect(commit.message).to eq('Rename readme') - #Only one commit was made + # Only one commit was made expect(commit_count).to eq(prev_commit_count + 1) # Previous file was removed - expect(previous_blob).to be_falsey + expect(removed_blob).to be_nil # File was renamed - expect(blob).to be_truthy + expect(blob).not_to be_nil end end @@ -357,11 +348,11 @@ describe Gitlab::Git::Blob do let!(:commit_sha) { Gitlab::Git::Blob.remove(repository, commit_options) } let!(:commit) { repository.lookup(commit_sha) } - let!(:blob) { + let!(:blob) do commit.tree.to_a.any? do |tree| tree[:name] == "README.md" end - } + end it 'should remove file with commit' do # Commit message valid -- GitLab From d0610a397e7a6a95b6984157cfccbc1dfeb5c100 Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Wed, 6 Jul 2016 16:52:38 +0100 Subject: [PATCH 21/46] adds rubocop-rspec gem --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index 038a3e8..5a896d3 100644 --- a/Gemfile +++ b/Gemfile @@ -4,6 +4,7 @@ gemspec group :development do gem 'rubocop' + gem 'rubocop-rspec' '~> 1.5.0' gem 'coveralls', require: false gem 'rspec', '~> 3.0' gem 'rspec-mocks' -- GitLab From 042da0e2b39c5bbb131370c910cf0d037762399d Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Wed, 6 Jul 2016 16:54:50 +0100 Subject: [PATCH 22/46] fixes :remove test for remove action --- spec/blob_spec.rb | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/spec/blob_spec.rb b/spec/blob_spec.rb index 7f4bb00..0af42c9 100644 --- a/spec/blob_spec.rb +++ b/spec/blob_spec.rb @@ -346,20 +346,16 @@ describe Gitlab::Git::Blob do } end - let!(:commit_sha) { Gitlab::Git::Blob.remove(repository, commit_options) } - let!(:commit) { repository.lookup(commit_sha) } - let!(:blob) do - commit.tree.to_a.any? do |tree| - tree[:name] == "README.md" - end - end + let(:commit_sha) { Gitlab::Git::Blob.remove(repository, commit_options) } + let(:commit) { repository.lookup(commit_sha) } + let(:blob) { Gitlab::Git::Blob.find(repository, commit_sha, "README.md") } it 'should remove file with commit' do # Commit message valid expect(commit.message).to eq('Remove readme') # File was removed - expect(blob).to be_falsey + expect(blob).to be_nil end end -- GitLab From acdd03047a01f15ba96ec43727050e371ebb37f2 Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Wed, 6 Jul 2016 16:58:31 +0100 Subject: [PATCH 23/46] fixes missing comma --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 5a896d3..394be07 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ gemspec group :development do gem 'rubocop' - gem 'rubocop-rspec' '~> 1.5.0' + gem 'rubocop-rspec', '~> 1.5.0' gem 'coveralls', require: false gem 'rspec', '~> 3.0' gem 'rspec-mocks' -- GitLab From c491ddf5c6d24405f657bd35bd28bef35414571e Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Mon, 4 Jul 2016 12:19:58 +0100 Subject: [PATCH 24/46] adds rename action to blob.rb --- lib/gitlab_git/.blob.rb.swp | Bin 0 -> 24576 bytes lib/gitlab_git/blob.rb | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 lib/gitlab_git/.blob.rb.swp diff --git a/lib/gitlab_git/.blob.rb.swp b/lib/gitlab_git/.blob.rb.swp new file mode 100644 index 0000000000000000000000000000000000000000..b08749de7612c6e07c1f48b64a9f5c8238e677ec GIT binary patch literal 24576 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 D6{d&6 literal 0 HcmV?d00001 diff --git a/lib/gitlab_git/blob.rb b/lib/gitlab_git/blob.rb index 94c0307..cb220c0 100644 --- a/lib/gitlab_git/blob.rb +++ b/lib/gitlab_git/blob.rb @@ -150,6 +150,14 @@ module Gitlab if action == :remove index.remove(filename) else + if action == :rename + old_path_name = PathHelper.normalize_path(file[:previous_path]) + raise Repository::InvalidBlobName.new("Invalid path") if path_name.each_filename.to_a.include?('..') + + old_filename = old_path_name.to_s + index.remove(old_filename) + end + mode = 0o100644 file_entry = index.get(filename) @@ -207,6 +215,33 @@ module Gitlab def remove(repository, options) commit(repository, options, :remove) end + + + # Rename file from repository and return commit sha + # + # options should contain next structure: + # file: { + # previous_path: 'documents/old_story.txt' + # path: 'documents/story.txt' + # }, + # author: { + # email: 'user@example.com', + # name: 'Test User', + # time: Time.now + # }, + # committer: { + # email: 'user@example.com', + # name: 'Test User', + # time: Time.now + # }, + # commit: { + # message: 'Rename FILENAME', + # branch: 'master' + # } + # + def rename(repository, options) + commit(repository, options, :rename) + end end def initialize(options) -- GitLab From 6c3f789f4fdcb2e1808f7d69f2dc88aa233642dc Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Mon, 4 Jul 2016 12:44:04 +0100 Subject: [PATCH 25/46] fixes accuracy of comments on rename method --- lib/gitlab_git/.blob.rb.swp | Bin 24576 -> 24576 bytes lib/gitlab_git/blob.rb | 2 ++ 2 files changed, 2 insertions(+) diff --git a/lib/gitlab_git/.blob.rb.swp b/lib/gitlab_git/.blob.rb.swp index b08749de7612c6e07c1f48b64a9f5c8238e677ec..02ca93df3597f403f8fc2553d007f24b33b081d1 100644 GIT binary patch delta 283 zcmXBPF-t;W6vpxM)=d$KZU`c@NO=h^qJc`#V1aN$qM*g1F|MnM;-Z6o0wG>-Y6x<2 zix*nEOD)>sQbW5CNRwMZ|LDLE4m|L1PCronK*g{3D&^DUekL!BE%JWSxrllX@dH~m z%(-o{>t6(umH)J1HjkpJHwcTg;NuJqEX+d`;0Z&tafvc=h~RTg<O4H|(M26q`0x<I z%o2IQGe)T45Cuz$l4sdL7(c5b-&o)cub85XD-^Kg{we<cxYKIexe4yIU2@Gv>Cw{Z R)Ru0hcJ*z=HH+g|;uq4_G>ZTL delta 262 zcmXBOze@sf9LDj_x4RSz@p}YEV8e}pa4H6eI;2AW3I`Y4Tf*g5wI!h~Xt6bJYS8ig zPEO~4&>Dfe4f!|ph8}pq1JClzw`#ss?tN+08+d_#B}9t^?Z>;%>)5Sn6`G+o#cW-P z<gEWSG*07GJuTBB3yjf40T;0Fof6sL9j};R03RM)9F9d27_6|w3;J+zf(-Vy$QsX> vVTuP^DsoF{qJc8<aG;U!HNp&4XymLoZYlFK{5mopH#_wfjV{e^=j{9sem5$1 diff --git a/lib/gitlab_git/blob.rb b/lib/gitlab_git/blob.rb index cb220c0..390bfb6 100644 --- a/lib/gitlab_git/blob.rb +++ b/lib/gitlab_git/blob.rb @@ -223,6 +223,8 @@ module Gitlab # file: { # previous_path: 'documents/old_story.txt' # path: 'documents/story.txt' + # content: 'Lorem ipsum...', + # update: true # }, # author: { # email: 'user@example.com', -- GitLab From e7b994a7371baa47784516ded733e537d7b5a8ba Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Mon, 4 Jul 2016 14:36:22 +0100 Subject: [PATCH 26/46] fixes bug regarding old_path_name in blob.rb's commit method --- lib/gitlab_git/blob.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gitlab_git/blob.rb b/lib/gitlab_git/blob.rb index 390bfb6..c6a902c 100644 --- a/lib/gitlab_git/blob.rb +++ b/lib/gitlab_git/blob.rb @@ -152,7 +152,7 @@ module Gitlab else if action == :rename old_path_name = PathHelper.normalize_path(file[:previous_path]) - raise Repository::InvalidBlobName.new("Invalid path") if path_name.each_filename.to_a.include?('..') + raise Repository::InvalidBlobName.new("Invalid path") if old_path_name.each_filename.to_a.include?('..') old_filename = old_path_name.to_s index.remove(old_filename) -- GitLab From a8cf154a5e34f8bd89923f54761ed82830a59008 Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Tue, 5 Jul 2016 10:38:09 +0100 Subject: [PATCH 27/46] removes .swp file --- lib/gitlab_git/.blob.rb.swp | Bin 24576 -> 0 bytes lib/gitlab_git/blob.rb | 2 -- 2 files changed, 2 deletions(-) delete mode 100644 lib/gitlab_git/.blob.rb.swp diff --git a/lib/gitlab_git/.blob.rb.swp b/lib/gitlab_git/.blob.rb.swp deleted file mode 100644 index 02ca93df3597f403f8fc2553d007f24b33b081d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24576 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 TO!G~q#QXUq(+nWVHS50s-n_1q diff --git a/lib/gitlab_git/blob.rb b/lib/gitlab_git/blob.rb index c6a902c..52d1138 100644 --- a/lib/gitlab_git/blob.rb +++ b/lib/gitlab_git/blob.rb @@ -152,8 +152,6 @@ module Gitlab else if action == :rename old_path_name = PathHelper.normalize_path(file[:previous_path]) - raise Repository::InvalidBlobName.new("Invalid path") if old_path_name.each_filename.to_a.include?('..') - old_filename = old_path_name.to_s index.remove(old_filename) end -- GitLab From 3b846c2d2e18a8c218088df29c3b4fde52b1fb5f Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Tue, 5 Jul 2016 11:23:23 +0100 Subject: [PATCH 28/46] adds tests for renaming a file --- spec/.blob_snippet_spec.rb.swp | Bin 0 -> 12288 bytes spec/.blob_spec.rb.swp | Bin 0 -> 28672 bytes spec/.spec_helper.rb.swp | Bin 0 -> 12288 bytes spec/blob_spec.rb | 48 +++++++++++++++++++++++++++++++++ 4 files changed, 48 insertions(+) create mode 100644 spec/.blob_snippet_spec.rb.swp create mode 100644 spec/.blob_spec.rb.swp create mode 100644 spec/.spec_helper.rb.swp diff --git a/spec/.blob_snippet_spec.rb.swp b/spec/.blob_snippet_spec.rb.swp new file mode 100644 index 0000000000000000000000000000000000000000..ddfee16af275096b2c18d97b3a746bd6d8f4ad99 GIT binary patch literal 12288 zcmeI2&uY|A6vl50ZiK4X7dVZJ%)m_28HLv1Y8DlRf?%r)m5@J&nLy^=G`VG}qV0?L z4B|WZ0Iqc9Bj^(-cy1@--xdq5D&K`KC%HNI%elX-LQcB=;LbK}1UHn7D@t7)J$txy z^Y!xEHKlBkjEzo><#J-&{Zq#F=w3hP{*FuU4}&t%CnvuA#V~B@EWBOVGD*Ynafl^^ zO~qN5mL`oGT~rm@*v$lWda@^GK>!5KN?=7@9}d=C_BC&fR<G`!bs_RV00ck)1V8`; zKmY_l00jO60=8OGhq905b}y@KT>34xmk1yL0w4eaAOHd&00JNY0w4eaAOHgAkU)|v z^=?I}%}Y|e{QqBk|9`%$)F;sg(R<Mw(JRrBXeb(pE{ML$x-X)Sq9f6v=&ooax+QYH z8zKx4009sH0T2KI5C8!X009sHf%8d#b*_l!#~+cXu=JexKw7qKr)}U4^28?Hz#8Jc zjyE&2$9lS-O}s9>P~zc6$+i=<>0L3Hw}nTM#3&j`Gx+^^FL<DN*72uFW4ZQw^vD-C ziN5pmpY&)T=Q1VT;=Xft)|t_k4=njr%?)cyWudw8DL3<nFShWP(o>FgQT}tq;?bkU z;g1q|TG^*R6-bnGlhsAa6gh~l=<hS9F*@E^&3pSr&E&b}`FO%*#kD70zw*X1lNWj% L(eBPxe^Y$}9_PtW literal 0 HcmV?d00001 diff --git a/spec/.blob_spec.rb.swp b/spec/.blob_spec.rb.swp new file mode 100644 index 0000000000000000000000000000000000000000..55948ef86f930d92ca44f0f38400a5a9ba0df0cd GIT binary patch literal 28672 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 literal 0 HcmV?d00001 diff --git a/spec/.spec_helper.rb.swp b/spec/.spec_helper.rb.swp new file mode 100644 index 0000000000000000000000000000000000000000..1246342965bda0d19fc0e816501ebebf323977e9 GIT binary patch literal 12288 zcmeI2PmkL~6u_rFfK(_TK%xf@v&+F7(Kzi=6%lC<*^=$9lx(8>Sq^9!jqR6Ys<Fq6 z$0>p3&xtDs1QL7(1SdWK2*GDS9QXoAd;mD`Y=`{=+a*14sPruTGP2*B@tfb+k)lj+ z<6y7LU-fS>Jf30f%J#c&^j`bs@(*i_IVGni35)|hGe!IXM|ZnlkDxv(((9YPmdW{v zADkJmk=d|uS2-<%#<Xk%HjONWu>24+&?#8o2Ir4PSIGbwcsK)B*(;kjZxnrAT3_SO zJv)B5?vzai$N(8217v^<kO4A42FSo8ZNR0M*oQcS%gb53ylgN1qg|d-Lk7qI86X2> zfDDiUGC&5%02v?yWPl7jf(B&7*u5)^Z9aj;<NyDE|Nj5|X~up=enP%SzCyl4K1V)7 zK0++=7IKK(MxIB0dy28|kS`F6bPx}D9C-}+<tmPee2aX72xJ|35xIuEfc*F*V;>_e z<WH>Y59C+mYvfa8fgB>Yk)rOK2pwdA43GgbKnBPF86X2>;QuiINyIo0O)^naKY)p` zu+fxS*Z6xJk}S6%GJq)K@1LZpB-D8Xe29VFa$D<3%-9Gl-{PK?Nn~R0Br;LjffY7S zcynUHJUa>DHG%gO_h*m@n1fxonM$Uj>H-mt=WGsaFvRV&epM`1#v{Xzs<R`;M(yE9 zbjPFCcBd@{?S4=6Tccg<x}!As_l!z5hU0#}HyD+H>wG=VoeVV8Eu_ZB-MZ_wYLNZj zpxf%KHb!DxJ&^X_gRD}4SM3z8V^epKxuOWK#!i=crv7p!@J@<qMJnBFqr4C)o5&b8 zgxJ}`sf$|eI`@3Pk>zP>Y%w6KR=N7*T!t=}+LyVT87qpud~2&*%>kNdHt(1?R<7A> zjYqq^f!G;$I%2=oZR3I+ca9;;<n#d@yY1nyb@xoZ!bLpq9(%8!8kMhY@kD975=$4( z%Jr>^J*w8e+3Xepu$dphL?ytR0f@QODiUE?HTJ=uYVdZh@X58HrBid@-qJ;*SZeR0 zcpfZ7piOX5QlO^GyIqu}W#(2$n<%?d9wecOikG6A=S6phICYB^^8S0I;?-a7T=$N( z;=5gLYgaBiu7Z21U7R|r9_(TZJoc-eyP=9x4R_4k&z!Ul7kRl%xH@GhG;@!E&HzK0 k1{S{(GXFkEyLLJm)2fii)P%S958m`fgVw>`&^u&*0gcb<CIA2c literal 0 HcmV?d00001 diff --git a/spec/blob_spec.rb b/spec/blob_spec.rb index 6998ea3..969d058 100644 --- a/spec/blob_spec.rb +++ b/spec/blob_spec.rb @@ -270,6 +270,54 @@ describe Gitlab::Git::Blob do end end + describe :rename do + let(:repository) { Gitlab::Git::Repository.new(TEST_NORMAL_REPO_PATH) } + + let(:commit_options) do + options = { + file: { + path: 'NEWREADME.md', + previous_path: 'README.md', + content: 'Lorem ipsum...', + update: true + }, + author: { + email: 'user@example.com', + name: 'Test User', + time: Time.now + }, + committer: { + email: 'user@example.com', + name: 'Test User', + time: Time.now + }, + commit: { + message: 'Rename readme', + branch: 'master' + } + } + end + + let!(:commit_sha) { Gitlab::Git::Blob.rename(repository, commit_options) } + let!(:commit) { repository.lookup(commit_sha) } + + it 'should rename the file with commit' do + # Commit message valid + expect(commit.message).to eq('Rename readme') + + # Previous file was removed + expect(commit.tree.to_a.any? do |tree| + tree[:name] == 'README.md' + end).to be_falsey + + # File was renamed + expect(commit.tree.to_a.any? do |tree| + tree[:name] == 'NEWREADME.md' + end).to be_truthy + + end + end + describe :remove do let(:repository) { Gitlab::Git::Repository.new(TEST_REPO_PATH) } -- GitLab From 842bdbcfb2b71cc86ed5453a6dd91f31ab6cc74b Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Tue, 5 Jul 2016 12:11:28 +0100 Subject: [PATCH 29/46] removes swp files --- spec/.blob_snippet_spec.rb.swp | Bin 12288 -> 0 bytes spec/.blob_spec.rb.swp | Bin 28672 -> 0 bytes spec/.spec_helper.rb.swp | Bin 12288 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 spec/.blob_snippet_spec.rb.swp delete mode 100644 spec/.blob_spec.rb.swp delete mode 100644 spec/.spec_helper.rb.swp diff --git a/spec/.blob_snippet_spec.rb.swp b/spec/.blob_snippet_spec.rb.swp deleted file mode 100644 index ddfee16af275096b2c18d97b3a746bd6d8f4ad99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2&uY|A6vl50ZiK4X7dVZJ%)m_28HLv1Y8DlRf?%r)m5@J&nLy^=G`VG}qV0?L z4B|WZ0Iqc9Bj^(-cy1@--xdq5D&K`KC%HNI%elX-LQcB=;LbK}1UHn7D@t7)J$txy z^Y!xEHKlBkjEzo><#J-&{Zq#F=w3hP{*FuU4}&t%CnvuA#V~B@EWBOVGD*Ynafl^^ zO~qN5mL`oGT~rm@*v$lWda@^GK>!5KN?=7@9}d=C_BC&fR<G`!bs_RV00ck)1V8`; zKmY_l00jO60=8OGhq905b}y@KT>34xmk1yL0w4eaAOHd&00JNY0w4eaAOHgAkU)|v z^=?I}%}Y|e{QqBk|9`%$)F;sg(R<Mw(JRrBXeb(pE{ML$x-X)Sq9f6v=&ooax+QYH z8zKx4009sH0T2KI5C8!X009sHf%8d#b*_l!#~+cXu=JexKw7qKr)}U4^28?Hz#8Jc zjyE&2$9lS-O}s9>P~zc6$+i=<>0L3Hw}nTM#3&j`Gx+^^FL<DN*72uFW4ZQw^vD-C ziN5pmpY&)T=Q1VT;=Xft)|t_k4=njr%?)cyWudw8DL3<nFShWP(o>FgQT}tq;?bkU z;g1q|TG^*R6-bnGlhsAa6gh~l=<hS9F*@E^&3pSr&E&b}`FO%*#kD70zw*X1lNWj% L(eBPxe^Y$}9_PtW diff --git a/spec/.blob_spec.rb.swp b/spec/.blob_spec.rb.swp deleted file mode 100644 index 55948ef86f930d92ca44f0f38400a5a9ba0df0cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28672 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 diff --git a/spec/.spec_helper.rb.swp b/spec/.spec_helper.rb.swp deleted file mode 100644 index 1246342965bda0d19fc0e816501ebebf323977e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2PmkL~6u_rFfK(_TK%xf@v&+F7(Kzi=6%lC<*^=$9lx(8>Sq^9!jqR6Ys<Fq6 z$0>p3&xtDs1QL7(1SdWK2*GDS9QXoAd;mD`Y=`{=+a*14sPruTGP2*B@tfb+k)lj+ z<6y7LU-fS>Jf30f%J#c&^j`bs@(*i_IVGni35)|hGe!IXM|ZnlkDxv(((9YPmdW{v zADkJmk=d|uS2-<%#<Xk%HjONWu>24+&?#8o2Ir4PSIGbwcsK)B*(;kjZxnrAT3_SO zJv)B5?vzai$N(8217v^<kO4A42FSo8ZNR0M*oQcS%gb53ylgN1qg|d-Lk7qI86X2> zfDDiUGC&5%02v?yWPl7jf(B&7*u5)^Z9aj;<NyDE|Nj5|X~up=enP%SzCyl4K1V)7 zK0++=7IKK(MxIB0dy28|kS`F6bPx}D9C-}+<tmPee2aX72xJ|35xIuEfc*F*V;>_e z<WH>Y59C+mYvfa8fgB>Yk)rOK2pwdA43GgbKnBPF86X2>;QuiINyIo0O)^naKY)p` zu+fxS*Z6xJk}S6%GJq)K@1LZpB-D8Xe29VFa$D<3%-9Gl-{PK?Nn~R0Br;LjffY7S zcynUHJUa>DHG%gO_h*m@n1fxonM$Uj>H-mt=WGsaFvRV&epM`1#v{Xzs<R`;M(yE9 zbjPFCcBd@{?S4=6Tccg<x}!As_l!z5hU0#}HyD+H>wG=VoeVV8Eu_ZB-MZ_wYLNZj zpxf%KHb!DxJ&^X_gRD}4SM3z8V^epKxuOWK#!i=crv7p!@J@<qMJnBFqr4C)o5&b8 zgxJ}`sf$|eI`@3Pk>zP>Y%w6KR=N7*T!t=}+LyVT87qpud~2&*%>kNdHt(1?R<7A> zjYqq^f!G;$I%2=oZR3I+ca9;;<n#d@yY1nyb@xoZ!bLpq9(%8!8kMhY@kD975=$4( z%Jr>^J*w8e+3Xepu$dphL?ytR0f@QODiUE?HTJ=uYVdZh@X58HrBid@-qJ;*SZeR0 zcpfZ7piOX5QlO^GyIqu}W#(2$n<%?d9wecOikG6A=S6phICYB^^8S0I;?-a7T=$N( z;=5gLYgaBiu7Z21U7R|r9_(TZJoc-eyP=9x4R_4k&z!Ul7kRl%xH@GhG;@!E&HzK0 k1{S{(GXFkEyLLJm)2fii)P%S958m`fgVw>`&^u&*0gcb<CIA2c -- GitLab From 7022a6d0d019114abec393f434256548a01a529e Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Tue, 5 Jul 2016 12:12:18 +0100 Subject: [PATCH 30/46] removes redundant empty line --- spec/.blob_spec.rb.swp | Bin 0 -> 24576 bytes spec/blob_spec.rb | 1 - 2 files changed, 1 deletion(-) create mode 100644 spec/.blob_spec.rb.swp diff --git a/spec/.blob_spec.rb.swp b/spec/.blob_spec.rb.swp new file mode 100644 index 0000000000000000000000000000000000000000..18e1c7e9ced827d737cf8ae4a2790989f9456be1 GIT binary patch literal 24576 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 a4?L1yO1U-0iF+k=BaZEk;U&*a(*FWE^rH&^ literal 0 HcmV?d00001 diff --git a/spec/blob_spec.rb b/spec/blob_spec.rb index 969d058..0d89582 100644 --- a/spec/blob_spec.rb +++ b/spec/blob_spec.rb @@ -314,7 +314,6 @@ describe Gitlab::Git::Blob do expect(commit.tree.to_a.any? do |tree| tree[:name] == 'NEWREADME.md' end).to be_truthy - end end -- GitLab From 01088c8747a9b05567e11afcf14b5414d055463f Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Mon, 4 Jul 2016 12:19:58 +0100 Subject: [PATCH 31/46] adds rename action to blob.rb --- lib/gitlab_git/.blob.rb.swp | Bin 0 -> 24576 bytes lib/gitlab_git/blob.rb | 3 +++ 2 files changed, 3 insertions(+) create mode 100644 lib/gitlab_git/.blob.rb.swp diff --git a/lib/gitlab_git/.blob.rb.swp b/lib/gitlab_git/.blob.rb.swp new file mode 100644 index 0000000000000000000000000000000000000000..b08749de7612c6e07c1f48b64a9f5c8238e677ec GIT binary patch literal 24576 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 D6{d&6 literal 0 HcmV?d00001 diff --git a/lib/gitlab_git/blob.rb b/lib/gitlab_git/blob.rb index 52d1138..644f8cd 100644 --- a/lib/gitlab_git/blob.rb +++ b/lib/gitlab_git/blob.rb @@ -221,8 +221,11 @@ module Gitlab # file: { # previous_path: 'documents/old_story.txt' # path: 'documents/story.txt' +<<<<<<< 7022a6d0d019114abec393f434256548a01a529e # content: 'Lorem ipsum...', # update: true +======= +>>>>>>> adds rename action to blob.rb # }, # author: { # email: 'user@example.com', -- GitLab From 29745d85e955d9fe42dbe0d91c2f0af3c8d5e22f Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Mon, 4 Jul 2016 12:44:04 +0100 Subject: [PATCH 32/46] fixes accuracy of comments on rename method --- lib/gitlab_git/.blob.rb.swp | Bin 24576 -> 24576 bytes lib/gitlab_git/blob.rb | 3 --- 2 files changed, 3 deletions(-) diff --git a/lib/gitlab_git/.blob.rb.swp b/lib/gitlab_git/.blob.rb.swp index b08749de7612c6e07c1f48b64a9f5c8238e677ec..02ca93df3597f403f8fc2553d007f24b33b081d1 100644 GIT binary patch delta 283 zcmXBPF-t;W6vpxM)=d$KZU`c@NO=h^qJc`#V1aN$qM*g1F|MnM;-Z6o0wG>-Y6x<2 zix*nEOD)>sQbW5CNRwMZ|LDLE4m|L1PCronK*g{3D&^DUekL!BE%JWSxrllX@dH~m z%(-o{>t6(umH)J1HjkpJHwcTg;NuJqEX+d`;0Z&tafvc=h~RTg<O4H|(M26q`0x<I z%o2IQGe)T45Cuz$l4sdL7(c5b-&o)cub85XD-^Kg{we<cxYKIexe4yIU2@Gv>Cw{Z R)Ru0hcJ*z=HH+g|;uq4_G>ZTL delta 262 zcmXBOze@sf9LDj_x4RSz@p}YEV8e}pa4H6eI;2AW3I`Y4Tf*g5wI!h~Xt6bJYS8ig zPEO~4&>Dfe4f!|ph8}pq1JClzw`#ss?tN+08+d_#B}9t^?Z>;%>)5Sn6`G+o#cW-P z<gEWSG*07GJuTBB3yjf40T;0Fof6sL9j};R03RM)9F9d27_6|w3;J+zf(-Vy$QsX> vVTuP^DsoF{qJc8<aG;U!HNp&4XymLoZYlFK{5mopH#_wfjV{e^=j{9sem5$1 diff --git a/lib/gitlab_git/blob.rb b/lib/gitlab_git/blob.rb index 644f8cd..52d1138 100644 --- a/lib/gitlab_git/blob.rb +++ b/lib/gitlab_git/blob.rb @@ -221,11 +221,8 @@ module Gitlab # file: { # previous_path: 'documents/old_story.txt' # path: 'documents/story.txt' -<<<<<<< 7022a6d0d019114abec393f434256548a01a529e # content: 'Lorem ipsum...', # update: true -======= ->>>>>>> adds rename action to blob.rb # }, # author: { # email: 'user@example.com', -- GitLab From ed2627568ca7a3ce36285f069eb9d8591da7cd5c Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Mon, 4 Jul 2016 14:36:22 +0100 Subject: [PATCH 33/46] fixes bug regarding old_path_name in blob.rb's commit method --- lib/gitlab_git/blob.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/gitlab_git/blob.rb b/lib/gitlab_git/blob.rb index 52d1138..aa2fe6f 100644 --- a/lib/gitlab_git/blob.rb +++ b/lib/gitlab_git/blob.rb @@ -152,6 +152,7 @@ module Gitlab else if action == :rename old_path_name = PathHelper.normalize_path(file[:previous_path]) + old_filename = old_path_name.to_s index.remove(old_filename) end -- GitLab From 4330c3e79d9c37ba507d121195f7b3fe4b3300c4 Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Tue, 5 Jul 2016 10:38:09 +0100 Subject: [PATCH 34/46] removes .swp file --- lib/gitlab_git/.blob.rb.swp | Bin 24576 -> 0 bytes lib/gitlab_git/blob.rb | 1 - 2 files changed, 1 deletion(-) delete mode 100644 lib/gitlab_git/.blob.rb.swp diff --git a/lib/gitlab_git/.blob.rb.swp b/lib/gitlab_git/.blob.rb.swp deleted file mode 100644 index 02ca93df3597f403f8fc2553d007f24b33b081d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24576 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 TO!G~q#QXUq(+nWVHS50s-n_1q diff --git a/lib/gitlab_git/blob.rb b/lib/gitlab_git/blob.rb index aa2fe6f..52d1138 100644 --- a/lib/gitlab_git/blob.rb +++ b/lib/gitlab_git/blob.rb @@ -152,7 +152,6 @@ module Gitlab else if action == :rename old_path_name = PathHelper.normalize_path(file[:previous_path]) - old_filename = old_path_name.to_s index.remove(old_filename) end -- GitLab From b9f569c919d3d25527b8a28cb48927b72f3266b0 Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Tue, 5 Jul 2016 11:23:23 +0100 Subject: [PATCH 35/46] adds tests for renaming a file --- spec/.blob_snippet_spec.rb.swp | Bin 0 -> 12288 bytes spec/.spec_helper.rb.swp | Bin 0 -> 12288 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 spec/.blob_snippet_spec.rb.swp create mode 100644 spec/.spec_helper.rb.swp diff --git a/spec/.blob_snippet_spec.rb.swp b/spec/.blob_snippet_spec.rb.swp new file mode 100644 index 0000000000000000000000000000000000000000..ddfee16af275096b2c18d97b3a746bd6d8f4ad99 GIT binary patch literal 12288 zcmeI2&uY|A6vl50ZiK4X7dVZJ%)m_28HLv1Y8DlRf?%r)m5@J&nLy^=G`VG}qV0?L z4B|WZ0Iqc9Bj^(-cy1@--xdq5D&K`KC%HNI%elX-LQcB=;LbK}1UHn7D@t7)J$txy z^Y!xEHKlBkjEzo><#J-&{Zq#F=w3hP{*FuU4}&t%CnvuA#V~B@EWBOVGD*Ynafl^^ zO~qN5mL`oGT~rm@*v$lWda@^GK>!5KN?=7@9}d=C_BC&fR<G`!bs_RV00ck)1V8`; zKmY_l00jO60=8OGhq905b}y@KT>34xmk1yL0w4eaAOHd&00JNY0w4eaAOHgAkU)|v z^=?I}%}Y|e{QqBk|9`%$)F;sg(R<Mw(JRrBXeb(pE{ML$x-X)Sq9f6v=&ooax+QYH z8zKx4009sH0T2KI5C8!X009sHf%8d#b*_l!#~+cXu=JexKw7qKr)}U4^28?Hz#8Jc zjyE&2$9lS-O}s9>P~zc6$+i=<>0L3Hw}nTM#3&j`Gx+^^FL<DN*72uFW4ZQw^vD-C ziN5pmpY&)T=Q1VT;=Xft)|t_k4=njr%?)cyWudw8DL3<nFShWP(o>FgQT}tq;?bkU z;g1q|TG^*R6-bnGlhsAa6gh~l=<hS9F*@E^&3pSr&E&b}`FO%*#kD70zw*X1lNWj% L(eBPxe^Y$}9_PtW literal 0 HcmV?d00001 diff --git a/spec/.spec_helper.rb.swp b/spec/.spec_helper.rb.swp new file mode 100644 index 0000000000000000000000000000000000000000..1246342965bda0d19fc0e816501ebebf323977e9 GIT binary patch literal 12288 zcmeI2PmkL~6u_rFfK(_TK%xf@v&+F7(Kzi=6%lC<*^=$9lx(8>Sq^9!jqR6Ys<Fq6 z$0>p3&xtDs1QL7(1SdWK2*GDS9QXoAd;mD`Y=`{=+a*14sPruTGP2*B@tfb+k)lj+ z<6y7LU-fS>Jf30f%J#c&^j`bs@(*i_IVGni35)|hGe!IXM|ZnlkDxv(((9YPmdW{v zADkJmk=d|uS2-<%#<Xk%HjONWu>24+&?#8o2Ir4PSIGbwcsK)B*(;kjZxnrAT3_SO zJv)B5?vzai$N(8217v^<kO4A42FSo8ZNR0M*oQcS%gb53ylgN1qg|d-Lk7qI86X2> zfDDiUGC&5%02v?yWPl7jf(B&7*u5)^Z9aj;<NyDE|Nj5|X~up=enP%SzCyl4K1V)7 zK0++=7IKK(MxIB0dy28|kS`F6bPx}D9C-}+<tmPee2aX72xJ|35xIuEfc*F*V;>_e z<WH>Y59C+mYvfa8fgB>Yk)rOK2pwdA43GgbKnBPF86X2>;QuiINyIo0O)^naKY)p` zu+fxS*Z6xJk}S6%GJq)K@1LZpB-D8Xe29VFa$D<3%-9Gl-{PK?Nn~R0Br;LjffY7S zcynUHJUa>DHG%gO_h*m@n1fxonM$Uj>H-mt=WGsaFvRV&epM`1#v{Xzs<R`;M(yE9 zbjPFCcBd@{?S4=6Tccg<x}!As_l!z5hU0#}HyD+H>wG=VoeVV8Eu_ZB-MZ_wYLNZj zpxf%KHb!DxJ&^X_gRD}4SM3z8V^epKxuOWK#!i=crv7p!@J@<qMJnBFqr4C)o5&b8 zgxJ}`sf$|eI`@3Pk>zP>Y%w6KR=N7*T!t=}+LyVT87qpud~2&*%>kNdHt(1?R<7A> zjYqq^f!G;$I%2=oZR3I+ca9;;<n#d@yY1nyb@xoZ!bLpq9(%8!8kMhY@kD975=$4( z%Jr>^J*w8e+3Xepu$dphL?ytR0f@QODiUE?HTJ=uYVdZh@X58HrBid@-qJ;*SZeR0 zcpfZ7piOX5QlO^GyIqu}W#(2$n<%?d9wecOikG6A=S6phICYB^^8S0I;?-a7T=$N( z;=5gLYgaBiu7Z21U7R|r9_(TZJoc-eyP=9x4R_4k&z!Ul7kRl%xH@GhG;@!E&HzK0 k1{S{(GXFkEyLLJm)2fii)P%S958m`fgVw>`&^u&*0gcb<CIA2c literal 0 HcmV?d00001 -- GitLab From 849b1c114ff2b1c48441c8f7b07df5bf552f1cc6 Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Tue, 5 Jul 2016 12:11:28 +0100 Subject: [PATCH 36/46] removes swp files --- spec/.blob_snippet_spec.rb.swp | Bin 12288 -> 0 bytes spec/.blob_spec.rb.swp | Bin 24576 -> 0 bytes spec/.spec_helper.rb.swp | Bin 12288 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 spec/.blob_snippet_spec.rb.swp delete mode 100644 spec/.blob_spec.rb.swp delete mode 100644 spec/.spec_helper.rb.swp diff --git a/spec/.blob_snippet_spec.rb.swp b/spec/.blob_snippet_spec.rb.swp deleted file mode 100644 index ddfee16af275096b2c18d97b3a746bd6d8f4ad99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2&uY|A6vl50ZiK4X7dVZJ%)m_28HLv1Y8DlRf?%r)m5@J&nLy^=G`VG}qV0?L z4B|WZ0Iqc9Bj^(-cy1@--xdq5D&K`KC%HNI%elX-LQcB=;LbK}1UHn7D@t7)J$txy z^Y!xEHKlBkjEzo><#J-&{Zq#F=w3hP{*FuU4}&t%CnvuA#V~B@EWBOVGD*Ynafl^^ zO~qN5mL`oGT~rm@*v$lWda@^GK>!5KN?=7@9}d=C_BC&fR<G`!bs_RV00ck)1V8`; zKmY_l00jO60=8OGhq905b}y@KT>34xmk1yL0w4eaAOHd&00JNY0w4eaAOHgAkU)|v z^=?I}%}Y|e{QqBk|9`%$)F;sg(R<Mw(JRrBXeb(pE{ML$x-X)Sq9f6v=&ooax+QYH z8zKx4009sH0T2KI5C8!X009sHf%8d#b*_l!#~+cXu=JexKw7qKr)}U4^28?Hz#8Jc zjyE&2$9lS-O}s9>P~zc6$+i=<>0L3Hw}nTM#3&j`Gx+^^FL<DN*72uFW4ZQw^vD-C ziN5pmpY&)T=Q1VT;=Xft)|t_k4=njr%?)cyWudw8DL3<nFShWP(o>FgQT}tq;?bkU z;g1q|TG^*R6-bnGlhsAa6gh~l=<hS9F*@E^&3pSr&E&b}`FO%*#kD70zw*X1lNWj% L(eBPxe^Y$}9_PtW diff --git a/spec/.blob_spec.rb.swp b/spec/.blob_spec.rb.swp deleted file mode 100644 index 18e1c7e9ced827d737cf8ae4a2790989f9456be1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24576 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 a4?L1yO1U-0iF+k=BaZEk;U&*a(*FWE^rH&^ diff --git a/spec/.spec_helper.rb.swp b/spec/.spec_helper.rb.swp deleted file mode 100644 index 1246342965bda0d19fc0e816501ebebf323977e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2PmkL~6u_rFfK(_TK%xf@v&+F7(Kzi=6%lC<*^=$9lx(8>Sq^9!jqR6Ys<Fq6 z$0>p3&xtDs1QL7(1SdWK2*GDS9QXoAd;mD`Y=`{=+a*14sPruTGP2*B@tfb+k)lj+ z<6y7LU-fS>Jf30f%J#c&^j`bs@(*i_IVGni35)|hGe!IXM|ZnlkDxv(((9YPmdW{v zADkJmk=d|uS2-<%#<Xk%HjONWu>24+&?#8o2Ir4PSIGbwcsK)B*(;kjZxnrAT3_SO zJv)B5?vzai$N(8217v^<kO4A42FSo8ZNR0M*oQcS%gb53ylgN1qg|d-Lk7qI86X2> zfDDiUGC&5%02v?yWPl7jf(B&7*u5)^Z9aj;<NyDE|Nj5|X~up=enP%SzCyl4K1V)7 zK0++=7IKK(MxIB0dy28|kS`F6bPx}D9C-}+<tmPee2aX72xJ|35xIuEfc*F*V;>_e z<WH>Y59C+mYvfa8fgB>Yk)rOK2pwdA43GgbKnBPF86X2>;QuiINyIo0O)^naKY)p` zu+fxS*Z6xJk}S6%GJq)K@1LZpB-D8Xe29VFa$D<3%-9Gl-{PK?Nn~R0Br;LjffY7S zcynUHJUa>DHG%gO_h*m@n1fxonM$Uj>H-mt=WGsaFvRV&epM`1#v{Xzs<R`;M(yE9 zbjPFCcBd@{?S4=6Tccg<x}!As_l!z5hU0#}HyD+H>wG=VoeVV8Eu_ZB-MZ_wYLNZj zpxf%KHb!DxJ&^X_gRD}4SM3z8V^epKxuOWK#!i=crv7p!@J@<qMJnBFqr4C)o5&b8 zgxJ}`sf$|eI`@3Pk>zP>Y%w6KR=N7*T!t=}+LyVT87qpud~2&*%>kNdHt(1?R<7A> zjYqq^f!G;$I%2=oZR3I+ca9;;<n#d@yY1nyb@xoZ!bLpq9(%8!8kMhY@kD975=$4( z%Jr>^J*w8e+3Xepu$dphL?ytR0f@QODiUE?HTJ=uYVdZh@X58HrBid@-qJ;*SZeR0 zcpfZ7piOX5QlO^GyIqu}W#(2$n<%?d9wecOikG6A=S6phICYB^^8S0I;?-a7T=$N( z;=5gLYgaBiu7Z21U7R|r9_(TZJoc-eyP=9x4R_4k&z!Ul7kRl%xH@GhG;@!E&HzK0 k1{S{(GXFkEyLLJm)2fii)P%S958m`fgVw>`&^u&*0gcb<CIA2c -- GitLab From 57ddb1a3c86939db130150f951aec1e893f4bdb5 Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Tue, 5 Jul 2016 12:12:18 +0100 Subject: [PATCH 37/46] removes redundant empty line --- spec/.blob_spec.rb.swp | Bin 0 -> 24576 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 spec/.blob_spec.rb.swp diff --git a/spec/.blob_spec.rb.swp b/spec/.blob_spec.rb.swp new file mode 100644 index 0000000000000000000000000000000000000000..18e1c7e9ced827d737cf8ae4a2790989f9456be1 GIT binary patch literal 24576 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 a4?L1yO1U-0iF+k=BaZEk;U&*a(*FWE^rH&^ literal 0 HcmV?d00001 -- GitLab From ac07a9c40f216b3f9afbd9fddb65fd17a1739a00 Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Tue, 5 Jul 2016 15:02:21 +0100 Subject: [PATCH 38/46] removes .swp file --- spec/.blob_spec.rb.swp | Bin 24576 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 spec/.blob_spec.rb.swp diff --git a/spec/.blob_spec.rb.swp b/spec/.blob_spec.rb.swp deleted file mode 100644 index 18e1c7e9ced827d737cf8ae4a2790989f9456be1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24576 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 a4?L1yO1U-0iF+k=BaZEk;U&*a(*FWE^rH&^ -- GitLab From 4701bcfa3f3c826dd69e53dca2d69a79574aa7a2 Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Wed, 6 Jul 2016 10:58:16 +0100 Subject: [PATCH 39/46] adds new test for rename method and refactors code for the test --- CHANGELOG | 1 + spec/blob_spec.rb | 34 +++++++++++++++++++++++++--------- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index aa14f49..0e28697 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ v 10.3.0 (unreleased) - Remove Repository#format_patch - Remove Repository#add_tag + - Rename a repository file v 10.2.3 - Handle nil blob data diff --git a/spec/blob_spec.rb b/spec/blob_spec.rb index 0d89582..42d6e58 100644 --- a/spec/blob_spec.rb +++ b/spec/blob_spec.rb @@ -298,22 +298,35 @@ describe Gitlab::Git::Blob do } end + let!(:ref) { commit_options[:commit][:branch] } + let!(:prev_commit_count) { repository.commit_count(ref) } let!(:commit_sha) { Gitlab::Git::Blob.rename(repository, commit_options) } let!(:commit) { repository.lookup(commit_sha) } + let!(:commit_count) { repository.commit_count(ref) } + let!(:blob) { + commit.tree.to_a.any? do |tree| + tree[:name] == 'NEWREADME.md' + end + } + + let!(:previous_blob) { + commit.tree.to_a.any? do |tree| + tree[:name] == 'README.md' + end + } it 'should rename the file with commit' do # Commit message valid expect(commit.message).to eq('Rename readme') + #Only one commit was made + expect(commit_count).to eq(prev_commit_count + 1) + # Previous file was removed - expect(commit.tree.to_a.any? do |tree| - tree[:name] == 'README.md' - end).to be_falsey + expect(previous_blob).to be_falsey # File was renamed - expect(commit.tree.to_a.any? do |tree| - tree[:name] == 'NEWREADME.md' - end).to be_truthy + expect(blob).to be_truthy end end @@ -344,15 +357,18 @@ describe Gitlab::Git::Blob do let!(:commit_sha) { Gitlab::Git::Blob.remove(repository, commit_options) } let!(:commit) { repository.lookup(commit_sha) } + let!(:blob) { + commit.tree.to_a.any? do |tree| + tree[:name] == "README.md" + end + } it 'should remove file with commit' do # Commit message valid expect(commit.message).to eq('Remove readme') # File was removed - expect(commit.tree.to_a.any? do |tree| - tree[:name] == 'README.md' - end).to be_falsey + expect(blob).to be_falsey end end -- GitLab From 413aaa19abdb0cf136d25bdbc454ac7d9762af58 Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Wed, 6 Jul 2016 10:59:29 +0100 Subject: [PATCH 40/46] changes tabs to spaces on CHANGELOG file --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 0e28697..27eef85 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,7 @@ v 10.3.0 (unreleased) - Remove Repository#format_patch - Remove Repository#add_tag - - Rename a repository file + - Rename a repository file v 10.2.3 - Handle nil blob data -- GitLab From dcf55d477b01b39b97b8a24592a79d59620d4c38 Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Wed, 6 Jul 2016 15:01:53 +0100 Subject: [PATCH 41/46] improves codestyle of test --- spec/blob_spec.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/spec/blob_spec.rb b/spec/blob_spec.rb index 42d6e58..f5f372b 100644 --- a/spec/blob_spec.rb +++ b/spec/blob_spec.rb @@ -299,10 +299,8 @@ describe Gitlab::Git::Blob do end let!(:ref) { commit_options[:commit][:branch] } - let!(:prev_commit_count) { repository.commit_count(ref) } let!(:commit_sha) { Gitlab::Git::Blob.rename(repository, commit_options) } let!(:commit) { repository.lookup(commit_sha) } - let!(:commit_count) { repository.commit_count(ref) } let!(:blob) { commit.tree.to_a.any? do |tree| tree[:name] == 'NEWREADME.md' @@ -319,8 +317,8 @@ describe Gitlab::Git::Blob do # Commit message valid expect(commit.message).to eq('Rename readme') - #Only one commit was made - expect(commit_count).to eq(prev_commit_count + 1) + # Only one commit was made + expect(commit_sha).to change { repository.commit_count(ref) }.by(1) # Previous file was removed expect(previous_blob).to be_falsey -- GitLab From f1973f951081d4c6f51956d167665e8f048d4645 Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Wed, 6 Jul 2016 15:16:33 +0100 Subject: [PATCH 42/46] reverts back to old codestyle for rename test --- spec/blob_spec.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/spec/blob_spec.rb b/spec/blob_spec.rb index f5f372b..42d6e58 100644 --- a/spec/blob_spec.rb +++ b/spec/blob_spec.rb @@ -299,8 +299,10 @@ describe Gitlab::Git::Blob do end let!(:ref) { commit_options[:commit][:branch] } + let!(:prev_commit_count) { repository.commit_count(ref) } let!(:commit_sha) { Gitlab::Git::Blob.rename(repository, commit_options) } let!(:commit) { repository.lookup(commit_sha) } + let!(:commit_count) { repository.commit_count(ref) } let!(:blob) { commit.tree.to_a.any? do |tree| tree[:name] == 'NEWREADME.md' @@ -317,8 +319,8 @@ describe Gitlab::Git::Blob do # Commit message valid expect(commit.message).to eq('Rename readme') - # Only one commit was made - expect(commit_sha).to change { repository.commit_count(ref) }.by(1) + #Only one commit was made + expect(commit_count).to eq(prev_commit_count + 1) # Previous file was removed expect(previous_blob).to be_falsey -- GitLab From 6497d2b2038bc822a08dd8cc68d472ce77ba1457 Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Wed, 6 Jul 2016 16:47:34 +0100 Subject: [PATCH 43/46] fixes issues for MR acceptance --- spec/blob_spec.rb | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/spec/blob_spec.rb b/spec/blob_spec.rb index 42d6e58..7f4bb00 100644 --- a/spec/blob_spec.rb +++ b/spec/blob_spec.rb @@ -300,33 +300,24 @@ describe Gitlab::Git::Blob do let!(:ref) { commit_options[:commit][:branch] } let!(:prev_commit_count) { repository.commit_count(ref) } - let!(:commit_sha) { Gitlab::Git::Blob.rename(repository, commit_options) } - let!(:commit) { repository.lookup(commit_sha) } - let!(:commit_count) { repository.commit_count(ref) } - let!(:blob) { - commit.tree.to_a.any? do |tree| - tree[:name] == 'NEWREADME.md' - end - } - - let!(:previous_blob) { - commit.tree.to_a.any? do |tree| - tree[:name] == 'README.md' - end - } + let(:commit_sha) { Gitlab::Git::Blob.rename(repository, commit_options) } + let(:commit_count) { repository.commit_count(ref) } + let(:commit) { repository.lookup(commit_sha) } + let(:blob) { Gitlab::Git::Blob.find(repository, commit_sha, "NEWREADME.md") } + let(:removed_blob) { Gitlab::Git::Blob.find(repository, commit_sha, "README.md") } it 'should rename the file with commit' do # Commit message valid expect(commit.message).to eq('Rename readme') - #Only one commit was made + # Only one commit was made expect(commit_count).to eq(prev_commit_count + 1) # Previous file was removed - expect(previous_blob).to be_falsey + expect(removed_blob).to be_nil # File was renamed - expect(blob).to be_truthy + expect(blob).not_to be_nil end end @@ -357,11 +348,11 @@ describe Gitlab::Git::Blob do let!(:commit_sha) { Gitlab::Git::Blob.remove(repository, commit_options) } let!(:commit) { repository.lookup(commit_sha) } - let!(:blob) { + let!(:blob) do commit.tree.to_a.any? do |tree| tree[:name] == "README.md" end - } + end it 'should remove file with commit' do # Commit message valid -- GitLab From 27b430632976ec4d594b1600051e3c9250b8e89c Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Wed, 6 Jul 2016 16:52:38 +0100 Subject: [PATCH 44/46] adds rubocop-rspec gem --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index 038a3e8..5a896d3 100644 --- a/Gemfile +++ b/Gemfile @@ -4,6 +4,7 @@ gemspec group :development do gem 'rubocop' + gem 'rubocop-rspec' '~> 1.5.0' gem 'coveralls', require: false gem 'rspec', '~> 3.0' gem 'rspec-mocks' -- GitLab From c020dda65176578c2d87ee5a02c82bfa53746570 Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Wed, 6 Jul 2016 16:54:50 +0100 Subject: [PATCH 45/46] fixes :remove test for remove action --- spec/blob_spec.rb | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/spec/blob_spec.rb b/spec/blob_spec.rb index 7f4bb00..0af42c9 100644 --- a/spec/blob_spec.rb +++ b/spec/blob_spec.rb @@ -346,20 +346,16 @@ describe Gitlab::Git::Blob do } end - let!(:commit_sha) { Gitlab::Git::Blob.remove(repository, commit_options) } - let!(:commit) { repository.lookup(commit_sha) } - let!(:blob) do - commit.tree.to_a.any? do |tree| - tree[:name] == "README.md" - end - end + let(:commit_sha) { Gitlab::Git::Blob.remove(repository, commit_options) } + let(:commit) { repository.lookup(commit_sha) } + let(:blob) { Gitlab::Git::Blob.find(repository, commit_sha, "README.md") } it 'should remove file with commit' do # Commit message valid expect(commit.message).to eq('Remove readme') # File was removed - expect(blob).to be_falsey + expect(blob).to be_nil end end -- GitLab From 02c73c3b20e7144e0b447080b8e92b97d37b329e Mon Sep 17 00:00:00 2001 From: tiagonbotelho <tiagonbotelho@hotmail.com> Date: Wed, 6 Jul 2016 16:58:31 +0100 Subject: [PATCH 46/46] fixes missing comma --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 5a896d3..394be07 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ gemspec group :development do gem 'rubocop' - gem 'rubocop-rspec' '~> 1.5.0' + gem 'rubocop-rspec', '~> 1.5.0' gem 'coveralls', require: false gem 'rspec', '~> 3.0' gem 'rspec-mocks' -- GitLab