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