Mercurial > hg-talk

annotate session1.sh @ 2:dd7a3a06dfe7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add some stuff about help command to session1.sh
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Thu, 06 Nov 2014 16:48:08 -0500
parents 882028e37e4a
children 4f46f63130a6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
1 #doitlive commentecho: true
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
2 #doitlive prompt: {user.blue}@{TTY.MAGENTA}mtlpyladies{TTY.RESET}:{dir.green}$
2
dd7a3a06dfe7 Add some stuff about help command to session1.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 0
diff changeset
3
dd7a3a06dfe7 Add some stuff about help command to session1.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 0
diff changeset
4 #First, what is hg?
dd7a3a06dfe7 Add some stuff about help command to session1.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 0
diff changeset
5 hg
dd7a3a06dfe7 Add some stuff about help command to session1.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 0
diff changeset
6 hg help
dd7a3a06dfe7 Add some stuff about help command to session1.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 0
diff changeset
7
dd7a3a06dfe7 Add some stuff about help command to session1.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 0
diff changeset
8 #doitlive pause:
dd7a3a06dfe7 Add some stuff about help command to session1.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 0
diff changeset
9 #To read the help of a particular command...
dd7a3a06dfe7 Add some stuff about help command to session1.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 0
diff changeset
10 hg help init
dd7a3a06dfe7 Add some stuff about help command to session1.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 0
diff changeset
11
dd7a3a06dfe7 Add some stuff about help command to session1.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 0
diff changeset
12 #doitlive pause:
dd7a3a06dfe7 Add some stuff about help command to session1.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 0
diff changeset
13 #Let's do some configging!
0
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
14 hg config --edit
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
15
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
16 #And our first repo
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
17 hg init planets
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
18 cd planets
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
19
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
20 #Work on our first file
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
21 echo "Cold and dry, but everything is my favorite color" > mars.txt
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
22 ls
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
23 cat mars.txt
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
24
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
25 #
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
26 #Several ways to get information about our current state
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
27 hg summary
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
28 hg status
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
29 hg diff
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
30
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
31 #
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
32 #Add the file
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
33 hg add mars.txt
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
34
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
35 #
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
36 #Let's see how the information changed!
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
37 hg summary
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
38 hg status
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
39 hg diff
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
40
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
41 #
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
42 #And we commit the file
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
43 hg commit -m "Starting to think about Mars"
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
44
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
45 hg summary
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
46 hg status
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
47 hg diff
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
48
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
49 #
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
50 #Most excitingly, we have a log!
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
51 hg log
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
52
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
53 echo "The two moons may be a problem for Wolfman" >> mars.txt
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
54
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
55 #Adding more changes will show up differently
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
56 hg summary
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
57 hg status
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
58 hg diff
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
59
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
60 hg commit -m "Concerns about Mars's moons on my furry friend"
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
61 hg log
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
62
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
63 #Another change, this time adding another file...
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
64 echo "But the Mummy will appreciate the lack of humidity" >> mars.txt
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
65 echo "That big red spot is quite the storm." >> jupiter.txt
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
66 hg add jupiter.txt
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
67 ls
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
68 hg diff
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
69 hg commit -m "Thoughts about the climate"
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
70
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
71 #Now that we have some history to speak of, let's explore it.
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
72 hg log --patch --verbose --graph
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
73 hg log -pvG
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
74 hg glog -pv
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
75 hg glog --patch --verbose --rev 1
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
76 hg glog -pvr 1
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
77
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
78 hg diff -r 0 -r 2
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
79 hg diff -r 1 -r 2
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
80 hg diff --change 2
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
81 hg diff -c 2
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
82
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
83 hg annotate mars.txt
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
84 hg ann --user --date --number --changeset mars.txt
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
85 hg ann -udnc --quiet mars.txt
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
86
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
87 #Let's make some mistakes...
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
88 echo "We will need to manufacture our own oxygen" >> mars.txt
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
89 hg diff
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
90
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
91 #Nah, never mind, we don't want to record this change, let's just throw it out
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
92 hg revert mars.txt
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
93 hg diff
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
94
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
95 #Y'know what, let's actually restore this file to an older version
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
96 hg rev -r 0 mars.txt
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
97 hg diff
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
98
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
99 #Hm, but why does that look changed?
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
100 hg rev mars.txt
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
101
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
102 #Let's *move* around the history instead of just changing individual files
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
103 hg update --rev 0
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
104 cat mars.txt
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
105 hg summ
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
106 hg glog
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
107 hg up -r 1
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
108 cat mars.txt
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
109 hg summ
882028e37e4a Add first session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
110 hg glog