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
|
require File.dirname(__FILE__) + "/spec_helper"
require 'pp'
describe TicGitNG do
include TicGitNGSpecHelper
before(:each) do
@path= setup_new_git_repo
@orig_test_opts= test_opts
@ticgitng= TicGitNG.open(@path, @orig_test_opts)
end
after(:each) do
Dir.glob(File.expand_path("~/.ticgit-ng/-tmp*")).each {|file_name| FileUtils.rm_r(file_name, {:force=>true,:secure=>true}) }
Dir.glob(File.expand_path("~/.ticgit/-tmp*")).each {|file_name| FileUtils.rm_r(file_name, {:force=>true,:secure=>true}) }
Dir.glob(File.expand_path("/tmp/ticgit-ng-*")).each {|file_name| FileUtils.rm_r(file_name, {:force=>true,:secure=>true}) }
end
it "Should merge in tickets from a remote source" do
Dir.chdir(File.expand_path( tmp_dir=Dir.mktmpdir('ticgit-ng-gitdir1-') )) do
#prep, get temp dirs, init git2
@ticgitng.ticket_new('my new ticket')
git2=Git.clone(@path, 'remote_1')
git=Git.open(@path)
git_path_2= tmp_dir + '/remote_1/'
#Make ticgit-ng branch in remote_1
git2.checkout('origin/ticgit')
git2.branch('ticgit-ng').checkout
ticgit2=TicGitNG.open(git_path_2, @orig_test_opts)
ticgit2.ticket_new('my second ticket')
git2.checkout('master')
git.add_remote('upstream', git_path_2)
git.checkout('ticgit')
git.pull('upstream', 'upstream/ticgit-ng')
git.checkout('master')
ticgit2.tickets.length.should == @ticgitng.tickets.length
end
end
it "should be able to sync with origin" do
Dir.chdir(File.expand_path( tmp_dir=Dir.mktmpdir('ticgit-ng-gitdir1-') )) do
#prep, get temp dirs, init git2
#@ticgitng.ticket_new('my new ticket')
#git=Git.open(@path)
git_path_2= tmp_dir + '/remote_1/'
git_path_3= tmp_dir + '/remote_2/'
#Make ticgit-ng branch in remote_1
git2=Git.clone(@path, 'remote_1')
git2.checkout('origin/ticgit')
#this creates the ticgit-ng branch, tracking origin/ticgit-ng
git2.branch('ticgit-ng').checkout
git2.checkout('master')
git3=Git.clone(git_path_2, 'remote_2')
git3.checkout('origin/ticgit-ng')
git3.branch('ticgit-ng').checkout
git3.checkout('master')
ticgit2=TicGitNG.open(git_path_2, @orig_test_opts)
ticgit2.ticket_new('my first ticket')
ticgit3=TicGitNG.open(git_path_3, @orig_test_opts)
ticgit3.ticket_new('my second ticket')
ticgit2.ticket_new('my third ticket')
#git.add_remote('upstream', git_path_2)
#git.checkout('ticgit-ng')
#git.pull('upstream', 'upstream/ticgit-ng')
#git.checkout('master')
ticgit3.sync_tickets('origin', true, false)
ticgit3.tickets.length.should == ticgit2.tickets.length
end
end
it "should be able to sync with other repos" do
Dir.chdir(File.expand_path( tmp_dir=Dir.mktmpdir('ticgit-ng-gitdir1-') )) do
#prep, get temp dirs, init git2
git_path_2= tmp_dir + '/remote_1/'
git_path_3= tmp_dir + '/remote_2/'
git_path_4= tmp_dir + '/remote_3/'
#Make ticgit-ng branch in remote_1
git2=Git.clone(@path, 'remote_1')
git2.checkout('origin/ticgit')
#this creates the ticgit-ng branch, tracking from the
#branch we are already on, origin/ticgit-ng
git2.branch('ticgit-ng').checkout
git2.checkout('master')
#Make ticgit-ng branch in remote_2
git3=Git.clone(@path, 'remote_2')
git3.checkout('origin/ticgit')
git3.branch('ticgit-ng').checkout
git3.checkout('master')
#Make ticgit-ng branch in remote_2
git4=Git.clone(@path, 'remote_3')
git4.checkout('origin/ticgit')
git4.branch('ticgit-ng').checkout
git4.checkout('master')
ticgit2=TicGitNG.open(git_path_2, @orig_test_opts)
ticgit2.tickets.length.should==0
ticgit2.ticket_new('my first ticket')
ticgit3=TicGitNG.open(git_path_3, @orig_test_opts)
ticgit3.tickets.length.should==0
ticgit3.ticket_new('my second ticket')
ticgit4=TicGitNG.open(git_path_4, @orig_test_opts)
ticgit4.tickets.length.should==0
ticgit4.ticket_new('my third ticket')
ticgit2.ticket_new('my fourth ticket')
#git.add_remote('upstream', git_path_2)
#git.checkout('ticgit-ng')
#git.pull('upstream', 'upstream/ticgit-ng')
#git.checkout('master')
git3.add_remote('ticgit2', git_path_2)
git4.add_remote('ticgit3', git_path_3)
ticgit3.sync_tickets('ticgit2', true, false) #ticgit3 should now have tickets 1, 2, and 4
#and ticgit2 should now have the same
ticgit3.tickets.length.should==3
ticgit2.tickets.length.should==3
ticgit4.sync_tickets('ticgit3', false, false) #ticgit4 should now have tickets 1,2,3,4
#but ticgit2 and 3 should only have 1,2,4
ticgit4.tickets.length.should==4
ticgit3.tickets.length.should==3
ticgit2.tickets.length.should==3
git4.add_remote('ticgit2', git_path_2)
ticgit4.sync_tickets('ticgit2', true, false) #ticgit2 and 4 should now have 4 tickets while
#ticgit3 only has 3 tickets
ticgit4.tickets.length.should==4
ticgit3.tickets.length.should==3
ticgit2.tickets.length.should==4
end
end
it "Use the 'ticgit' branch if 'ticgit-ng' isn't available (legacy support)" do
Dir.chdir(File.expand_path( tmp_dir=Dir.mktmpdir('ticgit-ng-gitdir1-') )) do
#Because there is no 'ticgit' or 'ticgit-ng' branch
#this will create a new ticket in 'ticgit-ng'
@ticgitng.ticket_new('original shinanigins')
git1=Git.clone( @path, 'remote_0' )
#This checks out origin/ticgit-ng and creates a new
#branch following it callled ticgit, which should be
#used transparently instead of ticgit-ng
git1.checkout( 'origin/ticgit' )
git1.branch('ticgit').checkout
ticgitng1=TicGitNG.open( tmp_dir+'/remote_0/', @orig_test_opts )
ticgitng1.which_branch?.should == 'ticgit'
git2=Git.clone( @path, 'remote_1' )
git2.checkout( 'origin/ticgit' )
git2.branch('ticgit-ng').checkout
ticgitng2=TicGitNG.open( tmp_dir+'/remote_1/', @orig_test_opts )
ticgitng2.which_branch?.should == 'ticgit-ng'
git3=Git.clone( @path, 'remote_2' )
git3.checkout( 'origin/ticgit' )
git3.branch('ticgit').checkout
git3.checkout( 'origin/ticgit' )
git3.branch('ticgit-ng').checkout
ticgitng3=TicGitNG.open( tmp_dir+'/remote_2/', @orig_test_opts )
ticgitng3.which_branch?.should == 'ticgit-ng'
# if 'ticgit' and 'ticgit-ng'
# should use 'ticgit-ng'
# elsif 'ticgit' and !'ticgit-ng'
# should use 'ticgit'
# elsif !'ticgit' and 'ticgit-ng'
# should use 'ticgit-ng'
# end
end
end
end
|
