about summary refs log tree commit diff
path: root/usth/ICT2.7/P1L4 Version Control Subtitles/14 - GIT Demo: Git + Eclipse - lang_en_vs5.srt
blob: b95877bd3f64b9f19373d502e1875155e1f5acca (plain) (blame)
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
1
00:00:00,140 --> 00:00:02,580
Now that we saw some of the git basic

2
00:00:02,580 --> 00:00:05,689
functionalities in practice, let's go a step further. If

3
00:00:05,689 --> 00:00:08,420
you remember I mentioned before that many of these

4
00:00:08,420 --> 00:00:12,250
version control systems are actually integrated into IDE's. So

5
00:00:12,250 --> 00:00:14,540
what were going to look at next is what happens

6
00:00:14,540 --> 00:00:17,500
if we put together git and eclipse. And the

7
00:00:17,500 --> 00:00:20,960
result is egit, or EGit is a plug in

8
00:00:20,960 --> 00:00:25,520
for the eclipse IDE that adds git functionality to eclipse.

9
00:00:25,520 --> 00:00:27,880
So let's see how that works in practice. So

10
00:00:27,880 --> 00:00:31,400
support for git is available in many IDE's including

11
00:00:31,400 --> 00:00:33,920
Eclipse. And if you want to get github

12
00:00:33,920 --> 00:00:38,620
for Eclipse, you should go to eclipse.github.com and you can

13
00:00:38,620 --> 00:00:41,445
download the plugin. So this bring us to the

14
00:00:41,445 --> 00:00:44,530
plugin page and you can use the provided URL

15
00:00:44,530 --> 00:00:47,060
and directions to install the plugin. In this case

16
00:00:47,060 --> 00:00:49,945
we're going to copy this address. So we're going to

17
00:00:49,945 --> 00:00:54,110
Eclipse, Help, Install new software. We can click on Add

18
00:00:54,110 --> 00:00:56,810
to add a new site from which to get software. We

19
00:00:56,810 --> 00:00:59,110
paste the location that we just copied here. And we

20
00:00:59,110 --> 00:01:02,842
can give it a descriptive name. In this case I'll just

21
00:01:02,842 --> 00:01:06,645
call it Eclipse Git plugin. Then when I click okay,

22
00:01:06,645 --> 00:01:09,720
Eclipse will go, and look for plugins. And as you can

23
00:01:09,720 --> 00:01:12,510
see, there are two options. We can select both of them,

24
00:01:12,510 --> 00:01:15,180
and click on next. You can see that the Eclipse identified

25
00:01:15,180 --> 00:01:18,330
a few dependencies. You can click next and accept them. You can

26
00:01:18,330 --> 00:01:21,540
accept the terms and conditions for the plug in, and then just

27
00:01:21,540 --> 00:01:25,730
finish. And at this point, Eclipse will install the plugin, which might

28
00:01:25,730 --> 00:01:28,610
take a little bit of time. So we're just going to speed it up.

29
00:01:28,610 --> 00:01:31,110
And when Eclipse is done, you will get this prompt that will

30
00:01:31,110 --> 00:01:33,670
tell you that you need to restart Eclipse for the plugin to

31
00:01:33,670 --> 00:01:36,990
be actually installed. And at this point, you want to click yes. And

32
00:01:36,990 --> 00:01:40,550
when Eclipse restarts. You'll have your plugin. We're going to go to the git

33
00:01:40,550 --> 00:01:44,030
repository perspective that we can select here. And when we click

34
00:01:44,030 --> 00:01:47,160
OK, you can see that our display will change. And since

35
00:01:47,160 --> 00:01:49,360
we don't have any repository yet, we are provided with the

36
00:01:49,360 --> 00:01:53,620
possibility of adding an existing local git repository, cloning a git repository

37
00:01:53,620 --> 00:01:56,330
or creating a new local git repository. We're going to add an

38
00:01:56,330 --> 00:01:59,800
existing local repository. This is the one that we created earlier,

39
00:01:59,800 --> 00:02:02,170
so we'll select it and click finish, and you can see

40
00:02:02,170 --> 00:02:05,660
that my project is now added to this set of git repositories.

41
00:02:05,660 --> 00:02:09,240
Now let's check out the project from the repository by selecting import

42
00:02:09,240 --> 00:02:12,530
project. And here you can import something as an existing project, you

43
00:02:12,530 --> 00:02:15,300
can use a new project wizard, and in this case I chose

44
00:02:15,300 --> 00:02:18,680
the option of importing as a general project. Then I click Next and

45
00:02:18,680 --> 00:02:20,870
as you can see, I have the project name up there and

46
00:02:20,870 --> 00:02:24,630
I can click Finish. So now, if I go to the resource perspective

47
00:02:24,630 --> 00:02:27,740
by clicking here, I can see that the project has been added

48
00:02:27,740 --> 00:02:30,760
to my set of projects. And I can see all the files within

49
00:02:30,760 --> 00:02:33,440
the project, particularly, if I click on the README, you can see

50
00:02:33,440 --> 00:02:36,190
that we have the Readme file that we created before. Same thing for

51
00:02:36,190 --> 00:02:38,930
the test file. One thing I can do at this point, it

52
00:02:38,930 --> 00:02:41,070
to execute different git commands, perform

53
00:02:41,070 --> 00:02:43,430
different git operations by using the team

54
00:02:43,430 --> 00:02:47,010
submenu in the contactual menu. And here there are several things

55
00:02:47,010 --> 00:02:50,650
I can do including some advanced commands. And just to give it a

56
00:02:50,650 --> 00:02:53,200
shot, I am going to try to click show local history, and this

57
00:02:53,200 --> 00:02:56,180
shows the history of the file. For example it shows the author and

58
00:02:56,180 --> 00:02:59,200
it shows when he was created, when he was authored. Lets make

59
00:02:59,200 --> 00:03:02,810
some changes to this file by adding some new content. Okay. I saved

60
00:03:02,810 --> 00:03:05,160
the file and now I can see that error that indicates that my

61
00:03:05,160 --> 00:03:08,620
file was locally changed. So now if I go to the team menu,

62
00:03:08,620 --> 00:03:11,380
you can see that I have the option to add to the index,

63
00:03:11,380 --> 00:03:14,686
to stage the file. And now I got this new label that star

64
00:03:14,686 --> 00:03:17,980
that shows the files added to the index. And now at this point,

65
00:03:17,980 --> 00:03:21,270
I can go to the team menu again and I can actually commit

66
00:03:21,270 --> 00:03:25,480
the file by selecting the corresponding entry. This allows me to enter

67
00:03:25,480 --> 00:03:28,390
the commit message, exactly in the same way which I could do

68
00:03:28,390 --> 00:03:31,250
that from the command line with the textual editor. And after I

69
00:03:31,250 --> 00:03:34,050
put the comment there, I can actually commit. And now if we

70
00:03:34,050 --> 00:03:36,320
look at the history view, we can see here that we have

71
00:03:36,320 --> 00:03:38,960
a new version for the file that we just modified. And we

72
00:03:38,960 --> 00:03:42,250
can also see the commit comment. And, at this point, if we

73
00:03:42,250 --> 00:03:46,450
had remote repository we could push our changes to that remote repository

74
00:03:46,450 --> 00:03:49,330
as well. Again, using the team submenu and

75
00:03:49,330 --> 00:03:52,170
the contextual menu. And, speaking of remote repositories, what we

76
00:03:52,170 --> 00:03:55,230
are going to see next is how to use GitHub

77
00:03:55,230 --> 00:03:58,640
repositories which are remote repositories that are hosted on GitHub.