##// END OF EJS Templates
log: document the characters ---graph uses to draw...
Matt DeVore -
r32075:7000196a stable
parent child Browse files
Show More
@@ -1,5478 +1,5480 b''
1 # commands.py - command processing for mercurial
1 # commands.py - command processing for mercurial
2 #
2 #
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7
7
8 from __future__ import absolute_import
8 from __future__ import absolute_import
9
9
10 import difflib
10 import difflib
11 import errno
11 import errno
12 import os
12 import os
13 import re
13 import re
14
14
15 from .i18n import _
15 from .i18n import _
16 from .node import (
16 from .node import (
17 hex,
17 hex,
18 nullid,
18 nullid,
19 nullrev,
19 nullrev,
20 short,
20 short,
21 )
21 )
22 from . import (
22 from . import (
23 archival,
23 archival,
24 bookmarks,
24 bookmarks,
25 bundle2,
25 bundle2,
26 changegroup,
26 changegroup,
27 cmdutil,
27 cmdutil,
28 copies,
28 copies,
29 destutil,
29 destutil,
30 dirstateguard,
30 dirstateguard,
31 discovery,
31 discovery,
32 encoding,
32 encoding,
33 error,
33 error,
34 exchange,
34 exchange,
35 extensions,
35 extensions,
36 graphmod,
36 graphmod,
37 hbisect,
37 hbisect,
38 help,
38 help,
39 hg,
39 hg,
40 lock as lockmod,
40 lock as lockmod,
41 merge as mergemod,
41 merge as mergemod,
42 obsolete,
42 obsolete,
43 patch,
43 patch,
44 phases,
44 phases,
45 pycompat,
45 pycompat,
46 rcutil,
46 rcutil,
47 revsetlang,
47 revsetlang,
48 scmutil,
48 scmutil,
49 server,
49 server,
50 sshserver,
50 sshserver,
51 streamclone,
51 streamclone,
52 tags as tagsmod,
52 tags as tagsmod,
53 templatekw,
53 templatekw,
54 ui as uimod,
54 ui as uimod,
55 util,
55 util,
56 )
56 )
57
57
58 release = lockmod.release
58 release = lockmod.release
59
59
60 table = {}
60 table = {}
61
61
62 command = cmdutil.command(table)
62 command = cmdutil.command(table)
63
63
64 # label constants
64 # label constants
65 # until 3.5, bookmarks.current was the advertised name, not
65 # until 3.5, bookmarks.current was the advertised name, not
66 # bookmarks.active, so we must use both to avoid breaking old
66 # bookmarks.active, so we must use both to avoid breaking old
67 # custom styles
67 # custom styles
68 activebookmarklabel = 'bookmarks.active bookmarks.current'
68 activebookmarklabel = 'bookmarks.active bookmarks.current'
69
69
70 # common command options
70 # common command options
71
71
72 globalopts = [
72 globalopts = [
73 ('R', 'repository', '',
73 ('R', 'repository', '',
74 _('repository root directory or name of overlay bundle file'),
74 _('repository root directory or name of overlay bundle file'),
75 _('REPO')),
75 _('REPO')),
76 ('', 'cwd', '',
76 ('', 'cwd', '',
77 _('change working directory'), _('DIR')),
77 _('change working directory'), _('DIR')),
78 ('y', 'noninteractive', None,
78 ('y', 'noninteractive', None,
79 _('do not prompt, automatically pick the first choice for all prompts')),
79 _('do not prompt, automatically pick the first choice for all prompts')),
80 ('q', 'quiet', None, _('suppress output')),
80 ('q', 'quiet', None, _('suppress output')),
81 ('v', 'verbose', None, _('enable additional output')),
81 ('v', 'verbose', None, _('enable additional output')),
82 ('', 'color', '',
82 ('', 'color', '',
83 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
83 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
84 # and should not be translated
84 # and should not be translated
85 _("when to colorize (boolean, always, auto, never, or debug)"),
85 _("when to colorize (boolean, always, auto, never, or debug)"),
86 _('TYPE')),
86 _('TYPE')),
87 ('', 'config', [],
87 ('', 'config', [],
88 _('set/override config option (use \'section.name=value\')'),
88 _('set/override config option (use \'section.name=value\')'),
89 _('CONFIG')),
89 _('CONFIG')),
90 ('', 'debug', None, _('enable debugging output')),
90 ('', 'debug', None, _('enable debugging output')),
91 ('', 'debugger', None, _('start debugger')),
91 ('', 'debugger', None, _('start debugger')),
92 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
92 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
93 _('ENCODE')),
93 _('ENCODE')),
94 ('', 'encodingmode', encoding.encodingmode,
94 ('', 'encodingmode', encoding.encodingmode,
95 _('set the charset encoding mode'), _('MODE')),
95 _('set the charset encoding mode'), _('MODE')),
96 ('', 'traceback', None, _('always print a traceback on exception')),
96 ('', 'traceback', None, _('always print a traceback on exception')),
97 ('', 'time', None, _('time how long the command takes')),
97 ('', 'time', None, _('time how long the command takes')),
98 ('', 'profile', None, _('print command execution profile')),
98 ('', 'profile', None, _('print command execution profile')),
99 ('', 'version', None, _('output version information and exit')),
99 ('', 'version', None, _('output version information and exit')),
100 ('h', 'help', None, _('display help and exit')),
100 ('h', 'help', None, _('display help and exit')),
101 ('', 'hidden', False, _('consider hidden changesets')),
101 ('', 'hidden', False, _('consider hidden changesets')),
102 ('', 'pager', 'auto',
102 ('', 'pager', 'auto',
103 _("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
103 _("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
104 ]
104 ]
105
105
106 dryrunopts = [('n', 'dry-run', None,
106 dryrunopts = [('n', 'dry-run', None,
107 _('do not perform actions, just print output'))]
107 _('do not perform actions, just print output'))]
108
108
109 remoteopts = [
109 remoteopts = [
110 ('e', 'ssh', '',
110 ('e', 'ssh', '',
111 _('specify ssh command to use'), _('CMD')),
111 _('specify ssh command to use'), _('CMD')),
112 ('', 'remotecmd', '',
112 ('', 'remotecmd', '',
113 _('specify hg command to run on the remote side'), _('CMD')),
113 _('specify hg command to run on the remote side'), _('CMD')),
114 ('', 'insecure', None,
114 ('', 'insecure', None,
115 _('do not verify server certificate (ignoring web.cacerts config)')),
115 _('do not verify server certificate (ignoring web.cacerts config)')),
116 ]
116 ]
117
117
118 walkopts = [
118 walkopts = [
119 ('I', 'include', [],
119 ('I', 'include', [],
120 _('include names matching the given patterns'), _('PATTERN')),
120 _('include names matching the given patterns'), _('PATTERN')),
121 ('X', 'exclude', [],
121 ('X', 'exclude', [],
122 _('exclude names matching the given patterns'), _('PATTERN')),
122 _('exclude names matching the given patterns'), _('PATTERN')),
123 ]
123 ]
124
124
125 commitopts = [
125 commitopts = [
126 ('m', 'message', '',
126 ('m', 'message', '',
127 _('use text as commit message'), _('TEXT')),
127 _('use text as commit message'), _('TEXT')),
128 ('l', 'logfile', '',
128 ('l', 'logfile', '',
129 _('read commit message from file'), _('FILE')),
129 _('read commit message from file'), _('FILE')),
130 ]
130 ]
131
131
132 commitopts2 = [
132 commitopts2 = [
133 ('d', 'date', '',
133 ('d', 'date', '',
134 _('record the specified date as commit date'), _('DATE')),
134 _('record the specified date as commit date'), _('DATE')),
135 ('u', 'user', '',
135 ('u', 'user', '',
136 _('record the specified user as committer'), _('USER')),
136 _('record the specified user as committer'), _('USER')),
137 ]
137 ]
138
138
139 # hidden for now
139 # hidden for now
140 formatteropts = [
140 formatteropts = [
141 ('T', 'template', '',
141 ('T', 'template', '',
142 _('display with template (EXPERIMENTAL)'), _('TEMPLATE')),
142 _('display with template (EXPERIMENTAL)'), _('TEMPLATE')),
143 ]
143 ]
144
144
145 templateopts = [
145 templateopts = [
146 ('', 'style', '',
146 ('', 'style', '',
147 _('display using template map file (DEPRECATED)'), _('STYLE')),
147 _('display using template map file (DEPRECATED)'), _('STYLE')),
148 ('T', 'template', '',
148 ('T', 'template', '',
149 _('display with template'), _('TEMPLATE')),
149 _('display with template'), _('TEMPLATE')),
150 ]
150 ]
151
151
152 logopts = [
152 logopts = [
153 ('p', 'patch', None, _('show patch')),
153 ('p', 'patch', None, _('show patch')),
154 ('g', 'git', None, _('use git extended diff format')),
154 ('g', 'git', None, _('use git extended diff format')),
155 ('l', 'limit', '',
155 ('l', 'limit', '',
156 _('limit number of changes displayed'), _('NUM')),
156 _('limit number of changes displayed'), _('NUM')),
157 ('M', 'no-merges', None, _('do not show merges')),
157 ('M', 'no-merges', None, _('do not show merges')),
158 ('', 'stat', None, _('output diffstat-style summary of changes')),
158 ('', 'stat', None, _('output diffstat-style summary of changes')),
159 ('G', 'graph', None, _("show the revision DAG")),
159 ('G', 'graph', None, _("show the revision DAG")),
160 ] + templateopts
160 ] + templateopts
161
161
162 diffopts = [
162 diffopts = [
163 ('a', 'text', None, _('treat all files as text')),
163 ('a', 'text', None, _('treat all files as text')),
164 ('g', 'git', None, _('use git extended diff format')),
164 ('g', 'git', None, _('use git extended diff format')),
165 ('', 'binary', None, _('generate binary diffs in git mode (default)')),
165 ('', 'binary', None, _('generate binary diffs in git mode (default)')),
166 ('', 'nodates', None, _('omit dates from diff headers'))
166 ('', 'nodates', None, _('omit dates from diff headers'))
167 ]
167 ]
168
168
169 diffwsopts = [
169 diffwsopts = [
170 ('w', 'ignore-all-space', None,
170 ('w', 'ignore-all-space', None,
171 _('ignore white space when comparing lines')),
171 _('ignore white space when comparing lines')),
172 ('b', 'ignore-space-change', None,
172 ('b', 'ignore-space-change', None,
173 _('ignore changes in the amount of white space')),
173 _('ignore changes in the amount of white space')),
174 ('B', 'ignore-blank-lines', None,
174 ('B', 'ignore-blank-lines', None,
175 _('ignore changes whose lines are all blank')),
175 _('ignore changes whose lines are all blank')),
176 ]
176 ]
177
177
178 diffopts2 = [
178 diffopts2 = [
179 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')),
179 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')),
180 ('p', 'show-function', None, _('show which function each change is in')),
180 ('p', 'show-function', None, _('show which function each change is in')),
181 ('', 'reverse', None, _('produce a diff that undoes the changes')),
181 ('', 'reverse', None, _('produce a diff that undoes the changes')),
182 ] + diffwsopts + [
182 ] + diffwsopts + [
183 ('U', 'unified', '',
183 ('U', 'unified', '',
184 _('number of lines of context to show'), _('NUM')),
184 _('number of lines of context to show'), _('NUM')),
185 ('', 'stat', None, _('output diffstat-style summary of changes')),
185 ('', 'stat', None, _('output diffstat-style summary of changes')),
186 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')),
186 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')),
187 ]
187 ]
188
188
189 mergetoolopts = [
189 mergetoolopts = [
190 ('t', 'tool', '', _('specify merge tool')),
190 ('t', 'tool', '', _('specify merge tool')),
191 ]
191 ]
192
192
193 similarityopts = [
193 similarityopts = [
194 ('s', 'similarity', '',
194 ('s', 'similarity', '',
195 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
195 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
196 ]
196 ]
197
197
198 subrepoopts = [
198 subrepoopts = [
199 ('S', 'subrepos', None,
199 ('S', 'subrepos', None,
200 _('recurse into subrepositories'))
200 _('recurse into subrepositories'))
201 ]
201 ]
202
202
203 debugrevlogopts = [
203 debugrevlogopts = [
204 ('c', 'changelog', False, _('open changelog')),
204 ('c', 'changelog', False, _('open changelog')),
205 ('m', 'manifest', False, _('open manifest')),
205 ('m', 'manifest', False, _('open manifest')),
206 ('', 'dir', '', _('open directory manifest')),
206 ('', 'dir', '', _('open directory manifest')),
207 ]
207 ]
208
208
209 # Commands start here, listed alphabetically
209 # Commands start here, listed alphabetically
210
210
211 @command('^add',
211 @command('^add',
212 walkopts + subrepoopts + dryrunopts,
212 walkopts + subrepoopts + dryrunopts,
213 _('[OPTION]... [FILE]...'),
213 _('[OPTION]... [FILE]...'),
214 inferrepo=True)
214 inferrepo=True)
215 def add(ui, repo, *pats, **opts):
215 def add(ui, repo, *pats, **opts):
216 """add the specified files on the next commit
216 """add the specified files on the next commit
217
217
218 Schedule files to be version controlled and added to the
218 Schedule files to be version controlled and added to the
219 repository.
219 repository.
220
220
221 The files will be added to the repository at the next commit. To
221 The files will be added to the repository at the next commit. To
222 undo an add before that, see :hg:`forget`.
222 undo an add before that, see :hg:`forget`.
223
223
224 If no names are given, add all files to the repository (except
224 If no names are given, add all files to the repository (except
225 files matching ``.hgignore``).
225 files matching ``.hgignore``).
226
226
227 .. container:: verbose
227 .. container:: verbose
228
228
229 Examples:
229 Examples:
230
230
231 - New (unknown) files are added
231 - New (unknown) files are added
232 automatically by :hg:`add`::
232 automatically by :hg:`add`::
233
233
234 $ ls
234 $ ls
235 foo.c
235 foo.c
236 $ hg status
236 $ hg status
237 ? foo.c
237 ? foo.c
238 $ hg add
238 $ hg add
239 adding foo.c
239 adding foo.c
240 $ hg status
240 $ hg status
241 A foo.c
241 A foo.c
242
242
243 - Specific files to be added can be specified::
243 - Specific files to be added can be specified::
244
244
245 $ ls
245 $ ls
246 bar.c foo.c
246 bar.c foo.c
247 $ hg status
247 $ hg status
248 ? bar.c
248 ? bar.c
249 ? foo.c
249 ? foo.c
250 $ hg add bar.c
250 $ hg add bar.c
251 $ hg status
251 $ hg status
252 A bar.c
252 A bar.c
253 ? foo.c
253 ? foo.c
254
254
255 Returns 0 if all files are successfully added.
255 Returns 0 if all files are successfully added.
256 """
256 """
257
257
258 m = scmutil.match(repo[None], pats, opts)
258 m = scmutil.match(repo[None], pats, opts)
259 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
259 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
260 return rejected and 1 or 0
260 return rejected and 1 or 0
261
261
262 @command('addremove',
262 @command('addremove',
263 similarityopts + subrepoopts + walkopts + dryrunopts,
263 similarityopts + subrepoopts + walkopts + dryrunopts,
264 _('[OPTION]... [FILE]...'),
264 _('[OPTION]... [FILE]...'),
265 inferrepo=True)
265 inferrepo=True)
266 def addremove(ui, repo, *pats, **opts):
266 def addremove(ui, repo, *pats, **opts):
267 """add all new files, delete all missing files
267 """add all new files, delete all missing files
268
268
269 Add all new files and remove all missing files from the
269 Add all new files and remove all missing files from the
270 repository.
270 repository.
271
271
272 Unless names are given, new files are ignored if they match any of
272 Unless names are given, new files are ignored if they match any of
273 the patterns in ``.hgignore``. As with add, these changes take
273 the patterns in ``.hgignore``. As with add, these changes take
274 effect at the next commit.
274 effect at the next commit.
275
275
276 Use the -s/--similarity option to detect renamed files. This
276 Use the -s/--similarity option to detect renamed files. This
277 option takes a percentage between 0 (disabled) and 100 (files must
277 option takes a percentage between 0 (disabled) and 100 (files must
278 be identical) as its parameter. With a parameter greater than 0,
278 be identical) as its parameter. With a parameter greater than 0,
279 this compares every removed file with every added file and records
279 this compares every removed file with every added file and records
280 those similar enough as renames. Detecting renamed files this way
280 those similar enough as renames. Detecting renamed files this way
281 can be expensive. After using this option, :hg:`status -C` can be
281 can be expensive. After using this option, :hg:`status -C` can be
282 used to check which files were identified as moved or renamed. If
282 used to check which files were identified as moved or renamed. If
283 not specified, -s/--similarity defaults to 100 and only renames of
283 not specified, -s/--similarity defaults to 100 and only renames of
284 identical files are detected.
284 identical files are detected.
285
285
286 .. container:: verbose
286 .. container:: verbose
287
287
288 Examples:
288 Examples:
289
289
290 - A number of files (bar.c and foo.c) are new,
290 - A number of files (bar.c and foo.c) are new,
291 while foobar.c has been removed (without using :hg:`remove`)
291 while foobar.c has been removed (without using :hg:`remove`)
292 from the repository::
292 from the repository::
293
293
294 $ ls
294 $ ls
295 bar.c foo.c
295 bar.c foo.c
296 $ hg status
296 $ hg status
297 ! foobar.c
297 ! foobar.c
298 ? bar.c
298 ? bar.c
299 ? foo.c
299 ? foo.c
300 $ hg addremove
300 $ hg addremove
301 adding bar.c
301 adding bar.c
302 adding foo.c
302 adding foo.c
303 removing foobar.c
303 removing foobar.c
304 $ hg status
304 $ hg status
305 A bar.c
305 A bar.c
306 A foo.c
306 A foo.c
307 R foobar.c
307 R foobar.c
308
308
309 - A file foobar.c was moved to foo.c without using :hg:`rename`.
309 - A file foobar.c was moved to foo.c without using :hg:`rename`.
310 Afterwards, it was edited slightly::
310 Afterwards, it was edited slightly::
311
311
312 $ ls
312 $ ls
313 foo.c
313 foo.c
314 $ hg status
314 $ hg status
315 ! foobar.c
315 ! foobar.c
316 ? foo.c
316 ? foo.c
317 $ hg addremove --similarity 90
317 $ hg addremove --similarity 90
318 removing foobar.c
318 removing foobar.c
319 adding foo.c
319 adding foo.c
320 recording removal of foobar.c as rename to foo.c (94% similar)
320 recording removal of foobar.c as rename to foo.c (94% similar)
321 $ hg status -C
321 $ hg status -C
322 A foo.c
322 A foo.c
323 foobar.c
323 foobar.c
324 R foobar.c
324 R foobar.c
325
325
326 Returns 0 if all files are successfully added.
326 Returns 0 if all files are successfully added.
327 """
327 """
328 try:
328 try:
329 sim = float(opts.get('similarity') or 100)
329 sim = float(opts.get('similarity') or 100)
330 except ValueError:
330 except ValueError:
331 raise error.Abort(_('similarity must be a number'))
331 raise error.Abort(_('similarity must be a number'))
332 if sim < 0 or sim > 100:
332 if sim < 0 or sim > 100:
333 raise error.Abort(_('similarity must be between 0 and 100'))
333 raise error.Abort(_('similarity must be between 0 and 100'))
334 matcher = scmutil.match(repo[None], pats, opts)
334 matcher = scmutil.match(repo[None], pats, opts)
335 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
335 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
336
336
337 @command('^annotate|blame',
337 @command('^annotate|blame',
338 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
338 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
339 ('', 'follow', None,
339 ('', 'follow', None,
340 _('follow copies/renames and list the filename (DEPRECATED)')),
340 _('follow copies/renames and list the filename (DEPRECATED)')),
341 ('', 'no-follow', None, _("don't follow copies and renames")),
341 ('', 'no-follow', None, _("don't follow copies and renames")),
342 ('a', 'text', None, _('treat all files as text')),
342 ('a', 'text', None, _('treat all files as text')),
343 ('u', 'user', None, _('list the author (long with -v)')),
343 ('u', 'user', None, _('list the author (long with -v)')),
344 ('f', 'file', None, _('list the filename')),
344 ('f', 'file', None, _('list the filename')),
345 ('d', 'date', None, _('list the date (short with -q)')),
345 ('d', 'date', None, _('list the date (short with -q)')),
346 ('n', 'number', None, _('list the revision number (default)')),
346 ('n', 'number', None, _('list the revision number (default)')),
347 ('c', 'changeset', None, _('list the changeset')),
347 ('c', 'changeset', None, _('list the changeset')),
348 ('l', 'line-number', None, _('show line number at the first appearance'))
348 ('l', 'line-number', None, _('show line number at the first appearance'))
349 ] + diffwsopts + walkopts + formatteropts,
349 ] + diffwsopts + walkopts + formatteropts,
350 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
350 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
351 inferrepo=True)
351 inferrepo=True)
352 def annotate(ui, repo, *pats, **opts):
352 def annotate(ui, repo, *pats, **opts):
353 """show changeset information by line for each file
353 """show changeset information by line for each file
354
354
355 List changes in files, showing the revision id responsible for
355 List changes in files, showing the revision id responsible for
356 each line.
356 each line.
357
357
358 This command is useful for discovering when a change was made and
358 This command is useful for discovering when a change was made and
359 by whom.
359 by whom.
360
360
361 If you include --file, --user, or --date, the revision number is
361 If you include --file, --user, or --date, the revision number is
362 suppressed unless you also include --number.
362 suppressed unless you also include --number.
363
363
364 Without the -a/--text option, annotate will avoid processing files
364 Without the -a/--text option, annotate will avoid processing files
365 it detects as binary. With -a, annotate will annotate the file
365 it detects as binary. With -a, annotate will annotate the file
366 anyway, although the results will probably be neither useful
366 anyway, although the results will probably be neither useful
367 nor desirable.
367 nor desirable.
368
368
369 Returns 0 on success.
369 Returns 0 on success.
370 """
370 """
371 if not pats:
371 if not pats:
372 raise error.Abort(_('at least one filename or pattern is required'))
372 raise error.Abort(_('at least one filename or pattern is required'))
373
373
374 if opts.get('follow'):
374 if opts.get('follow'):
375 # --follow is deprecated and now just an alias for -f/--file
375 # --follow is deprecated and now just an alias for -f/--file
376 # to mimic the behavior of Mercurial before version 1.5
376 # to mimic the behavior of Mercurial before version 1.5
377 opts['file'] = True
377 opts['file'] = True
378
378
379 ctx = scmutil.revsingle(repo, opts.get('rev'))
379 ctx = scmutil.revsingle(repo, opts.get('rev'))
380
380
381 fm = ui.formatter('annotate', opts)
381 fm = ui.formatter('annotate', opts)
382 if ui.quiet:
382 if ui.quiet:
383 datefunc = util.shortdate
383 datefunc = util.shortdate
384 else:
384 else:
385 datefunc = util.datestr
385 datefunc = util.datestr
386 if ctx.rev() is None:
386 if ctx.rev() is None:
387 def hexfn(node):
387 def hexfn(node):
388 if node is None:
388 if node is None:
389 return None
389 return None
390 else:
390 else:
391 return fm.hexfunc(node)
391 return fm.hexfunc(node)
392 if opts.get('changeset'):
392 if opts.get('changeset'):
393 # omit "+" suffix which is appended to node hex
393 # omit "+" suffix which is appended to node hex
394 def formatrev(rev):
394 def formatrev(rev):
395 if rev is None:
395 if rev is None:
396 return '%d' % ctx.p1().rev()
396 return '%d' % ctx.p1().rev()
397 else:
397 else:
398 return '%d' % rev
398 return '%d' % rev
399 else:
399 else:
400 def formatrev(rev):
400 def formatrev(rev):
401 if rev is None:
401 if rev is None:
402 return '%d+' % ctx.p1().rev()
402 return '%d+' % ctx.p1().rev()
403 else:
403 else:
404 return '%d ' % rev
404 return '%d ' % rev
405 def formathex(hex):
405 def formathex(hex):
406 if hex is None:
406 if hex is None:
407 return '%s+' % fm.hexfunc(ctx.p1().node())
407 return '%s+' % fm.hexfunc(ctx.p1().node())
408 else:
408 else:
409 return '%s ' % hex
409 return '%s ' % hex
410 else:
410 else:
411 hexfn = fm.hexfunc
411 hexfn = fm.hexfunc
412 formatrev = formathex = str
412 formatrev = formathex = str
413
413
414 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
414 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
415 ('number', ' ', lambda x: x[0].rev(), formatrev),
415 ('number', ' ', lambda x: x[0].rev(), formatrev),
416 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
416 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
417 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
417 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
418 ('file', ' ', lambda x: x[0].path(), str),
418 ('file', ' ', lambda x: x[0].path(), str),
419 ('line_number', ':', lambda x: x[1], str),
419 ('line_number', ':', lambda x: x[1], str),
420 ]
420 ]
421 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
421 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
422
422
423 if (not opts.get('user') and not opts.get('changeset')
423 if (not opts.get('user') and not opts.get('changeset')
424 and not opts.get('date') and not opts.get('file')):
424 and not opts.get('date') and not opts.get('file')):
425 opts['number'] = True
425 opts['number'] = True
426
426
427 linenumber = opts.get('line_number') is not None
427 linenumber = opts.get('line_number') is not None
428 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
428 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
429 raise error.Abort(_('at least one of -n/-c is required for -l'))
429 raise error.Abort(_('at least one of -n/-c is required for -l'))
430
430
431 ui.pager('annotate')
431 ui.pager('annotate')
432
432
433 if fm.isplain():
433 if fm.isplain():
434 def makefunc(get, fmt):
434 def makefunc(get, fmt):
435 return lambda x: fmt(get(x))
435 return lambda x: fmt(get(x))
436 else:
436 else:
437 def makefunc(get, fmt):
437 def makefunc(get, fmt):
438 return get
438 return get
439 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
439 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
440 if opts.get(op)]
440 if opts.get(op)]
441 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
441 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
442 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
442 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
443 if opts.get(op))
443 if opts.get(op))
444
444
445 def bad(x, y):
445 def bad(x, y):
446 raise error.Abort("%s: %s" % (x, y))
446 raise error.Abort("%s: %s" % (x, y))
447
447
448 m = scmutil.match(ctx, pats, opts, badfn=bad)
448 m = scmutil.match(ctx, pats, opts, badfn=bad)
449
449
450 follow = not opts.get('no_follow')
450 follow = not opts.get('no_follow')
451 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
451 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
452 whitespace=True)
452 whitespace=True)
453 for abs in ctx.walk(m):
453 for abs in ctx.walk(m):
454 fctx = ctx[abs]
454 fctx = ctx[abs]
455 if not opts.get('text') and util.binary(fctx.data()):
455 if not opts.get('text') and util.binary(fctx.data()):
456 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
456 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
457 continue
457 continue
458
458
459 lines = fctx.annotate(follow=follow, linenumber=linenumber,
459 lines = fctx.annotate(follow=follow, linenumber=linenumber,
460 diffopts=diffopts)
460 diffopts=diffopts)
461 if not lines:
461 if not lines:
462 continue
462 continue
463 formats = []
463 formats = []
464 pieces = []
464 pieces = []
465
465
466 for f, sep in funcmap:
466 for f, sep in funcmap:
467 l = [f(n) for n, dummy in lines]
467 l = [f(n) for n, dummy in lines]
468 if fm.isplain():
468 if fm.isplain():
469 sizes = [encoding.colwidth(x) for x in l]
469 sizes = [encoding.colwidth(x) for x in l]
470 ml = max(sizes)
470 ml = max(sizes)
471 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
471 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
472 else:
472 else:
473 formats.append(['%s' for x in l])
473 formats.append(['%s' for x in l])
474 pieces.append(l)
474 pieces.append(l)
475
475
476 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
476 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
477 fm.startitem()
477 fm.startitem()
478 fm.write(fields, "".join(f), *p)
478 fm.write(fields, "".join(f), *p)
479 fm.write('line', ": %s", l[1])
479 fm.write('line', ": %s", l[1])
480
480
481 if not lines[-1][1].endswith('\n'):
481 if not lines[-1][1].endswith('\n'):
482 fm.plain('\n')
482 fm.plain('\n')
483
483
484 fm.end()
484 fm.end()
485
485
486 @command('archive',
486 @command('archive',
487 [('', 'no-decode', None, _('do not pass files through decoders')),
487 [('', 'no-decode', None, _('do not pass files through decoders')),
488 ('p', 'prefix', '', _('directory prefix for files in archive'),
488 ('p', 'prefix', '', _('directory prefix for files in archive'),
489 _('PREFIX')),
489 _('PREFIX')),
490 ('r', 'rev', '', _('revision to distribute'), _('REV')),
490 ('r', 'rev', '', _('revision to distribute'), _('REV')),
491 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
491 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
492 ] + subrepoopts + walkopts,
492 ] + subrepoopts + walkopts,
493 _('[OPTION]... DEST'))
493 _('[OPTION]... DEST'))
494 def archive(ui, repo, dest, **opts):
494 def archive(ui, repo, dest, **opts):
495 '''create an unversioned archive of a repository revision
495 '''create an unversioned archive of a repository revision
496
496
497 By default, the revision used is the parent of the working
497 By default, the revision used is the parent of the working
498 directory; use -r/--rev to specify a different revision.
498 directory; use -r/--rev to specify a different revision.
499
499
500 The archive type is automatically detected based on file
500 The archive type is automatically detected based on file
501 extension (to override, use -t/--type).
501 extension (to override, use -t/--type).
502
502
503 .. container:: verbose
503 .. container:: verbose
504
504
505 Examples:
505 Examples:
506
506
507 - create a zip file containing the 1.0 release::
507 - create a zip file containing the 1.0 release::
508
508
509 hg archive -r 1.0 project-1.0.zip
509 hg archive -r 1.0 project-1.0.zip
510
510
511 - create a tarball excluding .hg files::
511 - create a tarball excluding .hg files::
512
512
513 hg archive project.tar.gz -X ".hg*"
513 hg archive project.tar.gz -X ".hg*"
514
514
515 Valid types are:
515 Valid types are:
516
516
517 :``files``: a directory full of files (default)
517 :``files``: a directory full of files (default)
518 :``tar``: tar archive, uncompressed
518 :``tar``: tar archive, uncompressed
519 :``tbz2``: tar archive, compressed using bzip2
519 :``tbz2``: tar archive, compressed using bzip2
520 :``tgz``: tar archive, compressed using gzip
520 :``tgz``: tar archive, compressed using gzip
521 :``uzip``: zip archive, uncompressed
521 :``uzip``: zip archive, uncompressed
522 :``zip``: zip archive, compressed using deflate
522 :``zip``: zip archive, compressed using deflate
523
523
524 The exact name of the destination archive or directory is given
524 The exact name of the destination archive or directory is given
525 using a format string; see :hg:`help export` for details.
525 using a format string; see :hg:`help export` for details.
526
526
527 Each member added to an archive file has a directory prefix
527 Each member added to an archive file has a directory prefix
528 prepended. Use -p/--prefix to specify a format string for the
528 prepended. Use -p/--prefix to specify a format string for the
529 prefix. The default is the basename of the archive, with suffixes
529 prefix. The default is the basename of the archive, with suffixes
530 removed.
530 removed.
531
531
532 Returns 0 on success.
532 Returns 0 on success.
533 '''
533 '''
534
534
535 ctx = scmutil.revsingle(repo, opts.get('rev'))
535 ctx = scmutil.revsingle(repo, opts.get('rev'))
536 if not ctx:
536 if not ctx:
537 raise error.Abort(_('no working directory: please specify a revision'))
537 raise error.Abort(_('no working directory: please specify a revision'))
538 node = ctx.node()
538 node = ctx.node()
539 dest = cmdutil.makefilename(repo, dest, node)
539 dest = cmdutil.makefilename(repo, dest, node)
540 if os.path.realpath(dest) == repo.root:
540 if os.path.realpath(dest) == repo.root:
541 raise error.Abort(_('repository root cannot be destination'))
541 raise error.Abort(_('repository root cannot be destination'))
542
542
543 kind = opts.get('type') or archival.guesskind(dest) or 'files'
543 kind = opts.get('type') or archival.guesskind(dest) or 'files'
544 prefix = opts.get('prefix')
544 prefix = opts.get('prefix')
545
545
546 if dest == '-':
546 if dest == '-':
547 if kind == 'files':
547 if kind == 'files':
548 raise error.Abort(_('cannot archive plain files to stdout'))
548 raise error.Abort(_('cannot archive plain files to stdout'))
549 dest = cmdutil.makefileobj(repo, dest)
549 dest = cmdutil.makefileobj(repo, dest)
550 if not prefix:
550 if not prefix:
551 prefix = os.path.basename(repo.root) + '-%h'
551 prefix = os.path.basename(repo.root) + '-%h'
552
552
553 prefix = cmdutil.makefilename(repo, prefix, node)
553 prefix = cmdutil.makefilename(repo, prefix, node)
554 matchfn = scmutil.match(ctx, [], opts)
554 matchfn = scmutil.match(ctx, [], opts)
555 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
555 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
556 matchfn, prefix, subrepos=opts.get('subrepos'))
556 matchfn, prefix, subrepos=opts.get('subrepos'))
557
557
558 @command('backout',
558 @command('backout',
559 [('', 'merge', None, _('merge with old dirstate parent after backout')),
559 [('', 'merge', None, _('merge with old dirstate parent after backout')),
560 ('', 'commit', None,
560 ('', 'commit', None,
561 _('commit if no conflicts were encountered (DEPRECATED)')),
561 _('commit if no conflicts were encountered (DEPRECATED)')),
562 ('', 'no-commit', None, _('do not commit')),
562 ('', 'no-commit', None, _('do not commit')),
563 ('', 'parent', '',
563 ('', 'parent', '',
564 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
564 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
565 ('r', 'rev', '', _('revision to backout'), _('REV')),
565 ('r', 'rev', '', _('revision to backout'), _('REV')),
566 ('e', 'edit', False, _('invoke editor on commit messages')),
566 ('e', 'edit', False, _('invoke editor on commit messages')),
567 ] + mergetoolopts + walkopts + commitopts + commitopts2,
567 ] + mergetoolopts + walkopts + commitopts + commitopts2,
568 _('[OPTION]... [-r] REV'))
568 _('[OPTION]... [-r] REV'))
569 def backout(ui, repo, node=None, rev=None, **opts):
569 def backout(ui, repo, node=None, rev=None, **opts):
570 '''reverse effect of earlier changeset
570 '''reverse effect of earlier changeset
571
571
572 Prepare a new changeset with the effect of REV undone in the
572 Prepare a new changeset with the effect of REV undone in the
573 current working directory. If no conflicts were encountered,
573 current working directory. If no conflicts were encountered,
574 it will be committed immediately.
574 it will be committed immediately.
575
575
576 If REV is the parent of the working directory, then this new changeset
576 If REV is the parent of the working directory, then this new changeset
577 is committed automatically (unless --no-commit is specified).
577 is committed automatically (unless --no-commit is specified).
578
578
579 .. note::
579 .. note::
580
580
581 :hg:`backout` cannot be used to fix either an unwanted or
581 :hg:`backout` cannot be used to fix either an unwanted or
582 incorrect merge.
582 incorrect merge.
583
583
584 .. container:: verbose
584 .. container:: verbose
585
585
586 Examples:
586 Examples:
587
587
588 - Reverse the effect of the parent of the working directory.
588 - Reverse the effect of the parent of the working directory.
589 This backout will be committed immediately::
589 This backout will be committed immediately::
590
590
591 hg backout -r .
591 hg backout -r .
592
592
593 - Reverse the effect of previous bad revision 23::
593 - Reverse the effect of previous bad revision 23::
594
594
595 hg backout -r 23
595 hg backout -r 23
596
596
597 - Reverse the effect of previous bad revision 23 and
597 - Reverse the effect of previous bad revision 23 and
598 leave changes uncommitted::
598 leave changes uncommitted::
599
599
600 hg backout -r 23 --no-commit
600 hg backout -r 23 --no-commit
601 hg commit -m "Backout revision 23"
601 hg commit -m "Backout revision 23"
602
602
603 By default, the pending changeset will have one parent,
603 By default, the pending changeset will have one parent,
604 maintaining a linear history. With --merge, the pending
604 maintaining a linear history. With --merge, the pending
605 changeset will instead have two parents: the old parent of the
605 changeset will instead have two parents: the old parent of the
606 working directory and a new child of REV that simply undoes REV.
606 working directory and a new child of REV that simply undoes REV.
607
607
608 Before version 1.7, the behavior without --merge was equivalent
608 Before version 1.7, the behavior without --merge was equivalent
609 to specifying --merge followed by :hg:`update --clean .` to
609 to specifying --merge followed by :hg:`update --clean .` to
610 cancel the merge and leave the child of REV as a head to be
610 cancel the merge and leave the child of REV as a head to be
611 merged separately.
611 merged separately.
612
612
613 See :hg:`help dates` for a list of formats valid for -d/--date.
613 See :hg:`help dates` for a list of formats valid for -d/--date.
614
614
615 See :hg:`help revert` for a way to restore files to the state
615 See :hg:`help revert` for a way to restore files to the state
616 of another revision.
616 of another revision.
617
617
618 Returns 0 on success, 1 if nothing to backout or there are unresolved
618 Returns 0 on success, 1 if nothing to backout or there are unresolved
619 files.
619 files.
620 '''
620 '''
621 wlock = lock = None
621 wlock = lock = None
622 try:
622 try:
623 wlock = repo.wlock()
623 wlock = repo.wlock()
624 lock = repo.lock()
624 lock = repo.lock()
625 return _dobackout(ui, repo, node, rev, **opts)
625 return _dobackout(ui, repo, node, rev, **opts)
626 finally:
626 finally:
627 release(lock, wlock)
627 release(lock, wlock)
628
628
629 def _dobackout(ui, repo, node=None, rev=None, **opts):
629 def _dobackout(ui, repo, node=None, rev=None, **opts):
630 if opts.get('commit') and opts.get('no_commit'):
630 if opts.get('commit') and opts.get('no_commit'):
631 raise error.Abort(_("cannot use --commit with --no-commit"))
631 raise error.Abort(_("cannot use --commit with --no-commit"))
632 if opts.get('merge') and opts.get('no_commit'):
632 if opts.get('merge') and opts.get('no_commit'):
633 raise error.Abort(_("cannot use --merge with --no-commit"))
633 raise error.Abort(_("cannot use --merge with --no-commit"))
634
634
635 if rev and node:
635 if rev and node:
636 raise error.Abort(_("please specify just one revision"))
636 raise error.Abort(_("please specify just one revision"))
637
637
638 if not rev:
638 if not rev:
639 rev = node
639 rev = node
640
640
641 if not rev:
641 if not rev:
642 raise error.Abort(_("please specify a revision to backout"))
642 raise error.Abort(_("please specify a revision to backout"))
643
643
644 date = opts.get('date')
644 date = opts.get('date')
645 if date:
645 if date:
646 opts['date'] = util.parsedate(date)
646 opts['date'] = util.parsedate(date)
647
647
648 cmdutil.checkunfinished(repo)
648 cmdutil.checkunfinished(repo)
649 cmdutil.bailifchanged(repo)
649 cmdutil.bailifchanged(repo)
650 node = scmutil.revsingle(repo, rev).node()
650 node = scmutil.revsingle(repo, rev).node()
651
651
652 op1, op2 = repo.dirstate.parents()
652 op1, op2 = repo.dirstate.parents()
653 if not repo.changelog.isancestor(node, op1):
653 if not repo.changelog.isancestor(node, op1):
654 raise error.Abort(_('cannot backout change that is not an ancestor'))
654 raise error.Abort(_('cannot backout change that is not an ancestor'))
655
655
656 p1, p2 = repo.changelog.parents(node)
656 p1, p2 = repo.changelog.parents(node)
657 if p1 == nullid:
657 if p1 == nullid:
658 raise error.Abort(_('cannot backout a change with no parents'))
658 raise error.Abort(_('cannot backout a change with no parents'))
659 if p2 != nullid:
659 if p2 != nullid:
660 if not opts.get('parent'):
660 if not opts.get('parent'):
661 raise error.Abort(_('cannot backout a merge changeset'))
661 raise error.Abort(_('cannot backout a merge changeset'))
662 p = repo.lookup(opts['parent'])
662 p = repo.lookup(opts['parent'])
663 if p not in (p1, p2):
663 if p not in (p1, p2):
664 raise error.Abort(_('%s is not a parent of %s') %
664 raise error.Abort(_('%s is not a parent of %s') %
665 (short(p), short(node)))
665 (short(p), short(node)))
666 parent = p
666 parent = p
667 else:
667 else:
668 if opts.get('parent'):
668 if opts.get('parent'):
669 raise error.Abort(_('cannot use --parent on non-merge changeset'))
669 raise error.Abort(_('cannot use --parent on non-merge changeset'))
670 parent = p1
670 parent = p1
671
671
672 # the backout should appear on the same branch
672 # the backout should appear on the same branch
673 branch = repo.dirstate.branch()
673 branch = repo.dirstate.branch()
674 bheads = repo.branchheads(branch)
674 bheads = repo.branchheads(branch)
675 rctx = scmutil.revsingle(repo, hex(parent))
675 rctx = scmutil.revsingle(repo, hex(parent))
676 if not opts.get('merge') and op1 != node:
676 if not opts.get('merge') and op1 != node:
677 dsguard = dirstateguard.dirstateguard(repo, 'backout')
677 dsguard = dirstateguard.dirstateguard(repo, 'backout')
678 try:
678 try:
679 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
679 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
680 'backout')
680 'backout')
681 stats = mergemod.update(repo, parent, True, True, node, False)
681 stats = mergemod.update(repo, parent, True, True, node, False)
682 repo.setparents(op1, op2)
682 repo.setparents(op1, op2)
683 dsguard.close()
683 dsguard.close()
684 hg._showstats(repo, stats)
684 hg._showstats(repo, stats)
685 if stats[3]:
685 if stats[3]:
686 repo.ui.status(_("use 'hg resolve' to retry unresolved "
686 repo.ui.status(_("use 'hg resolve' to retry unresolved "
687 "file merges\n"))
687 "file merges\n"))
688 return 1
688 return 1
689 finally:
689 finally:
690 ui.setconfig('ui', 'forcemerge', '', '')
690 ui.setconfig('ui', 'forcemerge', '', '')
691 lockmod.release(dsguard)
691 lockmod.release(dsguard)
692 else:
692 else:
693 hg.clean(repo, node, show_stats=False)
693 hg.clean(repo, node, show_stats=False)
694 repo.dirstate.setbranch(branch)
694 repo.dirstate.setbranch(branch)
695 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
695 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
696
696
697 if opts.get('no_commit'):
697 if opts.get('no_commit'):
698 msg = _("changeset %s backed out, "
698 msg = _("changeset %s backed out, "
699 "don't forget to commit.\n")
699 "don't forget to commit.\n")
700 ui.status(msg % short(node))
700 ui.status(msg % short(node))
701 return 0
701 return 0
702
702
703 def commitfunc(ui, repo, message, match, opts):
703 def commitfunc(ui, repo, message, match, opts):
704 editform = 'backout'
704 editform = 'backout'
705 e = cmdutil.getcommiteditor(editform=editform, **opts)
705 e = cmdutil.getcommiteditor(editform=editform, **opts)
706 if not message:
706 if not message:
707 # we don't translate commit messages
707 # we don't translate commit messages
708 message = "Backed out changeset %s" % short(node)
708 message = "Backed out changeset %s" % short(node)
709 e = cmdutil.getcommiteditor(edit=True, editform=editform)
709 e = cmdutil.getcommiteditor(edit=True, editform=editform)
710 return repo.commit(message, opts.get('user'), opts.get('date'),
710 return repo.commit(message, opts.get('user'), opts.get('date'),
711 match, editor=e)
711 match, editor=e)
712 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
712 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
713 if not newnode:
713 if not newnode:
714 ui.status(_("nothing changed\n"))
714 ui.status(_("nothing changed\n"))
715 return 1
715 return 1
716 cmdutil.commitstatus(repo, newnode, branch, bheads)
716 cmdutil.commitstatus(repo, newnode, branch, bheads)
717
717
718 def nice(node):
718 def nice(node):
719 return '%d:%s' % (repo.changelog.rev(node), short(node))
719 return '%d:%s' % (repo.changelog.rev(node), short(node))
720 ui.status(_('changeset %s backs out changeset %s\n') %
720 ui.status(_('changeset %s backs out changeset %s\n') %
721 (nice(repo.changelog.tip()), nice(node)))
721 (nice(repo.changelog.tip()), nice(node)))
722 if opts.get('merge') and op1 != node:
722 if opts.get('merge') and op1 != node:
723 hg.clean(repo, op1, show_stats=False)
723 hg.clean(repo, op1, show_stats=False)
724 ui.status(_('merging with changeset %s\n')
724 ui.status(_('merging with changeset %s\n')
725 % nice(repo.changelog.tip()))
725 % nice(repo.changelog.tip()))
726 try:
726 try:
727 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
727 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
728 'backout')
728 'backout')
729 return hg.merge(repo, hex(repo.changelog.tip()))
729 return hg.merge(repo, hex(repo.changelog.tip()))
730 finally:
730 finally:
731 ui.setconfig('ui', 'forcemerge', '', '')
731 ui.setconfig('ui', 'forcemerge', '', '')
732 return 0
732 return 0
733
733
734 @command('bisect',
734 @command('bisect',
735 [('r', 'reset', False, _('reset bisect state')),
735 [('r', 'reset', False, _('reset bisect state')),
736 ('g', 'good', False, _('mark changeset good')),
736 ('g', 'good', False, _('mark changeset good')),
737 ('b', 'bad', False, _('mark changeset bad')),
737 ('b', 'bad', False, _('mark changeset bad')),
738 ('s', 'skip', False, _('skip testing changeset')),
738 ('s', 'skip', False, _('skip testing changeset')),
739 ('e', 'extend', False, _('extend the bisect range')),
739 ('e', 'extend', False, _('extend the bisect range')),
740 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
740 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
741 ('U', 'noupdate', False, _('do not update to target'))],
741 ('U', 'noupdate', False, _('do not update to target'))],
742 _("[-gbsr] [-U] [-c CMD] [REV]"))
742 _("[-gbsr] [-U] [-c CMD] [REV]"))
743 def bisect(ui, repo, rev=None, extra=None, command=None,
743 def bisect(ui, repo, rev=None, extra=None, command=None,
744 reset=None, good=None, bad=None, skip=None, extend=None,
744 reset=None, good=None, bad=None, skip=None, extend=None,
745 noupdate=None):
745 noupdate=None):
746 """subdivision search of changesets
746 """subdivision search of changesets
747
747
748 This command helps to find changesets which introduce problems. To
748 This command helps to find changesets which introduce problems. To
749 use, mark the earliest changeset you know exhibits the problem as
749 use, mark the earliest changeset you know exhibits the problem as
750 bad, then mark the latest changeset which is free from the problem
750 bad, then mark the latest changeset which is free from the problem
751 as good. Bisect will update your working directory to a revision
751 as good. Bisect will update your working directory to a revision
752 for testing (unless the -U/--noupdate option is specified). Once
752 for testing (unless the -U/--noupdate option is specified). Once
753 you have performed tests, mark the working directory as good or
753 you have performed tests, mark the working directory as good or
754 bad, and bisect will either update to another candidate changeset
754 bad, and bisect will either update to another candidate changeset
755 or announce that it has found the bad revision.
755 or announce that it has found the bad revision.
756
756
757 As a shortcut, you can also use the revision argument to mark a
757 As a shortcut, you can also use the revision argument to mark a
758 revision as good or bad without checking it out first.
758 revision as good or bad without checking it out first.
759
759
760 If you supply a command, it will be used for automatic bisection.
760 If you supply a command, it will be used for automatic bisection.
761 The environment variable HG_NODE will contain the ID of the
761 The environment variable HG_NODE will contain the ID of the
762 changeset being tested. The exit status of the command will be
762 changeset being tested. The exit status of the command will be
763 used to mark revisions as good or bad: status 0 means good, 125
763 used to mark revisions as good or bad: status 0 means good, 125
764 means to skip the revision, 127 (command not found) will abort the
764 means to skip the revision, 127 (command not found) will abort the
765 bisection, and any other non-zero exit status means the revision
765 bisection, and any other non-zero exit status means the revision
766 is bad.
766 is bad.
767
767
768 .. container:: verbose
768 .. container:: verbose
769
769
770 Some examples:
770 Some examples:
771
771
772 - start a bisection with known bad revision 34, and good revision 12::
772 - start a bisection with known bad revision 34, and good revision 12::
773
773
774 hg bisect --bad 34
774 hg bisect --bad 34
775 hg bisect --good 12
775 hg bisect --good 12
776
776
777 - advance the current bisection by marking current revision as good or
777 - advance the current bisection by marking current revision as good or
778 bad::
778 bad::
779
779
780 hg bisect --good
780 hg bisect --good
781 hg bisect --bad
781 hg bisect --bad
782
782
783 - mark the current revision, or a known revision, to be skipped (e.g. if
783 - mark the current revision, or a known revision, to be skipped (e.g. if
784 that revision is not usable because of another issue)::
784 that revision is not usable because of another issue)::
785
785
786 hg bisect --skip
786 hg bisect --skip
787 hg bisect --skip 23
787 hg bisect --skip 23
788
788
789 - skip all revisions that do not touch directories ``foo`` or ``bar``::
789 - skip all revisions that do not touch directories ``foo`` or ``bar``::
790
790
791 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
791 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
792
792
793 - forget the current bisection::
793 - forget the current bisection::
794
794
795 hg bisect --reset
795 hg bisect --reset
796
796
797 - use 'make && make tests' to automatically find the first broken
797 - use 'make && make tests' to automatically find the first broken
798 revision::
798 revision::
799
799
800 hg bisect --reset
800 hg bisect --reset
801 hg bisect --bad 34
801 hg bisect --bad 34
802 hg bisect --good 12
802 hg bisect --good 12
803 hg bisect --command "make && make tests"
803 hg bisect --command "make && make tests"
804
804
805 - see all changesets whose states are already known in the current
805 - see all changesets whose states are already known in the current
806 bisection::
806 bisection::
807
807
808 hg log -r "bisect(pruned)"
808 hg log -r "bisect(pruned)"
809
809
810 - see the changeset currently being bisected (especially useful
810 - see the changeset currently being bisected (especially useful
811 if running with -U/--noupdate)::
811 if running with -U/--noupdate)::
812
812
813 hg log -r "bisect(current)"
813 hg log -r "bisect(current)"
814
814
815 - see all changesets that took part in the current bisection::
815 - see all changesets that took part in the current bisection::
816
816
817 hg log -r "bisect(range)"
817 hg log -r "bisect(range)"
818
818
819 - you can even get a nice graph::
819 - you can even get a nice graph::
820
820
821 hg log --graph -r "bisect(range)"
821 hg log --graph -r "bisect(range)"
822
822
823 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
823 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
824
824
825 Returns 0 on success.
825 Returns 0 on success.
826 """
826 """
827 # backward compatibility
827 # backward compatibility
828 if rev in "good bad reset init".split():
828 if rev in "good bad reset init".split():
829 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
829 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
830 cmd, rev, extra = rev, extra, None
830 cmd, rev, extra = rev, extra, None
831 if cmd == "good":
831 if cmd == "good":
832 good = True
832 good = True
833 elif cmd == "bad":
833 elif cmd == "bad":
834 bad = True
834 bad = True
835 else:
835 else:
836 reset = True
836 reset = True
837 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
837 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
838 raise error.Abort(_('incompatible arguments'))
838 raise error.Abort(_('incompatible arguments'))
839
839
840 cmdutil.checkunfinished(repo)
840 cmdutil.checkunfinished(repo)
841
841
842 if reset:
842 if reset:
843 hbisect.resetstate(repo)
843 hbisect.resetstate(repo)
844 return
844 return
845
845
846 state = hbisect.load_state(repo)
846 state = hbisect.load_state(repo)
847
847
848 # update state
848 # update state
849 if good or bad or skip:
849 if good or bad or skip:
850 if rev:
850 if rev:
851 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
851 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
852 else:
852 else:
853 nodes = [repo.lookup('.')]
853 nodes = [repo.lookup('.')]
854 if good:
854 if good:
855 state['good'] += nodes
855 state['good'] += nodes
856 elif bad:
856 elif bad:
857 state['bad'] += nodes
857 state['bad'] += nodes
858 elif skip:
858 elif skip:
859 state['skip'] += nodes
859 state['skip'] += nodes
860 hbisect.save_state(repo, state)
860 hbisect.save_state(repo, state)
861 if not (state['good'] and state['bad']):
861 if not (state['good'] and state['bad']):
862 return
862 return
863
863
864 def mayupdate(repo, node, show_stats=True):
864 def mayupdate(repo, node, show_stats=True):
865 """common used update sequence"""
865 """common used update sequence"""
866 if noupdate:
866 if noupdate:
867 return
867 return
868 cmdutil.bailifchanged(repo)
868 cmdutil.bailifchanged(repo)
869 return hg.clean(repo, node, show_stats=show_stats)
869 return hg.clean(repo, node, show_stats=show_stats)
870
870
871 displayer = cmdutil.show_changeset(ui, repo, {})
871 displayer = cmdutil.show_changeset(ui, repo, {})
872
872
873 if command:
873 if command:
874 changesets = 1
874 changesets = 1
875 if noupdate:
875 if noupdate:
876 try:
876 try:
877 node = state['current'][0]
877 node = state['current'][0]
878 except LookupError:
878 except LookupError:
879 raise error.Abort(_('current bisect revision is unknown - '
879 raise error.Abort(_('current bisect revision is unknown - '
880 'start a new bisect to fix'))
880 'start a new bisect to fix'))
881 else:
881 else:
882 node, p2 = repo.dirstate.parents()
882 node, p2 = repo.dirstate.parents()
883 if p2 != nullid:
883 if p2 != nullid:
884 raise error.Abort(_('current bisect revision is a merge'))
884 raise error.Abort(_('current bisect revision is a merge'))
885 if rev:
885 if rev:
886 node = repo[scmutil.revsingle(repo, rev, node)].node()
886 node = repo[scmutil.revsingle(repo, rev, node)].node()
887 try:
887 try:
888 while changesets:
888 while changesets:
889 # update state
889 # update state
890 state['current'] = [node]
890 state['current'] = [node]
891 hbisect.save_state(repo, state)
891 hbisect.save_state(repo, state)
892 status = ui.system(command, environ={'HG_NODE': hex(node)},
892 status = ui.system(command, environ={'HG_NODE': hex(node)},
893 blockedtag='bisect_check')
893 blockedtag='bisect_check')
894 if status == 125:
894 if status == 125:
895 transition = "skip"
895 transition = "skip"
896 elif status == 0:
896 elif status == 0:
897 transition = "good"
897 transition = "good"
898 # status < 0 means process was killed
898 # status < 0 means process was killed
899 elif status == 127:
899 elif status == 127:
900 raise error.Abort(_("failed to execute %s") % command)
900 raise error.Abort(_("failed to execute %s") % command)
901 elif status < 0:
901 elif status < 0:
902 raise error.Abort(_("%s killed") % command)
902 raise error.Abort(_("%s killed") % command)
903 else:
903 else:
904 transition = "bad"
904 transition = "bad"
905 state[transition].append(node)
905 state[transition].append(node)
906 ctx = repo[node]
906 ctx = repo[node]
907 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
907 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
908 hbisect.checkstate(state)
908 hbisect.checkstate(state)
909 # bisect
909 # bisect
910 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
910 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
911 # update to next check
911 # update to next check
912 node = nodes[0]
912 node = nodes[0]
913 mayupdate(repo, node, show_stats=False)
913 mayupdate(repo, node, show_stats=False)
914 finally:
914 finally:
915 state['current'] = [node]
915 state['current'] = [node]
916 hbisect.save_state(repo, state)
916 hbisect.save_state(repo, state)
917 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
917 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
918 return
918 return
919
919
920 hbisect.checkstate(state)
920 hbisect.checkstate(state)
921
921
922 # actually bisect
922 # actually bisect
923 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
923 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
924 if extend:
924 if extend:
925 if not changesets:
925 if not changesets:
926 extendnode = hbisect.extendrange(repo, state, nodes, good)
926 extendnode = hbisect.extendrange(repo, state, nodes, good)
927 if extendnode is not None:
927 if extendnode is not None:
928 ui.write(_("Extending search to changeset %d:%s\n")
928 ui.write(_("Extending search to changeset %d:%s\n")
929 % (extendnode.rev(), extendnode))
929 % (extendnode.rev(), extendnode))
930 state['current'] = [extendnode.node()]
930 state['current'] = [extendnode.node()]
931 hbisect.save_state(repo, state)
931 hbisect.save_state(repo, state)
932 return mayupdate(repo, extendnode.node())
932 return mayupdate(repo, extendnode.node())
933 raise error.Abort(_("nothing to extend"))
933 raise error.Abort(_("nothing to extend"))
934
934
935 if changesets == 0:
935 if changesets == 0:
936 hbisect.printresult(ui, repo, state, displayer, nodes, good)
936 hbisect.printresult(ui, repo, state, displayer, nodes, good)
937 else:
937 else:
938 assert len(nodes) == 1 # only a single node can be tested next
938 assert len(nodes) == 1 # only a single node can be tested next
939 node = nodes[0]
939 node = nodes[0]
940 # compute the approximate number of remaining tests
940 # compute the approximate number of remaining tests
941 tests, size = 0, 2
941 tests, size = 0, 2
942 while size <= changesets:
942 while size <= changesets:
943 tests, size = tests + 1, size * 2
943 tests, size = tests + 1, size * 2
944 rev = repo.changelog.rev(node)
944 rev = repo.changelog.rev(node)
945 ui.write(_("Testing changeset %d:%s "
945 ui.write(_("Testing changeset %d:%s "
946 "(%d changesets remaining, ~%d tests)\n")
946 "(%d changesets remaining, ~%d tests)\n")
947 % (rev, short(node), changesets, tests))
947 % (rev, short(node), changesets, tests))
948 state['current'] = [node]
948 state['current'] = [node]
949 hbisect.save_state(repo, state)
949 hbisect.save_state(repo, state)
950 return mayupdate(repo, node)
950 return mayupdate(repo, node)
951
951
952 @command('bookmarks|bookmark',
952 @command('bookmarks|bookmark',
953 [('f', 'force', False, _('force')),
953 [('f', 'force', False, _('force')),
954 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
954 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
955 ('d', 'delete', False, _('delete a given bookmark')),
955 ('d', 'delete', False, _('delete a given bookmark')),
956 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
956 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
957 ('i', 'inactive', False, _('mark a bookmark inactive')),
957 ('i', 'inactive', False, _('mark a bookmark inactive')),
958 ] + formatteropts,
958 ] + formatteropts,
959 _('hg bookmarks [OPTIONS]... [NAME]...'))
959 _('hg bookmarks [OPTIONS]... [NAME]...'))
960 def bookmark(ui, repo, *names, **opts):
960 def bookmark(ui, repo, *names, **opts):
961 '''create a new bookmark or list existing bookmarks
961 '''create a new bookmark or list existing bookmarks
962
962
963 Bookmarks are labels on changesets to help track lines of development.
963 Bookmarks are labels on changesets to help track lines of development.
964 Bookmarks are unversioned and can be moved, renamed and deleted.
964 Bookmarks are unversioned and can be moved, renamed and deleted.
965 Deleting or moving a bookmark has no effect on the associated changesets.
965 Deleting or moving a bookmark has no effect on the associated changesets.
966
966
967 Creating or updating to a bookmark causes it to be marked as 'active'.
967 Creating or updating to a bookmark causes it to be marked as 'active'.
968 The active bookmark is indicated with a '*'.
968 The active bookmark is indicated with a '*'.
969 When a commit is made, the active bookmark will advance to the new commit.
969 When a commit is made, the active bookmark will advance to the new commit.
970 A plain :hg:`update` will also advance an active bookmark, if possible.
970 A plain :hg:`update` will also advance an active bookmark, if possible.
971 Updating away from a bookmark will cause it to be deactivated.
971 Updating away from a bookmark will cause it to be deactivated.
972
972
973 Bookmarks can be pushed and pulled between repositories (see
973 Bookmarks can be pushed and pulled between repositories (see
974 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
974 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
975 diverged, a new 'divergent bookmark' of the form 'name@path' will
975 diverged, a new 'divergent bookmark' of the form 'name@path' will
976 be created. Using :hg:`merge` will resolve the divergence.
976 be created. Using :hg:`merge` will resolve the divergence.
977
977
978 A bookmark named '@' has the special property that :hg:`clone` will
978 A bookmark named '@' has the special property that :hg:`clone` will
979 check it out by default if it exists.
979 check it out by default if it exists.
980
980
981 .. container:: verbose
981 .. container:: verbose
982
982
983 Examples:
983 Examples:
984
984
985 - create an active bookmark for a new line of development::
985 - create an active bookmark for a new line of development::
986
986
987 hg book new-feature
987 hg book new-feature
988
988
989 - create an inactive bookmark as a place marker::
989 - create an inactive bookmark as a place marker::
990
990
991 hg book -i reviewed
991 hg book -i reviewed
992
992
993 - create an inactive bookmark on another changeset::
993 - create an inactive bookmark on another changeset::
994
994
995 hg book -r .^ tested
995 hg book -r .^ tested
996
996
997 - rename bookmark turkey to dinner::
997 - rename bookmark turkey to dinner::
998
998
999 hg book -m turkey dinner
999 hg book -m turkey dinner
1000
1000
1001 - move the '@' bookmark from another branch::
1001 - move the '@' bookmark from another branch::
1002
1002
1003 hg book -f @
1003 hg book -f @
1004 '''
1004 '''
1005 force = opts.get('force')
1005 force = opts.get('force')
1006 rev = opts.get('rev')
1006 rev = opts.get('rev')
1007 delete = opts.get('delete')
1007 delete = opts.get('delete')
1008 rename = opts.get('rename')
1008 rename = opts.get('rename')
1009 inactive = opts.get('inactive')
1009 inactive = opts.get('inactive')
1010
1010
1011 def checkformat(mark):
1011 def checkformat(mark):
1012 mark = mark.strip()
1012 mark = mark.strip()
1013 if not mark:
1013 if not mark:
1014 raise error.Abort(_("bookmark names cannot consist entirely of "
1014 raise error.Abort(_("bookmark names cannot consist entirely of "
1015 "whitespace"))
1015 "whitespace"))
1016 scmutil.checknewlabel(repo, mark, 'bookmark')
1016 scmutil.checknewlabel(repo, mark, 'bookmark')
1017 return mark
1017 return mark
1018
1018
1019 def checkconflict(repo, mark, cur, force=False, target=None):
1019 def checkconflict(repo, mark, cur, force=False, target=None):
1020 if mark in marks and not force:
1020 if mark in marks and not force:
1021 if target:
1021 if target:
1022 if marks[mark] == target and target == cur:
1022 if marks[mark] == target and target == cur:
1023 # re-activating a bookmark
1023 # re-activating a bookmark
1024 return
1024 return
1025 anc = repo.changelog.ancestors([repo[target].rev()])
1025 anc = repo.changelog.ancestors([repo[target].rev()])
1026 bmctx = repo[marks[mark]]
1026 bmctx = repo[marks[mark]]
1027 divs = [repo[b].node() for b in marks
1027 divs = [repo[b].node() for b in marks
1028 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
1028 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
1029
1029
1030 # allow resolving a single divergent bookmark even if moving
1030 # allow resolving a single divergent bookmark even if moving
1031 # the bookmark across branches when a revision is specified
1031 # the bookmark across branches when a revision is specified
1032 # that contains a divergent bookmark
1032 # that contains a divergent bookmark
1033 if bmctx.rev() not in anc and target in divs:
1033 if bmctx.rev() not in anc and target in divs:
1034 bookmarks.deletedivergent(repo, [target], mark)
1034 bookmarks.deletedivergent(repo, [target], mark)
1035 return
1035 return
1036
1036
1037 deletefrom = [b for b in divs
1037 deletefrom = [b for b in divs
1038 if repo[b].rev() in anc or b == target]
1038 if repo[b].rev() in anc or b == target]
1039 bookmarks.deletedivergent(repo, deletefrom, mark)
1039 bookmarks.deletedivergent(repo, deletefrom, mark)
1040 if bookmarks.validdest(repo, bmctx, repo[target]):
1040 if bookmarks.validdest(repo, bmctx, repo[target]):
1041 ui.status(_("moving bookmark '%s' forward from %s\n") %
1041 ui.status(_("moving bookmark '%s' forward from %s\n") %
1042 (mark, short(bmctx.node())))
1042 (mark, short(bmctx.node())))
1043 return
1043 return
1044 raise error.Abort(_("bookmark '%s' already exists "
1044 raise error.Abort(_("bookmark '%s' already exists "
1045 "(use -f to force)") % mark)
1045 "(use -f to force)") % mark)
1046 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
1046 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
1047 and not force):
1047 and not force):
1048 raise error.Abort(
1048 raise error.Abort(
1049 _("a bookmark cannot have the name of an existing branch"))
1049 _("a bookmark cannot have the name of an existing branch"))
1050
1050
1051 if delete and rename:
1051 if delete and rename:
1052 raise error.Abort(_("--delete and --rename are incompatible"))
1052 raise error.Abort(_("--delete and --rename are incompatible"))
1053 if delete and rev:
1053 if delete and rev:
1054 raise error.Abort(_("--rev is incompatible with --delete"))
1054 raise error.Abort(_("--rev is incompatible with --delete"))
1055 if rename and rev:
1055 if rename and rev:
1056 raise error.Abort(_("--rev is incompatible with --rename"))
1056 raise error.Abort(_("--rev is incompatible with --rename"))
1057 if not names and (delete or rev):
1057 if not names and (delete or rev):
1058 raise error.Abort(_("bookmark name required"))
1058 raise error.Abort(_("bookmark name required"))
1059
1059
1060 if delete or rename or names or inactive:
1060 if delete or rename or names or inactive:
1061 wlock = lock = tr = None
1061 wlock = lock = tr = None
1062 try:
1062 try:
1063 wlock = repo.wlock()
1063 wlock = repo.wlock()
1064 lock = repo.lock()
1064 lock = repo.lock()
1065 cur = repo.changectx('.').node()
1065 cur = repo.changectx('.').node()
1066 marks = repo._bookmarks
1066 marks = repo._bookmarks
1067 if delete:
1067 if delete:
1068 tr = repo.transaction('bookmark')
1068 tr = repo.transaction('bookmark')
1069 for mark in names:
1069 for mark in names:
1070 if mark not in marks:
1070 if mark not in marks:
1071 raise error.Abort(_("bookmark '%s' does not exist") %
1071 raise error.Abort(_("bookmark '%s' does not exist") %
1072 mark)
1072 mark)
1073 if mark == repo._activebookmark:
1073 if mark == repo._activebookmark:
1074 bookmarks.deactivate(repo)
1074 bookmarks.deactivate(repo)
1075 del marks[mark]
1075 del marks[mark]
1076
1076
1077 elif rename:
1077 elif rename:
1078 tr = repo.transaction('bookmark')
1078 tr = repo.transaction('bookmark')
1079 if not names:
1079 if not names:
1080 raise error.Abort(_("new bookmark name required"))
1080 raise error.Abort(_("new bookmark name required"))
1081 elif len(names) > 1:
1081 elif len(names) > 1:
1082 raise error.Abort(_("only one new bookmark name allowed"))
1082 raise error.Abort(_("only one new bookmark name allowed"))
1083 mark = checkformat(names[0])
1083 mark = checkformat(names[0])
1084 if rename not in marks:
1084 if rename not in marks:
1085 raise error.Abort(_("bookmark '%s' does not exist")
1085 raise error.Abort(_("bookmark '%s' does not exist")
1086 % rename)
1086 % rename)
1087 checkconflict(repo, mark, cur, force)
1087 checkconflict(repo, mark, cur, force)
1088 marks[mark] = marks[rename]
1088 marks[mark] = marks[rename]
1089 if repo._activebookmark == rename and not inactive:
1089 if repo._activebookmark == rename and not inactive:
1090 bookmarks.activate(repo, mark)
1090 bookmarks.activate(repo, mark)
1091 del marks[rename]
1091 del marks[rename]
1092 elif names:
1092 elif names:
1093 tr = repo.transaction('bookmark')
1093 tr = repo.transaction('bookmark')
1094 newact = None
1094 newact = None
1095 for mark in names:
1095 for mark in names:
1096 mark = checkformat(mark)
1096 mark = checkformat(mark)
1097 if newact is None:
1097 if newact is None:
1098 newact = mark
1098 newact = mark
1099 if inactive and mark == repo._activebookmark:
1099 if inactive and mark == repo._activebookmark:
1100 bookmarks.deactivate(repo)
1100 bookmarks.deactivate(repo)
1101 return
1101 return
1102 tgt = cur
1102 tgt = cur
1103 if rev:
1103 if rev:
1104 tgt = scmutil.revsingle(repo, rev).node()
1104 tgt = scmutil.revsingle(repo, rev).node()
1105 checkconflict(repo, mark, cur, force, tgt)
1105 checkconflict(repo, mark, cur, force, tgt)
1106 marks[mark] = tgt
1106 marks[mark] = tgt
1107 if not inactive and cur == marks[newact] and not rev:
1107 if not inactive and cur == marks[newact] and not rev:
1108 bookmarks.activate(repo, newact)
1108 bookmarks.activate(repo, newact)
1109 elif cur != tgt and newact == repo._activebookmark:
1109 elif cur != tgt and newact == repo._activebookmark:
1110 bookmarks.deactivate(repo)
1110 bookmarks.deactivate(repo)
1111 elif inactive:
1111 elif inactive:
1112 if len(marks) == 0:
1112 if len(marks) == 0:
1113 ui.status(_("no bookmarks set\n"))
1113 ui.status(_("no bookmarks set\n"))
1114 elif not repo._activebookmark:
1114 elif not repo._activebookmark:
1115 ui.status(_("no active bookmark\n"))
1115 ui.status(_("no active bookmark\n"))
1116 else:
1116 else:
1117 bookmarks.deactivate(repo)
1117 bookmarks.deactivate(repo)
1118 if tr is not None:
1118 if tr is not None:
1119 marks.recordchange(tr)
1119 marks.recordchange(tr)
1120 tr.close()
1120 tr.close()
1121 finally:
1121 finally:
1122 lockmod.release(tr, lock, wlock)
1122 lockmod.release(tr, lock, wlock)
1123 else: # show bookmarks
1123 else: # show bookmarks
1124 fm = ui.formatter('bookmarks', opts)
1124 fm = ui.formatter('bookmarks', opts)
1125 hexfn = fm.hexfunc
1125 hexfn = fm.hexfunc
1126 marks = repo._bookmarks
1126 marks = repo._bookmarks
1127 if len(marks) == 0 and fm.isplain():
1127 if len(marks) == 0 and fm.isplain():
1128 ui.status(_("no bookmarks set\n"))
1128 ui.status(_("no bookmarks set\n"))
1129 for bmark, n in sorted(marks.iteritems()):
1129 for bmark, n in sorted(marks.iteritems()):
1130 active = repo._activebookmark
1130 active = repo._activebookmark
1131 if bmark == active:
1131 if bmark == active:
1132 prefix, label = '*', activebookmarklabel
1132 prefix, label = '*', activebookmarklabel
1133 else:
1133 else:
1134 prefix, label = ' ', ''
1134 prefix, label = ' ', ''
1135
1135
1136 fm.startitem()
1136 fm.startitem()
1137 if not ui.quiet:
1137 if not ui.quiet:
1138 fm.plain(' %s ' % prefix, label=label)
1138 fm.plain(' %s ' % prefix, label=label)
1139 fm.write('bookmark', '%s', bmark, label=label)
1139 fm.write('bookmark', '%s', bmark, label=label)
1140 pad = " " * (25 - encoding.colwidth(bmark))
1140 pad = " " * (25 - encoding.colwidth(bmark))
1141 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1141 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1142 repo.changelog.rev(n), hexfn(n), label=label)
1142 repo.changelog.rev(n), hexfn(n), label=label)
1143 fm.data(active=(bmark == active))
1143 fm.data(active=(bmark == active))
1144 fm.plain('\n')
1144 fm.plain('\n')
1145 fm.end()
1145 fm.end()
1146
1146
1147 @command('branch',
1147 @command('branch',
1148 [('f', 'force', None,
1148 [('f', 'force', None,
1149 _('set branch name even if it shadows an existing branch')),
1149 _('set branch name even if it shadows an existing branch')),
1150 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1150 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1151 _('[-fC] [NAME]'))
1151 _('[-fC] [NAME]'))
1152 def branch(ui, repo, label=None, **opts):
1152 def branch(ui, repo, label=None, **opts):
1153 """set or show the current branch name
1153 """set or show the current branch name
1154
1154
1155 .. note::
1155 .. note::
1156
1156
1157 Branch names are permanent and global. Use :hg:`bookmark` to create a
1157 Branch names are permanent and global. Use :hg:`bookmark` to create a
1158 light-weight bookmark instead. See :hg:`help glossary` for more
1158 light-weight bookmark instead. See :hg:`help glossary` for more
1159 information about named branches and bookmarks.
1159 information about named branches and bookmarks.
1160
1160
1161 With no argument, show the current branch name. With one argument,
1161 With no argument, show the current branch name. With one argument,
1162 set the working directory branch name (the branch will not exist
1162 set the working directory branch name (the branch will not exist
1163 in the repository until the next commit). Standard practice
1163 in the repository until the next commit). Standard practice
1164 recommends that primary development take place on the 'default'
1164 recommends that primary development take place on the 'default'
1165 branch.
1165 branch.
1166
1166
1167 Unless -f/--force is specified, branch will not let you set a
1167 Unless -f/--force is specified, branch will not let you set a
1168 branch name that already exists.
1168 branch name that already exists.
1169
1169
1170 Use -C/--clean to reset the working directory branch to that of
1170 Use -C/--clean to reset the working directory branch to that of
1171 the parent of the working directory, negating a previous branch
1171 the parent of the working directory, negating a previous branch
1172 change.
1172 change.
1173
1173
1174 Use the command :hg:`update` to switch to an existing branch. Use
1174 Use the command :hg:`update` to switch to an existing branch. Use
1175 :hg:`commit --close-branch` to mark this branch head as closed.
1175 :hg:`commit --close-branch` to mark this branch head as closed.
1176 When all heads of a branch are closed, the branch will be
1176 When all heads of a branch are closed, the branch will be
1177 considered closed.
1177 considered closed.
1178
1178
1179 Returns 0 on success.
1179 Returns 0 on success.
1180 """
1180 """
1181 if label:
1181 if label:
1182 label = label.strip()
1182 label = label.strip()
1183
1183
1184 if not opts.get('clean') and not label:
1184 if not opts.get('clean') and not label:
1185 ui.write("%s\n" % repo.dirstate.branch())
1185 ui.write("%s\n" % repo.dirstate.branch())
1186 return
1186 return
1187
1187
1188 with repo.wlock():
1188 with repo.wlock():
1189 if opts.get('clean'):
1189 if opts.get('clean'):
1190 label = repo[None].p1().branch()
1190 label = repo[None].p1().branch()
1191 repo.dirstate.setbranch(label)
1191 repo.dirstate.setbranch(label)
1192 ui.status(_('reset working directory to branch %s\n') % label)
1192 ui.status(_('reset working directory to branch %s\n') % label)
1193 elif label:
1193 elif label:
1194 if not opts.get('force') and label in repo.branchmap():
1194 if not opts.get('force') and label in repo.branchmap():
1195 if label not in [p.branch() for p in repo[None].parents()]:
1195 if label not in [p.branch() for p in repo[None].parents()]:
1196 raise error.Abort(_('a branch of the same name already'
1196 raise error.Abort(_('a branch of the same name already'
1197 ' exists'),
1197 ' exists'),
1198 # i18n: "it" refers to an existing branch
1198 # i18n: "it" refers to an existing branch
1199 hint=_("use 'hg update' to switch to it"))
1199 hint=_("use 'hg update' to switch to it"))
1200 scmutil.checknewlabel(repo, label, 'branch')
1200 scmutil.checknewlabel(repo, label, 'branch')
1201 repo.dirstate.setbranch(label)
1201 repo.dirstate.setbranch(label)
1202 ui.status(_('marked working directory as branch %s\n') % label)
1202 ui.status(_('marked working directory as branch %s\n') % label)
1203
1203
1204 # find any open named branches aside from default
1204 # find any open named branches aside from default
1205 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1205 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1206 if n != "default" and not c]
1206 if n != "default" and not c]
1207 if not others:
1207 if not others:
1208 ui.status(_('(branches are permanent and global, '
1208 ui.status(_('(branches are permanent and global, '
1209 'did you want a bookmark?)\n'))
1209 'did you want a bookmark?)\n'))
1210
1210
1211 @command('branches',
1211 @command('branches',
1212 [('a', 'active', False,
1212 [('a', 'active', False,
1213 _('show only branches that have unmerged heads (DEPRECATED)')),
1213 _('show only branches that have unmerged heads (DEPRECATED)')),
1214 ('c', 'closed', False, _('show normal and closed branches')),
1214 ('c', 'closed', False, _('show normal and closed branches')),
1215 ] + formatteropts,
1215 ] + formatteropts,
1216 _('[-c]'))
1216 _('[-c]'))
1217 def branches(ui, repo, active=False, closed=False, **opts):
1217 def branches(ui, repo, active=False, closed=False, **opts):
1218 """list repository named branches
1218 """list repository named branches
1219
1219
1220 List the repository's named branches, indicating which ones are
1220 List the repository's named branches, indicating which ones are
1221 inactive. If -c/--closed is specified, also list branches which have
1221 inactive. If -c/--closed is specified, also list branches which have
1222 been marked closed (see :hg:`commit --close-branch`).
1222 been marked closed (see :hg:`commit --close-branch`).
1223
1223
1224 Use the command :hg:`update` to switch to an existing branch.
1224 Use the command :hg:`update` to switch to an existing branch.
1225
1225
1226 Returns 0.
1226 Returns 0.
1227 """
1227 """
1228
1228
1229 ui.pager('branches')
1229 ui.pager('branches')
1230 fm = ui.formatter('branches', opts)
1230 fm = ui.formatter('branches', opts)
1231 hexfunc = fm.hexfunc
1231 hexfunc = fm.hexfunc
1232
1232
1233 allheads = set(repo.heads())
1233 allheads = set(repo.heads())
1234 branches = []
1234 branches = []
1235 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1235 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1236 isactive = not isclosed and bool(set(heads) & allheads)
1236 isactive = not isclosed and bool(set(heads) & allheads)
1237 branches.append((tag, repo[tip], isactive, not isclosed))
1237 branches.append((tag, repo[tip], isactive, not isclosed))
1238 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1238 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1239 reverse=True)
1239 reverse=True)
1240
1240
1241 for tag, ctx, isactive, isopen in branches:
1241 for tag, ctx, isactive, isopen in branches:
1242 if active and not isactive:
1242 if active and not isactive:
1243 continue
1243 continue
1244 if isactive:
1244 if isactive:
1245 label = 'branches.active'
1245 label = 'branches.active'
1246 notice = ''
1246 notice = ''
1247 elif not isopen:
1247 elif not isopen:
1248 if not closed:
1248 if not closed:
1249 continue
1249 continue
1250 label = 'branches.closed'
1250 label = 'branches.closed'
1251 notice = _(' (closed)')
1251 notice = _(' (closed)')
1252 else:
1252 else:
1253 label = 'branches.inactive'
1253 label = 'branches.inactive'
1254 notice = _(' (inactive)')
1254 notice = _(' (inactive)')
1255 current = (tag == repo.dirstate.branch())
1255 current = (tag == repo.dirstate.branch())
1256 if current:
1256 if current:
1257 label = 'branches.current'
1257 label = 'branches.current'
1258
1258
1259 fm.startitem()
1259 fm.startitem()
1260 fm.write('branch', '%s', tag, label=label)
1260 fm.write('branch', '%s', tag, label=label)
1261 rev = ctx.rev()
1261 rev = ctx.rev()
1262 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1262 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1263 fmt = ' ' * padsize + ' %d:%s'
1263 fmt = ' ' * padsize + ' %d:%s'
1264 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1264 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1265 label='log.changeset changeset.%s' % ctx.phasestr())
1265 label='log.changeset changeset.%s' % ctx.phasestr())
1266 fm.context(ctx=ctx)
1266 fm.context(ctx=ctx)
1267 fm.data(active=isactive, closed=not isopen, current=current)
1267 fm.data(active=isactive, closed=not isopen, current=current)
1268 if not ui.quiet:
1268 if not ui.quiet:
1269 fm.plain(notice)
1269 fm.plain(notice)
1270 fm.plain('\n')
1270 fm.plain('\n')
1271 fm.end()
1271 fm.end()
1272
1272
1273 @command('bundle',
1273 @command('bundle',
1274 [('f', 'force', None, _('run even when the destination is unrelated')),
1274 [('f', 'force', None, _('run even when the destination is unrelated')),
1275 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1275 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1276 _('REV')),
1276 _('REV')),
1277 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1277 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1278 _('BRANCH')),
1278 _('BRANCH')),
1279 ('', 'base', [],
1279 ('', 'base', [],
1280 _('a base changeset assumed to be available at the destination'),
1280 _('a base changeset assumed to be available at the destination'),
1281 _('REV')),
1281 _('REV')),
1282 ('a', 'all', None, _('bundle all changesets in the repository')),
1282 ('a', 'all', None, _('bundle all changesets in the repository')),
1283 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1283 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1284 ] + remoteopts,
1284 ] + remoteopts,
1285 _('[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1285 _('[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1286 def bundle(ui, repo, fname, dest=None, **opts):
1286 def bundle(ui, repo, fname, dest=None, **opts):
1287 """create a bundle file
1287 """create a bundle file
1288
1288
1289 Generate a bundle file containing data to be added to a repository.
1289 Generate a bundle file containing data to be added to a repository.
1290
1290
1291 To create a bundle containing all changesets, use -a/--all
1291 To create a bundle containing all changesets, use -a/--all
1292 (or --base null). Otherwise, hg assumes the destination will have
1292 (or --base null). Otherwise, hg assumes the destination will have
1293 all the nodes you specify with --base parameters. Otherwise, hg
1293 all the nodes you specify with --base parameters. Otherwise, hg
1294 will assume the repository has all the nodes in destination, or
1294 will assume the repository has all the nodes in destination, or
1295 default-push/default if no destination is specified.
1295 default-push/default if no destination is specified.
1296
1296
1297 You can change bundle format with the -t/--type option. See
1297 You can change bundle format with the -t/--type option. See
1298 :hg:`help bundlespec` for documentation on this format. By default,
1298 :hg:`help bundlespec` for documentation on this format. By default,
1299 the most appropriate format is used and compression defaults to
1299 the most appropriate format is used and compression defaults to
1300 bzip2.
1300 bzip2.
1301
1301
1302 The bundle file can then be transferred using conventional means
1302 The bundle file can then be transferred using conventional means
1303 and applied to another repository with the unbundle or pull
1303 and applied to another repository with the unbundle or pull
1304 command. This is useful when direct push and pull are not
1304 command. This is useful when direct push and pull are not
1305 available or when exporting an entire repository is undesirable.
1305 available or when exporting an entire repository is undesirable.
1306
1306
1307 Applying bundles preserves all changeset contents including
1307 Applying bundles preserves all changeset contents including
1308 permissions, copy/rename information, and revision history.
1308 permissions, copy/rename information, and revision history.
1309
1309
1310 Returns 0 on success, 1 if no changes found.
1310 Returns 0 on success, 1 if no changes found.
1311 """
1311 """
1312 revs = None
1312 revs = None
1313 if 'rev' in opts:
1313 if 'rev' in opts:
1314 revstrings = opts['rev']
1314 revstrings = opts['rev']
1315 revs = scmutil.revrange(repo, revstrings)
1315 revs = scmutil.revrange(repo, revstrings)
1316 if revstrings and not revs:
1316 if revstrings and not revs:
1317 raise error.Abort(_('no commits to bundle'))
1317 raise error.Abort(_('no commits to bundle'))
1318
1318
1319 bundletype = opts.get('type', 'bzip2').lower()
1319 bundletype = opts.get('type', 'bzip2').lower()
1320 try:
1320 try:
1321 bcompression, cgversion, params = exchange.parsebundlespec(
1321 bcompression, cgversion, params = exchange.parsebundlespec(
1322 repo, bundletype, strict=False)
1322 repo, bundletype, strict=False)
1323 except error.UnsupportedBundleSpecification as e:
1323 except error.UnsupportedBundleSpecification as e:
1324 raise error.Abort(str(e),
1324 raise error.Abort(str(e),
1325 hint=_("see 'hg help bundlespec' for supported "
1325 hint=_("see 'hg help bundlespec' for supported "
1326 "values for --type"))
1326 "values for --type"))
1327
1327
1328 # Packed bundles are a pseudo bundle format for now.
1328 # Packed bundles are a pseudo bundle format for now.
1329 if cgversion == 's1':
1329 if cgversion == 's1':
1330 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1330 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1331 hint=_("use 'hg debugcreatestreamclonebundle'"))
1331 hint=_("use 'hg debugcreatestreamclonebundle'"))
1332
1332
1333 if opts.get('all'):
1333 if opts.get('all'):
1334 if dest:
1334 if dest:
1335 raise error.Abort(_("--all is incompatible with specifying "
1335 raise error.Abort(_("--all is incompatible with specifying "
1336 "a destination"))
1336 "a destination"))
1337 if opts.get('base'):
1337 if opts.get('base'):
1338 ui.warn(_("ignoring --base because --all was specified\n"))
1338 ui.warn(_("ignoring --base because --all was specified\n"))
1339 base = ['null']
1339 base = ['null']
1340 else:
1340 else:
1341 base = scmutil.revrange(repo, opts.get('base'))
1341 base = scmutil.revrange(repo, opts.get('base'))
1342 # TODO: get desired bundlecaps from command line.
1342 # TODO: get desired bundlecaps from command line.
1343 bundlecaps = None
1343 bundlecaps = None
1344 if cgversion not in changegroup.supportedoutgoingversions(repo):
1344 if cgversion not in changegroup.supportedoutgoingversions(repo):
1345 raise error.Abort(_("repository does not support bundle version %s") %
1345 raise error.Abort(_("repository does not support bundle version %s") %
1346 cgversion)
1346 cgversion)
1347
1347
1348 if base:
1348 if base:
1349 if dest:
1349 if dest:
1350 raise error.Abort(_("--base is incompatible with specifying "
1350 raise error.Abort(_("--base is incompatible with specifying "
1351 "a destination"))
1351 "a destination"))
1352 common = [repo.lookup(rev) for rev in base]
1352 common = [repo.lookup(rev) for rev in base]
1353 heads = revs and map(repo.lookup, revs) or None
1353 heads = revs and map(repo.lookup, revs) or None
1354 outgoing = discovery.outgoing(repo, common, heads)
1354 outgoing = discovery.outgoing(repo, common, heads)
1355 cg = changegroup.getchangegroup(repo, 'bundle', outgoing,
1355 cg = changegroup.getchangegroup(repo, 'bundle', outgoing,
1356 bundlecaps=bundlecaps,
1356 bundlecaps=bundlecaps,
1357 version=cgversion)
1357 version=cgversion)
1358 outgoing = None
1358 outgoing = None
1359 else:
1359 else:
1360 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1360 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1361 dest, branches = hg.parseurl(dest, opts.get('branch'))
1361 dest, branches = hg.parseurl(dest, opts.get('branch'))
1362 other = hg.peer(repo, opts, dest)
1362 other = hg.peer(repo, opts, dest)
1363 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1363 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1364 heads = revs and map(repo.lookup, revs) or revs
1364 heads = revs and map(repo.lookup, revs) or revs
1365 outgoing = discovery.findcommonoutgoing(repo, other,
1365 outgoing = discovery.findcommonoutgoing(repo, other,
1366 onlyheads=heads,
1366 onlyheads=heads,
1367 force=opts.get('force'),
1367 force=opts.get('force'),
1368 portable=True)
1368 portable=True)
1369 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1369 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1370 bundlecaps, version=cgversion)
1370 bundlecaps, version=cgversion)
1371 if not cg:
1371 if not cg:
1372 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1372 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1373 return 1
1373 return 1
1374
1374
1375 if cgversion == '01': #bundle1
1375 if cgversion == '01': #bundle1
1376 if bcompression is None:
1376 if bcompression is None:
1377 bcompression = 'UN'
1377 bcompression = 'UN'
1378 bversion = 'HG10' + bcompression
1378 bversion = 'HG10' + bcompression
1379 bcompression = None
1379 bcompression = None
1380 elif cgversion in ('02', '03'):
1380 elif cgversion in ('02', '03'):
1381 bversion = 'HG20'
1381 bversion = 'HG20'
1382 else:
1382 else:
1383 raise error.ProgrammingError(
1383 raise error.ProgrammingError(
1384 'bundle: unexpected changegroup version %s' % cgversion)
1384 'bundle: unexpected changegroup version %s' % cgversion)
1385
1385
1386 # TODO compression options should be derived from bundlespec parsing.
1386 # TODO compression options should be derived from bundlespec parsing.
1387 # This is a temporary hack to allow adjusting bundle compression
1387 # This is a temporary hack to allow adjusting bundle compression
1388 # level without a) formalizing the bundlespec changes to declare it
1388 # level without a) formalizing the bundlespec changes to declare it
1389 # b) introducing a command flag.
1389 # b) introducing a command flag.
1390 compopts = {}
1390 compopts = {}
1391 complevel = ui.configint('experimental', 'bundlecomplevel')
1391 complevel = ui.configint('experimental', 'bundlecomplevel')
1392 if complevel is not None:
1392 if complevel is not None:
1393 compopts['level'] = complevel
1393 compopts['level'] = complevel
1394
1394
1395 bundle2.writebundle(ui, cg, fname, bversion, compression=bcompression,
1395 bundle2.writebundle(ui, cg, fname, bversion, compression=bcompression,
1396 compopts=compopts)
1396 compopts=compopts)
1397
1397
1398 @command('cat',
1398 @command('cat',
1399 [('o', 'output', '',
1399 [('o', 'output', '',
1400 _('print output to file with formatted name'), _('FORMAT')),
1400 _('print output to file with formatted name'), _('FORMAT')),
1401 ('r', 'rev', '', _('print the given revision'), _('REV')),
1401 ('r', 'rev', '', _('print the given revision'), _('REV')),
1402 ('', 'decode', None, _('apply any matching decode filter')),
1402 ('', 'decode', None, _('apply any matching decode filter')),
1403 ] + walkopts,
1403 ] + walkopts,
1404 _('[OPTION]... FILE...'),
1404 _('[OPTION]... FILE...'),
1405 inferrepo=True)
1405 inferrepo=True)
1406 def cat(ui, repo, file1, *pats, **opts):
1406 def cat(ui, repo, file1, *pats, **opts):
1407 """output the current or given revision of files
1407 """output the current or given revision of files
1408
1408
1409 Print the specified files as they were at the given revision. If
1409 Print the specified files as they were at the given revision. If
1410 no revision is given, the parent of the working directory is used.
1410 no revision is given, the parent of the working directory is used.
1411
1411
1412 Output may be to a file, in which case the name of the file is
1412 Output may be to a file, in which case the name of the file is
1413 given using a format string. The formatting rules as follows:
1413 given using a format string. The formatting rules as follows:
1414
1414
1415 :``%%``: literal "%" character
1415 :``%%``: literal "%" character
1416 :``%s``: basename of file being printed
1416 :``%s``: basename of file being printed
1417 :``%d``: dirname of file being printed, or '.' if in repository root
1417 :``%d``: dirname of file being printed, or '.' if in repository root
1418 :``%p``: root-relative path name of file being printed
1418 :``%p``: root-relative path name of file being printed
1419 :``%H``: changeset hash (40 hexadecimal digits)
1419 :``%H``: changeset hash (40 hexadecimal digits)
1420 :``%R``: changeset revision number
1420 :``%R``: changeset revision number
1421 :``%h``: short-form changeset hash (12 hexadecimal digits)
1421 :``%h``: short-form changeset hash (12 hexadecimal digits)
1422 :``%r``: zero-padded changeset revision number
1422 :``%r``: zero-padded changeset revision number
1423 :``%b``: basename of the exporting repository
1423 :``%b``: basename of the exporting repository
1424
1424
1425 Returns 0 on success.
1425 Returns 0 on success.
1426 """
1426 """
1427 ctx = scmutil.revsingle(repo, opts.get('rev'))
1427 ctx = scmutil.revsingle(repo, opts.get('rev'))
1428 m = scmutil.match(ctx, (file1,) + pats, opts)
1428 m = scmutil.match(ctx, (file1,) + pats, opts)
1429
1429
1430 ui.pager('cat')
1430 ui.pager('cat')
1431 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1431 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1432
1432
1433 @command('^clone',
1433 @command('^clone',
1434 [('U', 'noupdate', None, _('the clone will include an empty working '
1434 [('U', 'noupdate', None, _('the clone will include an empty working '
1435 'directory (only a repository)')),
1435 'directory (only a repository)')),
1436 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1436 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1437 _('REV')),
1437 _('REV')),
1438 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1438 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1439 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1439 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1440 ('', 'pull', None, _('use pull protocol to copy metadata')),
1440 ('', 'pull', None, _('use pull protocol to copy metadata')),
1441 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1441 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1442 ] + remoteopts,
1442 ] + remoteopts,
1443 _('[OPTION]... SOURCE [DEST]'),
1443 _('[OPTION]... SOURCE [DEST]'),
1444 norepo=True)
1444 norepo=True)
1445 def clone(ui, source, dest=None, **opts):
1445 def clone(ui, source, dest=None, **opts):
1446 """make a copy of an existing repository
1446 """make a copy of an existing repository
1447
1447
1448 Create a copy of an existing repository in a new directory.
1448 Create a copy of an existing repository in a new directory.
1449
1449
1450 If no destination directory name is specified, it defaults to the
1450 If no destination directory name is specified, it defaults to the
1451 basename of the source.
1451 basename of the source.
1452
1452
1453 The location of the source is added to the new repository's
1453 The location of the source is added to the new repository's
1454 ``.hg/hgrc`` file, as the default to be used for future pulls.
1454 ``.hg/hgrc`` file, as the default to be used for future pulls.
1455
1455
1456 Only local paths and ``ssh://`` URLs are supported as
1456 Only local paths and ``ssh://`` URLs are supported as
1457 destinations. For ``ssh://`` destinations, no working directory or
1457 destinations. For ``ssh://`` destinations, no working directory or
1458 ``.hg/hgrc`` will be created on the remote side.
1458 ``.hg/hgrc`` will be created on the remote side.
1459
1459
1460 If the source repository has a bookmark called '@' set, that
1460 If the source repository has a bookmark called '@' set, that
1461 revision will be checked out in the new repository by default.
1461 revision will be checked out in the new repository by default.
1462
1462
1463 To check out a particular version, use -u/--update, or
1463 To check out a particular version, use -u/--update, or
1464 -U/--noupdate to create a clone with no working directory.
1464 -U/--noupdate to create a clone with no working directory.
1465
1465
1466 To pull only a subset of changesets, specify one or more revisions
1466 To pull only a subset of changesets, specify one or more revisions
1467 identifiers with -r/--rev or branches with -b/--branch. The
1467 identifiers with -r/--rev or branches with -b/--branch. The
1468 resulting clone will contain only the specified changesets and
1468 resulting clone will contain only the specified changesets and
1469 their ancestors. These options (or 'clone src#rev dest') imply
1469 their ancestors. These options (or 'clone src#rev dest') imply
1470 --pull, even for local source repositories.
1470 --pull, even for local source repositories.
1471
1471
1472 .. note::
1472 .. note::
1473
1473
1474 Specifying a tag will include the tagged changeset but not the
1474 Specifying a tag will include the tagged changeset but not the
1475 changeset containing the tag.
1475 changeset containing the tag.
1476
1476
1477 .. container:: verbose
1477 .. container:: verbose
1478
1478
1479 For efficiency, hardlinks are used for cloning whenever the
1479 For efficiency, hardlinks are used for cloning whenever the
1480 source and destination are on the same filesystem (note this
1480 source and destination are on the same filesystem (note this
1481 applies only to the repository data, not to the working
1481 applies only to the repository data, not to the working
1482 directory). Some filesystems, such as AFS, implement hardlinking
1482 directory). Some filesystems, such as AFS, implement hardlinking
1483 incorrectly, but do not report errors. In these cases, use the
1483 incorrectly, but do not report errors. In these cases, use the
1484 --pull option to avoid hardlinking.
1484 --pull option to avoid hardlinking.
1485
1485
1486 In some cases, you can clone repositories and the working
1486 In some cases, you can clone repositories and the working
1487 directory using full hardlinks with ::
1487 directory using full hardlinks with ::
1488
1488
1489 $ cp -al REPO REPOCLONE
1489 $ cp -al REPO REPOCLONE
1490
1490
1491 This is the fastest way to clone, but it is not always safe. The
1491 This is the fastest way to clone, but it is not always safe. The
1492 operation is not atomic (making sure REPO is not modified during
1492 operation is not atomic (making sure REPO is not modified during
1493 the operation is up to you) and you have to make sure your
1493 the operation is up to you) and you have to make sure your
1494 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1494 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1495 so). Also, this is not compatible with certain extensions that
1495 so). Also, this is not compatible with certain extensions that
1496 place their metadata under the .hg directory, such as mq.
1496 place their metadata under the .hg directory, such as mq.
1497
1497
1498 Mercurial will update the working directory to the first applicable
1498 Mercurial will update the working directory to the first applicable
1499 revision from this list:
1499 revision from this list:
1500
1500
1501 a) null if -U or the source repository has no changesets
1501 a) null if -U or the source repository has no changesets
1502 b) if -u . and the source repository is local, the first parent of
1502 b) if -u . and the source repository is local, the first parent of
1503 the source repository's working directory
1503 the source repository's working directory
1504 c) the changeset specified with -u (if a branch name, this means the
1504 c) the changeset specified with -u (if a branch name, this means the
1505 latest head of that branch)
1505 latest head of that branch)
1506 d) the changeset specified with -r
1506 d) the changeset specified with -r
1507 e) the tipmost head specified with -b
1507 e) the tipmost head specified with -b
1508 f) the tipmost head specified with the url#branch source syntax
1508 f) the tipmost head specified with the url#branch source syntax
1509 g) the revision marked with the '@' bookmark, if present
1509 g) the revision marked with the '@' bookmark, if present
1510 h) the tipmost head of the default branch
1510 h) the tipmost head of the default branch
1511 i) tip
1511 i) tip
1512
1512
1513 When cloning from servers that support it, Mercurial may fetch
1513 When cloning from servers that support it, Mercurial may fetch
1514 pre-generated data from a server-advertised URL. When this is done,
1514 pre-generated data from a server-advertised URL. When this is done,
1515 hooks operating on incoming changesets and changegroups may fire twice,
1515 hooks operating on incoming changesets and changegroups may fire twice,
1516 once for the bundle fetched from the URL and another for any additional
1516 once for the bundle fetched from the URL and another for any additional
1517 data not fetched from this URL. In addition, if an error occurs, the
1517 data not fetched from this URL. In addition, if an error occurs, the
1518 repository may be rolled back to a partial clone. This behavior may
1518 repository may be rolled back to a partial clone. This behavior may
1519 change in future releases. See :hg:`help -e clonebundles` for more.
1519 change in future releases. See :hg:`help -e clonebundles` for more.
1520
1520
1521 Examples:
1521 Examples:
1522
1522
1523 - clone a remote repository to a new directory named hg/::
1523 - clone a remote repository to a new directory named hg/::
1524
1524
1525 hg clone https://www.mercurial-scm.org/repo/hg/
1525 hg clone https://www.mercurial-scm.org/repo/hg/
1526
1526
1527 - create a lightweight local clone::
1527 - create a lightweight local clone::
1528
1528
1529 hg clone project/ project-feature/
1529 hg clone project/ project-feature/
1530
1530
1531 - clone from an absolute path on an ssh server (note double-slash)::
1531 - clone from an absolute path on an ssh server (note double-slash)::
1532
1532
1533 hg clone ssh://user@server//home/projects/alpha/
1533 hg clone ssh://user@server//home/projects/alpha/
1534
1534
1535 - do a high-speed clone over a LAN while checking out a
1535 - do a high-speed clone over a LAN while checking out a
1536 specified version::
1536 specified version::
1537
1537
1538 hg clone --uncompressed http://server/repo -u 1.5
1538 hg clone --uncompressed http://server/repo -u 1.5
1539
1539
1540 - create a repository without changesets after a particular revision::
1540 - create a repository without changesets after a particular revision::
1541
1541
1542 hg clone -r 04e544 experimental/ good/
1542 hg clone -r 04e544 experimental/ good/
1543
1543
1544 - clone (and track) a particular named branch::
1544 - clone (and track) a particular named branch::
1545
1545
1546 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1546 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1547
1547
1548 See :hg:`help urls` for details on specifying URLs.
1548 See :hg:`help urls` for details on specifying URLs.
1549
1549
1550 Returns 0 on success.
1550 Returns 0 on success.
1551 """
1551 """
1552 if opts.get('noupdate') and opts.get('updaterev'):
1552 if opts.get('noupdate') and opts.get('updaterev'):
1553 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1553 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1554
1554
1555 r = hg.clone(ui, opts, source, dest,
1555 r = hg.clone(ui, opts, source, dest,
1556 pull=opts.get('pull'),
1556 pull=opts.get('pull'),
1557 stream=opts.get('uncompressed'),
1557 stream=opts.get('uncompressed'),
1558 rev=opts.get('rev'),
1558 rev=opts.get('rev'),
1559 update=opts.get('updaterev') or not opts.get('noupdate'),
1559 update=opts.get('updaterev') or not opts.get('noupdate'),
1560 branch=opts.get('branch'),
1560 branch=opts.get('branch'),
1561 shareopts=opts.get('shareopts'))
1561 shareopts=opts.get('shareopts'))
1562
1562
1563 return r is None
1563 return r is None
1564
1564
1565 @command('^commit|ci',
1565 @command('^commit|ci',
1566 [('A', 'addremove', None,
1566 [('A', 'addremove', None,
1567 _('mark new/missing files as added/removed before committing')),
1567 _('mark new/missing files as added/removed before committing')),
1568 ('', 'close-branch', None,
1568 ('', 'close-branch', None,
1569 _('mark a branch head as closed')),
1569 _('mark a branch head as closed')),
1570 ('', 'amend', None, _('amend the parent of the working directory')),
1570 ('', 'amend', None, _('amend the parent of the working directory')),
1571 ('s', 'secret', None, _('use the secret phase for committing')),
1571 ('s', 'secret', None, _('use the secret phase for committing')),
1572 ('e', 'edit', None, _('invoke editor on commit messages')),
1572 ('e', 'edit', None, _('invoke editor on commit messages')),
1573 ('i', 'interactive', None, _('use interactive mode')),
1573 ('i', 'interactive', None, _('use interactive mode')),
1574 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1574 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1575 _('[OPTION]... [FILE]...'),
1575 _('[OPTION]... [FILE]...'),
1576 inferrepo=True)
1576 inferrepo=True)
1577 def commit(ui, repo, *pats, **opts):
1577 def commit(ui, repo, *pats, **opts):
1578 """commit the specified files or all outstanding changes
1578 """commit the specified files or all outstanding changes
1579
1579
1580 Commit changes to the given files into the repository. Unlike a
1580 Commit changes to the given files into the repository. Unlike a
1581 centralized SCM, this operation is a local operation. See
1581 centralized SCM, this operation is a local operation. See
1582 :hg:`push` for a way to actively distribute your changes.
1582 :hg:`push` for a way to actively distribute your changes.
1583
1583
1584 If a list of files is omitted, all changes reported by :hg:`status`
1584 If a list of files is omitted, all changes reported by :hg:`status`
1585 will be committed.
1585 will be committed.
1586
1586
1587 If you are committing the result of a merge, do not provide any
1587 If you are committing the result of a merge, do not provide any
1588 filenames or -I/-X filters.
1588 filenames or -I/-X filters.
1589
1589
1590 If no commit message is specified, Mercurial starts your
1590 If no commit message is specified, Mercurial starts your
1591 configured editor where you can enter a message. In case your
1591 configured editor where you can enter a message. In case your
1592 commit fails, you will find a backup of your message in
1592 commit fails, you will find a backup of your message in
1593 ``.hg/last-message.txt``.
1593 ``.hg/last-message.txt``.
1594
1594
1595 The --close-branch flag can be used to mark the current branch
1595 The --close-branch flag can be used to mark the current branch
1596 head closed. When all heads of a branch are closed, the branch
1596 head closed. When all heads of a branch are closed, the branch
1597 will be considered closed and no longer listed.
1597 will be considered closed and no longer listed.
1598
1598
1599 The --amend flag can be used to amend the parent of the
1599 The --amend flag can be used to amend the parent of the
1600 working directory with a new commit that contains the changes
1600 working directory with a new commit that contains the changes
1601 in the parent in addition to those currently reported by :hg:`status`,
1601 in the parent in addition to those currently reported by :hg:`status`,
1602 if there are any. The old commit is stored in a backup bundle in
1602 if there are any. The old commit is stored in a backup bundle in
1603 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1603 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1604 on how to restore it).
1604 on how to restore it).
1605
1605
1606 Message, user and date are taken from the amended commit unless
1606 Message, user and date are taken from the amended commit unless
1607 specified. When a message isn't specified on the command line,
1607 specified. When a message isn't specified on the command line,
1608 the editor will open with the message of the amended commit.
1608 the editor will open with the message of the amended commit.
1609
1609
1610 It is not possible to amend public changesets (see :hg:`help phases`)
1610 It is not possible to amend public changesets (see :hg:`help phases`)
1611 or changesets that have children.
1611 or changesets that have children.
1612
1612
1613 See :hg:`help dates` for a list of formats valid for -d/--date.
1613 See :hg:`help dates` for a list of formats valid for -d/--date.
1614
1614
1615 Returns 0 on success, 1 if nothing changed.
1615 Returns 0 on success, 1 if nothing changed.
1616
1616
1617 .. container:: verbose
1617 .. container:: verbose
1618
1618
1619 Examples:
1619 Examples:
1620
1620
1621 - commit all files ending in .py::
1621 - commit all files ending in .py::
1622
1622
1623 hg commit --include "set:**.py"
1623 hg commit --include "set:**.py"
1624
1624
1625 - commit all non-binary files::
1625 - commit all non-binary files::
1626
1626
1627 hg commit --exclude "set:binary()"
1627 hg commit --exclude "set:binary()"
1628
1628
1629 - amend the current commit and set the date to now::
1629 - amend the current commit and set the date to now::
1630
1630
1631 hg commit --amend --date now
1631 hg commit --amend --date now
1632 """
1632 """
1633 wlock = lock = None
1633 wlock = lock = None
1634 try:
1634 try:
1635 wlock = repo.wlock()
1635 wlock = repo.wlock()
1636 lock = repo.lock()
1636 lock = repo.lock()
1637 return _docommit(ui, repo, *pats, **opts)
1637 return _docommit(ui, repo, *pats, **opts)
1638 finally:
1638 finally:
1639 release(lock, wlock)
1639 release(lock, wlock)
1640
1640
1641 def _docommit(ui, repo, *pats, **opts):
1641 def _docommit(ui, repo, *pats, **opts):
1642 opts = pycompat.byteskwargs(opts)
1642 opts = pycompat.byteskwargs(opts)
1643 if opts.get('interactive'):
1643 if opts.get('interactive'):
1644 opts.pop('interactive')
1644 opts.pop('interactive')
1645 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1645 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1646 cmdutil.recordfilter, *pats,
1646 cmdutil.recordfilter, *pats,
1647 **pycompat.strkwargs(opts))
1647 **pycompat.strkwargs(opts))
1648 # ret can be 0 (no changes to record) or the value returned by
1648 # ret can be 0 (no changes to record) or the value returned by
1649 # commit(), 1 if nothing changed or None on success.
1649 # commit(), 1 if nothing changed or None on success.
1650 return 1 if ret == 0 else ret
1650 return 1 if ret == 0 else ret
1651
1651
1652 if opts.get('subrepos'):
1652 if opts.get('subrepos'):
1653 if opts.get('amend'):
1653 if opts.get('amend'):
1654 raise error.Abort(_('cannot amend with --subrepos'))
1654 raise error.Abort(_('cannot amend with --subrepos'))
1655 # Let --subrepos on the command line override config setting.
1655 # Let --subrepos on the command line override config setting.
1656 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1656 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1657
1657
1658 cmdutil.checkunfinished(repo, commit=True)
1658 cmdutil.checkunfinished(repo, commit=True)
1659
1659
1660 branch = repo[None].branch()
1660 branch = repo[None].branch()
1661 bheads = repo.branchheads(branch)
1661 bheads = repo.branchheads(branch)
1662
1662
1663 extra = {}
1663 extra = {}
1664 if opts.get('close_branch'):
1664 if opts.get('close_branch'):
1665 extra['close'] = 1
1665 extra['close'] = 1
1666
1666
1667 if not bheads:
1667 if not bheads:
1668 raise error.Abort(_('can only close branch heads'))
1668 raise error.Abort(_('can only close branch heads'))
1669 elif opts.get('amend'):
1669 elif opts.get('amend'):
1670 if repo[None].parents()[0].p1().branch() != branch and \
1670 if repo[None].parents()[0].p1().branch() != branch and \
1671 repo[None].parents()[0].p2().branch() != branch:
1671 repo[None].parents()[0].p2().branch() != branch:
1672 raise error.Abort(_('can only close branch heads'))
1672 raise error.Abort(_('can only close branch heads'))
1673
1673
1674 if opts.get('amend'):
1674 if opts.get('amend'):
1675 if ui.configbool('ui', 'commitsubrepos'):
1675 if ui.configbool('ui', 'commitsubrepos'):
1676 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1676 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1677
1677
1678 old = repo['.']
1678 old = repo['.']
1679 if not old.mutable():
1679 if not old.mutable():
1680 raise error.Abort(_('cannot amend public changesets'))
1680 raise error.Abort(_('cannot amend public changesets'))
1681 if len(repo[None].parents()) > 1:
1681 if len(repo[None].parents()) > 1:
1682 raise error.Abort(_('cannot amend while merging'))
1682 raise error.Abort(_('cannot amend while merging'))
1683 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1683 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1684 if not allowunstable and old.children():
1684 if not allowunstable and old.children():
1685 raise error.Abort(_('cannot amend changeset with children'))
1685 raise error.Abort(_('cannot amend changeset with children'))
1686
1686
1687 # Currently histedit gets confused if an amend happens while histedit
1687 # Currently histedit gets confused if an amend happens while histedit
1688 # is in progress. Since we have a checkunfinished command, we are
1688 # is in progress. Since we have a checkunfinished command, we are
1689 # temporarily honoring it.
1689 # temporarily honoring it.
1690 #
1690 #
1691 # Note: eventually this guard will be removed. Please do not expect
1691 # Note: eventually this guard will be removed. Please do not expect
1692 # this behavior to remain.
1692 # this behavior to remain.
1693 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1693 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1694 cmdutil.checkunfinished(repo)
1694 cmdutil.checkunfinished(repo)
1695
1695
1696 # commitfunc is used only for temporary amend commit by cmdutil.amend
1696 # commitfunc is used only for temporary amend commit by cmdutil.amend
1697 def commitfunc(ui, repo, message, match, opts):
1697 def commitfunc(ui, repo, message, match, opts):
1698 return repo.commit(message,
1698 return repo.commit(message,
1699 opts.get('user') or old.user(),
1699 opts.get('user') or old.user(),
1700 opts.get('date') or old.date(),
1700 opts.get('date') or old.date(),
1701 match,
1701 match,
1702 extra=extra)
1702 extra=extra)
1703
1703
1704 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1704 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1705 if node == old.node():
1705 if node == old.node():
1706 ui.status(_("nothing changed\n"))
1706 ui.status(_("nothing changed\n"))
1707 return 1
1707 return 1
1708 else:
1708 else:
1709 def commitfunc(ui, repo, message, match, opts):
1709 def commitfunc(ui, repo, message, match, opts):
1710 overrides = {}
1710 overrides = {}
1711 if opts.get('secret'):
1711 if opts.get('secret'):
1712 overrides[('phases', 'new-commit')] = 'secret'
1712 overrides[('phases', 'new-commit')] = 'secret'
1713
1713
1714 baseui = repo.baseui
1714 baseui = repo.baseui
1715 with baseui.configoverride(overrides, 'commit'):
1715 with baseui.configoverride(overrides, 'commit'):
1716 with ui.configoverride(overrides, 'commit'):
1716 with ui.configoverride(overrides, 'commit'):
1717 editform = cmdutil.mergeeditform(repo[None],
1717 editform = cmdutil.mergeeditform(repo[None],
1718 'commit.normal')
1718 'commit.normal')
1719 editor = cmdutil.getcommiteditor(
1719 editor = cmdutil.getcommiteditor(
1720 editform=editform, **pycompat.strkwargs(opts))
1720 editform=editform, **pycompat.strkwargs(opts))
1721 return repo.commit(message,
1721 return repo.commit(message,
1722 opts.get('user'),
1722 opts.get('user'),
1723 opts.get('date'),
1723 opts.get('date'),
1724 match,
1724 match,
1725 editor=editor,
1725 editor=editor,
1726 extra=extra)
1726 extra=extra)
1727
1727
1728 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1728 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1729
1729
1730 if not node:
1730 if not node:
1731 stat = cmdutil.postcommitstatus(repo, pats, opts)
1731 stat = cmdutil.postcommitstatus(repo, pats, opts)
1732 if stat[3]:
1732 if stat[3]:
1733 ui.status(_("nothing changed (%d missing files, see "
1733 ui.status(_("nothing changed (%d missing files, see "
1734 "'hg status')\n") % len(stat[3]))
1734 "'hg status')\n") % len(stat[3]))
1735 else:
1735 else:
1736 ui.status(_("nothing changed\n"))
1736 ui.status(_("nothing changed\n"))
1737 return 1
1737 return 1
1738
1738
1739 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1739 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1740
1740
1741 @command('config|showconfig|debugconfig',
1741 @command('config|showconfig|debugconfig',
1742 [('u', 'untrusted', None, _('show untrusted configuration options')),
1742 [('u', 'untrusted', None, _('show untrusted configuration options')),
1743 ('e', 'edit', None, _('edit user config')),
1743 ('e', 'edit', None, _('edit user config')),
1744 ('l', 'local', None, _('edit repository config')),
1744 ('l', 'local', None, _('edit repository config')),
1745 ('g', 'global', None, _('edit global config'))] + formatteropts,
1745 ('g', 'global', None, _('edit global config'))] + formatteropts,
1746 _('[-u] [NAME]...'),
1746 _('[-u] [NAME]...'),
1747 optionalrepo=True)
1747 optionalrepo=True)
1748 def config(ui, repo, *values, **opts):
1748 def config(ui, repo, *values, **opts):
1749 """show combined config settings from all hgrc files
1749 """show combined config settings from all hgrc files
1750
1750
1751 With no arguments, print names and values of all config items.
1751 With no arguments, print names and values of all config items.
1752
1752
1753 With one argument of the form section.name, print just the value
1753 With one argument of the form section.name, print just the value
1754 of that config item.
1754 of that config item.
1755
1755
1756 With multiple arguments, print names and values of all config
1756 With multiple arguments, print names and values of all config
1757 items with matching section names.
1757 items with matching section names.
1758
1758
1759 With --edit, start an editor on the user-level config file. With
1759 With --edit, start an editor on the user-level config file. With
1760 --global, edit the system-wide config file. With --local, edit the
1760 --global, edit the system-wide config file. With --local, edit the
1761 repository-level config file.
1761 repository-level config file.
1762
1762
1763 With --debug, the source (filename and line number) is printed
1763 With --debug, the source (filename and line number) is printed
1764 for each config item.
1764 for each config item.
1765
1765
1766 See :hg:`help config` for more information about config files.
1766 See :hg:`help config` for more information about config files.
1767
1767
1768 Returns 0 on success, 1 if NAME does not exist.
1768 Returns 0 on success, 1 if NAME does not exist.
1769
1769
1770 """
1770 """
1771
1771
1772 if opts.get('edit') or opts.get('local') or opts.get('global'):
1772 if opts.get('edit') or opts.get('local') or opts.get('global'):
1773 if opts.get('local') and opts.get('global'):
1773 if opts.get('local') and opts.get('global'):
1774 raise error.Abort(_("can't use --local and --global together"))
1774 raise error.Abort(_("can't use --local and --global together"))
1775
1775
1776 if opts.get('local'):
1776 if opts.get('local'):
1777 if not repo:
1777 if not repo:
1778 raise error.Abort(_("can't use --local outside a repository"))
1778 raise error.Abort(_("can't use --local outside a repository"))
1779 paths = [repo.vfs.join('hgrc')]
1779 paths = [repo.vfs.join('hgrc')]
1780 elif opts.get('global'):
1780 elif opts.get('global'):
1781 paths = rcutil.systemrcpath()
1781 paths = rcutil.systemrcpath()
1782 else:
1782 else:
1783 paths = rcutil.userrcpath()
1783 paths = rcutil.userrcpath()
1784
1784
1785 for f in paths:
1785 for f in paths:
1786 if os.path.exists(f):
1786 if os.path.exists(f):
1787 break
1787 break
1788 else:
1788 else:
1789 if opts.get('global'):
1789 if opts.get('global'):
1790 samplehgrc = uimod.samplehgrcs['global']
1790 samplehgrc = uimod.samplehgrcs['global']
1791 elif opts.get('local'):
1791 elif opts.get('local'):
1792 samplehgrc = uimod.samplehgrcs['local']
1792 samplehgrc = uimod.samplehgrcs['local']
1793 else:
1793 else:
1794 samplehgrc = uimod.samplehgrcs['user']
1794 samplehgrc = uimod.samplehgrcs['user']
1795
1795
1796 f = paths[0]
1796 f = paths[0]
1797 fp = open(f, "w")
1797 fp = open(f, "w")
1798 fp.write(samplehgrc)
1798 fp.write(samplehgrc)
1799 fp.close()
1799 fp.close()
1800
1800
1801 editor = ui.geteditor()
1801 editor = ui.geteditor()
1802 ui.system("%s \"%s\"" % (editor, f),
1802 ui.system("%s \"%s\"" % (editor, f),
1803 onerr=error.Abort, errprefix=_("edit failed"),
1803 onerr=error.Abort, errprefix=_("edit failed"),
1804 blockedtag='config_edit')
1804 blockedtag='config_edit')
1805 return
1805 return
1806 ui.pager('config')
1806 ui.pager('config')
1807 fm = ui.formatter('config', opts)
1807 fm = ui.formatter('config', opts)
1808 for t, f in rcutil.rccomponents():
1808 for t, f in rcutil.rccomponents():
1809 if t == 'path':
1809 if t == 'path':
1810 ui.debug('read config from: %s\n' % f)
1810 ui.debug('read config from: %s\n' % f)
1811 elif t == 'items':
1811 elif t == 'items':
1812 for section, name, value, source in f:
1812 for section, name, value, source in f:
1813 ui.debug('set config by: %s\n' % source)
1813 ui.debug('set config by: %s\n' % source)
1814 else:
1814 else:
1815 raise error.ProgrammingError('unknown rctype: %s' % t)
1815 raise error.ProgrammingError('unknown rctype: %s' % t)
1816 untrusted = bool(opts.get('untrusted'))
1816 untrusted = bool(opts.get('untrusted'))
1817 if values:
1817 if values:
1818 sections = [v for v in values if '.' not in v]
1818 sections = [v for v in values if '.' not in v]
1819 items = [v for v in values if '.' in v]
1819 items = [v for v in values if '.' in v]
1820 if len(items) > 1 or items and sections:
1820 if len(items) > 1 or items and sections:
1821 raise error.Abort(_('only one config item permitted'))
1821 raise error.Abort(_('only one config item permitted'))
1822 matched = False
1822 matched = False
1823 for section, name, value in ui.walkconfig(untrusted=untrusted):
1823 for section, name, value in ui.walkconfig(untrusted=untrusted):
1824 source = ui.configsource(section, name, untrusted)
1824 source = ui.configsource(section, name, untrusted)
1825 value = pycompat.bytestr(value)
1825 value = pycompat.bytestr(value)
1826 if fm.isplain():
1826 if fm.isplain():
1827 source = source or 'none'
1827 source = source or 'none'
1828 value = value.replace('\n', '\\n')
1828 value = value.replace('\n', '\\n')
1829 entryname = section + '.' + name
1829 entryname = section + '.' + name
1830 if values:
1830 if values:
1831 for v in values:
1831 for v in values:
1832 if v == section:
1832 if v == section:
1833 fm.startitem()
1833 fm.startitem()
1834 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1834 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1835 fm.write('name value', '%s=%s\n', entryname, value)
1835 fm.write('name value', '%s=%s\n', entryname, value)
1836 matched = True
1836 matched = True
1837 elif v == entryname:
1837 elif v == entryname:
1838 fm.startitem()
1838 fm.startitem()
1839 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1839 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1840 fm.write('value', '%s\n', value)
1840 fm.write('value', '%s\n', value)
1841 fm.data(name=entryname)
1841 fm.data(name=entryname)
1842 matched = True
1842 matched = True
1843 else:
1843 else:
1844 fm.startitem()
1844 fm.startitem()
1845 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1845 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1846 fm.write('name value', '%s=%s\n', entryname, value)
1846 fm.write('name value', '%s=%s\n', entryname, value)
1847 matched = True
1847 matched = True
1848 fm.end()
1848 fm.end()
1849 if matched:
1849 if matched:
1850 return 0
1850 return 0
1851 return 1
1851 return 1
1852
1852
1853 @command('copy|cp',
1853 @command('copy|cp',
1854 [('A', 'after', None, _('record a copy that has already occurred')),
1854 [('A', 'after', None, _('record a copy that has already occurred')),
1855 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1855 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1856 ] + walkopts + dryrunopts,
1856 ] + walkopts + dryrunopts,
1857 _('[OPTION]... [SOURCE]... DEST'))
1857 _('[OPTION]... [SOURCE]... DEST'))
1858 def copy(ui, repo, *pats, **opts):
1858 def copy(ui, repo, *pats, **opts):
1859 """mark files as copied for the next commit
1859 """mark files as copied for the next commit
1860
1860
1861 Mark dest as having copies of source files. If dest is a
1861 Mark dest as having copies of source files. If dest is a
1862 directory, copies are put in that directory. If dest is a file,
1862 directory, copies are put in that directory. If dest is a file,
1863 the source must be a single file.
1863 the source must be a single file.
1864
1864
1865 By default, this command copies the contents of files as they
1865 By default, this command copies the contents of files as they
1866 exist in the working directory. If invoked with -A/--after, the
1866 exist in the working directory. If invoked with -A/--after, the
1867 operation is recorded, but no copying is performed.
1867 operation is recorded, but no copying is performed.
1868
1868
1869 This command takes effect with the next commit. To undo a copy
1869 This command takes effect with the next commit. To undo a copy
1870 before that, see :hg:`revert`.
1870 before that, see :hg:`revert`.
1871
1871
1872 Returns 0 on success, 1 if errors are encountered.
1872 Returns 0 on success, 1 if errors are encountered.
1873 """
1873 """
1874 with repo.wlock(False):
1874 with repo.wlock(False):
1875 return cmdutil.copy(ui, repo, pats, opts)
1875 return cmdutil.copy(ui, repo, pats, opts)
1876
1876
1877 @command('^diff',
1877 @command('^diff',
1878 [('r', 'rev', [], _('revision'), _('REV')),
1878 [('r', 'rev', [], _('revision'), _('REV')),
1879 ('c', 'change', '', _('change made by revision'), _('REV'))
1879 ('c', 'change', '', _('change made by revision'), _('REV'))
1880 ] + diffopts + diffopts2 + walkopts + subrepoopts,
1880 ] + diffopts + diffopts2 + walkopts + subrepoopts,
1881 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
1881 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
1882 inferrepo=True)
1882 inferrepo=True)
1883 def diff(ui, repo, *pats, **opts):
1883 def diff(ui, repo, *pats, **opts):
1884 """diff repository (or selected files)
1884 """diff repository (or selected files)
1885
1885
1886 Show differences between revisions for the specified files.
1886 Show differences between revisions for the specified files.
1887
1887
1888 Differences between files are shown using the unified diff format.
1888 Differences between files are shown using the unified diff format.
1889
1889
1890 .. note::
1890 .. note::
1891
1891
1892 :hg:`diff` may generate unexpected results for merges, as it will
1892 :hg:`diff` may generate unexpected results for merges, as it will
1893 default to comparing against the working directory's first
1893 default to comparing against the working directory's first
1894 parent changeset if no revisions are specified.
1894 parent changeset if no revisions are specified.
1895
1895
1896 When two revision arguments are given, then changes are shown
1896 When two revision arguments are given, then changes are shown
1897 between those revisions. If only one revision is specified then
1897 between those revisions. If only one revision is specified then
1898 that revision is compared to the working directory, and, when no
1898 that revision is compared to the working directory, and, when no
1899 revisions are specified, the working directory files are compared
1899 revisions are specified, the working directory files are compared
1900 to its first parent.
1900 to its first parent.
1901
1901
1902 Alternatively you can specify -c/--change with a revision to see
1902 Alternatively you can specify -c/--change with a revision to see
1903 the changes in that changeset relative to its first parent.
1903 the changes in that changeset relative to its first parent.
1904
1904
1905 Without the -a/--text option, diff will avoid generating diffs of
1905 Without the -a/--text option, diff will avoid generating diffs of
1906 files it detects as binary. With -a, diff will generate a diff
1906 files it detects as binary. With -a, diff will generate a diff
1907 anyway, probably with undesirable results.
1907 anyway, probably with undesirable results.
1908
1908
1909 Use the -g/--git option to generate diffs in the git extended diff
1909 Use the -g/--git option to generate diffs in the git extended diff
1910 format. For more information, read :hg:`help diffs`.
1910 format. For more information, read :hg:`help diffs`.
1911
1911
1912 .. container:: verbose
1912 .. container:: verbose
1913
1913
1914 Examples:
1914 Examples:
1915
1915
1916 - compare a file in the current working directory to its parent::
1916 - compare a file in the current working directory to its parent::
1917
1917
1918 hg diff foo.c
1918 hg diff foo.c
1919
1919
1920 - compare two historical versions of a directory, with rename info::
1920 - compare two historical versions of a directory, with rename info::
1921
1921
1922 hg diff --git -r 1.0:1.2 lib/
1922 hg diff --git -r 1.0:1.2 lib/
1923
1923
1924 - get change stats relative to the last change on some date::
1924 - get change stats relative to the last change on some date::
1925
1925
1926 hg diff --stat -r "date('may 2')"
1926 hg diff --stat -r "date('may 2')"
1927
1927
1928 - diff all newly-added files that contain a keyword::
1928 - diff all newly-added files that contain a keyword::
1929
1929
1930 hg diff "set:added() and grep(GNU)"
1930 hg diff "set:added() and grep(GNU)"
1931
1931
1932 - compare a revision and its parents::
1932 - compare a revision and its parents::
1933
1933
1934 hg diff -c 9353 # compare against first parent
1934 hg diff -c 9353 # compare against first parent
1935 hg diff -r 9353^:9353 # same using revset syntax
1935 hg diff -r 9353^:9353 # same using revset syntax
1936 hg diff -r 9353^2:9353 # compare against the second parent
1936 hg diff -r 9353^2:9353 # compare against the second parent
1937
1937
1938 Returns 0 on success.
1938 Returns 0 on success.
1939 """
1939 """
1940
1940
1941 revs = opts.get('rev')
1941 revs = opts.get('rev')
1942 change = opts.get('change')
1942 change = opts.get('change')
1943 stat = opts.get('stat')
1943 stat = opts.get('stat')
1944 reverse = opts.get('reverse')
1944 reverse = opts.get('reverse')
1945
1945
1946 if revs and change:
1946 if revs and change:
1947 msg = _('cannot specify --rev and --change at the same time')
1947 msg = _('cannot specify --rev and --change at the same time')
1948 raise error.Abort(msg)
1948 raise error.Abort(msg)
1949 elif change:
1949 elif change:
1950 node2 = scmutil.revsingle(repo, change, None).node()
1950 node2 = scmutil.revsingle(repo, change, None).node()
1951 node1 = repo[node2].p1().node()
1951 node1 = repo[node2].p1().node()
1952 else:
1952 else:
1953 node1, node2 = scmutil.revpair(repo, revs)
1953 node1, node2 = scmutil.revpair(repo, revs)
1954
1954
1955 if reverse:
1955 if reverse:
1956 node1, node2 = node2, node1
1956 node1, node2 = node2, node1
1957
1957
1958 diffopts = patch.diffallopts(ui, opts)
1958 diffopts = patch.diffallopts(ui, opts)
1959 m = scmutil.match(repo[node2], pats, opts)
1959 m = scmutil.match(repo[node2], pats, opts)
1960 ui.pager('diff')
1960 ui.pager('diff')
1961 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
1961 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
1962 listsubrepos=opts.get('subrepos'),
1962 listsubrepos=opts.get('subrepos'),
1963 root=opts.get('root'))
1963 root=opts.get('root'))
1964
1964
1965 @command('^export',
1965 @command('^export',
1966 [('o', 'output', '',
1966 [('o', 'output', '',
1967 _('print output to file with formatted name'), _('FORMAT')),
1967 _('print output to file with formatted name'), _('FORMAT')),
1968 ('', 'switch-parent', None, _('diff against the second parent')),
1968 ('', 'switch-parent', None, _('diff against the second parent')),
1969 ('r', 'rev', [], _('revisions to export'), _('REV')),
1969 ('r', 'rev', [], _('revisions to export'), _('REV')),
1970 ] + diffopts,
1970 ] + diffopts,
1971 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
1971 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
1972 def export(ui, repo, *changesets, **opts):
1972 def export(ui, repo, *changesets, **opts):
1973 """dump the header and diffs for one or more changesets
1973 """dump the header and diffs for one or more changesets
1974
1974
1975 Print the changeset header and diffs for one or more revisions.
1975 Print the changeset header and diffs for one or more revisions.
1976 If no revision is given, the parent of the working directory is used.
1976 If no revision is given, the parent of the working directory is used.
1977
1977
1978 The information shown in the changeset header is: author, date,
1978 The information shown in the changeset header is: author, date,
1979 branch name (if non-default), changeset hash, parent(s) and commit
1979 branch name (if non-default), changeset hash, parent(s) and commit
1980 comment.
1980 comment.
1981
1981
1982 .. note::
1982 .. note::
1983
1983
1984 :hg:`export` may generate unexpected diff output for merge
1984 :hg:`export` may generate unexpected diff output for merge
1985 changesets, as it will compare the merge changeset against its
1985 changesets, as it will compare the merge changeset against its
1986 first parent only.
1986 first parent only.
1987
1987
1988 Output may be to a file, in which case the name of the file is
1988 Output may be to a file, in which case the name of the file is
1989 given using a format string. The formatting rules are as follows:
1989 given using a format string. The formatting rules are as follows:
1990
1990
1991 :``%%``: literal "%" character
1991 :``%%``: literal "%" character
1992 :``%H``: changeset hash (40 hexadecimal digits)
1992 :``%H``: changeset hash (40 hexadecimal digits)
1993 :``%N``: number of patches being generated
1993 :``%N``: number of patches being generated
1994 :``%R``: changeset revision number
1994 :``%R``: changeset revision number
1995 :``%b``: basename of the exporting repository
1995 :``%b``: basename of the exporting repository
1996 :``%h``: short-form changeset hash (12 hexadecimal digits)
1996 :``%h``: short-form changeset hash (12 hexadecimal digits)
1997 :``%m``: first line of the commit message (only alphanumeric characters)
1997 :``%m``: first line of the commit message (only alphanumeric characters)
1998 :``%n``: zero-padded sequence number, starting at 1
1998 :``%n``: zero-padded sequence number, starting at 1
1999 :``%r``: zero-padded changeset revision number
1999 :``%r``: zero-padded changeset revision number
2000
2000
2001 Without the -a/--text option, export will avoid generating diffs
2001 Without the -a/--text option, export will avoid generating diffs
2002 of files it detects as binary. With -a, export will generate a
2002 of files it detects as binary. With -a, export will generate a
2003 diff anyway, probably with undesirable results.
2003 diff anyway, probably with undesirable results.
2004
2004
2005 Use the -g/--git option to generate diffs in the git extended diff
2005 Use the -g/--git option to generate diffs in the git extended diff
2006 format. See :hg:`help diffs` for more information.
2006 format. See :hg:`help diffs` for more information.
2007
2007
2008 With the --switch-parent option, the diff will be against the
2008 With the --switch-parent option, the diff will be against the
2009 second parent. It can be useful to review a merge.
2009 second parent. It can be useful to review a merge.
2010
2010
2011 .. container:: verbose
2011 .. container:: verbose
2012
2012
2013 Examples:
2013 Examples:
2014
2014
2015 - use export and import to transplant a bugfix to the current
2015 - use export and import to transplant a bugfix to the current
2016 branch::
2016 branch::
2017
2017
2018 hg export -r 9353 | hg import -
2018 hg export -r 9353 | hg import -
2019
2019
2020 - export all the changesets between two revisions to a file with
2020 - export all the changesets between two revisions to a file with
2021 rename information::
2021 rename information::
2022
2022
2023 hg export --git -r 123:150 > changes.txt
2023 hg export --git -r 123:150 > changes.txt
2024
2024
2025 - split outgoing changes into a series of patches with
2025 - split outgoing changes into a series of patches with
2026 descriptive names::
2026 descriptive names::
2027
2027
2028 hg export -r "outgoing()" -o "%n-%m.patch"
2028 hg export -r "outgoing()" -o "%n-%m.patch"
2029
2029
2030 Returns 0 on success.
2030 Returns 0 on success.
2031 """
2031 """
2032 opts = pycompat.byteskwargs(opts)
2032 opts = pycompat.byteskwargs(opts)
2033 changesets += tuple(opts.get('rev', []))
2033 changesets += tuple(opts.get('rev', []))
2034 if not changesets:
2034 if not changesets:
2035 changesets = ['.']
2035 changesets = ['.']
2036 revs = scmutil.revrange(repo, changesets)
2036 revs = scmutil.revrange(repo, changesets)
2037 if not revs:
2037 if not revs:
2038 raise error.Abort(_("export requires at least one changeset"))
2038 raise error.Abort(_("export requires at least one changeset"))
2039 if len(revs) > 1:
2039 if len(revs) > 1:
2040 ui.note(_('exporting patches:\n'))
2040 ui.note(_('exporting patches:\n'))
2041 else:
2041 else:
2042 ui.note(_('exporting patch:\n'))
2042 ui.note(_('exporting patch:\n'))
2043 ui.pager('export')
2043 ui.pager('export')
2044 cmdutil.export(repo, revs, template=opts.get('output'),
2044 cmdutil.export(repo, revs, template=opts.get('output'),
2045 switch_parent=opts.get('switch_parent'),
2045 switch_parent=opts.get('switch_parent'),
2046 opts=patch.diffallopts(ui, opts))
2046 opts=patch.diffallopts(ui, opts))
2047
2047
2048 @command('files',
2048 @command('files',
2049 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
2049 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
2050 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
2050 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
2051 ] + walkopts + formatteropts + subrepoopts,
2051 ] + walkopts + formatteropts + subrepoopts,
2052 _('[OPTION]... [FILE]...'))
2052 _('[OPTION]... [FILE]...'))
2053 def files(ui, repo, *pats, **opts):
2053 def files(ui, repo, *pats, **opts):
2054 """list tracked files
2054 """list tracked files
2055
2055
2056 Print files under Mercurial control in the working directory or
2056 Print files under Mercurial control in the working directory or
2057 specified revision for given files (excluding removed files).
2057 specified revision for given files (excluding removed files).
2058 Files can be specified as filenames or filesets.
2058 Files can be specified as filenames or filesets.
2059
2059
2060 If no files are given to match, this command prints the names
2060 If no files are given to match, this command prints the names
2061 of all files under Mercurial control.
2061 of all files under Mercurial control.
2062
2062
2063 .. container:: verbose
2063 .. container:: verbose
2064
2064
2065 Examples:
2065 Examples:
2066
2066
2067 - list all files under the current directory::
2067 - list all files under the current directory::
2068
2068
2069 hg files .
2069 hg files .
2070
2070
2071 - shows sizes and flags for current revision::
2071 - shows sizes and flags for current revision::
2072
2072
2073 hg files -vr .
2073 hg files -vr .
2074
2074
2075 - list all files named README::
2075 - list all files named README::
2076
2076
2077 hg files -I "**/README"
2077 hg files -I "**/README"
2078
2078
2079 - list all binary files::
2079 - list all binary files::
2080
2080
2081 hg files "set:binary()"
2081 hg files "set:binary()"
2082
2082
2083 - find files containing a regular expression::
2083 - find files containing a regular expression::
2084
2084
2085 hg files "set:grep('bob')"
2085 hg files "set:grep('bob')"
2086
2086
2087 - search tracked file contents with xargs and grep::
2087 - search tracked file contents with xargs and grep::
2088
2088
2089 hg files -0 | xargs -0 grep foo
2089 hg files -0 | xargs -0 grep foo
2090
2090
2091 See :hg:`help patterns` and :hg:`help filesets` for more information
2091 See :hg:`help patterns` and :hg:`help filesets` for more information
2092 on specifying file patterns.
2092 on specifying file patterns.
2093
2093
2094 Returns 0 if a match is found, 1 otherwise.
2094 Returns 0 if a match is found, 1 otherwise.
2095
2095
2096 """
2096 """
2097 ctx = scmutil.revsingle(repo, opts.get(r'rev'), None)
2097 ctx = scmutil.revsingle(repo, opts.get(r'rev'), None)
2098
2098
2099 end = '\n'
2099 end = '\n'
2100 if opts.get('print0'):
2100 if opts.get('print0'):
2101 end = '\0'
2101 end = '\0'
2102 fmt = '%s' + end
2102 fmt = '%s' + end
2103
2103
2104 m = scmutil.match(ctx, pats, opts)
2104 m = scmutil.match(ctx, pats, opts)
2105 ui.pager('files')
2105 ui.pager('files')
2106 with ui.formatter('files', opts) as fm:
2106 with ui.formatter('files', opts) as fm:
2107 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
2107 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
2108
2108
2109 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
2109 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
2110 def forget(ui, repo, *pats, **opts):
2110 def forget(ui, repo, *pats, **opts):
2111 """forget the specified files on the next commit
2111 """forget the specified files on the next commit
2112
2112
2113 Mark the specified files so they will no longer be tracked
2113 Mark the specified files so they will no longer be tracked
2114 after the next commit.
2114 after the next commit.
2115
2115
2116 This only removes files from the current branch, not from the
2116 This only removes files from the current branch, not from the
2117 entire project history, and it does not delete them from the
2117 entire project history, and it does not delete them from the
2118 working directory.
2118 working directory.
2119
2119
2120 To delete the file from the working directory, see :hg:`remove`.
2120 To delete the file from the working directory, see :hg:`remove`.
2121
2121
2122 To undo a forget before the next commit, see :hg:`add`.
2122 To undo a forget before the next commit, see :hg:`add`.
2123
2123
2124 .. container:: verbose
2124 .. container:: verbose
2125
2125
2126 Examples:
2126 Examples:
2127
2127
2128 - forget newly-added binary files::
2128 - forget newly-added binary files::
2129
2129
2130 hg forget "set:added() and binary()"
2130 hg forget "set:added() and binary()"
2131
2131
2132 - forget files that would be excluded by .hgignore::
2132 - forget files that would be excluded by .hgignore::
2133
2133
2134 hg forget "set:hgignore()"
2134 hg forget "set:hgignore()"
2135
2135
2136 Returns 0 on success.
2136 Returns 0 on success.
2137 """
2137 """
2138
2138
2139 if not pats:
2139 if not pats:
2140 raise error.Abort(_('no files specified'))
2140 raise error.Abort(_('no files specified'))
2141
2141
2142 m = scmutil.match(repo[None], pats, opts)
2142 m = scmutil.match(repo[None], pats, opts)
2143 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
2143 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
2144 return rejected and 1 or 0
2144 return rejected and 1 or 0
2145
2145
2146 @command(
2146 @command(
2147 'graft',
2147 'graft',
2148 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2148 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2149 ('c', 'continue', False, _('resume interrupted graft')),
2149 ('c', 'continue', False, _('resume interrupted graft')),
2150 ('e', 'edit', False, _('invoke editor on commit messages')),
2150 ('e', 'edit', False, _('invoke editor on commit messages')),
2151 ('', 'log', None, _('append graft info to log message')),
2151 ('', 'log', None, _('append graft info to log message')),
2152 ('f', 'force', False, _('force graft')),
2152 ('f', 'force', False, _('force graft')),
2153 ('D', 'currentdate', False,
2153 ('D', 'currentdate', False,
2154 _('record the current date as commit date')),
2154 _('record the current date as commit date')),
2155 ('U', 'currentuser', False,
2155 ('U', 'currentuser', False,
2156 _('record the current user as committer'), _('DATE'))]
2156 _('record the current user as committer'), _('DATE'))]
2157 + commitopts2 + mergetoolopts + dryrunopts,
2157 + commitopts2 + mergetoolopts + dryrunopts,
2158 _('[OPTION]... [-r REV]... REV...'))
2158 _('[OPTION]... [-r REV]... REV...'))
2159 def graft(ui, repo, *revs, **opts):
2159 def graft(ui, repo, *revs, **opts):
2160 '''copy changes from other branches onto the current branch
2160 '''copy changes from other branches onto the current branch
2161
2161
2162 This command uses Mercurial's merge logic to copy individual
2162 This command uses Mercurial's merge logic to copy individual
2163 changes from other branches without merging branches in the
2163 changes from other branches without merging branches in the
2164 history graph. This is sometimes known as 'backporting' or
2164 history graph. This is sometimes known as 'backporting' or
2165 'cherry-picking'. By default, graft will copy user, date, and
2165 'cherry-picking'. By default, graft will copy user, date, and
2166 description from the source changesets.
2166 description from the source changesets.
2167
2167
2168 Changesets that are ancestors of the current revision, that have
2168 Changesets that are ancestors of the current revision, that have
2169 already been grafted, or that are merges will be skipped.
2169 already been grafted, or that are merges will be skipped.
2170
2170
2171 If --log is specified, log messages will have a comment appended
2171 If --log is specified, log messages will have a comment appended
2172 of the form::
2172 of the form::
2173
2173
2174 (grafted from CHANGESETHASH)
2174 (grafted from CHANGESETHASH)
2175
2175
2176 If --force is specified, revisions will be grafted even if they
2176 If --force is specified, revisions will be grafted even if they
2177 are already ancestors of or have been grafted to the destination.
2177 are already ancestors of or have been grafted to the destination.
2178 This is useful when the revisions have since been backed out.
2178 This is useful when the revisions have since been backed out.
2179
2179
2180 If a graft merge results in conflicts, the graft process is
2180 If a graft merge results in conflicts, the graft process is
2181 interrupted so that the current merge can be manually resolved.
2181 interrupted so that the current merge can be manually resolved.
2182 Once all conflicts are addressed, the graft process can be
2182 Once all conflicts are addressed, the graft process can be
2183 continued with the -c/--continue option.
2183 continued with the -c/--continue option.
2184
2184
2185 .. note::
2185 .. note::
2186
2186
2187 The -c/--continue option does not reapply earlier options, except
2187 The -c/--continue option does not reapply earlier options, except
2188 for --force.
2188 for --force.
2189
2189
2190 .. container:: verbose
2190 .. container:: verbose
2191
2191
2192 Examples:
2192 Examples:
2193
2193
2194 - copy a single change to the stable branch and edit its description::
2194 - copy a single change to the stable branch and edit its description::
2195
2195
2196 hg update stable
2196 hg update stable
2197 hg graft --edit 9393
2197 hg graft --edit 9393
2198
2198
2199 - graft a range of changesets with one exception, updating dates::
2199 - graft a range of changesets with one exception, updating dates::
2200
2200
2201 hg graft -D "2085::2093 and not 2091"
2201 hg graft -D "2085::2093 and not 2091"
2202
2202
2203 - continue a graft after resolving conflicts::
2203 - continue a graft after resolving conflicts::
2204
2204
2205 hg graft -c
2205 hg graft -c
2206
2206
2207 - show the source of a grafted changeset::
2207 - show the source of a grafted changeset::
2208
2208
2209 hg log --debug -r .
2209 hg log --debug -r .
2210
2210
2211 - show revisions sorted by date::
2211 - show revisions sorted by date::
2212
2212
2213 hg log -r "sort(all(), date)"
2213 hg log -r "sort(all(), date)"
2214
2214
2215 See :hg:`help revisions` for more about specifying revisions.
2215 See :hg:`help revisions` for more about specifying revisions.
2216
2216
2217 Returns 0 on successful completion.
2217 Returns 0 on successful completion.
2218 '''
2218 '''
2219 with repo.wlock():
2219 with repo.wlock():
2220 return _dograft(ui, repo, *revs, **opts)
2220 return _dograft(ui, repo, *revs, **opts)
2221
2221
2222 def _dograft(ui, repo, *revs, **opts):
2222 def _dograft(ui, repo, *revs, **opts):
2223 if revs and opts.get('rev'):
2223 if revs and opts.get('rev'):
2224 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
2224 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
2225 'revision ordering!\n'))
2225 'revision ordering!\n'))
2226
2226
2227 revs = list(revs)
2227 revs = list(revs)
2228 revs.extend(opts.get('rev'))
2228 revs.extend(opts.get('rev'))
2229
2229
2230 if not opts.get('user') and opts.get('currentuser'):
2230 if not opts.get('user') and opts.get('currentuser'):
2231 opts['user'] = ui.username()
2231 opts['user'] = ui.username()
2232 if not opts.get('date') and opts.get('currentdate'):
2232 if not opts.get('date') and opts.get('currentdate'):
2233 opts['date'] = "%d %d" % util.makedate()
2233 opts['date'] = "%d %d" % util.makedate()
2234
2234
2235 editor = cmdutil.getcommiteditor(editform='graft', **opts)
2235 editor = cmdutil.getcommiteditor(editform='graft', **opts)
2236
2236
2237 cont = False
2237 cont = False
2238 if opts.get('continue'):
2238 if opts.get('continue'):
2239 cont = True
2239 cont = True
2240 if revs:
2240 if revs:
2241 raise error.Abort(_("can't specify --continue and revisions"))
2241 raise error.Abort(_("can't specify --continue and revisions"))
2242 # read in unfinished revisions
2242 # read in unfinished revisions
2243 try:
2243 try:
2244 nodes = repo.vfs.read('graftstate').splitlines()
2244 nodes = repo.vfs.read('graftstate').splitlines()
2245 revs = [repo[node].rev() for node in nodes]
2245 revs = [repo[node].rev() for node in nodes]
2246 except IOError as inst:
2246 except IOError as inst:
2247 if inst.errno != errno.ENOENT:
2247 if inst.errno != errno.ENOENT:
2248 raise
2248 raise
2249 cmdutil.wrongtooltocontinue(repo, _('graft'))
2249 cmdutil.wrongtooltocontinue(repo, _('graft'))
2250 else:
2250 else:
2251 cmdutil.checkunfinished(repo)
2251 cmdutil.checkunfinished(repo)
2252 cmdutil.bailifchanged(repo)
2252 cmdutil.bailifchanged(repo)
2253 if not revs:
2253 if not revs:
2254 raise error.Abort(_('no revisions specified'))
2254 raise error.Abort(_('no revisions specified'))
2255 revs = scmutil.revrange(repo, revs)
2255 revs = scmutil.revrange(repo, revs)
2256
2256
2257 skipped = set()
2257 skipped = set()
2258 # check for merges
2258 # check for merges
2259 for rev in repo.revs('%ld and merge()', revs):
2259 for rev in repo.revs('%ld and merge()', revs):
2260 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
2260 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
2261 skipped.add(rev)
2261 skipped.add(rev)
2262 revs = [r for r in revs if r not in skipped]
2262 revs = [r for r in revs if r not in skipped]
2263 if not revs:
2263 if not revs:
2264 return -1
2264 return -1
2265
2265
2266 # Don't check in the --continue case, in effect retaining --force across
2266 # Don't check in the --continue case, in effect retaining --force across
2267 # --continues. That's because without --force, any revisions we decided to
2267 # --continues. That's because without --force, any revisions we decided to
2268 # skip would have been filtered out here, so they wouldn't have made their
2268 # skip would have been filtered out here, so they wouldn't have made their
2269 # way to the graftstate. With --force, any revisions we would have otherwise
2269 # way to the graftstate. With --force, any revisions we would have otherwise
2270 # skipped would not have been filtered out, and if they hadn't been applied
2270 # skipped would not have been filtered out, and if they hadn't been applied
2271 # already, they'd have been in the graftstate.
2271 # already, they'd have been in the graftstate.
2272 if not (cont or opts.get('force')):
2272 if not (cont or opts.get('force')):
2273 # check for ancestors of dest branch
2273 # check for ancestors of dest branch
2274 crev = repo['.'].rev()
2274 crev = repo['.'].rev()
2275 ancestors = repo.changelog.ancestors([crev], inclusive=True)
2275 ancestors = repo.changelog.ancestors([crev], inclusive=True)
2276 # XXX make this lazy in the future
2276 # XXX make this lazy in the future
2277 # don't mutate while iterating, create a copy
2277 # don't mutate while iterating, create a copy
2278 for rev in list(revs):
2278 for rev in list(revs):
2279 if rev in ancestors:
2279 if rev in ancestors:
2280 ui.warn(_('skipping ancestor revision %d:%s\n') %
2280 ui.warn(_('skipping ancestor revision %d:%s\n') %
2281 (rev, repo[rev]))
2281 (rev, repo[rev]))
2282 # XXX remove on list is slow
2282 # XXX remove on list is slow
2283 revs.remove(rev)
2283 revs.remove(rev)
2284 if not revs:
2284 if not revs:
2285 return -1
2285 return -1
2286
2286
2287 # analyze revs for earlier grafts
2287 # analyze revs for earlier grafts
2288 ids = {}
2288 ids = {}
2289 for ctx in repo.set("%ld", revs):
2289 for ctx in repo.set("%ld", revs):
2290 ids[ctx.hex()] = ctx.rev()
2290 ids[ctx.hex()] = ctx.rev()
2291 n = ctx.extra().get('source')
2291 n = ctx.extra().get('source')
2292 if n:
2292 if n:
2293 ids[n] = ctx.rev()
2293 ids[n] = ctx.rev()
2294
2294
2295 # check ancestors for earlier grafts
2295 # check ancestors for earlier grafts
2296 ui.debug('scanning for duplicate grafts\n')
2296 ui.debug('scanning for duplicate grafts\n')
2297
2297
2298 for rev in repo.changelog.findmissingrevs(revs, [crev]):
2298 for rev in repo.changelog.findmissingrevs(revs, [crev]):
2299 ctx = repo[rev]
2299 ctx = repo[rev]
2300 n = ctx.extra().get('source')
2300 n = ctx.extra().get('source')
2301 if n in ids:
2301 if n in ids:
2302 try:
2302 try:
2303 r = repo[n].rev()
2303 r = repo[n].rev()
2304 except error.RepoLookupError:
2304 except error.RepoLookupError:
2305 r = None
2305 r = None
2306 if r in revs:
2306 if r in revs:
2307 ui.warn(_('skipping revision %d:%s '
2307 ui.warn(_('skipping revision %d:%s '
2308 '(already grafted to %d:%s)\n')
2308 '(already grafted to %d:%s)\n')
2309 % (r, repo[r], rev, ctx))
2309 % (r, repo[r], rev, ctx))
2310 revs.remove(r)
2310 revs.remove(r)
2311 elif ids[n] in revs:
2311 elif ids[n] in revs:
2312 if r is None:
2312 if r is None:
2313 ui.warn(_('skipping already grafted revision %d:%s '
2313 ui.warn(_('skipping already grafted revision %d:%s '
2314 '(%d:%s also has unknown origin %s)\n')
2314 '(%d:%s also has unknown origin %s)\n')
2315 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
2315 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
2316 else:
2316 else:
2317 ui.warn(_('skipping already grafted revision %d:%s '
2317 ui.warn(_('skipping already grafted revision %d:%s '
2318 '(%d:%s also has origin %d:%s)\n')
2318 '(%d:%s also has origin %d:%s)\n')
2319 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
2319 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
2320 revs.remove(ids[n])
2320 revs.remove(ids[n])
2321 elif ctx.hex() in ids:
2321 elif ctx.hex() in ids:
2322 r = ids[ctx.hex()]
2322 r = ids[ctx.hex()]
2323 ui.warn(_('skipping already grafted revision %d:%s '
2323 ui.warn(_('skipping already grafted revision %d:%s '
2324 '(was grafted from %d:%s)\n') %
2324 '(was grafted from %d:%s)\n') %
2325 (r, repo[r], rev, ctx))
2325 (r, repo[r], rev, ctx))
2326 revs.remove(r)
2326 revs.remove(r)
2327 if not revs:
2327 if not revs:
2328 return -1
2328 return -1
2329
2329
2330 for pos, ctx in enumerate(repo.set("%ld", revs)):
2330 for pos, ctx in enumerate(repo.set("%ld", revs)):
2331 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
2331 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
2332 ctx.description().split('\n', 1)[0])
2332 ctx.description().split('\n', 1)[0])
2333 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
2333 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
2334 if names:
2334 if names:
2335 desc += ' (%s)' % ' '.join(names)
2335 desc += ' (%s)' % ' '.join(names)
2336 ui.status(_('grafting %s\n') % desc)
2336 ui.status(_('grafting %s\n') % desc)
2337 if opts.get('dry_run'):
2337 if opts.get('dry_run'):
2338 continue
2338 continue
2339
2339
2340 source = ctx.extra().get('source')
2340 source = ctx.extra().get('source')
2341 extra = {}
2341 extra = {}
2342 if source:
2342 if source:
2343 extra['source'] = source
2343 extra['source'] = source
2344 extra['intermediate-source'] = ctx.hex()
2344 extra['intermediate-source'] = ctx.hex()
2345 else:
2345 else:
2346 extra['source'] = ctx.hex()
2346 extra['source'] = ctx.hex()
2347 user = ctx.user()
2347 user = ctx.user()
2348 if opts.get('user'):
2348 if opts.get('user'):
2349 user = opts['user']
2349 user = opts['user']
2350 date = ctx.date()
2350 date = ctx.date()
2351 if opts.get('date'):
2351 if opts.get('date'):
2352 date = opts['date']
2352 date = opts['date']
2353 message = ctx.description()
2353 message = ctx.description()
2354 if opts.get('log'):
2354 if opts.get('log'):
2355 message += '\n(grafted from %s)' % ctx.hex()
2355 message += '\n(grafted from %s)' % ctx.hex()
2356
2356
2357 # we don't merge the first commit when continuing
2357 # we don't merge the first commit when continuing
2358 if not cont:
2358 if not cont:
2359 # perform the graft merge with p1(rev) as 'ancestor'
2359 # perform the graft merge with p1(rev) as 'ancestor'
2360 try:
2360 try:
2361 # ui.forcemerge is an internal variable, do not document
2361 # ui.forcemerge is an internal variable, do not document
2362 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
2362 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
2363 'graft')
2363 'graft')
2364 stats = mergemod.graft(repo, ctx, ctx.p1(),
2364 stats = mergemod.graft(repo, ctx, ctx.p1(),
2365 ['local', 'graft'])
2365 ['local', 'graft'])
2366 finally:
2366 finally:
2367 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
2367 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
2368 # report any conflicts
2368 # report any conflicts
2369 if stats and stats[3] > 0:
2369 if stats and stats[3] > 0:
2370 # write out state for --continue
2370 # write out state for --continue
2371 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2371 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2372 repo.vfs.write('graftstate', ''.join(nodelines))
2372 repo.vfs.write('graftstate', ''.join(nodelines))
2373 extra = ''
2373 extra = ''
2374 if opts.get('user'):
2374 if opts.get('user'):
2375 extra += ' --user %s' % util.shellquote(opts['user'])
2375 extra += ' --user %s' % util.shellquote(opts['user'])
2376 if opts.get('date'):
2376 if opts.get('date'):
2377 extra += ' --date %s' % util.shellquote(opts['date'])
2377 extra += ' --date %s' % util.shellquote(opts['date'])
2378 if opts.get('log'):
2378 if opts.get('log'):
2379 extra += ' --log'
2379 extra += ' --log'
2380 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
2380 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
2381 raise error.Abort(
2381 raise error.Abort(
2382 _("unresolved conflicts, can't continue"),
2382 _("unresolved conflicts, can't continue"),
2383 hint=hint)
2383 hint=hint)
2384 else:
2384 else:
2385 cont = False
2385 cont = False
2386
2386
2387 # commit
2387 # commit
2388 node = repo.commit(text=message, user=user,
2388 node = repo.commit(text=message, user=user,
2389 date=date, extra=extra, editor=editor)
2389 date=date, extra=extra, editor=editor)
2390 if node is None:
2390 if node is None:
2391 ui.warn(
2391 ui.warn(
2392 _('note: graft of %d:%s created no changes to commit\n') %
2392 _('note: graft of %d:%s created no changes to commit\n') %
2393 (ctx.rev(), ctx))
2393 (ctx.rev(), ctx))
2394
2394
2395 # remove state when we complete successfully
2395 # remove state when we complete successfully
2396 if not opts.get('dry_run'):
2396 if not opts.get('dry_run'):
2397 repo.vfs.unlinkpath('graftstate', ignoremissing=True)
2397 repo.vfs.unlinkpath('graftstate', ignoremissing=True)
2398
2398
2399 return 0
2399 return 0
2400
2400
2401 @command('grep',
2401 @command('grep',
2402 [('0', 'print0', None, _('end fields with NUL')),
2402 [('0', 'print0', None, _('end fields with NUL')),
2403 ('', 'all', None, _('print all revisions that match')),
2403 ('', 'all', None, _('print all revisions that match')),
2404 ('a', 'text', None, _('treat all files as text')),
2404 ('a', 'text', None, _('treat all files as text')),
2405 ('f', 'follow', None,
2405 ('f', 'follow', None,
2406 _('follow changeset history,'
2406 _('follow changeset history,'
2407 ' or file history across copies and renames')),
2407 ' or file history across copies and renames')),
2408 ('i', 'ignore-case', None, _('ignore case when matching')),
2408 ('i', 'ignore-case', None, _('ignore case when matching')),
2409 ('l', 'files-with-matches', None,
2409 ('l', 'files-with-matches', None,
2410 _('print only filenames and revisions that match')),
2410 _('print only filenames and revisions that match')),
2411 ('n', 'line-number', None, _('print matching line numbers')),
2411 ('n', 'line-number', None, _('print matching line numbers')),
2412 ('r', 'rev', [],
2412 ('r', 'rev', [],
2413 _('only search files changed within revision range'), _('REV')),
2413 _('only search files changed within revision range'), _('REV')),
2414 ('u', 'user', None, _('list the author (long with -v)')),
2414 ('u', 'user', None, _('list the author (long with -v)')),
2415 ('d', 'date', None, _('list the date (short with -q)')),
2415 ('d', 'date', None, _('list the date (short with -q)')),
2416 ] + formatteropts + walkopts,
2416 ] + formatteropts + walkopts,
2417 _('[OPTION]... PATTERN [FILE]...'),
2417 _('[OPTION]... PATTERN [FILE]...'),
2418 inferrepo=True)
2418 inferrepo=True)
2419 def grep(ui, repo, pattern, *pats, **opts):
2419 def grep(ui, repo, pattern, *pats, **opts):
2420 """search revision history for a pattern in specified files
2420 """search revision history for a pattern in specified files
2421
2421
2422 Search revision history for a regular expression in the specified
2422 Search revision history for a regular expression in the specified
2423 files or the entire project.
2423 files or the entire project.
2424
2424
2425 By default, grep prints the most recent revision number for each
2425 By default, grep prints the most recent revision number for each
2426 file in which it finds a match. To get it to print every revision
2426 file in which it finds a match. To get it to print every revision
2427 that contains a change in match status ("-" for a match that becomes
2427 that contains a change in match status ("-" for a match that becomes
2428 a non-match, or "+" for a non-match that becomes a match), use the
2428 a non-match, or "+" for a non-match that becomes a match), use the
2429 --all flag.
2429 --all flag.
2430
2430
2431 PATTERN can be any Python (roughly Perl-compatible) regular
2431 PATTERN can be any Python (roughly Perl-compatible) regular
2432 expression.
2432 expression.
2433
2433
2434 If no FILEs are specified (and -f/--follow isn't set), all files in
2434 If no FILEs are specified (and -f/--follow isn't set), all files in
2435 the repository are searched, including those that don't exist in the
2435 the repository are searched, including those that don't exist in the
2436 current branch or have been deleted in a prior changeset.
2436 current branch or have been deleted in a prior changeset.
2437
2437
2438 Returns 0 if a match is found, 1 otherwise.
2438 Returns 0 if a match is found, 1 otherwise.
2439 """
2439 """
2440 reflags = re.M
2440 reflags = re.M
2441 if opts.get('ignore_case'):
2441 if opts.get('ignore_case'):
2442 reflags |= re.I
2442 reflags |= re.I
2443 try:
2443 try:
2444 regexp = util.re.compile(pattern, reflags)
2444 regexp = util.re.compile(pattern, reflags)
2445 except re.error as inst:
2445 except re.error as inst:
2446 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
2446 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
2447 return 1
2447 return 1
2448 sep, eol = ':', '\n'
2448 sep, eol = ':', '\n'
2449 if opts.get('print0'):
2449 if opts.get('print0'):
2450 sep = eol = '\0'
2450 sep = eol = '\0'
2451
2451
2452 getfile = util.lrucachefunc(repo.file)
2452 getfile = util.lrucachefunc(repo.file)
2453
2453
2454 def matchlines(body):
2454 def matchlines(body):
2455 begin = 0
2455 begin = 0
2456 linenum = 0
2456 linenum = 0
2457 while begin < len(body):
2457 while begin < len(body):
2458 match = regexp.search(body, begin)
2458 match = regexp.search(body, begin)
2459 if not match:
2459 if not match:
2460 break
2460 break
2461 mstart, mend = match.span()
2461 mstart, mend = match.span()
2462 linenum += body.count('\n', begin, mstart) + 1
2462 linenum += body.count('\n', begin, mstart) + 1
2463 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2463 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2464 begin = body.find('\n', mend) + 1 or len(body) + 1
2464 begin = body.find('\n', mend) + 1 or len(body) + 1
2465 lend = begin - 1
2465 lend = begin - 1
2466 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2466 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2467
2467
2468 class linestate(object):
2468 class linestate(object):
2469 def __init__(self, line, linenum, colstart, colend):
2469 def __init__(self, line, linenum, colstart, colend):
2470 self.line = line
2470 self.line = line
2471 self.linenum = linenum
2471 self.linenum = linenum
2472 self.colstart = colstart
2472 self.colstart = colstart
2473 self.colend = colend
2473 self.colend = colend
2474
2474
2475 def __hash__(self):
2475 def __hash__(self):
2476 return hash((self.linenum, self.line))
2476 return hash((self.linenum, self.line))
2477
2477
2478 def __eq__(self, other):
2478 def __eq__(self, other):
2479 return self.line == other.line
2479 return self.line == other.line
2480
2480
2481 def findpos(self):
2481 def findpos(self):
2482 """Iterate all (start, end) indices of matches"""
2482 """Iterate all (start, end) indices of matches"""
2483 yield self.colstart, self.colend
2483 yield self.colstart, self.colend
2484 p = self.colend
2484 p = self.colend
2485 while p < len(self.line):
2485 while p < len(self.line):
2486 m = regexp.search(self.line, p)
2486 m = regexp.search(self.line, p)
2487 if not m:
2487 if not m:
2488 break
2488 break
2489 yield m.span()
2489 yield m.span()
2490 p = m.end()
2490 p = m.end()
2491
2491
2492 matches = {}
2492 matches = {}
2493 copies = {}
2493 copies = {}
2494 def grepbody(fn, rev, body):
2494 def grepbody(fn, rev, body):
2495 matches[rev].setdefault(fn, [])
2495 matches[rev].setdefault(fn, [])
2496 m = matches[rev][fn]
2496 m = matches[rev][fn]
2497 for lnum, cstart, cend, line in matchlines(body):
2497 for lnum, cstart, cend, line in matchlines(body):
2498 s = linestate(line, lnum, cstart, cend)
2498 s = linestate(line, lnum, cstart, cend)
2499 m.append(s)
2499 m.append(s)
2500
2500
2501 def difflinestates(a, b):
2501 def difflinestates(a, b):
2502 sm = difflib.SequenceMatcher(None, a, b)
2502 sm = difflib.SequenceMatcher(None, a, b)
2503 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2503 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2504 if tag == 'insert':
2504 if tag == 'insert':
2505 for i in xrange(blo, bhi):
2505 for i in xrange(blo, bhi):
2506 yield ('+', b[i])
2506 yield ('+', b[i])
2507 elif tag == 'delete':
2507 elif tag == 'delete':
2508 for i in xrange(alo, ahi):
2508 for i in xrange(alo, ahi):
2509 yield ('-', a[i])
2509 yield ('-', a[i])
2510 elif tag == 'replace':
2510 elif tag == 'replace':
2511 for i in xrange(alo, ahi):
2511 for i in xrange(alo, ahi):
2512 yield ('-', a[i])
2512 yield ('-', a[i])
2513 for i in xrange(blo, bhi):
2513 for i in xrange(blo, bhi):
2514 yield ('+', b[i])
2514 yield ('+', b[i])
2515
2515
2516 def display(fm, fn, ctx, pstates, states):
2516 def display(fm, fn, ctx, pstates, states):
2517 rev = ctx.rev()
2517 rev = ctx.rev()
2518 if fm.isplain():
2518 if fm.isplain():
2519 formatuser = ui.shortuser
2519 formatuser = ui.shortuser
2520 else:
2520 else:
2521 formatuser = str
2521 formatuser = str
2522 if ui.quiet:
2522 if ui.quiet:
2523 datefmt = '%Y-%m-%d'
2523 datefmt = '%Y-%m-%d'
2524 else:
2524 else:
2525 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
2525 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
2526 found = False
2526 found = False
2527 @util.cachefunc
2527 @util.cachefunc
2528 def binary():
2528 def binary():
2529 flog = getfile(fn)
2529 flog = getfile(fn)
2530 return util.binary(flog.read(ctx.filenode(fn)))
2530 return util.binary(flog.read(ctx.filenode(fn)))
2531
2531
2532 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
2532 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
2533 if opts.get('all'):
2533 if opts.get('all'):
2534 iter = difflinestates(pstates, states)
2534 iter = difflinestates(pstates, states)
2535 else:
2535 else:
2536 iter = [('', l) for l in states]
2536 iter = [('', l) for l in states]
2537 for change, l in iter:
2537 for change, l in iter:
2538 fm.startitem()
2538 fm.startitem()
2539 fm.data(node=fm.hexfunc(ctx.node()))
2539 fm.data(node=fm.hexfunc(ctx.node()))
2540 cols = [
2540 cols = [
2541 ('filename', fn, True),
2541 ('filename', fn, True),
2542 ('rev', rev, True),
2542 ('rev', rev, True),
2543 ('linenumber', l.linenum, opts.get('line_number')),
2543 ('linenumber', l.linenum, opts.get('line_number')),
2544 ]
2544 ]
2545 if opts.get('all'):
2545 if opts.get('all'):
2546 cols.append(('change', change, True))
2546 cols.append(('change', change, True))
2547 cols.extend([
2547 cols.extend([
2548 ('user', formatuser(ctx.user()), opts.get('user')),
2548 ('user', formatuser(ctx.user()), opts.get('user')),
2549 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
2549 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
2550 ])
2550 ])
2551 lastcol = next(name for name, data, cond in reversed(cols) if cond)
2551 lastcol = next(name for name, data, cond in reversed(cols) if cond)
2552 for name, data, cond in cols:
2552 for name, data, cond in cols:
2553 field = fieldnamemap.get(name, name)
2553 field = fieldnamemap.get(name, name)
2554 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
2554 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
2555 if cond and name != lastcol:
2555 if cond and name != lastcol:
2556 fm.plain(sep, label='grep.sep')
2556 fm.plain(sep, label='grep.sep')
2557 if not opts.get('files_with_matches'):
2557 if not opts.get('files_with_matches'):
2558 fm.plain(sep, label='grep.sep')
2558 fm.plain(sep, label='grep.sep')
2559 if not opts.get('text') and binary():
2559 if not opts.get('text') and binary():
2560 fm.plain(_(" Binary file matches"))
2560 fm.plain(_(" Binary file matches"))
2561 else:
2561 else:
2562 displaymatches(fm.nested('texts'), l)
2562 displaymatches(fm.nested('texts'), l)
2563 fm.plain(eol)
2563 fm.plain(eol)
2564 found = True
2564 found = True
2565 if opts.get('files_with_matches'):
2565 if opts.get('files_with_matches'):
2566 break
2566 break
2567 return found
2567 return found
2568
2568
2569 def displaymatches(fm, l):
2569 def displaymatches(fm, l):
2570 p = 0
2570 p = 0
2571 for s, e in l.findpos():
2571 for s, e in l.findpos():
2572 if p < s:
2572 if p < s:
2573 fm.startitem()
2573 fm.startitem()
2574 fm.write('text', '%s', l.line[p:s])
2574 fm.write('text', '%s', l.line[p:s])
2575 fm.data(matched=False)
2575 fm.data(matched=False)
2576 fm.startitem()
2576 fm.startitem()
2577 fm.write('text', '%s', l.line[s:e], label='grep.match')
2577 fm.write('text', '%s', l.line[s:e], label='grep.match')
2578 fm.data(matched=True)
2578 fm.data(matched=True)
2579 p = e
2579 p = e
2580 if p < len(l.line):
2580 if p < len(l.line):
2581 fm.startitem()
2581 fm.startitem()
2582 fm.write('text', '%s', l.line[p:])
2582 fm.write('text', '%s', l.line[p:])
2583 fm.data(matched=False)
2583 fm.data(matched=False)
2584 fm.end()
2584 fm.end()
2585
2585
2586 skip = {}
2586 skip = {}
2587 revfiles = {}
2587 revfiles = {}
2588 matchfn = scmutil.match(repo[None], pats, opts)
2588 matchfn = scmutil.match(repo[None], pats, opts)
2589 found = False
2589 found = False
2590 follow = opts.get('follow')
2590 follow = opts.get('follow')
2591
2591
2592 def prep(ctx, fns):
2592 def prep(ctx, fns):
2593 rev = ctx.rev()
2593 rev = ctx.rev()
2594 pctx = ctx.p1()
2594 pctx = ctx.p1()
2595 parent = pctx.rev()
2595 parent = pctx.rev()
2596 matches.setdefault(rev, {})
2596 matches.setdefault(rev, {})
2597 matches.setdefault(parent, {})
2597 matches.setdefault(parent, {})
2598 files = revfiles.setdefault(rev, [])
2598 files = revfiles.setdefault(rev, [])
2599 for fn in fns:
2599 for fn in fns:
2600 flog = getfile(fn)
2600 flog = getfile(fn)
2601 try:
2601 try:
2602 fnode = ctx.filenode(fn)
2602 fnode = ctx.filenode(fn)
2603 except error.LookupError:
2603 except error.LookupError:
2604 continue
2604 continue
2605
2605
2606 copied = flog.renamed(fnode)
2606 copied = flog.renamed(fnode)
2607 copy = follow and copied and copied[0]
2607 copy = follow and copied and copied[0]
2608 if copy:
2608 if copy:
2609 copies.setdefault(rev, {})[fn] = copy
2609 copies.setdefault(rev, {})[fn] = copy
2610 if fn in skip:
2610 if fn in skip:
2611 if copy:
2611 if copy:
2612 skip[copy] = True
2612 skip[copy] = True
2613 continue
2613 continue
2614 files.append(fn)
2614 files.append(fn)
2615
2615
2616 if fn not in matches[rev]:
2616 if fn not in matches[rev]:
2617 grepbody(fn, rev, flog.read(fnode))
2617 grepbody(fn, rev, flog.read(fnode))
2618
2618
2619 pfn = copy or fn
2619 pfn = copy or fn
2620 if pfn not in matches[parent]:
2620 if pfn not in matches[parent]:
2621 try:
2621 try:
2622 fnode = pctx.filenode(pfn)
2622 fnode = pctx.filenode(pfn)
2623 grepbody(pfn, parent, flog.read(fnode))
2623 grepbody(pfn, parent, flog.read(fnode))
2624 except error.LookupError:
2624 except error.LookupError:
2625 pass
2625 pass
2626
2626
2627 ui.pager('grep')
2627 ui.pager('grep')
2628 fm = ui.formatter('grep', opts)
2628 fm = ui.formatter('grep', opts)
2629 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
2629 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
2630 rev = ctx.rev()
2630 rev = ctx.rev()
2631 parent = ctx.p1().rev()
2631 parent = ctx.p1().rev()
2632 for fn in sorted(revfiles.get(rev, [])):
2632 for fn in sorted(revfiles.get(rev, [])):
2633 states = matches[rev][fn]
2633 states = matches[rev][fn]
2634 copy = copies.get(rev, {}).get(fn)
2634 copy = copies.get(rev, {}).get(fn)
2635 if fn in skip:
2635 if fn in skip:
2636 if copy:
2636 if copy:
2637 skip[copy] = True
2637 skip[copy] = True
2638 continue
2638 continue
2639 pstates = matches.get(parent, {}).get(copy or fn, [])
2639 pstates = matches.get(parent, {}).get(copy or fn, [])
2640 if pstates or states:
2640 if pstates or states:
2641 r = display(fm, fn, ctx, pstates, states)
2641 r = display(fm, fn, ctx, pstates, states)
2642 found = found or r
2642 found = found or r
2643 if r and not opts.get('all'):
2643 if r and not opts.get('all'):
2644 skip[fn] = True
2644 skip[fn] = True
2645 if copy:
2645 if copy:
2646 skip[copy] = True
2646 skip[copy] = True
2647 del matches[rev]
2647 del matches[rev]
2648 del revfiles[rev]
2648 del revfiles[rev]
2649 fm.end()
2649 fm.end()
2650
2650
2651 return not found
2651 return not found
2652
2652
2653 @command('heads',
2653 @command('heads',
2654 [('r', 'rev', '',
2654 [('r', 'rev', '',
2655 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2655 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2656 ('t', 'topo', False, _('show topological heads only')),
2656 ('t', 'topo', False, _('show topological heads only')),
2657 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2657 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2658 ('c', 'closed', False, _('show normal and closed branch heads')),
2658 ('c', 'closed', False, _('show normal and closed branch heads')),
2659 ] + templateopts,
2659 ] + templateopts,
2660 _('[-ct] [-r STARTREV] [REV]...'))
2660 _('[-ct] [-r STARTREV] [REV]...'))
2661 def heads(ui, repo, *branchrevs, **opts):
2661 def heads(ui, repo, *branchrevs, **opts):
2662 """show branch heads
2662 """show branch heads
2663
2663
2664 With no arguments, show all open branch heads in the repository.
2664 With no arguments, show all open branch heads in the repository.
2665 Branch heads are changesets that have no descendants on the
2665 Branch heads are changesets that have no descendants on the
2666 same branch. They are where development generally takes place and
2666 same branch. They are where development generally takes place and
2667 are the usual targets for update and merge operations.
2667 are the usual targets for update and merge operations.
2668
2668
2669 If one or more REVs are given, only open branch heads on the
2669 If one or more REVs are given, only open branch heads on the
2670 branches associated with the specified changesets are shown. This
2670 branches associated with the specified changesets are shown. This
2671 means that you can use :hg:`heads .` to see the heads on the
2671 means that you can use :hg:`heads .` to see the heads on the
2672 currently checked-out branch.
2672 currently checked-out branch.
2673
2673
2674 If -c/--closed is specified, also show branch heads marked closed
2674 If -c/--closed is specified, also show branch heads marked closed
2675 (see :hg:`commit --close-branch`).
2675 (see :hg:`commit --close-branch`).
2676
2676
2677 If STARTREV is specified, only those heads that are descendants of
2677 If STARTREV is specified, only those heads that are descendants of
2678 STARTREV will be displayed.
2678 STARTREV will be displayed.
2679
2679
2680 If -t/--topo is specified, named branch mechanics will be ignored and only
2680 If -t/--topo is specified, named branch mechanics will be ignored and only
2681 topological heads (changesets with no children) will be shown.
2681 topological heads (changesets with no children) will be shown.
2682
2682
2683 Returns 0 if matching heads are found, 1 if not.
2683 Returns 0 if matching heads are found, 1 if not.
2684 """
2684 """
2685
2685
2686 start = None
2686 start = None
2687 if 'rev' in opts:
2687 if 'rev' in opts:
2688 start = scmutil.revsingle(repo, opts['rev'], None).node()
2688 start = scmutil.revsingle(repo, opts['rev'], None).node()
2689
2689
2690 if opts.get('topo'):
2690 if opts.get('topo'):
2691 heads = [repo[h] for h in repo.heads(start)]
2691 heads = [repo[h] for h in repo.heads(start)]
2692 else:
2692 else:
2693 heads = []
2693 heads = []
2694 for branch in repo.branchmap():
2694 for branch in repo.branchmap():
2695 heads += repo.branchheads(branch, start, opts.get('closed'))
2695 heads += repo.branchheads(branch, start, opts.get('closed'))
2696 heads = [repo[h] for h in heads]
2696 heads = [repo[h] for h in heads]
2697
2697
2698 if branchrevs:
2698 if branchrevs:
2699 branches = set(repo[br].branch() for br in branchrevs)
2699 branches = set(repo[br].branch() for br in branchrevs)
2700 heads = [h for h in heads if h.branch() in branches]
2700 heads = [h for h in heads if h.branch() in branches]
2701
2701
2702 if opts.get('active') and branchrevs:
2702 if opts.get('active') and branchrevs:
2703 dagheads = repo.heads(start)
2703 dagheads = repo.heads(start)
2704 heads = [h for h in heads if h.node() in dagheads]
2704 heads = [h for h in heads if h.node() in dagheads]
2705
2705
2706 if branchrevs:
2706 if branchrevs:
2707 haveheads = set(h.branch() for h in heads)
2707 haveheads = set(h.branch() for h in heads)
2708 if branches - haveheads:
2708 if branches - haveheads:
2709 headless = ', '.join(b for b in branches - haveheads)
2709 headless = ', '.join(b for b in branches - haveheads)
2710 msg = _('no open branch heads found on branches %s')
2710 msg = _('no open branch heads found on branches %s')
2711 if opts.get('rev'):
2711 if opts.get('rev'):
2712 msg += _(' (started at %s)') % opts['rev']
2712 msg += _(' (started at %s)') % opts['rev']
2713 ui.warn((msg + '\n') % headless)
2713 ui.warn((msg + '\n') % headless)
2714
2714
2715 if not heads:
2715 if not heads:
2716 return 1
2716 return 1
2717
2717
2718 ui.pager('heads')
2718 ui.pager('heads')
2719 heads = sorted(heads, key=lambda x: -x.rev())
2719 heads = sorted(heads, key=lambda x: -x.rev())
2720 displayer = cmdutil.show_changeset(ui, repo, opts)
2720 displayer = cmdutil.show_changeset(ui, repo, opts)
2721 for ctx in heads:
2721 for ctx in heads:
2722 displayer.show(ctx)
2722 displayer.show(ctx)
2723 displayer.close()
2723 displayer.close()
2724
2724
2725 @command('help',
2725 @command('help',
2726 [('e', 'extension', None, _('show only help for extensions')),
2726 [('e', 'extension', None, _('show only help for extensions')),
2727 ('c', 'command', None, _('show only help for commands')),
2727 ('c', 'command', None, _('show only help for commands')),
2728 ('k', 'keyword', None, _('show topics matching keyword')),
2728 ('k', 'keyword', None, _('show topics matching keyword')),
2729 ('s', 'system', [], _('show help for specific platform(s)')),
2729 ('s', 'system', [], _('show help for specific platform(s)')),
2730 ],
2730 ],
2731 _('[-ecks] [TOPIC]'),
2731 _('[-ecks] [TOPIC]'),
2732 norepo=True)
2732 norepo=True)
2733 def help_(ui, name=None, **opts):
2733 def help_(ui, name=None, **opts):
2734 """show help for a given topic or a help overview
2734 """show help for a given topic or a help overview
2735
2735
2736 With no arguments, print a list of commands with short help messages.
2736 With no arguments, print a list of commands with short help messages.
2737
2737
2738 Given a topic, extension, or command name, print help for that
2738 Given a topic, extension, or command name, print help for that
2739 topic.
2739 topic.
2740
2740
2741 Returns 0 if successful.
2741 Returns 0 if successful.
2742 """
2742 """
2743
2743
2744 keep = opts.get('system') or []
2744 keep = opts.get('system') or []
2745 if len(keep) == 0:
2745 if len(keep) == 0:
2746 if pycompat.sysplatform.startswith('win'):
2746 if pycompat.sysplatform.startswith('win'):
2747 keep.append('windows')
2747 keep.append('windows')
2748 elif pycompat.sysplatform == 'OpenVMS':
2748 elif pycompat.sysplatform == 'OpenVMS':
2749 keep.append('vms')
2749 keep.append('vms')
2750 elif pycompat.sysplatform == 'plan9':
2750 elif pycompat.sysplatform == 'plan9':
2751 keep.append('plan9')
2751 keep.append('plan9')
2752 else:
2752 else:
2753 keep.append('unix')
2753 keep.append('unix')
2754 keep.append(pycompat.sysplatform.lower())
2754 keep.append(pycompat.sysplatform.lower())
2755 if ui.verbose:
2755 if ui.verbose:
2756 keep.append('verbose')
2756 keep.append('verbose')
2757
2757
2758 formatted = help.formattedhelp(ui, name, keep=keep, **opts)
2758 formatted = help.formattedhelp(ui, name, keep=keep, **opts)
2759 ui.pager('help')
2759 ui.pager('help')
2760 ui.write(formatted)
2760 ui.write(formatted)
2761
2761
2762
2762
2763 @command('identify|id',
2763 @command('identify|id',
2764 [('r', 'rev', '',
2764 [('r', 'rev', '',
2765 _('identify the specified revision'), _('REV')),
2765 _('identify the specified revision'), _('REV')),
2766 ('n', 'num', None, _('show local revision number')),
2766 ('n', 'num', None, _('show local revision number')),
2767 ('i', 'id', None, _('show global revision id')),
2767 ('i', 'id', None, _('show global revision id')),
2768 ('b', 'branch', None, _('show branch')),
2768 ('b', 'branch', None, _('show branch')),
2769 ('t', 'tags', None, _('show tags')),
2769 ('t', 'tags', None, _('show tags')),
2770 ('B', 'bookmarks', None, _('show bookmarks')),
2770 ('B', 'bookmarks', None, _('show bookmarks')),
2771 ] + remoteopts,
2771 ] + remoteopts,
2772 _('[-nibtB] [-r REV] [SOURCE]'),
2772 _('[-nibtB] [-r REV] [SOURCE]'),
2773 optionalrepo=True)
2773 optionalrepo=True)
2774 def identify(ui, repo, source=None, rev=None,
2774 def identify(ui, repo, source=None, rev=None,
2775 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
2775 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
2776 """identify the working directory or specified revision
2776 """identify the working directory or specified revision
2777
2777
2778 Print a summary identifying the repository state at REV using one or
2778 Print a summary identifying the repository state at REV using one or
2779 two parent hash identifiers, followed by a "+" if the working
2779 two parent hash identifiers, followed by a "+" if the working
2780 directory has uncommitted changes, the branch name (if not default),
2780 directory has uncommitted changes, the branch name (if not default),
2781 a list of tags, and a list of bookmarks.
2781 a list of tags, and a list of bookmarks.
2782
2782
2783 When REV is not given, print a summary of the current state of the
2783 When REV is not given, print a summary of the current state of the
2784 repository.
2784 repository.
2785
2785
2786 Specifying a path to a repository root or Mercurial bundle will
2786 Specifying a path to a repository root or Mercurial bundle will
2787 cause lookup to operate on that repository/bundle.
2787 cause lookup to operate on that repository/bundle.
2788
2788
2789 .. container:: verbose
2789 .. container:: verbose
2790
2790
2791 Examples:
2791 Examples:
2792
2792
2793 - generate a build identifier for the working directory::
2793 - generate a build identifier for the working directory::
2794
2794
2795 hg id --id > build-id.dat
2795 hg id --id > build-id.dat
2796
2796
2797 - find the revision corresponding to a tag::
2797 - find the revision corresponding to a tag::
2798
2798
2799 hg id -n -r 1.3
2799 hg id -n -r 1.3
2800
2800
2801 - check the most recent revision of a remote repository::
2801 - check the most recent revision of a remote repository::
2802
2802
2803 hg id -r tip https://www.mercurial-scm.org/repo/hg/
2803 hg id -r tip https://www.mercurial-scm.org/repo/hg/
2804
2804
2805 See :hg:`log` for generating more information about specific revisions,
2805 See :hg:`log` for generating more information about specific revisions,
2806 including full hash identifiers.
2806 including full hash identifiers.
2807
2807
2808 Returns 0 if successful.
2808 Returns 0 if successful.
2809 """
2809 """
2810
2810
2811 if not repo and not source:
2811 if not repo and not source:
2812 raise error.Abort(_("there is no Mercurial repository here "
2812 raise error.Abort(_("there is no Mercurial repository here "
2813 "(.hg not found)"))
2813 "(.hg not found)"))
2814
2814
2815 if ui.debugflag:
2815 if ui.debugflag:
2816 hexfunc = hex
2816 hexfunc = hex
2817 else:
2817 else:
2818 hexfunc = short
2818 hexfunc = short
2819 default = not (num or id or branch or tags or bookmarks)
2819 default = not (num or id or branch or tags or bookmarks)
2820 output = []
2820 output = []
2821 revs = []
2821 revs = []
2822
2822
2823 if source:
2823 if source:
2824 source, branches = hg.parseurl(ui.expandpath(source))
2824 source, branches = hg.parseurl(ui.expandpath(source))
2825 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
2825 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
2826 repo = peer.local()
2826 repo = peer.local()
2827 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
2827 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
2828
2828
2829 if not repo:
2829 if not repo:
2830 if num or branch or tags:
2830 if num or branch or tags:
2831 raise error.Abort(
2831 raise error.Abort(
2832 _("can't query remote revision number, branch, or tags"))
2832 _("can't query remote revision number, branch, or tags"))
2833 if not rev and revs:
2833 if not rev and revs:
2834 rev = revs[0]
2834 rev = revs[0]
2835 if not rev:
2835 if not rev:
2836 rev = "tip"
2836 rev = "tip"
2837
2837
2838 remoterev = peer.lookup(rev)
2838 remoterev = peer.lookup(rev)
2839 if default or id:
2839 if default or id:
2840 output = [hexfunc(remoterev)]
2840 output = [hexfunc(remoterev)]
2841
2841
2842 def getbms():
2842 def getbms():
2843 bms = []
2843 bms = []
2844
2844
2845 if 'bookmarks' in peer.listkeys('namespaces'):
2845 if 'bookmarks' in peer.listkeys('namespaces'):
2846 hexremoterev = hex(remoterev)
2846 hexremoterev = hex(remoterev)
2847 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
2847 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
2848 if bmr == hexremoterev]
2848 if bmr == hexremoterev]
2849
2849
2850 return sorted(bms)
2850 return sorted(bms)
2851
2851
2852 if bookmarks:
2852 if bookmarks:
2853 output.extend(getbms())
2853 output.extend(getbms())
2854 elif default and not ui.quiet:
2854 elif default and not ui.quiet:
2855 # multiple bookmarks for a single parent separated by '/'
2855 # multiple bookmarks for a single parent separated by '/'
2856 bm = '/'.join(getbms())
2856 bm = '/'.join(getbms())
2857 if bm:
2857 if bm:
2858 output.append(bm)
2858 output.append(bm)
2859 else:
2859 else:
2860 ctx = scmutil.revsingle(repo, rev, None)
2860 ctx = scmutil.revsingle(repo, rev, None)
2861
2861
2862 if ctx.rev() is None:
2862 if ctx.rev() is None:
2863 ctx = repo[None]
2863 ctx = repo[None]
2864 parents = ctx.parents()
2864 parents = ctx.parents()
2865 taglist = []
2865 taglist = []
2866 for p in parents:
2866 for p in parents:
2867 taglist.extend(p.tags())
2867 taglist.extend(p.tags())
2868
2868
2869 changed = ""
2869 changed = ""
2870 if default or id or num:
2870 if default or id or num:
2871 if (any(repo.status())
2871 if (any(repo.status())
2872 or any(ctx.sub(s).dirty() for s in ctx.substate)):
2872 or any(ctx.sub(s).dirty() for s in ctx.substate)):
2873 changed = '+'
2873 changed = '+'
2874 if default or id:
2874 if default or id:
2875 output = ["%s%s" %
2875 output = ["%s%s" %
2876 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
2876 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
2877 if num:
2877 if num:
2878 output.append("%s%s" %
2878 output.append("%s%s" %
2879 ('+'.join([str(p.rev()) for p in parents]), changed))
2879 ('+'.join([str(p.rev()) for p in parents]), changed))
2880 else:
2880 else:
2881 if default or id:
2881 if default or id:
2882 output = [hexfunc(ctx.node())]
2882 output = [hexfunc(ctx.node())]
2883 if num:
2883 if num:
2884 output.append(str(ctx.rev()))
2884 output.append(str(ctx.rev()))
2885 taglist = ctx.tags()
2885 taglist = ctx.tags()
2886
2886
2887 if default and not ui.quiet:
2887 if default and not ui.quiet:
2888 b = ctx.branch()
2888 b = ctx.branch()
2889 if b != 'default':
2889 if b != 'default':
2890 output.append("(%s)" % b)
2890 output.append("(%s)" % b)
2891
2891
2892 # multiple tags for a single parent separated by '/'
2892 # multiple tags for a single parent separated by '/'
2893 t = '/'.join(taglist)
2893 t = '/'.join(taglist)
2894 if t:
2894 if t:
2895 output.append(t)
2895 output.append(t)
2896
2896
2897 # multiple bookmarks for a single parent separated by '/'
2897 # multiple bookmarks for a single parent separated by '/'
2898 bm = '/'.join(ctx.bookmarks())
2898 bm = '/'.join(ctx.bookmarks())
2899 if bm:
2899 if bm:
2900 output.append(bm)
2900 output.append(bm)
2901 else:
2901 else:
2902 if branch:
2902 if branch:
2903 output.append(ctx.branch())
2903 output.append(ctx.branch())
2904
2904
2905 if tags:
2905 if tags:
2906 output.extend(taglist)
2906 output.extend(taglist)
2907
2907
2908 if bookmarks:
2908 if bookmarks:
2909 output.extend(ctx.bookmarks())
2909 output.extend(ctx.bookmarks())
2910
2910
2911 ui.write("%s\n" % ' '.join(output))
2911 ui.write("%s\n" % ' '.join(output))
2912
2912
2913 @command('import|patch',
2913 @command('import|patch',
2914 [('p', 'strip', 1,
2914 [('p', 'strip', 1,
2915 _('directory strip option for patch. This has the same '
2915 _('directory strip option for patch. This has the same '
2916 'meaning as the corresponding patch option'), _('NUM')),
2916 'meaning as the corresponding patch option'), _('NUM')),
2917 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
2917 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
2918 ('e', 'edit', False, _('invoke editor on commit messages')),
2918 ('e', 'edit', False, _('invoke editor on commit messages')),
2919 ('f', 'force', None,
2919 ('f', 'force', None,
2920 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
2920 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
2921 ('', 'no-commit', None,
2921 ('', 'no-commit', None,
2922 _("don't commit, just update the working directory")),
2922 _("don't commit, just update the working directory")),
2923 ('', 'bypass', None,
2923 ('', 'bypass', None,
2924 _("apply patch without touching the working directory")),
2924 _("apply patch without touching the working directory")),
2925 ('', 'partial', None,
2925 ('', 'partial', None,
2926 _('commit even if some hunks fail')),
2926 _('commit even if some hunks fail')),
2927 ('', 'exact', None,
2927 ('', 'exact', None,
2928 _('abort if patch would apply lossily')),
2928 _('abort if patch would apply lossily')),
2929 ('', 'prefix', '',
2929 ('', 'prefix', '',
2930 _('apply patch to subdirectory'), _('DIR')),
2930 _('apply patch to subdirectory'), _('DIR')),
2931 ('', 'import-branch', None,
2931 ('', 'import-branch', None,
2932 _('use any branch information in patch (implied by --exact)'))] +
2932 _('use any branch information in patch (implied by --exact)'))] +
2933 commitopts + commitopts2 + similarityopts,
2933 commitopts + commitopts2 + similarityopts,
2934 _('[OPTION]... PATCH...'))
2934 _('[OPTION]... PATCH...'))
2935 def import_(ui, repo, patch1=None, *patches, **opts):
2935 def import_(ui, repo, patch1=None, *patches, **opts):
2936 """import an ordered set of patches
2936 """import an ordered set of patches
2937
2937
2938 Import a list of patches and commit them individually (unless
2938 Import a list of patches and commit them individually (unless
2939 --no-commit is specified).
2939 --no-commit is specified).
2940
2940
2941 To read a patch from standard input (stdin), use "-" as the patch
2941 To read a patch from standard input (stdin), use "-" as the patch
2942 name. If a URL is specified, the patch will be downloaded from
2942 name. If a URL is specified, the patch will be downloaded from
2943 there.
2943 there.
2944
2944
2945 Import first applies changes to the working directory (unless
2945 Import first applies changes to the working directory (unless
2946 --bypass is specified), import will abort if there are outstanding
2946 --bypass is specified), import will abort if there are outstanding
2947 changes.
2947 changes.
2948
2948
2949 Use --bypass to apply and commit patches directly to the
2949 Use --bypass to apply and commit patches directly to the
2950 repository, without affecting the working directory. Without
2950 repository, without affecting the working directory. Without
2951 --exact, patches will be applied on top of the working directory
2951 --exact, patches will be applied on top of the working directory
2952 parent revision.
2952 parent revision.
2953
2953
2954 You can import a patch straight from a mail message. Even patches
2954 You can import a patch straight from a mail message. Even patches
2955 as attachments work (to use the body part, it must have type
2955 as attachments work (to use the body part, it must have type
2956 text/plain or text/x-patch). From and Subject headers of email
2956 text/plain or text/x-patch). From and Subject headers of email
2957 message are used as default committer and commit message. All
2957 message are used as default committer and commit message. All
2958 text/plain body parts before first diff are added to the commit
2958 text/plain body parts before first diff are added to the commit
2959 message.
2959 message.
2960
2960
2961 If the imported patch was generated by :hg:`export`, user and
2961 If the imported patch was generated by :hg:`export`, user and
2962 description from patch override values from message headers and
2962 description from patch override values from message headers and
2963 body. Values given on command line with -m/--message and -u/--user
2963 body. Values given on command line with -m/--message and -u/--user
2964 override these.
2964 override these.
2965
2965
2966 If --exact is specified, import will set the working directory to
2966 If --exact is specified, import will set the working directory to
2967 the parent of each patch before applying it, and will abort if the
2967 the parent of each patch before applying it, and will abort if the
2968 resulting changeset has a different ID than the one recorded in
2968 resulting changeset has a different ID than the one recorded in
2969 the patch. This will guard against various ways that portable
2969 the patch. This will guard against various ways that portable
2970 patch formats and mail systems might fail to transfer Mercurial
2970 patch formats and mail systems might fail to transfer Mercurial
2971 data or metadata. See :hg:`bundle` for lossless transmission.
2971 data or metadata. See :hg:`bundle` for lossless transmission.
2972
2972
2973 Use --partial to ensure a changeset will be created from the patch
2973 Use --partial to ensure a changeset will be created from the patch
2974 even if some hunks fail to apply. Hunks that fail to apply will be
2974 even if some hunks fail to apply. Hunks that fail to apply will be
2975 written to a <target-file>.rej file. Conflicts can then be resolved
2975 written to a <target-file>.rej file. Conflicts can then be resolved
2976 by hand before :hg:`commit --amend` is run to update the created
2976 by hand before :hg:`commit --amend` is run to update the created
2977 changeset. This flag exists to let people import patches that
2977 changeset. This flag exists to let people import patches that
2978 partially apply without losing the associated metadata (author,
2978 partially apply without losing the associated metadata (author,
2979 date, description, ...).
2979 date, description, ...).
2980
2980
2981 .. note::
2981 .. note::
2982
2982
2983 When no hunks apply cleanly, :hg:`import --partial` will create
2983 When no hunks apply cleanly, :hg:`import --partial` will create
2984 an empty changeset, importing only the patch metadata.
2984 an empty changeset, importing only the patch metadata.
2985
2985
2986 With -s/--similarity, hg will attempt to discover renames and
2986 With -s/--similarity, hg will attempt to discover renames and
2987 copies in the patch in the same way as :hg:`addremove`.
2987 copies in the patch in the same way as :hg:`addremove`.
2988
2988
2989 It is possible to use external patch programs to perform the patch
2989 It is possible to use external patch programs to perform the patch
2990 by setting the ``ui.patch`` configuration option. For the default
2990 by setting the ``ui.patch`` configuration option. For the default
2991 internal tool, the fuzz can also be configured via ``patch.fuzz``.
2991 internal tool, the fuzz can also be configured via ``patch.fuzz``.
2992 See :hg:`help config` for more information about configuration
2992 See :hg:`help config` for more information about configuration
2993 files and how to use these options.
2993 files and how to use these options.
2994
2994
2995 See :hg:`help dates` for a list of formats valid for -d/--date.
2995 See :hg:`help dates` for a list of formats valid for -d/--date.
2996
2996
2997 .. container:: verbose
2997 .. container:: verbose
2998
2998
2999 Examples:
2999 Examples:
3000
3000
3001 - import a traditional patch from a website and detect renames::
3001 - import a traditional patch from a website and detect renames::
3002
3002
3003 hg import -s 80 http://example.com/bugfix.patch
3003 hg import -s 80 http://example.com/bugfix.patch
3004
3004
3005 - import a changeset from an hgweb server::
3005 - import a changeset from an hgweb server::
3006
3006
3007 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
3007 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
3008
3008
3009 - import all the patches in an Unix-style mbox::
3009 - import all the patches in an Unix-style mbox::
3010
3010
3011 hg import incoming-patches.mbox
3011 hg import incoming-patches.mbox
3012
3012
3013 - import patches from stdin::
3013 - import patches from stdin::
3014
3014
3015 hg import -
3015 hg import -
3016
3016
3017 - attempt to exactly restore an exported changeset (not always
3017 - attempt to exactly restore an exported changeset (not always
3018 possible)::
3018 possible)::
3019
3019
3020 hg import --exact proposed-fix.patch
3020 hg import --exact proposed-fix.patch
3021
3021
3022 - use an external tool to apply a patch which is too fuzzy for
3022 - use an external tool to apply a patch which is too fuzzy for
3023 the default internal tool.
3023 the default internal tool.
3024
3024
3025 hg import --config ui.patch="patch --merge" fuzzy.patch
3025 hg import --config ui.patch="patch --merge" fuzzy.patch
3026
3026
3027 - change the default fuzzing from 2 to a less strict 7
3027 - change the default fuzzing from 2 to a less strict 7
3028
3028
3029 hg import --config ui.fuzz=7 fuzz.patch
3029 hg import --config ui.fuzz=7 fuzz.patch
3030
3030
3031 Returns 0 on success, 1 on partial success (see --partial).
3031 Returns 0 on success, 1 on partial success (see --partial).
3032 """
3032 """
3033
3033
3034 if not patch1:
3034 if not patch1:
3035 raise error.Abort(_('need at least one patch to import'))
3035 raise error.Abort(_('need at least one patch to import'))
3036
3036
3037 patches = (patch1,) + patches
3037 patches = (patch1,) + patches
3038
3038
3039 date = opts.get('date')
3039 date = opts.get('date')
3040 if date:
3040 if date:
3041 opts['date'] = util.parsedate(date)
3041 opts['date'] = util.parsedate(date)
3042
3042
3043 exact = opts.get('exact')
3043 exact = opts.get('exact')
3044 update = not opts.get('bypass')
3044 update = not opts.get('bypass')
3045 if not update and opts.get('no_commit'):
3045 if not update and opts.get('no_commit'):
3046 raise error.Abort(_('cannot use --no-commit with --bypass'))
3046 raise error.Abort(_('cannot use --no-commit with --bypass'))
3047 try:
3047 try:
3048 sim = float(opts.get('similarity') or 0)
3048 sim = float(opts.get('similarity') or 0)
3049 except ValueError:
3049 except ValueError:
3050 raise error.Abort(_('similarity must be a number'))
3050 raise error.Abort(_('similarity must be a number'))
3051 if sim < 0 or sim > 100:
3051 if sim < 0 or sim > 100:
3052 raise error.Abort(_('similarity must be between 0 and 100'))
3052 raise error.Abort(_('similarity must be between 0 and 100'))
3053 if sim and not update:
3053 if sim and not update:
3054 raise error.Abort(_('cannot use --similarity with --bypass'))
3054 raise error.Abort(_('cannot use --similarity with --bypass'))
3055 if exact:
3055 if exact:
3056 if opts.get('edit'):
3056 if opts.get('edit'):
3057 raise error.Abort(_('cannot use --exact with --edit'))
3057 raise error.Abort(_('cannot use --exact with --edit'))
3058 if opts.get('prefix'):
3058 if opts.get('prefix'):
3059 raise error.Abort(_('cannot use --exact with --prefix'))
3059 raise error.Abort(_('cannot use --exact with --prefix'))
3060
3060
3061 base = opts["base"]
3061 base = opts["base"]
3062 wlock = dsguard = lock = tr = None
3062 wlock = dsguard = lock = tr = None
3063 msgs = []
3063 msgs = []
3064 ret = 0
3064 ret = 0
3065
3065
3066
3066
3067 try:
3067 try:
3068 wlock = repo.wlock()
3068 wlock = repo.wlock()
3069
3069
3070 if update:
3070 if update:
3071 cmdutil.checkunfinished(repo)
3071 cmdutil.checkunfinished(repo)
3072 if (exact or not opts.get('force')):
3072 if (exact or not opts.get('force')):
3073 cmdutil.bailifchanged(repo)
3073 cmdutil.bailifchanged(repo)
3074
3074
3075 if not opts.get('no_commit'):
3075 if not opts.get('no_commit'):
3076 lock = repo.lock()
3076 lock = repo.lock()
3077 tr = repo.transaction('import')
3077 tr = repo.transaction('import')
3078 else:
3078 else:
3079 dsguard = dirstateguard.dirstateguard(repo, 'import')
3079 dsguard = dirstateguard.dirstateguard(repo, 'import')
3080 parents = repo[None].parents()
3080 parents = repo[None].parents()
3081 for patchurl in patches:
3081 for patchurl in patches:
3082 if patchurl == '-':
3082 if patchurl == '-':
3083 ui.status(_('applying patch from stdin\n'))
3083 ui.status(_('applying patch from stdin\n'))
3084 patchfile = ui.fin
3084 patchfile = ui.fin
3085 patchurl = 'stdin' # for error message
3085 patchurl = 'stdin' # for error message
3086 else:
3086 else:
3087 patchurl = os.path.join(base, patchurl)
3087 patchurl = os.path.join(base, patchurl)
3088 ui.status(_('applying %s\n') % patchurl)
3088 ui.status(_('applying %s\n') % patchurl)
3089 patchfile = hg.openpath(ui, patchurl)
3089 patchfile = hg.openpath(ui, patchurl)
3090
3090
3091 haspatch = False
3091 haspatch = False
3092 for hunk in patch.split(patchfile):
3092 for hunk in patch.split(patchfile):
3093 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
3093 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
3094 parents, opts,
3094 parents, opts,
3095 msgs, hg.clean)
3095 msgs, hg.clean)
3096 if msg:
3096 if msg:
3097 haspatch = True
3097 haspatch = True
3098 ui.note(msg + '\n')
3098 ui.note(msg + '\n')
3099 if update or exact:
3099 if update or exact:
3100 parents = repo[None].parents()
3100 parents = repo[None].parents()
3101 else:
3101 else:
3102 parents = [repo[node]]
3102 parents = [repo[node]]
3103 if rej:
3103 if rej:
3104 ui.write_err(_("patch applied partially\n"))
3104 ui.write_err(_("patch applied partially\n"))
3105 ui.write_err(_("(fix the .rej files and run "
3105 ui.write_err(_("(fix the .rej files and run "
3106 "`hg commit --amend`)\n"))
3106 "`hg commit --amend`)\n"))
3107 ret = 1
3107 ret = 1
3108 break
3108 break
3109
3109
3110 if not haspatch:
3110 if not haspatch:
3111 raise error.Abort(_('%s: no diffs found') % patchurl)
3111 raise error.Abort(_('%s: no diffs found') % patchurl)
3112
3112
3113 if tr:
3113 if tr:
3114 tr.close()
3114 tr.close()
3115 if msgs:
3115 if msgs:
3116 repo.savecommitmessage('\n* * *\n'.join(msgs))
3116 repo.savecommitmessage('\n* * *\n'.join(msgs))
3117 if dsguard:
3117 if dsguard:
3118 dsguard.close()
3118 dsguard.close()
3119 return ret
3119 return ret
3120 finally:
3120 finally:
3121 if tr:
3121 if tr:
3122 tr.release()
3122 tr.release()
3123 release(lock, dsguard, wlock)
3123 release(lock, dsguard, wlock)
3124
3124
3125 @command('incoming|in',
3125 @command('incoming|in',
3126 [('f', 'force', None,
3126 [('f', 'force', None,
3127 _('run even if remote repository is unrelated')),
3127 _('run even if remote repository is unrelated')),
3128 ('n', 'newest-first', None, _('show newest record first')),
3128 ('n', 'newest-first', None, _('show newest record first')),
3129 ('', 'bundle', '',
3129 ('', 'bundle', '',
3130 _('file to store the bundles into'), _('FILE')),
3130 _('file to store the bundles into'), _('FILE')),
3131 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3131 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3132 ('B', 'bookmarks', False, _("compare bookmarks")),
3132 ('B', 'bookmarks', False, _("compare bookmarks")),
3133 ('b', 'branch', [],
3133 ('b', 'branch', [],
3134 _('a specific branch you would like to pull'), _('BRANCH')),
3134 _('a specific branch you would like to pull'), _('BRANCH')),
3135 ] + logopts + remoteopts + subrepoopts,
3135 ] + logopts + remoteopts + subrepoopts,
3136 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3136 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3137 def incoming(ui, repo, source="default", **opts):
3137 def incoming(ui, repo, source="default", **opts):
3138 """show new changesets found in source
3138 """show new changesets found in source
3139
3139
3140 Show new changesets found in the specified path/URL or the default
3140 Show new changesets found in the specified path/URL or the default
3141 pull location. These are the changesets that would have been pulled
3141 pull location. These are the changesets that would have been pulled
3142 if a pull at the time you issued this command.
3142 if a pull at the time you issued this command.
3143
3143
3144 See pull for valid source format details.
3144 See pull for valid source format details.
3145
3145
3146 .. container:: verbose
3146 .. container:: verbose
3147
3147
3148 With -B/--bookmarks, the result of bookmark comparison between
3148 With -B/--bookmarks, the result of bookmark comparison between
3149 local and remote repositories is displayed. With -v/--verbose,
3149 local and remote repositories is displayed. With -v/--verbose,
3150 status is also displayed for each bookmark like below::
3150 status is also displayed for each bookmark like below::
3151
3151
3152 BM1 01234567890a added
3152 BM1 01234567890a added
3153 BM2 1234567890ab advanced
3153 BM2 1234567890ab advanced
3154 BM3 234567890abc diverged
3154 BM3 234567890abc diverged
3155 BM4 34567890abcd changed
3155 BM4 34567890abcd changed
3156
3156
3157 The action taken locally when pulling depends on the
3157 The action taken locally when pulling depends on the
3158 status of each bookmark:
3158 status of each bookmark:
3159
3159
3160 :``added``: pull will create it
3160 :``added``: pull will create it
3161 :``advanced``: pull will update it
3161 :``advanced``: pull will update it
3162 :``diverged``: pull will create a divergent bookmark
3162 :``diverged``: pull will create a divergent bookmark
3163 :``changed``: result depends on remote changesets
3163 :``changed``: result depends on remote changesets
3164
3164
3165 From the point of view of pulling behavior, bookmark
3165 From the point of view of pulling behavior, bookmark
3166 existing only in the remote repository are treated as ``added``,
3166 existing only in the remote repository are treated as ``added``,
3167 even if it is in fact locally deleted.
3167 even if it is in fact locally deleted.
3168
3168
3169 .. container:: verbose
3169 .. container:: verbose
3170
3170
3171 For remote repository, using --bundle avoids downloading the
3171 For remote repository, using --bundle avoids downloading the
3172 changesets twice if the incoming is followed by a pull.
3172 changesets twice if the incoming is followed by a pull.
3173
3173
3174 Examples:
3174 Examples:
3175
3175
3176 - show incoming changes with patches and full description::
3176 - show incoming changes with patches and full description::
3177
3177
3178 hg incoming -vp
3178 hg incoming -vp
3179
3179
3180 - show incoming changes excluding merges, store a bundle::
3180 - show incoming changes excluding merges, store a bundle::
3181
3181
3182 hg in -vpM --bundle incoming.hg
3182 hg in -vpM --bundle incoming.hg
3183 hg pull incoming.hg
3183 hg pull incoming.hg
3184
3184
3185 - briefly list changes inside a bundle::
3185 - briefly list changes inside a bundle::
3186
3186
3187 hg in changes.hg -T "{desc|firstline}\\n"
3187 hg in changes.hg -T "{desc|firstline}\\n"
3188
3188
3189 Returns 0 if there are incoming changes, 1 otherwise.
3189 Returns 0 if there are incoming changes, 1 otherwise.
3190 """
3190 """
3191 opts = pycompat.byteskwargs(opts)
3191 opts = pycompat.byteskwargs(opts)
3192 if opts.get('graph'):
3192 if opts.get('graph'):
3193 cmdutil.checkunsupportedgraphflags([], opts)
3193 cmdutil.checkunsupportedgraphflags([], opts)
3194 def display(other, chlist, displayer):
3194 def display(other, chlist, displayer):
3195 revdag = cmdutil.graphrevs(other, chlist, opts)
3195 revdag = cmdutil.graphrevs(other, chlist, opts)
3196 cmdutil.displaygraph(ui, repo, revdag, displayer,
3196 cmdutil.displaygraph(ui, repo, revdag, displayer,
3197 graphmod.asciiedges)
3197 graphmod.asciiedges)
3198
3198
3199 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3199 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3200 return 0
3200 return 0
3201
3201
3202 if opts.get('bundle') and opts.get('subrepos'):
3202 if opts.get('bundle') and opts.get('subrepos'):
3203 raise error.Abort(_('cannot combine --bundle and --subrepos'))
3203 raise error.Abort(_('cannot combine --bundle and --subrepos'))
3204
3204
3205 if opts.get('bookmarks'):
3205 if opts.get('bookmarks'):
3206 source, branches = hg.parseurl(ui.expandpath(source),
3206 source, branches = hg.parseurl(ui.expandpath(source),
3207 opts.get('branch'))
3207 opts.get('branch'))
3208 other = hg.peer(repo, opts, source)
3208 other = hg.peer(repo, opts, source)
3209 if 'bookmarks' not in other.listkeys('namespaces'):
3209 if 'bookmarks' not in other.listkeys('namespaces'):
3210 ui.warn(_("remote doesn't support bookmarks\n"))
3210 ui.warn(_("remote doesn't support bookmarks\n"))
3211 return 0
3211 return 0
3212 ui.pager('incoming')
3212 ui.pager('incoming')
3213 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3213 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3214 return bookmarks.incoming(ui, repo, other)
3214 return bookmarks.incoming(ui, repo, other)
3215
3215
3216 repo._subtoppath = ui.expandpath(source)
3216 repo._subtoppath = ui.expandpath(source)
3217 try:
3217 try:
3218 return hg.incoming(ui, repo, source, opts)
3218 return hg.incoming(ui, repo, source, opts)
3219 finally:
3219 finally:
3220 del repo._subtoppath
3220 del repo._subtoppath
3221
3221
3222
3222
3223 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
3223 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
3224 norepo=True)
3224 norepo=True)
3225 def init(ui, dest=".", **opts):
3225 def init(ui, dest=".", **opts):
3226 """create a new repository in the given directory
3226 """create a new repository in the given directory
3227
3227
3228 Initialize a new repository in the given directory. If the given
3228 Initialize a new repository in the given directory. If the given
3229 directory does not exist, it will be created.
3229 directory does not exist, it will be created.
3230
3230
3231 If no directory is given, the current directory is used.
3231 If no directory is given, the current directory is used.
3232
3232
3233 It is possible to specify an ``ssh://`` URL as the destination.
3233 It is possible to specify an ``ssh://`` URL as the destination.
3234 See :hg:`help urls` for more information.
3234 See :hg:`help urls` for more information.
3235
3235
3236 Returns 0 on success.
3236 Returns 0 on success.
3237 """
3237 """
3238 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3238 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3239
3239
3240 @command('locate',
3240 @command('locate',
3241 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3241 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3242 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3242 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3243 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3243 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3244 ] + walkopts,
3244 ] + walkopts,
3245 _('[OPTION]... [PATTERN]...'))
3245 _('[OPTION]... [PATTERN]...'))
3246 def locate(ui, repo, *pats, **opts):
3246 def locate(ui, repo, *pats, **opts):
3247 """locate files matching specific patterns (DEPRECATED)
3247 """locate files matching specific patterns (DEPRECATED)
3248
3248
3249 Print files under Mercurial control in the working directory whose
3249 Print files under Mercurial control in the working directory whose
3250 names match the given patterns.
3250 names match the given patterns.
3251
3251
3252 By default, this command searches all directories in the working
3252 By default, this command searches all directories in the working
3253 directory. To search just the current directory and its
3253 directory. To search just the current directory and its
3254 subdirectories, use "--include .".
3254 subdirectories, use "--include .".
3255
3255
3256 If no patterns are given to match, this command prints the names
3256 If no patterns are given to match, this command prints the names
3257 of all files under Mercurial control in the working directory.
3257 of all files under Mercurial control in the working directory.
3258
3258
3259 If you want to feed the output of this command into the "xargs"
3259 If you want to feed the output of this command into the "xargs"
3260 command, use the -0 option to both this command and "xargs". This
3260 command, use the -0 option to both this command and "xargs". This
3261 will avoid the problem of "xargs" treating single filenames that
3261 will avoid the problem of "xargs" treating single filenames that
3262 contain whitespace as multiple filenames.
3262 contain whitespace as multiple filenames.
3263
3263
3264 See :hg:`help files` for a more versatile command.
3264 See :hg:`help files` for a more versatile command.
3265
3265
3266 Returns 0 if a match is found, 1 otherwise.
3266 Returns 0 if a match is found, 1 otherwise.
3267 """
3267 """
3268 if opts.get('print0'):
3268 if opts.get('print0'):
3269 end = '\0'
3269 end = '\0'
3270 else:
3270 else:
3271 end = '\n'
3271 end = '\n'
3272 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3272 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3273
3273
3274 ret = 1
3274 ret = 1
3275 ctx = repo[rev]
3275 ctx = repo[rev]
3276 m = scmutil.match(ctx, pats, opts, default='relglob',
3276 m = scmutil.match(ctx, pats, opts, default='relglob',
3277 badfn=lambda x, y: False)
3277 badfn=lambda x, y: False)
3278
3278
3279 ui.pager('locate')
3279 ui.pager('locate')
3280 for abs in ctx.matches(m):
3280 for abs in ctx.matches(m):
3281 if opts.get('fullpath'):
3281 if opts.get('fullpath'):
3282 ui.write(repo.wjoin(abs), end)
3282 ui.write(repo.wjoin(abs), end)
3283 else:
3283 else:
3284 ui.write(((pats and m.rel(abs)) or abs), end)
3284 ui.write(((pats and m.rel(abs)) or abs), end)
3285 ret = 0
3285 ret = 0
3286
3286
3287 return ret
3287 return ret
3288
3288
3289 @command('^log|history',
3289 @command('^log|history',
3290 [('f', 'follow', None,
3290 [('f', 'follow', None,
3291 _('follow changeset history, or file history across copies and renames')),
3291 _('follow changeset history, or file history across copies and renames')),
3292 ('', 'follow-first', None,
3292 ('', 'follow-first', None,
3293 _('only follow the first parent of merge changesets (DEPRECATED)')),
3293 _('only follow the first parent of merge changesets (DEPRECATED)')),
3294 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3294 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3295 ('C', 'copies', None, _('show copied files')),
3295 ('C', 'copies', None, _('show copied files')),
3296 ('k', 'keyword', [],
3296 ('k', 'keyword', [],
3297 _('do case-insensitive search for a given text'), _('TEXT')),
3297 _('do case-insensitive search for a given text'), _('TEXT')),
3298 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
3298 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
3299 ('', 'removed', None, _('include revisions where files were removed')),
3299 ('', 'removed', None, _('include revisions where files were removed')),
3300 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3300 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3301 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3301 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3302 ('', 'only-branch', [],
3302 ('', 'only-branch', [],
3303 _('show only changesets within the given named branch (DEPRECATED)'),
3303 _('show only changesets within the given named branch (DEPRECATED)'),
3304 _('BRANCH')),
3304 _('BRANCH')),
3305 ('b', 'branch', [],
3305 ('b', 'branch', [],
3306 _('show changesets within the given named branch'), _('BRANCH')),
3306 _('show changesets within the given named branch'), _('BRANCH')),
3307 ('P', 'prune', [],
3307 ('P', 'prune', [],
3308 _('do not display revision or any of its ancestors'), _('REV')),
3308 _('do not display revision or any of its ancestors'), _('REV')),
3309 ] + logopts + walkopts,
3309 ] + logopts + walkopts,
3310 _('[OPTION]... [FILE]'),
3310 _('[OPTION]... [FILE]'),
3311 inferrepo=True)
3311 inferrepo=True)
3312 def log(ui, repo, *pats, **opts):
3312 def log(ui, repo, *pats, **opts):
3313 """show revision history of entire repository or files
3313 """show revision history of entire repository or files
3314
3314
3315 Print the revision history of the specified files or the entire
3315 Print the revision history of the specified files or the entire
3316 project.
3316 project.
3317
3317
3318 If no revision range is specified, the default is ``tip:0`` unless
3318 If no revision range is specified, the default is ``tip:0`` unless
3319 --follow is set, in which case the working directory parent is
3319 --follow is set, in which case the working directory parent is
3320 used as the starting revision.
3320 used as the starting revision.
3321
3321
3322 File history is shown without following rename or copy history of
3322 File history is shown without following rename or copy history of
3323 files. Use -f/--follow with a filename to follow history across
3323 files. Use -f/--follow with a filename to follow history across
3324 renames and copies. --follow without a filename will only show
3324 renames and copies. --follow without a filename will only show
3325 ancestors or descendants of the starting revision.
3325 ancestors or descendants of the starting revision.
3326
3326
3327 By default this command prints revision number and changeset id,
3327 By default this command prints revision number and changeset id,
3328 tags, non-trivial parents, user, date and time, and a summary for
3328 tags, non-trivial parents, user, date and time, and a summary for
3329 each commit. When the -v/--verbose switch is used, the list of
3329 each commit. When the -v/--verbose switch is used, the list of
3330 changed files and full commit message are shown.
3330 changed files and full commit message are shown.
3331
3331
3332 With --graph the revisions are shown as an ASCII art DAG with the most
3332 With --graph the revisions are shown as an ASCII art DAG with the most
3333 recent changeset at the top.
3333 recent changeset at the top.
3334 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
3334 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
3335 and '+' represents a fork where the changeset from the lines below is a
3335 and '+' represents a fork where the changeset from the lines below is a
3336 parent of the 'o' merge on the same line.
3336 parent of the 'o' merge on the same line.
3337 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
3338 of a '|' indicates one or more revisions in a path are omitted.
3337
3339
3338 .. note::
3340 .. note::
3339
3341
3340 :hg:`log --patch` may generate unexpected diff output for merge
3342 :hg:`log --patch` may generate unexpected diff output for merge
3341 changesets, as it will only compare the merge changeset against
3343 changesets, as it will only compare the merge changeset against
3342 its first parent. Also, only files different from BOTH parents
3344 its first parent. Also, only files different from BOTH parents
3343 will appear in files:.
3345 will appear in files:.
3344
3346
3345 .. note::
3347 .. note::
3346
3348
3347 For performance reasons, :hg:`log FILE` may omit duplicate changes
3349 For performance reasons, :hg:`log FILE` may omit duplicate changes
3348 made on branches and will not show removals or mode changes. To
3350 made on branches and will not show removals or mode changes. To
3349 see all such changes, use the --removed switch.
3351 see all such changes, use the --removed switch.
3350
3352
3351 .. container:: verbose
3353 .. container:: verbose
3352
3354
3353 Some examples:
3355 Some examples:
3354
3356
3355 - changesets with full descriptions and file lists::
3357 - changesets with full descriptions and file lists::
3356
3358
3357 hg log -v
3359 hg log -v
3358
3360
3359 - changesets ancestral to the working directory::
3361 - changesets ancestral to the working directory::
3360
3362
3361 hg log -f
3363 hg log -f
3362
3364
3363 - last 10 commits on the current branch::
3365 - last 10 commits on the current branch::
3364
3366
3365 hg log -l 10 -b .
3367 hg log -l 10 -b .
3366
3368
3367 - changesets showing all modifications of a file, including removals::
3369 - changesets showing all modifications of a file, including removals::
3368
3370
3369 hg log --removed file.c
3371 hg log --removed file.c
3370
3372
3371 - all changesets that touch a directory, with diffs, excluding merges::
3373 - all changesets that touch a directory, with diffs, excluding merges::
3372
3374
3373 hg log -Mp lib/
3375 hg log -Mp lib/
3374
3376
3375 - all revision numbers that match a keyword::
3377 - all revision numbers that match a keyword::
3376
3378
3377 hg log -k bug --template "{rev}\\n"
3379 hg log -k bug --template "{rev}\\n"
3378
3380
3379 - the full hash identifier of the working directory parent::
3381 - the full hash identifier of the working directory parent::
3380
3382
3381 hg log -r . --template "{node}\\n"
3383 hg log -r . --template "{node}\\n"
3382
3384
3383 - list available log templates::
3385 - list available log templates::
3384
3386
3385 hg log -T list
3387 hg log -T list
3386
3388
3387 - check if a given changeset is included in a tagged release::
3389 - check if a given changeset is included in a tagged release::
3388
3390
3389 hg log -r "a21ccf and ancestor(1.9)"
3391 hg log -r "a21ccf and ancestor(1.9)"
3390
3392
3391 - find all changesets by some user in a date range::
3393 - find all changesets by some user in a date range::
3392
3394
3393 hg log -k alice -d "may 2008 to jul 2008"
3395 hg log -k alice -d "may 2008 to jul 2008"
3394
3396
3395 - summary of all changesets after the last tag::
3397 - summary of all changesets after the last tag::
3396
3398
3397 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3399 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3398
3400
3399 See :hg:`help dates` for a list of formats valid for -d/--date.
3401 See :hg:`help dates` for a list of formats valid for -d/--date.
3400
3402
3401 See :hg:`help revisions` for more about specifying and ordering
3403 See :hg:`help revisions` for more about specifying and ordering
3402 revisions.
3404 revisions.
3403
3405
3404 See :hg:`help templates` for more about pre-packaged styles and
3406 See :hg:`help templates` for more about pre-packaged styles and
3405 specifying custom templates.
3407 specifying custom templates.
3406
3408
3407 Returns 0 on success.
3409 Returns 0 on success.
3408
3410
3409 """
3411 """
3410 opts = pycompat.byteskwargs(opts)
3412 opts = pycompat.byteskwargs(opts)
3411 if opts.get('follow') and opts.get('rev'):
3413 if opts.get('follow') and opts.get('rev'):
3412 opts['rev'] = [revsetlang.formatspec('reverse(::%lr)', opts.get('rev'))]
3414 opts['rev'] = [revsetlang.formatspec('reverse(::%lr)', opts.get('rev'))]
3413 del opts['follow']
3415 del opts['follow']
3414
3416
3415 if opts.get('graph'):
3417 if opts.get('graph'):
3416 return cmdutil.graphlog(ui, repo, pats, opts)
3418 return cmdutil.graphlog(ui, repo, pats, opts)
3417
3419
3418 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
3420 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
3419 limit = cmdutil.loglimit(opts)
3421 limit = cmdutil.loglimit(opts)
3420 count = 0
3422 count = 0
3421
3423
3422 getrenamed = None
3424 getrenamed = None
3423 if opts.get('copies'):
3425 if opts.get('copies'):
3424 endrev = None
3426 endrev = None
3425 if opts.get('rev'):
3427 if opts.get('rev'):
3426 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
3428 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
3427 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3429 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3428
3430
3429 ui.pager('log')
3431 ui.pager('log')
3430 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3432 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3431 for rev in revs:
3433 for rev in revs:
3432 if count == limit:
3434 if count == limit:
3433 break
3435 break
3434 ctx = repo[rev]
3436 ctx = repo[rev]
3435 copies = None
3437 copies = None
3436 if getrenamed is not None and rev:
3438 if getrenamed is not None and rev:
3437 copies = []
3439 copies = []
3438 for fn in ctx.files():
3440 for fn in ctx.files():
3439 rename = getrenamed(fn, rev)
3441 rename = getrenamed(fn, rev)
3440 if rename:
3442 if rename:
3441 copies.append((fn, rename[0]))
3443 copies.append((fn, rename[0]))
3442 if filematcher:
3444 if filematcher:
3443 revmatchfn = filematcher(ctx.rev())
3445 revmatchfn = filematcher(ctx.rev())
3444 else:
3446 else:
3445 revmatchfn = None
3447 revmatchfn = None
3446 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
3448 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
3447 if displayer.flush(ctx):
3449 if displayer.flush(ctx):
3448 count += 1
3450 count += 1
3449
3451
3450 displayer.close()
3452 displayer.close()
3451
3453
3452 @command('manifest',
3454 @command('manifest',
3453 [('r', 'rev', '', _('revision to display'), _('REV')),
3455 [('r', 'rev', '', _('revision to display'), _('REV')),
3454 ('', 'all', False, _("list files from all revisions"))]
3456 ('', 'all', False, _("list files from all revisions"))]
3455 + formatteropts,
3457 + formatteropts,
3456 _('[-r REV]'))
3458 _('[-r REV]'))
3457 def manifest(ui, repo, node=None, rev=None, **opts):
3459 def manifest(ui, repo, node=None, rev=None, **opts):
3458 """output the current or given revision of the project manifest
3460 """output the current or given revision of the project manifest
3459
3461
3460 Print a list of version controlled files for the given revision.
3462 Print a list of version controlled files for the given revision.
3461 If no revision is given, the first parent of the working directory
3463 If no revision is given, the first parent of the working directory
3462 is used, or the null revision if no revision is checked out.
3464 is used, or the null revision if no revision is checked out.
3463
3465
3464 With -v, print file permissions, symlink and executable bits.
3466 With -v, print file permissions, symlink and executable bits.
3465 With --debug, print file revision hashes.
3467 With --debug, print file revision hashes.
3466
3468
3467 If option --all is specified, the list of all files from all revisions
3469 If option --all is specified, the list of all files from all revisions
3468 is printed. This includes deleted and renamed files.
3470 is printed. This includes deleted and renamed files.
3469
3471
3470 Returns 0 on success.
3472 Returns 0 on success.
3471 """
3473 """
3472 fm = ui.formatter('manifest', opts)
3474 fm = ui.formatter('manifest', opts)
3473
3475
3474 if opts.get('all'):
3476 if opts.get('all'):
3475 if rev or node:
3477 if rev or node:
3476 raise error.Abort(_("can't specify a revision with --all"))
3478 raise error.Abort(_("can't specify a revision with --all"))
3477
3479
3478 res = []
3480 res = []
3479 prefix = "data/"
3481 prefix = "data/"
3480 suffix = ".i"
3482 suffix = ".i"
3481 plen = len(prefix)
3483 plen = len(prefix)
3482 slen = len(suffix)
3484 slen = len(suffix)
3483 with repo.lock():
3485 with repo.lock():
3484 for fn, b, size in repo.store.datafiles():
3486 for fn, b, size in repo.store.datafiles():
3485 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
3487 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
3486 res.append(fn[plen:-slen])
3488 res.append(fn[plen:-slen])
3487 ui.pager('manifest')
3489 ui.pager('manifest')
3488 for f in res:
3490 for f in res:
3489 fm.startitem()
3491 fm.startitem()
3490 fm.write("path", '%s\n', f)
3492 fm.write("path", '%s\n', f)
3491 fm.end()
3493 fm.end()
3492 return
3494 return
3493
3495
3494 if rev and node:
3496 if rev and node:
3495 raise error.Abort(_("please specify just one revision"))
3497 raise error.Abort(_("please specify just one revision"))
3496
3498
3497 if not node:
3499 if not node:
3498 node = rev
3500 node = rev
3499
3501
3500 char = {'l': '@', 'x': '*', '': ''}
3502 char = {'l': '@', 'x': '*', '': ''}
3501 mode = {'l': '644', 'x': '755', '': '644'}
3503 mode = {'l': '644', 'x': '755', '': '644'}
3502 ctx = scmutil.revsingle(repo, node)
3504 ctx = scmutil.revsingle(repo, node)
3503 mf = ctx.manifest()
3505 mf = ctx.manifest()
3504 ui.pager('manifest')
3506 ui.pager('manifest')
3505 for f in ctx:
3507 for f in ctx:
3506 fm.startitem()
3508 fm.startitem()
3507 fl = ctx[f].flags()
3509 fl = ctx[f].flags()
3508 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3510 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3509 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3511 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3510 fm.write('path', '%s\n', f)
3512 fm.write('path', '%s\n', f)
3511 fm.end()
3513 fm.end()
3512
3514
3513 @command('^merge',
3515 @command('^merge',
3514 [('f', 'force', None,
3516 [('f', 'force', None,
3515 _('force a merge including outstanding changes (DEPRECATED)')),
3517 _('force a merge including outstanding changes (DEPRECATED)')),
3516 ('r', 'rev', '', _('revision to merge'), _('REV')),
3518 ('r', 'rev', '', _('revision to merge'), _('REV')),
3517 ('P', 'preview', None,
3519 ('P', 'preview', None,
3518 _('review revisions to merge (no merge is performed)'))
3520 _('review revisions to merge (no merge is performed)'))
3519 ] + mergetoolopts,
3521 ] + mergetoolopts,
3520 _('[-P] [[-r] REV]'))
3522 _('[-P] [[-r] REV]'))
3521 def merge(ui, repo, node=None, **opts):
3523 def merge(ui, repo, node=None, **opts):
3522 """merge another revision into working directory
3524 """merge another revision into working directory
3523
3525
3524 The current working directory is updated with all changes made in
3526 The current working directory is updated with all changes made in
3525 the requested revision since the last common predecessor revision.
3527 the requested revision since the last common predecessor revision.
3526
3528
3527 Files that changed between either parent are marked as changed for
3529 Files that changed between either parent are marked as changed for
3528 the next commit and a commit must be performed before any further
3530 the next commit and a commit must be performed before any further
3529 updates to the repository are allowed. The next commit will have
3531 updates to the repository are allowed. The next commit will have
3530 two parents.
3532 two parents.
3531
3533
3532 ``--tool`` can be used to specify the merge tool used for file
3534 ``--tool`` can be used to specify the merge tool used for file
3533 merges. It overrides the HGMERGE environment variable and your
3535 merges. It overrides the HGMERGE environment variable and your
3534 configuration files. See :hg:`help merge-tools` for options.
3536 configuration files. See :hg:`help merge-tools` for options.
3535
3537
3536 If no revision is specified, the working directory's parent is a
3538 If no revision is specified, the working directory's parent is a
3537 head revision, and the current branch contains exactly one other
3539 head revision, and the current branch contains exactly one other
3538 head, the other head is merged with by default. Otherwise, an
3540 head, the other head is merged with by default. Otherwise, an
3539 explicit revision with which to merge with must be provided.
3541 explicit revision with which to merge with must be provided.
3540
3542
3541 See :hg:`help resolve` for information on handling file conflicts.
3543 See :hg:`help resolve` for information on handling file conflicts.
3542
3544
3543 To undo an uncommitted merge, use :hg:`update --clean .` which
3545 To undo an uncommitted merge, use :hg:`update --clean .` which
3544 will check out a clean copy of the original merge parent, losing
3546 will check out a clean copy of the original merge parent, losing
3545 all changes.
3547 all changes.
3546
3548
3547 Returns 0 on success, 1 if there are unresolved files.
3549 Returns 0 on success, 1 if there are unresolved files.
3548 """
3550 """
3549
3551
3550 if opts.get('rev') and node:
3552 if opts.get('rev') and node:
3551 raise error.Abort(_("please specify just one revision"))
3553 raise error.Abort(_("please specify just one revision"))
3552 if not node:
3554 if not node:
3553 node = opts.get('rev')
3555 node = opts.get('rev')
3554
3556
3555 if node:
3557 if node:
3556 node = scmutil.revsingle(repo, node).node()
3558 node = scmutil.revsingle(repo, node).node()
3557
3559
3558 if not node:
3560 if not node:
3559 node = repo[destutil.destmerge(repo)].node()
3561 node = repo[destutil.destmerge(repo)].node()
3560
3562
3561 if opts.get('preview'):
3563 if opts.get('preview'):
3562 # find nodes that are ancestors of p2 but not of p1
3564 # find nodes that are ancestors of p2 but not of p1
3563 p1 = repo.lookup('.')
3565 p1 = repo.lookup('.')
3564 p2 = repo.lookup(node)
3566 p2 = repo.lookup(node)
3565 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
3567 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
3566
3568
3567 displayer = cmdutil.show_changeset(ui, repo, opts)
3569 displayer = cmdutil.show_changeset(ui, repo, opts)
3568 for node in nodes:
3570 for node in nodes:
3569 displayer.show(repo[node])
3571 displayer.show(repo[node])
3570 displayer.close()
3572 displayer.close()
3571 return 0
3573 return 0
3572
3574
3573 try:
3575 try:
3574 # ui.forcemerge is an internal variable, do not document
3576 # ui.forcemerge is an internal variable, do not document
3575 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
3577 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
3576 force = opts.get('force')
3578 force = opts.get('force')
3577 labels = ['working copy', 'merge rev']
3579 labels = ['working copy', 'merge rev']
3578 return hg.merge(repo, node, force=force, mergeforce=force,
3580 return hg.merge(repo, node, force=force, mergeforce=force,
3579 labels=labels)
3581 labels=labels)
3580 finally:
3582 finally:
3581 ui.setconfig('ui', 'forcemerge', '', 'merge')
3583 ui.setconfig('ui', 'forcemerge', '', 'merge')
3582
3584
3583 @command('outgoing|out',
3585 @command('outgoing|out',
3584 [('f', 'force', None, _('run even when the destination is unrelated')),
3586 [('f', 'force', None, _('run even when the destination is unrelated')),
3585 ('r', 'rev', [],
3587 ('r', 'rev', [],
3586 _('a changeset intended to be included in the destination'), _('REV')),
3588 _('a changeset intended to be included in the destination'), _('REV')),
3587 ('n', 'newest-first', None, _('show newest record first')),
3589 ('n', 'newest-first', None, _('show newest record first')),
3588 ('B', 'bookmarks', False, _('compare bookmarks')),
3590 ('B', 'bookmarks', False, _('compare bookmarks')),
3589 ('b', 'branch', [], _('a specific branch you would like to push'),
3591 ('b', 'branch', [], _('a specific branch you would like to push'),
3590 _('BRANCH')),
3592 _('BRANCH')),
3591 ] + logopts + remoteopts + subrepoopts,
3593 ] + logopts + remoteopts + subrepoopts,
3592 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
3594 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
3593 def outgoing(ui, repo, dest=None, **opts):
3595 def outgoing(ui, repo, dest=None, **opts):
3594 """show changesets not found in the destination
3596 """show changesets not found in the destination
3595
3597
3596 Show changesets not found in the specified destination repository
3598 Show changesets not found in the specified destination repository
3597 or the default push location. These are the changesets that would
3599 or the default push location. These are the changesets that would
3598 be pushed if a push was requested.
3600 be pushed if a push was requested.
3599
3601
3600 See pull for details of valid destination formats.
3602 See pull for details of valid destination formats.
3601
3603
3602 .. container:: verbose
3604 .. container:: verbose
3603
3605
3604 With -B/--bookmarks, the result of bookmark comparison between
3606 With -B/--bookmarks, the result of bookmark comparison between
3605 local and remote repositories is displayed. With -v/--verbose,
3607 local and remote repositories is displayed. With -v/--verbose,
3606 status is also displayed for each bookmark like below::
3608 status is also displayed for each bookmark like below::
3607
3609
3608 BM1 01234567890a added
3610 BM1 01234567890a added
3609 BM2 deleted
3611 BM2 deleted
3610 BM3 234567890abc advanced
3612 BM3 234567890abc advanced
3611 BM4 34567890abcd diverged
3613 BM4 34567890abcd diverged
3612 BM5 4567890abcde changed
3614 BM5 4567890abcde changed
3613
3615
3614 The action taken when pushing depends on the
3616 The action taken when pushing depends on the
3615 status of each bookmark:
3617 status of each bookmark:
3616
3618
3617 :``added``: push with ``-B`` will create it
3619 :``added``: push with ``-B`` will create it
3618 :``deleted``: push with ``-B`` will delete it
3620 :``deleted``: push with ``-B`` will delete it
3619 :``advanced``: push will update it
3621 :``advanced``: push will update it
3620 :``diverged``: push with ``-B`` will update it
3622 :``diverged``: push with ``-B`` will update it
3621 :``changed``: push with ``-B`` will update it
3623 :``changed``: push with ``-B`` will update it
3622
3624
3623 From the point of view of pushing behavior, bookmarks
3625 From the point of view of pushing behavior, bookmarks
3624 existing only in the remote repository are treated as
3626 existing only in the remote repository are treated as
3625 ``deleted``, even if it is in fact added remotely.
3627 ``deleted``, even if it is in fact added remotely.
3626
3628
3627 Returns 0 if there are outgoing changes, 1 otherwise.
3629 Returns 0 if there are outgoing changes, 1 otherwise.
3628 """
3630 """
3629 if opts.get('graph'):
3631 if opts.get('graph'):
3630 cmdutil.checkunsupportedgraphflags([], opts)
3632 cmdutil.checkunsupportedgraphflags([], opts)
3631 o, other = hg._outgoing(ui, repo, dest, opts)
3633 o, other = hg._outgoing(ui, repo, dest, opts)
3632 if not o:
3634 if not o:
3633 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3635 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3634 return
3636 return
3635
3637
3636 revdag = cmdutil.graphrevs(repo, o, opts)
3638 revdag = cmdutil.graphrevs(repo, o, opts)
3637 ui.pager('outgoing')
3639 ui.pager('outgoing')
3638 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3640 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3639 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
3641 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
3640 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3642 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3641 return 0
3643 return 0
3642
3644
3643 if opts.get('bookmarks'):
3645 if opts.get('bookmarks'):
3644 dest = ui.expandpath(dest or 'default-push', dest or 'default')
3646 dest = ui.expandpath(dest or 'default-push', dest or 'default')
3645 dest, branches = hg.parseurl(dest, opts.get('branch'))
3647 dest, branches = hg.parseurl(dest, opts.get('branch'))
3646 other = hg.peer(repo, opts, dest)
3648 other = hg.peer(repo, opts, dest)
3647 if 'bookmarks' not in other.listkeys('namespaces'):
3649 if 'bookmarks' not in other.listkeys('namespaces'):
3648 ui.warn(_("remote doesn't support bookmarks\n"))
3650 ui.warn(_("remote doesn't support bookmarks\n"))
3649 return 0
3651 return 0
3650 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
3652 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
3651 ui.pager('outgoing')
3653 ui.pager('outgoing')
3652 return bookmarks.outgoing(ui, repo, other)
3654 return bookmarks.outgoing(ui, repo, other)
3653
3655
3654 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
3656 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
3655 try:
3657 try:
3656 return hg.outgoing(ui, repo, dest, opts)
3658 return hg.outgoing(ui, repo, dest, opts)
3657 finally:
3659 finally:
3658 del repo._subtoppath
3660 del repo._subtoppath
3659
3661
3660 @command('parents',
3662 @command('parents',
3661 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
3663 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
3662 ] + templateopts,
3664 ] + templateopts,
3663 _('[-r REV] [FILE]'),
3665 _('[-r REV] [FILE]'),
3664 inferrepo=True)
3666 inferrepo=True)
3665 def parents(ui, repo, file_=None, **opts):
3667 def parents(ui, repo, file_=None, **opts):
3666 """show the parents of the working directory or revision (DEPRECATED)
3668 """show the parents of the working directory or revision (DEPRECATED)
3667
3669
3668 Print the working directory's parent revisions. If a revision is
3670 Print the working directory's parent revisions. If a revision is
3669 given via -r/--rev, the parent of that revision will be printed.
3671 given via -r/--rev, the parent of that revision will be printed.
3670 If a file argument is given, the revision in which the file was
3672 If a file argument is given, the revision in which the file was
3671 last changed (before the working directory revision or the
3673 last changed (before the working directory revision or the
3672 argument to --rev if given) is printed.
3674 argument to --rev if given) is printed.
3673
3675
3674 This command is equivalent to::
3676 This command is equivalent to::
3675
3677
3676 hg log -r "p1()+p2()" or
3678 hg log -r "p1()+p2()" or
3677 hg log -r "p1(REV)+p2(REV)" or
3679 hg log -r "p1(REV)+p2(REV)" or
3678 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
3680 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
3679 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
3681 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
3680
3682
3681 See :hg:`summary` and :hg:`help revsets` for related information.
3683 See :hg:`summary` and :hg:`help revsets` for related information.
3682
3684
3683 Returns 0 on success.
3685 Returns 0 on success.
3684 """
3686 """
3685
3687
3686 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3688 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3687
3689
3688 if file_:
3690 if file_:
3689 m = scmutil.match(ctx, (file_,), opts)
3691 m = scmutil.match(ctx, (file_,), opts)
3690 if m.anypats() or len(m.files()) != 1:
3692 if m.anypats() or len(m.files()) != 1:
3691 raise error.Abort(_('can only specify an explicit filename'))
3693 raise error.Abort(_('can only specify an explicit filename'))
3692 file_ = m.files()[0]
3694 file_ = m.files()[0]
3693 filenodes = []
3695 filenodes = []
3694 for cp in ctx.parents():
3696 for cp in ctx.parents():
3695 if not cp:
3697 if not cp:
3696 continue
3698 continue
3697 try:
3699 try:
3698 filenodes.append(cp.filenode(file_))
3700 filenodes.append(cp.filenode(file_))
3699 except error.LookupError:
3701 except error.LookupError:
3700 pass
3702 pass
3701 if not filenodes:
3703 if not filenodes:
3702 raise error.Abort(_("'%s' not found in manifest!") % file_)
3704 raise error.Abort(_("'%s' not found in manifest!") % file_)
3703 p = []
3705 p = []
3704 for fn in filenodes:
3706 for fn in filenodes:
3705 fctx = repo.filectx(file_, fileid=fn)
3707 fctx = repo.filectx(file_, fileid=fn)
3706 p.append(fctx.node())
3708 p.append(fctx.node())
3707 else:
3709 else:
3708 p = [cp.node() for cp in ctx.parents()]
3710 p = [cp.node() for cp in ctx.parents()]
3709
3711
3710 displayer = cmdutil.show_changeset(ui, repo, opts)
3712 displayer = cmdutil.show_changeset(ui, repo, opts)
3711 for n in p:
3713 for n in p:
3712 if n != nullid:
3714 if n != nullid:
3713 displayer.show(repo[n])
3715 displayer.show(repo[n])
3714 displayer.close()
3716 displayer.close()
3715
3717
3716 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
3718 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
3717 def paths(ui, repo, search=None, **opts):
3719 def paths(ui, repo, search=None, **opts):
3718 """show aliases for remote repositories
3720 """show aliases for remote repositories
3719
3721
3720 Show definition of symbolic path name NAME. If no name is given,
3722 Show definition of symbolic path name NAME. If no name is given,
3721 show definition of all available names.
3723 show definition of all available names.
3722
3724
3723 Option -q/--quiet suppresses all output when searching for NAME
3725 Option -q/--quiet suppresses all output when searching for NAME
3724 and shows only the path names when listing all definitions.
3726 and shows only the path names when listing all definitions.
3725
3727
3726 Path names are defined in the [paths] section of your
3728 Path names are defined in the [paths] section of your
3727 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
3729 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
3728 repository, ``.hg/hgrc`` is used, too.
3730 repository, ``.hg/hgrc`` is used, too.
3729
3731
3730 The path names ``default`` and ``default-push`` have a special
3732 The path names ``default`` and ``default-push`` have a special
3731 meaning. When performing a push or pull operation, they are used
3733 meaning. When performing a push or pull operation, they are used
3732 as fallbacks if no location is specified on the command-line.
3734 as fallbacks if no location is specified on the command-line.
3733 When ``default-push`` is set, it will be used for push and
3735 When ``default-push`` is set, it will be used for push and
3734 ``default`` will be used for pull; otherwise ``default`` is used
3736 ``default`` will be used for pull; otherwise ``default`` is used
3735 as the fallback for both. When cloning a repository, the clone
3737 as the fallback for both. When cloning a repository, the clone
3736 source is written as ``default`` in ``.hg/hgrc``.
3738 source is written as ``default`` in ``.hg/hgrc``.
3737
3739
3738 .. note::
3740 .. note::
3739
3741
3740 ``default`` and ``default-push`` apply to all inbound (e.g.
3742 ``default`` and ``default-push`` apply to all inbound (e.g.
3741 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
3743 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
3742 and :hg:`bundle`) operations.
3744 and :hg:`bundle`) operations.
3743
3745
3744 See :hg:`help urls` for more information.
3746 See :hg:`help urls` for more information.
3745
3747
3746 Returns 0 on success.
3748 Returns 0 on success.
3747 """
3749 """
3748 ui.pager('paths')
3750 ui.pager('paths')
3749 if search:
3751 if search:
3750 pathitems = [(name, path) for name, path in ui.paths.iteritems()
3752 pathitems = [(name, path) for name, path in ui.paths.iteritems()
3751 if name == search]
3753 if name == search]
3752 else:
3754 else:
3753 pathitems = sorted(ui.paths.iteritems())
3755 pathitems = sorted(ui.paths.iteritems())
3754
3756
3755 fm = ui.formatter('paths', opts)
3757 fm = ui.formatter('paths', opts)
3756 if fm.isplain():
3758 if fm.isplain():
3757 hidepassword = util.hidepassword
3759 hidepassword = util.hidepassword
3758 else:
3760 else:
3759 hidepassword = str
3761 hidepassword = str
3760 if ui.quiet:
3762 if ui.quiet:
3761 namefmt = '%s\n'
3763 namefmt = '%s\n'
3762 else:
3764 else:
3763 namefmt = '%s = '
3765 namefmt = '%s = '
3764 showsubopts = not search and not ui.quiet
3766 showsubopts = not search and not ui.quiet
3765
3767
3766 for name, path in pathitems:
3768 for name, path in pathitems:
3767 fm.startitem()
3769 fm.startitem()
3768 fm.condwrite(not search, 'name', namefmt, name)
3770 fm.condwrite(not search, 'name', namefmt, name)
3769 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
3771 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
3770 for subopt, value in sorted(path.suboptions.items()):
3772 for subopt, value in sorted(path.suboptions.items()):
3771 assert subopt not in ('name', 'url')
3773 assert subopt not in ('name', 'url')
3772 if showsubopts:
3774 if showsubopts:
3773 fm.plain('%s:%s = ' % (name, subopt))
3775 fm.plain('%s:%s = ' % (name, subopt))
3774 fm.condwrite(showsubopts, subopt, '%s\n', value)
3776 fm.condwrite(showsubopts, subopt, '%s\n', value)
3775
3777
3776 fm.end()
3778 fm.end()
3777
3779
3778 if search and not pathitems:
3780 if search and not pathitems:
3779 if not ui.quiet:
3781 if not ui.quiet:
3780 ui.warn(_("not found!\n"))
3782 ui.warn(_("not found!\n"))
3781 return 1
3783 return 1
3782 else:
3784 else:
3783 return 0
3785 return 0
3784
3786
3785 @command('phase',
3787 @command('phase',
3786 [('p', 'public', False, _('set changeset phase to public')),
3788 [('p', 'public', False, _('set changeset phase to public')),
3787 ('d', 'draft', False, _('set changeset phase to draft')),
3789 ('d', 'draft', False, _('set changeset phase to draft')),
3788 ('s', 'secret', False, _('set changeset phase to secret')),
3790 ('s', 'secret', False, _('set changeset phase to secret')),
3789 ('f', 'force', False, _('allow to move boundary backward')),
3791 ('f', 'force', False, _('allow to move boundary backward')),
3790 ('r', 'rev', [], _('target revision'), _('REV')),
3792 ('r', 'rev', [], _('target revision'), _('REV')),
3791 ],
3793 ],
3792 _('[-p|-d|-s] [-f] [-r] [REV...]'))
3794 _('[-p|-d|-s] [-f] [-r] [REV...]'))
3793 def phase(ui, repo, *revs, **opts):
3795 def phase(ui, repo, *revs, **opts):
3794 """set or show the current phase name
3796 """set or show the current phase name
3795
3797
3796 With no argument, show the phase name of the current revision(s).
3798 With no argument, show the phase name of the current revision(s).
3797
3799
3798 With one of -p/--public, -d/--draft or -s/--secret, change the
3800 With one of -p/--public, -d/--draft or -s/--secret, change the
3799 phase value of the specified revisions.
3801 phase value of the specified revisions.
3800
3802
3801 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
3803 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
3802 lower phase to an higher phase. Phases are ordered as follows::
3804 lower phase to an higher phase. Phases are ordered as follows::
3803
3805
3804 public < draft < secret
3806 public < draft < secret
3805
3807
3806 Returns 0 on success, 1 if some phases could not be changed.
3808 Returns 0 on success, 1 if some phases could not be changed.
3807
3809
3808 (For more information about the phases concept, see :hg:`help phases`.)
3810 (For more information about the phases concept, see :hg:`help phases`.)
3809 """
3811 """
3810 # search for a unique phase argument
3812 # search for a unique phase argument
3811 targetphase = None
3813 targetphase = None
3812 for idx, name in enumerate(phases.phasenames):
3814 for idx, name in enumerate(phases.phasenames):
3813 if opts[name]:
3815 if opts[name]:
3814 if targetphase is not None:
3816 if targetphase is not None:
3815 raise error.Abort(_('only one phase can be specified'))
3817 raise error.Abort(_('only one phase can be specified'))
3816 targetphase = idx
3818 targetphase = idx
3817
3819
3818 # look for specified revision
3820 # look for specified revision
3819 revs = list(revs)
3821 revs = list(revs)
3820 revs.extend(opts['rev'])
3822 revs.extend(opts['rev'])
3821 if not revs:
3823 if not revs:
3822 # display both parents as the second parent phase can influence
3824 # display both parents as the second parent phase can influence
3823 # the phase of a merge commit
3825 # the phase of a merge commit
3824 revs = [c.rev() for c in repo[None].parents()]
3826 revs = [c.rev() for c in repo[None].parents()]
3825
3827
3826 revs = scmutil.revrange(repo, revs)
3828 revs = scmutil.revrange(repo, revs)
3827
3829
3828 lock = None
3830 lock = None
3829 ret = 0
3831 ret = 0
3830 if targetphase is None:
3832 if targetphase is None:
3831 # display
3833 # display
3832 for r in revs:
3834 for r in revs:
3833 ctx = repo[r]
3835 ctx = repo[r]
3834 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
3836 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
3835 else:
3837 else:
3836 tr = None
3838 tr = None
3837 lock = repo.lock()
3839 lock = repo.lock()
3838 try:
3840 try:
3839 tr = repo.transaction("phase")
3841 tr = repo.transaction("phase")
3840 # set phase
3842 # set phase
3841 if not revs:
3843 if not revs:
3842 raise error.Abort(_('empty revision set'))
3844 raise error.Abort(_('empty revision set'))
3843 nodes = [repo[r].node() for r in revs]
3845 nodes = [repo[r].node() for r in revs]
3844 # moving revision from public to draft may hide them
3846 # moving revision from public to draft may hide them
3845 # We have to check result on an unfiltered repository
3847 # We have to check result on an unfiltered repository
3846 unfi = repo.unfiltered()
3848 unfi = repo.unfiltered()
3847 getphase = unfi._phasecache.phase
3849 getphase = unfi._phasecache.phase
3848 olddata = [getphase(unfi, r) for r in unfi]
3850 olddata = [getphase(unfi, r) for r in unfi]
3849 phases.advanceboundary(repo, tr, targetphase, nodes)
3851 phases.advanceboundary(repo, tr, targetphase, nodes)
3850 if opts['force']:
3852 if opts['force']:
3851 phases.retractboundary(repo, tr, targetphase, nodes)
3853 phases.retractboundary(repo, tr, targetphase, nodes)
3852 tr.close()
3854 tr.close()
3853 finally:
3855 finally:
3854 if tr is not None:
3856 if tr is not None:
3855 tr.release()
3857 tr.release()
3856 lock.release()
3858 lock.release()
3857 getphase = unfi._phasecache.phase
3859 getphase = unfi._phasecache.phase
3858 newdata = [getphase(unfi, r) for r in unfi]
3860 newdata = [getphase(unfi, r) for r in unfi]
3859 changes = sum(newdata[r] != olddata[r] for r in unfi)
3861 changes = sum(newdata[r] != olddata[r] for r in unfi)
3860 cl = unfi.changelog
3862 cl = unfi.changelog
3861 rejected = [n for n in nodes
3863 rejected = [n for n in nodes
3862 if newdata[cl.rev(n)] < targetphase]
3864 if newdata[cl.rev(n)] < targetphase]
3863 if rejected:
3865 if rejected:
3864 ui.warn(_('cannot move %i changesets to a higher '
3866 ui.warn(_('cannot move %i changesets to a higher '
3865 'phase, use --force\n') % len(rejected))
3867 'phase, use --force\n') % len(rejected))
3866 ret = 1
3868 ret = 1
3867 if changes:
3869 if changes:
3868 msg = _('phase changed for %i changesets\n') % changes
3870 msg = _('phase changed for %i changesets\n') % changes
3869 if ret:
3871 if ret:
3870 ui.status(msg)
3872 ui.status(msg)
3871 else:
3873 else:
3872 ui.note(msg)
3874 ui.note(msg)
3873 else:
3875 else:
3874 ui.warn(_('no phases changed\n'))
3876 ui.warn(_('no phases changed\n'))
3875 return ret
3877 return ret
3876
3878
3877 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
3879 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
3878 """Run after a changegroup has been added via pull/unbundle
3880 """Run after a changegroup has been added via pull/unbundle
3879
3881
3880 This takes arguments below:
3882 This takes arguments below:
3881
3883
3882 :modheads: change of heads by pull/unbundle
3884 :modheads: change of heads by pull/unbundle
3883 :optupdate: updating working directory is needed or not
3885 :optupdate: updating working directory is needed or not
3884 :checkout: update destination revision (or None to default destination)
3886 :checkout: update destination revision (or None to default destination)
3885 :brev: a name, which might be a bookmark to be activated after updating
3887 :brev: a name, which might be a bookmark to be activated after updating
3886 """
3888 """
3887 if modheads == 0:
3889 if modheads == 0:
3888 return
3890 return
3889 if optupdate:
3891 if optupdate:
3890 try:
3892 try:
3891 return hg.updatetotally(ui, repo, checkout, brev)
3893 return hg.updatetotally(ui, repo, checkout, brev)
3892 except error.UpdateAbort as inst:
3894 except error.UpdateAbort as inst:
3893 msg = _("not updating: %s") % str(inst)
3895 msg = _("not updating: %s") % str(inst)
3894 hint = inst.hint
3896 hint = inst.hint
3895 raise error.UpdateAbort(msg, hint=hint)
3897 raise error.UpdateAbort(msg, hint=hint)
3896 if modheads > 1:
3898 if modheads > 1:
3897 currentbranchheads = len(repo.branchheads())
3899 currentbranchheads = len(repo.branchheads())
3898 if currentbranchheads == modheads:
3900 if currentbranchheads == modheads:
3899 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
3901 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
3900 elif currentbranchheads > 1:
3902 elif currentbranchheads > 1:
3901 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
3903 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
3902 "merge)\n"))
3904 "merge)\n"))
3903 else:
3905 else:
3904 ui.status(_("(run 'hg heads' to see heads)\n"))
3906 ui.status(_("(run 'hg heads' to see heads)\n"))
3905 else:
3907 else:
3906 ui.status(_("(run 'hg update' to get a working copy)\n"))
3908 ui.status(_("(run 'hg update' to get a working copy)\n"))
3907
3909
3908 @command('^pull',
3910 @command('^pull',
3909 [('u', 'update', None,
3911 [('u', 'update', None,
3910 _('update to new branch head if changesets were pulled')),
3912 _('update to new branch head if changesets were pulled')),
3911 ('f', 'force', None, _('run even when remote repository is unrelated')),
3913 ('f', 'force', None, _('run even when remote repository is unrelated')),
3912 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3914 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3913 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
3915 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
3914 ('b', 'branch', [], _('a specific branch you would like to pull'),
3916 ('b', 'branch', [], _('a specific branch you would like to pull'),
3915 _('BRANCH')),
3917 _('BRANCH')),
3916 ] + remoteopts,
3918 ] + remoteopts,
3917 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
3919 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
3918 def pull(ui, repo, source="default", **opts):
3920 def pull(ui, repo, source="default", **opts):
3919 """pull changes from the specified source
3921 """pull changes from the specified source
3920
3922
3921 Pull changes from a remote repository to a local one.
3923 Pull changes from a remote repository to a local one.
3922
3924
3923 This finds all changes from the repository at the specified path
3925 This finds all changes from the repository at the specified path
3924 or URL and adds them to a local repository (the current one unless
3926 or URL and adds them to a local repository (the current one unless
3925 -R is specified). By default, this does not update the copy of the
3927 -R is specified). By default, this does not update the copy of the
3926 project in the working directory.
3928 project in the working directory.
3927
3929
3928 Use :hg:`incoming` if you want to see what would have been added
3930 Use :hg:`incoming` if you want to see what would have been added
3929 by a pull at the time you issued this command. If you then decide
3931 by a pull at the time you issued this command. If you then decide
3930 to add those changes to the repository, you should use :hg:`pull
3932 to add those changes to the repository, you should use :hg:`pull
3931 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
3933 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
3932
3934
3933 If SOURCE is omitted, the 'default' path will be used.
3935 If SOURCE is omitted, the 'default' path will be used.
3934 See :hg:`help urls` for more information.
3936 See :hg:`help urls` for more information.
3935
3937
3936 Specifying bookmark as ``.`` is equivalent to specifying the active
3938 Specifying bookmark as ``.`` is equivalent to specifying the active
3937 bookmark's name.
3939 bookmark's name.
3938
3940
3939 Returns 0 on success, 1 if an update had unresolved files.
3941 Returns 0 on success, 1 if an update had unresolved files.
3940 """
3942 """
3941
3943
3942 if ui.configbool('commands', 'update.requiredest') and opts.get('update'):
3944 if ui.configbool('commands', 'update.requiredest') and opts.get('update'):
3943 msg = _('update destination required by configuration')
3945 msg = _('update destination required by configuration')
3944 hint = _('use hg pull followed by hg update DEST')
3946 hint = _('use hg pull followed by hg update DEST')
3945 raise error.Abort(msg, hint=hint)
3947 raise error.Abort(msg, hint=hint)
3946
3948
3947 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
3949 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
3948 ui.status(_('pulling from %s\n') % util.hidepassword(source))
3950 ui.status(_('pulling from %s\n') % util.hidepassword(source))
3949 other = hg.peer(repo, opts, source)
3951 other = hg.peer(repo, opts, source)
3950 try:
3952 try:
3951 revs, checkout = hg.addbranchrevs(repo, other, branches,
3953 revs, checkout = hg.addbranchrevs(repo, other, branches,
3952 opts.get('rev'))
3954 opts.get('rev'))
3953
3955
3954
3956
3955 pullopargs = {}
3957 pullopargs = {}
3956 if opts.get('bookmark'):
3958 if opts.get('bookmark'):
3957 if not revs:
3959 if not revs:
3958 revs = []
3960 revs = []
3959 # The list of bookmark used here is not the one used to actually
3961 # The list of bookmark used here is not the one used to actually
3960 # update the bookmark name. This can result in the revision pulled
3962 # update the bookmark name. This can result in the revision pulled
3961 # not ending up with the name of the bookmark because of a race
3963 # not ending up with the name of the bookmark because of a race
3962 # condition on the server. (See issue 4689 for details)
3964 # condition on the server. (See issue 4689 for details)
3963 remotebookmarks = other.listkeys('bookmarks')
3965 remotebookmarks = other.listkeys('bookmarks')
3964 pullopargs['remotebookmarks'] = remotebookmarks
3966 pullopargs['remotebookmarks'] = remotebookmarks
3965 for b in opts['bookmark']:
3967 for b in opts['bookmark']:
3966 b = repo._bookmarks.expandname(b)
3968 b = repo._bookmarks.expandname(b)
3967 if b not in remotebookmarks:
3969 if b not in remotebookmarks:
3968 raise error.Abort(_('remote bookmark %s not found!') % b)
3970 raise error.Abort(_('remote bookmark %s not found!') % b)
3969 revs.append(remotebookmarks[b])
3971 revs.append(remotebookmarks[b])
3970
3972
3971 if revs:
3973 if revs:
3972 try:
3974 try:
3973 # When 'rev' is a bookmark name, we cannot guarantee that it
3975 # When 'rev' is a bookmark name, we cannot guarantee that it
3974 # will be updated with that name because of a race condition
3976 # will be updated with that name because of a race condition
3975 # server side. (See issue 4689 for details)
3977 # server side. (See issue 4689 for details)
3976 oldrevs = revs
3978 oldrevs = revs
3977 revs = [] # actually, nodes
3979 revs = [] # actually, nodes
3978 for r in oldrevs:
3980 for r in oldrevs:
3979 node = other.lookup(r)
3981 node = other.lookup(r)
3980 revs.append(node)
3982 revs.append(node)
3981 if r == checkout:
3983 if r == checkout:
3982 checkout = node
3984 checkout = node
3983 except error.CapabilityError:
3985 except error.CapabilityError:
3984 err = _("other repository doesn't support revision lookup, "
3986 err = _("other repository doesn't support revision lookup, "
3985 "so a rev cannot be specified.")
3987 "so a rev cannot be specified.")
3986 raise error.Abort(err)
3988 raise error.Abort(err)
3987
3989
3988 pullopargs.update(opts.get('opargs', {}))
3990 pullopargs.update(opts.get('opargs', {}))
3989 modheads = exchange.pull(repo, other, heads=revs,
3991 modheads = exchange.pull(repo, other, heads=revs,
3990 force=opts.get('force'),
3992 force=opts.get('force'),
3991 bookmarks=opts.get('bookmark', ()),
3993 bookmarks=opts.get('bookmark', ()),
3992 opargs=pullopargs).cgresult
3994 opargs=pullopargs).cgresult
3993
3995
3994 # brev is a name, which might be a bookmark to be activated at
3996 # brev is a name, which might be a bookmark to be activated at
3995 # the end of the update. In other words, it is an explicit
3997 # the end of the update. In other words, it is an explicit
3996 # destination of the update
3998 # destination of the update
3997 brev = None
3999 brev = None
3998
4000
3999 if checkout:
4001 if checkout:
4000 checkout = str(repo.changelog.rev(checkout))
4002 checkout = str(repo.changelog.rev(checkout))
4001
4003
4002 # order below depends on implementation of
4004 # order below depends on implementation of
4003 # hg.addbranchrevs(). opts['bookmark'] is ignored,
4005 # hg.addbranchrevs(). opts['bookmark'] is ignored,
4004 # because 'checkout' is determined without it.
4006 # because 'checkout' is determined without it.
4005 if opts.get('rev'):
4007 if opts.get('rev'):
4006 brev = opts['rev'][0]
4008 brev = opts['rev'][0]
4007 elif opts.get('branch'):
4009 elif opts.get('branch'):
4008 brev = opts['branch'][0]
4010 brev = opts['branch'][0]
4009 else:
4011 else:
4010 brev = branches[0]
4012 brev = branches[0]
4011 repo._subtoppath = source
4013 repo._subtoppath = source
4012 try:
4014 try:
4013 ret = postincoming(ui, repo, modheads, opts.get('update'),
4015 ret = postincoming(ui, repo, modheads, opts.get('update'),
4014 checkout, brev)
4016 checkout, brev)
4015
4017
4016 finally:
4018 finally:
4017 del repo._subtoppath
4019 del repo._subtoppath
4018
4020
4019 finally:
4021 finally:
4020 other.close()
4022 other.close()
4021 return ret
4023 return ret
4022
4024
4023 @command('^push',
4025 @command('^push',
4024 [('f', 'force', None, _('force push')),
4026 [('f', 'force', None, _('force push')),
4025 ('r', 'rev', [],
4027 ('r', 'rev', [],
4026 _('a changeset intended to be included in the destination'),
4028 _('a changeset intended to be included in the destination'),
4027 _('REV')),
4029 _('REV')),
4028 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4030 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4029 ('b', 'branch', [],
4031 ('b', 'branch', [],
4030 _('a specific branch you would like to push'), _('BRANCH')),
4032 _('a specific branch you would like to push'), _('BRANCH')),
4031 ('', 'new-branch', False, _('allow pushing a new branch')),
4033 ('', 'new-branch', False, _('allow pushing a new branch')),
4032 ] + remoteopts,
4034 ] + remoteopts,
4033 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4035 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4034 def push(ui, repo, dest=None, **opts):
4036 def push(ui, repo, dest=None, **opts):
4035 """push changes to the specified destination
4037 """push changes to the specified destination
4036
4038
4037 Push changesets from the local repository to the specified
4039 Push changesets from the local repository to the specified
4038 destination.
4040 destination.
4039
4041
4040 This operation is symmetrical to pull: it is identical to a pull
4042 This operation is symmetrical to pull: it is identical to a pull
4041 in the destination repository from the current one.
4043 in the destination repository from the current one.
4042
4044
4043 By default, push will not allow creation of new heads at the
4045 By default, push will not allow creation of new heads at the
4044 destination, since multiple heads would make it unclear which head
4046 destination, since multiple heads would make it unclear which head
4045 to use. In this situation, it is recommended to pull and merge
4047 to use. In this situation, it is recommended to pull and merge
4046 before pushing.
4048 before pushing.
4047
4049
4048 Use --new-branch if you want to allow push to create a new named
4050 Use --new-branch if you want to allow push to create a new named
4049 branch that is not present at the destination. This allows you to
4051 branch that is not present at the destination. This allows you to
4050 only create a new branch without forcing other changes.
4052 only create a new branch without forcing other changes.
4051
4053
4052 .. note::
4054 .. note::
4053
4055
4054 Extra care should be taken with the -f/--force option,
4056 Extra care should be taken with the -f/--force option,
4055 which will push all new heads on all branches, an action which will
4057 which will push all new heads on all branches, an action which will
4056 almost always cause confusion for collaborators.
4058 almost always cause confusion for collaborators.
4057
4059
4058 If -r/--rev is used, the specified revision and all its ancestors
4060 If -r/--rev is used, the specified revision and all its ancestors
4059 will be pushed to the remote repository.
4061 will be pushed to the remote repository.
4060
4062
4061 If -B/--bookmark is used, the specified bookmarked revision, its
4063 If -B/--bookmark is used, the specified bookmarked revision, its
4062 ancestors, and the bookmark will be pushed to the remote
4064 ancestors, and the bookmark will be pushed to the remote
4063 repository. Specifying ``.`` is equivalent to specifying the active
4065 repository. Specifying ``.`` is equivalent to specifying the active
4064 bookmark's name.
4066 bookmark's name.
4065
4067
4066 Please see :hg:`help urls` for important details about ``ssh://``
4068 Please see :hg:`help urls` for important details about ``ssh://``
4067 URLs. If DESTINATION is omitted, a default path will be used.
4069 URLs. If DESTINATION is omitted, a default path will be used.
4068
4070
4069 Returns 0 if push was successful, 1 if nothing to push.
4071 Returns 0 if push was successful, 1 if nothing to push.
4070 """
4072 """
4071
4073
4072 if opts.get('bookmark'):
4074 if opts.get('bookmark'):
4073 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4075 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4074 for b in opts['bookmark']:
4076 for b in opts['bookmark']:
4075 # translate -B options to -r so changesets get pushed
4077 # translate -B options to -r so changesets get pushed
4076 b = repo._bookmarks.expandname(b)
4078 b = repo._bookmarks.expandname(b)
4077 if b in repo._bookmarks:
4079 if b in repo._bookmarks:
4078 opts.setdefault('rev', []).append(b)
4080 opts.setdefault('rev', []).append(b)
4079 else:
4081 else:
4080 # if we try to push a deleted bookmark, translate it to null
4082 # if we try to push a deleted bookmark, translate it to null
4081 # this lets simultaneous -r, -b options continue working
4083 # this lets simultaneous -r, -b options continue working
4082 opts.setdefault('rev', []).append("null")
4084 opts.setdefault('rev', []).append("null")
4083
4085
4084 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4086 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4085 if not path:
4087 if not path:
4086 raise error.Abort(_('default repository not configured!'),
4088 raise error.Abort(_('default repository not configured!'),
4087 hint=_("see 'hg help config.paths'"))
4089 hint=_("see 'hg help config.paths'"))
4088 dest = path.pushloc or path.loc
4090 dest = path.pushloc or path.loc
4089 branches = (path.branch, opts.get('branch') or [])
4091 branches = (path.branch, opts.get('branch') or [])
4090 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4092 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4091 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4093 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4092 other = hg.peer(repo, opts, dest)
4094 other = hg.peer(repo, opts, dest)
4093
4095
4094 if revs:
4096 if revs:
4095 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
4097 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
4096 if not revs:
4098 if not revs:
4097 raise error.Abort(_("specified revisions evaluate to an empty set"),
4099 raise error.Abort(_("specified revisions evaluate to an empty set"),
4098 hint=_("use different revision arguments"))
4100 hint=_("use different revision arguments"))
4099 elif path.pushrev:
4101 elif path.pushrev:
4100 # It doesn't make any sense to specify ancestor revisions. So limit
4102 # It doesn't make any sense to specify ancestor revisions. So limit
4101 # to DAG heads to make discovery simpler.
4103 # to DAG heads to make discovery simpler.
4102 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4104 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4103 revs = scmutil.revrange(repo, [expr])
4105 revs = scmutil.revrange(repo, [expr])
4104 revs = [repo[rev].node() for rev in revs]
4106 revs = [repo[rev].node() for rev in revs]
4105 if not revs:
4107 if not revs:
4106 raise error.Abort(_('default push revset for path evaluates to an '
4108 raise error.Abort(_('default push revset for path evaluates to an '
4107 'empty set'))
4109 'empty set'))
4108
4110
4109 repo._subtoppath = dest
4111 repo._subtoppath = dest
4110 try:
4112 try:
4111 # push subrepos depth-first for coherent ordering
4113 # push subrepos depth-first for coherent ordering
4112 c = repo['']
4114 c = repo['']
4113 subs = c.substate # only repos that are committed
4115 subs = c.substate # only repos that are committed
4114 for s in sorted(subs):
4116 for s in sorted(subs):
4115 result = c.sub(s).push(opts)
4117 result = c.sub(s).push(opts)
4116 if result == 0:
4118 if result == 0:
4117 return not result
4119 return not result
4118 finally:
4120 finally:
4119 del repo._subtoppath
4121 del repo._subtoppath
4120 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4122 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4121 newbranch=opts.get('new_branch'),
4123 newbranch=opts.get('new_branch'),
4122 bookmarks=opts.get('bookmark', ()),
4124 bookmarks=opts.get('bookmark', ()),
4123 opargs=opts.get('opargs'))
4125 opargs=opts.get('opargs'))
4124
4126
4125 result = not pushop.cgresult
4127 result = not pushop.cgresult
4126
4128
4127 if pushop.bkresult is not None:
4129 if pushop.bkresult is not None:
4128 if pushop.bkresult == 2:
4130 if pushop.bkresult == 2:
4129 result = 2
4131 result = 2
4130 elif not result and pushop.bkresult:
4132 elif not result and pushop.bkresult:
4131 result = 2
4133 result = 2
4132
4134
4133 return result
4135 return result
4134
4136
4135 @command('recover', [])
4137 @command('recover', [])
4136 def recover(ui, repo):
4138 def recover(ui, repo):
4137 """roll back an interrupted transaction
4139 """roll back an interrupted transaction
4138
4140
4139 Recover from an interrupted commit or pull.
4141 Recover from an interrupted commit or pull.
4140
4142
4141 This command tries to fix the repository status after an
4143 This command tries to fix the repository status after an
4142 interrupted operation. It should only be necessary when Mercurial
4144 interrupted operation. It should only be necessary when Mercurial
4143 suggests it.
4145 suggests it.
4144
4146
4145 Returns 0 if successful, 1 if nothing to recover or verify fails.
4147 Returns 0 if successful, 1 if nothing to recover or verify fails.
4146 """
4148 """
4147 if repo.recover():
4149 if repo.recover():
4148 return hg.verify(repo)
4150 return hg.verify(repo)
4149 return 1
4151 return 1
4150
4152
4151 @command('^remove|rm',
4153 @command('^remove|rm',
4152 [('A', 'after', None, _('record delete for missing files')),
4154 [('A', 'after', None, _('record delete for missing files')),
4153 ('f', 'force', None,
4155 ('f', 'force', None,
4154 _('forget added files, delete modified files')),
4156 _('forget added files, delete modified files')),
4155 ] + subrepoopts + walkopts,
4157 ] + subrepoopts + walkopts,
4156 _('[OPTION]... FILE...'),
4158 _('[OPTION]... FILE...'),
4157 inferrepo=True)
4159 inferrepo=True)
4158 def remove(ui, repo, *pats, **opts):
4160 def remove(ui, repo, *pats, **opts):
4159 """remove the specified files on the next commit
4161 """remove the specified files on the next commit
4160
4162
4161 Schedule the indicated files for removal from the current branch.
4163 Schedule the indicated files for removal from the current branch.
4162
4164
4163 This command schedules the files to be removed at the next commit.
4165 This command schedules the files to be removed at the next commit.
4164 To undo a remove before that, see :hg:`revert`. To undo added
4166 To undo a remove before that, see :hg:`revert`. To undo added
4165 files, see :hg:`forget`.
4167 files, see :hg:`forget`.
4166
4168
4167 .. container:: verbose
4169 .. container:: verbose
4168
4170
4169 -A/--after can be used to remove only files that have already
4171 -A/--after can be used to remove only files that have already
4170 been deleted, -f/--force can be used to force deletion, and -Af
4172 been deleted, -f/--force can be used to force deletion, and -Af
4171 can be used to remove files from the next revision without
4173 can be used to remove files from the next revision without
4172 deleting them from the working directory.
4174 deleting them from the working directory.
4173
4175
4174 The following table details the behavior of remove for different
4176 The following table details the behavior of remove for different
4175 file states (columns) and option combinations (rows). The file
4177 file states (columns) and option combinations (rows). The file
4176 states are Added [A], Clean [C], Modified [M] and Missing [!]
4178 states are Added [A], Clean [C], Modified [M] and Missing [!]
4177 (as reported by :hg:`status`). The actions are Warn, Remove
4179 (as reported by :hg:`status`). The actions are Warn, Remove
4178 (from branch) and Delete (from disk):
4180 (from branch) and Delete (from disk):
4179
4181
4180 ========= == == == ==
4182 ========= == == == ==
4181 opt/state A C M !
4183 opt/state A C M !
4182 ========= == == == ==
4184 ========= == == == ==
4183 none W RD W R
4185 none W RD W R
4184 -f R RD RD R
4186 -f R RD RD R
4185 -A W W W R
4187 -A W W W R
4186 -Af R R R R
4188 -Af R R R R
4187 ========= == == == ==
4189 ========= == == == ==
4188
4190
4189 .. note::
4191 .. note::
4190
4192
4191 :hg:`remove` never deletes files in Added [A] state from the
4193 :hg:`remove` never deletes files in Added [A] state from the
4192 working directory, not even if ``--force`` is specified.
4194 working directory, not even if ``--force`` is specified.
4193
4195
4194 Returns 0 on success, 1 if any warnings encountered.
4196 Returns 0 on success, 1 if any warnings encountered.
4195 """
4197 """
4196
4198
4197 after, force = opts.get('after'), opts.get('force')
4199 after, force = opts.get('after'), opts.get('force')
4198 if not pats and not after:
4200 if not pats and not after:
4199 raise error.Abort(_('no files specified'))
4201 raise error.Abort(_('no files specified'))
4200
4202
4201 m = scmutil.match(repo[None], pats, opts)
4203 m = scmutil.match(repo[None], pats, opts)
4202 subrepos = opts.get('subrepos')
4204 subrepos = opts.get('subrepos')
4203 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
4205 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
4204
4206
4205 @command('rename|move|mv',
4207 @command('rename|move|mv',
4206 [('A', 'after', None, _('record a rename that has already occurred')),
4208 [('A', 'after', None, _('record a rename that has already occurred')),
4207 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4209 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4208 ] + walkopts + dryrunopts,
4210 ] + walkopts + dryrunopts,
4209 _('[OPTION]... SOURCE... DEST'))
4211 _('[OPTION]... SOURCE... DEST'))
4210 def rename(ui, repo, *pats, **opts):
4212 def rename(ui, repo, *pats, **opts):
4211 """rename files; equivalent of copy + remove
4213 """rename files; equivalent of copy + remove
4212
4214
4213 Mark dest as copies of sources; mark sources for deletion. If dest
4215 Mark dest as copies of sources; mark sources for deletion. If dest
4214 is a directory, copies are put in that directory. If dest is a
4216 is a directory, copies are put in that directory. If dest is a
4215 file, there can only be one source.
4217 file, there can only be one source.
4216
4218
4217 By default, this command copies the contents of files as they
4219 By default, this command copies the contents of files as they
4218 exist in the working directory. If invoked with -A/--after, the
4220 exist in the working directory. If invoked with -A/--after, the
4219 operation is recorded, but no copying is performed.
4221 operation is recorded, but no copying is performed.
4220
4222
4221 This command takes effect at the next commit. To undo a rename
4223 This command takes effect at the next commit. To undo a rename
4222 before that, see :hg:`revert`.
4224 before that, see :hg:`revert`.
4223
4225
4224 Returns 0 on success, 1 if errors are encountered.
4226 Returns 0 on success, 1 if errors are encountered.
4225 """
4227 """
4226 with repo.wlock(False):
4228 with repo.wlock(False):
4227 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4229 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4228
4230
4229 @command('resolve',
4231 @command('resolve',
4230 [('a', 'all', None, _('select all unresolved files')),
4232 [('a', 'all', None, _('select all unresolved files')),
4231 ('l', 'list', None, _('list state of files needing merge')),
4233 ('l', 'list', None, _('list state of files needing merge')),
4232 ('m', 'mark', None, _('mark files as resolved')),
4234 ('m', 'mark', None, _('mark files as resolved')),
4233 ('u', 'unmark', None, _('mark files as unresolved')),
4235 ('u', 'unmark', None, _('mark files as unresolved')),
4234 ('n', 'no-status', None, _('hide status prefix'))]
4236 ('n', 'no-status', None, _('hide status prefix'))]
4235 + mergetoolopts + walkopts + formatteropts,
4237 + mergetoolopts + walkopts + formatteropts,
4236 _('[OPTION]... [FILE]...'),
4238 _('[OPTION]... [FILE]...'),
4237 inferrepo=True)
4239 inferrepo=True)
4238 def resolve(ui, repo, *pats, **opts):
4240 def resolve(ui, repo, *pats, **opts):
4239 """redo merges or set/view the merge status of files
4241 """redo merges or set/view the merge status of files
4240
4242
4241 Merges with unresolved conflicts are often the result of
4243 Merges with unresolved conflicts are often the result of
4242 non-interactive merging using the ``internal:merge`` configuration
4244 non-interactive merging using the ``internal:merge`` configuration
4243 setting, or a command-line merge tool like ``diff3``. The resolve
4245 setting, or a command-line merge tool like ``diff3``. The resolve
4244 command is used to manage the files involved in a merge, after
4246 command is used to manage the files involved in a merge, after
4245 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4247 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4246 working directory must have two parents). See :hg:`help
4248 working directory must have two parents). See :hg:`help
4247 merge-tools` for information on configuring merge tools.
4249 merge-tools` for information on configuring merge tools.
4248
4250
4249 The resolve command can be used in the following ways:
4251 The resolve command can be used in the following ways:
4250
4252
4251 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4253 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4252 files, discarding any previous merge attempts. Re-merging is not
4254 files, discarding any previous merge attempts. Re-merging is not
4253 performed for files already marked as resolved. Use ``--all/-a``
4255 performed for files already marked as resolved. Use ``--all/-a``
4254 to select all unresolved files. ``--tool`` can be used to specify
4256 to select all unresolved files. ``--tool`` can be used to specify
4255 the merge tool used for the given files. It overrides the HGMERGE
4257 the merge tool used for the given files. It overrides the HGMERGE
4256 environment variable and your configuration files. Previous file
4258 environment variable and your configuration files. Previous file
4257 contents are saved with a ``.orig`` suffix.
4259 contents are saved with a ``.orig`` suffix.
4258
4260
4259 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4261 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4260 (e.g. after having manually fixed-up the files). The default is
4262 (e.g. after having manually fixed-up the files). The default is
4261 to mark all unresolved files.
4263 to mark all unresolved files.
4262
4264
4263 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4265 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4264 default is to mark all resolved files.
4266 default is to mark all resolved files.
4265
4267
4266 - :hg:`resolve -l`: list files which had or still have conflicts.
4268 - :hg:`resolve -l`: list files which had or still have conflicts.
4267 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4269 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4268 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4270 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4269 the list. See :hg:`help filesets` for details.
4271 the list. See :hg:`help filesets` for details.
4270
4272
4271 .. note::
4273 .. note::
4272
4274
4273 Mercurial will not let you commit files with unresolved merge
4275 Mercurial will not let you commit files with unresolved merge
4274 conflicts. You must use :hg:`resolve -m ...` before you can
4276 conflicts. You must use :hg:`resolve -m ...` before you can
4275 commit after a conflicting merge.
4277 commit after a conflicting merge.
4276
4278
4277 Returns 0 on success, 1 if any files fail a resolve attempt.
4279 Returns 0 on success, 1 if any files fail a resolve attempt.
4278 """
4280 """
4279
4281
4280 flaglist = 'all mark unmark list no_status'.split()
4282 flaglist = 'all mark unmark list no_status'.split()
4281 all, mark, unmark, show, nostatus = \
4283 all, mark, unmark, show, nostatus = \
4282 [opts.get(o) for o in flaglist]
4284 [opts.get(o) for o in flaglist]
4283
4285
4284 if (show and (mark or unmark)) or (mark and unmark):
4286 if (show and (mark or unmark)) or (mark and unmark):
4285 raise error.Abort(_("too many options specified"))
4287 raise error.Abort(_("too many options specified"))
4286 if pats and all:
4288 if pats and all:
4287 raise error.Abort(_("can't specify --all and patterns"))
4289 raise error.Abort(_("can't specify --all and patterns"))
4288 if not (all or pats or show or mark or unmark):
4290 if not (all or pats or show or mark or unmark):
4289 raise error.Abort(_('no files or directories specified'),
4291 raise error.Abort(_('no files or directories specified'),
4290 hint=('use --all to re-merge all unresolved files'))
4292 hint=('use --all to re-merge all unresolved files'))
4291
4293
4292 if show:
4294 if show:
4293 ui.pager('resolve')
4295 ui.pager('resolve')
4294 fm = ui.formatter('resolve', opts)
4296 fm = ui.formatter('resolve', opts)
4295 ms = mergemod.mergestate.read(repo)
4297 ms = mergemod.mergestate.read(repo)
4296 m = scmutil.match(repo[None], pats, opts)
4298 m = scmutil.match(repo[None], pats, opts)
4297 for f in ms:
4299 for f in ms:
4298 if not m(f):
4300 if not m(f):
4299 continue
4301 continue
4300 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
4302 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
4301 'd': 'driverresolved'}[ms[f]]
4303 'd': 'driverresolved'}[ms[f]]
4302 fm.startitem()
4304 fm.startitem()
4303 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
4305 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
4304 fm.write('path', '%s\n', f, label=l)
4306 fm.write('path', '%s\n', f, label=l)
4305 fm.end()
4307 fm.end()
4306 return 0
4308 return 0
4307
4309
4308 with repo.wlock():
4310 with repo.wlock():
4309 ms = mergemod.mergestate.read(repo)
4311 ms = mergemod.mergestate.read(repo)
4310
4312
4311 if not (ms.active() or repo.dirstate.p2() != nullid):
4313 if not (ms.active() or repo.dirstate.p2() != nullid):
4312 raise error.Abort(
4314 raise error.Abort(
4313 _('resolve command not applicable when not merging'))
4315 _('resolve command not applicable when not merging'))
4314
4316
4315 wctx = repo[None]
4317 wctx = repo[None]
4316
4318
4317 if ms.mergedriver and ms.mdstate() == 'u':
4319 if ms.mergedriver and ms.mdstate() == 'u':
4318 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4320 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4319 ms.commit()
4321 ms.commit()
4320 # allow mark and unmark to go through
4322 # allow mark and unmark to go through
4321 if not mark and not unmark and not proceed:
4323 if not mark and not unmark and not proceed:
4322 return 1
4324 return 1
4323
4325
4324 m = scmutil.match(wctx, pats, opts)
4326 m = scmutil.match(wctx, pats, opts)
4325 ret = 0
4327 ret = 0
4326 didwork = False
4328 didwork = False
4327 runconclude = False
4329 runconclude = False
4328
4330
4329 tocomplete = []
4331 tocomplete = []
4330 for f in ms:
4332 for f in ms:
4331 if not m(f):
4333 if not m(f):
4332 continue
4334 continue
4333
4335
4334 didwork = True
4336 didwork = True
4335
4337
4336 # don't let driver-resolved files be marked, and run the conclude
4338 # don't let driver-resolved files be marked, and run the conclude
4337 # step if asked to resolve
4339 # step if asked to resolve
4338 if ms[f] == "d":
4340 if ms[f] == "d":
4339 exact = m.exact(f)
4341 exact = m.exact(f)
4340 if mark:
4342 if mark:
4341 if exact:
4343 if exact:
4342 ui.warn(_('not marking %s as it is driver-resolved\n')
4344 ui.warn(_('not marking %s as it is driver-resolved\n')
4343 % f)
4345 % f)
4344 elif unmark:
4346 elif unmark:
4345 if exact:
4347 if exact:
4346 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4348 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4347 % f)
4349 % f)
4348 else:
4350 else:
4349 runconclude = True
4351 runconclude = True
4350 continue
4352 continue
4351
4353
4352 if mark:
4354 if mark:
4353 ms.mark(f, "r")
4355 ms.mark(f, "r")
4354 elif unmark:
4356 elif unmark:
4355 ms.mark(f, "u")
4357 ms.mark(f, "u")
4356 else:
4358 else:
4357 # backup pre-resolve (merge uses .orig for its own purposes)
4359 # backup pre-resolve (merge uses .orig for its own purposes)
4358 a = repo.wjoin(f)
4360 a = repo.wjoin(f)
4359 try:
4361 try:
4360 util.copyfile(a, a + ".resolve")
4362 util.copyfile(a, a + ".resolve")
4361 except (IOError, OSError) as inst:
4363 except (IOError, OSError) as inst:
4362 if inst.errno != errno.ENOENT:
4364 if inst.errno != errno.ENOENT:
4363 raise
4365 raise
4364
4366
4365 try:
4367 try:
4366 # preresolve file
4368 # preresolve file
4367 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4369 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4368 'resolve')
4370 'resolve')
4369 complete, r = ms.preresolve(f, wctx)
4371 complete, r = ms.preresolve(f, wctx)
4370 if not complete:
4372 if not complete:
4371 tocomplete.append(f)
4373 tocomplete.append(f)
4372 elif r:
4374 elif r:
4373 ret = 1
4375 ret = 1
4374 finally:
4376 finally:
4375 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4377 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4376 ms.commit()
4378 ms.commit()
4377
4379
4378 # replace filemerge's .orig file with our resolve file, but only
4380 # replace filemerge's .orig file with our resolve file, but only
4379 # for merges that are complete
4381 # for merges that are complete
4380 if complete:
4382 if complete:
4381 try:
4383 try:
4382 util.rename(a + ".resolve",
4384 util.rename(a + ".resolve",
4383 scmutil.origpath(ui, repo, a))
4385 scmutil.origpath(ui, repo, a))
4384 except OSError as inst:
4386 except OSError as inst:
4385 if inst.errno != errno.ENOENT:
4387 if inst.errno != errno.ENOENT:
4386 raise
4388 raise
4387
4389
4388 for f in tocomplete:
4390 for f in tocomplete:
4389 try:
4391 try:
4390 # resolve file
4392 # resolve file
4391 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4393 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4392 'resolve')
4394 'resolve')
4393 r = ms.resolve(f, wctx)
4395 r = ms.resolve(f, wctx)
4394 if r:
4396 if r:
4395 ret = 1
4397 ret = 1
4396 finally:
4398 finally:
4397 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4399 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4398 ms.commit()
4400 ms.commit()
4399
4401
4400 # replace filemerge's .orig file with our resolve file
4402 # replace filemerge's .orig file with our resolve file
4401 a = repo.wjoin(f)
4403 a = repo.wjoin(f)
4402 try:
4404 try:
4403 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
4405 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
4404 except OSError as inst:
4406 except OSError as inst:
4405 if inst.errno != errno.ENOENT:
4407 if inst.errno != errno.ENOENT:
4406 raise
4408 raise
4407
4409
4408 ms.commit()
4410 ms.commit()
4409 ms.recordactions()
4411 ms.recordactions()
4410
4412
4411 if not didwork and pats:
4413 if not didwork and pats:
4412 hint = None
4414 hint = None
4413 if not any([p for p in pats if p.find(':') >= 0]):
4415 if not any([p for p in pats if p.find(':') >= 0]):
4414 pats = ['path:%s' % p for p in pats]
4416 pats = ['path:%s' % p for p in pats]
4415 m = scmutil.match(wctx, pats, opts)
4417 m = scmutil.match(wctx, pats, opts)
4416 for f in ms:
4418 for f in ms:
4417 if not m(f):
4419 if not m(f):
4418 continue
4420 continue
4419 flags = ''.join(['-%s ' % o[0] for o in flaglist
4421 flags = ''.join(['-%s ' % o[0] for o in flaglist
4420 if opts.get(o)])
4422 if opts.get(o)])
4421 hint = _("(try: hg resolve %s%s)\n") % (
4423 hint = _("(try: hg resolve %s%s)\n") % (
4422 flags,
4424 flags,
4423 ' '.join(pats))
4425 ' '.join(pats))
4424 break
4426 break
4425 ui.warn(_("arguments do not match paths that need resolving\n"))
4427 ui.warn(_("arguments do not match paths that need resolving\n"))
4426 if hint:
4428 if hint:
4427 ui.warn(hint)
4429 ui.warn(hint)
4428 elif ms.mergedriver and ms.mdstate() != 's':
4430 elif ms.mergedriver and ms.mdstate() != 's':
4429 # run conclude step when either a driver-resolved file is requested
4431 # run conclude step when either a driver-resolved file is requested
4430 # or there are no driver-resolved files
4432 # or there are no driver-resolved files
4431 # we can't use 'ret' to determine whether any files are unresolved
4433 # we can't use 'ret' to determine whether any files are unresolved
4432 # because we might not have tried to resolve some
4434 # because we might not have tried to resolve some
4433 if ((runconclude or not list(ms.driverresolved()))
4435 if ((runconclude or not list(ms.driverresolved()))
4434 and not list(ms.unresolved())):
4436 and not list(ms.unresolved())):
4435 proceed = mergemod.driverconclude(repo, ms, wctx)
4437 proceed = mergemod.driverconclude(repo, ms, wctx)
4436 ms.commit()
4438 ms.commit()
4437 if not proceed:
4439 if not proceed:
4438 return 1
4440 return 1
4439
4441
4440 # Nudge users into finishing an unfinished operation
4442 # Nudge users into finishing an unfinished operation
4441 unresolvedf = list(ms.unresolved())
4443 unresolvedf = list(ms.unresolved())
4442 driverresolvedf = list(ms.driverresolved())
4444 driverresolvedf = list(ms.driverresolved())
4443 if not unresolvedf and not driverresolvedf:
4445 if not unresolvedf and not driverresolvedf:
4444 ui.status(_('(no more unresolved files)\n'))
4446 ui.status(_('(no more unresolved files)\n'))
4445 cmdutil.checkafterresolved(repo)
4447 cmdutil.checkafterresolved(repo)
4446 elif not unresolvedf:
4448 elif not unresolvedf:
4447 ui.status(_('(no more unresolved files -- '
4449 ui.status(_('(no more unresolved files -- '
4448 'run "hg resolve --all" to conclude)\n'))
4450 'run "hg resolve --all" to conclude)\n'))
4449
4451
4450 return ret
4452 return ret
4451
4453
4452 @command('revert',
4454 @command('revert',
4453 [('a', 'all', None, _('revert all changes when no arguments given')),
4455 [('a', 'all', None, _('revert all changes when no arguments given')),
4454 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4456 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4455 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4457 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4456 ('C', 'no-backup', None, _('do not save backup copies of files')),
4458 ('C', 'no-backup', None, _('do not save backup copies of files')),
4457 ('i', 'interactive', None,
4459 ('i', 'interactive', None,
4458 _('interactively select the changes (EXPERIMENTAL)')),
4460 _('interactively select the changes (EXPERIMENTAL)')),
4459 ] + walkopts + dryrunopts,
4461 ] + walkopts + dryrunopts,
4460 _('[OPTION]... [-r REV] [NAME]...'))
4462 _('[OPTION]... [-r REV] [NAME]...'))
4461 def revert(ui, repo, *pats, **opts):
4463 def revert(ui, repo, *pats, **opts):
4462 """restore files to their checkout state
4464 """restore files to their checkout state
4463
4465
4464 .. note::
4466 .. note::
4465
4467
4466 To check out earlier revisions, you should use :hg:`update REV`.
4468 To check out earlier revisions, you should use :hg:`update REV`.
4467 To cancel an uncommitted merge (and lose your changes),
4469 To cancel an uncommitted merge (and lose your changes),
4468 use :hg:`update --clean .`.
4470 use :hg:`update --clean .`.
4469
4471
4470 With no revision specified, revert the specified files or directories
4472 With no revision specified, revert the specified files or directories
4471 to the contents they had in the parent of the working directory.
4473 to the contents they had in the parent of the working directory.
4472 This restores the contents of files to an unmodified
4474 This restores the contents of files to an unmodified
4473 state and unschedules adds, removes, copies, and renames. If the
4475 state and unschedules adds, removes, copies, and renames. If the
4474 working directory has two parents, you must explicitly specify a
4476 working directory has two parents, you must explicitly specify a
4475 revision.
4477 revision.
4476
4478
4477 Using the -r/--rev or -d/--date options, revert the given files or
4479 Using the -r/--rev or -d/--date options, revert the given files or
4478 directories to their states as of a specific revision. Because
4480 directories to their states as of a specific revision. Because
4479 revert does not change the working directory parents, this will
4481 revert does not change the working directory parents, this will
4480 cause these files to appear modified. This can be helpful to "back
4482 cause these files to appear modified. This can be helpful to "back
4481 out" some or all of an earlier change. See :hg:`backout` for a
4483 out" some or all of an earlier change. See :hg:`backout` for a
4482 related method.
4484 related method.
4483
4485
4484 Modified files are saved with a .orig suffix before reverting.
4486 Modified files are saved with a .orig suffix before reverting.
4485 To disable these backups, use --no-backup. It is possible to store
4487 To disable these backups, use --no-backup. It is possible to store
4486 the backup files in a custom directory relative to the root of the
4488 the backup files in a custom directory relative to the root of the
4487 repository by setting the ``ui.origbackuppath`` configuration
4489 repository by setting the ``ui.origbackuppath`` configuration
4488 option.
4490 option.
4489
4491
4490 See :hg:`help dates` for a list of formats valid for -d/--date.
4492 See :hg:`help dates` for a list of formats valid for -d/--date.
4491
4493
4492 See :hg:`help backout` for a way to reverse the effect of an
4494 See :hg:`help backout` for a way to reverse the effect of an
4493 earlier changeset.
4495 earlier changeset.
4494
4496
4495 Returns 0 on success.
4497 Returns 0 on success.
4496 """
4498 """
4497
4499
4498 if opts.get("date"):
4500 if opts.get("date"):
4499 if opts.get("rev"):
4501 if opts.get("rev"):
4500 raise error.Abort(_("you can't specify a revision and a date"))
4502 raise error.Abort(_("you can't specify a revision and a date"))
4501 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4503 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4502
4504
4503 parent, p2 = repo.dirstate.parents()
4505 parent, p2 = repo.dirstate.parents()
4504 if not opts.get('rev') and p2 != nullid:
4506 if not opts.get('rev') and p2 != nullid:
4505 # revert after merge is a trap for new users (issue2915)
4507 # revert after merge is a trap for new users (issue2915)
4506 raise error.Abort(_('uncommitted merge with no revision specified'),
4508 raise error.Abort(_('uncommitted merge with no revision specified'),
4507 hint=_("use 'hg update' or see 'hg help revert'"))
4509 hint=_("use 'hg update' or see 'hg help revert'"))
4508
4510
4509 ctx = scmutil.revsingle(repo, opts.get('rev'))
4511 ctx = scmutil.revsingle(repo, opts.get('rev'))
4510
4512
4511 if (not (pats or opts.get('include') or opts.get('exclude') or
4513 if (not (pats or opts.get('include') or opts.get('exclude') or
4512 opts.get('all') or opts.get('interactive'))):
4514 opts.get('all') or opts.get('interactive'))):
4513 msg = _("no files or directories specified")
4515 msg = _("no files or directories specified")
4514 if p2 != nullid:
4516 if p2 != nullid:
4515 hint = _("uncommitted merge, use --all to discard all changes,"
4517 hint = _("uncommitted merge, use --all to discard all changes,"
4516 " or 'hg update -C .' to abort the merge")
4518 " or 'hg update -C .' to abort the merge")
4517 raise error.Abort(msg, hint=hint)
4519 raise error.Abort(msg, hint=hint)
4518 dirty = any(repo.status())
4520 dirty = any(repo.status())
4519 node = ctx.node()
4521 node = ctx.node()
4520 if node != parent:
4522 if node != parent:
4521 if dirty:
4523 if dirty:
4522 hint = _("uncommitted changes, use --all to discard all"
4524 hint = _("uncommitted changes, use --all to discard all"
4523 " changes, or 'hg update %s' to update") % ctx.rev()
4525 " changes, or 'hg update %s' to update") % ctx.rev()
4524 else:
4526 else:
4525 hint = _("use --all to revert all files,"
4527 hint = _("use --all to revert all files,"
4526 " or 'hg update %s' to update") % ctx.rev()
4528 " or 'hg update %s' to update") % ctx.rev()
4527 elif dirty:
4529 elif dirty:
4528 hint = _("uncommitted changes, use --all to discard all changes")
4530 hint = _("uncommitted changes, use --all to discard all changes")
4529 else:
4531 else:
4530 hint = _("use --all to revert all files")
4532 hint = _("use --all to revert all files")
4531 raise error.Abort(msg, hint=hint)
4533 raise error.Abort(msg, hint=hint)
4532
4534
4533 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
4535 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
4534
4536
4535 @command('rollback', dryrunopts +
4537 @command('rollback', dryrunopts +
4536 [('f', 'force', False, _('ignore safety measures'))])
4538 [('f', 'force', False, _('ignore safety measures'))])
4537 def rollback(ui, repo, **opts):
4539 def rollback(ui, repo, **opts):
4538 """roll back the last transaction (DANGEROUS) (DEPRECATED)
4540 """roll back the last transaction (DANGEROUS) (DEPRECATED)
4539
4541
4540 Please use :hg:`commit --amend` instead of rollback to correct
4542 Please use :hg:`commit --amend` instead of rollback to correct
4541 mistakes in the last commit.
4543 mistakes in the last commit.
4542
4544
4543 This command should be used with care. There is only one level of
4545 This command should be used with care. There is only one level of
4544 rollback, and there is no way to undo a rollback. It will also
4546 rollback, and there is no way to undo a rollback. It will also
4545 restore the dirstate at the time of the last transaction, losing
4547 restore the dirstate at the time of the last transaction, losing
4546 any dirstate changes since that time. This command does not alter
4548 any dirstate changes since that time. This command does not alter
4547 the working directory.
4549 the working directory.
4548
4550
4549 Transactions are used to encapsulate the effects of all commands
4551 Transactions are used to encapsulate the effects of all commands
4550 that create new changesets or propagate existing changesets into a
4552 that create new changesets or propagate existing changesets into a
4551 repository.
4553 repository.
4552
4554
4553 .. container:: verbose
4555 .. container:: verbose
4554
4556
4555 For example, the following commands are transactional, and their
4557 For example, the following commands are transactional, and their
4556 effects can be rolled back:
4558 effects can be rolled back:
4557
4559
4558 - commit
4560 - commit
4559 - import
4561 - import
4560 - pull
4562 - pull
4561 - push (with this repository as the destination)
4563 - push (with this repository as the destination)
4562 - unbundle
4564 - unbundle
4563
4565
4564 To avoid permanent data loss, rollback will refuse to rollback a
4566 To avoid permanent data loss, rollback will refuse to rollback a
4565 commit transaction if it isn't checked out. Use --force to
4567 commit transaction if it isn't checked out. Use --force to
4566 override this protection.
4568 override this protection.
4567
4569
4568 The rollback command can be entirely disabled by setting the
4570 The rollback command can be entirely disabled by setting the
4569 ``ui.rollback`` configuration setting to false. If you're here
4571 ``ui.rollback`` configuration setting to false. If you're here
4570 because you want to use rollback and it's disabled, you can
4572 because you want to use rollback and it's disabled, you can
4571 re-enable the command by setting ``ui.rollback`` to true.
4573 re-enable the command by setting ``ui.rollback`` to true.
4572
4574
4573 This command is not intended for use on public repositories. Once
4575 This command is not intended for use on public repositories. Once
4574 changes are visible for pull by other users, rolling a transaction
4576 changes are visible for pull by other users, rolling a transaction
4575 back locally is ineffective (someone else may already have pulled
4577 back locally is ineffective (someone else may already have pulled
4576 the changes). Furthermore, a race is possible with readers of the
4578 the changes). Furthermore, a race is possible with readers of the
4577 repository; for example an in-progress pull from the repository
4579 repository; for example an in-progress pull from the repository
4578 may fail if a rollback is performed.
4580 may fail if a rollback is performed.
4579
4581
4580 Returns 0 on success, 1 if no rollback data is available.
4582 Returns 0 on success, 1 if no rollback data is available.
4581 """
4583 """
4582 if not ui.configbool('ui', 'rollback', True):
4584 if not ui.configbool('ui', 'rollback', True):
4583 raise error.Abort(_('rollback is disabled because it is unsafe'),
4585 raise error.Abort(_('rollback is disabled because it is unsafe'),
4584 hint=('see `hg help -v rollback` for information'))
4586 hint=('see `hg help -v rollback` for information'))
4585 return repo.rollback(dryrun=opts.get('dry_run'),
4587 return repo.rollback(dryrun=opts.get('dry_run'),
4586 force=opts.get('force'))
4588 force=opts.get('force'))
4587
4589
4588 @command('root', [])
4590 @command('root', [])
4589 def root(ui, repo):
4591 def root(ui, repo):
4590 """print the root (top) of the current working directory
4592 """print the root (top) of the current working directory
4591
4593
4592 Print the root directory of the current repository.
4594 Print the root directory of the current repository.
4593
4595
4594 Returns 0 on success.
4596 Returns 0 on success.
4595 """
4597 """
4596 ui.write(repo.root + "\n")
4598 ui.write(repo.root + "\n")
4597
4599
4598 @command('^serve',
4600 @command('^serve',
4599 [('A', 'accesslog', '', _('name of access log file to write to'),
4601 [('A', 'accesslog', '', _('name of access log file to write to'),
4600 _('FILE')),
4602 _('FILE')),
4601 ('d', 'daemon', None, _('run server in background')),
4603 ('d', 'daemon', None, _('run server in background')),
4602 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
4604 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
4603 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4605 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4604 # use string type, then we can check if something was passed
4606 # use string type, then we can check if something was passed
4605 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4607 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4606 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4608 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4607 _('ADDR')),
4609 _('ADDR')),
4608 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4610 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4609 _('PREFIX')),
4611 _('PREFIX')),
4610 ('n', 'name', '',
4612 ('n', 'name', '',
4611 _('name to show in web pages (default: working directory)'), _('NAME')),
4613 _('name to show in web pages (default: working directory)'), _('NAME')),
4612 ('', 'web-conf', '',
4614 ('', 'web-conf', '',
4613 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
4615 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
4614 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4616 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4615 _('FILE')),
4617 _('FILE')),
4616 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4618 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4617 ('', 'stdio', None, _('for remote clients (ADVANCED)')),
4619 ('', 'stdio', None, _('for remote clients (ADVANCED)')),
4618 ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
4620 ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
4619 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4621 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4620 ('', 'style', '', _('template style to use'), _('STYLE')),
4622 ('', 'style', '', _('template style to use'), _('STYLE')),
4621 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4623 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4622 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))]
4624 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))]
4623 + subrepoopts,
4625 + subrepoopts,
4624 _('[OPTION]...'),
4626 _('[OPTION]...'),
4625 optionalrepo=True)
4627 optionalrepo=True)
4626 def serve(ui, repo, **opts):
4628 def serve(ui, repo, **opts):
4627 """start stand-alone webserver
4629 """start stand-alone webserver
4628
4630
4629 Start a local HTTP repository browser and pull server. You can use
4631 Start a local HTTP repository browser and pull server. You can use
4630 this for ad-hoc sharing and browsing of repositories. It is
4632 this for ad-hoc sharing and browsing of repositories. It is
4631 recommended to use a real web server to serve a repository for
4633 recommended to use a real web server to serve a repository for
4632 longer periods of time.
4634 longer periods of time.
4633
4635
4634 Please note that the server does not implement access control.
4636 Please note that the server does not implement access control.
4635 This means that, by default, anybody can read from the server and
4637 This means that, by default, anybody can read from the server and
4636 nobody can write to it by default. Set the ``web.allow_push``
4638 nobody can write to it by default. Set the ``web.allow_push``
4637 option to ``*`` to allow everybody to push to the server. You
4639 option to ``*`` to allow everybody to push to the server. You
4638 should use a real web server if you need to authenticate users.
4640 should use a real web server if you need to authenticate users.
4639
4641
4640 By default, the server logs accesses to stdout and errors to
4642 By default, the server logs accesses to stdout and errors to
4641 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
4643 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
4642 files.
4644 files.
4643
4645
4644 To have the server choose a free port number to listen on, specify
4646 To have the server choose a free port number to listen on, specify
4645 a port number of 0; in this case, the server will print the port
4647 a port number of 0; in this case, the server will print the port
4646 number it uses.
4648 number it uses.
4647
4649
4648 Returns 0 on success.
4650 Returns 0 on success.
4649 """
4651 """
4650
4652
4651 if opts["stdio"] and opts["cmdserver"]:
4653 if opts["stdio"] and opts["cmdserver"]:
4652 raise error.Abort(_("cannot use --stdio with --cmdserver"))
4654 raise error.Abort(_("cannot use --stdio with --cmdserver"))
4653
4655
4654 if opts["stdio"]:
4656 if opts["stdio"]:
4655 if repo is None:
4657 if repo is None:
4656 raise error.RepoError(_("there is no Mercurial repository here"
4658 raise error.RepoError(_("there is no Mercurial repository here"
4657 " (.hg not found)"))
4659 " (.hg not found)"))
4658 s = sshserver.sshserver(ui, repo)
4660 s = sshserver.sshserver(ui, repo)
4659 s.serve_forever()
4661 s.serve_forever()
4660
4662
4661 service = server.createservice(ui, repo, opts)
4663 service = server.createservice(ui, repo, opts)
4662 return server.runservice(opts, initfn=service.init, runfn=service.run)
4664 return server.runservice(opts, initfn=service.init, runfn=service.run)
4663
4665
4664 @command('^status|st',
4666 @command('^status|st',
4665 [('A', 'all', None, _('show status of all files')),
4667 [('A', 'all', None, _('show status of all files')),
4666 ('m', 'modified', None, _('show only modified files')),
4668 ('m', 'modified', None, _('show only modified files')),
4667 ('a', 'added', None, _('show only added files')),
4669 ('a', 'added', None, _('show only added files')),
4668 ('r', 'removed', None, _('show only removed files')),
4670 ('r', 'removed', None, _('show only removed files')),
4669 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4671 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4670 ('c', 'clean', None, _('show only files without changes')),
4672 ('c', 'clean', None, _('show only files without changes')),
4671 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4673 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4672 ('i', 'ignored', None, _('show only ignored files')),
4674 ('i', 'ignored', None, _('show only ignored files')),
4673 ('n', 'no-status', None, _('hide status prefix')),
4675 ('n', 'no-status', None, _('hide status prefix')),
4674 ('C', 'copies', None, _('show source of copied files')),
4676 ('C', 'copies', None, _('show source of copied files')),
4675 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4677 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4676 ('', 'rev', [], _('show difference from revision'), _('REV')),
4678 ('', 'rev', [], _('show difference from revision'), _('REV')),
4677 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
4679 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
4678 ] + walkopts + subrepoopts + formatteropts,
4680 ] + walkopts + subrepoopts + formatteropts,
4679 _('[OPTION]... [FILE]...'),
4681 _('[OPTION]... [FILE]...'),
4680 inferrepo=True)
4682 inferrepo=True)
4681 def status(ui, repo, *pats, **opts):
4683 def status(ui, repo, *pats, **opts):
4682 """show changed files in the working directory
4684 """show changed files in the working directory
4683
4685
4684 Show status of files in the repository. If names are given, only
4686 Show status of files in the repository. If names are given, only
4685 files that match are shown. Files that are clean or ignored or
4687 files that match are shown. Files that are clean or ignored or
4686 the source of a copy/move operation, are not listed unless
4688 the source of a copy/move operation, are not listed unless
4687 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
4689 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
4688 Unless options described with "show only ..." are given, the
4690 Unless options described with "show only ..." are given, the
4689 options -mardu are used.
4691 options -mardu are used.
4690
4692
4691 Option -q/--quiet hides untracked (unknown and ignored) files
4693 Option -q/--quiet hides untracked (unknown and ignored) files
4692 unless explicitly requested with -u/--unknown or -i/--ignored.
4694 unless explicitly requested with -u/--unknown or -i/--ignored.
4693
4695
4694 .. note::
4696 .. note::
4695
4697
4696 :hg:`status` may appear to disagree with diff if permissions have
4698 :hg:`status` may appear to disagree with diff if permissions have
4697 changed or a merge has occurred. The standard diff format does
4699 changed or a merge has occurred. The standard diff format does
4698 not report permission changes and diff only reports changes
4700 not report permission changes and diff only reports changes
4699 relative to one merge parent.
4701 relative to one merge parent.
4700
4702
4701 If one revision is given, it is used as the base revision.
4703 If one revision is given, it is used as the base revision.
4702 If two revisions are given, the differences between them are
4704 If two revisions are given, the differences between them are
4703 shown. The --change option can also be used as a shortcut to list
4705 shown. The --change option can also be used as a shortcut to list
4704 the changed files of a revision from its first parent.
4706 the changed files of a revision from its first parent.
4705
4707
4706 The codes used to show the status of files are::
4708 The codes used to show the status of files are::
4707
4709
4708 M = modified
4710 M = modified
4709 A = added
4711 A = added
4710 R = removed
4712 R = removed
4711 C = clean
4713 C = clean
4712 ! = missing (deleted by non-hg command, but still tracked)
4714 ! = missing (deleted by non-hg command, but still tracked)
4713 ? = not tracked
4715 ? = not tracked
4714 I = ignored
4716 I = ignored
4715 = origin of the previous file (with --copies)
4717 = origin of the previous file (with --copies)
4716
4718
4717 .. container:: verbose
4719 .. container:: verbose
4718
4720
4719 Examples:
4721 Examples:
4720
4722
4721 - show changes in the working directory relative to a
4723 - show changes in the working directory relative to a
4722 changeset::
4724 changeset::
4723
4725
4724 hg status --rev 9353
4726 hg status --rev 9353
4725
4727
4726 - show changes in the working directory relative to the
4728 - show changes in the working directory relative to the
4727 current directory (see :hg:`help patterns` for more information)::
4729 current directory (see :hg:`help patterns` for more information)::
4728
4730
4729 hg status re:
4731 hg status re:
4730
4732
4731 - show all changes including copies in an existing changeset::
4733 - show all changes including copies in an existing changeset::
4732
4734
4733 hg status --copies --change 9353
4735 hg status --copies --change 9353
4734
4736
4735 - get a NUL separated list of added files, suitable for xargs::
4737 - get a NUL separated list of added files, suitable for xargs::
4736
4738
4737 hg status -an0
4739 hg status -an0
4738
4740
4739 Returns 0 on success.
4741 Returns 0 on success.
4740 """
4742 """
4741
4743
4742 opts = pycompat.byteskwargs(opts)
4744 opts = pycompat.byteskwargs(opts)
4743 revs = opts.get('rev')
4745 revs = opts.get('rev')
4744 change = opts.get('change')
4746 change = opts.get('change')
4745
4747
4746 if revs and change:
4748 if revs and change:
4747 msg = _('cannot specify --rev and --change at the same time')
4749 msg = _('cannot specify --rev and --change at the same time')
4748 raise error.Abort(msg)
4750 raise error.Abort(msg)
4749 elif change:
4751 elif change:
4750 node2 = scmutil.revsingle(repo, change, None).node()
4752 node2 = scmutil.revsingle(repo, change, None).node()
4751 node1 = repo[node2].p1().node()
4753 node1 = repo[node2].p1().node()
4752 else:
4754 else:
4753 node1, node2 = scmutil.revpair(repo, revs)
4755 node1, node2 = scmutil.revpair(repo, revs)
4754
4756
4755 if pats or ui.configbool('commands', 'status.relative'):
4757 if pats or ui.configbool('commands', 'status.relative'):
4756 cwd = repo.getcwd()
4758 cwd = repo.getcwd()
4757 else:
4759 else:
4758 cwd = ''
4760 cwd = ''
4759
4761
4760 if opts.get('print0'):
4762 if opts.get('print0'):
4761 end = '\0'
4763 end = '\0'
4762 else:
4764 else:
4763 end = '\n'
4765 end = '\n'
4764 copy = {}
4766 copy = {}
4765 states = 'modified added removed deleted unknown ignored clean'.split()
4767 states = 'modified added removed deleted unknown ignored clean'.split()
4766 show = [k for k in states if opts.get(k)]
4768 show = [k for k in states if opts.get(k)]
4767 if opts.get('all'):
4769 if opts.get('all'):
4768 show += ui.quiet and (states[:4] + ['clean']) or states
4770 show += ui.quiet and (states[:4] + ['clean']) or states
4769 if not show:
4771 if not show:
4770 if ui.quiet:
4772 if ui.quiet:
4771 show = states[:4]
4773 show = states[:4]
4772 else:
4774 else:
4773 show = states[:5]
4775 show = states[:5]
4774
4776
4775 m = scmutil.match(repo[node2], pats, opts)
4777 m = scmutil.match(repo[node2], pats, opts)
4776 stat = repo.status(node1, node2, m,
4778 stat = repo.status(node1, node2, m,
4777 'ignored' in show, 'clean' in show, 'unknown' in show,
4779 'ignored' in show, 'clean' in show, 'unknown' in show,
4778 opts.get('subrepos'))
4780 opts.get('subrepos'))
4779 changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)
4781 changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)
4780
4782
4781 if (opts.get('all') or opts.get('copies')
4783 if (opts.get('all') or opts.get('copies')
4782 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
4784 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
4783 copy = copies.pathcopies(repo[node1], repo[node2], m)
4785 copy = copies.pathcopies(repo[node1], repo[node2], m)
4784
4786
4785 ui.pager('status')
4787 ui.pager('status')
4786 fm = ui.formatter('status', opts)
4788 fm = ui.formatter('status', opts)
4787 fmt = '%s' + end
4789 fmt = '%s' + end
4788 showchar = not opts.get('no_status')
4790 showchar = not opts.get('no_status')
4789
4791
4790 for state, char, files in changestates:
4792 for state, char, files in changestates:
4791 if state in show:
4793 if state in show:
4792 label = 'status.' + state
4794 label = 'status.' + state
4793 for f in files:
4795 for f in files:
4794 fm.startitem()
4796 fm.startitem()
4795 fm.condwrite(showchar, 'status', '%s ', char, label=label)
4797 fm.condwrite(showchar, 'status', '%s ', char, label=label)
4796 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
4798 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
4797 if f in copy:
4799 if f in copy:
4798 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
4800 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
4799 label='status.copied')
4801 label='status.copied')
4800 fm.end()
4802 fm.end()
4801
4803
4802 @command('^summary|sum',
4804 @command('^summary|sum',
4803 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
4805 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
4804 def summary(ui, repo, **opts):
4806 def summary(ui, repo, **opts):
4805 """summarize working directory state
4807 """summarize working directory state
4806
4808
4807 This generates a brief summary of the working directory state,
4809 This generates a brief summary of the working directory state,
4808 including parents, branch, commit status, phase and available updates.
4810 including parents, branch, commit status, phase and available updates.
4809
4811
4810 With the --remote option, this will check the default paths for
4812 With the --remote option, this will check the default paths for
4811 incoming and outgoing changes. This can be time-consuming.
4813 incoming and outgoing changes. This can be time-consuming.
4812
4814
4813 Returns 0 on success.
4815 Returns 0 on success.
4814 """
4816 """
4815
4817
4816 ui.pager('summary')
4818 ui.pager('summary')
4817 ctx = repo[None]
4819 ctx = repo[None]
4818 parents = ctx.parents()
4820 parents = ctx.parents()
4819 pnode = parents[0].node()
4821 pnode = parents[0].node()
4820 marks = []
4822 marks = []
4821
4823
4822 ms = None
4824 ms = None
4823 try:
4825 try:
4824 ms = mergemod.mergestate.read(repo)
4826 ms = mergemod.mergestate.read(repo)
4825 except error.UnsupportedMergeRecords as e:
4827 except error.UnsupportedMergeRecords as e:
4826 s = ' '.join(e.recordtypes)
4828 s = ' '.join(e.recordtypes)
4827 ui.warn(
4829 ui.warn(
4828 _('warning: merge state has unsupported record types: %s\n') % s)
4830 _('warning: merge state has unsupported record types: %s\n') % s)
4829 unresolved = 0
4831 unresolved = 0
4830 else:
4832 else:
4831 unresolved = [f for f in ms if ms[f] == 'u']
4833 unresolved = [f for f in ms if ms[f] == 'u']
4832
4834
4833 for p in parents:
4835 for p in parents:
4834 # label with log.changeset (instead of log.parent) since this
4836 # label with log.changeset (instead of log.parent) since this
4835 # shows a working directory parent *changeset*:
4837 # shows a working directory parent *changeset*:
4836 # i18n: column positioning for "hg summary"
4838 # i18n: column positioning for "hg summary"
4837 ui.write(_('parent: %d:%s ') % (p.rev(), p),
4839 ui.write(_('parent: %d:%s ') % (p.rev(), p),
4838 label=cmdutil._changesetlabels(p))
4840 label=cmdutil._changesetlabels(p))
4839 ui.write(' '.join(p.tags()), label='log.tag')
4841 ui.write(' '.join(p.tags()), label='log.tag')
4840 if p.bookmarks():
4842 if p.bookmarks():
4841 marks.extend(p.bookmarks())
4843 marks.extend(p.bookmarks())
4842 if p.rev() == -1:
4844 if p.rev() == -1:
4843 if not len(repo):
4845 if not len(repo):
4844 ui.write(_(' (empty repository)'))
4846 ui.write(_(' (empty repository)'))
4845 else:
4847 else:
4846 ui.write(_(' (no revision checked out)'))
4848 ui.write(_(' (no revision checked out)'))
4847 if p.obsolete():
4849 if p.obsolete():
4848 ui.write(_(' (obsolete)'))
4850 ui.write(_(' (obsolete)'))
4849 if p.troubled():
4851 if p.troubled():
4850 ui.write(' ('
4852 ui.write(' ('
4851 + ', '.join(ui.label(trouble, 'trouble.%s' % trouble)
4853 + ', '.join(ui.label(trouble, 'trouble.%s' % trouble)
4852 for trouble in p.troubles())
4854 for trouble in p.troubles())
4853 + ')')
4855 + ')')
4854 ui.write('\n')
4856 ui.write('\n')
4855 if p.description():
4857 if p.description():
4856 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
4858 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
4857 label='log.summary')
4859 label='log.summary')
4858
4860
4859 branch = ctx.branch()
4861 branch = ctx.branch()
4860 bheads = repo.branchheads(branch)
4862 bheads = repo.branchheads(branch)
4861 # i18n: column positioning for "hg summary"
4863 # i18n: column positioning for "hg summary"
4862 m = _('branch: %s\n') % branch
4864 m = _('branch: %s\n') % branch
4863 if branch != 'default':
4865 if branch != 'default':
4864 ui.write(m, label='log.branch')
4866 ui.write(m, label='log.branch')
4865 else:
4867 else:
4866 ui.status(m, label='log.branch')
4868 ui.status(m, label='log.branch')
4867
4869
4868 if marks:
4870 if marks:
4869 active = repo._activebookmark
4871 active = repo._activebookmark
4870 # i18n: column positioning for "hg summary"
4872 # i18n: column positioning for "hg summary"
4871 ui.write(_('bookmarks:'), label='log.bookmark')
4873 ui.write(_('bookmarks:'), label='log.bookmark')
4872 if active is not None:
4874 if active is not None:
4873 if active in marks:
4875 if active in marks:
4874 ui.write(' *' + active, label=activebookmarklabel)
4876 ui.write(' *' + active, label=activebookmarklabel)
4875 marks.remove(active)
4877 marks.remove(active)
4876 else:
4878 else:
4877 ui.write(' [%s]' % active, label=activebookmarklabel)
4879 ui.write(' [%s]' % active, label=activebookmarklabel)
4878 for m in marks:
4880 for m in marks:
4879 ui.write(' ' + m, label='log.bookmark')
4881 ui.write(' ' + m, label='log.bookmark')
4880 ui.write('\n', label='log.bookmark')
4882 ui.write('\n', label='log.bookmark')
4881
4883
4882 status = repo.status(unknown=True)
4884 status = repo.status(unknown=True)
4883
4885
4884 c = repo.dirstate.copies()
4886 c = repo.dirstate.copies()
4885 copied, renamed = [], []
4887 copied, renamed = [], []
4886 for d, s in c.iteritems():
4888 for d, s in c.iteritems():
4887 if s in status.removed:
4889 if s in status.removed:
4888 status.removed.remove(s)
4890 status.removed.remove(s)
4889 renamed.append(d)
4891 renamed.append(d)
4890 else:
4892 else:
4891 copied.append(d)
4893 copied.append(d)
4892 if d in status.added:
4894 if d in status.added:
4893 status.added.remove(d)
4895 status.added.remove(d)
4894
4896
4895 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
4897 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
4896
4898
4897 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
4899 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
4898 (ui.label(_('%d added'), 'status.added'), status.added),
4900 (ui.label(_('%d added'), 'status.added'), status.added),
4899 (ui.label(_('%d removed'), 'status.removed'), status.removed),
4901 (ui.label(_('%d removed'), 'status.removed'), status.removed),
4900 (ui.label(_('%d renamed'), 'status.copied'), renamed),
4902 (ui.label(_('%d renamed'), 'status.copied'), renamed),
4901 (ui.label(_('%d copied'), 'status.copied'), copied),
4903 (ui.label(_('%d copied'), 'status.copied'), copied),
4902 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
4904 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
4903 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
4905 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
4904 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
4906 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
4905 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
4907 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
4906 t = []
4908 t = []
4907 for l, s in labels:
4909 for l, s in labels:
4908 if s:
4910 if s:
4909 t.append(l % len(s))
4911 t.append(l % len(s))
4910
4912
4911 t = ', '.join(t)
4913 t = ', '.join(t)
4912 cleanworkdir = False
4914 cleanworkdir = False
4913
4915
4914 if repo.vfs.exists('graftstate'):
4916 if repo.vfs.exists('graftstate'):
4915 t += _(' (graft in progress)')
4917 t += _(' (graft in progress)')
4916 if repo.vfs.exists('updatestate'):
4918 if repo.vfs.exists('updatestate'):
4917 t += _(' (interrupted update)')
4919 t += _(' (interrupted update)')
4918 elif len(parents) > 1:
4920 elif len(parents) > 1:
4919 t += _(' (merge)')
4921 t += _(' (merge)')
4920 elif branch != parents[0].branch():
4922 elif branch != parents[0].branch():
4921 t += _(' (new branch)')
4923 t += _(' (new branch)')
4922 elif (parents[0].closesbranch() and
4924 elif (parents[0].closesbranch() and
4923 pnode in repo.branchheads(branch, closed=True)):
4925 pnode in repo.branchheads(branch, closed=True)):
4924 t += _(' (head closed)')
4926 t += _(' (head closed)')
4925 elif not (status.modified or status.added or status.removed or renamed or
4927 elif not (status.modified or status.added or status.removed or renamed or
4926 copied or subs):
4928 copied or subs):
4927 t += _(' (clean)')
4929 t += _(' (clean)')
4928 cleanworkdir = True
4930 cleanworkdir = True
4929 elif pnode not in bheads:
4931 elif pnode not in bheads:
4930 t += _(' (new branch head)')
4932 t += _(' (new branch head)')
4931
4933
4932 if parents:
4934 if parents:
4933 pendingphase = max(p.phase() for p in parents)
4935 pendingphase = max(p.phase() for p in parents)
4934 else:
4936 else:
4935 pendingphase = phases.public
4937 pendingphase = phases.public
4936
4938
4937 if pendingphase > phases.newcommitphase(ui):
4939 if pendingphase > phases.newcommitphase(ui):
4938 t += ' (%s)' % phases.phasenames[pendingphase]
4940 t += ' (%s)' % phases.phasenames[pendingphase]
4939
4941
4940 if cleanworkdir:
4942 if cleanworkdir:
4941 # i18n: column positioning for "hg summary"
4943 # i18n: column positioning for "hg summary"
4942 ui.status(_('commit: %s\n') % t.strip())
4944 ui.status(_('commit: %s\n') % t.strip())
4943 else:
4945 else:
4944 # i18n: column positioning for "hg summary"
4946 # i18n: column positioning for "hg summary"
4945 ui.write(_('commit: %s\n') % t.strip())
4947 ui.write(_('commit: %s\n') % t.strip())
4946
4948
4947 # all ancestors of branch heads - all ancestors of parent = new csets
4949 # all ancestors of branch heads - all ancestors of parent = new csets
4948 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
4950 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
4949 bheads))
4951 bheads))
4950
4952
4951 if new == 0:
4953 if new == 0:
4952 # i18n: column positioning for "hg summary"
4954 # i18n: column positioning for "hg summary"
4953 ui.status(_('update: (current)\n'))
4955 ui.status(_('update: (current)\n'))
4954 elif pnode not in bheads:
4956 elif pnode not in bheads:
4955 # i18n: column positioning for "hg summary"
4957 # i18n: column positioning for "hg summary"
4956 ui.write(_('update: %d new changesets (update)\n') % new)
4958 ui.write(_('update: %d new changesets (update)\n') % new)
4957 else:
4959 else:
4958 # i18n: column positioning for "hg summary"
4960 # i18n: column positioning for "hg summary"
4959 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
4961 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
4960 (new, len(bheads)))
4962 (new, len(bheads)))
4961
4963
4962 t = []
4964 t = []
4963 draft = len(repo.revs('draft()'))
4965 draft = len(repo.revs('draft()'))
4964 if draft:
4966 if draft:
4965 t.append(_('%d draft') % draft)
4967 t.append(_('%d draft') % draft)
4966 secret = len(repo.revs('secret()'))
4968 secret = len(repo.revs('secret()'))
4967 if secret:
4969 if secret:
4968 t.append(_('%d secret') % secret)
4970 t.append(_('%d secret') % secret)
4969
4971
4970 if draft or secret:
4972 if draft or secret:
4971 ui.status(_('phases: %s\n') % ', '.join(t))
4973 ui.status(_('phases: %s\n') % ', '.join(t))
4972
4974
4973 if obsolete.isenabled(repo, obsolete.createmarkersopt):
4975 if obsolete.isenabled(repo, obsolete.createmarkersopt):
4974 for trouble in ("unstable", "divergent", "bumped"):
4976 for trouble in ("unstable", "divergent", "bumped"):
4975 numtrouble = len(repo.revs(trouble + "()"))
4977 numtrouble = len(repo.revs(trouble + "()"))
4976 # We write all the possibilities to ease translation
4978 # We write all the possibilities to ease translation
4977 troublemsg = {
4979 troublemsg = {
4978 "unstable": _("unstable: %d changesets"),
4980 "unstable": _("unstable: %d changesets"),
4979 "divergent": _("divergent: %d changesets"),
4981 "divergent": _("divergent: %d changesets"),
4980 "bumped": _("bumped: %d changesets"),
4982 "bumped": _("bumped: %d changesets"),
4981 }
4983 }
4982 if numtrouble > 0:
4984 if numtrouble > 0:
4983 ui.status(troublemsg[trouble] % numtrouble + "\n")
4985 ui.status(troublemsg[trouble] % numtrouble + "\n")
4984
4986
4985 cmdutil.summaryhooks(ui, repo)
4987 cmdutil.summaryhooks(ui, repo)
4986
4988
4987 if opts.get('remote'):
4989 if opts.get('remote'):
4988 needsincoming, needsoutgoing = True, True
4990 needsincoming, needsoutgoing = True, True
4989 else:
4991 else:
4990 needsincoming, needsoutgoing = False, False
4992 needsincoming, needsoutgoing = False, False
4991 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
4993 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
4992 if i:
4994 if i:
4993 needsincoming = True
4995 needsincoming = True
4994 if o:
4996 if o:
4995 needsoutgoing = True
4997 needsoutgoing = True
4996 if not needsincoming and not needsoutgoing:
4998 if not needsincoming and not needsoutgoing:
4997 return
4999 return
4998
5000
4999 def getincoming():
5001 def getincoming():
5000 source, branches = hg.parseurl(ui.expandpath('default'))
5002 source, branches = hg.parseurl(ui.expandpath('default'))
5001 sbranch = branches[0]
5003 sbranch = branches[0]
5002 try:
5004 try:
5003 other = hg.peer(repo, {}, source)
5005 other = hg.peer(repo, {}, source)
5004 except error.RepoError:
5006 except error.RepoError:
5005 if opts.get('remote'):
5007 if opts.get('remote'):
5006 raise
5008 raise
5007 return source, sbranch, None, None, None
5009 return source, sbranch, None, None, None
5008 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
5010 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
5009 if revs:
5011 if revs:
5010 revs = [other.lookup(rev) for rev in revs]
5012 revs = [other.lookup(rev) for rev in revs]
5011 ui.debug('comparing with %s\n' % util.hidepassword(source))
5013 ui.debug('comparing with %s\n' % util.hidepassword(source))
5012 repo.ui.pushbuffer()
5014 repo.ui.pushbuffer()
5013 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5015 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5014 repo.ui.popbuffer()
5016 repo.ui.popbuffer()
5015 return source, sbranch, other, commoninc, commoninc[1]
5017 return source, sbranch, other, commoninc, commoninc[1]
5016
5018
5017 if needsincoming:
5019 if needsincoming:
5018 source, sbranch, sother, commoninc, incoming = getincoming()
5020 source, sbranch, sother, commoninc, incoming = getincoming()
5019 else:
5021 else:
5020 source = sbranch = sother = commoninc = incoming = None
5022 source = sbranch = sother = commoninc = incoming = None
5021
5023
5022 def getoutgoing():
5024 def getoutgoing():
5023 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5025 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5024 dbranch = branches[0]
5026 dbranch = branches[0]
5025 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5027 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5026 if source != dest:
5028 if source != dest:
5027 try:
5029 try:
5028 dother = hg.peer(repo, {}, dest)
5030 dother = hg.peer(repo, {}, dest)
5029 except error.RepoError:
5031 except error.RepoError:
5030 if opts.get('remote'):
5032 if opts.get('remote'):
5031 raise
5033 raise
5032 return dest, dbranch, None, None
5034 return dest, dbranch, None, None
5033 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5035 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5034 elif sother is None:
5036 elif sother is None:
5035 # there is no explicit destination peer, but source one is invalid
5037 # there is no explicit destination peer, but source one is invalid
5036 return dest, dbranch, None, None
5038 return dest, dbranch, None, None
5037 else:
5039 else:
5038 dother = sother
5040 dother = sother
5039 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5041 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5040 common = None
5042 common = None
5041 else:
5043 else:
5042 common = commoninc
5044 common = commoninc
5043 if revs:
5045 if revs:
5044 revs = [repo.lookup(rev) for rev in revs]
5046 revs = [repo.lookup(rev) for rev in revs]
5045 repo.ui.pushbuffer()
5047 repo.ui.pushbuffer()
5046 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5048 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5047 commoninc=common)
5049 commoninc=common)
5048 repo.ui.popbuffer()
5050 repo.ui.popbuffer()
5049 return dest, dbranch, dother, outgoing
5051 return dest, dbranch, dother, outgoing
5050
5052
5051 if needsoutgoing:
5053 if needsoutgoing:
5052 dest, dbranch, dother, outgoing = getoutgoing()
5054 dest, dbranch, dother, outgoing = getoutgoing()
5053 else:
5055 else:
5054 dest = dbranch = dother = outgoing = None
5056 dest = dbranch = dother = outgoing = None
5055
5057
5056 if opts.get('remote'):
5058 if opts.get('remote'):
5057 t = []
5059 t = []
5058 if incoming:
5060 if incoming:
5059 t.append(_('1 or more incoming'))
5061 t.append(_('1 or more incoming'))
5060 o = outgoing.missing
5062 o = outgoing.missing
5061 if o:
5063 if o:
5062 t.append(_('%d outgoing') % len(o))
5064 t.append(_('%d outgoing') % len(o))
5063 other = dother or sother
5065 other = dother or sother
5064 if 'bookmarks' in other.listkeys('namespaces'):
5066 if 'bookmarks' in other.listkeys('namespaces'):
5065 counts = bookmarks.summary(repo, other)
5067 counts = bookmarks.summary(repo, other)
5066 if counts[0] > 0:
5068 if counts[0] > 0:
5067 t.append(_('%d incoming bookmarks') % counts[0])
5069 t.append(_('%d incoming bookmarks') % counts[0])
5068 if counts[1] > 0:
5070 if counts[1] > 0:
5069 t.append(_('%d outgoing bookmarks') % counts[1])
5071 t.append(_('%d outgoing bookmarks') % counts[1])
5070
5072
5071 if t:
5073 if t:
5072 # i18n: column positioning for "hg summary"
5074 # i18n: column positioning for "hg summary"
5073 ui.write(_('remote: %s\n') % (', '.join(t)))
5075 ui.write(_('remote: %s\n') % (', '.join(t)))
5074 else:
5076 else:
5075 # i18n: column positioning for "hg summary"
5077 # i18n: column positioning for "hg summary"
5076 ui.status(_('remote: (synced)\n'))
5078 ui.status(_('remote: (synced)\n'))
5077
5079
5078 cmdutil.summaryremotehooks(ui, repo, opts,
5080 cmdutil.summaryremotehooks(ui, repo, opts,
5079 ((source, sbranch, sother, commoninc),
5081 ((source, sbranch, sother, commoninc),
5080 (dest, dbranch, dother, outgoing)))
5082 (dest, dbranch, dother, outgoing)))
5081
5083
5082 @command('tag',
5084 @command('tag',
5083 [('f', 'force', None, _('force tag')),
5085 [('f', 'force', None, _('force tag')),
5084 ('l', 'local', None, _('make the tag local')),
5086 ('l', 'local', None, _('make the tag local')),
5085 ('r', 'rev', '', _('revision to tag'), _('REV')),
5087 ('r', 'rev', '', _('revision to tag'), _('REV')),
5086 ('', 'remove', None, _('remove a tag')),
5088 ('', 'remove', None, _('remove a tag')),
5087 # -l/--local is already there, commitopts cannot be used
5089 # -l/--local is already there, commitopts cannot be used
5088 ('e', 'edit', None, _('invoke editor on commit messages')),
5090 ('e', 'edit', None, _('invoke editor on commit messages')),
5089 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5091 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5090 ] + commitopts2,
5092 ] + commitopts2,
5091 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5093 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5092 def tag(ui, repo, name1, *names, **opts):
5094 def tag(ui, repo, name1, *names, **opts):
5093 """add one or more tags for the current or given revision
5095 """add one or more tags for the current or given revision
5094
5096
5095 Name a particular revision using <name>.
5097 Name a particular revision using <name>.
5096
5098
5097 Tags are used to name particular revisions of the repository and are
5099 Tags are used to name particular revisions of the repository and are
5098 very useful to compare different revisions, to go back to significant
5100 very useful to compare different revisions, to go back to significant
5099 earlier versions or to mark branch points as releases, etc. Changing
5101 earlier versions or to mark branch points as releases, etc. Changing
5100 an existing tag is normally disallowed; use -f/--force to override.
5102 an existing tag is normally disallowed; use -f/--force to override.
5101
5103
5102 If no revision is given, the parent of the working directory is
5104 If no revision is given, the parent of the working directory is
5103 used.
5105 used.
5104
5106
5105 To facilitate version control, distribution, and merging of tags,
5107 To facilitate version control, distribution, and merging of tags,
5106 they are stored as a file named ".hgtags" which is managed similarly
5108 they are stored as a file named ".hgtags" which is managed similarly
5107 to other project files and can be hand-edited if necessary. This
5109 to other project files and can be hand-edited if necessary. This
5108 also means that tagging creates a new commit. The file
5110 also means that tagging creates a new commit. The file
5109 ".hg/localtags" is used for local tags (not shared among
5111 ".hg/localtags" is used for local tags (not shared among
5110 repositories).
5112 repositories).
5111
5113
5112 Tag commits are usually made at the head of a branch. If the parent
5114 Tag commits are usually made at the head of a branch. If the parent
5113 of the working directory is not a branch head, :hg:`tag` aborts; use
5115 of the working directory is not a branch head, :hg:`tag` aborts; use
5114 -f/--force to force the tag commit to be based on a non-head
5116 -f/--force to force the tag commit to be based on a non-head
5115 changeset.
5117 changeset.
5116
5118
5117 See :hg:`help dates` for a list of formats valid for -d/--date.
5119 See :hg:`help dates` for a list of formats valid for -d/--date.
5118
5120
5119 Since tag names have priority over branch names during revision
5121 Since tag names have priority over branch names during revision
5120 lookup, using an existing branch name as a tag name is discouraged.
5122 lookup, using an existing branch name as a tag name is discouraged.
5121
5123
5122 Returns 0 on success.
5124 Returns 0 on success.
5123 """
5125 """
5124 wlock = lock = None
5126 wlock = lock = None
5125 try:
5127 try:
5126 wlock = repo.wlock()
5128 wlock = repo.wlock()
5127 lock = repo.lock()
5129 lock = repo.lock()
5128 rev_ = "."
5130 rev_ = "."
5129 names = [t.strip() for t in (name1,) + names]
5131 names = [t.strip() for t in (name1,) + names]
5130 if len(names) != len(set(names)):
5132 if len(names) != len(set(names)):
5131 raise error.Abort(_('tag names must be unique'))
5133 raise error.Abort(_('tag names must be unique'))
5132 for n in names:
5134 for n in names:
5133 scmutil.checknewlabel(repo, n, 'tag')
5135 scmutil.checknewlabel(repo, n, 'tag')
5134 if not n:
5136 if not n:
5135 raise error.Abort(_('tag names cannot consist entirely of '
5137 raise error.Abort(_('tag names cannot consist entirely of '
5136 'whitespace'))
5138 'whitespace'))
5137 if opts.get('rev') and opts.get('remove'):
5139 if opts.get('rev') and opts.get('remove'):
5138 raise error.Abort(_("--rev and --remove are incompatible"))
5140 raise error.Abort(_("--rev and --remove are incompatible"))
5139 if opts.get('rev'):
5141 if opts.get('rev'):
5140 rev_ = opts['rev']
5142 rev_ = opts['rev']
5141 message = opts.get('message')
5143 message = opts.get('message')
5142 if opts.get('remove'):
5144 if opts.get('remove'):
5143 if opts.get('local'):
5145 if opts.get('local'):
5144 expectedtype = 'local'
5146 expectedtype = 'local'
5145 else:
5147 else:
5146 expectedtype = 'global'
5148 expectedtype = 'global'
5147
5149
5148 for n in names:
5150 for n in names:
5149 if not repo.tagtype(n):
5151 if not repo.tagtype(n):
5150 raise error.Abort(_("tag '%s' does not exist") % n)
5152 raise error.Abort(_("tag '%s' does not exist") % n)
5151 if repo.tagtype(n) != expectedtype:
5153 if repo.tagtype(n) != expectedtype:
5152 if expectedtype == 'global':
5154 if expectedtype == 'global':
5153 raise error.Abort(_("tag '%s' is not a global tag") % n)
5155 raise error.Abort(_("tag '%s' is not a global tag") % n)
5154 else:
5156 else:
5155 raise error.Abort(_("tag '%s' is not a local tag") % n)
5157 raise error.Abort(_("tag '%s' is not a local tag") % n)
5156 rev_ = 'null'
5158 rev_ = 'null'
5157 if not message:
5159 if not message:
5158 # we don't translate commit messages
5160 # we don't translate commit messages
5159 message = 'Removed tag %s' % ', '.join(names)
5161 message = 'Removed tag %s' % ', '.join(names)
5160 elif not opts.get('force'):
5162 elif not opts.get('force'):
5161 for n in names:
5163 for n in names:
5162 if n in repo.tags():
5164 if n in repo.tags():
5163 raise error.Abort(_("tag '%s' already exists "
5165 raise error.Abort(_("tag '%s' already exists "
5164 "(use -f to force)") % n)
5166 "(use -f to force)") % n)
5165 if not opts.get('local'):
5167 if not opts.get('local'):
5166 p1, p2 = repo.dirstate.parents()
5168 p1, p2 = repo.dirstate.parents()
5167 if p2 != nullid:
5169 if p2 != nullid:
5168 raise error.Abort(_('uncommitted merge'))
5170 raise error.Abort(_('uncommitted merge'))
5169 bheads = repo.branchheads()
5171 bheads = repo.branchheads()
5170 if not opts.get('force') and bheads and p1 not in bheads:
5172 if not opts.get('force') and bheads and p1 not in bheads:
5171 raise error.Abort(_('working directory is not at a branch head '
5173 raise error.Abort(_('working directory is not at a branch head '
5172 '(use -f to force)'))
5174 '(use -f to force)'))
5173 r = scmutil.revsingle(repo, rev_).node()
5175 r = scmutil.revsingle(repo, rev_).node()
5174
5176
5175 if not message:
5177 if not message:
5176 # we don't translate commit messages
5178 # we don't translate commit messages
5177 message = ('Added tag %s for changeset %s' %
5179 message = ('Added tag %s for changeset %s' %
5178 (', '.join(names), short(r)))
5180 (', '.join(names), short(r)))
5179
5181
5180 date = opts.get('date')
5182 date = opts.get('date')
5181 if date:
5183 if date:
5182 date = util.parsedate(date)
5184 date = util.parsedate(date)
5183
5185
5184 if opts.get('remove'):
5186 if opts.get('remove'):
5185 editform = 'tag.remove'
5187 editform = 'tag.remove'
5186 else:
5188 else:
5187 editform = 'tag.add'
5189 editform = 'tag.add'
5188 editor = cmdutil.getcommiteditor(editform=editform, **opts)
5190 editor = cmdutil.getcommiteditor(editform=editform, **opts)
5189
5191
5190 # don't allow tagging the null rev
5192 # don't allow tagging the null rev
5191 if (not opts.get('remove') and
5193 if (not opts.get('remove') and
5192 scmutil.revsingle(repo, rev_).rev() == nullrev):
5194 scmutil.revsingle(repo, rev_).rev() == nullrev):
5193 raise error.Abort(_("cannot tag null revision"))
5195 raise error.Abort(_("cannot tag null revision"))
5194
5196
5195 tagsmod.tag(repo, names, r, message, opts.get('local'),
5197 tagsmod.tag(repo, names, r, message, opts.get('local'),
5196 opts.get('user'), date, editor=editor)
5198 opts.get('user'), date, editor=editor)
5197 finally:
5199 finally:
5198 release(lock, wlock)
5200 release(lock, wlock)
5199
5201
5200 @command('tags', formatteropts, '')
5202 @command('tags', formatteropts, '')
5201 def tags(ui, repo, **opts):
5203 def tags(ui, repo, **opts):
5202 """list repository tags
5204 """list repository tags
5203
5205
5204 This lists both regular and local tags. When the -v/--verbose
5206 This lists both regular and local tags. When the -v/--verbose
5205 switch is used, a third column "local" is printed for local tags.
5207 switch is used, a third column "local" is printed for local tags.
5206 When the -q/--quiet switch is used, only the tag name is printed.
5208 When the -q/--quiet switch is used, only the tag name is printed.
5207
5209
5208 Returns 0 on success.
5210 Returns 0 on success.
5209 """
5211 """
5210
5212
5211 ui.pager('tags')
5213 ui.pager('tags')
5212 fm = ui.formatter('tags', opts)
5214 fm = ui.formatter('tags', opts)
5213 hexfunc = fm.hexfunc
5215 hexfunc = fm.hexfunc
5214 tagtype = ""
5216 tagtype = ""
5215
5217
5216 for t, n in reversed(repo.tagslist()):
5218 for t, n in reversed(repo.tagslist()):
5217 hn = hexfunc(n)
5219 hn = hexfunc(n)
5218 label = 'tags.normal'
5220 label = 'tags.normal'
5219 tagtype = ''
5221 tagtype = ''
5220 if repo.tagtype(t) == 'local':
5222 if repo.tagtype(t) == 'local':
5221 label = 'tags.local'
5223 label = 'tags.local'
5222 tagtype = 'local'
5224 tagtype = 'local'
5223
5225
5224 fm.startitem()
5226 fm.startitem()
5225 fm.write('tag', '%s', t, label=label)
5227 fm.write('tag', '%s', t, label=label)
5226 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5228 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5227 fm.condwrite(not ui.quiet, 'rev node', fmt,
5229 fm.condwrite(not ui.quiet, 'rev node', fmt,
5228 repo.changelog.rev(n), hn, label=label)
5230 repo.changelog.rev(n), hn, label=label)
5229 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5231 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5230 tagtype, label=label)
5232 tagtype, label=label)
5231 fm.plain('\n')
5233 fm.plain('\n')
5232 fm.end()
5234 fm.end()
5233
5235
5234 @command('tip',
5236 @command('tip',
5235 [('p', 'patch', None, _('show patch')),
5237 [('p', 'patch', None, _('show patch')),
5236 ('g', 'git', None, _('use git extended diff format')),
5238 ('g', 'git', None, _('use git extended diff format')),
5237 ] + templateopts,
5239 ] + templateopts,
5238 _('[-p] [-g]'))
5240 _('[-p] [-g]'))
5239 def tip(ui, repo, **opts):
5241 def tip(ui, repo, **opts):
5240 """show the tip revision (DEPRECATED)
5242 """show the tip revision (DEPRECATED)
5241
5243
5242 The tip revision (usually just called the tip) is the changeset
5244 The tip revision (usually just called the tip) is the changeset
5243 most recently added to the repository (and therefore the most
5245 most recently added to the repository (and therefore the most
5244 recently changed head).
5246 recently changed head).
5245
5247
5246 If you have just made a commit, that commit will be the tip. If
5248 If you have just made a commit, that commit will be the tip. If
5247 you have just pulled changes from another repository, the tip of
5249 you have just pulled changes from another repository, the tip of
5248 that repository becomes the current tip. The "tip" tag is special
5250 that repository becomes the current tip. The "tip" tag is special
5249 and cannot be renamed or assigned to a different changeset.
5251 and cannot be renamed or assigned to a different changeset.
5250
5252
5251 This command is deprecated, please use :hg:`heads` instead.
5253 This command is deprecated, please use :hg:`heads` instead.
5252
5254
5253 Returns 0 on success.
5255 Returns 0 on success.
5254 """
5256 """
5255 displayer = cmdutil.show_changeset(ui, repo, opts)
5257 displayer = cmdutil.show_changeset(ui, repo, opts)
5256 displayer.show(repo['tip'])
5258 displayer.show(repo['tip'])
5257 displayer.close()
5259 displayer.close()
5258
5260
5259 @command('unbundle',
5261 @command('unbundle',
5260 [('u', 'update', None,
5262 [('u', 'update', None,
5261 _('update to new branch head if changesets were unbundled'))],
5263 _('update to new branch head if changesets were unbundled'))],
5262 _('[-u] FILE...'))
5264 _('[-u] FILE...'))
5263 def unbundle(ui, repo, fname1, *fnames, **opts):
5265 def unbundle(ui, repo, fname1, *fnames, **opts):
5264 """apply one or more bundle files
5266 """apply one or more bundle files
5265
5267
5266 Apply one or more bundle files generated by :hg:`bundle`.
5268 Apply one or more bundle files generated by :hg:`bundle`.
5267
5269
5268 Returns 0 on success, 1 if an update has unresolved files.
5270 Returns 0 on success, 1 if an update has unresolved files.
5269 """
5271 """
5270 fnames = (fname1,) + fnames
5272 fnames = (fname1,) + fnames
5271
5273
5272 with repo.lock():
5274 with repo.lock():
5273 for fname in fnames:
5275 for fname in fnames:
5274 f = hg.openpath(ui, fname)
5276 f = hg.openpath(ui, fname)
5275 gen = exchange.readbundle(ui, f, fname)
5277 gen = exchange.readbundle(ui, f, fname)
5276 if isinstance(gen, bundle2.unbundle20):
5278 if isinstance(gen, bundle2.unbundle20):
5277 tr = repo.transaction('unbundle')
5279 tr = repo.transaction('unbundle')
5278 try:
5280 try:
5279 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
5281 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
5280 url='bundle:' + fname)
5282 url='bundle:' + fname)
5281 tr.close()
5283 tr.close()
5282 except error.BundleUnknownFeatureError as exc:
5284 except error.BundleUnknownFeatureError as exc:
5283 raise error.Abort(_('%s: unknown bundle feature, %s')
5285 raise error.Abort(_('%s: unknown bundle feature, %s')
5284 % (fname, exc),
5286 % (fname, exc),
5285 hint=_("see https://mercurial-scm.org/"
5287 hint=_("see https://mercurial-scm.org/"
5286 "wiki/BundleFeature for more "
5288 "wiki/BundleFeature for more "
5287 "information"))
5289 "information"))
5288 finally:
5290 finally:
5289 if tr:
5291 if tr:
5290 tr.release()
5292 tr.release()
5291 changes = [r.get('return', 0)
5293 changes = [r.get('return', 0)
5292 for r in op.records['changegroup']]
5294 for r in op.records['changegroup']]
5293 modheads = changegroup.combineresults(changes)
5295 modheads = changegroup.combineresults(changes)
5294 elif isinstance(gen, streamclone.streamcloneapplier):
5296 elif isinstance(gen, streamclone.streamcloneapplier):
5295 raise error.Abort(
5297 raise error.Abort(
5296 _('packed bundles cannot be applied with '
5298 _('packed bundles cannot be applied with '
5297 '"hg unbundle"'),
5299 '"hg unbundle"'),
5298 hint=_('use "hg debugapplystreamclonebundle"'))
5300 hint=_('use "hg debugapplystreamclonebundle"'))
5299 else:
5301 else:
5300 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
5302 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
5301
5303
5302 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
5304 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
5303
5305
5304 @command('^update|up|checkout|co',
5306 @command('^update|up|checkout|co',
5305 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5307 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5306 ('c', 'check', None, _('require clean working directory')),
5308 ('c', 'check', None, _('require clean working directory')),
5307 ('m', 'merge', None, _('merge uncommitted changes')),
5309 ('m', 'merge', None, _('merge uncommitted changes')),
5308 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5310 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5309 ('r', 'rev', '', _('revision'), _('REV'))
5311 ('r', 'rev', '', _('revision'), _('REV'))
5310 ] + mergetoolopts,
5312 ] + mergetoolopts,
5311 _('[-C|-c|-m] [-d DATE] [[-r] REV]'))
5313 _('[-C|-c|-m] [-d DATE] [[-r] REV]'))
5312 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
5314 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
5313 merge=None, tool=None):
5315 merge=None, tool=None):
5314 """update working directory (or switch revisions)
5316 """update working directory (or switch revisions)
5315
5317
5316 Update the repository's working directory to the specified
5318 Update the repository's working directory to the specified
5317 changeset. If no changeset is specified, update to the tip of the
5319 changeset. If no changeset is specified, update to the tip of the
5318 current named branch and move the active bookmark (see :hg:`help
5320 current named branch and move the active bookmark (see :hg:`help
5319 bookmarks`).
5321 bookmarks`).
5320
5322
5321 Update sets the working directory's parent revision to the specified
5323 Update sets the working directory's parent revision to the specified
5322 changeset (see :hg:`help parents`).
5324 changeset (see :hg:`help parents`).
5323
5325
5324 If the changeset is not a descendant or ancestor of the working
5326 If the changeset is not a descendant or ancestor of the working
5325 directory's parent and there are uncommitted changes, the update is
5327 directory's parent and there are uncommitted changes, the update is
5326 aborted. With the -c/--check option, the working directory is checked
5328 aborted. With the -c/--check option, the working directory is checked
5327 for uncommitted changes; if none are found, the working directory is
5329 for uncommitted changes; if none are found, the working directory is
5328 updated to the specified changeset.
5330 updated to the specified changeset.
5329
5331
5330 .. container:: verbose
5332 .. container:: verbose
5331
5333
5332 The -C/--clean, -c/--check, and -m/--merge options control what
5334 The -C/--clean, -c/--check, and -m/--merge options control what
5333 happens if the working directory contains uncommitted changes.
5335 happens if the working directory contains uncommitted changes.
5334 At most of one of them can be specified.
5336 At most of one of them can be specified.
5335
5337
5336 1. If no option is specified, and if
5338 1. If no option is specified, and if
5337 the requested changeset is an ancestor or descendant of
5339 the requested changeset is an ancestor or descendant of
5338 the working directory's parent, the uncommitted changes
5340 the working directory's parent, the uncommitted changes
5339 are merged into the requested changeset and the merged
5341 are merged into the requested changeset and the merged
5340 result is left uncommitted. If the requested changeset is
5342 result is left uncommitted. If the requested changeset is
5341 not an ancestor or descendant (that is, it is on another
5343 not an ancestor or descendant (that is, it is on another
5342 branch), the update is aborted and the uncommitted changes
5344 branch), the update is aborted and the uncommitted changes
5343 are preserved.
5345 are preserved.
5344
5346
5345 2. With the -m/--merge option, the update is allowed even if the
5347 2. With the -m/--merge option, the update is allowed even if the
5346 requested changeset is not an ancestor or descendant of
5348 requested changeset is not an ancestor or descendant of
5347 the working directory's parent.
5349 the working directory's parent.
5348
5350
5349 3. With the -c/--check option, the update is aborted and the
5351 3. With the -c/--check option, the update is aborted and the
5350 uncommitted changes are preserved.
5352 uncommitted changes are preserved.
5351
5353
5352 4. With the -C/--clean option, uncommitted changes are discarded and
5354 4. With the -C/--clean option, uncommitted changes are discarded and
5353 the working directory is updated to the requested changeset.
5355 the working directory is updated to the requested changeset.
5354
5356
5355 To cancel an uncommitted merge (and lose your changes), use
5357 To cancel an uncommitted merge (and lose your changes), use
5356 :hg:`update --clean .`.
5358 :hg:`update --clean .`.
5357
5359
5358 Use null as the changeset to remove the working directory (like
5360 Use null as the changeset to remove the working directory (like
5359 :hg:`clone -U`).
5361 :hg:`clone -U`).
5360
5362
5361 If you want to revert just one file to an older revision, use
5363 If you want to revert just one file to an older revision, use
5362 :hg:`revert [-r REV] NAME`.
5364 :hg:`revert [-r REV] NAME`.
5363
5365
5364 See :hg:`help dates` for a list of formats valid for -d/--date.
5366 See :hg:`help dates` for a list of formats valid for -d/--date.
5365
5367
5366 Returns 0 on success, 1 if there are unresolved files.
5368 Returns 0 on success, 1 if there are unresolved files.
5367 """
5369 """
5368 if rev and node:
5370 if rev and node:
5369 raise error.Abort(_("please specify just one revision"))
5371 raise error.Abort(_("please specify just one revision"))
5370
5372
5371 if ui.configbool('commands', 'update.requiredest'):
5373 if ui.configbool('commands', 'update.requiredest'):
5372 if not node and not rev and not date:
5374 if not node and not rev and not date:
5373 raise error.Abort(_('you must specify a destination'),
5375 raise error.Abort(_('you must specify a destination'),
5374 hint=_('for example: hg update ".::"'))
5376 hint=_('for example: hg update ".::"'))
5375
5377
5376 if rev is None or rev == '':
5378 if rev is None or rev == '':
5377 rev = node
5379 rev = node
5378
5380
5379 if date and rev is not None:
5381 if date and rev is not None:
5380 raise error.Abort(_("you can't specify a revision and a date"))
5382 raise error.Abort(_("you can't specify a revision and a date"))
5381
5383
5382 if len([x for x in (clean, check, merge) if x]) > 1:
5384 if len([x for x in (clean, check, merge) if x]) > 1:
5383 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
5385 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
5384 "or -m/merge"))
5386 "or -m/merge"))
5385
5387
5386 updatecheck = None
5388 updatecheck = None
5387 if check:
5389 if check:
5388 updatecheck = 'abort'
5390 updatecheck = 'abort'
5389 elif merge:
5391 elif merge:
5390 updatecheck = 'none'
5392 updatecheck = 'none'
5391
5393
5392 with repo.wlock():
5394 with repo.wlock():
5393 cmdutil.clearunfinished(repo)
5395 cmdutil.clearunfinished(repo)
5394
5396
5395 if date:
5397 if date:
5396 rev = cmdutil.finddate(ui, repo, date)
5398 rev = cmdutil.finddate(ui, repo, date)
5397
5399
5398 # if we defined a bookmark, we have to remember the original name
5400 # if we defined a bookmark, we have to remember the original name
5399 brev = rev
5401 brev = rev
5400 rev = scmutil.revsingle(repo, rev, rev).rev()
5402 rev = scmutil.revsingle(repo, rev, rev).rev()
5401
5403
5402 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
5404 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
5403
5405
5404 return hg.updatetotally(ui, repo, rev, brev, clean=clean,
5406 return hg.updatetotally(ui, repo, rev, brev, clean=clean,
5405 updatecheck=updatecheck)
5407 updatecheck=updatecheck)
5406
5408
5407 @command('verify', [])
5409 @command('verify', [])
5408 def verify(ui, repo):
5410 def verify(ui, repo):
5409 """verify the integrity of the repository
5411 """verify the integrity of the repository
5410
5412
5411 Verify the integrity of the current repository.
5413 Verify the integrity of the current repository.
5412
5414
5413 This will perform an extensive check of the repository's
5415 This will perform an extensive check of the repository's
5414 integrity, validating the hashes and checksums of each entry in
5416 integrity, validating the hashes and checksums of each entry in
5415 the changelog, manifest, and tracked files, as well as the
5417 the changelog, manifest, and tracked files, as well as the
5416 integrity of their crosslinks and indices.
5418 integrity of their crosslinks and indices.
5417
5419
5418 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
5420 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
5419 for more information about recovery from corruption of the
5421 for more information about recovery from corruption of the
5420 repository.
5422 repository.
5421
5423
5422 Returns 0 on success, 1 if errors are encountered.
5424 Returns 0 on success, 1 if errors are encountered.
5423 """
5425 """
5424 return hg.verify(repo)
5426 return hg.verify(repo)
5425
5427
5426 @command('version', [] + formatteropts, norepo=True)
5428 @command('version', [] + formatteropts, norepo=True)
5427 def version_(ui, **opts):
5429 def version_(ui, **opts):
5428 """output version and copyright information"""
5430 """output version and copyright information"""
5429 if ui.verbose:
5431 if ui.verbose:
5430 ui.pager('version')
5432 ui.pager('version')
5431 fm = ui.formatter("version", opts)
5433 fm = ui.formatter("version", opts)
5432 fm.startitem()
5434 fm.startitem()
5433 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
5435 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
5434 util.version())
5436 util.version())
5435 license = _(
5437 license = _(
5436 "(see https://mercurial-scm.org for more information)\n"
5438 "(see https://mercurial-scm.org for more information)\n"
5437 "\nCopyright (C) 2005-2017 Matt Mackall and others\n"
5439 "\nCopyright (C) 2005-2017 Matt Mackall and others\n"
5438 "This is free software; see the source for copying conditions. "
5440 "This is free software; see the source for copying conditions. "
5439 "There is NO\nwarranty; "
5441 "There is NO\nwarranty; "
5440 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5442 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5441 )
5443 )
5442 if not ui.quiet:
5444 if not ui.quiet:
5443 fm.plain(license)
5445 fm.plain(license)
5444
5446
5445 if ui.verbose:
5447 if ui.verbose:
5446 fm.plain(_("\nEnabled extensions:\n\n"))
5448 fm.plain(_("\nEnabled extensions:\n\n"))
5447 # format names and versions into columns
5449 # format names and versions into columns
5448 names = []
5450 names = []
5449 vers = []
5451 vers = []
5450 isinternals = []
5452 isinternals = []
5451 for name, module in extensions.extensions():
5453 for name, module in extensions.extensions():
5452 names.append(name)
5454 names.append(name)
5453 vers.append(extensions.moduleversion(module) or None)
5455 vers.append(extensions.moduleversion(module) or None)
5454 isinternals.append(extensions.ismoduleinternal(module))
5456 isinternals.append(extensions.ismoduleinternal(module))
5455 fn = fm.nested("extensions")
5457 fn = fm.nested("extensions")
5456 if names:
5458 if names:
5457 namefmt = " %%-%ds " % max(len(n) for n in names)
5459 namefmt = " %%-%ds " % max(len(n) for n in names)
5458 places = [_("external"), _("internal")]
5460 places = [_("external"), _("internal")]
5459 for n, v, p in zip(names, vers, isinternals):
5461 for n, v, p in zip(names, vers, isinternals):
5460 fn.startitem()
5462 fn.startitem()
5461 fn.condwrite(ui.verbose, "name", namefmt, n)
5463 fn.condwrite(ui.verbose, "name", namefmt, n)
5462 if ui.verbose:
5464 if ui.verbose:
5463 fn.plain("%s " % places[p])
5465 fn.plain("%s " % places[p])
5464 fn.data(bundled=p)
5466 fn.data(bundled=p)
5465 fn.condwrite(ui.verbose and v, "ver", "%s", v)
5467 fn.condwrite(ui.verbose and v, "ver", "%s", v)
5466 if ui.verbose:
5468 if ui.verbose:
5467 fn.plain("\n")
5469 fn.plain("\n")
5468 fn.end()
5470 fn.end()
5469 fm.end()
5471 fm.end()
5470
5472
5471 def loadcmdtable(ui, name, cmdtable):
5473 def loadcmdtable(ui, name, cmdtable):
5472 """Load command functions from specified cmdtable
5474 """Load command functions from specified cmdtable
5473 """
5475 """
5474 overrides = [cmd for cmd in cmdtable if cmd in table]
5476 overrides = [cmd for cmd in cmdtable if cmd in table]
5475 if overrides:
5477 if overrides:
5476 ui.warn(_("extension '%s' overrides commands: %s\n")
5478 ui.warn(_("extension '%s' overrides commands: %s\n")
5477 % (name, " ".join(overrides)))
5479 % (name, " ".join(overrides)))
5478 table.update(cmdtable)
5480 table.update(cmdtable)
General Comments 0
You need to be logged in to leave comments. Login now