-
Notifications
You must be signed in to change notification settings - Fork 30
/
monky.info
238 lines (182 loc) · 7.32 KB
/
monky.info
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
This is monky.info, produced by makeinfo version 7.0.2 from monky.texi.
Copyright © 2010 Anantha Kumaran.
Permission is granted to copy, distribute and/or modify this
document under the terms of the GNU Free Documentation License,
Version 1.2 or any later version published by the Free Software
Foundation; with no Invariant Sections, with no Front-Cover Texts,
and with no Back-Cover Texts.
INFO-DIR-SECTION Emacs
START-INFO-DIR-ENTRY
* Monky: (monky). An interactive interface for Hg.
END-INFO-DIR-ENTRY
File: monky.info, Node: Top, Next: Introduction, Up: (dir)
Monky User Manual
*****************
Monky is an emacs extension, provides an interactive interface for Hg
* Menu:
* Introduction::
* Sections::
* Status::
* Untracked files::
* Missing Files::
* Staging and Committing::
* Merged Files::
* Pushing and Pulling::
* Log::
* Blame::
* Branch::
* Queue::
* Using Hg Directly::
File: monky.info, Node: Introduction, Next: Sections, Prev: Top, Up: Top
1 Introduction
**************
Monky provides an interactive interface for Hg. Using Monky, your can
selectively commit files, view the diffs and other things.
File: monky.info, Node: Sections, Next: Status, Prev: Introduction, Up: Top
2 Sections
**********
All items in the Monky buffers are nested ’sections’. The visibility of
the current section can be toggled using ‘TAB’ key. When a section is
hidden, only its first line is shown and all its children are completely
invisible.
File: monky.info, Node: Status, Next: Untracked files, Prev: Sections, Up: Top
3 Status
********
Running ‘M-x monky-status’ while visiting any file in a repo displays
the status of the hg repo. The status buffer list down the missing
files, untracked files and changed files. By default the diff of the
files are invisible. Use ‘TAB’ key to toggle the visibility.
During a merge the buffer will show the list of merged files, and
files unmodified during the merge.
File: monky.info, Node: Untracked files, Next: Missing Files, Prev: Status, Up: Top
4 Untracked files
*****************
You can add a untracked file by typing key ‘s’. Type ‘k’ to delete the
file.
File: monky.info, Node: Missing Files, Next: Staging and Committing, Prev: Untracked files, Up: Top
5 Missing Files
***************
This section list the files missing from the repo. Typing ‘s’ will
remove the file from the repo. To restore the file type ‘k’.
File: monky.info, Node: Staging and Committing, Next: Merged Files, Prev: Missing Files, Up: Top
6 Staging and Committing
************************
_Changes_ section will list all the changes in the repo. Using monky
you can select a subset of your changes and commit it. Type ‘s’ to
stage a file. Typing ‘S’ will stage all files.
_Staged Changes_ section will list all the staged changes in the
repo. Type ‘u’ to unstage a file. Typing ‘U’ will unstage all the
previously staged files.
Once you staged all the necessary files type ‘c’. This will pop-up a
buffer for the commit message. Typing ‘C-c C-c’ will commit all the
staged files.
You can reset the current working directory by typing ‘X’.
Hg doesn’t have any staging area. So staging and unstaging won’t
make any changes to your repo unless you commit.
File: monky.info, Node: Merged Files, Next: Pushing and Pulling, Prev: Staging and Committing, Up: Top
7 Merged Files
**************
After a merge, this section will list the files merged. Typing ‘m’ will
mark the file as resolved and ‘x’ will mark the file as unresolved.
After a merge, Hg doesn’t allows to commit a subset of changes. so
files can’t be staged or unstaged. So committing after a merge will
commit all the merged and unmodified files during the merge.
File: monky.info, Node: Pushing and Pulling, Next: Log, Prev: Merged Files, Up: Top
8 Pushing and Pulling
*********************
Type ‘P’ to push the current branch, ‘f’ to pull changes from remote and
‘F’ to fetch changes from the remote. You can specify the
source/destination to the previous commands with a prefix argument.
File: monky.info, Node: Log, Next: Blame, Prev: Pushing and Pulling, Up: Top
9 Log
*****
Typing ‘l’ will bring up the log buffer. This will list the commit logs
of the repo. You can use ‘n’ and ‘p’ to move to the previous and next
commit. Type ‘RET’ to see the commit information, ‘C’ to checkout the
commit.
Monky will show only ‘monky-log-cutoff-length’ entries. Typing ‘e’
will show twice as many entries. ‘C-u e’ will show all entries, and
given a numeric prefix argument, ‘e’ will add this number of entries.
File: monky.info, Node: Blame, Next: Branch, Prev: Log, Up: Top
10 Blame
********
Run ‘M-x monky-blame-current-file’ to see the annotation of the current
file. Type ‘RET’ to see the commit which introduced/changed the current
line.
File: monky.info, Node: Branch, Next: Queue, Prev: Blame, Up: Top
11 Branch
*********
Typing ‘b’ will bring up the branch buffer. This will list all the
branches. You can use ‘C’ to checkout a branch.
File: monky.info, Node: Queue, Next: Using Hg Directly, Prev: Branch, Up: Top
12 Queue
********
Use ‘M-x monky-queue’ or ‘Q’ from the status buffer to view the queue
buffer. The queue buffer will list the _Applied Patches_, _UnApplied
Patches_ and the _Series_.
Key Description
--------------------------------------------------------------------------
u pop the selected patch and all the patches before it
U pop all the applied patches
s push the selected patch and all the patches before it
S push all the unapplied patches
r refresh(update) the current patch with the changes in
working directory
C-u r refresh the current patch and allows to edit the commit
message
R rename the selected patch
k remove the selected patch
N create a new patch on top of current patch
C-u N same as N except this will also read the commit message for
the patch
i import(qimport) patches from change sets. a change set at
the point or change sets in a selected region (when
selected) will be imported.
d fold the selected patch into the current patch
f apply(qfinish) the selected patch into repo history
F apply(qfinish) all applied patches into repo history
G reset the guards of the selected patch with new guards
o pop all patches and edit .hg/patches/series file to reorder
them
File: monky.info, Node: Using Hg Directly, Prev: Queue, Up: Top
13 Using Hg Directly
********************
To run a Hg command directly type ‘:’ and enter the command in the
minibuffer. This will refresh the status buffer after the execution of
command. The output of the command can be viewed by typing ‘$’.
Tag Table:
Node: Top549
Node: Introduction940
Node: Sections1182
Node: Status1525
Node: Untracked files2014
Node: Missing Files2229
Node: Staging and Committing2508
Node: Merged Files3383
Node: Pushing and Pulling3876
Node: Log4225
Node: Blame4793
Node: Branch5043
Node: Queue5263
Node: Using Hg Directly6785
End Tag Table
Local Variables:
coding: utf-8
End: