[13:19:12] [## Class Started at Mon Jul 14 13:19:12 2014 ##] [13:19:12] startclass [13:19:15] endclass [13:19:15] [## Class Ended at Mon Jul 14 13:19:15 2014 ##] [13:19:18] [## Class Started at Mon Jul 14 13:19:18 2014 ##] [13:19:18] startclass [13:19:49] no Armageddon today ? [13:20:57] sree82 is now known as Mactoc [13:21:37] --------SESSION STARTS--------- [13:21:41] Roll Call [13:21:46] Amit Tripathi [13:21:48] Sivaram Balakrishnan [13:21:52] Dhriti Shikhar [13:21:53] ashwani [13:21:57] shilpi shukla [13:21:57] Yasharth [13:21:58] Papiya Sen [13:22:01] Rakesh [13:22:01] Heena Kaushar [13:22:02] kanika narang [13:22:03] Amit Kumar [13:22:04] Amir [13:22:04] Soumyo Dey [13:22:05] surabhi [13:22:07] Sanyam Khurana [13:22:07] Bhargav Patel [13:22:10] Vipul Bansal [13:22:14] prajesh rawat [13:22:18] Koushik Bag [13:22:19] Azhar Hussain [13:22:26] Sudhir Khanger [13:22:29] vikash patil [13:22:34] Sreedevi [13:22:40] Sunit Jain [13:22:41] Satarupa Sinha [13:23:03] Prashant Surya [13:23:27] Nishant Pani [13:23:32] chandankumar, can i pass you my link too? [13:23:39] humpty, yes [13:23:39] Vikneshwar [13:24:20] chandankumar, http://thisisashwanipandey.blogspot.in/ [13:24:22] Thejazeto [13:24:41] humpty, added. [13:24:54] chandankumar, thanks :) [13:25:07] korak ghosh [13:25:15] /msg nickserv register amit@123 mail2amit19@gmail.com [13:25:28] oops [13:25:36] Abhiram Ravikumar [13:25:43] :D [13:26:37] Unless you all add up your blog details, we will not be able to add you for many future sessions [13:26:54] Tosin Animashaun [13:26:59] those will be dependent on us knowing who all will attend [13:27:13] Mahendra Yadav [13:27:17] okay...in a moment please [13:27:33] I apologise about the ellipsis [13:27:48] chalizard, time to change password. [13:27:53] acetakwas, was about to point that to you :) [13:28:06] kushal, i couldn't understand this though i have added. [13:28:13] kushal: i haven't created ,can i send you tomorrow ?? [13:28:31] iamviknesh, can you use a single question mark? [13:28:48] sayan: ok thanks :) [13:28:48] Does anyone know about 'Pelican' [13:28:52] Hi Kushal, I havent added my blog yet, Can I add it tomorrow ? [13:28:54] i have not made my blog yet. can i send it tomorrow ? [13:29:04] It's written in Python, that's why I chose it [13:29:44] acetakwas, what is pelican? [13:29:52] Can I send my at the end of the class? I have written it but I'm still trying to add some rst features to it [13:30:23] humpty, it is a Static Blog generator [13:30:35] like Nikola and the rest [13:30:46] any questions from the last session? [13:30:55] But you have to set it up from the terminal [13:30:57] acetakwas, ok [13:31:01] ! [13:31:23] sayan, Can I send mine at the end of the class? I have written it but I'm still trying to add some rst features to it [13:31:30] amitt001 is now known as amit001 [13:31:50] acetakwas, just submit it in the link when you are done [13:31:58] okay, thanks [13:32:13] Besides I am moving away from Wordpress [13:32:26] * acetakwas approaches Pelican [13:32:28] ! [13:32:50] sayan yes, i had to add an image in about me using rst. so i can add an image present in some folder. But how to add some from the web. i am unable to do that. [13:33:09] next [13:33:19] i had to add an image in about me using rst. so i can add an image present in some folder. But how to add some from the web. i am unable to do that. [13:33:44] charany1 is now known as yogeshwar [13:33:54] humpty, http://wiki.typo3.org/ReST_Syntax#Add_an_image [13:33:54] humpty, http://docutils.sourceforge.net/docs/ref/rst/directives.html [13:34:41] next [13:34:48] sayan: Submit to which link? [13:34:57] ! [13:35:20] donniezazen, the link posted from the previous class [13:35:23] donniezazen, http://piratepad.net/HKVLwvc64q [13:35:25] next [13:35:30] chandankumar, i read that and i am even able to add image present in my folder. but the problem is i want to add an image of mine from the web and i am unable to do that [13:35:35] donniezazen, http://piratepad.net/HKVLwvc64q [13:35:46] sorry, I couldn't submit it , Can I submit it after today's session? [13:35:47] chandankumar, what to to do for this? [13:36:03] Mactoc, yes [13:36:26] humpty, download the image and save it in the image directory [13:36:45] sayan, Thank you [13:36:50] sayan link also works [13:37:01] humpty, ^^ [13:37:03] sayan, ;o [13:37:13] sayan, but then when i would publish my page on web or github, will that image still show up? [13:37:43] because that image is in my computer and not on the web. [13:37:54] humpty, try that out, i usually save the images in my image directory [13:38:15] sayan, in that case it is working. [13:38:43] humpty, make it a practice to have your images in one folder [13:38:49] like this: [13:38:56] humpty, i don't know if pasting link works or not. i have never tried that out. [13:39:01] sayan, but how would you and others be able to see it then. [13:39:27] Do 'mkdir img' in your root folder [13:39:29] sayan, i tried but it's not working. it just shows that link in the html file and not he image [13:39:33] humpty, pasting links also works [13:39:36] s/he/the [13:39:43] then move your images to the folder 'img' [13:40:01] amit001, then tell me how? [13:40:18] humpty, see this http://amitt001.github.io/ click on human icon [13:40:32] humpty, http://docutils.sourceforge.net/docs/ref/rst/directives.html [13:40:48] here insted of image.jpg use the link [13:41:18] afterwards you can link to any image (e.g 'image001' in folder 'img') by indicating the source directory as 'res/image001' [13:41:21] amit001, are you sure of that because i have already done that but it didn't work. [13:41:57] yes I am. doubt? ok on my image cklick inspect element and see the link [13:42:14] s/cklick/click [13:42:38] amit001, can you the share the rst file for that page to humpty instead? [13:42:58] amit001, it must be on github, so share the link [13:43:29] amit001, yes because inspect element is showing me the html version and not the rst one [13:44:23] sayan, actually i uploaded the html version [13:44:43] humpty i wwill pass you the link after uploading my rst to gdrive [13:44:53] s/wwill/will [13:44:55] ! [13:45:18] amit001, in that case let me show you what i did. [13:46:41] amit001, .. image:: https://plus.google.com/u/0/photos?pid=5976132931173895458&oid=102513899573780558485&authkey=CO2Jre-4w_qklwE [13:46:58] amit001, i think this is all what i need to do [13:47:09] to get my image there [13:47:19] here is the my rst file http://ur1.ca/hr089 [13:47:26] humpty talk in pm [13:48:02] amit001, thanks and ok [13:48:10] next [13:48:16] i was late. was there any homework for today? also can you please tell me what today's session is about? [13:48:27] eeshangarg, discussion on last week [13:51:08] So any other question? [13:51:32] none, good. [13:51:35] Few points [13:51:42] m4_15_ is now known as m4_15 [13:52:13] Please remember to submit your hometasks, we will be selecting people from there to be added for various future sessions. [13:52:28] From now on, sessions will be 3 days a week [13:52:36] Monday, Wednesday, Friday [13:52:55] It can be on other days but those will be guest sessions mostly. [13:52:59] ! [13:53:02] next [13:53:13] What is the basis of selection? [13:53:40] donniezazen, people who will keep submitting the hometasks [13:53:46] donniezazen, nothing fancy [13:53:56] ! [13:54:02] donniezazen, just have to show they are willing to put time and effort [13:54:04] next [13:54:07] kushal, what will be in the guest sessions ? [13:54:15] [13:54:20] ace139, not decided yet. [13:54:31] kushal, good [13:54:41] ! [13:54:43] kushal, we are not allowed to join ? [13:54:56] ace139, everyone is allowed to join [13:55:29] next [13:55:32] will it be 3 days a week just for the next few weeks or till the end of the course? [13:55:35] ace139, but say, we need to provide username/password, we will choose people who are coming online regularly and who submit hometasks back [13:55:45] ace139, I think he means that the guest sessions will be on talks from invited folks, not necessarily tutorials [13:55:56] EkAurBottleLa, till the end [13:56:03] acetakwas, yes [13:56:05] next [13:57:08] Ok [13:57:24] So next we will learn the basics of a version control system. [13:57:24] <_krash> ! [13:57:28] next [13:57:50] <_krash> when you wil declare who all are eligible for the session [13:58:17] _krash, everyone is eligible by default [13:58:31] <_krash> I mean special sessions [13:58:33] _krash, but we must know the names/blogs and see some effort from them too. [13:58:44] _krash, yes, I am talking about those sessions too [13:58:54] <_krash> thanks [13:58:57] <_krash> [13:58:58] ! [13:59:08] next [13:59:25] Can anyone give me pointers on how to setup and use Pelican in PM? [13:59:43] acetakwas, use Nikola, far better anyday. [13:59:54] nikola +1 [13:59:57] acetakwas, also please do not ask out of session questions. [14:00:11] kushal, okay [14:00:16] coming back to the session [14:01:09] The first source code management we will learn is called mercurial. [14:01:14] yum install mercurial [14:01:22] or apt-get install mercurial [14:01:28] ^^ please install it now. [14:02:24] done. [14:02:43] Done [14:02:56] write done here when it is installed. [14:02:57] done [14:03:00] done [14:03:02] done [14:03:14] done [14:03:17] done [14:03:19] done [14:03:23] done [14:03:24] done [14:03:54] done [14:04:06] would take some time for me (slow net :( ) [14:04:33] done [14:04:35] I'm not on a pc right now. will do it asap [14:04:50] it will take some time for me too :( [14:04:55] facing dependency problems. [14:04:56] done [14:05:02] Done. [14:05:06] i also have slow connection. Its taking time. [14:05:11] done [14:05:15] Done [14:05:16] It's just about 2.5MB [14:05:26] my system will take some time due to slow network . [14:05:36] silentSae, you are supposed to use a computer [14:06:02] silentSae, during sessions [14:06:04] acetakwas, It's downloading dependencies too. [14:06:51] How to check if it is installed? I'm a bit confused. [14:07:31] Prash_542, It would show you finished, if using fedora, and something similar in other linux distros. [14:07:37] Prash_5421: Type hg in your command line [14:07:40] CuriousLearner, okay but I think all of that is included in the 2.5MB archive [14:07:59] Mactoc thanks. [14:08:09] Prash_5421: :) [14:08:29] acetakwas, no, it downloaded around 11MB+ dependencies and now, it's downloading the main package. [14:08:29] done [14:08:40] Done. [14:08:50] <_krash> done [14:08:57] done [14:09:04] done [14:09:18] CuriousLearner, okay [14:09:20] kushal, Yes but I'm on the move these days. Will use it from 16th. [14:09:22] CuriousLearner, 2.56 MB is downloaded aprox [14:09:52] ! [14:09:58] next [14:10:08] I don't know, for me, it downloaded some dependencies too. ace139 [14:10:09] kushal, what does it mean by source code management [14:10:24] done [14:10:36] CuriousLearner, Yeah I now understand you [14:10:37] CuriousLearner, same here! [14:10:39] done [14:11:00] I probably have some of those dependencies installed already, while you don't [14:11:14] acetakwas: +1 [14:11:18] humpty, good question, I am coming to that point [14:11:30] abhiram_rk, ;) [14:11:30] First [14:11:40] Everyone else please stop talking [14:11:44] CuriousLearner, actually it's actually 12M [14:11:44] next [14:12:16] How many of you did any school/college project and kept source code from different day in different folder in a usb drive? [14:12:21] * kushal did. [14:12:51] Me. Kept creating zip folders of each day's revisions. [14:12:59] * ace139 did [14:13:05] yeah i did [14:13:07] <_krash> did [14:13:13] kushal, could not understand. [14:13:17] q [14:13:20] * CuriousLearner didn't [14:13:23] Yes. I did. [14:13:30] I kind of overwrote/merged them [14:13:41] i did. [14:13:58] Me too [14:13:59] * humpty didn't [14:14:11] humpty, which one? the question? [14:14:25] humpty, if you've worked on something that you made updates to almost everyday [14:14:26] kushal, yes but understood it now! [14:14:31] ! [14:14:49] then had the work of each day saved in separate folders [14:14:58] acetakwas, no, never! [14:15:20] kushal, excuse me. I will have to leave for now. Will read the log. [14:15:35] next [14:15:56] what will the advantages of mercurial over git? [14:16:23] korak1, simple, google.com [14:16:41] * acetakwas bids vipsy farewell [14:16:41] so coming back to my point [14:16:45] ok [14:17:03] korak1: i think mercurial is good for newbie :) [14:17:19] iamviknesh, please STOP TALKING. [14:17:27] We all had some issues in managing source code/text files, which we updated regularly. [14:18:00] From the name source code management for SCM, we can understand it talks about managing the source code somehow. [14:18:12] There are many available software which does that. [14:18:24] We will only learn two of those, [14:19:45] RCS was the oldest I know about, from there CVS came in. [14:19:54] then it was the days of SVN [14:20:09] and then these days people are using git and mercurial. [14:20:19] http://en.wikipedia.org/wiki/List_of_revision_control_software is nice page to read later. [14:20:56] full meanings please 'RCS', 'SVN'? [14:21:15] acetakwas, read that wikipedia page when you have time :) [14:21:49] To start we will learn Mercurial [14:23:03] first everyone create a new folder called myproject [14:23:09] then go inside it [14:23:13] / [14:23:44] silentSae, ? [14:24:10] Sorry phone issues [14:25:01] now let us create a file called hello.txt [14:25:07] inside it write [14:25:11] Hello World. [14:25:37] Tell me when you are done. [14:25:41] done [14:25:43] Done [14:25:45] done [14:25:46] done [14:25:49] done [14:25:51] done [14:25:53] Done [14:25:53] done [14:25:55] done [14:25:57] done [14:26:02] Done. [14:26:03] done [14:26:04] done [14:26:04] done [14:26:07] done [14:26:08] done [14:26:08] done [14:26:09] done [14:26:10] <_krash> done [14:26:12] done [14:26:15] done [14:26:15] done [14:26:16] done [14:26:18] * acetakwas winks at lixxz [14:26:25] done [14:27:07] acetakwas, was late [14:27:44] Now first we will create a repository inside this directory, a mecurial repository [14:27:52] the command is $ hg init [14:28:08] after that do ls -la and tell me if you see any differenced [14:28:09] after that do ls -la and tell me if you see any difference [14:28:23] .hg folder [14:28:30] a .hg folder [14:28:34] It printed . .. hello.txt .hg [14:28:35] is created [14:28:58] done [14:29:01] good so it added a .hg folder inside [14:29:03] '.hg' directory created [14:29:13] done [14:29:17] There seems to be a new hidden .hg file [14:29:28] thejaman, it is a directory. [14:29:41] The is the main part of the repository. [14:30:15] Now it is a new repository. [14:30:17] kushal, thanks for the correction. [14:31:00] We will add our sourcecode file to it, which is a text file. [14:31:07] hg add hello.txt [14:31:38] done [14:31:46] and then we have to commit it. [14:31:48] hg commit [14:32:16] when you will say hg commit [14:32:19] opens a file [14:32:25] it will open up an editor. [14:32:34] "no username supplied" [14:32:37] On the top line, write: First change. [14:32:47] abort: no username supplied (see "hg help config") [14:32:55] same [14:32:57] yes ^^ this is comming [14:32:57] abort: no username supplied (see "hg help config") [14:33:01] same [14:33:01] Ok. [14:33:12] error! [14:33:31] wget this file to your home as .hgrc [14:33:32] http://kushaldas.in/details/hgrc [14:33:36] you need to create username in .hg/hgrc [14:33:43] ^^ save it as ~/.hgrc [14:34:16] 1 [14:34:18] change your name and email id inside that file [14:34:18] ! [14:34:20] next [14:34:53] ! [14:35:09] i have separate directory working on mozilla code , so creating this new hgrc will conflict with that ?? [14:35:12] ! [14:36:18] iamviknesh, see if you find any major difference in the two files, this one was created by the upstream :) [14:36:30] iamviknesh, they just typed it in my laptop :) [14:36:33] next [14:36:39] kushal, i am unable to follow anything you said after it is showing the error of no username supplied [14:37:03] humpty, I gave link to a file, download and save it as ~/.hgrc [14:37:09] next [14:37:13] not able to follow step from wget. [14:37:15] kushal,ok [14:37:48] ace139, type wget http://kushaldas.in/details/hgrc [14:38:11] ! [14:38:18] next [14:38:31] by username, do you mean my computer's login name? [14:38:43] acetakwas, No, your real name and your email id. [14:38:53] acetakwas, see my file to understand [14:38:59] okay [14:39:12] ! [14:39:14] [14:39:19] lixxz, it says wget command not found. [14:39:34] CuriousLearner, please save the file using the browser [14:39:35] Sparking_ is now known as Sparking [14:39:39] next [14:40:01] i saved it in home then ? [14:40:06] ! [14:40:11] ! [14:40:15] done [14:40:26] droy, saved as .hgrc filename? [14:40:29] next [14:40:41] How do we change default text editor [14:41:01] yes i saved it as .hgrc [14:41:06] thejaman, by - select-editor command [14:41:11] ! [14:41:19] droy, done [14:41:27] ! [14:41:40] next [14:41:45] saved it as .hgrc file in myproject folder, what's next? [14:41:45] next [14:41:46] ! [14:42:01] CuriousLearner, nope, I asked it to save as ~/.hgrc [14:42:12] Should I save it as ~/.hgrc or just .hgrc? [14:42:17] kushal, it's not accepting that name [14:42:23] The former goes into my home directory. [14:42:30] CuriousLearner, do the changes in your name and mail id and save it again. [14:42:39] ok [14:42:41] CuriousLearner, can you please tell me what ~/ means? [14:42:42] next [14:42:45] hello.hgrc ? [14:42:46] next [14:42:50] what do we do after saving it as ~/.hgrc ? [14:43:00] EkAurBottleLa, wait please, people are confused. [14:43:02] root directory [14:43:05] abhiram_rk, ~/ is your home directory not part of the file name [14:43:09] ok. [14:43:17] everone ! filename: .hgrc , folder: home [14:43:20] CuriousLearner, nope [14:43:25] CuriousLearner, home directory. [14:43:26] everyone* [14:43:26] So I should save it in the current directory right? [14:43:33] myproject? [14:43:34] abhiram_rk, nope [14:43:36] save it with the name '.hgrc' not '~/.hgrc' [14:44:02] When you do wget it gets downloaded to your current folder [14:44:19] that is, current working directory, do you understand? [14:44:29] next [14:44:30] acetakwas, no we have to save it with ~./hgrc [14:44:31] type cd it will take you to your home directory [14:44:40] humpty, wrong [14:44:45] then move it to your home directory [14:44:46] I'm confused. Varied opinions. [14:44:47] humpty, ~/.hgrc [14:44:58] abhiram_rk, listen what I am saying [14:45:12] kushal, sorry typing mistake1 [14:45:12] * abhiram_rk gives kushal thumbs-up! [14:45:14] In your home directory save the file as .hgrc [14:45:21] for those who dont know what does ~/ mean - it is your home directory [14:45:22] Next [14:45:25] like this in terminal: mv hgrc ~/ [14:45:25] Done. [14:45:40] amit001, for those who dont know what does ~/ mean, they should leave the training now. [14:45:52] then you can go to home directory which is ~/ [14:45:53] kushal, :) [14:45:56] now try hg commit [14:46:05] It will open up an editor [14:46:17] and rename it from 'hgrc' to '.hgrc' [14:46:26] write First change. and save the file. [14:46:40] everyone tell me when you are done^^^^ [14:46:43] kushal, still the same error [14:46:57] cone [14:46:58] done [14:47:00] done [14:47:00] done* [14:47:03] done [14:47:03] humpty, what error? same error can be anything. [14:47:13] username not supplied [14:47:16] failed to import extension script [14:47:22] kushal, there are many editors. which one to choose ? [14:47:29] kushal ^ [14:47:30] No module named strip [14:47:44] Done. [14:47:48] done [14:47:51] done [14:47:58] Done [14:48:06] * acetakwas says it works now [14:48:08] done [14:48:14] humpty, you are missing that .hgrc file. [14:48:17] done [14:48:20] done [14:48:35] kushal, no i checked it is present in the home directory [14:48:45] humpty, cd to ~/ [14:48:52] and do ls -al [14:48:55] ace139, we're using vim as our editor of choice [14:48:59] ls -al [14:49:03] kushal, which editor to open? vim.basic, vim.nox, vim.tiny [14:49:06] humpty, show us the output of ls -ls ~/.hgrc [14:49:15] ace139, vim.basic [14:49:28] ace139, this is the reason we asked people to use Fedora. [14:50:00] kushal, my laptop do not support fedora. :( formatted 20 times + [14:50:07] ace139, ok [14:51:09] done [14:51:17] Now give the following command [14:51:19] hg log [14:51:27] donniezazen_ is now known as donniezazen [14:51:52] kushal: Gives my commit message. [14:51:56] abhiram_rk, yes [14:52:24] done [14:52:35] Now everyone opens up hello.txt again [14:52:43] done [14:52:45] Add a ! before that . [14:52:48] kushal, [ash@localhost ~]$ ls -ls ~/.hgrc [14:52:49] ls: cannot access /home/ash/.hgrc: No such file or directory [14:52:53] save and exit of vim [14:53:03] but the file is present in home directory [14:53:09] humpty, ls -la ~/.hgrc [14:53:37] do you mean at the end of Hello World? [14:53:44] like this: Hello World! [14:53:45] ! [14:54:06] acetakwas, like Hello World! [14:54:10] next [14:54:11] kushal, [ash@localhost ~]$ ls -la ~/.hgrc [14:54:12] ls: cannot access /home/ash/.hgrc: No such file or directory [14:54:26] "!" before what? [14:54:27] humpty, that means you never saved it in the correct place. [14:54:30] okay [14:54:32] done [14:54:59] done [14:55:02] status [14:55:03] humpty, do this [14:55:14] open up terminal [14:55:14] done [14:55:17] cd ~/ [14:55:28] abhiram_rk, at the end. [14:55:29] done [14:55:41] abhiram_rk, I asked everyone to write Hello World. [14:55:47] wget http://kushaldas.in/details/hgrc [14:55:49] at the beginning [14:55:52] kushal: Done! Got it. [14:55:58] kushal, then how is it showing when i do ls -al [14:56:03] -rw-rw-r--. 1 ash ash 259 Jul 14 20:13 hgrc [14:56:05] -rw-rw-r--. 1 ash ash 259 Jul 14 20:09 hgrc~ [14:56:27] acetakwas, ok let me do it [14:56:45] humpty, go to a local optician [14:56:55] humpty, get a specs [14:57:06] humpty, .hgrc and hgrc is not same. [14:57:22] cd .. [14:57:26] sorry [14:57:33] humpty, see a dot a the first. [14:57:49] humpty, see a dot at the first. [14:58:10] kushal, after doing hg commit, and opening an editor, what to do ? [14:58:18] ! [14:58:23] ace139, read the log above I already answered that [14:58:25] next [14:58:53] ace139, which editor are you in? [14:59:02] nano or vim? [14:59:02] How do I know if my commit has gone through successfully ? and how do I know the different versions of my file ? [14:59:14] ! [14:59:30] RakRock, hg log [14:59:38] RakRock, learn to read what we are saying here. [14:59:49] RakRock, We mostly write in English. [14:59:52] next [14:59:55] kushal, what's with: no module named strip ? [15:00:14] thejaman, means you mercurial installation does not have that extension [15:00:26] thejaman, remove that word from .hgrc file [15:00:39] kushal, how does it effect mercurial? [15:00:46] thejaman, google.com [15:01:03] [15:01:04] After you all make changes to that hello.txt file [15:02:03] do hg commit again [15:02:13] and then write a new commit message. [15:02:22] say: Second commit. [15:02:22] humpty, are you done? PM [15:02:38] do hg log again. [15:02:44] Tell us what you see [15:03:00] both changes [15:03:12] ^^ others? [15:03:21] changeset 0 and changeset 1 logs [15:03:22] both changes with commit message [15:03:35] both changes with a tag in the second one [15:03:40] kushal:I had a connection problem in between, was unable to connect to freenode :( [15:03:52] can see both the changes made [15:04:05] ! [15:04:06] Mactoc, ok, you should use waartaa [15:04:07] next [15:04:07] can see both changes made [15:04:11] what is tag? [15:04:11] ! [15:04:13] ! [15:04:21] Commit history. [15:04:22] it says tag: tip [15:04:47] yes [15:04:55] amit001, mercurial what is a tag -- search that in google. [15:05:00] kushal, yes I am using it now [15:05:08] kushal, ok [15:05:15] next [15:05:17] next [15:05:20] How can I change the editor? [15:05:21] Can we see diffs between two different versions ? [15:05:38] RakRock, yes, google if you can not wait to learn with others [15:05:43] ahhda, select-editor [15:05:55] ahhda, type that in terminal [15:06:04] Thanks [15:06:07] and select vim basic [15:06:12] ahhda: using ubuntu ?? [15:06:41] Yes [15:07:03] ahhda, or add: editor=vim in the .hgrc file [15:07:17] ahhda: do this ---> sudo update-alternatives –config editor [15:07:37] next [15:07:38] thejaman, thanks for that one [15:07:54] Now let us add one more line to the same file. [15:08:14] Everyone add a second line: This is a second line with a number 1234. [15:08:34] ^^ write that line in the hello.txt file and do hg diff [15:08:59] done [15:09:19] done [15:09:25] showing new changes [15:09:27] Done [15:09:29] yes [15:09:37] +1234 [15:09:43] done [15:09:53] Shows additions and modifications. [15:09:57] done [15:10:05] Next, create a new file called bye.txt [15:10:09] Inside write [15:10:15] ! [15:10:33] ! [15:10:40] If you need to create an account, please ping any co-ordinators in #dgplug channel on Freenode. [15:10:46] and save the file [15:10:51] then do hg diff [15:11:00] and tell me if there is any difference. [15:11:01] next [15:11:03] next [15:11:27] What's the first line in the output of hg diff command? [15:11:37] diff -r 0cfdcbb32a24 hello.txt [15:11:41] I think I missed a lot, Should I continue with this or start from beginning? [15:11:59] diff -r 128a3ca2406c hello.txt [15:12:02] no [15:12:11] no change [15:12:30] ! [15:12:34] There is no difference [15:12:36] no change [15:12:37] Mactoc, start from beginning [15:12:42] I think we need to do add hg add here ? [15:12:44] no difference [15:13:19] abhiram_rk, difference between which files [15:13:27] in this case one is a commit. [15:13:38] next [15:13:44] @@ -1,1 +1,2 @@ [15:13:48] what is this ? [15:13:55] acetakwas:Ok [15:13:55] kushal, still the same result as before [15:14:49] ace139: i think those a line number from the start where changes were made [15:15:23] ace139, http://askubuntu.com/questions/56964/how-do-i-decipher-diff-output may help :) [15:15:35] now everyone do a command hg status [15:15:40] ^^ what it says? [15:15:47] acetkwas +1 means 1 line changed and 2 is the number of lines in the files [15:15:55] shows both the file [15:16:03] M means that file is modified and ? means that file is not under revision control. [15:16:25] It says A byte.txt [15:16:33] ? bye.txt [15:16:55] got it. [15:17:01] CuriousLearner, because you don't know how to follow steps given by me and you gave your own commands in between. [15:17:13] Now everyone do hg add bye.txt [15:17:29] CuriousLearner: you gave hg commit :) [15:17:32] and then check the status again. [15:17:35] iamviknesh, no [15:17:40] iamviknesh, he did hg add [15:17:55] oh sorry my mistake :P [15:18:05] After you see the status, we will do another commit [15:18:17] now it says A bye.txt [15:18:19] But before that I want everyone to be in same status [15:18:35] ahhda, yes, correct, it should have another change in hello.txt file. [15:19:45] Both differ in colour [15:20:18] ahhda, and a character in front [15:20:24] kushal, what change please? [15:20:26] A bye.txt [15:20:33] Yes, M hello.txt [15:20:36] acetakwas, ? [15:21:04] kushal, sorry for that and finally i am no more lagging behind! [15:21:11] you said, it should have another change in the hello.txt file and a character in front [15:21:17] I don't understand that [15:21:35] What I have in my terminal is: [15:21:39] acetakwas by change he meant difference [15:21:40] acetakwas, yeah done with it, was doing that silly mistake [15:21:41] M hello.txt [15:21:47] A bye.txt [15:22:00] acetakwas, you are good to go [15:22:02] acetakwas, yes, that is the thing I was talking as ahhda wrote about only bye.txt [15:22:12] humpty, okay cool ;) [15:22:24] okay [15:23:33] Now before we do the third commit, we should learn a little bit about commit messages. [15:23:54] They should be meaningful, in present tense generally [15:24:13] * abhiram_rk is finally on board. [15:24:17] After the first line you can actually start adding up more details. [15:24:26] Let me show an example. [15:26:03] Read the commit message I used just now [15:26:04] http://paste.fedoraproject.org/117846/14053513/raw/ [15:26:23] Remember to give a blank line between first line and next paragraph. [15:27:44] now everyone commit it. [15:27:51] with a proper message like mine. [15:27:58] ! [15:28:00] and then do hg log [15:28:04] next [15:28:10] should we type that [15:28:14] kushal, but why is that blank line required? [15:28:18] ? [15:28:32] humpty, do a hg log [15:28:46] acetakwas, type the message I typed. [15:28:47] repeat last line please got disconnected [15:29:04] the text after new line don't show up in hg log [15:29:06] lixxz_, use waartaa please [15:29:07] kushal, it shows just first line, working fine? or I'm on completely different track? [15:29:11] iamviknesh, CuriousLearner yes [15:29:18] in the hello.txt file? [15:29:29] acetakwas, no as the commit message. [15:29:35] kushal, it doesn't happen that often [15:29:42] lixxz_ is now known as lixxz [15:30:04] CuriousLearner, iamviknesh people do not want to read the whole commit message, they will get an idea about the commit from the first line [15:30:12] and then if required they will read about it. [15:30:37] kushal: oh ok :) [15:30:52] ! [15:31:16] next [15:31:19] ! [15:31:22] next [15:31:29] So how do we get to read that extra commit message? [15:31:33] ! [15:31:39] thejaman, I am coming to that [15:31:40] next [15:31:50] Same question as Thejaman [15:31:53] kushal: yeah the same question :) [15:32:54] Now can everyone see a changeset number for the 3rd commit? [15:33:02] use that number like below [15:33:05] yes [15:33:22] hg log -v -r 0e558dd2a91d [15:33:35] -v is for verbose [15:34:14] got it, Thanks [15:34:27] yeah , full commit message :) [15:34:47] done [15:34:58] done [15:34:59] Now say you do not want to commit while you are writing the commit message [15:35:09] Just do not save that file and exit [15:35:12] :q! [15:35:16] ^^ in vim [15:35:19] done [15:35:22] It will not commit it [15:35:30] ! [15:35:31] first make any change to hello.txt [15:35:42] okay [15:35:50] and then try to commit and then from the commit message editor do that above command. [15:35:54] and exit [15:35:54] next [15:36:08] So this means in order to commit a change it is necessary to write something as commit message, even if it's just a word? Right? kushal [15:36:32] CuriousLearner, yes [15:36:44] CuriousLearner, better if you can write a proper commit message. [15:37:04] done [15:37:11] got it, thanks [15:38:23] Is everyone ok with what we discussed till today? [15:38:29] yes [15:38:30] yes [15:38:31] yes [15:38:33] ! [15:38:37] next [15:38:38] yes, [15:38:41] absolutely [15:38:46] * acetakwas says Yes! [15:38:55] * lixxz yes [15:38:58] yes [15:38:58] yes [15:39:04] kushal, I want to try all this once again, I will read the log, can you tell me how to erase all this what I've done, I mean the repositories? [15:39:09] Yes. [15:39:17] yeah! [15:39:19] ! [15:39:21] CuriousLearner, cd .. and just remove the directory. [15:39:26] next [15:39:40] So Git is for the next class, right? [15:39:44] yes [15:40:07] ! [15:40:48] CuriousLearner, +1 [15:40:59] acetakwas, mostly no [15:41:16] Can I revert just one version of changes ? i.e go to currentversion -1 ? [15:41:27] ! [15:41:35] when will it likely be then? [15:41:49] next class will be on wednesday? [15:42:01] next [15:42:03] next [15:42:11] RakRock, yes [15:42:19] next [15:42:25] korak1, yes [15:42:30] okay, [15:42:38] ! [15:42:42] okay [15:42:55] So till tomorrow, please try out the commands from today's session and keep an eye on http://summertraining.readthedocs.org/en/latest/mercurial.html [15:43:12] I will adding stuff in there for Wednesday's session. [15:43:23] acetakwas, later some time. [15:43:36] kushal, 'tomorrow'? [15:43:43] * acetakwas rolls his eyes [15:43:59] acetakwas, yes, I will update the book we are writing for the summer training. [15:44:31] kushal: The book idea is amazing. [15:44:52] okay readthedocs [15:44:54] abhiram_rk, it was in plan for a long time, this year we are just doing it. [15:45:08] kushal, +1 [15:45:09] We will meet again on Wednesday. [15:45:18] --------SESSION ENDS-------- [15:45:26] Thanks kushal [15:45:27] batul endclass [15:45:27] [## Class Ended at Mon Jul 14 15:45:27 2014 ##]