##// END OF EJS Templates
py3: convert os.__file__ to bytes...
Pulkit Goyal -
r30892:44170550 default
parent child Browse files
Show More
@@ -1,6622 +1,6622 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 import socket
14 import socket
15 import string
15 import string
16 import sys
16 import sys
17 import tempfile
17 import tempfile
18 import time
18 import time
19
19
20 from .i18n import _
20 from .i18n import _
21 from .node import (
21 from .node import (
22 bin,
22 bin,
23 hex,
23 hex,
24 nullhex,
24 nullhex,
25 nullid,
25 nullid,
26 nullrev,
26 nullrev,
27 short,
27 short,
28 )
28 )
29 from . import (
29 from . import (
30 archival,
30 archival,
31 bookmarks,
31 bookmarks,
32 bundle2,
32 bundle2,
33 changegroup,
33 changegroup,
34 cmdutil,
34 cmdutil,
35 copies,
35 copies,
36 destutil,
36 destutil,
37 dirstateguard,
37 dirstateguard,
38 discovery,
38 discovery,
39 encoding,
39 encoding,
40 error,
40 error,
41 exchange,
41 exchange,
42 extensions,
42 extensions,
43 formatter,
43 formatter,
44 graphmod,
44 graphmod,
45 hbisect,
45 hbisect,
46 help,
46 help,
47 hg,
47 hg,
48 lock as lockmod,
48 lock as lockmod,
49 merge as mergemod,
49 merge as mergemod,
50 minirst,
50 minirst,
51 obsolete,
51 obsolete,
52 patch,
52 patch,
53 phases,
53 phases,
54 policy,
54 policy,
55 pvec,
55 pvec,
56 pycompat,
56 pycompat,
57 repair,
57 repair,
58 revlog,
58 revlog,
59 revset,
59 revset,
60 scmutil,
60 scmutil,
61 server,
61 server,
62 smartset,
62 smartset,
63 sshserver,
63 sshserver,
64 sslutil,
64 sslutil,
65 streamclone,
65 streamclone,
66 templatekw,
66 templatekw,
67 templater,
67 templater,
68 ui as uimod,
68 ui as uimod,
69 util,
69 util,
70 )
70 )
71
71
72 release = lockmod.release
72 release = lockmod.release
73
73
74 table = {}
74 table = {}
75
75
76 command = cmdutil.command(table)
76 command = cmdutil.command(table)
77
77
78 # label constants
78 # label constants
79 # until 3.5, bookmarks.current was the advertised name, not
79 # until 3.5, bookmarks.current was the advertised name, not
80 # bookmarks.active, so we must use both to avoid breaking old
80 # bookmarks.active, so we must use both to avoid breaking old
81 # custom styles
81 # custom styles
82 activebookmarklabel = 'bookmarks.active bookmarks.current'
82 activebookmarklabel = 'bookmarks.active bookmarks.current'
83
83
84 # common command options
84 # common command options
85
85
86 globalopts = [
86 globalopts = [
87 ('R', 'repository', '',
87 ('R', 'repository', '',
88 _('repository root directory or name of overlay bundle file'),
88 _('repository root directory or name of overlay bundle file'),
89 _('REPO')),
89 _('REPO')),
90 ('', 'cwd', '',
90 ('', 'cwd', '',
91 _('change working directory'), _('DIR')),
91 _('change working directory'), _('DIR')),
92 ('y', 'noninteractive', None,
92 ('y', 'noninteractive', None,
93 _('do not prompt, automatically pick the first choice for all prompts')),
93 _('do not prompt, automatically pick the first choice for all prompts')),
94 ('q', 'quiet', None, _('suppress output')),
94 ('q', 'quiet', None, _('suppress output')),
95 ('v', 'verbose', None, _('enable additional output')),
95 ('v', 'verbose', None, _('enable additional output')),
96 ('', 'config', [],
96 ('', 'config', [],
97 _('set/override config option (use \'section.name=value\')'),
97 _('set/override config option (use \'section.name=value\')'),
98 _('CONFIG')),
98 _('CONFIG')),
99 ('', 'debug', None, _('enable debugging output')),
99 ('', 'debug', None, _('enable debugging output')),
100 ('', 'debugger', None, _('start debugger')),
100 ('', 'debugger', None, _('start debugger')),
101 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
101 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
102 _('ENCODE')),
102 _('ENCODE')),
103 ('', 'encodingmode', encoding.encodingmode,
103 ('', 'encodingmode', encoding.encodingmode,
104 _('set the charset encoding mode'), _('MODE')),
104 _('set the charset encoding mode'), _('MODE')),
105 ('', 'traceback', None, _('always print a traceback on exception')),
105 ('', 'traceback', None, _('always print a traceback on exception')),
106 ('', 'time', None, _('time how long the command takes')),
106 ('', 'time', None, _('time how long the command takes')),
107 ('', 'profile', None, _('print command execution profile')),
107 ('', 'profile', None, _('print command execution profile')),
108 ('', 'version', None, _('output version information and exit')),
108 ('', 'version', None, _('output version information and exit')),
109 ('h', 'help', None, _('display help and exit')),
109 ('h', 'help', None, _('display help and exit')),
110 ('', 'hidden', False, _('consider hidden changesets')),
110 ('', 'hidden', False, _('consider hidden changesets')),
111 ]
111 ]
112
112
113 dryrunopts = [('n', 'dry-run', None,
113 dryrunopts = [('n', 'dry-run', None,
114 _('do not perform actions, just print output'))]
114 _('do not perform actions, just print output'))]
115
115
116 remoteopts = [
116 remoteopts = [
117 ('e', 'ssh', '',
117 ('e', 'ssh', '',
118 _('specify ssh command to use'), _('CMD')),
118 _('specify ssh command to use'), _('CMD')),
119 ('', 'remotecmd', '',
119 ('', 'remotecmd', '',
120 _('specify hg command to run on the remote side'), _('CMD')),
120 _('specify hg command to run on the remote side'), _('CMD')),
121 ('', 'insecure', None,
121 ('', 'insecure', None,
122 _('do not verify server certificate (ignoring web.cacerts config)')),
122 _('do not verify server certificate (ignoring web.cacerts config)')),
123 ]
123 ]
124
124
125 walkopts = [
125 walkopts = [
126 ('I', 'include', [],
126 ('I', 'include', [],
127 _('include names matching the given patterns'), _('PATTERN')),
127 _('include names matching the given patterns'), _('PATTERN')),
128 ('X', 'exclude', [],
128 ('X', 'exclude', [],
129 _('exclude names matching the given patterns'), _('PATTERN')),
129 _('exclude names matching the given patterns'), _('PATTERN')),
130 ]
130 ]
131
131
132 commitopts = [
132 commitopts = [
133 ('m', 'message', '',
133 ('m', 'message', '',
134 _('use text as commit message'), _('TEXT')),
134 _('use text as commit message'), _('TEXT')),
135 ('l', 'logfile', '',
135 ('l', 'logfile', '',
136 _('read commit message from file'), _('FILE')),
136 _('read commit message from file'), _('FILE')),
137 ]
137 ]
138
138
139 commitopts2 = [
139 commitopts2 = [
140 ('d', 'date', '',
140 ('d', 'date', '',
141 _('record the specified date as commit date'), _('DATE')),
141 _('record the specified date as commit date'), _('DATE')),
142 ('u', 'user', '',
142 ('u', 'user', '',
143 _('record the specified user as committer'), _('USER')),
143 _('record the specified user as committer'), _('USER')),
144 ]
144 ]
145
145
146 # hidden for now
146 # hidden for now
147 formatteropts = [
147 formatteropts = [
148 ('T', 'template', '',
148 ('T', 'template', '',
149 _('display with template (EXPERIMENTAL)'), _('TEMPLATE')),
149 _('display with template (EXPERIMENTAL)'), _('TEMPLATE')),
150 ]
150 ]
151
151
152 templateopts = [
152 templateopts = [
153 ('', 'style', '',
153 ('', 'style', '',
154 _('display using template map file (DEPRECATED)'), _('STYLE')),
154 _('display using template map file (DEPRECATED)'), _('STYLE')),
155 ('T', 'template', '',
155 ('T', 'template', '',
156 _('display with template'), _('TEMPLATE')),
156 _('display with template'), _('TEMPLATE')),
157 ]
157 ]
158
158
159 logopts = [
159 logopts = [
160 ('p', 'patch', None, _('show patch')),
160 ('p', 'patch', None, _('show patch')),
161 ('g', 'git', None, _('use git extended diff format')),
161 ('g', 'git', None, _('use git extended diff format')),
162 ('l', 'limit', '',
162 ('l', 'limit', '',
163 _('limit number of changes displayed'), _('NUM')),
163 _('limit number of changes displayed'), _('NUM')),
164 ('M', 'no-merges', None, _('do not show merges')),
164 ('M', 'no-merges', None, _('do not show merges')),
165 ('', 'stat', None, _('output diffstat-style summary of changes')),
165 ('', 'stat', None, _('output diffstat-style summary of changes')),
166 ('G', 'graph', None, _("show the revision DAG")),
166 ('G', 'graph', None, _("show the revision DAG")),
167 ] + templateopts
167 ] + templateopts
168
168
169 diffopts = [
169 diffopts = [
170 ('a', 'text', None, _('treat all files as text')),
170 ('a', 'text', None, _('treat all files as text')),
171 ('g', 'git', None, _('use git extended diff format')),
171 ('g', 'git', None, _('use git extended diff format')),
172 ('', 'nodates', None, _('omit dates from diff headers'))
172 ('', 'nodates', None, _('omit dates from diff headers'))
173 ]
173 ]
174
174
175 diffwsopts = [
175 diffwsopts = [
176 ('w', 'ignore-all-space', None,
176 ('w', 'ignore-all-space', None,
177 _('ignore white space when comparing lines')),
177 _('ignore white space when comparing lines')),
178 ('b', 'ignore-space-change', None,
178 ('b', 'ignore-space-change', None,
179 _('ignore changes in the amount of white space')),
179 _('ignore changes in the amount of white space')),
180 ('B', 'ignore-blank-lines', None,
180 ('B', 'ignore-blank-lines', None,
181 _('ignore changes whose lines are all blank')),
181 _('ignore changes whose lines are all blank')),
182 ]
182 ]
183
183
184 diffopts2 = [
184 diffopts2 = [
185 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')),
185 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')),
186 ('p', 'show-function', None, _('show which function each change is in')),
186 ('p', 'show-function', None, _('show which function each change is in')),
187 ('', 'reverse', None, _('produce a diff that undoes the changes')),
187 ('', 'reverse', None, _('produce a diff that undoes the changes')),
188 ] + diffwsopts + [
188 ] + diffwsopts + [
189 ('U', 'unified', '',
189 ('U', 'unified', '',
190 _('number of lines of context to show'), _('NUM')),
190 _('number of lines of context to show'), _('NUM')),
191 ('', 'stat', None, _('output diffstat-style summary of changes')),
191 ('', 'stat', None, _('output diffstat-style summary of changes')),
192 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')),
192 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')),
193 ]
193 ]
194
194
195 mergetoolopts = [
195 mergetoolopts = [
196 ('t', 'tool', '', _('specify merge tool')),
196 ('t', 'tool', '', _('specify merge tool')),
197 ]
197 ]
198
198
199 similarityopts = [
199 similarityopts = [
200 ('s', 'similarity', '',
200 ('s', 'similarity', '',
201 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
201 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
202 ]
202 ]
203
203
204 subrepoopts = [
204 subrepoopts = [
205 ('S', 'subrepos', None,
205 ('S', 'subrepos', None,
206 _('recurse into subrepositories'))
206 _('recurse into subrepositories'))
207 ]
207 ]
208
208
209 debugrevlogopts = [
209 debugrevlogopts = [
210 ('c', 'changelog', False, _('open changelog')),
210 ('c', 'changelog', False, _('open changelog')),
211 ('m', 'manifest', False, _('open manifest')),
211 ('m', 'manifest', False, _('open manifest')),
212 ('', 'dir', '', _('open directory manifest')),
212 ('', 'dir', '', _('open directory manifest')),
213 ]
213 ]
214
214
215 # Commands start here, listed alphabetically
215 # Commands start here, listed alphabetically
216
216
217 @command('^add',
217 @command('^add',
218 walkopts + subrepoopts + dryrunopts,
218 walkopts + subrepoopts + dryrunopts,
219 _('[OPTION]... [FILE]...'),
219 _('[OPTION]... [FILE]...'),
220 inferrepo=True)
220 inferrepo=True)
221 def add(ui, repo, *pats, **opts):
221 def add(ui, repo, *pats, **opts):
222 """add the specified files on the next commit
222 """add the specified files on the next commit
223
223
224 Schedule files to be version controlled and added to the
224 Schedule files to be version controlled and added to the
225 repository.
225 repository.
226
226
227 The files will be added to the repository at the next commit. To
227 The files will be added to the repository at the next commit. To
228 undo an add before that, see :hg:`forget`.
228 undo an add before that, see :hg:`forget`.
229
229
230 If no names are given, add all files to the repository (except
230 If no names are given, add all files to the repository (except
231 files matching ``.hgignore``).
231 files matching ``.hgignore``).
232
232
233 .. container:: verbose
233 .. container:: verbose
234
234
235 Examples:
235 Examples:
236
236
237 - New (unknown) files are added
237 - New (unknown) files are added
238 automatically by :hg:`add`::
238 automatically by :hg:`add`::
239
239
240 $ ls
240 $ ls
241 foo.c
241 foo.c
242 $ hg status
242 $ hg status
243 ? foo.c
243 ? foo.c
244 $ hg add
244 $ hg add
245 adding foo.c
245 adding foo.c
246 $ hg status
246 $ hg status
247 A foo.c
247 A foo.c
248
248
249 - Specific files to be added can be specified::
249 - Specific files to be added can be specified::
250
250
251 $ ls
251 $ ls
252 bar.c foo.c
252 bar.c foo.c
253 $ hg status
253 $ hg status
254 ? bar.c
254 ? bar.c
255 ? foo.c
255 ? foo.c
256 $ hg add bar.c
256 $ hg add bar.c
257 $ hg status
257 $ hg status
258 A bar.c
258 A bar.c
259 ? foo.c
259 ? foo.c
260
260
261 Returns 0 if all files are successfully added.
261 Returns 0 if all files are successfully added.
262 """
262 """
263
263
264 m = scmutil.match(repo[None], pats, opts)
264 m = scmutil.match(repo[None], pats, opts)
265 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
265 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
266 return rejected and 1 or 0
266 return rejected and 1 or 0
267
267
268 @command('addremove',
268 @command('addremove',
269 similarityopts + subrepoopts + walkopts + dryrunopts,
269 similarityopts + subrepoopts + walkopts + dryrunopts,
270 _('[OPTION]... [FILE]...'),
270 _('[OPTION]... [FILE]...'),
271 inferrepo=True)
271 inferrepo=True)
272 def addremove(ui, repo, *pats, **opts):
272 def addremove(ui, repo, *pats, **opts):
273 """add all new files, delete all missing files
273 """add all new files, delete all missing files
274
274
275 Add all new files and remove all missing files from the
275 Add all new files and remove all missing files from the
276 repository.
276 repository.
277
277
278 Unless names are given, new files are ignored if they match any of
278 Unless names are given, new files are ignored if they match any of
279 the patterns in ``.hgignore``. As with add, these changes take
279 the patterns in ``.hgignore``. As with add, these changes take
280 effect at the next commit.
280 effect at the next commit.
281
281
282 Use the -s/--similarity option to detect renamed files. This
282 Use the -s/--similarity option to detect renamed files. This
283 option takes a percentage between 0 (disabled) and 100 (files must
283 option takes a percentage between 0 (disabled) and 100 (files must
284 be identical) as its parameter. With a parameter greater than 0,
284 be identical) as its parameter. With a parameter greater than 0,
285 this compares every removed file with every added file and records
285 this compares every removed file with every added file and records
286 those similar enough as renames. Detecting renamed files this way
286 those similar enough as renames. Detecting renamed files this way
287 can be expensive. After using this option, :hg:`status -C` can be
287 can be expensive. After using this option, :hg:`status -C` can be
288 used to check which files were identified as moved or renamed. If
288 used to check which files were identified as moved or renamed. If
289 not specified, -s/--similarity defaults to 100 and only renames of
289 not specified, -s/--similarity defaults to 100 and only renames of
290 identical files are detected.
290 identical files are detected.
291
291
292 .. container:: verbose
292 .. container:: verbose
293
293
294 Examples:
294 Examples:
295
295
296 - A number of files (bar.c and foo.c) are new,
296 - A number of files (bar.c and foo.c) are new,
297 while foobar.c has been removed (without using :hg:`remove`)
297 while foobar.c has been removed (without using :hg:`remove`)
298 from the repository::
298 from the repository::
299
299
300 $ ls
300 $ ls
301 bar.c foo.c
301 bar.c foo.c
302 $ hg status
302 $ hg status
303 ! foobar.c
303 ! foobar.c
304 ? bar.c
304 ? bar.c
305 ? foo.c
305 ? foo.c
306 $ hg addremove
306 $ hg addremove
307 adding bar.c
307 adding bar.c
308 adding foo.c
308 adding foo.c
309 removing foobar.c
309 removing foobar.c
310 $ hg status
310 $ hg status
311 A bar.c
311 A bar.c
312 A foo.c
312 A foo.c
313 R foobar.c
313 R foobar.c
314
314
315 - A file foobar.c was moved to foo.c without using :hg:`rename`.
315 - A file foobar.c was moved to foo.c without using :hg:`rename`.
316 Afterwards, it was edited slightly::
316 Afterwards, it was edited slightly::
317
317
318 $ ls
318 $ ls
319 foo.c
319 foo.c
320 $ hg status
320 $ hg status
321 ! foobar.c
321 ! foobar.c
322 ? foo.c
322 ? foo.c
323 $ hg addremove --similarity 90
323 $ hg addremove --similarity 90
324 removing foobar.c
324 removing foobar.c
325 adding foo.c
325 adding foo.c
326 recording removal of foobar.c as rename to foo.c (94% similar)
326 recording removal of foobar.c as rename to foo.c (94% similar)
327 $ hg status -C
327 $ hg status -C
328 A foo.c
328 A foo.c
329 foobar.c
329 foobar.c
330 R foobar.c
330 R foobar.c
331
331
332 Returns 0 if all files are successfully added.
332 Returns 0 if all files are successfully added.
333 """
333 """
334 try:
334 try:
335 sim = float(opts.get('similarity') or 100)
335 sim = float(opts.get('similarity') or 100)
336 except ValueError:
336 except ValueError:
337 raise error.Abort(_('similarity must be a number'))
337 raise error.Abort(_('similarity must be a number'))
338 if sim < 0 or sim > 100:
338 if sim < 0 or sim > 100:
339 raise error.Abort(_('similarity must be between 0 and 100'))
339 raise error.Abort(_('similarity must be between 0 and 100'))
340 matcher = scmutil.match(repo[None], pats, opts)
340 matcher = scmutil.match(repo[None], pats, opts)
341 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
341 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
342
342
343 @command('^annotate|blame',
343 @command('^annotate|blame',
344 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
344 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
345 ('', 'follow', None,
345 ('', 'follow', None,
346 _('follow copies/renames and list the filename (DEPRECATED)')),
346 _('follow copies/renames and list the filename (DEPRECATED)')),
347 ('', 'no-follow', None, _("don't follow copies and renames")),
347 ('', 'no-follow', None, _("don't follow copies and renames")),
348 ('a', 'text', None, _('treat all files as text')),
348 ('a', 'text', None, _('treat all files as text')),
349 ('u', 'user', None, _('list the author (long with -v)')),
349 ('u', 'user', None, _('list the author (long with -v)')),
350 ('f', 'file', None, _('list the filename')),
350 ('f', 'file', None, _('list the filename')),
351 ('d', 'date', None, _('list the date (short with -q)')),
351 ('d', 'date', None, _('list the date (short with -q)')),
352 ('n', 'number', None, _('list the revision number (default)')),
352 ('n', 'number', None, _('list the revision number (default)')),
353 ('c', 'changeset', None, _('list the changeset')),
353 ('c', 'changeset', None, _('list the changeset')),
354 ('l', 'line-number', None, _('show line number at the first appearance'))
354 ('l', 'line-number', None, _('show line number at the first appearance'))
355 ] + diffwsopts + walkopts + formatteropts,
355 ] + diffwsopts + walkopts + formatteropts,
356 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
356 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
357 inferrepo=True)
357 inferrepo=True)
358 def annotate(ui, repo, *pats, **opts):
358 def annotate(ui, repo, *pats, **opts):
359 """show changeset information by line for each file
359 """show changeset information by line for each file
360
360
361 List changes in files, showing the revision id responsible for
361 List changes in files, showing the revision id responsible for
362 each line.
362 each line.
363
363
364 This command is useful for discovering when a change was made and
364 This command is useful for discovering when a change was made and
365 by whom.
365 by whom.
366
366
367 If you include --file, --user, or --date, the revision number is
367 If you include --file, --user, or --date, the revision number is
368 suppressed unless you also include --number.
368 suppressed unless you also include --number.
369
369
370 Without the -a/--text option, annotate will avoid processing files
370 Without the -a/--text option, annotate will avoid processing files
371 it detects as binary. With -a, annotate will annotate the file
371 it detects as binary. With -a, annotate will annotate the file
372 anyway, although the results will probably be neither useful
372 anyway, although the results will probably be neither useful
373 nor desirable.
373 nor desirable.
374
374
375 Returns 0 on success.
375 Returns 0 on success.
376 """
376 """
377 if not pats:
377 if not pats:
378 raise error.Abort(_('at least one filename or pattern is required'))
378 raise error.Abort(_('at least one filename or pattern is required'))
379
379
380 if opts.get('follow'):
380 if opts.get('follow'):
381 # --follow is deprecated and now just an alias for -f/--file
381 # --follow is deprecated and now just an alias for -f/--file
382 # to mimic the behavior of Mercurial before version 1.5
382 # to mimic the behavior of Mercurial before version 1.5
383 opts['file'] = True
383 opts['file'] = True
384
384
385 ctx = scmutil.revsingle(repo, opts.get('rev'))
385 ctx = scmutil.revsingle(repo, opts.get('rev'))
386
386
387 fm = ui.formatter('annotate', opts)
387 fm = ui.formatter('annotate', opts)
388 if ui.quiet:
388 if ui.quiet:
389 datefunc = util.shortdate
389 datefunc = util.shortdate
390 else:
390 else:
391 datefunc = util.datestr
391 datefunc = util.datestr
392 if ctx.rev() is None:
392 if ctx.rev() is None:
393 def hexfn(node):
393 def hexfn(node):
394 if node is None:
394 if node is None:
395 return None
395 return None
396 else:
396 else:
397 return fm.hexfunc(node)
397 return fm.hexfunc(node)
398 if opts.get('changeset'):
398 if opts.get('changeset'):
399 # omit "+" suffix which is appended to node hex
399 # omit "+" suffix which is appended to node hex
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 else:
405 else:
406 def formatrev(rev):
406 def formatrev(rev):
407 if rev is None:
407 if rev is None:
408 return '%d+' % ctx.p1().rev()
408 return '%d+' % ctx.p1().rev()
409 else:
409 else:
410 return '%d ' % rev
410 return '%d ' % rev
411 def formathex(hex):
411 def formathex(hex):
412 if hex is None:
412 if hex is None:
413 return '%s+' % fm.hexfunc(ctx.p1().node())
413 return '%s+' % fm.hexfunc(ctx.p1().node())
414 else:
414 else:
415 return '%s ' % hex
415 return '%s ' % hex
416 else:
416 else:
417 hexfn = fm.hexfunc
417 hexfn = fm.hexfunc
418 formatrev = formathex = str
418 formatrev = formathex = str
419
419
420 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
420 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
421 ('number', ' ', lambda x: x[0].rev(), formatrev),
421 ('number', ' ', lambda x: x[0].rev(), formatrev),
422 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
422 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
423 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
423 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
424 ('file', ' ', lambda x: x[0].path(), str),
424 ('file', ' ', lambda x: x[0].path(), str),
425 ('line_number', ':', lambda x: x[1], str),
425 ('line_number', ':', lambda x: x[1], str),
426 ]
426 ]
427 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
427 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
428
428
429 if (not opts.get('user') and not opts.get('changeset')
429 if (not opts.get('user') and not opts.get('changeset')
430 and not opts.get('date') and not opts.get('file')):
430 and not opts.get('date') and not opts.get('file')):
431 opts['number'] = True
431 opts['number'] = True
432
432
433 linenumber = opts.get('line_number') is not None
433 linenumber = opts.get('line_number') is not None
434 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
434 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
435 raise error.Abort(_('at least one of -n/-c is required for -l'))
435 raise error.Abort(_('at least one of -n/-c is required for -l'))
436
436
437 if fm.isplain():
437 if fm.isplain():
438 def makefunc(get, fmt):
438 def makefunc(get, fmt):
439 return lambda x: fmt(get(x))
439 return lambda x: fmt(get(x))
440 else:
440 else:
441 def makefunc(get, fmt):
441 def makefunc(get, fmt):
442 return get
442 return get
443 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
443 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
444 if opts.get(op)]
444 if opts.get(op)]
445 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
445 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
446 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
446 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
447 if opts.get(op))
447 if opts.get(op))
448
448
449 def bad(x, y):
449 def bad(x, y):
450 raise error.Abort("%s: %s" % (x, y))
450 raise error.Abort("%s: %s" % (x, y))
451
451
452 m = scmutil.match(ctx, pats, opts, badfn=bad)
452 m = scmutil.match(ctx, pats, opts, badfn=bad)
453
453
454 follow = not opts.get('no_follow')
454 follow = not opts.get('no_follow')
455 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
455 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
456 whitespace=True)
456 whitespace=True)
457 for abs in ctx.walk(m):
457 for abs in ctx.walk(m):
458 fctx = ctx[abs]
458 fctx = ctx[abs]
459 if not opts.get('text') and util.binary(fctx.data()):
459 if not opts.get('text') and util.binary(fctx.data()):
460 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
460 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
461 continue
461 continue
462
462
463 lines = fctx.annotate(follow=follow, linenumber=linenumber,
463 lines = fctx.annotate(follow=follow, linenumber=linenumber,
464 diffopts=diffopts)
464 diffopts=diffopts)
465 if not lines:
465 if not lines:
466 continue
466 continue
467 formats = []
467 formats = []
468 pieces = []
468 pieces = []
469
469
470 for f, sep in funcmap:
470 for f, sep in funcmap:
471 l = [f(n) for n, dummy in lines]
471 l = [f(n) for n, dummy in lines]
472 if fm.isplain():
472 if fm.isplain():
473 sizes = [encoding.colwidth(x) for x in l]
473 sizes = [encoding.colwidth(x) for x in l]
474 ml = max(sizes)
474 ml = max(sizes)
475 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
475 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
476 else:
476 else:
477 formats.append(['%s' for x in l])
477 formats.append(['%s' for x in l])
478 pieces.append(l)
478 pieces.append(l)
479
479
480 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
480 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
481 fm.startitem()
481 fm.startitem()
482 fm.write(fields, "".join(f), *p)
482 fm.write(fields, "".join(f), *p)
483 fm.write('line', ": %s", l[1])
483 fm.write('line', ": %s", l[1])
484
484
485 if not lines[-1][1].endswith('\n'):
485 if not lines[-1][1].endswith('\n'):
486 fm.plain('\n')
486 fm.plain('\n')
487
487
488 fm.end()
488 fm.end()
489
489
490 @command('archive',
490 @command('archive',
491 [('', 'no-decode', None, _('do not pass files through decoders')),
491 [('', 'no-decode', None, _('do not pass files through decoders')),
492 ('p', 'prefix', '', _('directory prefix for files in archive'),
492 ('p', 'prefix', '', _('directory prefix for files in archive'),
493 _('PREFIX')),
493 _('PREFIX')),
494 ('r', 'rev', '', _('revision to distribute'), _('REV')),
494 ('r', 'rev', '', _('revision to distribute'), _('REV')),
495 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
495 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
496 ] + subrepoopts + walkopts,
496 ] + subrepoopts + walkopts,
497 _('[OPTION]... DEST'))
497 _('[OPTION]... DEST'))
498 def archive(ui, repo, dest, **opts):
498 def archive(ui, repo, dest, **opts):
499 '''create an unversioned archive of a repository revision
499 '''create an unversioned archive of a repository revision
500
500
501 By default, the revision used is the parent of the working
501 By default, the revision used is the parent of the working
502 directory; use -r/--rev to specify a different revision.
502 directory; use -r/--rev to specify a different revision.
503
503
504 The archive type is automatically detected based on file
504 The archive type is automatically detected based on file
505 extension (to override, use -t/--type).
505 extension (to override, use -t/--type).
506
506
507 .. container:: verbose
507 .. container:: verbose
508
508
509 Examples:
509 Examples:
510
510
511 - create a zip file containing the 1.0 release::
511 - create a zip file containing the 1.0 release::
512
512
513 hg archive -r 1.0 project-1.0.zip
513 hg archive -r 1.0 project-1.0.zip
514
514
515 - create a tarball excluding .hg files::
515 - create a tarball excluding .hg files::
516
516
517 hg archive project.tar.gz -X ".hg*"
517 hg archive project.tar.gz -X ".hg*"
518
518
519 Valid types are:
519 Valid types are:
520
520
521 :``files``: a directory full of files (default)
521 :``files``: a directory full of files (default)
522 :``tar``: tar archive, uncompressed
522 :``tar``: tar archive, uncompressed
523 :``tbz2``: tar archive, compressed using bzip2
523 :``tbz2``: tar archive, compressed using bzip2
524 :``tgz``: tar archive, compressed using gzip
524 :``tgz``: tar archive, compressed using gzip
525 :``uzip``: zip archive, uncompressed
525 :``uzip``: zip archive, uncompressed
526 :``zip``: zip archive, compressed using deflate
526 :``zip``: zip archive, compressed using deflate
527
527
528 The exact name of the destination archive or directory is given
528 The exact name of the destination archive or directory is given
529 using a format string; see :hg:`help export` for details.
529 using a format string; see :hg:`help export` for details.
530
530
531 Each member added to an archive file has a directory prefix
531 Each member added to an archive file has a directory prefix
532 prepended. Use -p/--prefix to specify a format string for the
532 prepended. Use -p/--prefix to specify a format string for the
533 prefix. The default is the basename of the archive, with suffixes
533 prefix. The default is the basename of the archive, with suffixes
534 removed.
534 removed.
535
535
536 Returns 0 on success.
536 Returns 0 on success.
537 '''
537 '''
538
538
539 ctx = scmutil.revsingle(repo, opts.get('rev'))
539 ctx = scmutil.revsingle(repo, opts.get('rev'))
540 if not ctx:
540 if not ctx:
541 raise error.Abort(_('no working directory: please specify a revision'))
541 raise error.Abort(_('no working directory: please specify a revision'))
542 node = ctx.node()
542 node = ctx.node()
543 dest = cmdutil.makefilename(repo, dest, node)
543 dest = cmdutil.makefilename(repo, dest, node)
544 if os.path.realpath(dest) == repo.root:
544 if os.path.realpath(dest) == repo.root:
545 raise error.Abort(_('repository root cannot be destination'))
545 raise error.Abort(_('repository root cannot be destination'))
546
546
547 kind = opts.get('type') or archival.guesskind(dest) or 'files'
547 kind = opts.get('type') or archival.guesskind(dest) or 'files'
548 prefix = opts.get('prefix')
548 prefix = opts.get('prefix')
549
549
550 if dest == '-':
550 if dest == '-':
551 if kind == 'files':
551 if kind == 'files':
552 raise error.Abort(_('cannot archive plain files to stdout'))
552 raise error.Abort(_('cannot archive plain files to stdout'))
553 dest = cmdutil.makefileobj(repo, dest)
553 dest = cmdutil.makefileobj(repo, dest)
554 if not prefix:
554 if not prefix:
555 prefix = os.path.basename(repo.root) + '-%h'
555 prefix = os.path.basename(repo.root) + '-%h'
556
556
557 prefix = cmdutil.makefilename(repo, prefix, node)
557 prefix = cmdutil.makefilename(repo, prefix, node)
558 matchfn = scmutil.match(ctx, [], opts)
558 matchfn = scmutil.match(ctx, [], opts)
559 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
559 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
560 matchfn, prefix, subrepos=opts.get('subrepos'))
560 matchfn, prefix, subrepos=opts.get('subrepos'))
561
561
562 @command('backout',
562 @command('backout',
563 [('', 'merge', None, _('merge with old dirstate parent after backout')),
563 [('', 'merge', None, _('merge with old dirstate parent after backout')),
564 ('', 'commit', None,
564 ('', 'commit', None,
565 _('commit if no conflicts were encountered (DEPRECATED)')),
565 _('commit if no conflicts were encountered (DEPRECATED)')),
566 ('', 'no-commit', None, _('do not commit')),
566 ('', 'no-commit', None, _('do not commit')),
567 ('', 'parent', '',
567 ('', 'parent', '',
568 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
568 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
569 ('r', 'rev', '', _('revision to backout'), _('REV')),
569 ('r', 'rev', '', _('revision to backout'), _('REV')),
570 ('e', 'edit', False, _('invoke editor on commit messages')),
570 ('e', 'edit', False, _('invoke editor on commit messages')),
571 ] + mergetoolopts + walkopts + commitopts + commitopts2,
571 ] + mergetoolopts + walkopts + commitopts + commitopts2,
572 _('[OPTION]... [-r] REV'))
572 _('[OPTION]... [-r] REV'))
573 def backout(ui, repo, node=None, rev=None, **opts):
573 def backout(ui, repo, node=None, rev=None, **opts):
574 '''reverse effect of earlier changeset
574 '''reverse effect of earlier changeset
575
575
576 Prepare a new changeset with the effect of REV undone in the
576 Prepare a new changeset with the effect of REV undone in the
577 current working directory. If no conflicts were encountered,
577 current working directory. If no conflicts were encountered,
578 it will be committed immediately.
578 it will be committed immediately.
579
579
580 If REV is the parent of the working directory, then this new changeset
580 If REV is the parent of the working directory, then this new changeset
581 is committed automatically (unless --no-commit is specified).
581 is committed automatically (unless --no-commit is specified).
582
582
583 .. note::
583 .. note::
584
584
585 :hg:`backout` cannot be used to fix either an unwanted or
585 :hg:`backout` cannot be used to fix either an unwanted or
586 incorrect merge.
586 incorrect merge.
587
587
588 .. container:: verbose
588 .. container:: verbose
589
589
590 Examples:
590 Examples:
591
591
592 - Reverse the effect of the parent of the working directory.
592 - Reverse the effect of the parent of the working directory.
593 This backout will be committed immediately::
593 This backout will be committed immediately::
594
594
595 hg backout -r .
595 hg backout -r .
596
596
597 - Reverse the effect of previous bad revision 23::
597 - Reverse the effect of previous bad revision 23::
598
598
599 hg backout -r 23
599 hg backout -r 23
600
600
601 - Reverse the effect of previous bad revision 23 and
601 - Reverse the effect of previous bad revision 23 and
602 leave changes uncommitted::
602 leave changes uncommitted::
603
603
604 hg backout -r 23 --no-commit
604 hg backout -r 23 --no-commit
605 hg commit -m "Backout revision 23"
605 hg commit -m "Backout revision 23"
606
606
607 By default, the pending changeset will have one parent,
607 By default, the pending changeset will have one parent,
608 maintaining a linear history. With --merge, the pending
608 maintaining a linear history. With --merge, the pending
609 changeset will instead have two parents: the old parent of the
609 changeset will instead have two parents: the old parent of the
610 working directory and a new child of REV that simply undoes REV.
610 working directory and a new child of REV that simply undoes REV.
611
611
612 Before version 1.7, the behavior without --merge was equivalent
612 Before version 1.7, the behavior without --merge was equivalent
613 to specifying --merge followed by :hg:`update --clean .` to
613 to specifying --merge followed by :hg:`update --clean .` to
614 cancel the merge and leave the child of REV as a head to be
614 cancel the merge and leave the child of REV as a head to be
615 merged separately.
615 merged separately.
616
616
617 See :hg:`help dates` for a list of formats valid for -d/--date.
617 See :hg:`help dates` for a list of formats valid for -d/--date.
618
618
619 See :hg:`help revert` for a way to restore files to the state
619 See :hg:`help revert` for a way to restore files to the state
620 of another revision.
620 of another revision.
621
621
622 Returns 0 on success, 1 if nothing to backout or there are unresolved
622 Returns 0 on success, 1 if nothing to backout or there are unresolved
623 files.
623 files.
624 '''
624 '''
625 wlock = lock = None
625 wlock = lock = None
626 try:
626 try:
627 wlock = repo.wlock()
627 wlock = repo.wlock()
628 lock = repo.lock()
628 lock = repo.lock()
629 return _dobackout(ui, repo, node, rev, **opts)
629 return _dobackout(ui, repo, node, rev, **opts)
630 finally:
630 finally:
631 release(lock, wlock)
631 release(lock, wlock)
632
632
633 def _dobackout(ui, repo, node=None, rev=None, **opts):
633 def _dobackout(ui, repo, node=None, rev=None, **opts):
634 if opts.get('commit') and opts.get('no_commit'):
634 if opts.get('commit') and opts.get('no_commit'):
635 raise error.Abort(_("cannot use --commit with --no-commit"))
635 raise error.Abort(_("cannot use --commit with --no-commit"))
636 if opts.get('merge') and opts.get('no_commit'):
636 if opts.get('merge') and opts.get('no_commit'):
637 raise error.Abort(_("cannot use --merge with --no-commit"))
637 raise error.Abort(_("cannot use --merge with --no-commit"))
638
638
639 if rev and node:
639 if rev and node:
640 raise error.Abort(_("please specify just one revision"))
640 raise error.Abort(_("please specify just one revision"))
641
641
642 if not rev:
642 if not rev:
643 rev = node
643 rev = node
644
644
645 if not rev:
645 if not rev:
646 raise error.Abort(_("please specify a revision to backout"))
646 raise error.Abort(_("please specify a revision to backout"))
647
647
648 date = opts.get('date')
648 date = opts.get('date')
649 if date:
649 if date:
650 opts['date'] = util.parsedate(date)
650 opts['date'] = util.parsedate(date)
651
651
652 cmdutil.checkunfinished(repo)
652 cmdutil.checkunfinished(repo)
653 cmdutil.bailifchanged(repo)
653 cmdutil.bailifchanged(repo)
654 node = scmutil.revsingle(repo, rev).node()
654 node = scmutil.revsingle(repo, rev).node()
655
655
656 op1, op2 = repo.dirstate.parents()
656 op1, op2 = repo.dirstate.parents()
657 if not repo.changelog.isancestor(node, op1):
657 if not repo.changelog.isancestor(node, op1):
658 raise error.Abort(_('cannot backout change that is not an ancestor'))
658 raise error.Abort(_('cannot backout change that is not an ancestor'))
659
659
660 p1, p2 = repo.changelog.parents(node)
660 p1, p2 = repo.changelog.parents(node)
661 if p1 == nullid:
661 if p1 == nullid:
662 raise error.Abort(_('cannot backout a change with no parents'))
662 raise error.Abort(_('cannot backout a change with no parents'))
663 if p2 != nullid:
663 if p2 != nullid:
664 if not opts.get('parent'):
664 if not opts.get('parent'):
665 raise error.Abort(_('cannot backout a merge changeset'))
665 raise error.Abort(_('cannot backout a merge changeset'))
666 p = repo.lookup(opts['parent'])
666 p = repo.lookup(opts['parent'])
667 if p not in (p1, p2):
667 if p not in (p1, p2):
668 raise error.Abort(_('%s is not a parent of %s') %
668 raise error.Abort(_('%s is not a parent of %s') %
669 (short(p), short(node)))
669 (short(p), short(node)))
670 parent = p
670 parent = p
671 else:
671 else:
672 if opts.get('parent'):
672 if opts.get('parent'):
673 raise error.Abort(_('cannot use --parent on non-merge changeset'))
673 raise error.Abort(_('cannot use --parent on non-merge changeset'))
674 parent = p1
674 parent = p1
675
675
676 # the backout should appear on the same branch
676 # the backout should appear on the same branch
677 branch = repo.dirstate.branch()
677 branch = repo.dirstate.branch()
678 bheads = repo.branchheads(branch)
678 bheads = repo.branchheads(branch)
679 rctx = scmutil.revsingle(repo, hex(parent))
679 rctx = scmutil.revsingle(repo, hex(parent))
680 if not opts.get('merge') and op1 != node:
680 if not opts.get('merge') and op1 != node:
681 dsguard = dirstateguard.dirstateguard(repo, 'backout')
681 dsguard = dirstateguard.dirstateguard(repo, 'backout')
682 try:
682 try:
683 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
683 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
684 'backout')
684 'backout')
685 stats = mergemod.update(repo, parent, True, True, node, False)
685 stats = mergemod.update(repo, parent, True, True, node, False)
686 repo.setparents(op1, op2)
686 repo.setparents(op1, op2)
687 dsguard.close()
687 dsguard.close()
688 hg._showstats(repo, stats)
688 hg._showstats(repo, stats)
689 if stats[3]:
689 if stats[3]:
690 repo.ui.status(_("use 'hg resolve' to retry unresolved "
690 repo.ui.status(_("use 'hg resolve' to retry unresolved "
691 "file merges\n"))
691 "file merges\n"))
692 return 1
692 return 1
693 finally:
693 finally:
694 ui.setconfig('ui', 'forcemerge', '', '')
694 ui.setconfig('ui', 'forcemerge', '', '')
695 lockmod.release(dsguard)
695 lockmod.release(dsguard)
696 else:
696 else:
697 hg.clean(repo, node, show_stats=False)
697 hg.clean(repo, node, show_stats=False)
698 repo.dirstate.setbranch(branch)
698 repo.dirstate.setbranch(branch)
699 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
699 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
700
700
701 if opts.get('no_commit'):
701 if opts.get('no_commit'):
702 msg = _("changeset %s backed out, "
702 msg = _("changeset %s backed out, "
703 "don't forget to commit.\n")
703 "don't forget to commit.\n")
704 ui.status(msg % short(node))
704 ui.status(msg % short(node))
705 return 0
705 return 0
706
706
707 def commitfunc(ui, repo, message, match, opts):
707 def commitfunc(ui, repo, message, match, opts):
708 editform = 'backout'
708 editform = 'backout'
709 e = cmdutil.getcommiteditor(editform=editform, **opts)
709 e = cmdutil.getcommiteditor(editform=editform, **opts)
710 if not message:
710 if not message:
711 # we don't translate commit messages
711 # we don't translate commit messages
712 message = "Backed out changeset %s" % short(node)
712 message = "Backed out changeset %s" % short(node)
713 e = cmdutil.getcommiteditor(edit=True, editform=editform)
713 e = cmdutil.getcommiteditor(edit=True, editform=editform)
714 return repo.commit(message, opts.get('user'), opts.get('date'),
714 return repo.commit(message, opts.get('user'), opts.get('date'),
715 match, editor=e)
715 match, editor=e)
716 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
716 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
717 if not newnode:
717 if not newnode:
718 ui.status(_("nothing changed\n"))
718 ui.status(_("nothing changed\n"))
719 return 1
719 return 1
720 cmdutil.commitstatus(repo, newnode, branch, bheads)
720 cmdutil.commitstatus(repo, newnode, branch, bheads)
721
721
722 def nice(node):
722 def nice(node):
723 return '%d:%s' % (repo.changelog.rev(node), short(node))
723 return '%d:%s' % (repo.changelog.rev(node), short(node))
724 ui.status(_('changeset %s backs out changeset %s\n') %
724 ui.status(_('changeset %s backs out changeset %s\n') %
725 (nice(repo.changelog.tip()), nice(node)))
725 (nice(repo.changelog.tip()), nice(node)))
726 if opts.get('merge') and op1 != node:
726 if opts.get('merge') and op1 != node:
727 hg.clean(repo, op1, show_stats=False)
727 hg.clean(repo, op1, show_stats=False)
728 ui.status(_('merging with changeset %s\n')
728 ui.status(_('merging with changeset %s\n')
729 % nice(repo.changelog.tip()))
729 % nice(repo.changelog.tip()))
730 try:
730 try:
731 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
731 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
732 'backout')
732 'backout')
733 return hg.merge(repo, hex(repo.changelog.tip()))
733 return hg.merge(repo, hex(repo.changelog.tip()))
734 finally:
734 finally:
735 ui.setconfig('ui', 'forcemerge', '', '')
735 ui.setconfig('ui', 'forcemerge', '', '')
736 return 0
736 return 0
737
737
738 @command('bisect',
738 @command('bisect',
739 [('r', 'reset', False, _('reset bisect state')),
739 [('r', 'reset', False, _('reset bisect state')),
740 ('g', 'good', False, _('mark changeset good')),
740 ('g', 'good', False, _('mark changeset good')),
741 ('b', 'bad', False, _('mark changeset bad')),
741 ('b', 'bad', False, _('mark changeset bad')),
742 ('s', 'skip', False, _('skip testing changeset')),
742 ('s', 'skip', False, _('skip testing changeset')),
743 ('e', 'extend', False, _('extend the bisect range')),
743 ('e', 'extend', False, _('extend the bisect range')),
744 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
744 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
745 ('U', 'noupdate', False, _('do not update to target'))],
745 ('U', 'noupdate', False, _('do not update to target'))],
746 _("[-gbsr] [-U] [-c CMD] [REV]"))
746 _("[-gbsr] [-U] [-c CMD] [REV]"))
747 def bisect(ui, repo, rev=None, extra=None, command=None,
747 def bisect(ui, repo, rev=None, extra=None, command=None,
748 reset=None, good=None, bad=None, skip=None, extend=None,
748 reset=None, good=None, bad=None, skip=None, extend=None,
749 noupdate=None):
749 noupdate=None):
750 """subdivision search of changesets
750 """subdivision search of changesets
751
751
752 This command helps to find changesets which introduce problems. To
752 This command helps to find changesets which introduce problems. To
753 use, mark the earliest changeset you know exhibits the problem as
753 use, mark the earliest changeset you know exhibits the problem as
754 bad, then mark the latest changeset which is free from the problem
754 bad, then mark the latest changeset which is free from the problem
755 as good. Bisect will update your working directory to a revision
755 as good. Bisect will update your working directory to a revision
756 for testing (unless the -U/--noupdate option is specified). Once
756 for testing (unless the -U/--noupdate option is specified). Once
757 you have performed tests, mark the working directory as good or
757 you have performed tests, mark the working directory as good or
758 bad, and bisect will either update to another candidate changeset
758 bad, and bisect will either update to another candidate changeset
759 or announce that it has found the bad revision.
759 or announce that it has found the bad revision.
760
760
761 As a shortcut, you can also use the revision argument to mark a
761 As a shortcut, you can also use the revision argument to mark a
762 revision as good or bad without checking it out first.
762 revision as good or bad without checking it out first.
763
763
764 If you supply a command, it will be used for automatic bisection.
764 If you supply a command, it will be used for automatic bisection.
765 The environment variable HG_NODE will contain the ID of the
765 The environment variable HG_NODE will contain the ID of the
766 changeset being tested. The exit status of the command will be
766 changeset being tested. The exit status of the command will be
767 used to mark revisions as good or bad: status 0 means good, 125
767 used to mark revisions as good or bad: status 0 means good, 125
768 means to skip the revision, 127 (command not found) will abort the
768 means to skip the revision, 127 (command not found) will abort the
769 bisection, and any other non-zero exit status means the revision
769 bisection, and any other non-zero exit status means the revision
770 is bad.
770 is bad.
771
771
772 .. container:: verbose
772 .. container:: verbose
773
773
774 Some examples:
774 Some examples:
775
775
776 - start a bisection with known bad revision 34, and good revision 12::
776 - start a bisection with known bad revision 34, and good revision 12::
777
777
778 hg bisect --bad 34
778 hg bisect --bad 34
779 hg bisect --good 12
779 hg bisect --good 12
780
780
781 - advance the current bisection by marking current revision as good or
781 - advance the current bisection by marking current revision as good or
782 bad::
782 bad::
783
783
784 hg bisect --good
784 hg bisect --good
785 hg bisect --bad
785 hg bisect --bad
786
786
787 - mark the current revision, or a known revision, to be skipped (e.g. if
787 - mark the current revision, or a known revision, to be skipped (e.g. if
788 that revision is not usable because of another issue)::
788 that revision is not usable because of another issue)::
789
789
790 hg bisect --skip
790 hg bisect --skip
791 hg bisect --skip 23
791 hg bisect --skip 23
792
792
793 - skip all revisions that do not touch directories ``foo`` or ``bar``::
793 - skip all revisions that do not touch directories ``foo`` or ``bar``::
794
794
795 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
795 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
796
796
797 - forget the current bisection::
797 - forget the current bisection::
798
798
799 hg bisect --reset
799 hg bisect --reset
800
800
801 - use 'make && make tests' to automatically find the first broken
801 - use 'make && make tests' to automatically find the first broken
802 revision::
802 revision::
803
803
804 hg bisect --reset
804 hg bisect --reset
805 hg bisect --bad 34
805 hg bisect --bad 34
806 hg bisect --good 12
806 hg bisect --good 12
807 hg bisect --command "make && make tests"
807 hg bisect --command "make && make tests"
808
808
809 - see all changesets whose states are already known in the current
809 - see all changesets whose states are already known in the current
810 bisection::
810 bisection::
811
811
812 hg log -r "bisect(pruned)"
812 hg log -r "bisect(pruned)"
813
813
814 - see the changeset currently being bisected (especially useful
814 - see the changeset currently being bisected (especially useful
815 if running with -U/--noupdate)::
815 if running with -U/--noupdate)::
816
816
817 hg log -r "bisect(current)"
817 hg log -r "bisect(current)"
818
818
819 - see all changesets that took part in the current bisection::
819 - see all changesets that took part in the current bisection::
820
820
821 hg log -r "bisect(range)"
821 hg log -r "bisect(range)"
822
822
823 - you can even get a nice graph::
823 - you can even get a nice graph::
824
824
825 hg log --graph -r "bisect(range)"
825 hg log --graph -r "bisect(range)"
826
826
827 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
827 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
828
828
829 Returns 0 on success.
829 Returns 0 on success.
830 """
830 """
831 # backward compatibility
831 # backward compatibility
832 if rev in "good bad reset init".split():
832 if rev in "good bad reset init".split():
833 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
833 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
834 cmd, rev, extra = rev, extra, None
834 cmd, rev, extra = rev, extra, None
835 if cmd == "good":
835 if cmd == "good":
836 good = True
836 good = True
837 elif cmd == "bad":
837 elif cmd == "bad":
838 bad = True
838 bad = True
839 else:
839 else:
840 reset = True
840 reset = True
841 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
841 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
842 raise error.Abort(_('incompatible arguments'))
842 raise error.Abort(_('incompatible arguments'))
843
843
844 cmdutil.checkunfinished(repo)
844 cmdutil.checkunfinished(repo)
845
845
846 if reset:
846 if reset:
847 hbisect.resetstate(repo)
847 hbisect.resetstate(repo)
848 return
848 return
849
849
850 state = hbisect.load_state(repo)
850 state = hbisect.load_state(repo)
851
851
852 # update state
852 # update state
853 if good or bad or skip:
853 if good or bad or skip:
854 if rev:
854 if rev:
855 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
855 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
856 else:
856 else:
857 nodes = [repo.lookup('.')]
857 nodes = [repo.lookup('.')]
858 if good:
858 if good:
859 state['good'] += nodes
859 state['good'] += nodes
860 elif bad:
860 elif bad:
861 state['bad'] += nodes
861 state['bad'] += nodes
862 elif skip:
862 elif skip:
863 state['skip'] += nodes
863 state['skip'] += nodes
864 hbisect.save_state(repo, state)
864 hbisect.save_state(repo, state)
865 if not (state['good'] and state['bad']):
865 if not (state['good'] and state['bad']):
866 return
866 return
867
867
868 def mayupdate(repo, node, show_stats=True):
868 def mayupdate(repo, node, show_stats=True):
869 """common used update sequence"""
869 """common used update sequence"""
870 if noupdate:
870 if noupdate:
871 return
871 return
872 cmdutil.bailifchanged(repo)
872 cmdutil.bailifchanged(repo)
873 return hg.clean(repo, node, show_stats=show_stats)
873 return hg.clean(repo, node, show_stats=show_stats)
874
874
875 displayer = cmdutil.show_changeset(ui, repo, {})
875 displayer = cmdutil.show_changeset(ui, repo, {})
876
876
877 if command:
877 if command:
878 changesets = 1
878 changesets = 1
879 if noupdate:
879 if noupdate:
880 try:
880 try:
881 node = state['current'][0]
881 node = state['current'][0]
882 except LookupError:
882 except LookupError:
883 raise error.Abort(_('current bisect revision is unknown - '
883 raise error.Abort(_('current bisect revision is unknown - '
884 'start a new bisect to fix'))
884 'start a new bisect to fix'))
885 else:
885 else:
886 node, p2 = repo.dirstate.parents()
886 node, p2 = repo.dirstate.parents()
887 if p2 != nullid:
887 if p2 != nullid:
888 raise error.Abort(_('current bisect revision is a merge'))
888 raise error.Abort(_('current bisect revision is a merge'))
889 if rev:
889 if rev:
890 node = repo[scmutil.revsingle(repo, rev, node)].node()
890 node = repo[scmutil.revsingle(repo, rev, node)].node()
891 try:
891 try:
892 while changesets:
892 while changesets:
893 # update state
893 # update state
894 state['current'] = [node]
894 state['current'] = [node]
895 hbisect.save_state(repo, state)
895 hbisect.save_state(repo, state)
896 status = ui.system(command, environ={'HG_NODE': hex(node)})
896 status = ui.system(command, environ={'HG_NODE': hex(node)})
897 if status == 125:
897 if status == 125:
898 transition = "skip"
898 transition = "skip"
899 elif status == 0:
899 elif status == 0:
900 transition = "good"
900 transition = "good"
901 # status < 0 means process was killed
901 # status < 0 means process was killed
902 elif status == 127:
902 elif status == 127:
903 raise error.Abort(_("failed to execute %s") % command)
903 raise error.Abort(_("failed to execute %s") % command)
904 elif status < 0:
904 elif status < 0:
905 raise error.Abort(_("%s killed") % command)
905 raise error.Abort(_("%s killed") % command)
906 else:
906 else:
907 transition = "bad"
907 transition = "bad"
908 state[transition].append(node)
908 state[transition].append(node)
909 ctx = repo[node]
909 ctx = repo[node]
910 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
910 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
911 hbisect.checkstate(state)
911 hbisect.checkstate(state)
912 # bisect
912 # bisect
913 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
913 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
914 # update to next check
914 # update to next check
915 node = nodes[0]
915 node = nodes[0]
916 mayupdate(repo, node, show_stats=False)
916 mayupdate(repo, node, show_stats=False)
917 finally:
917 finally:
918 state['current'] = [node]
918 state['current'] = [node]
919 hbisect.save_state(repo, state)
919 hbisect.save_state(repo, state)
920 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
920 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
921 return
921 return
922
922
923 hbisect.checkstate(state)
923 hbisect.checkstate(state)
924
924
925 # actually bisect
925 # actually bisect
926 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
926 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
927 if extend:
927 if extend:
928 if not changesets:
928 if not changesets:
929 extendnode = hbisect.extendrange(repo, state, nodes, good)
929 extendnode = hbisect.extendrange(repo, state, nodes, good)
930 if extendnode is not None:
930 if extendnode is not None:
931 ui.write(_("Extending search to changeset %d:%s\n")
931 ui.write(_("Extending search to changeset %d:%s\n")
932 % (extendnode.rev(), extendnode))
932 % (extendnode.rev(), extendnode))
933 state['current'] = [extendnode.node()]
933 state['current'] = [extendnode.node()]
934 hbisect.save_state(repo, state)
934 hbisect.save_state(repo, state)
935 return mayupdate(repo, extendnode.node())
935 return mayupdate(repo, extendnode.node())
936 raise error.Abort(_("nothing to extend"))
936 raise error.Abort(_("nothing to extend"))
937
937
938 if changesets == 0:
938 if changesets == 0:
939 hbisect.printresult(ui, repo, state, displayer, nodes, good)
939 hbisect.printresult(ui, repo, state, displayer, nodes, good)
940 else:
940 else:
941 assert len(nodes) == 1 # only a single node can be tested next
941 assert len(nodes) == 1 # only a single node can be tested next
942 node = nodes[0]
942 node = nodes[0]
943 # compute the approximate number of remaining tests
943 # compute the approximate number of remaining tests
944 tests, size = 0, 2
944 tests, size = 0, 2
945 while size <= changesets:
945 while size <= changesets:
946 tests, size = tests + 1, size * 2
946 tests, size = tests + 1, size * 2
947 rev = repo.changelog.rev(node)
947 rev = repo.changelog.rev(node)
948 ui.write(_("Testing changeset %d:%s "
948 ui.write(_("Testing changeset %d:%s "
949 "(%d changesets remaining, ~%d tests)\n")
949 "(%d changesets remaining, ~%d tests)\n")
950 % (rev, short(node), changesets, tests))
950 % (rev, short(node), changesets, tests))
951 state['current'] = [node]
951 state['current'] = [node]
952 hbisect.save_state(repo, state)
952 hbisect.save_state(repo, state)
953 return mayupdate(repo, node)
953 return mayupdate(repo, node)
954
954
955 @command('bookmarks|bookmark',
955 @command('bookmarks|bookmark',
956 [('f', 'force', False, _('force')),
956 [('f', 'force', False, _('force')),
957 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
957 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
958 ('d', 'delete', False, _('delete a given bookmark')),
958 ('d', 'delete', False, _('delete a given bookmark')),
959 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
959 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
960 ('i', 'inactive', False, _('mark a bookmark inactive')),
960 ('i', 'inactive', False, _('mark a bookmark inactive')),
961 ] + formatteropts,
961 ] + formatteropts,
962 _('hg bookmarks [OPTIONS]... [NAME]...'))
962 _('hg bookmarks [OPTIONS]... [NAME]...'))
963 def bookmark(ui, repo, *names, **opts):
963 def bookmark(ui, repo, *names, **opts):
964 '''create a new bookmark or list existing bookmarks
964 '''create a new bookmark or list existing bookmarks
965
965
966 Bookmarks are labels on changesets to help track lines of development.
966 Bookmarks are labels on changesets to help track lines of development.
967 Bookmarks are unversioned and can be moved, renamed and deleted.
967 Bookmarks are unversioned and can be moved, renamed and deleted.
968 Deleting or moving a bookmark has no effect on the associated changesets.
968 Deleting or moving a bookmark has no effect on the associated changesets.
969
969
970 Creating or updating to a bookmark causes it to be marked as 'active'.
970 Creating or updating to a bookmark causes it to be marked as 'active'.
971 The active bookmark is indicated with a '*'.
971 The active bookmark is indicated with a '*'.
972 When a commit is made, the active bookmark will advance to the new commit.
972 When a commit is made, the active bookmark will advance to the new commit.
973 A plain :hg:`update` will also advance an active bookmark, if possible.
973 A plain :hg:`update` will also advance an active bookmark, if possible.
974 Updating away from a bookmark will cause it to be deactivated.
974 Updating away from a bookmark will cause it to be deactivated.
975
975
976 Bookmarks can be pushed and pulled between repositories (see
976 Bookmarks can be pushed and pulled between repositories (see
977 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
977 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
978 diverged, a new 'divergent bookmark' of the form 'name@path' will
978 diverged, a new 'divergent bookmark' of the form 'name@path' will
979 be created. Using :hg:`merge` will resolve the divergence.
979 be created. Using :hg:`merge` will resolve the divergence.
980
980
981 A bookmark named '@' has the special property that :hg:`clone` will
981 A bookmark named '@' has the special property that :hg:`clone` will
982 check it out by default if it exists.
982 check it out by default if it exists.
983
983
984 .. container:: verbose
984 .. container:: verbose
985
985
986 Examples:
986 Examples:
987
987
988 - create an active bookmark for a new line of development::
988 - create an active bookmark for a new line of development::
989
989
990 hg book new-feature
990 hg book new-feature
991
991
992 - create an inactive bookmark as a place marker::
992 - create an inactive bookmark as a place marker::
993
993
994 hg book -i reviewed
994 hg book -i reviewed
995
995
996 - create an inactive bookmark on another changeset::
996 - create an inactive bookmark on another changeset::
997
997
998 hg book -r .^ tested
998 hg book -r .^ tested
999
999
1000 - rename bookmark turkey to dinner::
1000 - rename bookmark turkey to dinner::
1001
1001
1002 hg book -m turkey dinner
1002 hg book -m turkey dinner
1003
1003
1004 - move the '@' bookmark from another branch::
1004 - move the '@' bookmark from another branch::
1005
1005
1006 hg book -f @
1006 hg book -f @
1007 '''
1007 '''
1008 force = opts.get('force')
1008 force = opts.get('force')
1009 rev = opts.get('rev')
1009 rev = opts.get('rev')
1010 delete = opts.get('delete')
1010 delete = opts.get('delete')
1011 rename = opts.get('rename')
1011 rename = opts.get('rename')
1012 inactive = opts.get('inactive')
1012 inactive = opts.get('inactive')
1013
1013
1014 def checkformat(mark):
1014 def checkformat(mark):
1015 mark = mark.strip()
1015 mark = mark.strip()
1016 if not mark:
1016 if not mark:
1017 raise error.Abort(_("bookmark names cannot consist entirely of "
1017 raise error.Abort(_("bookmark names cannot consist entirely of "
1018 "whitespace"))
1018 "whitespace"))
1019 scmutil.checknewlabel(repo, mark, 'bookmark')
1019 scmutil.checknewlabel(repo, mark, 'bookmark')
1020 return mark
1020 return mark
1021
1021
1022 def checkconflict(repo, mark, cur, force=False, target=None):
1022 def checkconflict(repo, mark, cur, force=False, target=None):
1023 if mark in marks and not force:
1023 if mark in marks and not force:
1024 if target:
1024 if target:
1025 if marks[mark] == target and target == cur:
1025 if marks[mark] == target and target == cur:
1026 # re-activating a bookmark
1026 # re-activating a bookmark
1027 return
1027 return
1028 anc = repo.changelog.ancestors([repo[target].rev()])
1028 anc = repo.changelog.ancestors([repo[target].rev()])
1029 bmctx = repo[marks[mark]]
1029 bmctx = repo[marks[mark]]
1030 divs = [repo[b].node() for b in marks
1030 divs = [repo[b].node() for b in marks
1031 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
1031 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
1032
1032
1033 # allow resolving a single divergent bookmark even if moving
1033 # allow resolving a single divergent bookmark even if moving
1034 # the bookmark across branches when a revision is specified
1034 # the bookmark across branches when a revision is specified
1035 # that contains a divergent bookmark
1035 # that contains a divergent bookmark
1036 if bmctx.rev() not in anc and target in divs:
1036 if bmctx.rev() not in anc and target in divs:
1037 bookmarks.deletedivergent(repo, [target], mark)
1037 bookmarks.deletedivergent(repo, [target], mark)
1038 return
1038 return
1039
1039
1040 deletefrom = [b for b in divs
1040 deletefrom = [b for b in divs
1041 if repo[b].rev() in anc or b == target]
1041 if repo[b].rev() in anc or b == target]
1042 bookmarks.deletedivergent(repo, deletefrom, mark)
1042 bookmarks.deletedivergent(repo, deletefrom, mark)
1043 if bookmarks.validdest(repo, bmctx, repo[target]):
1043 if bookmarks.validdest(repo, bmctx, repo[target]):
1044 ui.status(_("moving bookmark '%s' forward from %s\n") %
1044 ui.status(_("moving bookmark '%s' forward from %s\n") %
1045 (mark, short(bmctx.node())))
1045 (mark, short(bmctx.node())))
1046 return
1046 return
1047 raise error.Abort(_("bookmark '%s' already exists "
1047 raise error.Abort(_("bookmark '%s' already exists "
1048 "(use -f to force)") % mark)
1048 "(use -f to force)") % mark)
1049 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
1049 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
1050 and not force):
1050 and not force):
1051 raise error.Abort(
1051 raise error.Abort(
1052 _("a bookmark cannot have the name of an existing branch"))
1052 _("a bookmark cannot have the name of an existing branch"))
1053
1053
1054 if delete and rename:
1054 if delete and rename:
1055 raise error.Abort(_("--delete and --rename are incompatible"))
1055 raise error.Abort(_("--delete and --rename are incompatible"))
1056 if delete and rev:
1056 if delete and rev:
1057 raise error.Abort(_("--rev is incompatible with --delete"))
1057 raise error.Abort(_("--rev is incompatible with --delete"))
1058 if rename and rev:
1058 if rename and rev:
1059 raise error.Abort(_("--rev is incompatible with --rename"))
1059 raise error.Abort(_("--rev is incompatible with --rename"))
1060 if not names and (delete or rev):
1060 if not names and (delete or rev):
1061 raise error.Abort(_("bookmark name required"))
1061 raise error.Abort(_("bookmark name required"))
1062
1062
1063 if delete or rename or names or inactive:
1063 if delete or rename or names or inactive:
1064 wlock = lock = tr = None
1064 wlock = lock = tr = None
1065 try:
1065 try:
1066 wlock = repo.wlock()
1066 wlock = repo.wlock()
1067 lock = repo.lock()
1067 lock = repo.lock()
1068 cur = repo.changectx('.').node()
1068 cur = repo.changectx('.').node()
1069 marks = repo._bookmarks
1069 marks = repo._bookmarks
1070 if delete:
1070 if delete:
1071 tr = repo.transaction('bookmark')
1071 tr = repo.transaction('bookmark')
1072 for mark in names:
1072 for mark in names:
1073 if mark not in marks:
1073 if mark not in marks:
1074 raise error.Abort(_("bookmark '%s' does not exist") %
1074 raise error.Abort(_("bookmark '%s' does not exist") %
1075 mark)
1075 mark)
1076 if mark == repo._activebookmark:
1076 if mark == repo._activebookmark:
1077 bookmarks.deactivate(repo)
1077 bookmarks.deactivate(repo)
1078 del marks[mark]
1078 del marks[mark]
1079
1079
1080 elif rename:
1080 elif rename:
1081 tr = repo.transaction('bookmark')
1081 tr = repo.transaction('bookmark')
1082 if not names:
1082 if not names:
1083 raise error.Abort(_("new bookmark name required"))
1083 raise error.Abort(_("new bookmark name required"))
1084 elif len(names) > 1:
1084 elif len(names) > 1:
1085 raise error.Abort(_("only one new bookmark name allowed"))
1085 raise error.Abort(_("only one new bookmark name allowed"))
1086 mark = checkformat(names[0])
1086 mark = checkformat(names[0])
1087 if rename not in marks:
1087 if rename not in marks:
1088 raise error.Abort(_("bookmark '%s' does not exist")
1088 raise error.Abort(_("bookmark '%s' does not exist")
1089 % rename)
1089 % rename)
1090 checkconflict(repo, mark, cur, force)
1090 checkconflict(repo, mark, cur, force)
1091 marks[mark] = marks[rename]
1091 marks[mark] = marks[rename]
1092 if repo._activebookmark == rename and not inactive:
1092 if repo._activebookmark == rename and not inactive:
1093 bookmarks.activate(repo, mark)
1093 bookmarks.activate(repo, mark)
1094 del marks[rename]
1094 del marks[rename]
1095 elif names:
1095 elif names:
1096 tr = repo.transaction('bookmark')
1096 tr = repo.transaction('bookmark')
1097 newact = None
1097 newact = None
1098 for mark in names:
1098 for mark in names:
1099 mark = checkformat(mark)
1099 mark = checkformat(mark)
1100 if newact is None:
1100 if newact is None:
1101 newact = mark
1101 newact = mark
1102 if inactive and mark == repo._activebookmark:
1102 if inactive and mark == repo._activebookmark:
1103 bookmarks.deactivate(repo)
1103 bookmarks.deactivate(repo)
1104 return
1104 return
1105 tgt = cur
1105 tgt = cur
1106 if rev:
1106 if rev:
1107 tgt = scmutil.revsingle(repo, rev).node()
1107 tgt = scmutil.revsingle(repo, rev).node()
1108 checkconflict(repo, mark, cur, force, tgt)
1108 checkconflict(repo, mark, cur, force, tgt)
1109 marks[mark] = tgt
1109 marks[mark] = tgt
1110 if not inactive and cur == marks[newact] and not rev:
1110 if not inactive and cur == marks[newact] and not rev:
1111 bookmarks.activate(repo, newact)
1111 bookmarks.activate(repo, newact)
1112 elif cur != tgt and newact == repo._activebookmark:
1112 elif cur != tgt and newact == repo._activebookmark:
1113 bookmarks.deactivate(repo)
1113 bookmarks.deactivate(repo)
1114 elif inactive:
1114 elif inactive:
1115 if len(marks) == 0:
1115 if len(marks) == 0:
1116 ui.status(_("no bookmarks set\n"))
1116 ui.status(_("no bookmarks set\n"))
1117 elif not repo._activebookmark:
1117 elif not repo._activebookmark:
1118 ui.status(_("no active bookmark\n"))
1118 ui.status(_("no active bookmark\n"))
1119 else:
1119 else:
1120 bookmarks.deactivate(repo)
1120 bookmarks.deactivate(repo)
1121 if tr is not None:
1121 if tr is not None:
1122 marks.recordchange(tr)
1122 marks.recordchange(tr)
1123 tr.close()
1123 tr.close()
1124 finally:
1124 finally:
1125 lockmod.release(tr, lock, wlock)
1125 lockmod.release(tr, lock, wlock)
1126 else: # show bookmarks
1126 else: # show bookmarks
1127 fm = ui.formatter('bookmarks', opts)
1127 fm = ui.formatter('bookmarks', opts)
1128 hexfn = fm.hexfunc
1128 hexfn = fm.hexfunc
1129 marks = repo._bookmarks
1129 marks = repo._bookmarks
1130 if len(marks) == 0 and fm.isplain():
1130 if len(marks) == 0 and fm.isplain():
1131 ui.status(_("no bookmarks set\n"))
1131 ui.status(_("no bookmarks set\n"))
1132 for bmark, n in sorted(marks.iteritems()):
1132 for bmark, n in sorted(marks.iteritems()):
1133 active = repo._activebookmark
1133 active = repo._activebookmark
1134 if bmark == active:
1134 if bmark == active:
1135 prefix, label = '*', activebookmarklabel
1135 prefix, label = '*', activebookmarklabel
1136 else:
1136 else:
1137 prefix, label = ' ', ''
1137 prefix, label = ' ', ''
1138
1138
1139 fm.startitem()
1139 fm.startitem()
1140 if not ui.quiet:
1140 if not ui.quiet:
1141 fm.plain(' %s ' % prefix, label=label)
1141 fm.plain(' %s ' % prefix, label=label)
1142 fm.write('bookmark', '%s', bmark, label=label)
1142 fm.write('bookmark', '%s', bmark, label=label)
1143 pad = " " * (25 - encoding.colwidth(bmark))
1143 pad = " " * (25 - encoding.colwidth(bmark))
1144 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1144 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1145 repo.changelog.rev(n), hexfn(n), label=label)
1145 repo.changelog.rev(n), hexfn(n), label=label)
1146 fm.data(active=(bmark == active))
1146 fm.data(active=(bmark == active))
1147 fm.plain('\n')
1147 fm.plain('\n')
1148 fm.end()
1148 fm.end()
1149
1149
1150 @command('branch',
1150 @command('branch',
1151 [('f', 'force', None,
1151 [('f', 'force', None,
1152 _('set branch name even if it shadows an existing branch')),
1152 _('set branch name even if it shadows an existing branch')),
1153 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1153 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1154 _('[-fC] [NAME]'))
1154 _('[-fC] [NAME]'))
1155 def branch(ui, repo, label=None, **opts):
1155 def branch(ui, repo, label=None, **opts):
1156 """set or show the current branch name
1156 """set or show the current branch name
1157
1157
1158 .. note::
1158 .. note::
1159
1159
1160 Branch names are permanent and global. Use :hg:`bookmark` to create a
1160 Branch names are permanent and global. Use :hg:`bookmark` to create a
1161 light-weight bookmark instead. See :hg:`help glossary` for more
1161 light-weight bookmark instead. See :hg:`help glossary` for more
1162 information about named branches and bookmarks.
1162 information about named branches and bookmarks.
1163
1163
1164 With no argument, show the current branch name. With one argument,
1164 With no argument, show the current branch name. With one argument,
1165 set the working directory branch name (the branch will not exist
1165 set the working directory branch name (the branch will not exist
1166 in the repository until the next commit). Standard practice
1166 in the repository until the next commit). Standard practice
1167 recommends that primary development take place on the 'default'
1167 recommends that primary development take place on the 'default'
1168 branch.
1168 branch.
1169
1169
1170 Unless -f/--force is specified, branch will not let you set a
1170 Unless -f/--force is specified, branch will not let you set a
1171 branch name that already exists.
1171 branch name that already exists.
1172
1172
1173 Use -C/--clean to reset the working directory branch to that of
1173 Use -C/--clean to reset the working directory branch to that of
1174 the parent of the working directory, negating a previous branch
1174 the parent of the working directory, negating a previous branch
1175 change.
1175 change.
1176
1176
1177 Use the command :hg:`update` to switch to an existing branch. Use
1177 Use the command :hg:`update` to switch to an existing branch. Use
1178 :hg:`commit --close-branch` to mark this branch head as closed.
1178 :hg:`commit --close-branch` to mark this branch head as closed.
1179 When all heads of a branch are closed, the branch will be
1179 When all heads of a branch are closed, the branch will be
1180 considered closed.
1180 considered closed.
1181
1181
1182 Returns 0 on success.
1182 Returns 0 on success.
1183 """
1183 """
1184 if label:
1184 if label:
1185 label = label.strip()
1185 label = label.strip()
1186
1186
1187 if not opts.get('clean') and not label:
1187 if not opts.get('clean') and not label:
1188 ui.write("%s\n" % repo.dirstate.branch())
1188 ui.write("%s\n" % repo.dirstate.branch())
1189 return
1189 return
1190
1190
1191 with repo.wlock():
1191 with repo.wlock():
1192 if opts.get('clean'):
1192 if opts.get('clean'):
1193 label = repo[None].p1().branch()
1193 label = repo[None].p1().branch()
1194 repo.dirstate.setbranch(label)
1194 repo.dirstate.setbranch(label)
1195 ui.status(_('reset working directory to branch %s\n') % label)
1195 ui.status(_('reset working directory to branch %s\n') % label)
1196 elif label:
1196 elif label:
1197 if not opts.get('force') and label in repo.branchmap():
1197 if not opts.get('force') and label in repo.branchmap():
1198 if label not in [p.branch() for p in repo[None].parents()]:
1198 if label not in [p.branch() for p in repo[None].parents()]:
1199 raise error.Abort(_('a branch of the same name already'
1199 raise error.Abort(_('a branch of the same name already'
1200 ' exists'),
1200 ' exists'),
1201 # i18n: "it" refers to an existing branch
1201 # i18n: "it" refers to an existing branch
1202 hint=_("use 'hg update' to switch to it"))
1202 hint=_("use 'hg update' to switch to it"))
1203 scmutil.checknewlabel(repo, label, 'branch')
1203 scmutil.checknewlabel(repo, label, 'branch')
1204 repo.dirstate.setbranch(label)
1204 repo.dirstate.setbranch(label)
1205 ui.status(_('marked working directory as branch %s\n') % label)
1205 ui.status(_('marked working directory as branch %s\n') % label)
1206
1206
1207 # find any open named branches aside from default
1207 # find any open named branches aside from default
1208 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1208 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1209 if n != "default" and not c]
1209 if n != "default" and not c]
1210 if not others:
1210 if not others:
1211 ui.status(_('(branches are permanent and global, '
1211 ui.status(_('(branches are permanent and global, '
1212 'did you want a bookmark?)\n'))
1212 'did you want a bookmark?)\n'))
1213
1213
1214 @command('branches',
1214 @command('branches',
1215 [('a', 'active', False,
1215 [('a', 'active', False,
1216 _('show only branches that have unmerged heads (DEPRECATED)')),
1216 _('show only branches that have unmerged heads (DEPRECATED)')),
1217 ('c', 'closed', False, _('show normal and closed branches')),
1217 ('c', 'closed', False, _('show normal and closed branches')),
1218 ] + formatteropts,
1218 ] + formatteropts,
1219 _('[-c]'))
1219 _('[-c]'))
1220 def branches(ui, repo, active=False, closed=False, **opts):
1220 def branches(ui, repo, active=False, closed=False, **opts):
1221 """list repository named branches
1221 """list repository named branches
1222
1222
1223 List the repository's named branches, indicating which ones are
1223 List the repository's named branches, indicating which ones are
1224 inactive. If -c/--closed is specified, also list branches which have
1224 inactive. If -c/--closed is specified, also list branches which have
1225 been marked closed (see :hg:`commit --close-branch`).
1225 been marked closed (see :hg:`commit --close-branch`).
1226
1226
1227 Use the command :hg:`update` to switch to an existing branch.
1227 Use the command :hg:`update` to switch to an existing branch.
1228
1228
1229 Returns 0.
1229 Returns 0.
1230 """
1230 """
1231
1231
1232 fm = ui.formatter('branches', opts)
1232 fm = ui.formatter('branches', opts)
1233 hexfunc = fm.hexfunc
1233 hexfunc = fm.hexfunc
1234
1234
1235 allheads = set(repo.heads())
1235 allheads = set(repo.heads())
1236 branches = []
1236 branches = []
1237 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1237 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1238 isactive = not isclosed and bool(set(heads) & allheads)
1238 isactive = not isclosed and bool(set(heads) & allheads)
1239 branches.append((tag, repo[tip], isactive, not isclosed))
1239 branches.append((tag, repo[tip], isactive, not isclosed))
1240 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1240 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1241 reverse=True)
1241 reverse=True)
1242
1242
1243 for tag, ctx, isactive, isopen in branches:
1243 for tag, ctx, isactive, isopen in branches:
1244 if active and not isactive:
1244 if active and not isactive:
1245 continue
1245 continue
1246 if isactive:
1246 if isactive:
1247 label = 'branches.active'
1247 label = 'branches.active'
1248 notice = ''
1248 notice = ''
1249 elif not isopen:
1249 elif not isopen:
1250 if not closed:
1250 if not closed:
1251 continue
1251 continue
1252 label = 'branches.closed'
1252 label = 'branches.closed'
1253 notice = _(' (closed)')
1253 notice = _(' (closed)')
1254 else:
1254 else:
1255 label = 'branches.inactive'
1255 label = 'branches.inactive'
1256 notice = _(' (inactive)')
1256 notice = _(' (inactive)')
1257 current = (tag == repo.dirstate.branch())
1257 current = (tag == repo.dirstate.branch())
1258 if current:
1258 if current:
1259 label = 'branches.current'
1259 label = 'branches.current'
1260
1260
1261 fm.startitem()
1261 fm.startitem()
1262 fm.write('branch', '%s', tag, label=label)
1262 fm.write('branch', '%s', tag, label=label)
1263 rev = ctx.rev()
1263 rev = ctx.rev()
1264 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1264 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1265 fmt = ' ' * padsize + ' %d:%s'
1265 fmt = ' ' * padsize + ' %d:%s'
1266 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1266 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1267 label='log.changeset changeset.%s' % ctx.phasestr())
1267 label='log.changeset changeset.%s' % ctx.phasestr())
1268 fm.data(active=isactive, closed=not isopen, current=current)
1268 fm.data(active=isactive, closed=not isopen, current=current)
1269 if not ui.quiet:
1269 if not ui.quiet:
1270 fm.plain(notice)
1270 fm.plain(notice)
1271 fm.plain('\n')
1271 fm.plain('\n')
1272 fm.end()
1272 fm.end()
1273
1273
1274 @command('bundle',
1274 @command('bundle',
1275 [('f', 'force', None, _('run even when the destination is unrelated')),
1275 [('f', 'force', None, _('run even when the destination is unrelated')),
1276 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1276 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1277 _('REV')),
1277 _('REV')),
1278 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1278 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1279 _('BRANCH')),
1279 _('BRANCH')),
1280 ('', 'base', [],
1280 ('', 'base', [],
1281 _('a base changeset assumed to be available at the destination'),
1281 _('a base changeset assumed to be available at the destination'),
1282 _('REV')),
1282 _('REV')),
1283 ('a', 'all', None, _('bundle all changesets in the repository')),
1283 ('a', 'all', None, _('bundle all changesets in the repository')),
1284 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1284 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1285 ] + remoteopts,
1285 ] + remoteopts,
1286 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1286 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1287 def bundle(ui, repo, fname, dest=None, **opts):
1287 def bundle(ui, repo, fname, dest=None, **opts):
1288 """create a changegroup file
1288 """create a changegroup file
1289
1289
1290 Generate a changegroup file collecting changesets to be added
1290 Generate a changegroup file collecting changesets to be added
1291 to a repository.
1291 to a repository.
1292
1292
1293 To create a bundle containing all changesets, use -a/--all
1293 To create a bundle containing all changesets, use -a/--all
1294 (or --base null). Otherwise, hg assumes the destination will have
1294 (or --base null). Otherwise, hg assumes the destination will have
1295 all the nodes you specify with --base parameters. Otherwise, hg
1295 all the nodes you specify with --base parameters. Otherwise, hg
1296 will assume the repository has all the nodes in destination, or
1296 will assume the repository has all the nodes in destination, or
1297 default-push/default if no destination is specified.
1297 default-push/default if no destination is specified.
1298
1298
1299 You can change bundle format with the -t/--type option. You can
1299 You can change bundle format with the -t/--type option. You can
1300 specify a compression, a bundle version or both using a dash
1300 specify a compression, a bundle version or both using a dash
1301 (comp-version). The available compression methods are: none, bzip2,
1301 (comp-version). The available compression methods are: none, bzip2,
1302 and gzip (by default, bundles are compressed using bzip2). The
1302 and gzip (by default, bundles are compressed using bzip2). The
1303 available formats are: v1, v2 (default to most suitable).
1303 available formats are: v1, v2 (default to most suitable).
1304
1304
1305 The bundle file can then be transferred using conventional means
1305 The bundle file can then be transferred using conventional means
1306 and applied to another repository with the unbundle or pull
1306 and applied to another repository with the unbundle or pull
1307 command. This is useful when direct push and pull are not
1307 command. This is useful when direct push and pull are not
1308 available or when exporting an entire repository is undesirable.
1308 available or when exporting an entire repository is undesirable.
1309
1309
1310 Applying bundles preserves all changeset contents including
1310 Applying bundles preserves all changeset contents including
1311 permissions, copy/rename information, and revision history.
1311 permissions, copy/rename information, and revision history.
1312
1312
1313 Returns 0 on success, 1 if no changes found.
1313 Returns 0 on success, 1 if no changes found.
1314 """
1314 """
1315 revs = None
1315 revs = None
1316 if 'rev' in opts:
1316 if 'rev' in opts:
1317 revstrings = opts['rev']
1317 revstrings = opts['rev']
1318 revs = scmutil.revrange(repo, revstrings)
1318 revs = scmutil.revrange(repo, revstrings)
1319 if revstrings and not revs:
1319 if revstrings and not revs:
1320 raise error.Abort(_('no commits to bundle'))
1320 raise error.Abort(_('no commits to bundle'))
1321
1321
1322 bundletype = opts.get('type', 'bzip2').lower()
1322 bundletype = opts.get('type', 'bzip2').lower()
1323 try:
1323 try:
1324 bcompression, cgversion, params = exchange.parsebundlespec(
1324 bcompression, cgversion, params = exchange.parsebundlespec(
1325 repo, bundletype, strict=False)
1325 repo, bundletype, strict=False)
1326 except error.UnsupportedBundleSpecification as e:
1326 except error.UnsupportedBundleSpecification as e:
1327 raise error.Abort(str(e),
1327 raise error.Abort(str(e),
1328 hint=_("see 'hg help bundle' for supported "
1328 hint=_("see 'hg help bundle' for supported "
1329 "values for --type"))
1329 "values for --type"))
1330
1330
1331 # Packed bundles are a pseudo bundle format for now.
1331 # Packed bundles are a pseudo bundle format for now.
1332 if cgversion == 's1':
1332 if cgversion == 's1':
1333 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1333 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1334 hint=_("use 'hg debugcreatestreamclonebundle'"))
1334 hint=_("use 'hg debugcreatestreamclonebundle'"))
1335
1335
1336 if opts.get('all'):
1336 if opts.get('all'):
1337 if dest:
1337 if dest:
1338 raise error.Abort(_("--all is incompatible with specifying "
1338 raise error.Abort(_("--all is incompatible with specifying "
1339 "a destination"))
1339 "a destination"))
1340 if opts.get('base'):
1340 if opts.get('base'):
1341 ui.warn(_("ignoring --base because --all was specified\n"))
1341 ui.warn(_("ignoring --base because --all was specified\n"))
1342 base = ['null']
1342 base = ['null']
1343 else:
1343 else:
1344 base = scmutil.revrange(repo, opts.get('base'))
1344 base = scmutil.revrange(repo, opts.get('base'))
1345 # TODO: get desired bundlecaps from command line.
1345 # TODO: get desired bundlecaps from command line.
1346 bundlecaps = None
1346 bundlecaps = None
1347 if cgversion not in changegroup.supportedoutgoingversions(repo):
1347 if cgversion not in changegroup.supportedoutgoingversions(repo):
1348 raise error.Abort(_("repository does not support bundle version %s") %
1348 raise error.Abort(_("repository does not support bundle version %s") %
1349 cgversion)
1349 cgversion)
1350
1350
1351 if base:
1351 if base:
1352 if dest:
1352 if dest:
1353 raise error.Abort(_("--base is incompatible with specifying "
1353 raise error.Abort(_("--base is incompatible with specifying "
1354 "a destination"))
1354 "a destination"))
1355 common = [repo.lookup(rev) for rev in base]
1355 common = [repo.lookup(rev) for rev in base]
1356 heads = revs and map(repo.lookup, revs) or None
1356 heads = revs and map(repo.lookup, revs) or None
1357 outgoing = discovery.outgoing(repo, common, heads)
1357 outgoing = discovery.outgoing(repo, common, heads)
1358 cg = changegroup.getchangegroup(repo, 'bundle', outgoing,
1358 cg = changegroup.getchangegroup(repo, 'bundle', outgoing,
1359 bundlecaps=bundlecaps,
1359 bundlecaps=bundlecaps,
1360 version=cgversion)
1360 version=cgversion)
1361 outgoing = None
1361 outgoing = None
1362 else:
1362 else:
1363 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1363 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1364 dest, branches = hg.parseurl(dest, opts.get('branch'))
1364 dest, branches = hg.parseurl(dest, opts.get('branch'))
1365 other = hg.peer(repo, opts, dest)
1365 other = hg.peer(repo, opts, dest)
1366 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1366 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1367 heads = revs and map(repo.lookup, revs) or revs
1367 heads = revs and map(repo.lookup, revs) or revs
1368 outgoing = discovery.findcommonoutgoing(repo, other,
1368 outgoing = discovery.findcommonoutgoing(repo, other,
1369 onlyheads=heads,
1369 onlyheads=heads,
1370 force=opts.get('force'),
1370 force=opts.get('force'),
1371 portable=True)
1371 portable=True)
1372 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1372 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1373 bundlecaps, version=cgversion)
1373 bundlecaps, version=cgversion)
1374 if not cg:
1374 if not cg:
1375 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1375 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1376 return 1
1376 return 1
1377
1377
1378 if cgversion == '01': #bundle1
1378 if cgversion == '01': #bundle1
1379 if bcompression is None:
1379 if bcompression is None:
1380 bcompression = 'UN'
1380 bcompression = 'UN'
1381 bversion = 'HG10' + bcompression
1381 bversion = 'HG10' + bcompression
1382 bcompression = None
1382 bcompression = None
1383 else:
1383 else:
1384 assert cgversion == '02'
1384 assert cgversion == '02'
1385 bversion = 'HG20'
1385 bversion = 'HG20'
1386
1386
1387 # TODO compression options should be derived from bundlespec parsing.
1387 # TODO compression options should be derived from bundlespec parsing.
1388 # This is a temporary hack to allow adjusting bundle compression
1388 # This is a temporary hack to allow adjusting bundle compression
1389 # level without a) formalizing the bundlespec changes to declare it
1389 # level without a) formalizing the bundlespec changes to declare it
1390 # b) introducing a command flag.
1390 # b) introducing a command flag.
1391 compopts = {}
1391 compopts = {}
1392 complevel = ui.configint('experimental', 'bundlecomplevel')
1392 complevel = ui.configint('experimental', 'bundlecomplevel')
1393 if complevel is not None:
1393 if complevel is not None:
1394 compopts['level'] = complevel
1394 compopts['level'] = complevel
1395
1395
1396 bundle2.writebundle(ui, cg, fname, bversion, compression=bcompression,
1396 bundle2.writebundle(ui, cg, fname, bversion, compression=bcompression,
1397 compopts=compopts)
1397 compopts=compopts)
1398
1398
1399 @command('cat',
1399 @command('cat',
1400 [('o', 'output', '',
1400 [('o', 'output', '',
1401 _('print output to file with formatted name'), _('FORMAT')),
1401 _('print output to file with formatted name'), _('FORMAT')),
1402 ('r', 'rev', '', _('print the given revision'), _('REV')),
1402 ('r', 'rev', '', _('print the given revision'), _('REV')),
1403 ('', 'decode', None, _('apply any matching decode filter')),
1403 ('', 'decode', None, _('apply any matching decode filter')),
1404 ] + walkopts,
1404 ] + walkopts,
1405 _('[OPTION]... FILE...'),
1405 _('[OPTION]... FILE...'),
1406 inferrepo=True)
1406 inferrepo=True)
1407 def cat(ui, repo, file1, *pats, **opts):
1407 def cat(ui, repo, file1, *pats, **opts):
1408 """output the current or given revision of files
1408 """output the current or given revision of files
1409
1409
1410 Print the specified files as they were at the given revision. If
1410 Print the specified files as they were at the given revision. If
1411 no revision is given, the parent of the working directory is used.
1411 no revision is given, the parent of the working directory is used.
1412
1412
1413 Output may be to a file, in which case the name of the file is
1413 Output may be to a file, in which case the name of the file is
1414 given using a format string. The formatting rules as follows:
1414 given using a format string. The formatting rules as follows:
1415
1415
1416 :``%%``: literal "%" character
1416 :``%%``: literal "%" character
1417 :``%s``: basename of file being printed
1417 :``%s``: basename of file being printed
1418 :``%d``: dirname of file being printed, or '.' if in repository root
1418 :``%d``: dirname of file being printed, or '.' if in repository root
1419 :``%p``: root-relative path name of file being printed
1419 :``%p``: root-relative path name of file being printed
1420 :``%H``: changeset hash (40 hexadecimal digits)
1420 :``%H``: changeset hash (40 hexadecimal digits)
1421 :``%R``: changeset revision number
1421 :``%R``: changeset revision number
1422 :``%h``: short-form changeset hash (12 hexadecimal digits)
1422 :``%h``: short-form changeset hash (12 hexadecimal digits)
1423 :``%r``: zero-padded changeset revision number
1423 :``%r``: zero-padded changeset revision number
1424 :``%b``: basename of the exporting repository
1424 :``%b``: basename of the exporting repository
1425
1425
1426 Returns 0 on success.
1426 Returns 0 on success.
1427 """
1427 """
1428 ctx = scmutil.revsingle(repo, opts.get('rev'))
1428 ctx = scmutil.revsingle(repo, opts.get('rev'))
1429 m = scmutil.match(ctx, (file1,) + pats, opts)
1429 m = scmutil.match(ctx, (file1,) + pats, opts)
1430
1430
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 if opts.get('interactive'):
1642 if opts.get('interactive'):
1643 opts.pop('interactive')
1643 opts.pop('interactive')
1644 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1644 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1645 cmdutil.recordfilter, *pats, **opts)
1645 cmdutil.recordfilter, *pats, **opts)
1646 # ret can be 0 (no changes to record) or the value returned by
1646 # ret can be 0 (no changes to record) or the value returned by
1647 # commit(), 1 if nothing changed or None on success.
1647 # commit(), 1 if nothing changed or None on success.
1648 return 1 if ret == 0 else ret
1648 return 1 if ret == 0 else ret
1649
1649
1650 if opts.get('subrepos'):
1650 if opts.get('subrepos'):
1651 if opts.get('amend'):
1651 if opts.get('amend'):
1652 raise error.Abort(_('cannot amend with --subrepos'))
1652 raise error.Abort(_('cannot amend with --subrepos'))
1653 # Let --subrepos on the command line override config setting.
1653 # Let --subrepos on the command line override config setting.
1654 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1654 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1655
1655
1656 cmdutil.checkunfinished(repo, commit=True)
1656 cmdutil.checkunfinished(repo, commit=True)
1657
1657
1658 branch = repo[None].branch()
1658 branch = repo[None].branch()
1659 bheads = repo.branchheads(branch)
1659 bheads = repo.branchheads(branch)
1660
1660
1661 extra = {}
1661 extra = {}
1662 if opts.get('close_branch'):
1662 if opts.get('close_branch'):
1663 extra['close'] = 1
1663 extra['close'] = 1
1664
1664
1665 if not bheads:
1665 if not bheads:
1666 raise error.Abort(_('can only close branch heads'))
1666 raise error.Abort(_('can only close branch heads'))
1667 elif opts.get('amend'):
1667 elif opts.get('amend'):
1668 if repo[None].parents()[0].p1().branch() != branch and \
1668 if repo[None].parents()[0].p1().branch() != branch and \
1669 repo[None].parents()[0].p2().branch() != branch:
1669 repo[None].parents()[0].p2().branch() != branch:
1670 raise error.Abort(_('can only close branch heads'))
1670 raise error.Abort(_('can only close branch heads'))
1671
1671
1672 if opts.get('amend'):
1672 if opts.get('amend'):
1673 if ui.configbool('ui', 'commitsubrepos'):
1673 if ui.configbool('ui', 'commitsubrepos'):
1674 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1674 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1675
1675
1676 old = repo['.']
1676 old = repo['.']
1677 if not old.mutable():
1677 if not old.mutable():
1678 raise error.Abort(_('cannot amend public changesets'))
1678 raise error.Abort(_('cannot amend public changesets'))
1679 if len(repo[None].parents()) > 1:
1679 if len(repo[None].parents()) > 1:
1680 raise error.Abort(_('cannot amend while merging'))
1680 raise error.Abort(_('cannot amend while merging'))
1681 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1681 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1682 if not allowunstable and old.children():
1682 if not allowunstable and old.children():
1683 raise error.Abort(_('cannot amend changeset with children'))
1683 raise error.Abort(_('cannot amend changeset with children'))
1684
1684
1685 # Currently histedit gets confused if an amend happens while histedit
1685 # Currently histedit gets confused if an amend happens while histedit
1686 # is in progress. Since we have a checkunfinished command, we are
1686 # is in progress. Since we have a checkunfinished command, we are
1687 # temporarily honoring it.
1687 # temporarily honoring it.
1688 #
1688 #
1689 # Note: eventually this guard will be removed. Please do not expect
1689 # Note: eventually this guard will be removed. Please do not expect
1690 # this behavior to remain.
1690 # this behavior to remain.
1691 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1691 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1692 cmdutil.checkunfinished(repo)
1692 cmdutil.checkunfinished(repo)
1693
1693
1694 # commitfunc is used only for temporary amend commit by cmdutil.amend
1694 # commitfunc is used only for temporary amend commit by cmdutil.amend
1695 def commitfunc(ui, repo, message, match, opts):
1695 def commitfunc(ui, repo, message, match, opts):
1696 return repo.commit(message,
1696 return repo.commit(message,
1697 opts.get('user') or old.user(),
1697 opts.get('user') or old.user(),
1698 opts.get('date') or old.date(),
1698 opts.get('date') or old.date(),
1699 match,
1699 match,
1700 extra=extra)
1700 extra=extra)
1701
1701
1702 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1702 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1703 if node == old.node():
1703 if node == old.node():
1704 ui.status(_("nothing changed\n"))
1704 ui.status(_("nothing changed\n"))
1705 return 1
1705 return 1
1706 else:
1706 else:
1707 def commitfunc(ui, repo, message, match, opts):
1707 def commitfunc(ui, repo, message, match, opts):
1708 backup = ui.backupconfig('phases', 'new-commit')
1708 backup = ui.backupconfig('phases', 'new-commit')
1709 baseui = repo.baseui
1709 baseui = repo.baseui
1710 basebackup = baseui.backupconfig('phases', 'new-commit')
1710 basebackup = baseui.backupconfig('phases', 'new-commit')
1711 try:
1711 try:
1712 if opts.get('secret'):
1712 if opts.get('secret'):
1713 ui.setconfig('phases', 'new-commit', 'secret', 'commit')
1713 ui.setconfig('phases', 'new-commit', 'secret', 'commit')
1714 # Propagate to subrepos
1714 # Propagate to subrepos
1715 baseui.setconfig('phases', 'new-commit', 'secret', 'commit')
1715 baseui.setconfig('phases', 'new-commit', 'secret', 'commit')
1716
1716
1717 editform = cmdutil.mergeeditform(repo[None], 'commit.normal')
1717 editform = cmdutil.mergeeditform(repo[None], 'commit.normal')
1718 editor = cmdutil.getcommiteditor(editform=editform, **opts)
1718 editor = cmdutil.getcommiteditor(editform=editform, **opts)
1719 return repo.commit(message, opts.get('user'), opts.get('date'),
1719 return repo.commit(message, opts.get('user'), opts.get('date'),
1720 match,
1720 match,
1721 editor=editor,
1721 editor=editor,
1722 extra=extra)
1722 extra=extra)
1723 finally:
1723 finally:
1724 ui.restoreconfig(backup)
1724 ui.restoreconfig(backup)
1725 repo.baseui.restoreconfig(basebackup)
1725 repo.baseui.restoreconfig(basebackup)
1726
1726
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.join('hgrc')]
1779 paths = [repo.join('hgrc')]
1780 elif opts.get('global'):
1780 elif opts.get('global'):
1781 paths = scmutil.systemrcpath()
1781 paths = scmutil.systemrcpath()
1782 else:
1782 else:
1783 paths = scmutil.userrcpath()
1783 paths = scmutil.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 return
1804 return
1805
1805
1806 fm = ui.formatter('config', opts)
1806 fm = ui.formatter('config', opts)
1807 for f in scmutil.rcpath():
1807 for f in scmutil.rcpath():
1808 ui.debug('read config from: %s\n' % f)
1808 ui.debug('read config from: %s\n' % f)
1809 untrusted = bool(opts.get('untrusted'))
1809 untrusted = bool(opts.get('untrusted'))
1810 if values:
1810 if values:
1811 sections = [v for v in values if '.' not in v]
1811 sections = [v for v in values if '.' not in v]
1812 items = [v for v in values if '.' in v]
1812 items = [v for v in values if '.' in v]
1813 if len(items) > 1 or items and sections:
1813 if len(items) > 1 or items and sections:
1814 raise error.Abort(_('only one config item permitted'))
1814 raise error.Abort(_('only one config item permitted'))
1815 matched = False
1815 matched = False
1816 for section, name, value in ui.walkconfig(untrusted=untrusted):
1816 for section, name, value in ui.walkconfig(untrusted=untrusted):
1817 source = ui.configsource(section, name, untrusted)
1817 source = ui.configsource(section, name, untrusted)
1818 value = str(value)
1818 value = str(value)
1819 if fm.isplain():
1819 if fm.isplain():
1820 source = source or 'none'
1820 source = source or 'none'
1821 value = value.replace('\n', '\\n')
1821 value = value.replace('\n', '\\n')
1822 entryname = section + '.' + name
1822 entryname = section + '.' + name
1823 if values:
1823 if values:
1824 for v in values:
1824 for v in values:
1825 if v == section:
1825 if v == section:
1826 fm.startitem()
1826 fm.startitem()
1827 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1827 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1828 fm.write('name value', '%s=%s\n', entryname, value)
1828 fm.write('name value', '%s=%s\n', entryname, value)
1829 matched = True
1829 matched = True
1830 elif v == entryname:
1830 elif v == entryname:
1831 fm.startitem()
1831 fm.startitem()
1832 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1832 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1833 fm.write('value', '%s\n', value)
1833 fm.write('value', '%s\n', value)
1834 fm.data(name=entryname)
1834 fm.data(name=entryname)
1835 matched = True
1835 matched = True
1836 else:
1836 else:
1837 fm.startitem()
1837 fm.startitem()
1838 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1838 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1839 fm.write('name value', '%s=%s\n', entryname, value)
1839 fm.write('name value', '%s=%s\n', entryname, value)
1840 matched = True
1840 matched = True
1841 fm.end()
1841 fm.end()
1842 if matched:
1842 if matched:
1843 return 0
1843 return 0
1844 return 1
1844 return 1
1845
1845
1846 @command('copy|cp',
1846 @command('copy|cp',
1847 [('A', 'after', None, _('record a copy that has already occurred')),
1847 [('A', 'after', None, _('record a copy that has already occurred')),
1848 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1848 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1849 ] + walkopts + dryrunopts,
1849 ] + walkopts + dryrunopts,
1850 _('[OPTION]... [SOURCE]... DEST'))
1850 _('[OPTION]... [SOURCE]... DEST'))
1851 def copy(ui, repo, *pats, **opts):
1851 def copy(ui, repo, *pats, **opts):
1852 """mark files as copied for the next commit
1852 """mark files as copied for the next commit
1853
1853
1854 Mark dest as having copies of source files. If dest is a
1854 Mark dest as having copies of source files. If dest is a
1855 directory, copies are put in that directory. If dest is a file,
1855 directory, copies are put in that directory. If dest is a file,
1856 the source must be a single file.
1856 the source must be a single file.
1857
1857
1858 By default, this command copies the contents of files as they
1858 By default, this command copies the contents of files as they
1859 exist in the working directory. If invoked with -A/--after, the
1859 exist in the working directory. If invoked with -A/--after, the
1860 operation is recorded, but no copying is performed.
1860 operation is recorded, but no copying is performed.
1861
1861
1862 This command takes effect with the next commit. To undo a copy
1862 This command takes effect with the next commit. To undo a copy
1863 before that, see :hg:`revert`.
1863 before that, see :hg:`revert`.
1864
1864
1865 Returns 0 on success, 1 if errors are encountered.
1865 Returns 0 on success, 1 if errors are encountered.
1866 """
1866 """
1867 with repo.wlock(False):
1867 with repo.wlock(False):
1868 return cmdutil.copy(ui, repo, pats, opts)
1868 return cmdutil.copy(ui, repo, pats, opts)
1869
1869
1870 @command('debuginstall', [] + formatteropts, '', norepo=True)
1870 @command('debuginstall', [] + formatteropts, '', norepo=True)
1871 def debuginstall(ui, **opts):
1871 def debuginstall(ui, **opts):
1872 '''test Mercurial installation
1872 '''test Mercurial installation
1873
1873
1874 Returns 0 on success.
1874 Returns 0 on success.
1875 '''
1875 '''
1876
1876
1877 def writetemp(contents):
1877 def writetemp(contents):
1878 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
1878 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
1879 f = os.fdopen(fd, "wb")
1879 f = os.fdopen(fd, "wb")
1880 f.write(contents)
1880 f.write(contents)
1881 f.close()
1881 f.close()
1882 return name
1882 return name
1883
1883
1884 problems = 0
1884 problems = 0
1885
1885
1886 fm = ui.formatter('debuginstall', opts)
1886 fm = ui.formatter('debuginstall', opts)
1887 fm.startitem()
1887 fm.startitem()
1888
1888
1889 # encoding
1889 # encoding
1890 fm.write('encoding', _("checking encoding (%s)...\n"), encoding.encoding)
1890 fm.write('encoding', _("checking encoding (%s)...\n"), encoding.encoding)
1891 err = None
1891 err = None
1892 try:
1892 try:
1893 encoding.fromlocal("test")
1893 encoding.fromlocal("test")
1894 except error.Abort as inst:
1894 except error.Abort as inst:
1895 err = inst
1895 err = inst
1896 problems += 1
1896 problems += 1
1897 fm.condwrite(err, 'encodingerror', _(" %s\n"
1897 fm.condwrite(err, 'encodingerror', _(" %s\n"
1898 " (check that your locale is properly set)\n"), err)
1898 " (check that your locale is properly set)\n"), err)
1899
1899
1900 # Python
1900 # Python
1901 fm.write('pythonexe', _("checking Python executable (%s)\n"),
1901 fm.write('pythonexe', _("checking Python executable (%s)\n"),
1902 pycompat.sysexecutable)
1902 pycompat.sysexecutable)
1903 fm.write('pythonver', _("checking Python version (%s)\n"),
1903 fm.write('pythonver', _("checking Python version (%s)\n"),
1904 ("%d.%d.%d" % sys.version_info[:3]))
1904 ("%d.%d.%d" % sys.version_info[:3]))
1905 fm.write('pythonlib', _("checking Python lib (%s)...\n"),
1905 fm.write('pythonlib', _("checking Python lib (%s)...\n"),
1906 os.path.dirname(os.__file__))
1906 os.path.dirname(pycompat.fsencode(os.__file__)))
1907
1907
1908 security = set(sslutil.supportedprotocols)
1908 security = set(sslutil.supportedprotocols)
1909 if sslutil.hassni:
1909 if sslutil.hassni:
1910 security.add('sni')
1910 security.add('sni')
1911
1911
1912 fm.write('pythonsecurity', _("checking Python security support (%s)\n"),
1912 fm.write('pythonsecurity', _("checking Python security support (%s)\n"),
1913 fm.formatlist(sorted(security), name='protocol',
1913 fm.formatlist(sorted(security), name='protocol',
1914 fmt='%s', sep=','))
1914 fmt='%s', sep=','))
1915
1915
1916 # These are warnings, not errors. So don't increment problem count. This
1916 # These are warnings, not errors. So don't increment problem count. This
1917 # may change in the future.
1917 # may change in the future.
1918 if 'tls1.2' not in security:
1918 if 'tls1.2' not in security:
1919 fm.plain(_(' TLS 1.2 not supported by Python install; '
1919 fm.plain(_(' TLS 1.2 not supported by Python install; '
1920 'network connections lack modern security\n'))
1920 'network connections lack modern security\n'))
1921 if 'sni' not in security:
1921 if 'sni' not in security:
1922 fm.plain(_(' SNI not supported by Python install; may have '
1922 fm.plain(_(' SNI not supported by Python install; may have '
1923 'connectivity issues with some servers\n'))
1923 'connectivity issues with some servers\n'))
1924
1924
1925 # TODO print CA cert info
1925 # TODO print CA cert info
1926
1926
1927 # hg version
1927 # hg version
1928 hgver = util.version()
1928 hgver = util.version()
1929 fm.write('hgver', _("checking Mercurial version (%s)\n"),
1929 fm.write('hgver', _("checking Mercurial version (%s)\n"),
1930 hgver.split('+')[0])
1930 hgver.split('+')[0])
1931 fm.write('hgverextra', _("checking Mercurial custom build (%s)\n"),
1931 fm.write('hgverextra', _("checking Mercurial custom build (%s)\n"),
1932 '+'.join(hgver.split('+')[1:]))
1932 '+'.join(hgver.split('+')[1:]))
1933
1933
1934 # compiled modules
1934 # compiled modules
1935 fm.write('hgmodulepolicy', _("checking module policy (%s)\n"),
1935 fm.write('hgmodulepolicy', _("checking module policy (%s)\n"),
1936 policy.policy)
1936 policy.policy)
1937 fm.write('hgmodules', _("checking installed modules (%s)...\n"),
1937 fm.write('hgmodules', _("checking installed modules (%s)...\n"),
1938 os.path.dirname(__file__))
1938 os.path.dirname(__file__))
1939
1939
1940 err = None
1940 err = None
1941 try:
1941 try:
1942 from . import (
1942 from . import (
1943 base85,
1943 base85,
1944 bdiff,
1944 bdiff,
1945 mpatch,
1945 mpatch,
1946 osutil,
1946 osutil,
1947 )
1947 )
1948 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
1948 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
1949 except Exception as inst:
1949 except Exception as inst:
1950 err = inst
1950 err = inst
1951 problems += 1
1951 problems += 1
1952 fm.condwrite(err, 'extensionserror', " %s\n", err)
1952 fm.condwrite(err, 'extensionserror', " %s\n", err)
1953
1953
1954 compengines = util.compengines._engines.values()
1954 compengines = util.compengines._engines.values()
1955 fm.write('compengines', _('checking registered compression engines (%s)\n'),
1955 fm.write('compengines', _('checking registered compression engines (%s)\n'),
1956 fm.formatlist(sorted(e.name() for e in compengines),
1956 fm.formatlist(sorted(e.name() for e in compengines),
1957 name='compengine', fmt='%s', sep=', '))
1957 name='compengine', fmt='%s', sep=', '))
1958 fm.write('compenginesavail', _('checking available compression engines '
1958 fm.write('compenginesavail', _('checking available compression engines '
1959 '(%s)\n'),
1959 '(%s)\n'),
1960 fm.formatlist(sorted(e.name() for e in compengines
1960 fm.formatlist(sorted(e.name() for e in compengines
1961 if e.available()),
1961 if e.available()),
1962 name='compengine', fmt='%s', sep=', '))
1962 name='compengine', fmt='%s', sep=', '))
1963 wirecompengines = util.compengines.supportedwireengines(util.SERVERROLE)
1963 wirecompengines = util.compengines.supportedwireengines(util.SERVERROLE)
1964 fm.write('compenginesserver', _('checking available compression engines '
1964 fm.write('compenginesserver', _('checking available compression engines '
1965 'for wire protocol (%s)\n'),
1965 'for wire protocol (%s)\n'),
1966 fm.formatlist([e.name() for e in wirecompengines
1966 fm.formatlist([e.name() for e in wirecompengines
1967 if e.wireprotosupport()],
1967 if e.wireprotosupport()],
1968 name='compengine', fmt='%s', sep=', '))
1968 name='compengine', fmt='%s', sep=', '))
1969
1969
1970 # templates
1970 # templates
1971 p = templater.templatepaths()
1971 p = templater.templatepaths()
1972 fm.write('templatedirs', 'checking templates (%s)...\n', ' '.join(p))
1972 fm.write('templatedirs', 'checking templates (%s)...\n', ' '.join(p))
1973 fm.condwrite(not p, '', _(" no template directories found\n"))
1973 fm.condwrite(not p, '', _(" no template directories found\n"))
1974 if p:
1974 if p:
1975 m = templater.templatepath("map-cmdline.default")
1975 m = templater.templatepath("map-cmdline.default")
1976 if m:
1976 if m:
1977 # template found, check if it is working
1977 # template found, check if it is working
1978 err = None
1978 err = None
1979 try:
1979 try:
1980 templater.templater.frommapfile(m)
1980 templater.templater.frommapfile(m)
1981 except Exception as inst:
1981 except Exception as inst:
1982 err = inst
1982 err = inst
1983 p = None
1983 p = None
1984 fm.condwrite(err, 'defaulttemplateerror', " %s\n", err)
1984 fm.condwrite(err, 'defaulttemplateerror', " %s\n", err)
1985 else:
1985 else:
1986 p = None
1986 p = None
1987 fm.condwrite(p, 'defaulttemplate',
1987 fm.condwrite(p, 'defaulttemplate',
1988 _("checking default template (%s)\n"), m)
1988 _("checking default template (%s)\n"), m)
1989 fm.condwrite(not m, 'defaulttemplatenotfound',
1989 fm.condwrite(not m, 'defaulttemplatenotfound',
1990 _(" template '%s' not found\n"), "default")
1990 _(" template '%s' not found\n"), "default")
1991 if not p:
1991 if not p:
1992 problems += 1
1992 problems += 1
1993 fm.condwrite(not p, '',
1993 fm.condwrite(not p, '',
1994 _(" (templates seem to have been installed incorrectly)\n"))
1994 _(" (templates seem to have been installed incorrectly)\n"))
1995
1995
1996 # editor
1996 # editor
1997 editor = ui.geteditor()
1997 editor = ui.geteditor()
1998 editor = util.expandpath(editor)
1998 editor = util.expandpath(editor)
1999 fm.write('editor', _("checking commit editor... (%s)\n"), editor)
1999 fm.write('editor', _("checking commit editor... (%s)\n"), editor)
2000 cmdpath = util.findexe(pycompat.shlexsplit(editor)[0])
2000 cmdpath = util.findexe(pycompat.shlexsplit(editor)[0])
2001 fm.condwrite(not cmdpath and editor == 'vi', 'vinotfound',
2001 fm.condwrite(not cmdpath and editor == 'vi', 'vinotfound',
2002 _(" No commit editor set and can't find %s in PATH\n"
2002 _(" No commit editor set and can't find %s in PATH\n"
2003 " (specify a commit editor in your configuration"
2003 " (specify a commit editor in your configuration"
2004 " file)\n"), not cmdpath and editor == 'vi' and editor)
2004 " file)\n"), not cmdpath and editor == 'vi' and editor)
2005 fm.condwrite(not cmdpath and editor != 'vi', 'editornotfound',
2005 fm.condwrite(not cmdpath and editor != 'vi', 'editornotfound',
2006 _(" Can't find editor '%s' in PATH\n"
2006 _(" Can't find editor '%s' in PATH\n"
2007 " (specify a commit editor in your configuration"
2007 " (specify a commit editor in your configuration"
2008 " file)\n"), not cmdpath and editor)
2008 " file)\n"), not cmdpath and editor)
2009 if not cmdpath and editor != 'vi':
2009 if not cmdpath and editor != 'vi':
2010 problems += 1
2010 problems += 1
2011
2011
2012 # check username
2012 # check username
2013 username = None
2013 username = None
2014 err = None
2014 err = None
2015 try:
2015 try:
2016 username = ui.username()
2016 username = ui.username()
2017 except error.Abort as e:
2017 except error.Abort as e:
2018 err = e
2018 err = e
2019 problems += 1
2019 problems += 1
2020
2020
2021 fm.condwrite(username, 'username', _("checking username (%s)\n"), username)
2021 fm.condwrite(username, 'username', _("checking username (%s)\n"), username)
2022 fm.condwrite(err, 'usernameerror', _("checking username...\n %s\n"
2022 fm.condwrite(err, 'usernameerror', _("checking username...\n %s\n"
2023 " (specify a username in your configuration file)\n"), err)
2023 " (specify a username in your configuration file)\n"), err)
2024
2024
2025 fm.condwrite(not problems, '',
2025 fm.condwrite(not problems, '',
2026 _("no problems detected\n"))
2026 _("no problems detected\n"))
2027 if not problems:
2027 if not problems:
2028 fm.data(problems=problems)
2028 fm.data(problems=problems)
2029 fm.condwrite(problems, 'problems',
2029 fm.condwrite(problems, 'problems',
2030 _("%d problems detected,"
2030 _("%d problems detected,"
2031 " please check your install!\n"), problems)
2031 " please check your install!\n"), problems)
2032 fm.end()
2032 fm.end()
2033
2033
2034 return problems
2034 return problems
2035
2035
2036 @command('debugknown', [], _('REPO ID...'), norepo=True)
2036 @command('debugknown', [], _('REPO ID...'), norepo=True)
2037 def debugknown(ui, repopath, *ids, **opts):
2037 def debugknown(ui, repopath, *ids, **opts):
2038 """test whether node ids are known to a repo
2038 """test whether node ids are known to a repo
2039
2039
2040 Every ID must be a full-length hex node id string. Returns a list of 0s
2040 Every ID must be a full-length hex node id string. Returns a list of 0s
2041 and 1s indicating unknown/known.
2041 and 1s indicating unknown/known.
2042 """
2042 """
2043 repo = hg.peer(ui, opts, repopath)
2043 repo = hg.peer(ui, opts, repopath)
2044 if not repo.capable('known'):
2044 if not repo.capable('known'):
2045 raise error.Abort("known() not supported by target repository")
2045 raise error.Abort("known() not supported by target repository")
2046 flags = repo.known([bin(s) for s in ids])
2046 flags = repo.known([bin(s) for s in ids])
2047 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2047 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2048
2048
2049 @command('debuglabelcomplete', [], _('LABEL...'))
2049 @command('debuglabelcomplete', [], _('LABEL...'))
2050 def debuglabelcomplete(ui, repo, *args):
2050 def debuglabelcomplete(ui, repo, *args):
2051 '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
2051 '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
2052 debugnamecomplete(ui, repo, *args)
2052 debugnamecomplete(ui, repo, *args)
2053
2053
2054 @command('debugmergestate', [], '')
2054 @command('debugmergestate', [], '')
2055 def debugmergestate(ui, repo, *args):
2055 def debugmergestate(ui, repo, *args):
2056 """print merge state
2056 """print merge state
2057
2057
2058 Use --verbose to print out information about whether v1 or v2 merge state
2058 Use --verbose to print out information about whether v1 or v2 merge state
2059 was chosen."""
2059 was chosen."""
2060 def _hashornull(h):
2060 def _hashornull(h):
2061 if h == nullhex:
2061 if h == nullhex:
2062 return 'null'
2062 return 'null'
2063 else:
2063 else:
2064 return h
2064 return h
2065
2065
2066 def printrecords(version):
2066 def printrecords(version):
2067 ui.write(('* version %s records\n') % version)
2067 ui.write(('* version %s records\n') % version)
2068 if version == 1:
2068 if version == 1:
2069 records = v1records
2069 records = v1records
2070 else:
2070 else:
2071 records = v2records
2071 records = v2records
2072
2072
2073 for rtype, record in records:
2073 for rtype, record in records:
2074 # pretty print some record types
2074 # pretty print some record types
2075 if rtype == 'L':
2075 if rtype == 'L':
2076 ui.write(('local: %s\n') % record)
2076 ui.write(('local: %s\n') % record)
2077 elif rtype == 'O':
2077 elif rtype == 'O':
2078 ui.write(('other: %s\n') % record)
2078 ui.write(('other: %s\n') % record)
2079 elif rtype == 'm':
2079 elif rtype == 'm':
2080 driver, mdstate = record.split('\0', 1)
2080 driver, mdstate = record.split('\0', 1)
2081 ui.write(('merge driver: %s (state "%s")\n')
2081 ui.write(('merge driver: %s (state "%s")\n')
2082 % (driver, mdstate))
2082 % (driver, mdstate))
2083 elif rtype in 'FDC':
2083 elif rtype in 'FDC':
2084 r = record.split('\0')
2084 r = record.split('\0')
2085 f, state, hash, lfile, afile, anode, ofile = r[0:7]
2085 f, state, hash, lfile, afile, anode, ofile = r[0:7]
2086 if version == 1:
2086 if version == 1:
2087 onode = 'not stored in v1 format'
2087 onode = 'not stored in v1 format'
2088 flags = r[7]
2088 flags = r[7]
2089 else:
2089 else:
2090 onode, flags = r[7:9]
2090 onode, flags = r[7:9]
2091 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
2091 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
2092 % (f, rtype, state, _hashornull(hash)))
2092 % (f, rtype, state, _hashornull(hash)))
2093 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags))
2093 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags))
2094 ui.write((' ancestor path: %s (node %s)\n')
2094 ui.write((' ancestor path: %s (node %s)\n')
2095 % (afile, _hashornull(anode)))
2095 % (afile, _hashornull(anode)))
2096 ui.write((' other path: %s (node %s)\n')
2096 ui.write((' other path: %s (node %s)\n')
2097 % (ofile, _hashornull(onode)))
2097 % (ofile, _hashornull(onode)))
2098 elif rtype == 'f':
2098 elif rtype == 'f':
2099 filename, rawextras = record.split('\0', 1)
2099 filename, rawextras = record.split('\0', 1)
2100 extras = rawextras.split('\0')
2100 extras = rawextras.split('\0')
2101 i = 0
2101 i = 0
2102 extrastrings = []
2102 extrastrings = []
2103 while i < len(extras):
2103 while i < len(extras):
2104 extrastrings.append('%s = %s' % (extras[i], extras[i + 1]))
2104 extrastrings.append('%s = %s' % (extras[i], extras[i + 1]))
2105 i += 2
2105 i += 2
2106
2106
2107 ui.write(('file extras: %s (%s)\n')
2107 ui.write(('file extras: %s (%s)\n')
2108 % (filename, ', '.join(extrastrings)))
2108 % (filename, ', '.join(extrastrings)))
2109 elif rtype == 'l':
2109 elif rtype == 'l':
2110 labels = record.split('\0', 2)
2110 labels = record.split('\0', 2)
2111 labels = [l for l in labels if len(l) > 0]
2111 labels = [l for l in labels if len(l) > 0]
2112 ui.write(('labels:\n'))
2112 ui.write(('labels:\n'))
2113 ui.write((' local: %s\n' % labels[0]))
2113 ui.write((' local: %s\n' % labels[0]))
2114 ui.write((' other: %s\n' % labels[1]))
2114 ui.write((' other: %s\n' % labels[1]))
2115 if len(labels) > 2:
2115 if len(labels) > 2:
2116 ui.write((' base: %s\n' % labels[2]))
2116 ui.write((' base: %s\n' % labels[2]))
2117 else:
2117 else:
2118 ui.write(('unrecognized entry: %s\t%s\n')
2118 ui.write(('unrecognized entry: %s\t%s\n')
2119 % (rtype, record.replace('\0', '\t')))
2119 % (rtype, record.replace('\0', '\t')))
2120
2120
2121 # Avoid mergestate.read() since it may raise an exception for unsupported
2121 # Avoid mergestate.read() since it may raise an exception for unsupported
2122 # merge state records. We shouldn't be doing this, but this is OK since this
2122 # merge state records. We shouldn't be doing this, but this is OK since this
2123 # command is pretty low-level.
2123 # command is pretty low-level.
2124 ms = mergemod.mergestate(repo)
2124 ms = mergemod.mergestate(repo)
2125
2125
2126 # sort so that reasonable information is on top
2126 # sort so that reasonable information is on top
2127 v1records = ms._readrecordsv1()
2127 v1records = ms._readrecordsv1()
2128 v2records = ms._readrecordsv2()
2128 v2records = ms._readrecordsv2()
2129 order = 'LOml'
2129 order = 'LOml'
2130 def key(r):
2130 def key(r):
2131 idx = order.find(r[0])
2131 idx = order.find(r[0])
2132 if idx == -1:
2132 if idx == -1:
2133 return (1, r[1])
2133 return (1, r[1])
2134 else:
2134 else:
2135 return (0, idx)
2135 return (0, idx)
2136 v1records.sort(key=key)
2136 v1records.sort(key=key)
2137 v2records.sort(key=key)
2137 v2records.sort(key=key)
2138
2138
2139 if not v1records and not v2records:
2139 if not v1records and not v2records:
2140 ui.write(('no merge state found\n'))
2140 ui.write(('no merge state found\n'))
2141 elif not v2records:
2141 elif not v2records:
2142 ui.note(('no version 2 merge state\n'))
2142 ui.note(('no version 2 merge state\n'))
2143 printrecords(1)
2143 printrecords(1)
2144 elif ms._v1v2match(v1records, v2records):
2144 elif ms._v1v2match(v1records, v2records):
2145 ui.note(('v1 and v2 states match: using v2\n'))
2145 ui.note(('v1 and v2 states match: using v2\n'))
2146 printrecords(2)
2146 printrecords(2)
2147 else:
2147 else:
2148 ui.note(('v1 and v2 states mismatch: using v1\n'))
2148 ui.note(('v1 and v2 states mismatch: using v1\n'))
2149 printrecords(1)
2149 printrecords(1)
2150 if ui.verbose:
2150 if ui.verbose:
2151 printrecords(2)
2151 printrecords(2)
2152
2152
2153 @command('debugnamecomplete', [], _('NAME...'))
2153 @command('debugnamecomplete', [], _('NAME...'))
2154 def debugnamecomplete(ui, repo, *args):
2154 def debugnamecomplete(ui, repo, *args):
2155 '''complete "names" - tags, open branch names, bookmark names'''
2155 '''complete "names" - tags, open branch names, bookmark names'''
2156
2156
2157 names = set()
2157 names = set()
2158 # since we previously only listed open branches, we will handle that
2158 # since we previously only listed open branches, we will handle that
2159 # specially (after this for loop)
2159 # specially (after this for loop)
2160 for name, ns in repo.names.iteritems():
2160 for name, ns in repo.names.iteritems():
2161 if name != 'branches':
2161 if name != 'branches':
2162 names.update(ns.listnames(repo))
2162 names.update(ns.listnames(repo))
2163 names.update(tag for (tag, heads, tip, closed)
2163 names.update(tag for (tag, heads, tip, closed)
2164 in repo.branchmap().iterbranches() if not closed)
2164 in repo.branchmap().iterbranches() if not closed)
2165 completions = set()
2165 completions = set()
2166 if not args:
2166 if not args:
2167 args = ['']
2167 args = ['']
2168 for a in args:
2168 for a in args:
2169 completions.update(n for n in names if n.startswith(a))
2169 completions.update(n for n in names if n.startswith(a))
2170 ui.write('\n'.join(sorted(completions)))
2170 ui.write('\n'.join(sorted(completions)))
2171 ui.write('\n')
2171 ui.write('\n')
2172
2172
2173 @command('debuglocks',
2173 @command('debuglocks',
2174 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
2174 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
2175 ('W', 'force-wlock', None,
2175 ('W', 'force-wlock', None,
2176 _('free the working state lock (DANGEROUS)'))],
2176 _('free the working state lock (DANGEROUS)'))],
2177 _('[OPTION]...'))
2177 _('[OPTION]...'))
2178 def debuglocks(ui, repo, **opts):
2178 def debuglocks(ui, repo, **opts):
2179 """show or modify state of locks
2179 """show or modify state of locks
2180
2180
2181 By default, this command will show which locks are held. This
2181 By default, this command will show which locks are held. This
2182 includes the user and process holding the lock, the amount of time
2182 includes the user and process holding the lock, the amount of time
2183 the lock has been held, and the machine name where the process is
2183 the lock has been held, and the machine name where the process is
2184 running if it's not local.
2184 running if it's not local.
2185
2185
2186 Locks protect the integrity of Mercurial's data, so should be
2186 Locks protect the integrity of Mercurial's data, so should be
2187 treated with care. System crashes or other interruptions may cause
2187 treated with care. System crashes or other interruptions may cause
2188 locks to not be properly released, though Mercurial will usually
2188 locks to not be properly released, though Mercurial will usually
2189 detect and remove such stale locks automatically.
2189 detect and remove such stale locks automatically.
2190
2190
2191 However, detecting stale locks may not always be possible (for
2191 However, detecting stale locks may not always be possible (for
2192 instance, on a shared filesystem). Removing locks may also be
2192 instance, on a shared filesystem). Removing locks may also be
2193 blocked by filesystem permissions.
2193 blocked by filesystem permissions.
2194
2194
2195 Returns 0 if no locks are held.
2195 Returns 0 if no locks are held.
2196
2196
2197 """
2197 """
2198
2198
2199 if opts.get('force_lock'):
2199 if opts.get('force_lock'):
2200 repo.svfs.unlink('lock')
2200 repo.svfs.unlink('lock')
2201 if opts.get('force_wlock'):
2201 if opts.get('force_wlock'):
2202 repo.vfs.unlink('wlock')
2202 repo.vfs.unlink('wlock')
2203 if opts.get('force_lock') or opts.get('force_lock'):
2203 if opts.get('force_lock') or opts.get('force_lock'):
2204 return 0
2204 return 0
2205
2205
2206 now = time.time()
2206 now = time.time()
2207 held = 0
2207 held = 0
2208
2208
2209 def report(vfs, name, method):
2209 def report(vfs, name, method):
2210 # this causes stale locks to get reaped for more accurate reporting
2210 # this causes stale locks to get reaped for more accurate reporting
2211 try:
2211 try:
2212 l = method(False)
2212 l = method(False)
2213 except error.LockHeld:
2213 except error.LockHeld:
2214 l = None
2214 l = None
2215
2215
2216 if l:
2216 if l:
2217 l.release()
2217 l.release()
2218 else:
2218 else:
2219 try:
2219 try:
2220 stat = vfs.lstat(name)
2220 stat = vfs.lstat(name)
2221 age = now - stat.st_mtime
2221 age = now - stat.st_mtime
2222 user = util.username(stat.st_uid)
2222 user = util.username(stat.st_uid)
2223 locker = vfs.readlock(name)
2223 locker = vfs.readlock(name)
2224 if ":" in locker:
2224 if ":" in locker:
2225 host, pid = locker.split(':')
2225 host, pid = locker.split(':')
2226 if host == socket.gethostname():
2226 if host == socket.gethostname():
2227 locker = 'user %s, process %s' % (user, pid)
2227 locker = 'user %s, process %s' % (user, pid)
2228 else:
2228 else:
2229 locker = 'user %s, process %s, host %s' \
2229 locker = 'user %s, process %s, host %s' \
2230 % (user, pid, host)
2230 % (user, pid, host)
2231 ui.write(("%-6s %s (%ds)\n") % (name + ":", locker, age))
2231 ui.write(("%-6s %s (%ds)\n") % (name + ":", locker, age))
2232 return 1
2232 return 1
2233 except OSError as e:
2233 except OSError as e:
2234 if e.errno != errno.ENOENT:
2234 if e.errno != errno.ENOENT:
2235 raise
2235 raise
2236
2236
2237 ui.write(("%-6s free\n") % (name + ":"))
2237 ui.write(("%-6s free\n") % (name + ":"))
2238 return 0
2238 return 0
2239
2239
2240 held += report(repo.svfs, "lock", repo.lock)
2240 held += report(repo.svfs, "lock", repo.lock)
2241 held += report(repo.vfs, "wlock", repo.wlock)
2241 held += report(repo.vfs, "wlock", repo.wlock)
2242
2242
2243 return held
2243 return held
2244
2244
2245 @command('debugobsolete',
2245 @command('debugobsolete',
2246 [('', 'flags', 0, _('markers flag')),
2246 [('', 'flags', 0, _('markers flag')),
2247 ('', 'record-parents', False,
2247 ('', 'record-parents', False,
2248 _('record parent information for the precursor')),
2248 _('record parent information for the precursor')),
2249 ('r', 'rev', [], _('display markers relevant to REV')),
2249 ('r', 'rev', [], _('display markers relevant to REV')),
2250 ('', 'index', False, _('display index of the marker')),
2250 ('', 'index', False, _('display index of the marker')),
2251 ('', 'delete', [], _('delete markers specified by indices')),
2251 ('', 'delete', [], _('delete markers specified by indices')),
2252 ] + commitopts2 + formatteropts,
2252 ] + commitopts2 + formatteropts,
2253 _('[OBSOLETED [REPLACEMENT ...]]'))
2253 _('[OBSOLETED [REPLACEMENT ...]]'))
2254 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
2254 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
2255 """create arbitrary obsolete marker
2255 """create arbitrary obsolete marker
2256
2256
2257 With no arguments, displays the list of obsolescence markers."""
2257 With no arguments, displays the list of obsolescence markers."""
2258
2258
2259 def parsenodeid(s):
2259 def parsenodeid(s):
2260 try:
2260 try:
2261 # We do not use revsingle/revrange functions here to accept
2261 # We do not use revsingle/revrange functions here to accept
2262 # arbitrary node identifiers, possibly not present in the
2262 # arbitrary node identifiers, possibly not present in the
2263 # local repository.
2263 # local repository.
2264 n = bin(s)
2264 n = bin(s)
2265 if len(n) != len(nullid):
2265 if len(n) != len(nullid):
2266 raise TypeError()
2266 raise TypeError()
2267 return n
2267 return n
2268 except TypeError:
2268 except TypeError:
2269 raise error.Abort('changeset references must be full hexadecimal '
2269 raise error.Abort('changeset references must be full hexadecimal '
2270 'node identifiers')
2270 'node identifiers')
2271
2271
2272 if opts.get('delete'):
2272 if opts.get('delete'):
2273 indices = []
2273 indices = []
2274 for v in opts.get('delete'):
2274 for v in opts.get('delete'):
2275 try:
2275 try:
2276 indices.append(int(v))
2276 indices.append(int(v))
2277 except ValueError:
2277 except ValueError:
2278 raise error.Abort(_('invalid index value: %r') % v,
2278 raise error.Abort(_('invalid index value: %r') % v,
2279 hint=_('use integers for indices'))
2279 hint=_('use integers for indices'))
2280
2280
2281 if repo.currenttransaction():
2281 if repo.currenttransaction():
2282 raise error.Abort(_('cannot delete obsmarkers in the middle '
2282 raise error.Abort(_('cannot delete obsmarkers in the middle '
2283 'of transaction.'))
2283 'of transaction.'))
2284
2284
2285 with repo.lock():
2285 with repo.lock():
2286 n = repair.deleteobsmarkers(repo.obsstore, indices)
2286 n = repair.deleteobsmarkers(repo.obsstore, indices)
2287 ui.write(_('deleted %i obsolescence markers\n') % n)
2287 ui.write(_('deleted %i obsolescence markers\n') % n)
2288
2288
2289 return
2289 return
2290
2290
2291 if precursor is not None:
2291 if precursor is not None:
2292 if opts['rev']:
2292 if opts['rev']:
2293 raise error.Abort('cannot select revision when creating marker')
2293 raise error.Abort('cannot select revision when creating marker')
2294 metadata = {}
2294 metadata = {}
2295 metadata['user'] = opts['user'] or ui.username()
2295 metadata['user'] = opts['user'] or ui.username()
2296 succs = tuple(parsenodeid(succ) for succ in successors)
2296 succs = tuple(parsenodeid(succ) for succ in successors)
2297 l = repo.lock()
2297 l = repo.lock()
2298 try:
2298 try:
2299 tr = repo.transaction('debugobsolete')
2299 tr = repo.transaction('debugobsolete')
2300 try:
2300 try:
2301 date = opts.get('date')
2301 date = opts.get('date')
2302 if date:
2302 if date:
2303 date = util.parsedate(date)
2303 date = util.parsedate(date)
2304 else:
2304 else:
2305 date = None
2305 date = None
2306 prec = parsenodeid(precursor)
2306 prec = parsenodeid(precursor)
2307 parents = None
2307 parents = None
2308 if opts['record_parents']:
2308 if opts['record_parents']:
2309 if prec not in repo.unfiltered():
2309 if prec not in repo.unfiltered():
2310 raise error.Abort('cannot used --record-parents on '
2310 raise error.Abort('cannot used --record-parents on '
2311 'unknown changesets')
2311 'unknown changesets')
2312 parents = repo.unfiltered()[prec].parents()
2312 parents = repo.unfiltered()[prec].parents()
2313 parents = tuple(p.node() for p in parents)
2313 parents = tuple(p.node() for p in parents)
2314 repo.obsstore.create(tr, prec, succs, opts['flags'],
2314 repo.obsstore.create(tr, prec, succs, opts['flags'],
2315 parents=parents, date=date,
2315 parents=parents, date=date,
2316 metadata=metadata)
2316 metadata=metadata)
2317 tr.close()
2317 tr.close()
2318 except ValueError as exc:
2318 except ValueError as exc:
2319 raise error.Abort(_('bad obsmarker input: %s') % exc)
2319 raise error.Abort(_('bad obsmarker input: %s') % exc)
2320 finally:
2320 finally:
2321 tr.release()
2321 tr.release()
2322 finally:
2322 finally:
2323 l.release()
2323 l.release()
2324 else:
2324 else:
2325 if opts['rev']:
2325 if opts['rev']:
2326 revs = scmutil.revrange(repo, opts['rev'])
2326 revs = scmutil.revrange(repo, opts['rev'])
2327 nodes = [repo[r].node() for r in revs]
2327 nodes = [repo[r].node() for r in revs]
2328 markers = list(obsolete.getmarkers(repo, nodes=nodes))
2328 markers = list(obsolete.getmarkers(repo, nodes=nodes))
2329 markers.sort(key=lambda x: x._data)
2329 markers.sort(key=lambda x: x._data)
2330 else:
2330 else:
2331 markers = obsolete.getmarkers(repo)
2331 markers = obsolete.getmarkers(repo)
2332
2332
2333 markerstoiter = markers
2333 markerstoiter = markers
2334 isrelevant = lambda m: True
2334 isrelevant = lambda m: True
2335 if opts.get('rev') and opts.get('index'):
2335 if opts.get('rev') and opts.get('index'):
2336 markerstoiter = obsolete.getmarkers(repo)
2336 markerstoiter = obsolete.getmarkers(repo)
2337 markerset = set(markers)
2337 markerset = set(markers)
2338 isrelevant = lambda m: m in markerset
2338 isrelevant = lambda m: m in markerset
2339
2339
2340 fm = ui.formatter('debugobsolete', opts)
2340 fm = ui.formatter('debugobsolete', opts)
2341 for i, m in enumerate(markerstoiter):
2341 for i, m in enumerate(markerstoiter):
2342 if not isrelevant(m):
2342 if not isrelevant(m):
2343 # marker can be irrelevant when we're iterating over a set
2343 # marker can be irrelevant when we're iterating over a set
2344 # of markers (markerstoiter) which is bigger than the set
2344 # of markers (markerstoiter) which is bigger than the set
2345 # of markers we want to display (markers)
2345 # of markers we want to display (markers)
2346 # this can happen if both --index and --rev options are
2346 # this can happen if both --index and --rev options are
2347 # provided and thus we need to iterate over all of the markers
2347 # provided and thus we need to iterate over all of the markers
2348 # to get the correct indices, but only display the ones that
2348 # to get the correct indices, but only display the ones that
2349 # are relevant to --rev value
2349 # are relevant to --rev value
2350 continue
2350 continue
2351 fm.startitem()
2351 fm.startitem()
2352 ind = i if opts.get('index') else None
2352 ind = i if opts.get('index') else None
2353 cmdutil.showmarker(fm, m, index=ind)
2353 cmdutil.showmarker(fm, m, index=ind)
2354 fm.end()
2354 fm.end()
2355
2355
2356 @command('debugpathcomplete',
2356 @command('debugpathcomplete',
2357 [('f', 'full', None, _('complete an entire path')),
2357 [('f', 'full', None, _('complete an entire path')),
2358 ('n', 'normal', None, _('show only normal files')),
2358 ('n', 'normal', None, _('show only normal files')),
2359 ('a', 'added', None, _('show only added files')),
2359 ('a', 'added', None, _('show only added files')),
2360 ('r', 'removed', None, _('show only removed files'))],
2360 ('r', 'removed', None, _('show only removed files'))],
2361 _('FILESPEC...'))
2361 _('FILESPEC...'))
2362 def debugpathcomplete(ui, repo, *specs, **opts):
2362 def debugpathcomplete(ui, repo, *specs, **opts):
2363 '''complete part or all of a tracked path
2363 '''complete part or all of a tracked path
2364
2364
2365 This command supports shells that offer path name completion. It
2365 This command supports shells that offer path name completion. It
2366 currently completes only files already known to the dirstate.
2366 currently completes only files already known to the dirstate.
2367
2367
2368 Completion extends only to the next path segment unless
2368 Completion extends only to the next path segment unless
2369 --full is specified, in which case entire paths are used.'''
2369 --full is specified, in which case entire paths are used.'''
2370
2370
2371 def complete(path, acceptable):
2371 def complete(path, acceptable):
2372 dirstate = repo.dirstate
2372 dirstate = repo.dirstate
2373 spec = os.path.normpath(os.path.join(pycompat.getcwd(), path))
2373 spec = os.path.normpath(os.path.join(pycompat.getcwd(), path))
2374 rootdir = repo.root + pycompat.ossep
2374 rootdir = repo.root + pycompat.ossep
2375 if spec != repo.root and not spec.startswith(rootdir):
2375 if spec != repo.root and not spec.startswith(rootdir):
2376 return [], []
2376 return [], []
2377 if os.path.isdir(spec):
2377 if os.path.isdir(spec):
2378 spec += '/'
2378 spec += '/'
2379 spec = spec[len(rootdir):]
2379 spec = spec[len(rootdir):]
2380 fixpaths = pycompat.ossep != '/'
2380 fixpaths = pycompat.ossep != '/'
2381 if fixpaths:
2381 if fixpaths:
2382 spec = spec.replace(pycompat.ossep, '/')
2382 spec = spec.replace(pycompat.ossep, '/')
2383 speclen = len(spec)
2383 speclen = len(spec)
2384 fullpaths = opts['full']
2384 fullpaths = opts['full']
2385 files, dirs = set(), set()
2385 files, dirs = set(), set()
2386 adddir, addfile = dirs.add, files.add
2386 adddir, addfile = dirs.add, files.add
2387 for f, st in dirstate.iteritems():
2387 for f, st in dirstate.iteritems():
2388 if f.startswith(spec) and st[0] in acceptable:
2388 if f.startswith(spec) and st[0] in acceptable:
2389 if fixpaths:
2389 if fixpaths:
2390 f = f.replace('/', pycompat.ossep)
2390 f = f.replace('/', pycompat.ossep)
2391 if fullpaths:
2391 if fullpaths:
2392 addfile(f)
2392 addfile(f)
2393 continue
2393 continue
2394 s = f.find(pycompat.ossep, speclen)
2394 s = f.find(pycompat.ossep, speclen)
2395 if s >= 0:
2395 if s >= 0:
2396 adddir(f[:s])
2396 adddir(f[:s])
2397 else:
2397 else:
2398 addfile(f)
2398 addfile(f)
2399 return files, dirs
2399 return files, dirs
2400
2400
2401 acceptable = ''
2401 acceptable = ''
2402 if opts['normal']:
2402 if opts['normal']:
2403 acceptable += 'nm'
2403 acceptable += 'nm'
2404 if opts['added']:
2404 if opts['added']:
2405 acceptable += 'a'
2405 acceptable += 'a'
2406 if opts['removed']:
2406 if opts['removed']:
2407 acceptable += 'r'
2407 acceptable += 'r'
2408 cwd = repo.getcwd()
2408 cwd = repo.getcwd()
2409 if not specs:
2409 if not specs:
2410 specs = ['.']
2410 specs = ['.']
2411
2411
2412 files, dirs = set(), set()
2412 files, dirs = set(), set()
2413 for spec in specs:
2413 for spec in specs:
2414 f, d = complete(spec, acceptable or 'nmar')
2414 f, d = complete(spec, acceptable or 'nmar')
2415 files.update(f)
2415 files.update(f)
2416 dirs.update(d)
2416 dirs.update(d)
2417 files.update(dirs)
2417 files.update(dirs)
2418 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
2418 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
2419 ui.write('\n')
2419 ui.write('\n')
2420
2420
2421 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
2421 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
2422 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
2422 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
2423 '''access the pushkey key/value protocol
2423 '''access the pushkey key/value protocol
2424
2424
2425 With two args, list the keys in the given namespace.
2425 With two args, list the keys in the given namespace.
2426
2426
2427 With five args, set a key to new if it currently is set to old.
2427 With five args, set a key to new if it currently is set to old.
2428 Reports success or failure.
2428 Reports success or failure.
2429 '''
2429 '''
2430
2430
2431 target = hg.peer(ui, {}, repopath)
2431 target = hg.peer(ui, {}, repopath)
2432 if keyinfo:
2432 if keyinfo:
2433 key, old, new = keyinfo
2433 key, old, new = keyinfo
2434 r = target.pushkey(namespace, key, old, new)
2434 r = target.pushkey(namespace, key, old, new)
2435 ui.status(str(r) + '\n')
2435 ui.status(str(r) + '\n')
2436 return not r
2436 return not r
2437 else:
2437 else:
2438 for k, v in sorted(target.listkeys(namespace).iteritems()):
2438 for k, v in sorted(target.listkeys(namespace).iteritems()):
2439 ui.write("%s\t%s\n" % (k.encode('string-escape'),
2439 ui.write("%s\t%s\n" % (k.encode('string-escape'),
2440 v.encode('string-escape')))
2440 v.encode('string-escape')))
2441
2441
2442 @command('debugpvec', [], _('A B'))
2442 @command('debugpvec', [], _('A B'))
2443 def debugpvec(ui, repo, a, b=None):
2443 def debugpvec(ui, repo, a, b=None):
2444 ca = scmutil.revsingle(repo, a)
2444 ca = scmutil.revsingle(repo, a)
2445 cb = scmutil.revsingle(repo, b)
2445 cb = scmutil.revsingle(repo, b)
2446 pa = pvec.ctxpvec(ca)
2446 pa = pvec.ctxpvec(ca)
2447 pb = pvec.ctxpvec(cb)
2447 pb = pvec.ctxpvec(cb)
2448 if pa == pb:
2448 if pa == pb:
2449 rel = "="
2449 rel = "="
2450 elif pa > pb:
2450 elif pa > pb:
2451 rel = ">"
2451 rel = ">"
2452 elif pa < pb:
2452 elif pa < pb:
2453 rel = "<"
2453 rel = "<"
2454 elif pa | pb:
2454 elif pa | pb:
2455 rel = "|"
2455 rel = "|"
2456 ui.write(_("a: %s\n") % pa)
2456 ui.write(_("a: %s\n") % pa)
2457 ui.write(_("b: %s\n") % pb)
2457 ui.write(_("b: %s\n") % pb)
2458 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
2458 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
2459 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
2459 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
2460 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
2460 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
2461 pa.distance(pb), rel))
2461 pa.distance(pb), rel))
2462
2462
2463 @command('debugrebuilddirstate|debugrebuildstate',
2463 @command('debugrebuilddirstate|debugrebuildstate',
2464 [('r', 'rev', '', _('revision to rebuild to'), _('REV')),
2464 [('r', 'rev', '', _('revision to rebuild to'), _('REV')),
2465 ('', 'minimal', None, _('only rebuild files that are inconsistent with '
2465 ('', 'minimal', None, _('only rebuild files that are inconsistent with '
2466 'the working copy parent')),
2466 'the working copy parent')),
2467 ],
2467 ],
2468 _('[-r REV]'))
2468 _('[-r REV]'))
2469 def debugrebuilddirstate(ui, repo, rev, **opts):
2469 def debugrebuilddirstate(ui, repo, rev, **opts):
2470 """rebuild the dirstate as it would look like for the given revision
2470 """rebuild the dirstate as it would look like for the given revision
2471
2471
2472 If no revision is specified the first current parent will be used.
2472 If no revision is specified the first current parent will be used.
2473
2473
2474 The dirstate will be set to the files of the given revision.
2474 The dirstate will be set to the files of the given revision.
2475 The actual working directory content or existing dirstate
2475 The actual working directory content or existing dirstate
2476 information such as adds or removes is not considered.
2476 information such as adds or removes is not considered.
2477
2477
2478 ``minimal`` will only rebuild the dirstate status for files that claim to be
2478 ``minimal`` will only rebuild the dirstate status for files that claim to be
2479 tracked but are not in the parent manifest, or that exist in the parent
2479 tracked but are not in the parent manifest, or that exist in the parent
2480 manifest but are not in the dirstate. It will not change adds, removes, or
2480 manifest but are not in the dirstate. It will not change adds, removes, or
2481 modified files that are in the working copy parent.
2481 modified files that are in the working copy parent.
2482
2482
2483 One use of this command is to make the next :hg:`status` invocation
2483 One use of this command is to make the next :hg:`status` invocation
2484 check the actual file content.
2484 check the actual file content.
2485 """
2485 """
2486 ctx = scmutil.revsingle(repo, rev)
2486 ctx = scmutil.revsingle(repo, rev)
2487 with repo.wlock():
2487 with repo.wlock():
2488 dirstate = repo.dirstate
2488 dirstate = repo.dirstate
2489 changedfiles = None
2489 changedfiles = None
2490 # See command doc for what minimal does.
2490 # See command doc for what minimal does.
2491 if opts.get('minimal'):
2491 if opts.get('minimal'):
2492 manifestfiles = set(ctx.manifest().keys())
2492 manifestfiles = set(ctx.manifest().keys())
2493 dirstatefiles = set(dirstate)
2493 dirstatefiles = set(dirstate)
2494 manifestonly = manifestfiles - dirstatefiles
2494 manifestonly = manifestfiles - dirstatefiles
2495 dsonly = dirstatefiles - manifestfiles
2495 dsonly = dirstatefiles - manifestfiles
2496 dsnotadded = set(f for f in dsonly if dirstate[f] != 'a')
2496 dsnotadded = set(f for f in dsonly if dirstate[f] != 'a')
2497 changedfiles = manifestonly | dsnotadded
2497 changedfiles = manifestonly | dsnotadded
2498
2498
2499 dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles)
2499 dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles)
2500
2500
2501 @command('debugrebuildfncache', [], '')
2501 @command('debugrebuildfncache', [], '')
2502 def debugrebuildfncache(ui, repo):
2502 def debugrebuildfncache(ui, repo):
2503 """rebuild the fncache file"""
2503 """rebuild the fncache file"""
2504 repair.rebuildfncache(ui, repo)
2504 repair.rebuildfncache(ui, repo)
2505
2505
2506 @command('debugrename',
2506 @command('debugrename',
2507 [('r', 'rev', '', _('revision to debug'), _('REV'))],
2507 [('r', 'rev', '', _('revision to debug'), _('REV'))],
2508 _('[-r REV] FILE'))
2508 _('[-r REV] FILE'))
2509 def debugrename(ui, repo, file1, *pats, **opts):
2509 def debugrename(ui, repo, file1, *pats, **opts):
2510 """dump rename information"""
2510 """dump rename information"""
2511
2511
2512 ctx = scmutil.revsingle(repo, opts.get('rev'))
2512 ctx = scmutil.revsingle(repo, opts.get('rev'))
2513 m = scmutil.match(ctx, (file1,) + pats, opts)
2513 m = scmutil.match(ctx, (file1,) + pats, opts)
2514 for abs in ctx.walk(m):
2514 for abs in ctx.walk(m):
2515 fctx = ctx[abs]
2515 fctx = ctx[abs]
2516 o = fctx.filelog().renamed(fctx.filenode())
2516 o = fctx.filelog().renamed(fctx.filenode())
2517 rel = m.rel(abs)
2517 rel = m.rel(abs)
2518 if o:
2518 if o:
2519 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
2519 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
2520 else:
2520 else:
2521 ui.write(_("%s not renamed\n") % rel)
2521 ui.write(_("%s not renamed\n") % rel)
2522
2522
2523 @command('debugrevlog', debugrevlogopts +
2523 @command('debugrevlog', debugrevlogopts +
2524 [('d', 'dump', False, _('dump index data'))],
2524 [('d', 'dump', False, _('dump index data'))],
2525 _('-c|-m|FILE'),
2525 _('-c|-m|FILE'),
2526 optionalrepo=True)
2526 optionalrepo=True)
2527 def debugrevlog(ui, repo, file_=None, **opts):
2527 def debugrevlog(ui, repo, file_=None, **opts):
2528 """show data and statistics about a revlog"""
2528 """show data and statistics about a revlog"""
2529 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
2529 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
2530
2530
2531 if opts.get("dump"):
2531 if opts.get("dump"):
2532 numrevs = len(r)
2532 numrevs = len(r)
2533 ui.write(("# rev p1rev p2rev start end deltastart base p1 p2"
2533 ui.write(("# rev p1rev p2rev start end deltastart base p1 p2"
2534 " rawsize totalsize compression heads chainlen\n"))
2534 " rawsize totalsize compression heads chainlen\n"))
2535 ts = 0
2535 ts = 0
2536 heads = set()
2536 heads = set()
2537
2537
2538 for rev in xrange(numrevs):
2538 for rev in xrange(numrevs):
2539 dbase = r.deltaparent(rev)
2539 dbase = r.deltaparent(rev)
2540 if dbase == -1:
2540 if dbase == -1:
2541 dbase = rev
2541 dbase = rev
2542 cbase = r.chainbase(rev)
2542 cbase = r.chainbase(rev)
2543 clen = r.chainlen(rev)
2543 clen = r.chainlen(rev)
2544 p1, p2 = r.parentrevs(rev)
2544 p1, p2 = r.parentrevs(rev)
2545 rs = r.rawsize(rev)
2545 rs = r.rawsize(rev)
2546 ts = ts + rs
2546 ts = ts + rs
2547 heads -= set(r.parentrevs(rev))
2547 heads -= set(r.parentrevs(rev))
2548 heads.add(rev)
2548 heads.add(rev)
2549 try:
2549 try:
2550 compression = ts / r.end(rev)
2550 compression = ts / r.end(rev)
2551 except ZeroDivisionError:
2551 except ZeroDivisionError:
2552 compression = 0
2552 compression = 0
2553 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
2553 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
2554 "%11d %5d %8d\n" %
2554 "%11d %5d %8d\n" %
2555 (rev, p1, p2, r.start(rev), r.end(rev),
2555 (rev, p1, p2, r.start(rev), r.end(rev),
2556 r.start(dbase), r.start(cbase),
2556 r.start(dbase), r.start(cbase),
2557 r.start(p1), r.start(p2),
2557 r.start(p1), r.start(p2),
2558 rs, ts, compression, len(heads), clen))
2558 rs, ts, compression, len(heads), clen))
2559 return 0
2559 return 0
2560
2560
2561 v = r.version
2561 v = r.version
2562 format = v & 0xFFFF
2562 format = v & 0xFFFF
2563 flags = []
2563 flags = []
2564 gdelta = False
2564 gdelta = False
2565 if v & revlog.REVLOGNGINLINEDATA:
2565 if v & revlog.REVLOGNGINLINEDATA:
2566 flags.append('inline')
2566 flags.append('inline')
2567 if v & revlog.REVLOGGENERALDELTA:
2567 if v & revlog.REVLOGGENERALDELTA:
2568 gdelta = True
2568 gdelta = True
2569 flags.append('generaldelta')
2569 flags.append('generaldelta')
2570 if not flags:
2570 if not flags:
2571 flags = ['(none)']
2571 flags = ['(none)']
2572
2572
2573 nummerges = 0
2573 nummerges = 0
2574 numfull = 0
2574 numfull = 0
2575 numprev = 0
2575 numprev = 0
2576 nump1 = 0
2576 nump1 = 0
2577 nump2 = 0
2577 nump2 = 0
2578 numother = 0
2578 numother = 0
2579 nump1prev = 0
2579 nump1prev = 0
2580 nump2prev = 0
2580 nump2prev = 0
2581 chainlengths = []
2581 chainlengths = []
2582
2582
2583 datasize = [None, 0, 0]
2583 datasize = [None, 0, 0]
2584 fullsize = [None, 0, 0]
2584 fullsize = [None, 0, 0]
2585 deltasize = [None, 0, 0]
2585 deltasize = [None, 0, 0]
2586 chunktypecounts = {}
2586 chunktypecounts = {}
2587 chunktypesizes = {}
2587 chunktypesizes = {}
2588
2588
2589 def addsize(size, l):
2589 def addsize(size, l):
2590 if l[0] is None or size < l[0]:
2590 if l[0] is None or size < l[0]:
2591 l[0] = size
2591 l[0] = size
2592 if size > l[1]:
2592 if size > l[1]:
2593 l[1] = size
2593 l[1] = size
2594 l[2] += size
2594 l[2] += size
2595
2595
2596 numrevs = len(r)
2596 numrevs = len(r)
2597 for rev in xrange(numrevs):
2597 for rev in xrange(numrevs):
2598 p1, p2 = r.parentrevs(rev)
2598 p1, p2 = r.parentrevs(rev)
2599 delta = r.deltaparent(rev)
2599 delta = r.deltaparent(rev)
2600 if format > 0:
2600 if format > 0:
2601 addsize(r.rawsize(rev), datasize)
2601 addsize(r.rawsize(rev), datasize)
2602 if p2 != nullrev:
2602 if p2 != nullrev:
2603 nummerges += 1
2603 nummerges += 1
2604 size = r.length(rev)
2604 size = r.length(rev)
2605 if delta == nullrev:
2605 if delta == nullrev:
2606 chainlengths.append(0)
2606 chainlengths.append(0)
2607 numfull += 1
2607 numfull += 1
2608 addsize(size, fullsize)
2608 addsize(size, fullsize)
2609 else:
2609 else:
2610 chainlengths.append(chainlengths[delta] + 1)
2610 chainlengths.append(chainlengths[delta] + 1)
2611 addsize(size, deltasize)
2611 addsize(size, deltasize)
2612 if delta == rev - 1:
2612 if delta == rev - 1:
2613 numprev += 1
2613 numprev += 1
2614 if delta == p1:
2614 if delta == p1:
2615 nump1prev += 1
2615 nump1prev += 1
2616 elif delta == p2:
2616 elif delta == p2:
2617 nump2prev += 1
2617 nump2prev += 1
2618 elif delta == p1:
2618 elif delta == p1:
2619 nump1 += 1
2619 nump1 += 1
2620 elif delta == p2:
2620 elif delta == p2:
2621 nump2 += 1
2621 nump2 += 1
2622 elif delta != nullrev:
2622 elif delta != nullrev:
2623 numother += 1
2623 numother += 1
2624
2624
2625 # Obtain data on the raw chunks in the revlog.
2625 # Obtain data on the raw chunks in the revlog.
2626 chunk = r._chunkraw(rev, rev)[1]
2626 chunk = r._chunkraw(rev, rev)[1]
2627 if chunk:
2627 if chunk:
2628 chunktype = chunk[0]
2628 chunktype = chunk[0]
2629 else:
2629 else:
2630 chunktype = 'empty'
2630 chunktype = 'empty'
2631
2631
2632 if chunktype not in chunktypecounts:
2632 if chunktype not in chunktypecounts:
2633 chunktypecounts[chunktype] = 0
2633 chunktypecounts[chunktype] = 0
2634 chunktypesizes[chunktype] = 0
2634 chunktypesizes[chunktype] = 0
2635
2635
2636 chunktypecounts[chunktype] += 1
2636 chunktypecounts[chunktype] += 1
2637 chunktypesizes[chunktype] += size
2637 chunktypesizes[chunktype] += size
2638
2638
2639 # Adjust size min value for empty cases
2639 # Adjust size min value for empty cases
2640 for size in (datasize, fullsize, deltasize):
2640 for size in (datasize, fullsize, deltasize):
2641 if size[0] is None:
2641 if size[0] is None:
2642 size[0] = 0
2642 size[0] = 0
2643
2643
2644 numdeltas = numrevs - numfull
2644 numdeltas = numrevs - numfull
2645 numoprev = numprev - nump1prev - nump2prev
2645 numoprev = numprev - nump1prev - nump2prev
2646 totalrawsize = datasize[2]
2646 totalrawsize = datasize[2]
2647 datasize[2] /= numrevs
2647 datasize[2] /= numrevs
2648 fulltotal = fullsize[2]
2648 fulltotal = fullsize[2]
2649 fullsize[2] /= numfull
2649 fullsize[2] /= numfull
2650 deltatotal = deltasize[2]
2650 deltatotal = deltasize[2]
2651 if numrevs - numfull > 0:
2651 if numrevs - numfull > 0:
2652 deltasize[2] /= numrevs - numfull
2652 deltasize[2] /= numrevs - numfull
2653 totalsize = fulltotal + deltatotal
2653 totalsize = fulltotal + deltatotal
2654 avgchainlen = sum(chainlengths) / numrevs
2654 avgchainlen = sum(chainlengths) / numrevs
2655 maxchainlen = max(chainlengths)
2655 maxchainlen = max(chainlengths)
2656 compratio = 1
2656 compratio = 1
2657 if totalsize:
2657 if totalsize:
2658 compratio = totalrawsize / totalsize
2658 compratio = totalrawsize / totalsize
2659
2659
2660 basedfmtstr = '%%%dd\n'
2660 basedfmtstr = '%%%dd\n'
2661 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
2661 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
2662
2662
2663 def dfmtstr(max):
2663 def dfmtstr(max):
2664 return basedfmtstr % len(str(max))
2664 return basedfmtstr % len(str(max))
2665 def pcfmtstr(max, padding=0):
2665 def pcfmtstr(max, padding=0):
2666 return basepcfmtstr % (len(str(max)), ' ' * padding)
2666 return basepcfmtstr % (len(str(max)), ' ' * padding)
2667
2667
2668 def pcfmt(value, total):
2668 def pcfmt(value, total):
2669 if total:
2669 if total:
2670 return (value, 100 * float(value) / total)
2670 return (value, 100 * float(value) / total)
2671 else:
2671 else:
2672 return value, 100.0
2672 return value, 100.0
2673
2673
2674 ui.write(('format : %d\n') % format)
2674 ui.write(('format : %d\n') % format)
2675 ui.write(('flags : %s\n') % ', '.join(flags))
2675 ui.write(('flags : %s\n') % ', '.join(flags))
2676
2676
2677 ui.write('\n')
2677 ui.write('\n')
2678 fmt = pcfmtstr(totalsize)
2678 fmt = pcfmtstr(totalsize)
2679 fmt2 = dfmtstr(totalsize)
2679 fmt2 = dfmtstr(totalsize)
2680 ui.write(('revisions : ') + fmt2 % numrevs)
2680 ui.write(('revisions : ') + fmt2 % numrevs)
2681 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
2681 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
2682 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
2682 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
2683 ui.write(('revisions : ') + fmt2 % numrevs)
2683 ui.write(('revisions : ') + fmt2 % numrevs)
2684 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
2684 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
2685 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
2685 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
2686 ui.write(('revision size : ') + fmt2 % totalsize)
2686 ui.write(('revision size : ') + fmt2 % totalsize)
2687 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
2687 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
2688 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
2688 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
2689
2689
2690 def fmtchunktype(chunktype):
2690 def fmtchunktype(chunktype):
2691 if chunktype == 'empty':
2691 if chunktype == 'empty':
2692 return ' %s : ' % chunktype
2692 return ' %s : ' % chunktype
2693 elif chunktype in string.ascii_letters:
2693 elif chunktype in string.ascii_letters:
2694 return ' 0x%s (%s) : ' % (hex(chunktype), chunktype)
2694 return ' 0x%s (%s) : ' % (hex(chunktype), chunktype)
2695 else:
2695 else:
2696 return ' 0x%s : ' % hex(chunktype)
2696 return ' 0x%s : ' % hex(chunktype)
2697
2697
2698 ui.write('\n')
2698 ui.write('\n')
2699 ui.write(('chunks : ') + fmt2 % numrevs)
2699 ui.write(('chunks : ') + fmt2 % numrevs)
2700 for chunktype in sorted(chunktypecounts):
2700 for chunktype in sorted(chunktypecounts):
2701 ui.write(fmtchunktype(chunktype))
2701 ui.write(fmtchunktype(chunktype))
2702 ui.write(fmt % pcfmt(chunktypecounts[chunktype], numrevs))
2702 ui.write(fmt % pcfmt(chunktypecounts[chunktype], numrevs))
2703 ui.write(('chunks size : ') + fmt2 % totalsize)
2703 ui.write(('chunks size : ') + fmt2 % totalsize)
2704 for chunktype in sorted(chunktypecounts):
2704 for chunktype in sorted(chunktypecounts):
2705 ui.write(fmtchunktype(chunktype))
2705 ui.write(fmtchunktype(chunktype))
2706 ui.write(fmt % pcfmt(chunktypesizes[chunktype], totalsize))
2706 ui.write(fmt % pcfmt(chunktypesizes[chunktype], totalsize))
2707
2707
2708 ui.write('\n')
2708 ui.write('\n')
2709 fmt = dfmtstr(max(avgchainlen, compratio))
2709 fmt = dfmtstr(max(avgchainlen, compratio))
2710 ui.write(('avg chain length : ') + fmt % avgchainlen)
2710 ui.write(('avg chain length : ') + fmt % avgchainlen)
2711 ui.write(('max chain length : ') + fmt % maxchainlen)
2711 ui.write(('max chain length : ') + fmt % maxchainlen)
2712 ui.write(('compression ratio : ') + fmt % compratio)
2712 ui.write(('compression ratio : ') + fmt % compratio)
2713
2713
2714 if format > 0:
2714 if format > 0:
2715 ui.write('\n')
2715 ui.write('\n')
2716 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
2716 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
2717 % tuple(datasize))
2717 % tuple(datasize))
2718 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
2718 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
2719 % tuple(fullsize))
2719 % tuple(fullsize))
2720 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
2720 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
2721 % tuple(deltasize))
2721 % tuple(deltasize))
2722
2722
2723 if numdeltas > 0:
2723 if numdeltas > 0:
2724 ui.write('\n')
2724 ui.write('\n')
2725 fmt = pcfmtstr(numdeltas)
2725 fmt = pcfmtstr(numdeltas)
2726 fmt2 = pcfmtstr(numdeltas, 4)
2726 fmt2 = pcfmtstr(numdeltas, 4)
2727 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
2727 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
2728 if numprev > 0:
2728 if numprev > 0:
2729 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
2729 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
2730 numprev))
2730 numprev))
2731 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
2731 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
2732 numprev))
2732 numprev))
2733 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
2733 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
2734 numprev))
2734 numprev))
2735 if gdelta:
2735 if gdelta:
2736 ui.write(('deltas against p1 : ')
2736 ui.write(('deltas against p1 : ')
2737 + fmt % pcfmt(nump1, numdeltas))
2737 + fmt % pcfmt(nump1, numdeltas))
2738 ui.write(('deltas against p2 : ')
2738 ui.write(('deltas against p2 : ')
2739 + fmt % pcfmt(nump2, numdeltas))
2739 + fmt % pcfmt(nump2, numdeltas))
2740 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
2740 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
2741 numdeltas))
2741 numdeltas))
2742
2742
2743 @command('debugrevspec',
2743 @command('debugrevspec',
2744 [('', 'optimize', None,
2744 [('', 'optimize', None,
2745 _('print parsed tree after optimizing (DEPRECATED)')),
2745 _('print parsed tree after optimizing (DEPRECATED)')),
2746 ('p', 'show-stage', [],
2746 ('p', 'show-stage', [],
2747 _('print parsed tree at the given stage'), _('NAME')),
2747 _('print parsed tree at the given stage'), _('NAME')),
2748 ('', 'no-optimized', False, _('evaluate tree without optimization')),
2748 ('', 'no-optimized', False, _('evaluate tree without optimization')),
2749 ('', 'verify-optimized', False, _('verify optimized result')),
2749 ('', 'verify-optimized', False, _('verify optimized result')),
2750 ],
2750 ],
2751 ('REVSPEC'))
2751 ('REVSPEC'))
2752 def debugrevspec(ui, repo, expr, **opts):
2752 def debugrevspec(ui, repo, expr, **opts):
2753 """parse and apply a revision specification
2753 """parse and apply a revision specification
2754
2754
2755 Use -p/--show-stage option to print the parsed tree at the given stages.
2755 Use -p/--show-stage option to print the parsed tree at the given stages.
2756 Use -p all to print tree at every stage.
2756 Use -p all to print tree at every stage.
2757
2757
2758 Use --verify-optimized to compare the optimized result with the unoptimized
2758 Use --verify-optimized to compare the optimized result with the unoptimized
2759 one. Returns 1 if the optimized result differs.
2759 one. Returns 1 if the optimized result differs.
2760 """
2760 """
2761 stages = [
2761 stages = [
2762 ('parsed', lambda tree: tree),
2762 ('parsed', lambda tree: tree),
2763 ('expanded', lambda tree: revset.expandaliases(ui, tree)),
2763 ('expanded', lambda tree: revset.expandaliases(ui, tree)),
2764 ('concatenated', revset.foldconcat),
2764 ('concatenated', revset.foldconcat),
2765 ('analyzed', revset.analyze),
2765 ('analyzed', revset.analyze),
2766 ('optimized', revset.optimize),
2766 ('optimized', revset.optimize),
2767 ]
2767 ]
2768 if opts['no_optimized']:
2768 if opts['no_optimized']:
2769 stages = stages[:-1]
2769 stages = stages[:-1]
2770 if opts['verify_optimized'] and opts['no_optimized']:
2770 if opts['verify_optimized'] and opts['no_optimized']:
2771 raise error.Abort(_('cannot use --verify-optimized with '
2771 raise error.Abort(_('cannot use --verify-optimized with '
2772 '--no-optimized'))
2772 '--no-optimized'))
2773 stagenames = set(n for n, f in stages)
2773 stagenames = set(n for n, f in stages)
2774
2774
2775 showalways = set()
2775 showalways = set()
2776 showchanged = set()
2776 showchanged = set()
2777 if ui.verbose and not opts['show_stage']:
2777 if ui.verbose and not opts['show_stage']:
2778 # show parsed tree by --verbose (deprecated)
2778 # show parsed tree by --verbose (deprecated)
2779 showalways.add('parsed')
2779 showalways.add('parsed')
2780 showchanged.update(['expanded', 'concatenated'])
2780 showchanged.update(['expanded', 'concatenated'])
2781 if opts['optimize']:
2781 if opts['optimize']:
2782 showalways.add('optimized')
2782 showalways.add('optimized')
2783 if opts['show_stage'] and opts['optimize']:
2783 if opts['show_stage'] and opts['optimize']:
2784 raise error.Abort(_('cannot use --optimize with --show-stage'))
2784 raise error.Abort(_('cannot use --optimize with --show-stage'))
2785 if opts['show_stage'] == ['all']:
2785 if opts['show_stage'] == ['all']:
2786 showalways.update(stagenames)
2786 showalways.update(stagenames)
2787 else:
2787 else:
2788 for n in opts['show_stage']:
2788 for n in opts['show_stage']:
2789 if n not in stagenames:
2789 if n not in stagenames:
2790 raise error.Abort(_('invalid stage name: %s') % n)
2790 raise error.Abort(_('invalid stage name: %s') % n)
2791 showalways.update(opts['show_stage'])
2791 showalways.update(opts['show_stage'])
2792
2792
2793 treebystage = {}
2793 treebystage = {}
2794 printedtree = None
2794 printedtree = None
2795 tree = revset.parse(expr, lookup=repo.__contains__)
2795 tree = revset.parse(expr, lookup=repo.__contains__)
2796 for n, f in stages:
2796 for n, f in stages:
2797 treebystage[n] = tree = f(tree)
2797 treebystage[n] = tree = f(tree)
2798 if n in showalways or (n in showchanged and tree != printedtree):
2798 if n in showalways or (n in showchanged and tree != printedtree):
2799 if opts['show_stage'] or n != 'parsed':
2799 if opts['show_stage'] or n != 'parsed':
2800 ui.write(("* %s:\n") % n)
2800 ui.write(("* %s:\n") % n)
2801 ui.write(revset.prettyformat(tree), "\n")
2801 ui.write(revset.prettyformat(tree), "\n")
2802 printedtree = tree
2802 printedtree = tree
2803
2803
2804 if opts['verify_optimized']:
2804 if opts['verify_optimized']:
2805 arevs = revset.makematcher(treebystage['analyzed'])(repo)
2805 arevs = revset.makematcher(treebystage['analyzed'])(repo)
2806 brevs = revset.makematcher(treebystage['optimized'])(repo)
2806 brevs = revset.makematcher(treebystage['optimized'])(repo)
2807 if ui.verbose:
2807 if ui.verbose:
2808 ui.note(("* analyzed set:\n"), smartset.prettyformat(arevs), "\n")
2808 ui.note(("* analyzed set:\n"), smartset.prettyformat(arevs), "\n")
2809 ui.note(("* optimized set:\n"), smartset.prettyformat(brevs), "\n")
2809 ui.note(("* optimized set:\n"), smartset.prettyformat(brevs), "\n")
2810 arevs = list(arevs)
2810 arevs = list(arevs)
2811 brevs = list(brevs)
2811 brevs = list(brevs)
2812 if arevs == brevs:
2812 if arevs == brevs:
2813 return 0
2813 return 0
2814 ui.write(('--- analyzed\n'), label='diff.file_a')
2814 ui.write(('--- analyzed\n'), label='diff.file_a')
2815 ui.write(('+++ optimized\n'), label='diff.file_b')
2815 ui.write(('+++ optimized\n'), label='diff.file_b')
2816 sm = difflib.SequenceMatcher(None, arevs, brevs)
2816 sm = difflib.SequenceMatcher(None, arevs, brevs)
2817 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2817 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2818 if tag in ('delete', 'replace'):
2818 if tag in ('delete', 'replace'):
2819 for c in arevs[alo:ahi]:
2819 for c in arevs[alo:ahi]:
2820 ui.write('-%s\n' % c, label='diff.deleted')
2820 ui.write('-%s\n' % c, label='diff.deleted')
2821 if tag in ('insert', 'replace'):
2821 if tag in ('insert', 'replace'):
2822 for c in brevs[blo:bhi]:
2822 for c in brevs[blo:bhi]:
2823 ui.write('+%s\n' % c, label='diff.inserted')
2823 ui.write('+%s\n' % c, label='diff.inserted')
2824 if tag == 'equal':
2824 if tag == 'equal':
2825 for c in arevs[alo:ahi]:
2825 for c in arevs[alo:ahi]:
2826 ui.write(' %s\n' % c)
2826 ui.write(' %s\n' % c)
2827 return 1
2827 return 1
2828
2828
2829 func = revset.makematcher(tree)
2829 func = revset.makematcher(tree)
2830 revs = func(repo)
2830 revs = func(repo)
2831 if ui.verbose:
2831 if ui.verbose:
2832 ui.note(("* set:\n"), smartset.prettyformat(revs), "\n")
2832 ui.note(("* set:\n"), smartset.prettyformat(revs), "\n")
2833 for c in revs:
2833 for c in revs:
2834 ui.write("%s\n" % c)
2834 ui.write("%s\n" % c)
2835
2835
2836 @command('debugsetparents', [], _('REV1 [REV2]'))
2836 @command('debugsetparents', [], _('REV1 [REV2]'))
2837 def debugsetparents(ui, repo, rev1, rev2=None):
2837 def debugsetparents(ui, repo, rev1, rev2=None):
2838 """manually set the parents of the current working directory
2838 """manually set the parents of the current working directory
2839
2839
2840 This is useful for writing repository conversion tools, but should
2840 This is useful for writing repository conversion tools, but should
2841 be used with care. For example, neither the working directory nor the
2841 be used with care. For example, neither the working directory nor the
2842 dirstate is updated, so file status may be incorrect after running this
2842 dirstate is updated, so file status may be incorrect after running this
2843 command.
2843 command.
2844
2844
2845 Returns 0 on success.
2845 Returns 0 on success.
2846 """
2846 """
2847
2847
2848 r1 = scmutil.revsingle(repo, rev1).node()
2848 r1 = scmutil.revsingle(repo, rev1).node()
2849 r2 = scmutil.revsingle(repo, rev2, 'null').node()
2849 r2 = scmutil.revsingle(repo, rev2, 'null').node()
2850
2850
2851 with repo.wlock():
2851 with repo.wlock():
2852 repo.setparents(r1, r2)
2852 repo.setparents(r1, r2)
2853
2853
2854 @command('debugdirstate|debugstate',
2854 @command('debugdirstate|debugstate',
2855 [('', 'nodates', None, _('do not display the saved mtime')),
2855 [('', 'nodates', None, _('do not display the saved mtime')),
2856 ('', 'datesort', None, _('sort by saved mtime'))],
2856 ('', 'datesort', None, _('sort by saved mtime'))],
2857 _('[OPTION]...'))
2857 _('[OPTION]...'))
2858 def debugstate(ui, repo, **opts):
2858 def debugstate(ui, repo, **opts):
2859 """show the contents of the current dirstate"""
2859 """show the contents of the current dirstate"""
2860
2860
2861 nodates = opts.get('nodates')
2861 nodates = opts.get('nodates')
2862 datesort = opts.get('datesort')
2862 datesort = opts.get('datesort')
2863
2863
2864 timestr = ""
2864 timestr = ""
2865 if datesort:
2865 if datesort:
2866 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
2866 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
2867 else:
2867 else:
2868 keyfunc = None # sort by filename
2868 keyfunc = None # sort by filename
2869 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
2869 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
2870 if ent[3] == -1:
2870 if ent[3] == -1:
2871 timestr = 'unset '
2871 timestr = 'unset '
2872 elif nodates:
2872 elif nodates:
2873 timestr = 'set '
2873 timestr = 'set '
2874 else:
2874 else:
2875 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
2875 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
2876 time.localtime(ent[3]))
2876 time.localtime(ent[3]))
2877 if ent[1] & 0o20000:
2877 if ent[1] & 0o20000:
2878 mode = 'lnk'
2878 mode = 'lnk'
2879 else:
2879 else:
2880 mode = '%3o' % (ent[1] & 0o777 & ~util.umask)
2880 mode = '%3o' % (ent[1] & 0o777 & ~util.umask)
2881 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
2881 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
2882 for f in repo.dirstate.copies():
2882 for f in repo.dirstate.copies():
2883 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
2883 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
2884
2884
2885 @command('debugsub',
2885 @command('debugsub',
2886 [('r', 'rev', '',
2886 [('r', 'rev', '',
2887 _('revision to check'), _('REV'))],
2887 _('revision to check'), _('REV'))],
2888 _('[-r REV] [REV]'))
2888 _('[-r REV] [REV]'))
2889 def debugsub(ui, repo, rev=None):
2889 def debugsub(ui, repo, rev=None):
2890 ctx = scmutil.revsingle(repo, rev, None)
2890 ctx = scmutil.revsingle(repo, rev, None)
2891 for k, v in sorted(ctx.substate.items()):
2891 for k, v in sorted(ctx.substate.items()):
2892 ui.write(('path %s\n') % k)
2892 ui.write(('path %s\n') % k)
2893 ui.write((' source %s\n') % v[0])
2893 ui.write((' source %s\n') % v[0])
2894 ui.write((' revision %s\n') % v[1])
2894 ui.write((' revision %s\n') % v[1])
2895
2895
2896 @command('debugsuccessorssets',
2896 @command('debugsuccessorssets',
2897 [],
2897 [],
2898 _('[REV]'))
2898 _('[REV]'))
2899 def debugsuccessorssets(ui, repo, *revs):
2899 def debugsuccessorssets(ui, repo, *revs):
2900 """show set of successors for revision
2900 """show set of successors for revision
2901
2901
2902 A successors set of changeset A is a consistent group of revisions that
2902 A successors set of changeset A is a consistent group of revisions that
2903 succeed A. It contains non-obsolete changesets only.
2903 succeed A. It contains non-obsolete changesets only.
2904
2904
2905 In most cases a changeset A has a single successors set containing a single
2905 In most cases a changeset A has a single successors set containing a single
2906 successor (changeset A replaced by A').
2906 successor (changeset A replaced by A').
2907
2907
2908 A changeset that is made obsolete with no successors are called "pruned".
2908 A changeset that is made obsolete with no successors are called "pruned".
2909 Such changesets have no successors sets at all.
2909 Such changesets have no successors sets at all.
2910
2910
2911 A changeset that has been "split" will have a successors set containing
2911 A changeset that has been "split" will have a successors set containing
2912 more than one successor.
2912 more than one successor.
2913
2913
2914 A changeset that has been rewritten in multiple different ways is called
2914 A changeset that has been rewritten in multiple different ways is called
2915 "divergent". Such changesets have multiple successor sets (each of which
2915 "divergent". Such changesets have multiple successor sets (each of which
2916 may also be split, i.e. have multiple successors).
2916 may also be split, i.e. have multiple successors).
2917
2917
2918 Results are displayed as follows::
2918 Results are displayed as follows::
2919
2919
2920 <rev1>
2920 <rev1>
2921 <successors-1A>
2921 <successors-1A>
2922 <rev2>
2922 <rev2>
2923 <successors-2A>
2923 <successors-2A>
2924 <successors-2B1> <successors-2B2> <successors-2B3>
2924 <successors-2B1> <successors-2B2> <successors-2B3>
2925
2925
2926 Here rev2 has two possible (i.e. divergent) successors sets. The first
2926 Here rev2 has two possible (i.e. divergent) successors sets. The first
2927 holds one element, whereas the second holds three (i.e. the changeset has
2927 holds one element, whereas the second holds three (i.e. the changeset has
2928 been split).
2928 been split).
2929 """
2929 """
2930 # passed to successorssets caching computation from one call to another
2930 # passed to successorssets caching computation from one call to another
2931 cache = {}
2931 cache = {}
2932 ctx2str = str
2932 ctx2str = str
2933 node2str = short
2933 node2str = short
2934 if ui.debug():
2934 if ui.debug():
2935 def ctx2str(ctx):
2935 def ctx2str(ctx):
2936 return ctx.hex()
2936 return ctx.hex()
2937 node2str = hex
2937 node2str = hex
2938 for rev in scmutil.revrange(repo, revs):
2938 for rev in scmutil.revrange(repo, revs):
2939 ctx = repo[rev]
2939 ctx = repo[rev]
2940 ui.write('%s\n'% ctx2str(ctx))
2940 ui.write('%s\n'% ctx2str(ctx))
2941 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
2941 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
2942 if succsset:
2942 if succsset:
2943 ui.write(' ')
2943 ui.write(' ')
2944 ui.write(node2str(succsset[0]))
2944 ui.write(node2str(succsset[0]))
2945 for node in succsset[1:]:
2945 for node in succsset[1:]:
2946 ui.write(' ')
2946 ui.write(' ')
2947 ui.write(node2str(node))
2947 ui.write(node2str(node))
2948 ui.write('\n')
2948 ui.write('\n')
2949
2949
2950 @command('debugtemplate',
2950 @command('debugtemplate',
2951 [('r', 'rev', [], _('apply template on changesets'), _('REV')),
2951 [('r', 'rev', [], _('apply template on changesets'), _('REV')),
2952 ('D', 'define', [], _('define template keyword'), _('KEY=VALUE'))],
2952 ('D', 'define', [], _('define template keyword'), _('KEY=VALUE'))],
2953 _('[-r REV]... [-D KEY=VALUE]... TEMPLATE'),
2953 _('[-r REV]... [-D KEY=VALUE]... TEMPLATE'),
2954 optionalrepo=True)
2954 optionalrepo=True)
2955 def debugtemplate(ui, repo, tmpl, **opts):
2955 def debugtemplate(ui, repo, tmpl, **opts):
2956 """parse and apply a template
2956 """parse and apply a template
2957
2957
2958 If -r/--rev is given, the template is processed as a log template and
2958 If -r/--rev is given, the template is processed as a log template and
2959 applied to the given changesets. Otherwise, it is processed as a generic
2959 applied to the given changesets. Otherwise, it is processed as a generic
2960 template.
2960 template.
2961
2961
2962 Use --verbose to print the parsed tree.
2962 Use --verbose to print the parsed tree.
2963 """
2963 """
2964 revs = None
2964 revs = None
2965 if opts['rev']:
2965 if opts['rev']:
2966 if repo is None:
2966 if repo is None:
2967 raise error.RepoError(_('there is no Mercurial repository here '
2967 raise error.RepoError(_('there is no Mercurial repository here '
2968 '(.hg not found)'))
2968 '(.hg not found)'))
2969 revs = scmutil.revrange(repo, opts['rev'])
2969 revs = scmutil.revrange(repo, opts['rev'])
2970
2970
2971 props = {}
2971 props = {}
2972 for d in opts['define']:
2972 for d in opts['define']:
2973 try:
2973 try:
2974 k, v = (e.strip() for e in d.split('=', 1))
2974 k, v = (e.strip() for e in d.split('=', 1))
2975 if not k:
2975 if not k:
2976 raise ValueError
2976 raise ValueError
2977 props[k] = v
2977 props[k] = v
2978 except ValueError:
2978 except ValueError:
2979 raise error.Abort(_('malformed keyword definition: %s') % d)
2979 raise error.Abort(_('malformed keyword definition: %s') % d)
2980
2980
2981 if ui.verbose:
2981 if ui.verbose:
2982 aliases = ui.configitems('templatealias')
2982 aliases = ui.configitems('templatealias')
2983 tree = templater.parse(tmpl)
2983 tree = templater.parse(tmpl)
2984 ui.note(templater.prettyformat(tree), '\n')
2984 ui.note(templater.prettyformat(tree), '\n')
2985 newtree = templater.expandaliases(tree, aliases)
2985 newtree = templater.expandaliases(tree, aliases)
2986 if newtree != tree:
2986 if newtree != tree:
2987 ui.note(("* expanded:\n"), templater.prettyformat(newtree), '\n')
2987 ui.note(("* expanded:\n"), templater.prettyformat(newtree), '\n')
2988
2988
2989 mapfile = None
2989 mapfile = None
2990 if revs is None:
2990 if revs is None:
2991 k = 'debugtemplate'
2991 k = 'debugtemplate'
2992 t = formatter.maketemplater(ui, k, tmpl)
2992 t = formatter.maketemplater(ui, k, tmpl)
2993 ui.write(templater.stringify(t(k, **props)))
2993 ui.write(templater.stringify(t(k, **props)))
2994 else:
2994 else:
2995 displayer = cmdutil.changeset_templater(ui, repo, None, opts, tmpl,
2995 displayer = cmdutil.changeset_templater(ui, repo, None, opts, tmpl,
2996 mapfile, buffered=False)
2996 mapfile, buffered=False)
2997 for r in revs:
2997 for r in revs:
2998 displayer.show(repo[r], **props)
2998 displayer.show(repo[r], **props)
2999 displayer.close()
2999 displayer.close()
3000
3000
3001 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
3001 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
3002 def debugwalk(ui, repo, *pats, **opts):
3002 def debugwalk(ui, repo, *pats, **opts):
3003 """show how files match on given patterns"""
3003 """show how files match on given patterns"""
3004 m = scmutil.match(repo[None], pats, opts)
3004 m = scmutil.match(repo[None], pats, opts)
3005 items = list(repo.walk(m))
3005 items = list(repo.walk(m))
3006 if not items:
3006 if not items:
3007 return
3007 return
3008 f = lambda fn: fn
3008 f = lambda fn: fn
3009 if ui.configbool('ui', 'slash') and pycompat.ossep != '/':
3009 if ui.configbool('ui', 'slash') and pycompat.ossep != '/':
3010 f = lambda fn: util.normpath(fn)
3010 f = lambda fn: util.normpath(fn)
3011 fmt = 'f %%-%ds %%-%ds %%s' % (
3011 fmt = 'f %%-%ds %%-%ds %%s' % (
3012 max([len(abs) for abs in items]),
3012 max([len(abs) for abs in items]),
3013 max([len(m.rel(abs)) for abs in items]))
3013 max([len(m.rel(abs)) for abs in items]))
3014 for abs in items:
3014 for abs in items:
3015 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
3015 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
3016 ui.write("%s\n" % line.rstrip())
3016 ui.write("%s\n" % line.rstrip())
3017
3017
3018 @command('debugwireargs',
3018 @command('debugwireargs',
3019 [('', 'three', '', 'three'),
3019 [('', 'three', '', 'three'),
3020 ('', 'four', '', 'four'),
3020 ('', 'four', '', 'four'),
3021 ('', 'five', '', 'five'),
3021 ('', 'five', '', 'five'),
3022 ] + remoteopts,
3022 ] + remoteopts,
3023 _('REPO [OPTIONS]... [ONE [TWO]]'),
3023 _('REPO [OPTIONS]... [ONE [TWO]]'),
3024 norepo=True)
3024 norepo=True)
3025 def debugwireargs(ui, repopath, *vals, **opts):
3025 def debugwireargs(ui, repopath, *vals, **opts):
3026 repo = hg.peer(ui, opts, repopath)
3026 repo = hg.peer(ui, opts, repopath)
3027 for opt in remoteopts:
3027 for opt in remoteopts:
3028 del opts[opt[1]]
3028 del opts[opt[1]]
3029 args = {}
3029 args = {}
3030 for k, v in opts.iteritems():
3030 for k, v in opts.iteritems():
3031 if v:
3031 if v:
3032 args[k] = v
3032 args[k] = v
3033 # run twice to check that we don't mess up the stream for the next command
3033 # run twice to check that we don't mess up the stream for the next command
3034 res1 = repo.debugwireargs(*vals, **args)
3034 res1 = repo.debugwireargs(*vals, **args)
3035 res2 = repo.debugwireargs(*vals, **args)
3035 res2 = repo.debugwireargs(*vals, **args)
3036 ui.write("%s\n" % res1)
3036 ui.write("%s\n" % res1)
3037 if res1 != res2:
3037 if res1 != res2:
3038 ui.warn("%s\n" % res2)
3038 ui.warn("%s\n" % res2)
3039
3039
3040 @command('^diff',
3040 @command('^diff',
3041 [('r', 'rev', [], _('revision'), _('REV')),
3041 [('r', 'rev', [], _('revision'), _('REV')),
3042 ('c', 'change', '', _('change made by revision'), _('REV'))
3042 ('c', 'change', '', _('change made by revision'), _('REV'))
3043 ] + diffopts + diffopts2 + walkopts + subrepoopts,
3043 ] + diffopts + diffopts2 + walkopts + subrepoopts,
3044 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
3044 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
3045 inferrepo=True)
3045 inferrepo=True)
3046 def diff(ui, repo, *pats, **opts):
3046 def diff(ui, repo, *pats, **opts):
3047 """diff repository (or selected files)
3047 """diff repository (or selected files)
3048
3048
3049 Show differences between revisions for the specified files.
3049 Show differences between revisions for the specified files.
3050
3050
3051 Differences between files are shown using the unified diff format.
3051 Differences between files are shown using the unified diff format.
3052
3052
3053 .. note::
3053 .. note::
3054
3054
3055 :hg:`diff` may generate unexpected results for merges, as it will
3055 :hg:`diff` may generate unexpected results for merges, as it will
3056 default to comparing against the working directory's first
3056 default to comparing against the working directory's first
3057 parent changeset if no revisions are specified.
3057 parent changeset if no revisions are specified.
3058
3058
3059 When two revision arguments are given, then changes are shown
3059 When two revision arguments are given, then changes are shown
3060 between those revisions. If only one revision is specified then
3060 between those revisions. If only one revision is specified then
3061 that revision is compared to the working directory, and, when no
3061 that revision is compared to the working directory, and, when no
3062 revisions are specified, the working directory files are compared
3062 revisions are specified, the working directory files are compared
3063 to its first parent.
3063 to its first parent.
3064
3064
3065 Alternatively you can specify -c/--change with a revision to see
3065 Alternatively you can specify -c/--change with a revision to see
3066 the changes in that changeset relative to its first parent.
3066 the changes in that changeset relative to its first parent.
3067
3067
3068 Without the -a/--text option, diff will avoid generating diffs of
3068 Without the -a/--text option, diff will avoid generating diffs of
3069 files it detects as binary. With -a, diff will generate a diff
3069 files it detects as binary. With -a, diff will generate a diff
3070 anyway, probably with undesirable results.
3070 anyway, probably with undesirable results.
3071
3071
3072 Use the -g/--git option to generate diffs in the git extended diff
3072 Use the -g/--git option to generate diffs in the git extended diff
3073 format. For more information, read :hg:`help diffs`.
3073 format. For more information, read :hg:`help diffs`.
3074
3074
3075 .. container:: verbose
3075 .. container:: verbose
3076
3076
3077 Examples:
3077 Examples:
3078
3078
3079 - compare a file in the current working directory to its parent::
3079 - compare a file in the current working directory to its parent::
3080
3080
3081 hg diff foo.c
3081 hg diff foo.c
3082
3082
3083 - compare two historical versions of a directory, with rename info::
3083 - compare two historical versions of a directory, with rename info::
3084
3084
3085 hg diff --git -r 1.0:1.2 lib/
3085 hg diff --git -r 1.0:1.2 lib/
3086
3086
3087 - get change stats relative to the last change on some date::
3087 - get change stats relative to the last change on some date::
3088
3088
3089 hg diff --stat -r "date('may 2')"
3089 hg diff --stat -r "date('may 2')"
3090
3090
3091 - diff all newly-added files that contain a keyword::
3091 - diff all newly-added files that contain a keyword::
3092
3092
3093 hg diff "set:added() and grep(GNU)"
3093 hg diff "set:added() and grep(GNU)"
3094
3094
3095 - compare a revision and its parents::
3095 - compare a revision and its parents::
3096
3096
3097 hg diff -c 9353 # compare against first parent
3097 hg diff -c 9353 # compare against first parent
3098 hg diff -r 9353^:9353 # same using revset syntax
3098 hg diff -r 9353^:9353 # same using revset syntax
3099 hg diff -r 9353^2:9353 # compare against the second parent
3099 hg diff -r 9353^2:9353 # compare against the second parent
3100
3100
3101 Returns 0 on success.
3101 Returns 0 on success.
3102 """
3102 """
3103
3103
3104 revs = opts.get('rev')
3104 revs = opts.get('rev')
3105 change = opts.get('change')
3105 change = opts.get('change')
3106 stat = opts.get('stat')
3106 stat = opts.get('stat')
3107 reverse = opts.get('reverse')
3107 reverse = opts.get('reverse')
3108
3108
3109 if revs and change:
3109 if revs and change:
3110 msg = _('cannot specify --rev and --change at the same time')
3110 msg = _('cannot specify --rev and --change at the same time')
3111 raise error.Abort(msg)
3111 raise error.Abort(msg)
3112 elif change:
3112 elif change:
3113 node2 = scmutil.revsingle(repo, change, None).node()
3113 node2 = scmutil.revsingle(repo, change, None).node()
3114 node1 = repo[node2].p1().node()
3114 node1 = repo[node2].p1().node()
3115 else:
3115 else:
3116 node1, node2 = scmutil.revpair(repo, revs)
3116 node1, node2 = scmutil.revpair(repo, revs)
3117
3117
3118 if reverse:
3118 if reverse:
3119 node1, node2 = node2, node1
3119 node1, node2 = node2, node1
3120
3120
3121 diffopts = patch.diffallopts(ui, opts)
3121 diffopts = patch.diffallopts(ui, opts)
3122 m = scmutil.match(repo[node2], pats, opts)
3122 m = scmutil.match(repo[node2], pats, opts)
3123 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3123 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3124 listsubrepos=opts.get('subrepos'),
3124 listsubrepos=opts.get('subrepos'),
3125 root=opts.get('root'))
3125 root=opts.get('root'))
3126
3126
3127 @command('^export',
3127 @command('^export',
3128 [('o', 'output', '',
3128 [('o', 'output', '',
3129 _('print output to file with formatted name'), _('FORMAT')),
3129 _('print output to file with formatted name'), _('FORMAT')),
3130 ('', 'switch-parent', None, _('diff against the second parent')),
3130 ('', 'switch-parent', None, _('diff against the second parent')),
3131 ('r', 'rev', [], _('revisions to export'), _('REV')),
3131 ('r', 'rev', [], _('revisions to export'), _('REV')),
3132 ] + diffopts,
3132 ] + diffopts,
3133 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3133 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3134 def export(ui, repo, *changesets, **opts):
3134 def export(ui, repo, *changesets, **opts):
3135 """dump the header and diffs for one or more changesets
3135 """dump the header and diffs for one or more changesets
3136
3136
3137 Print the changeset header and diffs for one or more revisions.
3137 Print the changeset header and diffs for one or more revisions.
3138 If no revision is given, the parent of the working directory is used.
3138 If no revision is given, the parent of the working directory is used.
3139
3139
3140 The information shown in the changeset header is: author, date,
3140 The information shown in the changeset header is: author, date,
3141 branch name (if non-default), changeset hash, parent(s) and commit
3141 branch name (if non-default), changeset hash, parent(s) and commit
3142 comment.
3142 comment.
3143
3143
3144 .. note::
3144 .. note::
3145
3145
3146 :hg:`export` may generate unexpected diff output for merge
3146 :hg:`export` may generate unexpected diff output for merge
3147 changesets, as it will compare the merge changeset against its
3147 changesets, as it will compare the merge changeset against its
3148 first parent only.
3148 first parent only.
3149
3149
3150 Output may be to a file, in which case the name of the file is
3150 Output may be to a file, in which case the name of the file is
3151 given using a format string. The formatting rules are as follows:
3151 given using a format string. The formatting rules are as follows:
3152
3152
3153 :``%%``: literal "%" character
3153 :``%%``: literal "%" character
3154 :``%H``: changeset hash (40 hexadecimal digits)
3154 :``%H``: changeset hash (40 hexadecimal digits)
3155 :``%N``: number of patches being generated
3155 :``%N``: number of patches being generated
3156 :``%R``: changeset revision number
3156 :``%R``: changeset revision number
3157 :``%b``: basename of the exporting repository
3157 :``%b``: basename of the exporting repository
3158 :``%h``: short-form changeset hash (12 hexadecimal digits)
3158 :``%h``: short-form changeset hash (12 hexadecimal digits)
3159 :``%m``: first line of the commit message (only alphanumeric characters)
3159 :``%m``: first line of the commit message (only alphanumeric characters)
3160 :``%n``: zero-padded sequence number, starting at 1
3160 :``%n``: zero-padded sequence number, starting at 1
3161 :``%r``: zero-padded changeset revision number
3161 :``%r``: zero-padded changeset revision number
3162
3162
3163 Without the -a/--text option, export will avoid generating diffs
3163 Without the -a/--text option, export will avoid generating diffs
3164 of files it detects as binary. With -a, export will generate a
3164 of files it detects as binary. With -a, export will generate a
3165 diff anyway, probably with undesirable results.
3165 diff anyway, probably with undesirable results.
3166
3166
3167 Use the -g/--git option to generate diffs in the git extended diff
3167 Use the -g/--git option to generate diffs in the git extended diff
3168 format. See :hg:`help diffs` for more information.
3168 format. See :hg:`help diffs` for more information.
3169
3169
3170 With the --switch-parent option, the diff will be against the
3170 With the --switch-parent option, the diff will be against the
3171 second parent. It can be useful to review a merge.
3171 second parent. It can be useful to review a merge.
3172
3172
3173 .. container:: verbose
3173 .. container:: verbose
3174
3174
3175 Examples:
3175 Examples:
3176
3176
3177 - use export and import to transplant a bugfix to the current
3177 - use export and import to transplant a bugfix to the current
3178 branch::
3178 branch::
3179
3179
3180 hg export -r 9353 | hg import -
3180 hg export -r 9353 | hg import -
3181
3181
3182 - export all the changesets between two revisions to a file with
3182 - export all the changesets between two revisions to a file with
3183 rename information::
3183 rename information::
3184
3184
3185 hg export --git -r 123:150 > changes.txt
3185 hg export --git -r 123:150 > changes.txt
3186
3186
3187 - split outgoing changes into a series of patches with
3187 - split outgoing changes into a series of patches with
3188 descriptive names::
3188 descriptive names::
3189
3189
3190 hg export -r "outgoing()" -o "%n-%m.patch"
3190 hg export -r "outgoing()" -o "%n-%m.patch"
3191
3191
3192 Returns 0 on success.
3192 Returns 0 on success.
3193 """
3193 """
3194 changesets += tuple(opts.get('rev', []))
3194 changesets += tuple(opts.get('rev', []))
3195 if not changesets:
3195 if not changesets:
3196 changesets = ['.']
3196 changesets = ['.']
3197 revs = scmutil.revrange(repo, changesets)
3197 revs = scmutil.revrange(repo, changesets)
3198 if not revs:
3198 if not revs:
3199 raise error.Abort(_("export requires at least one changeset"))
3199 raise error.Abort(_("export requires at least one changeset"))
3200 if len(revs) > 1:
3200 if len(revs) > 1:
3201 ui.note(_('exporting patches:\n'))
3201 ui.note(_('exporting patches:\n'))
3202 else:
3202 else:
3203 ui.note(_('exporting patch:\n'))
3203 ui.note(_('exporting patch:\n'))
3204 cmdutil.export(repo, revs, template=opts.get('output'),
3204 cmdutil.export(repo, revs, template=opts.get('output'),
3205 switch_parent=opts.get('switch_parent'),
3205 switch_parent=opts.get('switch_parent'),
3206 opts=patch.diffallopts(ui, opts))
3206 opts=patch.diffallopts(ui, opts))
3207
3207
3208 @command('files',
3208 @command('files',
3209 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3209 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3210 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3210 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3211 ] + walkopts + formatteropts + subrepoopts,
3211 ] + walkopts + formatteropts + subrepoopts,
3212 _('[OPTION]... [FILE]...'))
3212 _('[OPTION]... [FILE]...'))
3213 def files(ui, repo, *pats, **opts):
3213 def files(ui, repo, *pats, **opts):
3214 """list tracked files
3214 """list tracked files
3215
3215
3216 Print files under Mercurial control in the working directory or
3216 Print files under Mercurial control in the working directory or
3217 specified revision for given files (excluding removed files).
3217 specified revision for given files (excluding removed files).
3218 Files can be specified as filenames or filesets.
3218 Files can be specified as filenames or filesets.
3219
3219
3220 If no files are given to match, this command prints the names
3220 If no files are given to match, this command prints the names
3221 of all files under Mercurial control.
3221 of all files under Mercurial control.
3222
3222
3223 .. container:: verbose
3223 .. container:: verbose
3224
3224
3225 Examples:
3225 Examples:
3226
3226
3227 - list all files under the current directory::
3227 - list all files under the current directory::
3228
3228
3229 hg files .
3229 hg files .
3230
3230
3231 - shows sizes and flags for current revision::
3231 - shows sizes and flags for current revision::
3232
3232
3233 hg files -vr .
3233 hg files -vr .
3234
3234
3235 - list all files named README::
3235 - list all files named README::
3236
3236
3237 hg files -I "**/README"
3237 hg files -I "**/README"
3238
3238
3239 - list all binary files::
3239 - list all binary files::
3240
3240
3241 hg files "set:binary()"
3241 hg files "set:binary()"
3242
3242
3243 - find files containing a regular expression::
3243 - find files containing a regular expression::
3244
3244
3245 hg files "set:grep('bob')"
3245 hg files "set:grep('bob')"
3246
3246
3247 - search tracked file contents with xargs and grep::
3247 - search tracked file contents with xargs and grep::
3248
3248
3249 hg files -0 | xargs -0 grep foo
3249 hg files -0 | xargs -0 grep foo
3250
3250
3251 See :hg:`help patterns` and :hg:`help filesets` for more information
3251 See :hg:`help patterns` and :hg:`help filesets` for more information
3252 on specifying file patterns.
3252 on specifying file patterns.
3253
3253
3254 Returns 0 if a match is found, 1 otherwise.
3254 Returns 0 if a match is found, 1 otherwise.
3255
3255
3256 """
3256 """
3257 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3257 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3258
3258
3259 end = '\n'
3259 end = '\n'
3260 if opts.get('print0'):
3260 if opts.get('print0'):
3261 end = '\0'
3261 end = '\0'
3262 fmt = '%s' + end
3262 fmt = '%s' + end
3263
3263
3264 m = scmutil.match(ctx, pats, opts)
3264 m = scmutil.match(ctx, pats, opts)
3265 with ui.formatter('files', opts) as fm:
3265 with ui.formatter('files', opts) as fm:
3266 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
3266 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
3267
3267
3268 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
3268 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
3269 def forget(ui, repo, *pats, **opts):
3269 def forget(ui, repo, *pats, **opts):
3270 """forget the specified files on the next commit
3270 """forget the specified files on the next commit
3271
3271
3272 Mark the specified files so they will no longer be tracked
3272 Mark the specified files so they will no longer be tracked
3273 after the next commit.
3273 after the next commit.
3274
3274
3275 This only removes files from the current branch, not from the
3275 This only removes files from the current branch, not from the
3276 entire project history, and it does not delete them from the
3276 entire project history, and it does not delete them from the
3277 working directory.
3277 working directory.
3278
3278
3279 To delete the file from the working directory, see :hg:`remove`.
3279 To delete the file from the working directory, see :hg:`remove`.
3280
3280
3281 To undo a forget before the next commit, see :hg:`add`.
3281 To undo a forget before the next commit, see :hg:`add`.
3282
3282
3283 .. container:: verbose
3283 .. container:: verbose
3284
3284
3285 Examples:
3285 Examples:
3286
3286
3287 - forget newly-added binary files::
3287 - forget newly-added binary files::
3288
3288
3289 hg forget "set:added() and binary()"
3289 hg forget "set:added() and binary()"
3290
3290
3291 - forget files that would be excluded by .hgignore::
3291 - forget files that would be excluded by .hgignore::
3292
3292
3293 hg forget "set:hgignore()"
3293 hg forget "set:hgignore()"
3294
3294
3295 Returns 0 on success.
3295 Returns 0 on success.
3296 """
3296 """
3297
3297
3298 if not pats:
3298 if not pats:
3299 raise error.Abort(_('no files specified'))
3299 raise error.Abort(_('no files specified'))
3300
3300
3301 m = scmutil.match(repo[None], pats, opts)
3301 m = scmutil.match(repo[None], pats, opts)
3302 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
3302 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
3303 return rejected and 1 or 0
3303 return rejected and 1 or 0
3304
3304
3305 @command(
3305 @command(
3306 'graft',
3306 'graft',
3307 [('r', 'rev', [], _('revisions to graft'), _('REV')),
3307 [('r', 'rev', [], _('revisions to graft'), _('REV')),
3308 ('c', 'continue', False, _('resume interrupted graft')),
3308 ('c', 'continue', False, _('resume interrupted graft')),
3309 ('e', 'edit', False, _('invoke editor on commit messages')),
3309 ('e', 'edit', False, _('invoke editor on commit messages')),
3310 ('', 'log', None, _('append graft info to log message')),
3310 ('', 'log', None, _('append graft info to log message')),
3311 ('f', 'force', False, _('force graft')),
3311 ('f', 'force', False, _('force graft')),
3312 ('D', 'currentdate', False,
3312 ('D', 'currentdate', False,
3313 _('record the current date as commit date')),
3313 _('record the current date as commit date')),
3314 ('U', 'currentuser', False,
3314 ('U', 'currentuser', False,
3315 _('record the current user as committer'), _('DATE'))]
3315 _('record the current user as committer'), _('DATE'))]
3316 + commitopts2 + mergetoolopts + dryrunopts,
3316 + commitopts2 + mergetoolopts + dryrunopts,
3317 _('[OPTION]... [-r REV]... REV...'))
3317 _('[OPTION]... [-r REV]... REV...'))
3318 def graft(ui, repo, *revs, **opts):
3318 def graft(ui, repo, *revs, **opts):
3319 '''copy changes from other branches onto the current branch
3319 '''copy changes from other branches onto the current branch
3320
3320
3321 This command uses Mercurial's merge logic to copy individual
3321 This command uses Mercurial's merge logic to copy individual
3322 changes from other branches without merging branches in the
3322 changes from other branches without merging branches in the
3323 history graph. This is sometimes known as 'backporting' or
3323 history graph. This is sometimes known as 'backporting' or
3324 'cherry-picking'. By default, graft will copy user, date, and
3324 'cherry-picking'. By default, graft will copy user, date, and
3325 description from the source changesets.
3325 description from the source changesets.
3326
3326
3327 Changesets that are ancestors of the current revision, that have
3327 Changesets that are ancestors of the current revision, that have
3328 already been grafted, or that are merges will be skipped.
3328 already been grafted, or that are merges will be skipped.
3329
3329
3330 If --log is specified, log messages will have a comment appended
3330 If --log is specified, log messages will have a comment appended
3331 of the form::
3331 of the form::
3332
3332
3333 (grafted from CHANGESETHASH)
3333 (grafted from CHANGESETHASH)
3334
3334
3335 If --force is specified, revisions will be grafted even if they
3335 If --force is specified, revisions will be grafted even if they
3336 are already ancestors of or have been grafted to the destination.
3336 are already ancestors of or have been grafted to the destination.
3337 This is useful when the revisions have since been backed out.
3337 This is useful when the revisions have since been backed out.
3338
3338
3339 If a graft merge results in conflicts, the graft process is
3339 If a graft merge results in conflicts, the graft process is
3340 interrupted so that the current merge can be manually resolved.
3340 interrupted so that the current merge can be manually resolved.
3341 Once all conflicts are addressed, the graft process can be
3341 Once all conflicts are addressed, the graft process can be
3342 continued with the -c/--continue option.
3342 continued with the -c/--continue option.
3343
3343
3344 .. note::
3344 .. note::
3345
3345
3346 The -c/--continue option does not reapply earlier options, except
3346 The -c/--continue option does not reapply earlier options, except
3347 for --force.
3347 for --force.
3348
3348
3349 .. container:: verbose
3349 .. container:: verbose
3350
3350
3351 Examples:
3351 Examples:
3352
3352
3353 - copy a single change to the stable branch and edit its description::
3353 - copy a single change to the stable branch and edit its description::
3354
3354
3355 hg update stable
3355 hg update stable
3356 hg graft --edit 9393
3356 hg graft --edit 9393
3357
3357
3358 - graft a range of changesets with one exception, updating dates::
3358 - graft a range of changesets with one exception, updating dates::
3359
3359
3360 hg graft -D "2085::2093 and not 2091"
3360 hg graft -D "2085::2093 and not 2091"
3361
3361
3362 - continue a graft after resolving conflicts::
3362 - continue a graft after resolving conflicts::
3363
3363
3364 hg graft -c
3364 hg graft -c
3365
3365
3366 - show the source of a grafted changeset::
3366 - show the source of a grafted changeset::
3367
3367
3368 hg log --debug -r .
3368 hg log --debug -r .
3369
3369
3370 - show revisions sorted by date::
3370 - show revisions sorted by date::
3371
3371
3372 hg log -r "sort(all(), date)"
3372 hg log -r "sort(all(), date)"
3373
3373
3374 See :hg:`help revisions` for more about specifying revisions.
3374 See :hg:`help revisions` for more about specifying revisions.
3375
3375
3376 Returns 0 on successful completion.
3376 Returns 0 on successful completion.
3377 '''
3377 '''
3378 with repo.wlock():
3378 with repo.wlock():
3379 return _dograft(ui, repo, *revs, **opts)
3379 return _dograft(ui, repo, *revs, **opts)
3380
3380
3381 def _dograft(ui, repo, *revs, **opts):
3381 def _dograft(ui, repo, *revs, **opts):
3382 if revs and opts.get('rev'):
3382 if revs and opts.get('rev'):
3383 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
3383 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
3384 'revision ordering!\n'))
3384 'revision ordering!\n'))
3385
3385
3386 revs = list(revs)
3386 revs = list(revs)
3387 revs.extend(opts.get('rev'))
3387 revs.extend(opts.get('rev'))
3388
3388
3389 if not opts.get('user') and opts.get('currentuser'):
3389 if not opts.get('user') and opts.get('currentuser'):
3390 opts['user'] = ui.username()
3390 opts['user'] = ui.username()
3391 if not opts.get('date') and opts.get('currentdate'):
3391 if not opts.get('date') and opts.get('currentdate'):
3392 opts['date'] = "%d %d" % util.makedate()
3392 opts['date'] = "%d %d" % util.makedate()
3393
3393
3394 editor = cmdutil.getcommiteditor(editform='graft', **opts)
3394 editor = cmdutil.getcommiteditor(editform='graft', **opts)
3395
3395
3396 cont = False
3396 cont = False
3397 if opts.get('continue'):
3397 if opts.get('continue'):
3398 cont = True
3398 cont = True
3399 if revs:
3399 if revs:
3400 raise error.Abort(_("can't specify --continue and revisions"))
3400 raise error.Abort(_("can't specify --continue and revisions"))
3401 # read in unfinished revisions
3401 # read in unfinished revisions
3402 try:
3402 try:
3403 nodes = repo.vfs.read('graftstate').splitlines()
3403 nodes = repo.vfs.read('graftstate').splitlines()
3404 revs = [repo[node].rev() for node in nodes]
3404 revs = [repo[node].rev() for node in nodes]
3405 except IOError as inst:
3405 except IOError as inst:
3406 if inst.errno != errno.ENOENT:
3406 if inst.errno != errno.ENOENT:
3407 raise
3407 raise
3408 cmdutil.wrongtooltocontinue(repo, _('graft'))
3408 cmdutil.wrongtooltocontinue(repo, _('graft'))
3409 else:
3409 else:
3410 cmdutil.checkunfinished(repo)
3410 cmdutil.checkunfinished(repo)
3411 cmdutil.bailifchanged(repo)
3411 cmdutil.bailifchanged(repo)
3412 if not revs:
3412 if not revs:
3413 raise error.Abort(_('no revisions specified'))
3413 raise error.Abort(_('no revisions specified'))
3414 revs = scmutil.revrange(repo, revs)
3414 revs = scmutil.revrange(repo, revs)
3415
3415
3416 skipped = set()
3416 skipped = set()
3417 # check for merges
3417 # check for merges
3418 for rev in repo.revs('%ld and merge()', revs):
3418 for rev in repo.revs('%ld and merge()', revs):
3419 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
3419 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
3420 skipped.add(rev)
3420 skipped.add(rev)
3421 revs = [r for r in revs if r not in skipped]
3421 revs = [r for r in revs if r not in skipped]
3422 if not revs:
3422 if not revs:
3423 return -1
3423 return -1
3424
3424
3425 # Don't check in the --continue case, in effect retaining --force across
3425 # Don't check in the --continue case, in effect retaining --force across
3426 # --continues. That's because without --force, any revisions we decided to
3426 # --continues. That's because without --force, any revisions we decided to
3427 # skip would have been filtered out here, so they wouldn't have made their
3427 # skip would have been filtered out here, so they wouldn't have made their
3428 # way to the graftstate. With --force, any revisions we would have otherwise
3428 # way to the graftstate. With --force, any revisions we would have otherwise
3429 # skipped would not have been filtered out, and if they hadn't been applied
3429 # skipped would not have been filtered out, and if they hadn't been applied
3430 # already, they'd have been in the graftstate.
3430 # already, they'd have been in the graftstate.
3431 if not (cont or opts.get('force')):
3431 if not (cont or opts.get('force')):
3432 # check for ancestors of dest branch
3432 # check for ancestors of dest branch
3433 crev = repo['.'].rev()
3433 crev = repo['.'].rev()
3434 ancestors = repo.changelog.ancestors([crev], inclusive=True)
3434 ancestors = repo.changelog.ancestors([crev], inclusive=True)
3435 # XXX make this lazy in the future
3435 # XXX make this lazy in the future
3436 # don't mutate while iterating, create a copy
3436 # don't mutate while iterating, create a copy
3437 for rev in list(revs):
3437 for rev in list(revs):
3438 if rev in ancestors:
3438 if rev in ancestors:
3439 ui.warn(_('skipping ancestor revision %d:%s\n') %
3439 ui.warn(_('skipping ancestor revision %d:%s\n') %
3440 (rev, repo[rev]))
3440 (rev, repo[rev]))
3441 # XXX remove on list is slow
3441 # XXX remove on list is slow
3442 revs.remove(rev)
3442 revs.remove(rev)
3443 if not revs:
3443 if not revs:
3444 return -1
3444 return -1
3445
3445
3446 # analyze revs for earlier grafts
3446 # analyze revs for earlier grafts
3447 ids = {}
3447 ids = {}
3448 for ctx in repo.set("%ld", revs):
3448 for ctx in repo.set("%ld", revs):
3449 ids[ctx.hex()] = ctx.rev()
3449 ids[ctx.hex()] = ctx.rev()
3450 n = ctx.extra().get('source')
3450 n = ctx.extra().get('source')
3451 if n:
3451 if n:
3452 ids[n] = ctx.rev()
3452 ids[n] = ctx.rev()
3453
3453
3454 # check ancestors for earlier grafts
3454 # check ancestors for earlier grafts
3455 ui.debug('scanning for duplicate grafts\n')
3455 ui.debug('scanning for duplicate grafts\n')
3456
3456
3457 for rev in repo.changelog.findmissingrevs(revs, [crev]):
3457 for rev in repo.changelog.findmissingrevs(revs, [crev]):
3458 ctx = repo[rev]
3458 ctx = repo[rev]
3459 n = ctx.extra().get('source')
3459 n = ctx.extra().get('source')
3460 if n in ids:
3460 if n in ids:
3461 try:
3461 try:
3462 r = repo[n].rev()
3462 r = repo[n].rev()
3463 except error.RepoLookupError:
3463 except error.RepoLookupError:
3464 r = None
3464 r = None
3465 if r in revs:
3465 if r in revs:
3466 ui.warn(_('skipping revision %d:%s '
3466 ui.warn(_('skipping revision %d:%s '
3467 '(already grafted to %d:%s)\n')
3467 '(already grafted to %d:%s)\n')
3468 % (r, repo[r], rev, ctx))
3468 % (r, repo[r], rev, ctx))
3469 revs.remove(r)
3469 revs.remove(r)
3470 elif ids[n] in revs:
3470 elif ids[n] in revs:
3471 if r is None:
3471 if r is None:
3472 ui.warn(_('skipping already grafted revision %d:%s '
3472 ui.warn(_('skipping already grafted revision %d:%s '
3473 '(%d:%s also has unknown origin %s)\n')
3473 '(%d:%s also has unknown origin %s)\n')
3474 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
3474 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
3475 else:
3475 else:
3476 ui.warn(_('skipping already grafted revision %d:%s '
3476 ui.warn(_('skipping already grafted revision %d:%s '
3477 '(%d:%s also has origin %d:%s)\n')
3477 '(%d:%s also has origin %d:%s)\n')
3478 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
3478 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
3479 revs.remove(ids[n])
3479 revs.remove(ids[n])
3480 elif ctx.hex() in ids:
3480 elif ctx.hex() in ids:
3481 r = ids[ctx.hex()]
3481 r = ids[ctx.hex()]
3482 ui.warn(_('skipping already grafted revision %d:%s '
3482 ui.warn(_('skipping already grafted revision %d:%s '
3483 '(was grafted from %d:%s)\n') %
3483 '(was grafted from %d:%s)\n') %
3484 (r, repo[r], rev, ctx))
3484 (r, repo[r], rev, ctx))
3485 revs.remove(r)
3485 revs.remove(r)
3486 if not revs:
3486 if not revs:
3487 return -1
3487 return -1
3488
3488
3489 for pos, ctx in enumerate(repo.set("%ld", revs)):
3489 for pos, ctx in enumerate(repo.set("%ld", revs)):
3490 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
3490 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
3491 ctx.description().split('\n', 1)[0])
3491 ctx.description().split('\n', 1)[0])
3492 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3492 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3493 if names:
3493 if names:
3494 desc += ' (%s)' % ' '.join(names)
3494 desc += ' (%s)' % ' '.join(names)
3495 ui.status(_('grafting %s\n') % desc)
3495 ui.status(_('grafting %s\n') % desc)
3496 if opts.get('dry_run'):
3496 if opts.get('dry_run'):
3497 continue
3497 continue
3498
3498
3499 source = ctx.extra().get('source')
3499 source = ctx.extra().get('source')
3500 extra = {}
3500 extra = {}
3501 if source:
3501 if source:
3502 extra['source'] = source
3502 extra['source'] = source
3503 extra['intermediate-source'] = ctx.hex()
3503 extra['intermediate-source'] = ctx.hex()
3504 else:
3504 else:
3505 extra['source'] = ctx.hex()
3505 extra['source'] = ctx.hex()
3506 user = ctx.user()
3506 user = ctx.user()
3507 if opts.get('user'):
3507 if opts.get('user'):
3508 user = opts['user']
3508 user = opts['user']
3509 date = ctx.date()
3509 date = ctx.date()
3510 if opts.get('date'):
3510 if opts.get('date'):
3511 date = opts['date']
3511 date = opts['date']
3512 message = ctx.description()
3512 message = ctx.description()
3513 if opts.get('log'):
3513 if opts.get('log'):
3514 message += '\n(grafted from %s)' % ctx.hex()
3514 message += '\n(grafted from %s)' % ctx.hex()
3515
3515
3516 # we don't merge the first commit when continuing
3516 # we don't merge the first commit when continuing
3517 if not cont:
3517 if not cont:
3518 # perform the graft merge with p1(rev) as 'ancestor'
3518 # perform the graft merge with p1(rev) as 'ancestor'
3519 try:
3519 try:
3520 # ui.forcemerge is an internal variable, do not document
3520 # ui.forcemerge is an internal variable, do not document
3521 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
3521 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
3522 'graft')
3522 'graft')
3523 stats = mergemod.graft(repo, ctx, ctx.p1(),
3523 stats = mergemod.graft(repo, ctx, ctx.p1(),
3524 ['local', 'graft'])
3524 ['local', 'graft'])
3525 finally:
3525 finally:
3526 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
3526 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
3527 # report any conflicts
3527 # report any conflicts
3528 if stats and stats[3] > 0:
3528 if stats and stats[3] > 0:
3529 # write out state for --continue
3529 # write out state for --continue
3530 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
3530 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
3531 repo.vfs.write('graftstate', ''.join(nodelines))
3531 repo.vfs.write('graftstate', ''.join(nodelines))
3532 extra = ''
3532 extra = ''
3533 if opts.get('user'):
3533 if opts.get('user'):
3534 extra += ' --user %s' % util.shellquote(opts['user'])
3534 extra += ' --user %s' % util.shellquote(opts['user'])
3535 if opts.get('date'):
3535 if opts.get('date'):
3536 extra += ' --date %s' % util.shellquote(opts['date'])
3536 extra += ' --date %s' % util.shellquote(opts['date'])
3537 if opts.get('log'):
3537 if opts.get('log'):
3538 extra += ' --log'
3538 extra += ' --log'
3539 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
3539 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
3540 raise error.Abort(
3540 raise error.Abort(
3541 _("unresolved conflicts, can't continue"),
3541 _("unresolved conflicts, can't continue"),
3542 hint=hint)
3542 hint=hint)
3543 else:
3543 else:
3544 cont = False
3544 cont = False
3545
3545
3546 # commit
3546 # commit
3547 node = repo.commit(text=message, user=user,
3547 node = repo.commit(text=message, user=user,
3548 date=date, extra=extra, editor=editor)
3548 date=date, extra=extra, editor=editor)
3549 if node is None:
3549 if node is None:
3550 ui.warn(
3550 ui.warn(
3551 _('note: graft of %d:%s created no changes to commit\n') %
3551 _('note: graft of %d:%s created no changes to commit\n') %
3552 (ctx.rev(), ctx))
3552 (ctx.rev(), ctx))
3553
3553
3554 # remove state when we complete successfully
3554 # remove state when we complete successfully
3555 if not opts.get('dry_run'):
3555 if not opts.get('dry_run'):
3556 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
3556 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
3557
3557
3558 return 0
3558 return 0
3559
3559
3560 @command('grep',
3560 @command('grep',
3561 [('0', 'print0', None, _('end fields with NUL')),
3561 [('0', 'print0', None, _('end fields with NUL')),
3562 ('', 'all', None, _('print all revisions that match')),
3562 ('', 'all', None, _('print all revisions that match')),
3563 ('a', 'text', None, _('treat all files as text')),
3563 ('a', 'text', None, _('treat all files as text')),
3564 ('f', 'follow', None,
3564 ('f', 'follow', None,
3565 _('follow changeset history,'
3565 _('follow changeset history,'
3566 ' or file history across copies and renames')),
3566 ' or file history across copies and renames')),
3567 ('i', 'ignore-case', None, _('ignore case when matching')),
3567 ('i', 'ignore-case', None, _('ignore case when matching')),
3568 ('l', 'files-with-matches', None,
3568 ('l', 'files-with-matches', None,
3569 _('print only filenames and revisions that match')),
3569 _('print only filenames and revisions that match')),
3570 ('n', 'line-number', None, _('print matching line numbers')),
3570 ('n', 'line-number', None, _('print matching line numbers')),
3571 ('r', 'rev', [],
3571 ('r', 'rev', [],
3572 _('only search files changed within revision range'), _('REV')),
3572 _('only search files changed within revision range'), _('REV')),
3573 ('u', 'user', None, _('list the author (long with -v)')),
3573 ('u', 'user', None, _('list the author (long with -v)')),
3574 ('d', 'date', None, _('list the date (short with -q)')),
3574 ('d', 'date', None, _('list the date (short with -q)')),
3575 ] + formatteropts + walkopts,
3575 ] + formatteropts + walkopts,
3576 _('[OPTION]... PATTERN [FILE]...'),
3576 _('[OPTION]... PATTERN [FILE]...'),
3577 inferrepo=True)
3577 inferrepo=True)
3578 def grep(ui, repo, pattern, *pats, **opts):
3578 def grep(ui, repo, pattern, *pats, **opts):
3579 """search revision history for a pattern in specified files
3579 """search revision history for a pattern in specified files
3580
3580
3581 Search revision history for a regular expression in the specified
3581 Search revision history for a regular expression in the specified
3582 files or the entire project.
3582 files or the entire project.
3583
3583
3584 By default, grep prints the most recent revision number for each
3584 By default, grep prints the most recent revision number for each
3585 file in which it finds a match. To get it to print every revision
3585 file in which it finds a match. To get it to print every revision
3586 that contains a change in match status ("-" for a match that becomes
3586 that contains a change in match status ("-" for a match that becomes
3587 a non-match, or "+" for a non-match that becomes a match), use the
3587 a non-match, or "+" for a non-match that becomes a match), use the
3588 --all flag.
3588 --all flag.
3589
3589
3590 PATTERN can be any Python (roughly Perl-compatible) regular
3590 PATTERN can be any Python (roughly Perl-compatible) regular
3591 expression.
3591 expression.
3592
3592
3593 If no FILEs are specified (and -f/--follow isn't set), all files in
3593 If no FILEs are specified (and -f/--follow isn't set), all files in
3594 the repository are searched, including those that don't exist in the
3594 the repository are searched, including those that don't exist in the
3595 current branch or have been deleted in a prior changeset.
3595 current branch or have been deleted in a prior changeset.
3596
3596
3597 Returns 0 if a match is found, 1 otherwise.
3597 Returns 0 if a match is found, 1 otherwise.
3598 """
3598 """
3599 reflags = re.M
3599 reflags = re.M
3600 if opts.get('ignore_case'):
3600 if opts.get('ignore_case'):
3601 reflags |= re.I
3601 reflags |= re.I
3602 try:
3602 try:
3603 regexp = util.re.compile(pattern, reflags)
3603 regexp = util.re.compile(pattern, reflags)
3604 except re.error as inst:
3604 except re.error as inst:
3605 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
3605 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
3606 return 1
3606 return 1
3607 sep, eol = ':', '\n'
3607 sep, eol = ':', '\n'
3608 if opts.get('print0'):
3608 if opts.get('print0'):
3609 sep = eol = '\0'
3609 sep = eol = '\0'
3610
3610
3611 getfile = util.lrucachefunc(repo.file)
3611 getfile = util.lrucachefunc(repo.file)
3612
3612
3613 def matchlines(body):
3613 def matchlines(body):
3614 begin = 0
3614 begin = 0
3615 linenum = 0
3615 linenum = 0
3616 while begin < len(body):
3616 while begin < len(body):
3617 match = regexp.search(body, begin)
3617 match = regexp.search(body, begin)
3618 if not match:
3618 if not match:
3619 break
3619 break
3620 mstart, mend = match.span()
3620 mstart, mend = match.span()
3621 linenum += body.count('\n', begin, mstart) + 1
3621 linenum += body.count('\n', begin, mstart) + 1
3622 lstart = body.rfind('\n', begin, mstart) + 1 or begin
3622 lstart = body.rfind('\n', begin, mstart) + 1 or begin
3623 begin = body.find('\n', mend) + 1 or len(body) + 1
3623 begin = body.find('\n', mend) + 1 or len(body) + 1
3624 lend = begin - 1
3624 lend = begin - 1
3625 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
3625 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
3626
3626
3627 class linestate(object):
3627 class linestate(object):
3628 def __init__(self, line, linenum, colstart, colend):
3628 def __init__(self, line, linenum, colstart, colend):
3629 self.line = line
3629 self.line = line
3630 self.linenum = linenum
3630 self.linenum = linenum
3631 self.colstart = colstart
3631 self.colstart = colstart
3632 self.colend = colend
3632 self.colend = colend
3633
3633
3634 def __hash__(self):
3634 def __hash__(self):
3635 return hash((self.linenum, self.line))
3635 return hash((self.linenum, self.line))
3636
3636
3637 def __eq__(self, other):
3637 def __eq__(self, other):
3638 return self.line == other.line
3638 return self.line == other.line
3639
3639
3640 def findpos(self):
3640 def findpos(self):
3641 """Iterate all (start, end) indices of matches"""
3641 """Iterate all (start, end) indices of matches"""
3642 yield self.colstart, self.colend
3642 yield self.colstart, self.colend
3643 p = self.colend
3643 p = self.colend
3644 while p < len(self.line):
3644 while p < len(self.line):
3645 m = regexp.search(self.line, p)
3645 m = regexp.search(self.line, p)
3646 if not m:
3646 if not m:
3647 break
3647 break
3648 yield m.span()
3648 yield m.span()
3649 p = m.end()
3649 p = m.end()
3650
3650
3651 matches = {}
3651 matches = {}
3652 copies = {}
3652 copies = {}
3653 def grepbody(fn, rev, body):
3653 def grepbody(fn, rev, body):
3654 matches[rev].setdefault(fn, [])
3654 matches[rev].setdefault(fn, [])
3655 m = matches[rev][fn]
3655 m = matches[rev][fn]
3656 for lnum, cstart, cend, line in matchlines(body):
3656 for lnum, cstart, cend, line in matchlines(body):
3657 s = linestate(line, lnum, cstart, cend)
3657 s = linestate(line, lnum, cstart, cend)
3658 m.append(s)
3658 m.append(s)
3659
3659
3660 def difflinestates(a, b):
3660 def difflinestates(a, b):
3661 sm = difflib.SequenceMatcher(None, a, b)
3661 sm = difflib.SequenceMatcher(None, a, b)
3662 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3662 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3663 if tag == 'insert':
3663 if tag == 'insert':
3664 for i in xrange(blo, bhi):
3664 for i in xrange(blo, bhi):
3665 yield ('+', b[i])
3665 yield ('+', b[i])
3666 elif tag == 'delete':
3666 elif tag == 'delete':
3667 for i in xrange(alo, ahi):
3667 for i in xrange(alo, ahi):
3668 yield ('-', a[i])
3668 yield ('-', a[i])
3669 elif tag == 'replace':
3669 elif tag == 'replace':
3670 for i in xrange(alo, ahi):
3670 for i in xrange(alo, ahi):
3671 yield ('-', a[i])
3671 yield ('-', a[i])
3672 for i in xrange(blo, bhi):
3672 for i in xrange(blo, bhi):
3673 yield ('+', b[i])
3673 yield ('+', b[i])
3674
3674
3675 def display(fm, fn, ctx, pstates, states):
3675 def display(fm, fn, ctx, pstates, states):
3676 rev = ctx.rev()
3676 rev = ctx.rev()
3677 if fm.isplain():
3677 if fm.isplain():
3678 formatuser = ui.shortuser
3678 formatuser = ui.shortuser
3679 else:
3679 else:
3680 formatuser = str
3680 formatuser = str
3681 if ui.quiet:
3681 if ui.quiet:
3682 datefmt = '%Y-%m-%d'
3682 datefmt = '%Y-%m-%d'
3683 else:
3683 else:
3684 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
3684 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
3685 found = False
3685 found = False
3686 @util.cachefunc
3686 @util.cachefunc
3687 def binary():
3687 def binary():
3688 flog = getfile(fn)
3688 flog = getfile(fn)
3689 return util.binary(flog.read(ctx.filenode(fn)))
3689 return util.binary(flog.read(ctx.filenode(fn)))
3690
3690
3691 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
3691 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
3692 if opts.get('all'):
3692 if opts.get('all'):
3693 iter = difflinestates(pstates, states)
3693 iter = difflinestates(pstates, states)
3694 else:
3694 else:
3695 iter = [('', l) for l in states]
3695 iter = [('', l) for l in states]
3696 for change, l in iter:
3696 for change, l in iter:
3697 fm.startitem()
3697 fm.startitem()
3698 fm.data(node=fm.hexfunc(ctx.node()))
3698 fm.data(node=fm.hexfunc(ctx.node()))
3699 cols = [
3699 cols = [
3700 ('filename', fn, True),
3700 ('filename', fn, True),
3701 ('rev', rev, True),
3701 ('rev', rev, True),
3702 ('linenumber', l.linenum, opts.get('line_number')),
3702 ('linenumber', l.linenum, opts.get('line_number')),
3703 ]
3703 ]
3704 if opts.get('all'):
3704 if opts.get('all'):
3705 cols.append(('change', change, True))
3705 cols.append(('change', change, True))
3706 cols.extend([
3706 cols.extend([
3707 ('user', formatuser(ctx.user()), opts.get('user')),
3707 ('user', formatuser(ctx.user()), opts.get('user')),
3708 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
3708 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
3709 ])
3709 ])
3710 lastcol = next(name for name, data, cond in reversed(cols) if cond)
3710 lastcol = next(name for name, data, cond in reversed(cols) if cond)
3711 for name, data, cond in cols:
3711 for name, data, cond in cols:
3712 field = fieldnamemap.get(name, name)
3712 field = fieldnamemap.get(name, name)
3713 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
3713 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
3714 if cond and name != lastcol:
3714 if cond and name != lastcol:
3715 fm.plain(sep, label='grep.sep')
3715 fm.plain(sep, label='grep.sep')
3716 if not opts.get('files_with_matches'):
3716 if not opts.get('files_with_matches'):
3717 fm.plain(sep, label='grep.sep')
3717 fm.plain(sep, label='grep.sep')
3718 if not opts.get('text') and binary():
3718 if not opts.get('text') and binary():
3719 fm.plain(_(" Binary file matches"))
3719 fm.plain(_(" Binary file matches"))
3720 else:
3720 else:
3721 displaymatches(fm.nested('texts'), l)
3721 displaymatches(fm.nested('texts'), l)
3722 fm.plain(eol)
3722 fm.plain(eol)
3723 found = True
3723 found = True
3724 if opts.get('files_with_matches'):
3724 if opts.get('files_with_matches'):
3725 break
3725 break
3726 return found
3726 return found
3727
3727
3728 def displaymatches(fm, l):
3728 def displaymatches(fm, l):
3729 p = 0
3729 p = 0
3730 for s, e in l.findpos():
3730 for s, e in l.findpos():
3731 if p < s:
3731 if p < s:
3732 fm.startitem()
3732 fm.startitem()
3733 fm.write('text', '%s', l.line[p:s])
3733 fm.write('text', '%s', l.line[p:s])
3734 fm.data(matched=False)
3734 fm.data(matched=False)
3735 fm.startitem()
3735 fm.startitem()
3736 fm.write('text', '%s', l.line[s:e], label='grep.match')
3736 fm.write('text', '%s', l.line[s:e], label='grep.match')
3737 fm.data(matched=True)
3737 fm.data(matched=True)
3738 p = e
3738 p = e
3739 if p < len(l.line):
3739 if p < len(l.line):
3740 fm.startitem()
3740 fm.startitem()
3741 fm.write('text', '%s', l.line[p:])
3741 fm.write('text', '%s', l.line[p:])
3742 fm.data(matched=False)
3742 fm.data(matched=False)
3743 fm.end()
3743 fm.end()
3744
3744
3745 skip = {}
3745 skip = {}
3746 revfiles = {}
3746 revfiles = {}
3747 matchfn = scmutil.match(repo[None], pats, opts)
3747 matchfn = scmutil.match(repo[None], pats, opts)
3748 found = False
3748 found = False
3749 follow = opts.get('follow')
3749 follow = opts.get('follow')
3750
3750
3751 def prep(ctx, fns):
3751 def prep(ctx, fns):
3752 rev = ctx.rev()
3752 rev = ctx.rev()
3753 pctx = ctx.p1()
3753 pctx = ctx.p1()
3754 parent = pctx.rev()
3754 parent = pctx.rev()
3755 matches.setdefault(rev, {})
3755 matches.setdefault(rev, {})
3756 matches.setdefault(parent, {})
3756 matches.setdefault(parent, {})
3757 files = revfiles.setdefault(rev, [])
3757 files = revfiles.setdefault(rev, [])
3758 for fn in fns:
3758 for fn in fns:
3759 flog = getfile(fn)
3759 flog = getfile(fn)
3760 try:
3760 try:
3761 fnode = ctx.filenode(fn)
3761 fnode = ctx.filenode(fn)
3762 except error.LookupError:
3762 except error.LookupError:
3763 continue
3763 continue
3764
3764
3765 copied = flog.renamed(fnode)
3765 copied = flog.renamed(fnode)
3766 copy = follow and copied and copied[0]
3766 copy = follow and copied and copied[0]
3767 if copy:
3767 if copy:
3768 copies.setdefault(rev, {})[fn] = copy
3768 copies.setdefault(rev, {})[fn] = copy
3769 if fn in skip:
3769 if fn in skip:
3770 if copy:
3770 if copy:
3771 skip[copy] = True
3771 skip[copy] = True
3772 continue
3772 continue
3773 files.append(fn)
3773 files.append(fn)
3774
3774
3775 if fn not in matches[rev]:
3775 if fn not in matches[rev]:
3776 grepbody(fn, rev, flog.read(fnode))
3776 grepbody(fn, rev, flog.read(fnode))
3777
3777
3778 pfn = copy or fn
3778 pfn = copy or fn
3779 if pfn not in matches[parent]:
3779 if pfn not in matches[parent]:
3780 try:
3780 try:
3781 fnode = pctx.filenode(pfn)
3781 fnode = pctx.filenode(pfn)
3782 grepbody(pfn, parent, flog.read(fnode))
3782 grepbody(pfn, parent, flog.read(fnode))
3783 except error.LookupError:
3783 except error.LookupError:
3784 pass
3784 pass
3785
3785
3786 fm = ui.formatter('grep', opts)
3786 fm = ui.formatter('grep', opts)
3787 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
3787 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
3788 rev = ctx.rev()
3788 rev = ctx.rev()
3789 parent = ctx.p1().rev()
3789 parent = ctx.p1().rev()
3790 for fn in sorted(revfiles.get(rev, [])):
3790 for fn in sorted(revfiles.get(rev, [])):
3791 states = matches[rev][fn]
3791 states = matches[rev][fn]
3792 copy = copies.get(rev, {}).get(fn)
3792 copy = copies.get(rev, {}).get(fn)
3793 if fn in skip:
3793 if fn in skip:
3794 if copy:
3794 if copy:
3795 skip[copy] = True
3795 skip[copy] = True
3796 continue
3796 continue
3797 pstates = matches.get(parent, {}).get(copy or fn, [])
3797 pstates = matches.get(parent, {}).get(copy or fn, [])
3798 if pstates or states:
3798 if pstates or states:
3799 r = display(fm, fn, ctx, pstates, states)
3799 r = display(fm, fn, ctx, pstates, states)
3800 found = found or r
3800 found = found or r
3801 if r and not opts.get('all'):
3801 if r and not opts.get('all'):
3802 skip[fn] = True
3802 skip[fn] = True
3803 if copy:
3803 if copy:
3804 skip[copy] = True
3804 skip[copy] = True
3805 del matches[rev]
3805 del matches[rev]
3806 del revfiles[rev]
3806 del revfiles[rev]
3807 fm.end()
3807 fm.end()
3808
3808
3809 return not found
3809 return not found
3810
3810
3811 @command('heads',
3811 @command('heads',
3812 [('r', 'rev', '',
3812 [('r', 'rev', '',
3813 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
3813 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
3814 ('t', 'topo', False, _('show topological heads only')),
3814 ('t', 'topo', False, _('show topological heads only')),
3815 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
3815 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
3816 ('c', 'closed', False, _('show normal and closed branch heads')),
3816 ('c', 'closed', False, _('show normal and closed branch heads')),
3817 ] + templateopts,
3817 ] + templateopts,
3818 _('[-ct] [-r STARTREV] [REV]...'))
3818 _('[-ct] [-r STARTREV] [REV]...'))
3819 def heads(ui, repo, *branchrevs, **opts):
3819 def heads(ui, repo, *branchrevs, **opts):
3820 """show branch heads
3820 """show branch heads
3821
3821
3822 With no arguments, show all open branch heads in the repository.
3822 With no arguments, show all open branch heads in the repository.
3823 Branch heads are changesets that have no descendants on the
3823 Branch heads are changesets that have no descendants on the
3824 same branch. They are where development generally takes place and
3824 same branch. They are where development generally takes place and
3825 are the usual targets for update and merge operations.
3825 are the usual targets for update and merge operations.
3826
3826
3827 If one or more REVs are given, only open branch heads on the
3827 If one or more REVs are given, only open branch heads on the
3828 branches associated with the specified changesets are shown. This
3828 branches associated with the specified changesets are shown. This
3829 means that you can use :hg:`heads .` to see the heads on the
3829 means that you can use :hg:`heads .` to see the heads on the
3830 currently checked-out branch.
3830 currently checked-out branch.
3831
3831
3832 If -c/--closed is specified, also show branch heads marked closed
3832 If -c/--closed is specified, also show branch heads marked closed
3833 (see :hg:`commit --close-branch`).
3833 (see :hg:`commit --close-branch`).
3834
3834
3835 If STARTREV is specified, only those heads that are descendants of
3835 If STARTREV is specified, only those heads that are descendants of
3836 STARTREV will be displayed.
3836 STARTREV will be displayed.
3837
3837
3838 If -t/--topo is specified, named branch mechanics will be ignored and only
3838 If -t/--topo is specified, named branch mechanics will be ignored and only
3839 topological heads (changesets with no children) will be shown.
3839 topological heads (changesets with no children) will be shown.
3840
3840
3841 Returns 0 if matching heads are found, 1 if not.
3841 Returns 0 if matching heads are found, 1 if not.
3842 """
3842 """
3843
3843
3844 start = None
3844 start = None
3845 if 'rev' in opts:
3845 if 'rev' in opts:
3846 start = scmutil.revsingle(repo, opts['rev'], None).node()
3846 start = scmutil.revsingle(repo, opts['rev'], None).node()
3847
3847
3848 if opts.get('topo'):
3848 if opts.get('topo'):
3849 heads = [repo[h] for h in repo.heads(start)]
3849 heads = [repo[h] for h in repo.heads(start)]
3850 else:
3850 else:
3851 heads = []
3851 heads = []
3852 for branch in repo.branchmap():
3852 for branch in repo.branchmap():
3853 heads += repo.branchheads(branch, start, opts.get('closed'))
3853 heads += repo.branchheads(branch, start, opts.get('closed'))
3854 heads = [repo[h] for h in heads]
3854 heads = [repo[h] for h in heads]
3855
3855
3856 if branchrevs:
3856 if branchrevs:
3857 branches = set(repo[br].branch() for br in branchrevs)
3857 branches = set(repo[br].branch() for br in branchrevs)
3858 heads = [h for h in heads if h.branch() in branches]
3858 heads = [h for h in heads if h.branch() in branches]
3859
3859
3860 if opts.get('active') and branchrevs:
3860 if opts.get('active') and branchrevs:
3861 dagheads = repo.heads(start)
3861 dagheads = repo.heads(start)
3862 heads = [h for h in heads if h.node() in dagheads]
3862 heads = [h for h in heads if h.node() in dagheads]
3863
3863
3864 if branchrevs:
3864 if branchrevs:
3865 haveheads = set(h.branch() for h in heads)
3865 haveheads = set(h.branch() for h in heads)
3866 if branches - haveheads:
3866 if branches - haveheads:
3867 headless = ', '.join(b for b in branches - haveheads)
3867 headless = ', '.join(b for b in branches - haveheads)
3868 msg = _('no open branch heads found on branches %s')
3868 msg = _('no open branch heads found on branches %s')
3869 if opts.get('rev'):
3869 if opts.get('rev'):
3870 msg += _(' (started at %s)') % opts['rev']
3870 msg += _(' (started at %s)') % opts['rev']
3871 ui.warn((msg + '\n') % headless)
3871 ui.warn((msg + '\n') % headless)
3872
3872
3873 if not heads:
3873 if not heads:
3874 return 1
3874 return 1
3875
3875
3876 heads = sorted(heads, key=lambda x: -x.rev())
3876 heads = sorted(heads, key=lambda x: -x.rev())
3877 displayer = cmdutil.show_changeset(ui, repo, opts)
3877 displayer = cmdutil.show_changeset(ui, repo, opts)
3878 for ctx in heads:
3878 for ctx in heads:
3879 displayer.show(ctx)
3879 displayer.show(ctx)
3880 displayer.close()
3880 displayer.close()
3881
3881
3882 @command('help',
3882 @command('help',
3883 [('e', 'extension', None, _('show only help for extensions')),
3883 [('e', 'extension', None, _('show only help for extensions')),
3884 ('c', 'command', None, _('show only help for commands')),
3884 ('c', 'command', None, _('show only help for commands')),
3885 ('k', 'keyword', None, _('show topics matching keyword')),
3885 ('k', 'keyword', None, _('show topics matching keyword')),
3886 ('s', 'system', [], _('show help for specific platform(s)')),
3886 ('s', 'system', [], _('show help for specific platform(s)')),
3887 ],
3887 ],
3888 _('[-ecks] [TOPIC]'),
3888 _('[-ecks] [TOPIC]'),
3889 norepo=True)
3889 norepo=True)
3890 def help_(ui, name=None, **opts):
3890 def help_(ui, name=None, **opts):
3891 """show help for a given topic or a help overview
3891 """show help for a given topic or a help overview
3892
3892
3893 With no arguments, print a list of commands with short help messages.
3893 With no arguments, print a list of commands with short help messages.
3894
3894
3895 Given a topic, extension, or command name, print help for that
3895 Given a topic, extension, or command name, print help for that
3896 topic.
3896 topic.
3897
3897
3898 Returns 0 if successful.
3898 Returns 0 if successful.
3899 """
3899 """
3900
3900
3901 textwidth = ui.configint('ui', 'textwidth', 78)
3901 textwidth = ui.configint('ui', 'textwidth', 78)
3902 termwidth = ui.termwidth() - 2
3902 termwidth = ui.termwidth() - 2
3903 if textwidth <= 0 or termwidth < textwidth:
3903 if textwidth <= 0 or termwidth < textwidth:
3904 textwidth = termwidth
3904 textwidth = termwidth
3905
3905
3906 keep = opts.get('system') or []
3906 keep = opts.get('system') or []
3907 if len(keep) == 0:
3907 if len(keep) == 0:
3908 if pycompat.sysplatform.startswith('win'):
3908 if pycompat.sysplatform.startswith('win'):
3909 keep.append('windows')
3909 keep.append('windows')
3910 elif pycompat.sysplatform == 'OpenVMS':
3910 elif pycompat.sysplatform == 'OpenVMS':
3911 keep.append('vms')
3911 keep.append('vms')
3912 elif pycompat.sysplatform == 'plan9':
3912 elif pycompat.sysplatform == 'plan9':
3913 keep.append('plan9')
3913 keep.append('plan9')
3914 else:
3914 else:
3915 keep.append('unix')
3915 keep.append('unix')
3916 keep.append(pycompat.sysplatform.lower())
3916 keep.append(pycompat.sysplatform.lower())
3917 if ui.verbose:
3917 if ui.verbose:
3918 keep.append('verbose')
3918 keep.append('verbose')
3919
3919
3920 fullname = name
3920 fullname = name
3921 section = None
3921 section = None
3922 subtopic = None
3922 subtopic = None
3923 if name and '.' in name:
3923 if name and '.' in name:
3924 name, remaining = name.split('.', 1)
3924 name, remaining = name.split('.', 1)
3925 remaining = encoding.lower(remaining)
3925 remaining = encoding.lower(remaining)
3926 if '.' in remaining:
3926 if '.' in remaining:
3927 subtopic, section = remaining.split('.', 1)
3927 subtopic, section = remaining.split('.', 1)
3928 else:
3928 else:
3929 if name in help.subtopics:
3929 if name in help.subtopics:
3930 subtopic = remaining
3930 subtopic = remaining
3931 else:
3931 else:
3932 section = remaining
3932 section = remaining
3933
3933
3934 text = help.help_(ui, name, subtopic=subtopic, **opts)
3934 text = help.help_(ui, name, subtopic=subtopic, **opts)
3935
3935
3936 formatted, pruned = minirst.format(text, textwidth, keep=keep,
3936 formatted, pruned = minirst.format(text, textwidth, keep=keep,
3937 section=section)
3937 section=section)
3938
3938
3939 # We could have been given a weird ".foo" section without a name
3939 # We could have been given a weird ".foo" section without a name
3940 # to look for, or we could have simply failed to found "foo.bar"
3940 # to look for, or we could have simply failed to found "foo.bar"
3941 # because bar isn't a section of foo
3941 # because bar isn't a section of foo
3942 if section and not (formatted and name):
3942 if section and not (formatted and name):
3943 raise error.Abort(_("help section not found: %s") % fullname)
3943 raise error.Abort(_("help section not found: %s") % fullname)
3944
3944
3945 if 'verbose' in pruned:
3945 if 'verbose' in pruned:
3946 keep.append('omitted')
3946 keep.append('omitted')
3947 else:
3947 else:
3948 keep.append('notomitted')
3948 keep.append('notomitted')
3949 formatted, pruned = minirst.format(text, textwidth, keep=keep,
3949 formatted, pruned = minirst.format(text, textwidth, keep=keep,
3950 section=section)
3950 section=section)
3951 ui.write(formatted)
3951 ui.write(formatted)
3952
3952
3953
3953
3954 @command('identify|id',
3954 @command('identify|id',
3955 [('r', 'rev', '',
3955 [('r', 'rev', '',
3956 _('identify the specified revision'), _('REV')),
3956 _('identify the specified revision'), _('REV')),
3957 ('n', 'num', None, _('show local revision number')),
3957 ('n', 'num', None, _('show local revision number')),
3958 ('i', 'id', None, _('show global revision id')),
3958 ('i', 'id', None, _('show global revision id')),
3959 ('b', 'branch', None, _('show branch')),
3959 ('b', 'branch', None, _('show branch')),
3960 ('t', 'tags', None, _('show tags')),
3960 ('t', 'tags', None, _('show tags')),
3961 ('B', 'bookmarks', None, _('show bookmarks')),
3961 ('B', 'bookmarks', None, _('show bookmarks')),
3962 ] + remoteopts,
3962 ] + remoteopts,
3963 _('[-nibtB] [-r REV] [SOURCE]'),
3963 _('[-nibtB] [-r REV] [SOURCE]'),
3964 optionalrepo=True)
3964 optionalrepo=True)
3965 def identify(ui, repo, source=None, rev=None,
3965 def identify(ui, repo, source=None, rev=None,
3966 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
3966 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
3967 """identify the working directory or specified revision
3967 """identify the working directory or specified revision
3968
3968
3969 Print a summary identifying the repository state at REV using one or
3969 Print a summary identifying the repository state at REV using one or
3970 two parent hash identifiers, followed by a "+" if the working
3970 two parent hash identifiers, followed by a "+" if the working
3971 directory has uncommitted changes, the branch name (if not default),
3971 directory has uncommitted changes, the branch name (if not default),
3972 a list of tags, and a list of bookmarks.
3972 a list of tags, and a list of bookmarks.
3973
3973
3974 When REV is not given, print a summary of the current state of the
3974 When REV is not given, print a summary of the current state of the
3975 repository.
3975 repository.
3976
3976
3977 Specifying a path to a repository root or Mercurial bundle will
3977 Specifying a path to a repository root or Mercurial bundle will
3978 cause lookup to operate on that repository/bundle.
3978 cause lookup to operate on that repository/bundle.
3979
3979
3980 .. container:: verbose
3980 .. container:: verbose
3981
3981
3982 Examples:
3982 Examples:
3983
3983
3984 - generate a build identifier for the working directory::
3984 - generate a build identifier for the working directory::
3985
3985
3986 hg id --id > build-id.dat
3986 hg id --id > build-id.dat
3987
3987
3988 - find the revision corresponding to a tag::
3988 - find the revision corresponding to a tag::
3989
3989
3990 hg id -n -r 1.3
3990 hg id -n -r 1.3
3991
3991
3992 - check the most recent revision of a remote repository::
3992 - check the most recent revision of a remote repository::
3993
3993
3994 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3994 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3995
3995
3996 See :hg:`log` for generating more information about specific revisions,
3996 See :hg:`log` for generating more information about specific revisions,
3997 including full hash identifiers.
3997 including full hash identifiers.
3998
3998
3999 Returns 0 if successful.
3999 Returns 0 if successful.
4000 """
4000 """
4001
4001
4002 if not repo and not source:
4002 if not repo and not source:
4003 raise error.Abort(_("there is no Mercurial repository here "
4003 raise error.Abort(_("there is no Mercurial repository here "
4004 "(.hg not found)"))
4004 "(.hg not found)"))
4005
4005
4006 if ui.debugflag:
4006 if ui.debugflag:
4007 hexfunc = hex
4007 hexfunc = hex
4008 else:
4008 else:
4009 hexfunc = short
4009 hexfunc = short
4010 default = not (num or id or branch or tags or bookmarks)
4010 default = not (num or id or branch or tags or bookmarks)
4011 output = []
4011 output = []
4012 revs = []
4012 revs = []
4013
4013
4014 if source:
4014 if source:
4015 source, branches = hg.parseurl(ui.expandpath(source))
4015 source, branches = hg.parseurl(ui.expandpath(source))
4016 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
4016 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
4017 repo = peer.local()
4017 repo = peer.local()
4018 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
4018 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
4019
4019
4020 if not repo:
4020 if not repo:
4021 if num or branch or tags:
4021 if num or branch or tags:
4022 raise error.Abort(
4022 raise error.Abort(
4023 _("can't query remote revision number, branch, or tags"))
4023 _("can't query remote revision number, branch, or tags"))
4024 if not rev and revs:
4024 if not rev and revs:
4025 rev = revs[0]
4025 rev = revs[0]
4026 if not rev:
4026 if not rev:
4027 rev = "tip"
4027 rev = "tip"
4028
4028
4029 remoterev = peer.lookup(rev)
4029 remoterev = peer.lookup(rev)
4030 if default or id:
4030 if default or id:
4031 output = [hexfunc(remoterev)]
4031 output = [hexfunc(remoterev)]
4032
4032
4033 def getbms():
4033 def getbms():
4034 bms = []
4034 bms = []
4035
4035
4036 if 'bookmarks' in peer.listkeys('namespaces'):
4036 if 'bookmarks' in peer.listkeys('namespaces'):
4037 hexremoterev = hex(remoterev)
4037 hexremoterev = hex(remoterev)
4038 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
4038 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
4039 if bmr == hexremoterev]
4039 if bmr == hexremoterev]
4040
4040
4041 return sorted(bms)
4041 return sorted(bms)
4042
4042
4043 if bookmarks:
4043 if bookmarks:
4044 output.extend(getbms())
4044 output.extend(getbms())
4045 elif default and not ui.quiet:
4045 elif default and not ui.quiet:
4046 # multiple bookmarks for a single parent separated by '/'
4046 # multiple bookmarks for a single parent separated by '/'
4047 bm = '/'.join(getbms())
4047 bm = '/'.join(getbms())
4048 if bm:
4048 if bm:
4049 output.append(bm)
4049 output.append(bm)
4050 else:
4050 else:
4051 ctx = scmutil.revsingle(repo, rev, None)
4051 ctx = scmutil.revsingle(repo, rev, None)
4052
4052
4053 if ctx.rev() is None:
4053 if ctx.rev() is None:
4054 ctx = repo[None]
4054 ctx = repo[None]
4055 parents = ctx.parents()
4055 parents = ctx.parents()
4056 taglist = []
4056 taglist = []
4057 for p in parents:
4057 for p in parents:
4058 taglist.extend(p.tags())
4058 taglist.extend(p.tags())
4059
4059
4060 changed = ""
4060 changed = ""
4061 if default or id or num:
4061 if default or id or num:
4062 if (any(repo.status())
4062 if (any(repo.status())
4063 or any(ctx.sub(s).dirty() for s in ctx.substate)):
4063 or any(ctx.sub(s).dirty() for s in ctx.substate)):
4064 changed = '+'
4064 changed = '+'
4065 if default or id:
4065 if default or id:
4066 output = ["%s%s" %
4066 output = ["%s%s" %
4067 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
4067 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
4068 if num:
4068 if num:
4069 output.append("%s%s" %
4069 output.append("%s%s" %
4070 ('+'.join([str(p.rev()) for p in parents]), changed))
4070 ('+'.join([str(p.rev()) for p in parents]), changed))
4071 else:
4071 else:
4072 if default or id:
4072 if default or id:
4073 output = [hexfunc(ctx.node())]
4073 output = [hexfunc(ctx.node())]
4074 if num:
4074 if num:
4075 output.append(str(ctx.rev()))
4075 output.append(str(ctx.rev()))
4076 taglist = ctx.tags()
4076 taglist = ctx.tags()
4077
4077
4078 if default and not ui.quiet:
4078 if default and not ui.quiet:
4079 b = ctx.branch()
4079 b = ctx.branch()
4080 if b != 'default':
4080 if b != 'default':
4081 output.append("(%s)" % b)
4081 output.append("(%s)" % b)
4082
4082
4083 # multiple tags for a single parent separated by '/'
4083 # multiple tags for a single parent separated by '/'
4084 t = '/'.join(taglist)
4084 t = '/'.join(taglist)
4085 if t:
4085 if t:
4086 output.append(t)
4086 output.append(t)
4087
4087
4088 # multiple bookmarks for a single parent separated by '/'
4088 # multiple bookmarks for a single parent separated by '/'
4089 bm = '/'.join(ctx.bookmarks())
4089 bm = '/'.join(ctx.bookmarks())
4090 if bm:
4090 if bm:
4091 output.append(bm)
4091 output.append(bm)
4092 else:
4092 else:
4093 if branch:
4093 if branch:
4094 output.append(ctx.branch())
4094 output.append(ctx.branch())
4095
4095
4096 if tags:
4096 if tags:
4097 output.extend(taglist)
4097 output.extend(taglist)
4098
4098
4099 if bookmarks:
4099 if bookmarks:
4100 output.extend(ctx.bookmarks())
4100 output.extend(ctx.bookmarks())
4101
4101
4102 ui.write("%s\n" % ' '.join(output))
4102 ui.write("%s\n" % ' '.join(output))
4103
4103
4104 @command('import|patch',
4104 @command('import|patch',
4105 [('p', 'strip', 1,
4105 [('p', 'strip', 1,
4106 _('directory strip option for patch. This has the same '
4106 _('directory strip option for patch. This has the same '
4107 'meaning as the corresponding patch option'), _('NUM')),
4107 'meaning as the corresponding patch option'), _('NUM')),
4108 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
4108 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
4109 ('e', 'edit', False, _('invoke editor on commit messages')),
4109 ('e', 'edit', False, _('invoke editor on commit messages')),
4110 ('f', 'force', None,
4110 ('f', 'force', None,
4111 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
4111 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
4112 ('', 'no-commit', None,
4112 ('', 'no-commit', None,
4113 _("don't commit, just update the working directory")),
4113 _("don't commit, just update the working directory")),
4114 ('', 'bypass', None,
4114 ('', 'bypass', None,
4115 _("apply patch without touching the working directory")),
4115 _("apply patch without touching the working directory")),
4116 ('', 'partial', None,
4116 ('', 'partial', None,
4117 _('commit even if some hunks fail')),
4117 _('commit even if some hunks fail')),
4118 ('', 'exact', None,
4118 ('', 'exact', None,
4119 _('abort if patch would apply lossily')),
4119 _('abort if patch would apply lossily')),
4120 ('', 'prefix', '',
4120 ('', 'prefix', '',
4121 _('apply patch to subdirectory'), _('DIR')),
4121 _('apply patch to subdirectory'), _('DIR')),
4122 ('', 'import-branch', None,
4122 ('', 'import-branch', None,
4123 _('use any branch information in patch (implied by --exact)'))] +
4123 _('use any branch information in patch (implied by --exact)'))] +
4124 commitopts + commitopts2 + similarityopts,
4124 commitopts + commitopts2 + similarityopts,
4125 _('[OPTION]... PATCH...'))
4125 _('[OPTION]... PATCH...'))
4126 def import_(ui, repo, patch1=None, *patches, **opts):
4126 def import_(ui, repo, patch1=None, *patches, **opts):
4127 """import an ordered set of patches
4127 """import an ordered set of patches
4128
4128
4129 Import a list of patches and commit them individually (unless
4129 Import a list of patches and commit them individually (unless
4130 --no-commit is specified).
4130 --no-commit is specified).
4131
4131
4132 To read a patch from standard input, use "-" as the patch name. If
4132 To read a patch from standard input, use "-" as the patch name. If
4133 a URL is specified, the patch will be downloaded from there.
4133 a URL is specified, the patch will be downloaded from there.
4134
4134
4135 Import first applies changes to the working directory (unless
4135 Import first applies changes to the working directory (unless
4136 --bypass is specified), import will abort if there are outstanding
4136 --bypass is specified), import will abort if there are outstanding
4137 changes.
4137 changes.
4138
4138
4139 Use --bypass to apply and commit patches directly to the
4139 Use --bypass to apply and commit patches directly to the
4140 repository, without affecting the working directory. Without
4140 repository, without affecting the working directory. Without
4141 --exact, patches will be applied on top of the working directory
4141 --exact, patches will be applied on top of the working directory
4142 parent revision.
4142 parent revision.
4143
4143
4144 You can import a patch straight from a mail message. Even patches
4144 You can import a patch straight from a mail message. Even patches
4145 as attachments work (to use the body part, it must have type
4145 as attachments work (to use the body part, it must have type
4146 text/plain or text/x-patch). From and Subject headers of email
4146 text/plain or text/x-patch). From and Subject headers of email
4147 message are used as default committer and commit message. All
4147 message are used as default committer and commit message. All
4148 text/plain body parts before first diff are added to the commit
4148 text/plain body parts before first diff are added to the commit
4149 message.
4149 message.
4150
4150
4151 If the imported patch was generated by :hg:`export`, user and
4151 If the imported patch was generated by :hg:`export`, user and
4152 description from patch override values from message headers and
4152 description from patch override values from message headers and
4153 body. Values given on command line with -m/--message and -u/--user
4153 body. Values given on command line with -m/--message and -u/--user
4154 override these.
4154 override these.
4155
4155
4156 If --exact is specified, import will set the working directory to
4156 If --exact is specified, import will set the working directory to
4157 the parent of each patch before applying it, and will abort if the
4157 the parent of each patch before applying it, and will abort if the
4158 resulting changeset has a different ID than the one recorded in
4158 resulting changeset has a different ID than the one recorded in
4159 the patch. This will guard against various ways that portable
4159 the patch. This will guard against various ways that portable
4160 patch formats and mail systems might fail to transfer Mercurial
4160 patch formats and mail systems might fail to transfer Mercurial
4161 data or metadata. See :hg:`bundle` for lossless transmission.
4161 data or metadata. See :hg:`bundle` for lossless transmission.
4162
4162
4163 Use --partial to ensure a changeset will be created from the patch
4163 Use --partial to ensure a changeset will be created from the patch
4164 even if some hunks fail to apply. Hunks that fail to apply will be
4164 even if some hunks fail to apply. Hunks that fail to apply will be
4165 written to a <target-file>.rej file. Conflicts can then be resolved
4165 written to a <target-file>.rej file. Conflicts can then be resolved
4166 by hand before :hg:`commit --amend` is run to update the created
4166 by hand before :hg:`commit --amend` is run to update the created
4167 changeset. This flag exists to let people import patches that
4167 changeset. This flag exists to let people import patches that
4168 partially apply without losing the associated metadata (author,
4168 partially apply without losing the associated metadata (author,
4169 date, description, ...).
4169 date, description, ...).
4170
4170
4171 .. note::
4171 .. note::
4172
4172
4173 When no hunks apply cleanly, :hg:`import --partial` will create
4173 When no hunks apply cleanly, :hg:`import --partial` will create
4174 an empty changeset, importing only the patch metadata.
4174 an empty changeset, importing only the patch metadata.
4175
4175
4176 With -s/--similarity, hg will attempt to discover renames and
4176 With -s/--similarity, hg will attempt to discover renames and
4177 copies in the patch in the same way as :hg:`addremove`.
4177 copies in the patch in the same way as :hg:`addremove`.
4178
4178
4179 It is possible to use external patch programs to perform the patch
4179 It is possible to use external patch programs to perform the patch
4180 by setting the ``ui.patch`` configuration option. For the default
4180 by setting the ``ui.patch`` configuration option. For the default
4181 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4181 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4182 See :hg:`help config` for more information about configuration
4182 See :hg:`help config` for more information about configuration
4183 files and how to use these options.
4183 files and how to use these options.
4184
4184
4185 See :hg:`help dates` for a list of formats valid for -d/--date.
4185 See :hg:`help dates` for a list of formats valid for -d/--date.
4186
4186
4187 .. container:: verbose
4187 .. container:: verbose
4188
4188
4189 Examples:
4189 Examples:
4190
4190
4191 - import a traditional patch from a website and detect renames::
4191 - import a traditional patch from a website and detect renames::
4192
4192
4193 hg import -s 80 http://example.com/bugfix.patch
4193 hg import -s 80 http://example.com/bugfix.patch
4194
4194
4195 - import a changeset from an hgweb server::
4195 - import a changeset from an hgweb server::
4196
4196
4197 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4197 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4198
4198
4199 - import all the patches in an Unix-style mbox::
4199 - import all the patches in an Unix-style mbox::
4200
4200
4201 hg import incoming-patches.mbox
4201 hg import incoming-patches.mbox
4202
4202
4203 - attempt to exactly restore an exported changeset (not always
4203 - attempt to exactly restore an exported changeset (not always
4204 possible)::
4204 possible)::
4205
4205
4206 hg import --exact proposed-fix.patch
4206 hg import --exact proposed-fix.patch
4207
4207
4208 - use an external tool to apply a patch which is too fuzzy for
4208 - use an external tool to apply a patch which is too fuzzy for
4209 the default internal tool.
4209 the default internal tool.
4210
4210
4211 hg import --config ui.patch="patch --merge" fuzzy.patch
4211 hg import --config ui.patch="patch --merge" fuzzy.patch
4212
4212
4213 - change the default fuzzing from 2 to a less strict 7
4213 - change the default fuzzing from 2 to a less strict 7
4214
4214
4215 hg import --config ui.fuzz=7 fuzz.patch
4215 hg import --config ui.fuzz=7 fuzz.patch
4216
4216
4217 Returns 0 on success, 1 on partial success (see --partial).
4217 Returns 0 on success, 1 on partial success (see --partial).
4218 """
4218 """
4219
4219
4220 if not patch1:
4220 if not patch1:
4221 raise error.Abort(_('need at least one patch to import'))
4221 raise error.Abort(_('need at least one patch to import'))
4222
4222
4223 patches = (patch1,) + patches
4223 patches = (patch1,) + patches
4224
4224
4225 date = opts.get('date')
4225 date = opts.get('date')
4226 if date:
4226 if date:
4227 opts['date'] = util.parsedate(date)
4227 opts['date'] = util.parsedate(date)
4228
4228
4229 exact = opts.get('exact')
4229 exact = opts.get('exact')
4230 update = not opts.get('bypass')
4230 update = not opts.get('bypass')
4231 if not update and opts.get('no_commit'):
4231 if not update and opts.get('no_commit'):
4232 raise error.Abort(_('cannot use --no-commit with --bypass'))
4232 raise error.Abort(_('cannot use --no-commit with --bypass'))
4233 try:
4233 try:
4234 sim = float(opts.get('similarity') or 0)
4234 sim = float(opts.get('similarity') or 0)
4235 except ValueError:
4235 except ValueError:
4236 raise error.Abort(_('similarity must be a number'))
4236 raise error.Abort(_('similarity must be a number'))
4237 if sim < 0 or sim > 100:
4237 if sim < 0 or sim > 100:
4238 raise error.Abort(_('similarity must be between 0 and 100'))
4238 raise error.Abort(_('similarity must be between 0 and 100'))
4239 if sim and not update:
4239 if sim and not update:
4240 raise error.Abort(_('cannot use --similarity with --bypass'))
4240 raise error.Abort(_('cannot use --similarity with --bypass'))
4241 if exact:
4241 if exact:
4242 if opts.get('edit'):
4242 if opts.get('edit'):
4243 raise error.Abort(_('cannot use --exact with --edit'))
4243 raise error.Abort(_('cannot use --exact with --edit'))
4244 if opts.get('prefix'):
4244 if opts.get('prefix'):
4245 raise error.Abort(_('cannot use --exact with --prefix'))
4245 raise error.Abort(_('cannot use --exact with --prefix'))
4246
4246
4247 base = opts["base"]
4247 base = opts["base"]
4248 wlock = dsguard = lock = tr = None
4248 wlock = dsguard = lock = tr = None
4249 msgs = []
4249 msgs = []
4250 ret = 0
4250 ret = 0
4251
4251
4252
4252
4253 try:
4253 try:
4254 wlock = repo.wlock()
4254 wlock = repo.wlock()
4255
4255
4256 if update:
4256 if update:
4257 cmdutil.checkunfinished(repo)
4257 cmdutil.checkunfinished(repo)
4258 if (exact or not opts.get('force')):
4258 if (exact or not opts.get('force')):
4259 cmdutil.bailifchanged(repo)
4259 cmdutil.bailifchanged(repo)
4260
4260
4261 if not opts.get('no_commit'):
4261 if not opts.get('no_commit'):
4262 lock = repo.lock()
4262 lock = repo.lock()
4263 tr = repo.transaction('import')
4263 tr = repo.transaction('import')
4264 else:
4264 else:
4265 dsguard = dirstateguard.dirstateguard(repo, 'import')
4265 dsguard = dirstateguard.dirstateguard(repo, 'import')
4266 parents = repo[None].parents()
4266 parents = repo[None].parents()
4267 for patchurl in patches:
4267 for patchurl in patches:
4268 if patchurl == '-':
4268 if patchurl == '-':
4269 ui.status(_('applying patch from stdin\n'))
4269 ui.status(_('applying patch from stdin\n'))
4270 patchfile = ui.fin
4270 patchfile = ui.fin
4271 patchurl = 'stdin' # for error message
4271 patchurl = 'stdin' # for error message
4272 else:
4272 else:
4273 patchurl = os.path.join(base, patchurl)
4273 patchurl = os.path.join(base, patchurl)
4274 ui.status(_('applying %s\n') % patchurl)
4274 ui.status(_('applying %s\n') % patchurl)
4275 patchfile = hg.openpath(ui, patchurl)
4275 patchfile = hg.openpath(ui, patchurl)
4276
4276
4277 haspatch = False
4277 haspatch = False
4278 for hunk in patch.split(patchfile):
4278 for hunk in patch.split(patchfile):
4279 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
4279 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
4280 parents, opts,
4280 parents, opts,
4281 msgs, hg.clean)
4281 msgs, hg.clean)
4282 if msg:
4282 if msg:
4283 haspatch = True
4283 haspatch = True
4284 ui.note(msg + '\n')
4284 ui.note(msg + '\n')
4285 if update or exact:
4285 if update or exact:
4286 parents = repo[None].parents()
4286 parents = repo[None].parents()
4287 else:
4287 else:
4288 parents = [repo[node]]
4288 parents = [repo[node]]
4289 if rej:
4289 if rej:
4290 ui.write_err(_("patch applied partially\n"))
4290 ui.write_err(_("patch applied partially\n"))
4291 ui.write_err(_("(fix the .rej files and run "
4291 ui.write_err(_("(fix the .rej files and run "
4292 "`hg commit --amend`)\n"))
4292 "`hg commit --amend`)\n"))
4293 ret = 1
4293 ret = 1
4294 break
4294 break
4295
4295
4296 if not haspatch:
4296 if not haspatch:
4297 raise error.Abort(_('%s: no diffs found') % patchurl)
4297 raise error.Abort(_('%s: no diffs found') % patchurl)
4298
4298
4299 if tr:
4299 if tr:
4300 tr.close()
4300 tr.close()
4301 if msgs:
4301 if msgs:
4302 repo.savecommitmessage('\n* * *\n'.join(msgs))
4302 repo.savecommitmessage('\n* * *\n'.join(msgs))
4303 if dsguard:
4303 if dsguard:
4304 dsguard.close()
4304 dsguard.close()
4305 return ret
4305 return ret
4306 finally:
4306 finally:
4307 if tr:
4307 if tr:
4308 tr.release()
4308 tr.release()
4309 release(lock, dsguard, wlock)
4309 release(lock, dsguard, wlock)
4310
4310
4311 @command('incoming|in',
4311 @command('incoming|in',
4312 [('f', 'force', None,
4312 [('f', 'force', None,
4313 _('run even if remote repository is unrelated')),
4313 _('run even if remote repository is unrelated')),
4314 ('n', 'newest-first', None, _('show newest record first')),
4314 ('n', 'newest-first', None, _('show newest record first')),
4315 ('', 'bundle', '',
4315 ('', 'bundle', '',
4316 _('file to store the bundles into'), _('FILE')),
4316 _('file to store the bundles into'), _('FILE')),
4317 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4317 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4318 ('B', 'bookmarks', False, _("compare bookmarks")),
4318 ('B', 'bookmarks', False, _("compare bookmarks")),
4319 ('b', 'branch', [],
4319 ('b', 'branch', [],
4320 _('a specific branch you would like to pull'), _('BRANCH')),
4320 _('a specific branch you would like to pull'), _('BRANCH')),
4321 ] + logopts + remoteopts + subrepoopts,
4321 ] + logopts + remoteopts + subrepoopts,
4322 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
4322 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
4323 def incoming(ui, repo, source="default", **opts):
4323 def incoming(ui, repo, source="default", **opts):
4324 """show new changesets found in source
4324 """show new changesets found in source
4325
4325
4326 Show new changesets found in the specified path/URL or the default
4326 Show new changesets found in the specified path/URL or the default
4327 pull location. These are the changesets that would have been pulled
4327 pull location. These are the changesets that would have been pulled
4328 if a pull at the time you issued this command.
4328 if a pull at the time you issued this command.
4329
4329
4330 See pull for valid source format details.
4330 See pull for valid source format details.
4331
4331
4332 .. container:: verbose
4332 .. container:: verbose
4333
4333
4334 With -B/--bookmarks, the result of bookmark comparison between
4334 With -B/--bookmarks, the result of bookmark comparison between
4335 local and remote repositories is displayed. With -v/--verbose,
4335 local and remote repositories is displayed. With -v/--verbose,
4336 status is also displayed for each bookmark like below::
4336 status is also displayed for each bookmark like below::
4337
4337
4338 BM1 01234567890a added
4338 BM1 01234567890a added
4339 BM2 1234567890ab advanced
4339 BM2 1234567890ab advanced
4340 BM3 234567890abc diverged
4340 BM3 234567890abc diverged
4341 BM4 34567890abcd changed
4341 BM4 34567890abcd changed
4342
4342
4343 The action taken locally when pulling depends on the
4343 The action taken locally when pulling depends on the
4344 status of each bookmark:
4344 status of each bookmark:
4345
4345
4346 :``added``: pull will create it
4346 :``added``: pull will create it
4347 :``advanced``: pull will update it
4347 :``advanced``: pull will update it
4348 :``diverged``: pull will create a divergent bookmark
4348 :``diverged``: pull will create a divergent bookmark
4349 :``changed``: result depends on remote changesets
4349 :``changed``: result depends on remote changesets
4350
4350
4351 From the point of view of pulling behavior, bookmark
4351 From the point of view of pulling behavior, bookmark
4352 existing only in the remote repository are treated as ``added``,
4352 existing only in the remote repository are treated as ``added``,
4353 even if it is in fact locally deleted.
4353 even if it is in fact locally deleted.
4354
4354
4355 .. container:: verbose
4355 .. container:: verbose
4356
4356
4357 For remote repository, using --bundle avoids downloading the
4357 For remote repository, using --bundle avoids downloading the
4358 changesets twice if the incoming is followed by a pull.
4358 changesets twice if the incoming is followed by a pull.
4359
4359
4360 Examples:
4360 Examples:
4361
4361
4362 - show incoming changes with patches and full description::
4362 - show incoming changes with patches and full description::
4363
4363
4364 hg incoming -vp
4364 hg incoming -vp
4365
4365
4366 - show incoming changes excluding merges, store a bundle::
4366 - show incoming changes excluding merges, store a bundle::
4367
4367
4368 hg in -vpM --bundle incoming.hg
4368 hg in -vpM --bundle incoming.hg
4369 hg pull incoming.hg
4369 hg pull incoming.hg
4370
4370
4371 - briefly list changes inside a bundle::
4371 - briefly list changes inside a bundle::
4372
4372
4373 hg in changes.hg -T "{desc|firstline}\\n"
4373 hg in changes.hg -T "{desc|firstline}\\n"
4374
4374
4375 Returns 0 if there are incoming changes, 1 otherwise.
4375 Returns 0 if there are incoming changes, 1 otherwise.
4376 """
4376 """
4377 if opts.get('graph'):
4377 if opts.get('graph'):
4378 cmdutil.checkunsupportedgraphflags([], opts)
4378 cmdutil.checkunsupportedgraphflags([], opts)
4379 def display(other, chlist, displayer):
4379 def display(other, chlist, displayer):
4380 revdag = cmdutil.graphrevs(other, chlist, opts)
4380 revdag = cmdutil.graphrevs(other, chlist, opts)
4381 cmdutil.displaygraph(ui, repo, revdag, displayer,
4381 cmdutil.displaygraph(ui, repo, revdag, displayer,
4382 graphmod.asciiedges)
4382 graphmod.asciiedges)
4383
4383
4384 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4384 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4385 return 0
4385 return 0
4386
4386
4387 if opts.get('bundle') and opts.get('subrepos'):
4387 if opts.get('bundle') and opts.get('subrepos'):
4388 raise error.Abort(_('cannot combine --bundle and --subrepos'))
4388 raise error.Abort(_('cannot combine --bundle and --subrepos'))
4389
4389
4390 if opts.get('bookmarks'):
4390 if opts.get('bookmarks'):
4391 source, branches = hg.parseurl(ui.expandpath(source),
4391 source, branches = hg.parseurl(ui.expandpath(source),
4392 opts.get('branch'))
4392 opts.get('branch'))
4393 other = hg.peer(repo, opts, source)
4393 other = hg.peer(repo, opts, source)
4394 if 'bookmarks' not in other.listkeys('namespaces'):
4394 if 'bookmarks' not in other.listkeys('namespaces'):
4395 ui.warn(_("remote doesn't support bookmarks\n"))
4395 ui.warn(_("remote doesn't support bookmarks\n"))
4396 return 0
4396 return 0
4397 ui.status(_('comparing with %s\n') % util.hidepassword(source))
4397 ui.status(_('comparing with %s\n') % util.hidepassword(source))
4398 return bookmarks.incoming(ui, repo, other)
4398 return bookmarks.incoming(ui, repo, other)
4399
4399
4400 repo._subtoppath = ui.expandpath(source)
4400 repo._subtoppath = ui.expandpath(source)
4401 try:
4401 try:
4402 return hg.incoming(ui, repo, source, opts)
4402 return hg.incoming(ui, repo, source, opts)
4403 finally:
4403 finally:
4404 del repo._subtoppath
4404 del repo._subtoppath
4405
4405
4406
4406
4407 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
4407 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
4408 norepo=True)
4408 norepo=True)
4409 def init(ui, dest=".", **opts):
4409 def init(ui, dest=".", **opts):
4410 """create a new repository in the given directory
4410 """create a new repository in the given directory
4411
4411
4412 Initialize a new repository in the given directory. If the given
4412 Initialize a new repository in the given directory. If the given
4413 directory does not exist, it will be created.
4413 directory does not exist, it will be created.
4414
4414
4415 If no directory is given, the current directory is used.
4415 If no directory is given, the current directory is used.
4416
4416
4417 It is possible to specify an ``ssh://`` URL as the destination.
4417 It is possible to specify an ``ssh://`` URL as the destination.
4418 See :hg:`help urls` for more information.
4418 See :hg:`help urls` for more information.
4419
4419
4420 Returns 0 on success.
4420 Returns 0 on success.
4421 """
4421 """
4422 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4422 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4423
4423
4424 @command('locate',
4424 @command('locate',
4425 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
4425 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
4426 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4426 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4427 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
4427 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
4428 ] + walkopts,
4428 ] + walkopts,
4429 _('[OPTION]... [PATTERN]...'))
4429 _('[OPTION]... [PATTERN]...'))
4430 def locate(ui, repo, *pats, **opts):
4430 def locate(ui, repo, *pats, **opts):
4431 """locate files matching specific patterns (DEPRECATED)
4431 """locate files matching specific patterns (DEPRECATED)
4432
4432
4433 Print files under Mercurial control in the working directory whose
4433 Print files under Mercurial control in the working directory whose
4434 names match the given patterns.
4434 names match the given patterns.
4435
4435
4436 By default, this command searches all directories in the working
4436 By default, this command searches all directories in the working
4437 directory. To search just the current directory and its
4437 directory. To search just the current directory and its
4438 subdirectories, use "--include .".
4438 subdirectories, use "--include .".
4439
4439
4440 If no patterns are given to match, this command prints the names
4440 If no patterns are given to match, this command prints the names
4441 of all files under Mercurial control in the working directory.
4441 of all files under Mercurial control in the working directory.
4442
4442
4443 If you want to feed the output of this command into the "xargs"
4443 If you want to feed the output of this command into the "xargs"
4444 command, use the -0 option to both this command and "xargs". This
4444 command, use the -0 option to both this command and "xargs". This
4445 will avoid the problem of "xargs" treating single filenames that
4445 will avoid the problem of "xargs" treating single filenames that
4446 contain whitespace as multiple filenames.
4446 contain whitespace as multiple filenames.
4447
4447
4448 See :hg:`help files` for a more versatile command.
4448 See :hg:`help files` for a more versatile command.
4449
4449
4450 Returns 0 if a match is found, 1 otherwise.
4450 Returns 0 if a match is found, 1 otherwise.
4451 """
4451 """
4452 if opts.get('print0'):
4452 if opts.get('print0'):
4453 end = '\0'
4453 end = '\0'
4454 else:
4454 else:
4455 end = '\n'
4455 end = '\n'
4456 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
4456 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
4457
4457
4458 ret = 1
4458 ret = 1
4459 ctx = repo[rev]
4459 ctx = repo[rev]
4460 m = scmutil.match(ctx, pats, opts, default='relglob',
4460 m = scmutil.match(ctx, pats, opts, default='relglob',
4461 badfn=lambda x, y: False)
4461 badfn=lambda x, y: False)
4462
4462
4463 for abs in ctx.matches(m):
4463 for abs in ctx.matches(m):
4464 if opts.get('fullpath'):
4464 if opts.get('fullpath'):
4465 ui.write(repo.wjoin(abs), end)
4465 ui.write(repo.wjoin(abs), end)
4466 else:
4466 else:
4467 ui.write(((pats and m.rel(abs)) or abs), end)
4467 ui.write(((pats and m.rel(abs)) or abs), end)
4468 ret = 0
4468 ret = 0
4469
4469
4470 return ret
4470 return ret
4471
4471
4472 @command('^log|history',
4472 @command('^log|history',
4473 [('f', 'follow', None,
4473 [('f', 'follow', None,
4474 _('follow changeset history, or file history across copies and renames')),
4474 _('follow changeset history, or file history across copies and renames')),
4475 ('', 'follow-first', None,
4475 ('', 'follow-first', None,
4476 _('only follow the first parent of merge changesets (DEPRECATED)')),
4476 _('only follow the first parent of merge changesets (DEPRECATED)')),
4477 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
4477 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
4478 ('C', 'copies', None, _('show copied files')),
4478 ('C', 'copies', None, _('show copied files')),
4479 ('k', 'keyword', [],
4479 ('k', 'keyword', [],
4480 _('do case-insensitive search for a given text'), _('TEXT')),
4480 _('do case-insensitive search for a given text'), _('TEXT')),
4481 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
4481 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
4482 ('', 'removed', None, _('include revisions where files were removed')),
4482 ('', 'removed', None, _('include revisions where files were removed')),
4483 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
4483 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
4484 ('u', 'user', [], _('revisions committed by user'), _('USER')),
4484 ('u', 'user', [], _('revisions committed by user'), _('USER')),
4485 ('', 'only-branch', [],
4485 ('', 'only-branch', [],
4486 _('show only changesets within the given named branch (DEPRECATED)'),
4486 _('show only changesets within the given named branch (DEPRECATED)'),
4487 _('BRANCH')),
4487 _('BRANCH')),
4488 ('b', 'branch', [],
4488 ('b', 'branch', [],
4489 _('show changesets within the given named branch'), _('BRANCH')),
4489 _('show changesets within the given named branch'), _('BRANCH')),
4490 ('P', 'prune', [],
4490 ('P', 'prune', [],
4491 _('do not display revision or any of its ancestors'), _('REV')),
4491 _('do not display revision or any of its ancestors'), _('REV')),
4492 ] + logopts + walkopts,
4492 ] + logopts + walkopts,
4493 _('[OPTION]... [FILE]'),
4493 _('[OPTION]... [FILE]'),
4494 inferrepo=True)
4494 inferrepo=True)
4495 def log(ui, repo, *pats, **opts):
4495 def log(ui, repo, *pats, **opts):
4496 """show revision history of entire repository or files
4496 """show revision history of entire repository or files
4497
4497
4498 Print the revision history of the specified files or the entire
4498 Print the revision history of the specified files or the entire
4499 project.
4499 project.
4500
4500
4501 If no revision range is specified, the default is ``tip:0`` unless
4501 If no revision range is specified, the default is ``tip:0`` unless
4502 --follow is set, in which case the working directory parent is
4502 --follow is set, in which case the working directory parent is
4503 used as the starting revision.
4503 used as the starting revision.
4504
4504
4505 File history is shown without following rename or copy history of
4505 File history is shown without following rename or copy history of
4506 files. Use -f/--follow with a filename to follow history across
4506 files. Use -f/--follow with a filename to follow history across
4507 renames and copies. --follow without a filename will only show
4507 renames and copies. --follow without a filename will only show
4508 ancestors or descendants of the starting revision.
4508 ancestors or descendants of the starting revision.
4509
4509
4510 By default this command prints revision number and changeset id,
4510 By default this command prints revision number and changeset id,
4511 tags, non-trivial parents, user, date and time, and a summary for
4511 tags, non-trivial parents, user, date and time, and a summary for
4512 each commit. When the -v/--verbose switch is used, the list of
4512 each commit. When the -v/--verbose switch is used, the list of
4513 changed files and full commit message are shown.
4513 changed files and full commit message are shown.
4514
4514
4515 With --graph the revisions are shown as an ASCII art DAG with the most
4515 With --graph the revisions are shown as an ASCII art DAG with the most
4516 recent changeset at the top.
4516 recent changeset at the top.
4517 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
4517 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
4518 and '+' represents a fork where the changeset from the lines below is a
4518 and '+' represents a fork where the changeset from the lines below is a
4519 parent of the 'o' merge on the same line.
4519 parent of the 'o' merge on the same line.
4520
4520
4521 .. note::
4521 .. note::
4522
4522
4523 :hg:`log --patch` may generate unexpected diff output for merge
4523 :hg:`log --patch` may generate unexpected diff output for merge
4524 changesets, as it will only compare the merge changeset against
4524 changesets, as it will only compare the merge changeset against
4525 its first parent. Also, only files different from BOTH parents
4525 its first parent. Also, only files different from BOTH parents
4526 will appear in files:.
4526 will appear in files:.
4527
4527
4528 .. note::
4528 .. note::
4529
4529
4530 For performance reasons, :hg:`log FILE` may omit duplicate changes
4530 For performance reasons, :hg:`log FILE` may omit duplicate changes
4531 made on branches and will not show removals or mode changes. To
4531 made on branches and will not show removals or mode changes. To
4532 see all such changes, use the --removed switch.
4532 see all such changes, use the --removed switch.
4533
4533
4534 .. container:: verbose
4534 .. container:: verbose
4535
4535
4536 Some examples:
4536 Some examples:
4537
4537
4538 - changesets with full descriptions and file lists::
4538 - changesets with full descriptions and file lists::
4539
4539
4540 hg log -v
4540 hg log -v
4541
4541
4542 - changesets ancestral to the working directory::
4542 - changesets ancestral to the working directory::
4543
4543
4544 hg log -f
4544 hg log -f
4545
4545
4546 - last 10 commits on the current branch::
4546 - last 10 commits on the current branch::
4547
4547
4548 hg log -l 10 -b .
4548 hg log -l 10 -b .
4549
4549
4550 - changesets showing all modifications of a file, including removals::
4550 - changesets showing all modifications of a file, including removals::
4551
4551
4552 hg log --removed file.c
4552 hg log --removed file.c
4553
4553
4554 - all changesets that touch a directory, with diffs, excluding merges::
4554 - all changesets that touch a directory, with diffs, excluding merges::
4555
4555
4556 hg log -Mp lib/
4556 hg log -Mp lib/
4557
4557
4558 - all revision numbers that match a keyword::
4558 - all revision numbers that match a keyword::
4559
4559
4560 hg log -k bug --template "{rev}\\n"
4560 hg log -k bug --template "{rev}\\n"
4561
4561
4562 - the full hash identifier of the working directory parent::
4562 - the full hash identifier of the working directory parent::
4563
4563
4564 hg log -r . --template "{node}\\n"
4564 hg log -r . --template "{node}\\n"
4565
4565
4566 - list available log templates::
4566 - list available log templates::
4567
4567
4568 hg log -T list
4568 hg log -T list
4569
4569
4570 - check if a given changeset is included in a tagged release::
4570 - check if a given changeset is included in a tagged release::
4571
4571
4572 hg log -r "a21ccf and ancestor(1.9)"
4572 hg log -r "a21ccf and ancestor(1.9)"
4573
4573
4574 - find all changesets by some user in a date range::
4574 - find all changesets by some user in a date range::
4575
4575
4576 hg log -k alice -d "may 2008 to jul 2008"
4576 hg log -k alice -d "may 2008 to jul 2008"
4577
4577
4578 - summary of all changesets after the last tag::
4578 - summary of all changesets after the last tag::
4579
4579
4580 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4580 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4581
4581
4582 See :hg:`help dates` for a list of formats valid for -d/--date.
4582 See :hg:`help dates` for a list of formats valid for -d/--date.
4583
4583
4584 See :hg:`help revisions` for more about specifying and ordering
4584 See :hg:`help revisions` for more about specifying and ordering
4585 revisions.
4585 revisions.
4586
4586
4587 See :hg:`help templates` for more about pre-packaged styles and
4587 See :hg:`help templates` for more about pre-packaged styles and
4588 specifying custom templates.
4588 specifying custom templates.
4589
4589
4590 Returns 0 on success.
4590 Returns 0 on success.
4591
4591
4592 """
4592 """
4593 if opts.get('follow') and opts.get('rev'):
4593 if opts.get('follow') and opts.get('rev'):
4594 opts['rev'] = [revset.formatspec('reverse(::%lr)', opts.get('rev'))]
4594 opts['rev'] = [revset.formatspec('reverse(::%lr)', opts.get('rev'))]
4595 del opts['follow']
4595 del opts['follow']
4596
4596
4597 if opts.get('graph'):
4597 if opts.get('graph'):
4598 return cmdutil.graphlog(ui, repo, *pats, **opts)
4598 return cmdutil.graphlog(ui, repo, *pats, **opts)
4599
4599
4600 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
4600 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
4601 limit = cmdutil.loglimit(opts)
4601 limit = cmdutil.loglimit(opts)
4602 count = 0
4602 count = 0
4603
4603
4604 getrenamed = None
4604 getrenamed = None
4605 if opts.get('copies'):
4605 if opts.get('copies'):
4606 endrev = None
4606 endrev = None
4607 if opts.get('rev'):
4607 if opts.get('rev'):
4608 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
4608 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
4609 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
4609 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
4610
4610
4611 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
4611 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
4612 for rev in revs:
4612 for rev in revs:
4613 if count == limit:
4613 if count == limit:
4614 break
4614 break
4615 ctx = repo[rev]
4615 ctx = repo[rev]
4616 copies = None
4616 copies = None
4617 if getrenamed is not None and rev:
4617 if getrenamed is not None and rev:
4618 copies = []
4618 copies = []
4619 for fn in ctx.files():
4619 for fn in ctx.files():
4620 rename = getrenamed(fn, rev)
4620 rename = getrenamed(fn, rev)
4621 if rename:
4621 if rename:
4622 copies.append((fn, rename[0]))
4622 copies.append((fn, rename[0]))
4623 if filematcher:
4623 if filematcher:
4624 revmatchfn = filematcher(ctx.rev())
4624 revmatchfn = filematcher(ctx.rev())
4625 else:
4625 else:
4626 revmatchfn = None
4626 revmatchfn = None
4627 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
4627 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
4628 if displayer.flush(ctx):
4628 if displayer.flush(ctx):
4629 count += 1
4629 count += 1
4630
4630
4631 displayer.close()
4631 displayer.close()
4632
4632
4633 @command('manifest',
4633 @command('manifest',
4634 [('r', 'rev', '', _('revision to display'), _('REV')),
4634 [('r', 'rev', '', _('revision to display'), _('REV')),
4635 ('', 'all', False, _("list files from all revisions"))]
4635 ('', 'all', False, _("list files from all revisions"))]
4636 + formatteropts,
4636 + formatteropts,
4637 _('[-r REV]'))
4637 _('[-r REV]'))
4638 def manifest(ui, repo, node=None, rev=None, **opts):
4638 def manifest(ui, repo, node=None, rev=None, **opts):
4639 """output the current or given revision of the project manifest
4639 """output the current or given revision of the project manifest
4640
4640
4641 Print a list of version controlled files for the given revision.
4641 Print a list of version controlled files for the given revision.
4642 If no revision is given, the first parent of the working directory
4642 If no revision is given, the first parent of the working directory
4643 is used, or the null revision if no revision is checked out.
4643 is used, or the null revision if no revision is checked out.
4644
4644
4645 With -v, print file permissions, symlink and executable bits.
4645 With -v, print file permissions, symlink and executable bits.
4646 With --debug, print file revision hashes.
4646 With --debug, print file revision hashes.
4647
4647
4648 If option --all is specified, the list of all files from all revisions
4648 If option --all is specified, the list of all files from all revisions
4649 is printed. This includes deleted and renamed files.
4649 is printed. This includes deleted and renamed files.
4650
4650
4651 Returns 0 on success.
4651 Returns 0 on success.
4652 """
4652 """
4653
4653
4654 fm = ui.formatter('manifest', opts)
4654 fm = ui.formatter('manifest', opts)
4655
4655
4656 if opts.get('all'):
4656 if opts.get('all'):
4657 if rev or node:
4657 if rev or node:
4658 raise error.Abort(_("can't specify a revision with --all"))
4658 raise error.Abort(_("can't specify a revision with --all"))
4659
4659
4660 res = []
4660 res = []
4661 prefix = "data/"
4661 prefix = "data/"
4662 suffix = ".i"
4662 suffix = ".i"
4663 plen = len(prefix)
4663 plen = len(prefix)
4664 slen = len(suffix)
4664 slen = len(suffix)
4665 with repo.lock():
4665 with repo.lock():
4666 for fn, b, size in repo.store.datafiles():
4666 for fn, b, size in repo.store.datafiles():
4667 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
4667 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
4668 res.append(fn[plen:-slen])
4668 res.append(fn[plen:-slen])
4669 for f in res:
4669 for f in res:
4670 fm.startitem()
4670 fm.startitem()
4671 fm.write("path", '%s\n', f)
4671 fm.write("path", '%s\n', f)
4672 fm.end()
4672 fm.end()
4673 return
4673 return
4674
4674
4675 if rev and node:
4675 if rev and node:
4676 raise error.Abort(_("please specify just one revision"))
4676 raise error.Abort(_("please specify just one revision"))
4677
4677
4678 if not node:
4678 if not node:
4679 node = rev
4679 node = rev
4680
4680
4681 char = {'l': '@', 'x': '*', '': ''}
4681 char = {'l': '@', 'x': '*', '': ''}
4682 mode = {'l': '644', 'x': '755', '': '644'}
4682 mode = {'l': '644', 'x': '755', '': '644'}
4683 ctx = scmutil.revsingle(repo, node)
4683 ctx = scmutil.revsingle(repo, node)
4684 mf = ctx.manifest()
4684 mf = ctx.manifest()
4685 for f in ctx:
4685 for f in ctx:
4686 fm.startitem()
4686 fm.startitem()
4687 fl = ctx[f].flags()
4687 fl = ctx[f].flags()
4688 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
4688 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
4689 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
4689 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
4690 fm.write('path', '%s\n', f)
4690 fm.write('path', '%s\n', f)
4691 fm.end()
4691 fm.end()
4692
4692
4693 @command('^merge',
4693 @command('^merge',
4694 [('f', 'force', None,
4694 [('f', 'force', None,
4695 _('force a merge including outstanding changes (DEPRECATED)')),
4695 _('force a merge including outstanding changes (DEPRECATED)')),
4696 ('r', 'rev', '', _('revision to merge'), _('REV')),
4696 ('r', 'rev', '', _('revision to merge'), _('REV')),
4697 ('P', 'preview', None,
4697 ('P', 'preview', None,
4698 _('review revisions to merge (no merge is performed)'))
4698 _('review revisions to merge (no merge is performed)'))
4699 ] + mergetoolopts,
4699 ] + mergetoolopts,
4700 _('[-P] [[-r] REV]'))
4700 _('[-P] [[-r] REV]'))
4701 def merge(ui, repo, node=None, **opts):
4701 def merge(ui, repo, node=None, **opts):
4702 """merge another revision into working directory
4702 """merge another revision into working directory
4703
4703
4704 The current working directory is updated with all changes made in
4704 The current working directory is updated with all changes made in
4705 the requested revision since the last common predecessor revision.
4705 the requested revision since the last common predecessor revision.
4706
4706
4707 Files that changed between either parent are marked as changed for
4707 Files that changed between either parent are marked as changed for
4708 the next commit and a commit must be performed before any further
4708 the next commit and a commit must be performed before any further
4709 updates to the repository are allowed. The next commit will have
4709 updates to the repository are allowed. The next commit will have
4710 two parents.
4710 two parents.
4711
4711
4712 ``--tool`` can be used to specify the merge tool used for file
4712 ``--tool`` can be used to specify the merge tool used for file
4713 merges. It overrides the HGMERGE environment variable and your
4713 merges. It overrides the HGMERGE environment variable and your
4714 configuration files. See :hg:`help merge-tools` for options.
4714 configuration files. See :hg:`help merge-tools` for options.
4715
4715
4716 If no revision is specified, the working directory's parent is a
4716 If no revision is specified, the working directory's parent is a
4717 head revision, and the current branch contains exactly one other
4717 head revision, and the current branch contains exactly one other
4718 head, the other head is merged with by default. Otherwise, an
4718 head, the other head is merged with by default. Otherwise, an
4719 explicit revision with which to merge with must be provided.
4719 explicit revision with which to merge with must be provided.
4720
4720
4721 See :hg:`help resolve` for information on handling file conflicts.
4721 See :hg:`help resolve` for information on handling file conflicts.
4722
4722
4723 To undo an uncommitted merge, use :hg:`update --clean .` which
4723 To undo an uncommitted merge, use :hg:`update --clean .` which
4724 will check out a clean copy of the original merge parent, losing
4724 will check out a clean copy of the original merge parent, losing
4725 all changes.
4725 all changes.
4726
4726
4727 Returns 0 on success, 1 if there are unresolved files.
4727 Returns 0 on success, 1 if there are unresolved files.
4728 """
4728 """
4729
4729
4730 if opts.get('rev') and node:
4730 if opts.get('rev') and node:
4731 raise error.Abort(_("please specify just one revision"))
4731 raise error.Abort(_("please specify just one revision"))
4732 if not node:
4732 if not node:
4733 node = opts.get('rev')
4733 node = opts.get('rev')
4734
4734
4735 if node:
4735 if node:
4736 node = scmutil.revsingle(repo, node).node()
4736 node = scmutil.revsingle(repo, node).node()
4737
4737
4738 if not node:
4738 if not node:
4739 node = repo[destutil.destmerge(repo)].node()
4739 node = repo[destutil.destmerge(repo)].node()
4740
4740
4741 if opts.get('preview'):
4741 if opts.get('preview'):
4742 # find nodes that are ancestors of p2 but not of p1
4742 # find nodes that are ancestors of p2 but not of p1
4743 p1 = repo.lookup('.')
4743 p1 = repo.lookup('.')
4744 p2 = repo.lookup(node)
4744 p2 = repo.lookup(node)
4745 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4745 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4746
4746
4747 displayer = cmdutil.show_changeset(ui, repo, opts)
4747 displayer = cmdutil.show_changeset(ui, repo, opts)
4748 for node in nodes:
4748 for node in nodes:
4749 displayer.show(repo[node])
4749 displayer.show(repo[node])
4750 displayer.close()
4750 displayer.close()
4751 return 0
4751 return 0
4752
4752
4753 try:
4753 try:
4754 # ui.forcemerge is an internal variable, do not document
4754 # ui.forcemerge is an internal variable, do not document
4755 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
4755 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
4756 force = opts.get('force')
4756 force = opts.get('force')
4757 labels = ['working copy', 'merge rev']
4757 labels = ['working copy', 'merge rev']
4758 return hg.merge(repo, node, force=force, mergeforce=force,
4758 return hg.merge(repo, node, force=force, mergeforce=force,
4759 labels=labels)
4759 labels=labels)
4760 finally:
4760 finally:
4761 ui.setconfig('ui', 'forcemerge', '', 'merge')
4761 ui.setconfig('ui', 'forcemerge', '', 'merge')
4762
4762
4763 @command('outgoing|out',
4763 @command('outgoing|out',
4764 [('f', 'force', None, _('run even when the destination is unrelated')),
4764 [('f', 'force', None, _('run even when the destination is unrelated')),
4765 ('r', 'rev', [],
4765 ('r', 'rev', [],
4766 _('a changeset intended to be included in the destination'), _('REV')),
4766 _('a changeset intended to be included in the destination'), _('REV')),
4767 ('n', 'newest-first', None, _('show newest record first')),
4767 ('n', 'newest-first', None, _('show newest record first')),
4768 ('B', 'bookmarks', False, _('compare bookmarks')),
4768 ('B', 'bookmarks', False, _('compare bookmarks')),
4769 ('b', 'branch', [], _('a specific branch you would like to push'),
4769 ('b', 'branch', [], _('a specific branch you would like to push'),
4770 _('BRANCH')),
4770 _('BRANCH')),
4771 ] + logopts + remoteopts + subrepoopts,
4771 ] + logopts + remoteopts + subrepoopts,
4772 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
4772 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
4773 def outgoing(ui, repo, dest=None, **opts):
4773 def outgoing(ui, repo, dest=None, **opts):
4774 """show changesets not found in the destination
4774 """show changesets not found in the destination
4775
4775
4776 Show changesets not found in the specified destination repository
4776 Show changesets not found in the specified destination repository
4777 or the default push location. These are the changesets that would
4777 or the default push location. These are the changesets that would
4778 be pushed if a push was requested.
4778 be pushed if a push was requested.
4779
4779
4780 See pull for details of valid destination formats.
4780 See pull for details of valid destination formats.
4781
4781
4782 .. container:: verbose
4782 .. container:: verbose
4783
4783
4784 With -B/--bookmarks, the result of bookmark comparison between
4784 With -B/--bookmarks, the result of bookmark comparison between
4785 local and remote repositories is displayed. With -v/--verbose,
4785 local and remote repositories is displayed. With -v/--verbose,
4786 status is also displayed for each bookmark like below::
4786 status is also displayed for each bookmark like below::
4787
4787
4788 BM1 01234567890a added
4788 BM1 01234567890a added
4789 BM2 deleted
4789 BM2 deleted
4790 BM3 234567890abc advanced
4790 BM3 234567890abc advanced
4791 BM4 34567890abcd diverged
4791 BM4 34567890abcd diverged
4792 BM5 4567890abcde changed
4792 BM5 4567890abcde changed
4793
4793
4794 The action taken when pushing depends on the
4794 The action taken when pushing depends on the
4795 status of each bookmark:
4795 status of each bookmark:
4796
4796
4797 :``added``: push with ``-B`` will create it
4797 :``added``: push with ``-B`` will create it
4798 :``deleted``: push with ``-B`` will delete it
4798 :``deleted``: push with ``-B`` will delete it
4799 :``advanced``: push will update it
4799 :``advanced``: push will update it
4800 :``diverged``: push with ``-B`` will update it
4800 :``diverged``: push with ``-B`` will update it
4801 :``changed``: push with ``-B`` will update it
4801 :``changed``: push with ``-B`` will update it
4802
4802
4803 From the point of view of pushing behavior, bookmarks
4803 From the point of view of pushing behavior, bookmarks
4804 existing only in the remote repository are treated as
4804 existing only in the remote repository are treated as
4805 ``deleted``, even if it is in fact added remotely.
4805 ``deleted``, even if it is in fact added remotely.
4806
4806
4807 Returns 0 if there are outgoing changes, 1 otherwise.
4807 Returns 0 if there are outgoing changes, 1 otherwise.
4808 """
4808 """
4809 if opts.get('graph'):
4809 if opts.get('graph'):
4810 cmdutil.checkunsupportedgraphflags([], opts)
4810 cmdutil.checkunsupportedgraphflags([], opts)
4811 o, other = hg._outgoing(ui, repo, dest, opts)
4811 o, other = hg._outgoing(ui, repo, dest, opts)
4812 if not o:
4812 if not o:
4813 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4813 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4814 return
4814 return
4815
4815
4816 revdag = cmdutil.graphrevs(repo, o, opts)
4816 revdag = cmdutil.graphrevs(repo, o, opts)
4817 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
4817 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
4818 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
4818 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
4819 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4819 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4820 return 0
4820 return 0
4821
4821
4822 if opts.get('bookmarks'):
4822 if opts.get('bookmarks'):
4823 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4823 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4824 dest, branches = hg.parseurl(dest, opts.get('branch'))
4824 dest, branches = hg.parseurl(dest, opts.get('branch'))
4825 other = hg.peer(repo, opts, dest)
4825 other = hg.peer(repo, opts, dest)
4826 if 'bookmarks' not in other.listkeys('namespaces'):
4826 if 'bookmarks' not in other.listkeys('namespaces'):
4827 ui.warn(_("remote doesn't support bookmarks\n"))
4827 ui.warn(_("remote doesn't support bookmarks\n"))
4828 return 0
4828 return 0
4829 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
4829 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
4830 return bookmarks.outgoing(ui, repo, other)
4830 return bookmarks.outgoing(ui, repo, other)
4831
4831
4832 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
4832 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
4833 try:
4833 try:
4834 return hg.outgoing(ui, repo, dest, opts)
4834 return hg.outgoing(ui, repo, dest, opts)
4835 finally:
4835 finally:
4836 del repo._subtoppath
4836 del repo._subtoppath
4837
4837
4838 @command('parents',
4838 @command('parents',
4839 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
4839 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
4840 ] + templateopts,
4840 ] + templateopts,
4841 _('[-r REV] [FILE]'),
4841 _('[-r REV] [FILE]'),
4842 inferrepo=True)
4842 inferrepo=True)
4843 def parents(ui, repo, file_=None, **opts):
4843 def parents(ui, repo, file_=None, **opts):
4844 """show the parents of the working directory or revision (DEPRECATED)
4844 """show the parents of the working directory or revision (DEPRECATED)
4845
4845
4846 Print the working directory's parent revisions. If a revision is
4846 Print the working directory's parent revisions. If a revision is
4847 given via -r/--rev, the parent of that revision will be printed.
4847 given via -r/--rev, the parent of that revision will be printed.
4848 If a file argument is given, the revision in which the file was
4848 If a file argument is given, the revision in which the file was
4849 last changed (before the working directory revision or the
4849 last changed (before the working directory revision or the
4850 argument to --rev if given) is printed.
4850 argument to --rev if given) is printed.
4851
4851
4852 This command is equivalent to::
4852 This command is equivalent to::
4853
4853
4854 hg log -r "p1()+p2()" or
4854 hg log -r "p1()+p2()" or
4855 hg log -r "p1(REV)+p2(REV)" or
4855 hg log -r "p1(REV)+p2(REV)" or
4856 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
4856 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
4857 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
4857 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
4858
4858
4859 See :hg:`summary` and :hg:`help revsets` for related information.
4859 See :hg:`summary` and :hg:`help revsets` for related information.
4860
4860
4861 Returns 0 on success.
4861 Returns 0 on success.
4862 """
4862 """
4863
4863
4864 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
4864 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
4865
4865
4866 if file_:
4866 if file_:
4867 m = scmutil.match(ctx, (file_,), opts)
4867 m = scmutil.match(ctx, (file_,), opts)
4868 if m.anypats() or len(m.files()) != 1:
4868 if m.anypats() or len(m.files()) != 1:
4869 raise error.Abort(_('can only specify an explicit filename'))
4869 raise error.Abort(_('can only specify an explicit filename'))
4870 file_ = m.files()[0]
4870 file_ = m.files()[0]
4871 filenodes = []
4871 filenodes = []
4872 for cp in ctx.parents():
4872 for cp in ctx.parents():
4873 if not cp:
4873 if not cp:
4874 continue
4874 continue
4875 try:
4875 try:
4876 filenodes.append(cp.filenode(file_))
4876 filenodes.append(cp.filenode(file_))
4877 except error.LookupError:
4877 except error.LookupError:
4878 pass
4878 pass
4879 if not filenodes:
4879 if not filenodes:
4880 raise error.Abort(_("'%s' not found in manifest!") % file_)
4880 raise error.Abort(_("'%s' not found in manifest!") % file_)
4881 p = []
4881 p = []
4882 for fn in filenodes:
4882 for fn in filenodes:
4883 fctx = repo.filectx(file_, fileid=fn)
4883 fctx = repo.filectx(file_, fileid=fn)
4884 p.append(fctx.node())
4884 p.append(fctx.node())
4885 else:
4885 else:
4886 p = [cp.node() for cp in ctx.parents()]
4886 p = [cp.node() for cp in ctx.parents()]
4887
4887
4888 displayer = cmdutil.show_changeset(ui, repo, opts)
4888 displayer = cmdutil.show_changeset(ui, repo, opts)
4889 for n in p:
4889 for n in p:
4890 if n != nullid:
4890 if n != nullid:
4891 displayer.show(repo[n])
4891 displayer.show(repo[n])
4892 displayer.close()
4892 displayer.close()
4893
4893
4894 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
4894 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
4895 def paths(ui, repo, search=None, **opts):
4895 def paths(ui, repo, search=None, **opts):
4896 """show aliases for remote repositories
4896 """show aliases for remote repositories
4897
4897
4898 Show definition of symbolic path name NAME. If no name is given,
4898 Show definition of symbolic path name NAME. If no name is given,
4899 show definition of all available names.
4899 show definition of all available names.
4900
4900
4901 Option -q/--quiet suppresses all output when searching for NAME
4901 Option -q/--quiet suppresses all output when searching for NAME
4902 and shows only the path names when listing all definitions.
4902 and shows only the path names when listing all definitions.
4903
4903
4904 Path names are defined in the [paths] section of your
4904 Path names are defined in the [paths] section of your
4905 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
4905 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
4906 repository, ``.hg/hgrc`` is used, too.
4906 repository, ``.hg/hgrc`` is used, too.
4907
4907
4908 The path names ``default`` and ``default-push`` have a special
4908 The path names ``default`` and ``default-push`` have a special
4909 meaning. When performing a push or pull operation, they are used
4909 meaning. When performing a push or pull operation, they are used
4910 as fallbacks if no location is specified on the command-line.
4910 as fallbacks if no location is specified on the command-line.
4911 When ``default-push`` is set, it will be used for push and
4911 When ``default-push`` is set, it will be used for push and
4912 ``default`` will be used for pull; otherwise ``default`` is used
4912 ``default`` will be used for pull; otherwise ``default`` is used
4913 as the fallback for both. When cloning a repository, the clone
4913 as the fallback for both. When cloning a repository, the clone
4914 source is written as ``default`` in ``.hg/hgrc``.
4914 source is written as ``default`` in ``.hg/hgrc``.
4915
4915
4916 .. note::
4916 .. note::
4917
4917
4918 ``default`` and ``default-push`` apply to all inbound (e.g.
4918 ``default`` and ``default-push`` apply to all inbound (e.g.
4919 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
4919 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
4920 and :hg:`bundle`) operations.
4920 and :hg:`bundle`) operations.
4921
4921
4922 See :hg:`help urls` for more information.
4922 See :hg:`help urls` for more information.
4923
4923
4924 Returns 0 on success.
4924 Returns 0 on success.
4925 """
4925 """
4926 if search:
4926 if search:
4927 pathitems = [(name, path) for name, path in ui.paths.iteritems()
4927 pathitems = [(name, path) for name, path in ui.paths.iteritems()
4928 if name == search]
4928 if name == search]
4929 else:
4929 else:
4930 pathitems = sorted(ui.paths.iteritems())
4930 pathitems = sorted(ui.paths.iteritems())
4931
4931
4932 fm = ui.formatter('paths', opts)
4932 fm = ui.formatter('paths', opts)
4933 if fm.isplain():
4933 if fm.isplain():
4934 hidepassword = util.hidepassword
4934 hidepassword = util.hidepassword
4935 else:
4935 else:
4936 hidepassword = str
4936 hidepassword = str
4937 if ui.quiet:
4937 if ui.quiet:
4938 namefmt = '%s\n'
4938 namefmt = '%s\n'
4939 else:
4939 else:
4940 namefmt = '%s = '
4940 namefmt = '%s = '
4941 showsubopts = not search and not ui.quiet
4941 showsubopts = not search and not ui.quiet
4942
4942
4943 for name, path in pathitems:
4943 for name, path in pathitems:
4944 fm.startitem()
4944 fm.startitem()
4945 fm.condwrite(not search, 'name', namefmt, name)
4945 fm.condwrite(not search, 'name', namefmt, name)
4946 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
4946 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
4947 for subopt, value in sorted(path.suboptions.items()):
4947 for subopt, value in sorted(path.suboptions.items()):
4948 assert subopt not in ('name', 'url')
4948 assert subopt not in ('name', 'url')
4949 if showsubopts:
4949 if showsubopts:
4950 fm.plain('%s:%s = ' % (name, subopt))
4950 fm.plain('%s:%s = ' % (name, subopt))
4951 fm.condwrite(showsubopts, subopt, '%s\n', value)
4951 fm.condwrite(showsubopts, subopt, '%s\n', value)
4952
4952
4953 fm.end()
4953 fm.end()
4954
4954
4955 if search and not pathitems:
4955 if search and not pathitems:
4956 if not ui.quiet:
4956 if not ui.quiet:
4957 ui.warn(_("not found!\n"))
4957 ui.warn(_("not found!\n"))
4958 return 1
4958 return 1
4959 else:
4959 else:
4960 return 0
4960 return 0
4961
4961
4962 @command('phase',
4962 @command('phase',
4963 [('p', 'public', False, _('set changeset phase to public')),
4963 [('p', 'public', False, _('set changeset phase to public')),
4964 ('d', 'draft', False, _('set changeset phase to draft')),
4964 ('d', 'draft', False, _('set changeset phase to draft')),
4965 ('s', 'secret', False, _('set changeset phase to secret')),
4965 ('s', 'secret', False, _('set changeset phase to secret')),
4966 ('f', 'force', False, _('allow to move boundary backward')),
4966 ('f', 'force', False, _('allow to move boundary backward')),
4967 ('r', 'rev', [], _('target revision'), _('REV')),
4967 ('r', 'rev', [], _('target revision'), _('REV')),
4968 ],
4968 ],
4969 _('[-p|-d|-s] [-f] [-r] [REV...]'))
4969 _('[-p|-d|-s] [-f] [-r] [REV...]'))
4970 def phase(ui, repo, *revs, **opts):
4970 def phase(ui, repo, *revs, **opts):
4971 """set or show the current phase name
4971 """set or show the current phase name
4972
4972
4973 With no argument, show the phase name of the current revision(s).
4973 With no argument, show the phase name of the current revision(s).
4974
4974
4975 With one of -p/--public, -d/--draft or -s/--secret, change the
4975 With one of -p/--public, -d/--draft or -s/--secret, change the
4976 phase value of the specified revisions.
4976 phase value of the specified revisions.
4977
4977
4978 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
4978 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
4979 lower phase to an higher phase. Phases are ordered as follows::
4979 lower phase to an higher phase. Phases are ordered as follows::
4980
4980
4981 public < draft < secret
4981 public < draft < secret
4982
4982
4983 Returns 0 on success, 1 if some phases could not be changed.
4983 Returns 0 on success, 1 if some phases could not be changed.
4984
4984
4985 (For more information about the phases concept, see :hg:`help phases`.)
4985 (For more information about the phases concept, see :hg:`help phases`.)
4986 """
4986 """
4987 # search for a unique phase argument
4987 # search for a unique phase argument
4988 targetphase = None
4988 targetphase = None
4989 for idx, name in enumerate(phases.phasenames):
4989 for idx, name in enumerate(phases.phasenames):
4990 if opts[name]:
4990 if opts[name]:
4991 if targetphase is not None:
4991 if targetphase is not None:
4992 raise error.Abort(_('only one phase can be specified'))
4992 raise error.Abort(_('only one phase can be specified'))
4993 targetphase = idx
4993 targetphase = idx
4994
4994
4995 # look for specified revision
4995 # look for specified revision
4996 revs = list(revs)
4996 revs = list(revs)
4997 revs.extend(opts['rev'])
4997 revs.extend(opts['rev'])
4998 if not revs:
4998 if not revs:
4999 # display both parents as the second parent phase can influence
4999 # display both parents as the second parent phase can influence
5000 # the phase of a merge commit
5000 # the phase of a merge commit
5001 revs = [c.rev() for c in repo[None].parents()]
5001 revs = [c.rev() for c in repo[None].parents()]
5002
5002
5003 revs = scmutil.revrange(repo, revs)
5003 revs = scmutil.revrange(repo, revs)
5004
5004
5005 lock = None
5005 lock = None
5006 ret = 0
5006 ret = 0
5007 if targetphase is None:
5007 if targetphase is None:
5008 # display
5008 # display
5009 for r in revs:
5009 for r in revs:
5010 ctx = repo[r]
5010 ctx = repo[r]
5011 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5011 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5012 else:
5012 else:
5013 tr = None
5013 tr = None
5014 lock = repo.lock()
5014 lock = repo.lock()
5015 try:
5015 try:
5016 tr = repo.transaction("phase")
5016 tr = repo.transaction("phase")
5017 # set phase
5017 # set phase
5018 if not revs:
5018 if not revs:
5019 raise error.Abort(_('empty revision set'))
5019 raise error.Abort(_('empty revision set'))
5020 nodes = [repo[r].node() for r in revs]
5020 nodes = [repo[r].node() for r in revs]
5021 # moving revision from public to draft may hide them
5021 # moving revision from public to draft may hide them
5022 # We have to check result on an unfiltered repository
5022 # We have to check result on an unfiltered repository
5023 unfi = repo.unfiltered()
5023 unfi = repo.unfiltered()
5024 getphase = unfi._phasecache.phase
5024 getphase = unfi._phasecache.phase
5025 olddata = [getphase(unfi, r) for r in unfi]
5025 olddata = [getphase(unfi, r) for r in unfi]
5026 phases.advanceboundary(repo, tr, targetphase, nodes)
5026 phases.advanceboundary(repo, tr, targetphase, nodes)
5027 if opts['force']:
5027 if opts['force']:
5028 phases.retractboundary(repo, tr, targetphase, nodes)
5028 phases.retractboundary(repo, tr, targetphase, nodes)
5029 tr.close()
5029 tr.close()
5030 finally:
5030 finally:
5031 if tr is not None:
5031 if tr is not None:
5032 tr.release()
5032 tr.release()
5033 lock.release()
5033 lock.release()
5034 getphase = unfi._phasecache.phase
5034 getphase = unfi._phasecache.phase
5035 newdata = [getphase(unfi, r) for r in unfi]
5035 newdata = [getphase(unfi, r) for r in unfi]
5036 changes = sum(newdata[r] != olddata[r] for r in unfi)
5036 changes = sum(newdata[r] != olddata[r] for r in unfi)
5037 cl = unfi.changelog
5037 cl = unfi.changelog
5038 rejected = [n for n in nodes
5038 rejected = [n for n in nodes
5039 if newdata[cl.rev(n)] < targetphase]
5039 if newdata[cl.rev(n)] < targetphase]
5040 if rejected:
5040 if rejected:
5041 ui.warn(_('cannot move %i changesets to a higher '
5041 ui.warn(_('cannot move %i changesets to a higher '
5042 'phase, use --force\n') % len(rejected))
5042 'phase, use --force\n') % len(rejected))
5043 ret = 1
5043 ret = 1
5044 if changes:
5044 if changes:
5045 msg = _('phase changed for %i changesets\n') % changes
5045 msg = _('phase changed for %i changesets\n') % changes
5046 if ret:
5046 if ret:
5047 ui.status(msg)
5047 ui.status(msg)
5048 else:
5048 else:
5049 ui.note(msg)
5049 ui.note(msg)
5050 else:
5050 else:
5051 ui.warn(_('no phases changed\n'))
5051 ui.warn(_('no phases changed\n'))
5052 return ret
5052 return ret
5053
5053
5054 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5054 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5055 """Run after a changegroup has been added via pull/unbundle
5055 """Run after a changegroup has been added via pull/unbundle
5056
5056
5057 This takes arguments below:
5057 This takes arguments below:
5058
5058
5059 :modheads: change of heads by pull/unbundle
5059 :modheads: change of heads by pull/unbundle
5060 :optupdate: updating working directory is needed or not
5060 :optupdate: updating working directory is needed or not
5061 :checkout: update destination revision (or None to default destination)
5061 :checkout: update destination revision (or None to default destination)
5062 :brev: a name, which might be a bookmark to be activated after updating
5062 :brev: a name, which might be a bookmark to be activated after updating
5063 """
5063 """
5064 if modheads == 0:
5064 if modheads == 0:
5065 return
5065 return
5066 if optupdate:
5066 if optupdate:
5067 try:
5067 try:
5068 return hg.updatetotally(ui, repo, checkout, brev)
5068 return hg.updatetotally(ui, repo, checkout, brev)
5069 except error.UpdateAbort as inst:
5069 except error.UpdateAbort as inst:
5070 msg = _("not updating: %s") % str(inst)
5070 msg = _("not updating: %s") % str(inst)
5071 hint = inst.hint
5071 hint = inst.hint
5072 raise error.UpdateAbort(msg, hint=hint)
5072 raise error.UpdateAbort(msg, hint=hint)
5073 if modheads > 1:
5073 if modheads > 1:
5074 currentbranchheads = len(repo.branchheads())
5074 currentbranchheads = len(repo.branchheads())
5075 if currentbranchheads == modheads:
5075 if currentbranchheads == modheads:
5076 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
5076 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
5077 elif currentbranchheads > 1:
5077 elif currentbranchheads > 1:
5078 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
5078 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
5079 "merge)\n"))
5079 "merge)\n"))
5080 else:
5080 else:
5081 ui.status(_("(run 'hg heads' to see heads)\n"))
5081 ui.status(_("(run 'hg heads' to see heads)\n"))
5082 else:
5082 else:
5083 ui.status(_("(run 'hg update' to get a working copy)\n"))
5083 ui.status(_("(run 'hg update' to get a working copy)\n"))
5084
5084
5085 @command('^pull',
5085 @command('^pull',
5086 [('u', 'update', None,
5086 [('u', 'update', None,
5087 _('update to new branch head if changesets were pulled')),
5087 _('update to new branch head if changesets were pulled')),
5088 ('f', 'force', None, _('run even when remote repository is unrelated')),
5088 ('f', 'force', None, _('run even when remote repository is unrelated')),
5089 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5089 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5090 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
5090 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
5091 ('b', 'branch', [], _('a specific branch you would like to pull'),
5091 ('b', 'branch', [], _('a specific branch you would like to pull'),
5092 _('BRANCH')),
5092 _('BRANCH')),
5093 ] + remoteopts,
5093 ] + remoteopts,
5094 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
5094 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
5095 def pull(ui, repo, source="default", **opts):
5095 def pull(ui, repo, source="default", **opts):
5096 """pull changes from the specified source
5096 """pull changes from the specified source
5097
5097
5098 Pull changes from a remote repository to a local one.
5098 Pull changes from a remote repository to a local one.
5099
5099
5100 This finds all changes from the repository at the specified path
5100 This finds all changes from the repository at the specified path
5101 or URL and adds them to a local repository (the current one unless
5101 or URL and adds them to a local repository (the current one unless
5102 -R is specified). By default, this does not update the copy of the
5102 -R is specified). By default, this does not update the copy of the
5103 project in the working directory.
5103 project in the working directory.
5104
5104
5105 Use :hg:`incoming` if you want to see what would have been added
5105 Use :hg:`incoming` if you want to see what would have been added
5106 by a pull at the time you issued this command. If you then decide
5106 by a pull at the time you issued this command. If you then decide
5107 to add those changes to the repository, you should use :hg:`pull
5107 to add those changes to the repository, you should use :hg:`pull
5108 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5108 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5109
5109
5110 If SOURCE is omitted, the 'default' path will be used.
5110 If SOURCE is omitted, the 'default' path will be used.
5111 See :hg:`help urls` for more information.
5111 See :hg:`help urls` for more information.
5112
5112
5113 Specifying bookmark as ``.`` is equivalent to specifying the active
5113 Specifying bookmark as ``.`` is equivalent to specifying the active
5114 bookmark's name.
5114 bookmark's name.
5115
5115
5116 Returns 0 on success, 1 if an update had unresolved files.
5116 Returns 0 on success, 1 if an update had unresolved files.
5117 """
5117 """
5118 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
5118 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
5119 ui.status(_('pulling from %s\n') % util.hidepassword(source))
5119 ui.status(_('pulling from %s\n') % util.hidepassword(source))
5120 other = hg.peer(repo, opts, source)
5120 other = hg.peer(repo, opts, source)
5121 try:
5121 try:
5122 revs, checkout = hg.addbranchrevs(repo, other, branches,
5122 revs, checkout = hg.addbranchrevs(repo, other, branches,
5123 opts.get('rev'))
5123 opts.get('rev'))
5124
5124
5125
5125
5126 pullopargs = {}
5126 pullopargs = {}
5127 if opts.get('bookmark'):
5127 if opts.get('bookmark'):
5128 if not revs:
5128 if not revs:
5129 revs = []
5129 revs = []
5130 # The list of bookmark used here is not the one used to actually
5130 # The list of bookmark used here is not the one used to actually
5131 # update the bookmark name. This can result in the revision pulled
5131 # update the bookmark name. This can result in the revision pulled
5132 # not ending up with the name of the bookmark because of a race
5132 # not ending up with the name of the bookmark because of a race
5133 # condition on the server. (See issue 4689 for details)
5133 # condition on the server. (See issue 4689 for details)
5134 remotebookmarks = other.listkeys('bookmarks')
5134 remotebookmarks = other.listkeys('bookmarks')
5135 pullopargs['remotebookmarks'] = remotebookmarks
5135 pullopargs['remotebookmarks'] = remotebookmarks
5136 for b in opts['bookmark']:
5136 for b in opts['bookmark']:
5137 b = repo._bookmarks.expandname(b)
5137 b = repo._bookmarks.expandname(b)
5138 if b not in remotebookmarks:
5138 if b not in remotebookmarks:
5139 raise error.Abort(_('remote bookmark %s not found!') % b)
5139 raise error.Abort(_('remote bookmark %s not found!') % b)
5140 revs.append(remotebookmarks[b])
5140 revs.append(remotebookmarks[b])
5141
5141
5142 if revs:
5142 if revs:
5143 try:
5143 try:
5144 # When 'rev' is a bookmark name, we cannot guarantee that it
5144 # When 'rev' is a bookmark name, we cannot guarantee that it
5145 # will be updated with that name because of a race condition
5145 # will be updated with that name because of a race condition
5146 # server side. (See issue 4689 for details)
5146 # server side. (See issue 4689 for details)
5147 oldrevs = revs
5147 oldrevs = revs
5148 revs = [] # actually, nodes
5148 revs = [] # actually, nodes
5149 for r in oldrevs:
5149 for r in oldrevs:
5150 node = other.lookup(r)
5150 node = other.lookup(r)
5151 revs.append(node)
5151 revs.append(node)
5152 if r == checkout:
5152 if r == checkout:
5153 checkout = node
5153 checkout = node
5154 except error.CapabilityError:
5154 except error.CapabilityError:
5155 err = _("other repository doesn't support revision lookup, "
5155 err = _("other repository doesn't support revision lookup, "
5156 "so a rev cannot be specified.")
5156 "so a rev cannot be specified.")
5157 raise error.Abort(err)
5157 raise error.Abort(err)
5158
5158
5159 pullopargs.update(opts.get('opargs', {}))
5159 pullopargs.update(opts.get('opargs', {}))
5160 modheads = exchange.pull(repo, other, heads=revs,
5160 modheads = exchange.pull(repo, other, heads=revs,
5161 force=opts.get('force'),
5161 force=opts.get('force'),
5162 bookmarks=opts.get('bookmark', ()),
5162 bookmarks=opts.get('bookmark', ()),
5163 opargs=pullopargs).cgresult
5163 opargs=pullopargs).cgresult
5164
5164
5165 # brev is a name, which might be a bookmark to be activated at
5165 # brev is a name, which might be a bookmark to be activated at
5166 # the end of the update. In other words, it is an explicit
5166 # the end of the update. In other words, it is an explicit
5167 # destination of the update
5167 # destination of the update
5168 brev = None
5168 brev = None
5169
5169
5170 if checkout:
5170 if checkout:
5171 checkout = str(repo.changelog.rev(checkout))
5171 checkout = str(repo.changelog.rev(checkout))
5172
5172
5173 # order below depends on implementation of
5173 # order below depends on implementation of
5174 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5174 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5175 # because 'checkout' is determined without it.
5175 # because 'checkout' is determined without it.
5176 if opts.get('rev'):
5176 if opts.get('rev'):
5177 brev = opts['rev'][0]
5177 brev = opts['rev'][0]
5178 elif opts.get('branch'):
5178 elif opts.get('branch'):
5179 brev = opts['branch'][0]
5179 brev = opts['branch'][0]
5180 else:
5180 else:
5181 brev = branches[0]
5181 brev = branches[0]
5182 repo._subtoppath = source
5182 repo._subtoppath = source
5183 try:
5183 try:
5184 ret = postincoming(ui, repo, modheads, opts.get('update'),
5184 ret = postincoming(ui, repo, modheads, opts.get('update'),
5185 checkout, brev)
5185 checkout, brev)
5186
5186
5187 finally:
5187 finally:
5188 del repo._subtoppath
5188 del repo._subtoppath
5189
5189
5190 finally:
5190 finally:
5191 other.close()
5191 other.close()
5192 return ret
5192 return ret
5193
5193
5194 @command('^push',
5194 @command('^push',
5195 [('f', 'force', None, _('force push')),
5195 [('f', 'force', None, _('force push')),
5196 ('r', 'rev', [],
5196 ('r', 'rev', [],
5197 _('a changeset intended to be included in the destination'),
5197 _('a changeset intended to be included in the destination'),
5198 _('REV')),
5198 _('REV')),
5199 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
5199 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
5200 ('b', 'branch', [],
5200 ('b', 'branch', [],
5201 _('a specific branch you would like to push'), _('BRANCH')),
5201 _('a specific branch you would like to push'), _('BRANCH')),
5202 ('', 'new-branch', False, _('allow pushing a new branch')),
5202 ('', 'new-branch', False, _('allow pushing a new branch')),
5203 ] + remoteopts,
5203 ] + remoteopts,
5204 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
5204 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
5205 def push(ui, repo, dest=None, **opts):
5205 def push(ui, repo, dest=None, **opts):
5206 """push changes to the specified destination
5206 """push changes to the specified destination
5207
5207
5208 Push changesets from the local repository to the specified
5208 Push changesets from the local repository to the specified
5209 destination.
5209 destination.
5210
5210
5211 This operation is symmetrical to pull: it is identical to a pull
5211 This operation is symmetrical to pull: it is identical to a pull
5212 in the destination repository from the current one.
5212 in the destination repository from the current one.
5213
5213
5214 By default, push will not allow creation of new heads at the
5214 By default, push will not allow creation of new heads at the
5215 destination, since multiple heads would make it unclear which head
5215 destination, since multiple heads would make it unclear which head
5216 to use. In this situation, it is recommended to pull and merge
5216 to use. In this situation, it is recommended to pull and merge
5217 before pushing.
5217 before pushing.
5218
5218
5219 Use --new-branch if you want to allow push to create a new named
5219 Use --new-branch if you want to allow push to create a new named
5220 branch that is not present at the destination. This allows you to
5220 branch that is not present at the destination. This allows you to
5221 only create a new branch without forcing other changes.
5221 only create a new branch without forcing other changes.
5222
5222
5223 .. note::
5223 .. note::
5224
5224
5225 Extra care should be taken with the -f/--force option,
5225 Extra care should be taken with the -f/--force option,
5226 which will push all new heads on all branches, an action which will
5226 which will push all new heads on all branches, an action which will
5227 almost always cause confusion for collaborators.
5227 almost always cause confusion for collaborators.
5228
5228
5229 If -r/--rev is used, the specified revision and all its ancestors
5229 If -r/--rev is used, the specified revision and all its ancestors
5230 will be pushed to the remote repository.
5230 will be pushed to the remote repository.
5231
5231
5232 If -B/--bookmark is used, the specified bookmarked revision, its
5232 If -B/--bookmark is used, the specified bookmarked revision, its
5233 ancestors, and the bookmark will be pushed to the remote
5233 ancestors, and the bookmark will be pushed to the remote
5234 repository. Specifying ``.`` is equivalent to specifying the active
5234 repository. Specifying ``.`` is equivalent to specifying the active
5235 bookmark's name.
5235 bookmark's name.
5236
5236
5237 Please see :hg:`help urls` for important details about ``ssh://``
5237 Please see :hg:`help urls` for important details about ``ssh://``
5238 URLs. If DESTINATION is omitted, a default path will be used.
5238 URLs. If DESTINATION is omitted, a default path will be used.
5239
5239
5240 Returns 0 if push was successful, 1 if nothing to push.
5240 Returns 0 if push was successful, 1 if nothing to push.
5241 """
5241 """
5242
5242
5243 if opts.get('bookmark'):
5243 if opts.get('bookmark'):
5244 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
5244 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
5245 for b in opts['bookmark']:
5245 for b in opts['bookmark']:
5246 # translate -B options to -r so changesets get pushed
5246 # translate -B options to -r so changesets get pushed
5247 b = repo._bookmarks.expandname(b)
5247 b = repo._bookmarks.expandname(b)
5248 if b in repo._bookmarks:
5248 if b in repo._bookmarks:
5249 opts.setdefault('rev', []).append(b)
5249 opts.setdefault('rev', []).append(b)
5250 else:
5250 else:
5251 # if we try to push a deleted bookmark, translate it to null
5251 # if we try to push a deleted bookmark, translate it to null
5252 # this lets simultaneous -r, -b options continue working
5252 # this lets simultaneous -r, -b options continue working
5253 opts.setdefault('rev', []).append("null")
5253 opts.setdefault('rev', []).append("null")
5254
5254
5255 path = ui.paths.getpath(dest, default=('default-push', 'default'))
5255 path = ui.paths.getpath(dest, default=('default-push', 'default'))
5256 if not path:
5256 if not path:
5257 raise error.Abort(_('default repository not configured!'),
5257 raise error.Abort(_('default repository not configured!'),
5258 hint=_("see 'hg help config.paths'"))
5258 hint=_("see 'hg help config.paths'"))
5259 dest = path.pushloc or path.loc
5259 dest = path.pushloc or path.loc
5260 branches = (path.branch, opts.get('branch') or [])
5260 branches = (path.branch, opts.get('branch') or [])
5261 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
5261 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
5262 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
5262 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
5263 other = hg.peer(repo, opts, dest)
5263 other = hg.peer(repo, opts, dest)
5264
5264
5265 if revs:
5265 if revs:
5266 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
5266 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
5267 if not revs:
5267 if not revs:
5268 raise error.Abort(_("specified revisions evaluate to an empty set"),
5268 raise error.Abort(_("specified revisions evaluate to an empty set"),
5269 hint=_("use different revision arguments"))
5269 hint=_("use different revision arguments"))
5270 elif path.pushrev:
5270 elif path.pushrev:
5271 # It doesn't make any sense to specify ancestor revisions. So limit
5271 # It doesn't make any sense to specify ancestor revisions. So limit
5272 # to DAG heads to make discovery simpler.
5272 # to DAG heads to make discovery simpler.
5273 expr = revset.formatspec('heads(%r)', path.pushrev)
5273 expr = revset.formatspec('heads(%r)', path.pushrev)
5274 revs = scmutil.revrange(repo, [expr])
5274 revs = scmutil.revrange(repo, [expr])
5275 revs = [repo[rev].node() for rev in revs]
5275 revs = [repo[rev].node() for rev in revs]
5276 if not revs:
5276 if not revs:
5277 raise error.Abort(_('default push revset for path evaluates to an '
5277 raise error.Abort(_('default push revset for path evaluates to an '
5278 'empty set'))
5278 'empty set'))
5279
5279
5280 repo._subtoppath = dest
5280 repo._subtoppath = dest
5281 try:
5281 try:
5282 # push subrepos depth-first for coherent ordering
5282 # push subrepos depth-first for coherent ordering
5283 c = repo['']
5283 c = repo['']
5284 subs = c.substate # only repos that are committed
5284 subs = c.substate # only repos that are committed
5285 for s in sorted(subs):
5285 for s in sorted(subs):
5286 result = c.sub(s).push(opts)
5286 result = c.sub(s).push(opts)
5287 if result == 0:
5287 if result == 0:
5288 return not result
5288 return not result
5289 finally:
5289 finally:
5290 del repo._subtoppath
5290 del repo._subtoppath
5291 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
5291 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
5292 newbranch=opts.get('new_branch'),
5292 newbranch=opts.get('new_branch'),
5293 bookmarks=opts.get('bookmark', ()),
5293 bookmarks=opts.get('bookmark', ()),
5294 opargs=opts.get('opargs'))
5294 opargs=opts.get('opargs'))
5295
5295
5296 result = not pushop.cgresult
5296 result = not pushop.cgresult
5297
5297
5298 if pushop.bkresult is not None:
5298 if pushop.bkresult is not None:
5299 if pushop.bkresult == 2:
5299 if pushop.bkresult == 2:
5300 result = 2
5300 result = 2
5301 elif not result and pushop.bkresult:
5301 elif not result and pushop.bkresult:
5302 result = 2
5302 result = 2
5303
5303
5304 return result
5304 return result
5305
5305
5306 @command('recover', [])
5306 @command('recover', [])
5307 def recover(ui, repo):
5307 def recover(ui, repo):
5308 """roll back an interrupted transaction
5308 """roll back an interrupted transaction
5309
5309
5310 Recover from an interrupted commit or pull.
5310 Recover from an interrupted commit or pull.
5311
5311
5312 This command tries to fix the repository status after an
5312 This command tries to fix the repository status after an
5313 interrupted operation. It should only be necessary when Mercurial
5313 interrupted operation. It should only be necessary when Mercurial
5314 suggests it.
5314 suggests it.
5315
5315
5316 Returns 0 if successful, 1 if nothing to recover or verify fails.
5316 Returns 0 if successful, 1 if nothing to recover or verify fails.
5317 """
5317 """
5318 if repo.recover():
5318 if repo.recover():
5319 return hg.verify(repo)
5319 return hg.verify(repo)
5320 return 1
5320 return 1
5321
5321
5322 @command('^remove|rm',
5322 @command('^remove|rm',
5323 [('A', 'after', None, _('record delete for missing files')),
5323 [('A', 'after', None, _('record delete for missing files')),
5324 ('f', 'force', None,
5324 ('f', 'force', None,
5325 _('forget added files, delete modified files')),
5325 _('forget added files, delete modified files')),
5326 ] + subrepoopts + walkopts,
5326 ] + subrepoopts + walkopts,
5327 _('[OPTION]... FILE...'),
5327 _('[OPTION]... FILE...'),
5328 inferrepo=True)
5328 inferrepo=True)
5329 def remove(ui, repo, *pats, **opts):
5329 def remove(ui, repo, *pats, **opts):
5330 """remove the specified files on the next commit
5330 """remove the specified files on the next commit
5331
5331
5332 Schedule the indicated files for removal from the current branch.
5332 Schedule the indicated files for removal from the current branch.
5333
5333
5334 This command schedules the files to be removed at the next commit.
5334 This command schedules the files to be removed at the next commit.
5335 To undo a remove before that, see :hg:`revert`. To undo added
5335 To undo a remove before that, see :hg:`revert`. To undo added
5336 files, see :hg:`forget`.
5336 files, see :hg:`forget`.
5337
5337
5338 .. container:: verbose
5338 .. container:: verbose
5339
5339
5340 -A/--after can be used to remove only files that have already
5340 -A/--after can be used to remove only files that have already
5341 been deleted, -f/--force can be used to force deletion, and -Af
5341 been deleted, -f/--force can be used to force deletion, and -Af
5342 can be used to remove files from the next revision without
5342 can be used to remove files from the next revision without
5343 deleting them from the working directory.
5343 deleting them from the working directory.
5344
5344
5345 The following table details the behavior of remove for different
5345 The following table details the behavior of remove for different
5346 file states (columns) and option combinations (rows). The file
5346 file states (columns) and option combinations (rows). The file
5347 states are Added [A], Clean [C], Modified [M] and Missing [!]
5347 states are Added [A], Clean [C], Modified [M] and Missing [!]
5348 (as reported by :hg:`status`). The actions are Warn, Remove
5348 (as reported by :hg:`status`). The actions are Warn, Remove
5349 (from branch) and Delete (from disk):
5349 (from branch) and Delete (from disk):
5350
5350
5351 ========= == == == ==
5351 ========= == == == ==
5352 opt/state A C M !
5352 opt/state A C M !
5353 ========= == == == ==
5353 ========= == == == ==
5354 none W RD W R
5354 none W RD W R
5355 -f R RD RD R
5355 -f R RD RD R
5356 -A W W W R
5356 -A W W W R
5357 -Af R R R R
5357 -Af R R R R
5358 ========= == == == ==
5358 ========= == == == ==
5359
5359
5360 .. note::
5360 .. note::
5361
5361
5362 :hg:`remove` never deletes files in Added [A] state from the
5362 :hg:`remove` never deletes files in Added [A] state from the
5363 working directory, not even if ``--force`` is specified.
5363 working directory, not even if ``--force`` is specified.
5364
5364
5365 Returns 0 on success, 1 if any warnings encountered.
5365 Returns 0 on success, 1 if any warnings encountered.
5366 """
5366 """
5367
5367
5368 after, force = opts.get('after'), opts.get('force')
5368 after, force = opts.get('after'), opts.get('force')
5369 if not pats and not after:
5369 if not pats and not after:
5370 raise error.Abort(_('no files specified'))
5370 raise error.Abort(_('no files specified'))
5371
5371
5372 m = scmutil.match(repo[None], pats, opts)
5372 m = scmutil.match(repo[None], pats, opts)
5373 subrepos = opts.get('subrepos')
5373 subrepos = opts.get('subrepos')
5374 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
5374 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
5375
5375
5376 @command('rename|move|mv',
5376 @command('rename|move|mv',
5377 [('A', 'after', None, _('record a rename that has already occurred')),
5377 [('A', 'after', None, _('record a rename that has already occurred')),
5378 ('f', 'force', None, _('forcibly copy over an existing managed file')),
5378 ('f', 'force', None, _('forcibly copy over an existing managed file')),
5379 ] + walkopts + dryrunopts,
5379 ] + walkopts + dryrunopts,
5380 _('[OPTION]... SOURCE... DEST'))
5380 _('[OPTION]... SOURCE... DEST'))
5381 def rename(ui, repo, *pats, **opts):
5381 def rename(ui, repo, *pats, **opts):
5382 """rename files; equivalent of copy + remove
5382 """rename files; equivalent of copy + remove
5383
5383
5384 Mark dest as copies of sources; mark sources for deletion. If dest
5384 Mark dest as copies of sources; mark sources for deletion. If dest
5385 is a directory, copies are put in that directory. If dest is a
5385 is a directory, copies are put in that directory. If dest is a
5386 file, there can only be one source.
5386 file, there can only be one source.
5387
5387
5388 By default, this command copies the contents of files as they
5388 By default, this command copies the contents of files as they
5389 exist in the working directory. If invoked with -A/--after, the
5389 exist in the working directory. If invoked with -A/--after, the
5390 operation is recorded, but no copying is performed.
5390 operation is recorded, but no copying is performed.
5391
5391
5392 This command takes effect at the next commit. To undo a rename
5392 This command takes effect at the next commit. To undo a rename
5393 before that, see :hg:`revert`.
5393 before that, see :hg:`revert`.
5394
5394
5395 Returns 0 on success, 1 if errors are encountered.
5395 Returns 0 on success, 1 if errors are encountered.
5396 """
5396 """
5397 with repo.wlock(False):
5397 with repo.wlock(False):
5398 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5398 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5399
5399
5400 @command('resolve',
5400 @command('resolve',
5401 [('a', 'all', None, _('select all unresolved files')),
5401 [('a', 'all', None, _('select all unresolved files')),
5402 ('l', 'list', None, _('list state of files needing merge')),
5402 ('l', 'list', None, _('list state of files needing merge')),
5403 ('m', 'mark', None, _('mark files as resolved')),
5403 ('m', 'mark', None, _('mark files as resolved')),
5404 ('u', 'unmark', None, _('mark files as unresolved')),
5404 ('u', 'unmark', None, _('mark files as unresolved')),
5405 ('n', 'no-status', None, _('hide status prefix'))]
5405 ('n', 'no-status', None, _('hide status prefix'))]
5406 + mergetoolopts + walkopts + formatteropts,
5406 + mergetoolopts + walkopts + formatteropts,
5407 _('[OPTION]... [FILE]...'),
5407 _('[OPTION]... [FILE]...'),
5408 inferrepo=True)
5408 inferrepo=True)
5409 def resolve(ui, repo, *pats, **opts):
5409 def resolve(ui, repo, *pats, **opts):
5410 """redo merges or set/view the merge status of files
5410 """redo merges or set/view the merge status of files
5411
5411
5412 Merges with unresolved conflicts are often the result of
5412 Merges with unresolved conflicts are often the result of
5413 non-interactive merging using the ``internal:merge`` configuration
5413 non-interactive merging using the ``internal:merge`` configuration
5414 setting, or a command-line merge tool like ``diff3``. The resolve
5414 setting, or a command-line merge tool like ``diff3``. The resolve
5415 command is used to manage the files involved in a merge, after
5415 command is used to manage the files involved in a merge, after
5416 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5416 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5417 working directory must have two parents). See :hg:`help
5417 working directory must have two parents). See :hg:`help
5418 merge-tools` for information on configuring merge tools.
5418 merge-tools` for information on configuring merge tools.
5419
5419
5420 The resolve command can be used in the following ways:
5420 The resolve command can be used in the following ways:
5421
5421
5422 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
5422 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
5423 files, discarding any previous merge attempts. Re-merging is not
5423 files, discarding any previous merge attempts. Re-merging is not
5424 performed for files already marked as resolved. Use ``--all/-a``
5424 performed for files already marked as resolved. Use ``--all/-a``
5425 to select all unresolved files. ``--tool`` can be used to specify
5425 to select all unresolved files. ``--tool`` can be used to specify
5426 the merge tool used for the given files. It overrides the HGMERGE
5426 the merge tool used for the given files. It overrides the HGMERGE
5427 environment variable and your configuration files. Previous file
5427 environment variable and your configuration files. Previous file
5428 contents are saved with a ``.orig`` suffix.
5428 contents are saved with a ``.orig`` suffix.
5429
5429
5430 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5430 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5431 (e.g. after having manually fixed-up the files). The default is
5431 (e.g. after having manually fixed-up the files). The default is
5432 to mark all unresolved files.
5432 to mark all unresolved files.
5433
5433
5434 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5434 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5435 default is to mark all resolved files.
5435 default is to mark all resolved files.
5436
5436
5437 - :hg:`resolve -l`: list files which had or still have conflicts.
5437 - :hg:`resolve -l`: list files which had or still have conflicts.
5438 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5438 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5439
5439
5440 .. note::
5440 .. note::
5441
5441
5442 Mercurial will not let you commit files with unresolved merge
5442 Mercurial will not let you commit files with unresolved merge
5443 conflicts. You must use :hg:`resolve -m ...` before you can
5443 conflicts. You must use :hg:`resolve -m ...` before you can
5444 commit after a conflicting merge.
5444 commit after a conflicting merge.
5445
5445
5446 Returns 0 on success, 1 if any files fail a resolve attempt.
5446 Returns 0 on success, 1 if any files fail a resolve attempt.
5447 """
5447 """
5448
5448
5449 flaglist = 'all mark unmark list no_status'.split()
5449 flaglist = 'all mark unmark list no_status'.split()
5450 all, mark, unmark, show, nostatus = \
5450 all, mark, unmark, show, nostatus = \
5451 [opts.get(o) for o in flaglist]
5451 [opts.get(o) for o in flaglist]
5452
5452
5453 if (show and (mark or unmark)) or (mark and unmark):
5453 if (show and (mark or unmark)) or (mark and unmark):
5454 raise error.Abort(_("too many options specified"))
5454 raise error.Abort(_("too many options specified"))
5455 if pats and all:
5455 if pats and all:
5456 raise error.Abort(_("can't specify --all and patterns"))
5456 raise error.Abort(_("can't specify --all and patterns"))
5457 if not (all or pats or show or mark or unmark):
5457 if not (all or pats or show or mark or unmark):
5458 raise error.Abort(_('no files or directories specified'),
5458 raise error.Abort(_('no files or directories specified'),
5459 hint=('use --all to re-merge all unresolved files'))
5459 hint=('use --all to re-merge all unresolved files'))
5460
5460
5461 if show:
5461 if show:
5462 fm = ui.formatter('resolve', opts)
5462 fm = ui.formatter('resolve', opts)
5463 ms = mergemod.mergestate.read(repo)
5463 ms = mergemod.mergestate.read(repo)
5464 m = scmutil.match(repo[None], pats, opts)
5464 m = scmutil.match(repo[None], pats, opts)
5465 for f in ms:
5465 for f in ms:
5466 if not m(f):
5466 if not m(f):
5467 continue
5467 continue
5468 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
5468 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
5469 'd': 'driverresolved'}[ms[f]]
5469 'd': 'driverresolved'}[ms[f]]
5470 fm.startitem()
5470 fm.startitem()
5471 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
5471 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
5472 fm.write('path', '%s\n', f, label=l)
5472 fm.write('path', '%s\n', f, label=l)
5473 fm.end()
5473 fm.end()
5474 return 0
5474 return 0
5475
5475
5476 with repo.wlock():
5476 with repo.wlock():
5477 ms = mergemod.mergestate.read(repo)
5477 ms = mergemod.mergestate.read(repo)
5478
5478
5479 if not (ms.active() or repo.dirstate.p2() != nullid):
5479 if not (ms.active() or repo.dirstate.p2() != nullid):
5480 raise error.Abort(
5480 raise error.Abort(
5481 _('resolve command not applicable when not merging'))
5481 _('resolve command not applicable when not merging'))
5482
5482
5483 wctx = repo[None]
5483 wctx = repo[None]
5484
5484
5485 if ms.mergedriver and ms.mdstate() == 'u':
5485 if ms.mergedriver and ms.mdstate() == 'u':
5486 proceed = mergemod.driverpreprocess(repo, ms, wctx)
5486 proceed = mergemod.driverpreprocess(repo, ms, wctx)
5487 ms.commit()
5487 ms.commit()
5488 # allow mark and unmark to go through
5488 # allow mark and unmark to go through
5489 if not mark and not unmark and not proceed:
5489 if not mark and not unmark and not proceed:
5490 return 1
5490 return 1
5491
5491
5492 m = scmutil.match(wctx, pats, opts)
5492 m = scmutil.match(wctx, pats, opts)
5493 ret = 0
5493 ret = 0
5494 didwork = False
5494 didwork = False
5495 runconclude = False
5495 runconclude = False
5496
5496
5497 tocomplete = []
5497 tocomplete = []
5498 for f in ms:
5498 for f in ms:
5499 if not m(f):
5499 if not m(f):
5500 continue
5500 continue
5501
5501
5502 didwork = True
5502 didwork = True
5503
5503
5504 # don't let driver-resolved files be marked, and run the conclude
5504 # don't let driver-resolved files be marked, and run the conclude
5505 # step if asked to resolve
5505 # step if asked to resolve
5506 if ms[f] == "d":
5506 if ms[f] == "d":
5507 exact = m.exact(f)
5507 exact = m.exact(f)
5508 if mark:
5508 if mark:
5509 if exact:
5509 if exact:
5510 ui.warn(_('not marking %s as it is driver-resolved\n')
5510 ui.warn(_('not marking %s as it is driver-resolved\n')
5511 % f)
5511 % f)
5512 elif unmark:
5512 elif unmark:
5513 if exact:
5513 if exact:
5514 ui.warn(_('not unmarking %s as it is driver-resolved\n')
5514 ui.warn(_('not unmarking %s as it is driver-resolved\n')
5515 % f)
5515 % f)
5516 else:
5516 else:
5517 runconclude = True
5517 runconclude = True
5518 continue
5518 continue
5519
5519
5520 if mark:
5520 if mark:
5521 ms.mark(f, "r")
5521 ms.mark(f, "r")
5522 elif unmark:
5522 elif unmark:
5523 ms.mark(f, "u")
5523 ms.mark(f, "u")
5524 else:
5524 else:
5525 # backup pre-resolve (merge uses .orig for its own purposes)
5525 # backup pre-resolve (merge uses .orig for its own purposes)
5526 a = repo.wjoin(f)
5526 a = repo.wjoin(f)
5527 try:
5527 try:
5528 util.copyfile(a, a + ".resolve")
5528 util.copyfile(a, a + ".resolve")
5529 except (IOError, OSError) as inst:
5529 except (IOError, OSError) as inst:
5530 if inst.errno != errno.ENOENT:
5530 if inst.errno != errno.ENOENT:
5531 raise
5531 raise
5532
5532
5533 try:
5533 try:
5534 # preresolve file
5534 # preresolve file
5535 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
5535 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
5536 'resolve')
5536 'resolve')
5537 complete, r = ms.preresolve(f, wctx)
5537 complete, r = ms.preresolve(f, wctx)
5538 if not complete:
5538 if not complete:
5539 tocomplete.append(f)
5539 tocomplete.append(f)
5540 elif r:
5540 elif r:
5541 ret = 1
5541 ret = 1
5542 finally:
5542 finally:
5543 ui.setconfig('ui', 'forcemerge', '', 'resolve')
5543 ui.setconfig('ui', 'forcemerge', '', 'resolve')
5544 ms.commit()
5544 ms.commit()
5545
5545
5546 # replace filemerge's .orig file with our resolve file, but only
5546 # replace filemerge's .orig file with our resolve file, but only
5547 # for merges that are complete
5547 # for merges that are complete
5548 if complete:
5548 if complete:
5549 try:
5549 try:
5550 util.rename(a + ".resolve",
5550 util.rename(a + ".resolve",
5551 scmutil.origpath(ui, repo, a))
5551 scmutil.origpath(ui, repo, a))
5552 except OSError as inst:
5552 except OSError as inst:
5553 if inst.errno != errno.ENOENT:
5553 if inst.errno != errno.ENOENT:
5554 raise
5554 raise
5555
5555
5556 for f in tocomplete:
5556 for f in tocomplete:
5557 try:
5557 try:
5558 # resolve file
5558 # resolve file
5559 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
5559 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
5560 'resolve')
5560 'resolve')
5561 r = ms.resolve(f, wctx)
5561 r = ms.resolve(f, wctx)
5562 if r:
5562 if r:
5563 ret = 1
5563 ret = 1
5564 finally:
5564 finally:
5565 ui.setconfig('ui', 'forcemerge', '', 'resolve')
5565 ui.setconfig('ui', 'forcemerge', '', 'resolve')
5566 ms.commit()
5566 ms.commit()
5567
5567
5568 # replace filemerge's .orig file with our resolve file
5568 # replace filemerge's .orig file with our resolve file
5569 a = repo.wjoin(f)
5569 a = repo.wjoin(f)
5570 try:
5570 try:
5571 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
5571 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
5572 except OSError as inst:
5572 except OSError as inst:
5573 if inst.errno != errno.ENOENT:
5573 if inst.errno != errno.ENOENT:
5574 raise
5574 raise
5575
5575
5576 ms.commit()
5576 ms.commit()
5577 ms.recordactions()
5577 ms.recordactions()
5578
5578
5579 if not didwork and pats:
5579 if not didwork and pats:
5580 hint = None
5580 hint = None
5581 if not any([p for p in pats if p.find(':') >= 0]):
5581 if not any([p for p in pats if p.find(':') >= 0]):
5582 pats = ['path:%s' % p for p in pats]
5582 pats = ['path:%s' % p for p in pats]
5583 m = scmutil.match(wctx, pats, opts)
5583 m = scmutil.match(wctx, pats, opts)
5584 for f in ms:
5584 for f in ms:
5585 if not m(f):
5585 if not m(f):
5586 continue
5586 continue
5587 flags = ''.join(['-%s ' % o[0] for o in flaglist
5587 flags = ''.join(['-%s ' % o[0] for o in flaglist
5588 if opts.get(o)])
5588 if opts.get(o)])
5589 hint = _("(try: hg resolve %s%s)\n") % (
5589 hint = _("(try: hg resolve %s%s)\n") % (
5590 flags,
5590 flags,
5591 ' '.join(pats))
5591 ' '.join(pats))
5592 break
5592 break
5593 ui.warn(_("arguments do not match paths that need resolving\n"))
5593 ui.warn(_("arguments do not match paths that need resolving\n"))
5594 if hint:
5594 if hint:
5595 ui.warn(hint)
5595 ui.warn(hint)
5596 elif ms.mergedriver and ms.mdstate() != 's':
5596 elif ms.mergedriver and ms.mdstate() != 's':
5597 # run conclude step when either a driver-resolved file is requested
5597 # run conclude step when either a driver-resolved file is requested
5598 # or there are no driver-resolved files
5598 # or there are no driver-resolved files
5599 # we can't use 'ret' to determine whether any files are unresolved
5599 # we can't use 'ret' to determine whether any files are unresolved
5600 # because we might not have tried to resolve some
5600 # because we might not have tried to resolve some
5601 if ((runconclude or not list(ms.driverresolved()))
5601 if ((runconclude or not list(ms.driverresolved()))
5602 and not list(ms.unresolved())):
5602 and not list(ms.unresolved())):
5603 proceed = mergemod.driverconclude(repo, ms, wctx)
5603 proceed = mergemod.driverconclude(repo, ms, wctx)
5604 ms.commit()
5604 ms.commit()
5605 if not proceed:
5605 if not proceed:
5606 return 1
5606 return 1
5607
5607
5608 # Nudge users into finishing an unfinished operation
5608 # Nudge users into finishing an unfinished operation
5609 unresolvedf = list(ms.unresolved())
5609 unresolvedf = list(ms.unresolved())
5610 driverresolvedf = list(ms.driverresolved())
5610 driverresolvedf = list(ms.driverresolved())
5611 if not unresolvedf and not driverresolvedf:
5611 if not unresolvedf and not driverresolvedf:
5612 ui.status(_('(no more unresolved files)\n'))
5612 ui.status(_('(no more unresolved files)\n'))
5613 cmdutil.checkafterresolved(repo)
5613 cmdutil.checkafterresolved(repo)
5614 elif not unresolvedf:
5614 elif not unresolvedf:
5615 ui.status(_('(no more unresolved files -- '
5615 ui.status(_('(no more unresolved files -- '
5616 'run "hg resolve --all" to conclude)\n'))
5616 'run "hg resolve --all" to conclude)\n'))
5617
5617
5618 return ret
5618 return ret
5619
5619
5620 @command('revert',
5620 @command('revert',
5621 [('a', 'all', None, _('revert all changes when no arguments given')),
5621 [('a', 'all', None, _('revert all changes when no arguments given')),
5622 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5622 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5623 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
5623 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
5624 ('C', 'no-backup', None, _('do not save backup copies of files')),
5624 ('C', 'no-backup', None, _('do not save backup copies of files')),
5625 ('i', 'interactive', None,
5625 ('i', 'interactive', None,
5626 _('interactively select the changes (EXPERIMENTAL)')),
5626 _('interactively select the changes (EXPERIMENTAL)')),
5627 ] + walkopts + dryrunopts,
5627 ] + walkopts + dryrunopts,
5628 _('[OPTION]... [-r REV] [NAME]...'))
5628 _('[OPTION]... [-r REV] [NAME]...'))
5629 def revert(ui, repo, *pats, **opts):
5629 def revert(ui, repo, *pats, **opts):
5630 """restore files to their checkout state
5630 """restore files to their checkout state
5631
5631
5632 .. note::
5632 .. note::
5633
5633
5634 To check out earlier revisions, you should use :hg:`update REV`.
5634 To check out earlier revisions, you should use :hg:`update REV`.
5635 To cancel an uncommitted merge (and lose your changes),
5635 To cancel an uncommitted merge (and lose your changes),
5636 use :hg:`update --clean .`.
5636 use :hg:`update --clean .`.
5637
5637
5638 With no revision specified, revert the specified files or directories
5638 With no revision specified, revert the specified files or directories
5639 to the contents they had in the parent of the working directory.
5639 to the contents they had in the parent of the working directory.
5640 This restores the contents of files to an unmodified
5640 This restores the contents of files to an unmodified
5641 state and unschedules adds, removes, copies, and renames. If the
5641 state and unschedules adds, removes, copies, and renames. If the
5642 working directory has two parents, you must explicitly specify a
5642 working directory has two parents, you must explicitly specify a
5643 revision.
5643 revision.
5644
5644
5645 Using the -r/--rev or -d/--date options, revert the given files or
5645 Using the -r/--rev or -d/--date options, revert the given files or
5646 directories to their states as of a specific revision. Because
5646 directories to their states as of a specific revision. Because
5647 revert does not change the working directory parents, this will
5647 revert does not change the working directory parents, this will
5648 cause these files to appear modified. This can be helpful to "back
5648 cause these files to appear modified. This can be helpful to "back
5649 out" some or all of an earlier change. See :hg:`backout` for a
5649 out" some or all of an earlier change. See :hg:`backout` for a
5650 related method.
5650 related method.
5651
5651
5652 Modified files are saved with a .orig suffix before reverting.
5652 Modified files are saved with a .orig suffix before reverting.
5653 To disable these backups, use --no-backup. It is possible to store
5653 To disable these backups, use --no-backup. It is possible to store
5654 the backup files in a custom directory relative to the root of the
5654 the backup files in a custom directory relative to the root of the
5655 repository by setting the ``ui.origbackuppath`` configuration
5655 repository by setting the ``ui.origbackuppath`` configuration
5656 option.
5656 option.
5657
5657
5658 See :hg:`help dates` for a list of formats valid for -d/--date.
5658 See :hg:`help dates` for a list of formats valid for -d/--date.
5659
5659
5660 See :hg:`help backout` for a way to reverse the effect of an
5660 See :hg:`help backout` for a way to reverse the effect of an
5661 earlier changeset.
5661 earlier changeset.
5662
5662
5663 Returns 0 on success.
5663 Returns 0 on success.
5664 """
5664 """
5665
5665
5666 if opts.get("date"):
5666 if opts.get("date"):
5667 if opts.get("rev"):
5667 if opts.get("rev"):
5668 raise error.Abort(_("you can't specify a revision and a date"))
5668 raise error.Abort(_("you can't specify a revision and a date"))
5669 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
5669 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
5670
5670
5671 parent, p2 = repo.dirstate.parents()
5671 parent, p2 = repo.dirstate.parents()
5672 if not opts.get('rev') and p2 != nullid:
5672 if not opts.get('rev') and p2 != nullid:
5673 # revert after merge is a trap for new users (issue2915)
5673 # revert after merge is a trap for new users (issue2915)
5674 raise error.Abort(_('uncommitted merge with no revision specified'),
5674 raise error.Abort(_('uncommitted merge with no revision specified'),
5675 hint=_("use 'hg update' or see 'hg help revert'"))
5675 hint=_("use 'hg update' or see 'hg help revert'"))
5676
5676
5677 ctx = scmutil.revsingle(repo, opts.get('rev'))
5677 ctx = scmutil.revsingle(repo, opts.get('rev'))
5678
5678
5679 if (not (pats or opts.get('include') or opts.get('exclude') or
5679 if (not (pats or opts.get('include') or opts.get('exclude') or
5680 opts.get('all') or opts.get('interactive'))):
5680 opts.get('all') or opts.get('interactive'))):
5681 msg = _("no files or directories specified")
5681 msg = _("no files or directories specified")
5682 if p2 != nullid:
5682 if p2 != nullid:
5683 hint = _("uncommitted merge, use --all to discard all changes,"
5683 hint = _("uncommitted merge, use --all to discard all changes,"
5684 " or 'hg update -C .' to abort the merge")
5684 " or 'hg update -C .' to abort the merge")
5685 raise error.Abort(msg, hint=hint)
5685 raise error.Abort(msg, hint=hint)
5686 dirty = any(repo.status())
5686 dirty = any(repo.status())
5687 node = ctx.node()
5687 node = ctx.node()
5688 if node != parent:
5688 if node != parent:
5689 if dirty:
5689 if dirty:
5690 hint = _("uncommitted changes, use --all to discard all"
5690 hint = _("uncommitted changes, use --all to discard all"
5691 " changes, or 'hg update %s' to update") % ctx.rev()
5691 " changes, or 'hg update %s' to update") % ctx.rev()
5692 else:
5692 else:
5693 hint = _("use --all to revert all files,"
5693 hint = _("use --all to revert all files,"
5694 " or 'hg update %s' to update") % ctx.rev()
5694 " or 'hg update %s' to update") % ctx.rev()
5695 elif dirty:
5695 elif dirty:
5696 hint = _("uncommitted changes, use --all to discard all changes")
5696 hint = _("uncommitted changes, use --all to discard all changes")
5697 else:
5697 else:
5698 hint = _("use --all to revert all files")
5698 hint = _("use --all to revert all files")
5699 raise error.Abort(msg, hint=hint)
5699 raise error.Abort(msg, hint=hint)
5700
5700
5701 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
5701 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
5702
5702
5703 @command('rollback', dryrunopts +
5703 @command('rollback', dryrunopts +
5704 [('f', 'force', False, _('ignore safety measures'))])
5704 [('f', 'force', False, _('ignore safety measures'))])
5705 def rollback(ui, repo, **opts):
5705 def rollback(ui, repo, **opts):
5706 """roll back the last transaction (DANGEROUS) (DEPRECATED)
5706 """roll back the last transaction (DANGEROUS) (DEPRECATED)
5707
5707
5708 Please use :hg:`commit --amend` instead of rollback to correct
5708 Please use :hg:`commit --amend` instead of rollback to correct
5709 mistakes in the last commit.
5709 mistakes in the last commit.
5710
5710
5711 This command should be used with care. There is only one level of
5711 This command should be used with care. There is only one level of
5712 rollback, and there is no way to undo a rollback. It will also
5712 rollback, and there is no way to undo a rollback. It will also
5713 restore the dirstate at the time of the last transaction, losing
5713 restore the dirstate at the time of the last transaction, losing
5714 any dirstate changes since that time. This command does not alter
5714 any dirstate changes since that time. This command does not alter
5715 the working directory.
5715 the working directory.
5716
5716
5717 Transactions are used to encapsulate the effects of all commands
5717 Transactions are used to encapsulate the effects of all commands
5718 that create new changesets or propagate existing changesets into a
5718 that create new changesets or propagate existing changesets into a
5719 repository.
5719 repository.
5720
5720
5721 .. container:: verbose
5721 .. container:: verbose
5722
5722
5723 For example, the following commands are transactional, and their
5723 For example, the following commands are transactional, and their
5724 effects can be rolled back:
5724 effects can be rolled back:
5725
5725
5726 - commit
5726 - commit
5727 - import
5727 - import
5728 - pull
5728 - pull
5729 - push (with this repository as the destination)
5729 - push (with this repository as the destination)
5730 - unbundle
5730 - unbundle
5731
5731
5732 To avoid permanent data loss, rollback will refuse to rollback a
5732 To avoid permanent data loss, rollback will refuse to rollback a
5733 commit transaction if it isn't checked out. Use --force to
5733 commit transaction if it isn't checked out. Use --force to
5734 override this protection.
5734 override this protection.
5735
5735
5736 The rollback command can be entirely disabled by setting the
5736 The rollback command can be entirely disabled by setting the
5737 ``ui.rollback`` configuration setting to false. If you're here
5737 ``ui.rollback`` configuration setting to false. If you're here
5738 because you want to use rollback and it's disabled, you can
5738 because you want to use rollback and it's disabled, you can
5739 re-enable the command by setting ``ui.rollback`` to true.
5739 re-enable the command by setting ``ui.rollback`` to true.
5740
5740
5741 This command is not intended for use on public repositories. Once
5741 This command is not intended for use on public repositories. Once
5742 changes are visible for pull by other users, rolling a transaction
5742 changes are visible for pull by other users, rolling a transaction
5743 back locally is ineffective (someone else may already have pulled
5743 back locally is ineffective (someone else may already have pulled
5744 the changes). Furthermore, a race is possible with readers of the
5744 the changes). Furthermore, a race is possible with readers of the
5745 repository; for example an in-progress pull from the repository
5745 repository; for example an in-progress pull from the repository
5746 may fail if a rollback is performed.
5746 may fail if a rollback is performed.
5747
5747
5748 Returns 0 on success, 1 if no rollback data is available.
5748 Returns 0 on success, 1 if no rollback data is available.
5749 """
5749 """
5750 if not ui.configbool('ui', 'rollback', True):
5750 if not ui.configbool('ui', 'rollback', True):
5751 raise error.Abort(_('rollback is disabled because it is unsafe'),
5751 raise error.Abort(_('rollback is disabled because it is unsafe'),
5752 hint=('see `hg help -v rollback` for information'))
5752 hint=('see `hg help -v rollback` for information'))
5753 return repo.rollback(dryrun=opts.get('dry_run'),
5753 return repo.rollback(dryrun=opts.get('dry_run'),
5754 force=opts.get('force'))
5754 force=opts.get('force'))
5755
5755
5756 @command('root', [])
5756 @command('root', [])
5757 def root(ui, repo):
5757 def root(ui, repo):
5758 """print the root (top) of the current working directory
5758 """print the root (top) of the current working directory
5759
5759
5760 Print the root directory of the current repository.
5760 Print the root directory of the current repository.
5761
5761
5762 Returns 0 on success.
5762 Returns 0 on success.
5763 """
5763 """
5764 ui.write(repo.root + "\n")
5764 ui.write(repo.root + "\n")
5765
5765
5766 @command('^serve',
5766 @command('^serve',
5767 [('A', 'accesslog', '', _('name of access log file to write to'),
5767 [('A', 'accesslog', '', _('name of access log file to write to'),
5768 _('FILE')),
5768 _('FILE')),
5769 ('d', 'daemon', None, _('run server in background')),
5769 ('d', 'daemon', None, _('run server in background')),
5770 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
5770 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
5771 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
5771 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
5772 # use string type, then we can check if something was passed
5772 # use string type, then we can check if something was passed
5773 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
5773 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
5774 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
5774 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
5775 _('ADDR')),
5775 _('ADDR')),
5776 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
5776 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
5777 _('PREFIX')),
5777 _('PREFIX')),
5778 ('n', 'name', '',
5778 ('n', 'name', '',
5779 _('name to show in web pages (default: working directory)'), _('NAME')),
5779 _('name to show in web pages (default: working directory)'), _('NAME')),
5780 ('', 'web-conf', '',
5780 ('', 'web-conf', '',
5781 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
5781 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
5782 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
5782 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
5783 _('FILE')),
5783 _('FILE')),
5784 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
5784 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
5785 ('', 'stdio', None, _('for remote clients')),
5785 ('', 'stdio', None, _('for remote clients')),
5786 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
5786 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
5787 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
5787 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
5788 ('', 'style', '', _('template style to use'), _('STYLE')),
5788 ('', 'style', '', _('template style to use'), _('STYLE')),
5789 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
5789 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
5790 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
5790 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
5791 _('[OPTION]...'),
5791 _('[OPTION]...'),
5792 optionalrepo=True)
5792 optionalrepo=True)
5793 def serve(ui, repo, **opts):
5793 def serve(ui, repo, **opts):
5794 """start stand-alone webserver
5794 """start stand-alone webserver
5795
5795
5796 Start a local HTTP repository browser and pull server. You can use
5796 Start a local HTTP repository browser and pull server. You can use
5797 this for ad-hoc sharing and browsing of repositories. It is
5797 this for ad-hoc sharing and browsing of repositories. It is
5798 recommended to use a real web server to serve a repository for
5798 recommended to use a real web server to serve a repository for
5799 longer periods of time.
5799 longer periods of time.
5800
5800
5801 Please note that the server does not implement access control.
5801 Please note that the server does not implement access control.
5802 This means that, by default, anybody can read from the server and
5802 This means that, by default, anybody can read from the server and
5803 nobody can write to it by default. Set the ``web.allow_push``
5803 nobody can write to it by default. Set the ``web.allow_push``
5804 option to ``*`` to allow everybody to push to the server. You
5804 option to ``*`` to allow everybody to push to the server. You
5805 should use a real web server if you need to authenticate users.
5805 should use a real web server if you need to authenticate users.
5806
5806
5807 By default, the server logs accesses to stdout and errors to
5807 By default, the server logs accesses to stdout and errors to
5808 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
5808 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
5809 files.
5809 files.
5810
5810
5811 To have the server choose a free port number to listen on, specify
5811 To have the server choose a free port number to listen on, specify
5812 a port number of 0; in this case, the server will print the port
5812 a port number of 0; in this case, the server will print the port
5813 number it uses.
5813 number it uses.
5814
5814
5815 Returns 0 on success.
5815 Returns 0 on success.
5816 """
5816 """
5817
5817
5818 if opts["stdio"] and opts["cmdserver"]:
5818 if opts["stdio"] and opts["cmdserver"]:
5819 raise error.Abort(_("cannot use --stdio with --cmdserver"))
5819 raise error.Abort(_("cannot use --stdio with --cmdserver"))
5820
5820
5821 if opts["stdio"]:
5821 if opts["stdio"]:
5822 if repo is None:
5822 if repo is None:
5823 raise error.RepoError(_("there is no Mercurial repository here"
5823 raise error.RepoError(_("there is no Mercurial repository here"
5824 " (.hg not found)"))
5824 " (.hg not found)"))
5825 s = sshserver.sshserver(ui, repo)
5825 s = sshserver.sshserver(ui, repo)
5826 s.serve_forever()
5826 s.serve_forever()
5827
5827
5828 service = server.createservice(ui, repo, opts)
5828 service = server.createservice(ui, repo, opts)
5829 return server.runservice(opts, initfn=service.init, runfn=service.run)
5829 return server.runservice(opts, initfn=service.init, runfn=service.run)
5830
5830
5831 @command('^status|st',
5831 @command('^status|st',
5832 [('A', 'all', None, _('show status of all files')),
5832 [('A', 'all', None, _('show status of all files')),
5833 ('m', 'modified', None, _('show only modified files')),
5833 ('m', 'modified', None, _('show only modified files')),
5834 ('a', 'added', None, _('show only added files')),
5834 ('a', 'added', None, _('show only added files')),
5835 ('r', 'removed', None, _('show only removed files')),
5835 ('r', 'removed', None, _('show only removed files')),
5836 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
5836 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
5837 ('c', 'clean', None, _('show only files without changes')),
5837 ('c', 'clean', None, _('show only files without changes')),
5838 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
5838 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
5839 ('i', 'ignored', None, _('show only ignored files')),
5839 ('i', 'ignored', None, _('show only ignored files')),
5840 ('n', 'no-status', None, _('hide status prefix')),
5840 ('n', 'no-status', None, _('hide status prefix')),
5841 ('C', 'copies', None, _('show source of copied files')),
5841 ('C', 'copies', None, _('show source of copied files')),
5842 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5842 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5843 ('', 'rev', [], _('show difference from revision'), _('REV')),
5843 ('', 'rev', [], _('show difference from revision'), _('REV')),
5844 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
5844 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
5845 ] + walkopts + subrepoopts + formatteropts,
5845 ] + walkopts + subrepoopts + formatteropts,
5846 _('[OPTION]... [FILE]...'),
5846 _('[OPTION]... [FILE]...'),
5847 inferrepo=True)
5847 inferrepo=True)
5848 def status(ui, repo, *pats, **opts):
5848 def status(ui, repo, *pats, **opts):
5849 """show changed files in the working directory
5849 """show changed files in the working directory
5850
5850
5851 Show status of files in the repository. If names are given, only
5851 Show status of files in the repository. If names are given, only
5852 files that match are shown. Files that are clean or ignored or
5852 files that match are shown. Files that are clean or ignored or
5853 the source of a copy/move operation, are not listed unless
5853 the source of a copy/move operation, are not listed unless
5854 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
5854 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
5855 Unless options described with "show only ..." are given, the
5855 Unless options described with "show only ..." are given, the
5856 options -mardu are used.
5856 options -mardu are used.
5857
5857
5858 Option -q/--quiet hides untracked (unknown and ignored) files
5858 Option -q/--quiet hides untracked (unknown and ignored) files
5859 unless explicitly requested with -u/--unknown or -i/--ignored.
5859 unless explicitly requested with -u/--unknown or -i/--ignored.
5860
5860
5861 .. note::
5861 .. note::
5862
5862
5863 :hg:`status` may appear to disagree with diff if permissions have
5863 :hg:`status` may appear to disagree with diff if permissions have
5864 changed or a merge has occurred. The standard diff format does
5864 changed or a merge has occurred. The standard diff format does
5865 not report permission changes and diff only reports changes
5865 not report permission changes and diff only reports changes
5866 relative to one merge parent.
5866 relative to one merge parent.
5867
5867
5868 If one revision is given, it is used as the base revision.
5868 If one revision is given, it is used as the base revision.
5869 If two revisions are given, the differences between them are
5869 If two revisions are given, the differences between them are
5870 shown. The --change option can also be used as a shortcut to list
5870 shown. The --change option can also be used as a shortcut to list
5871 the changed files of a revision from its first parent.
5871 the changed files of a revision from its first parent.
5872
5872
5873 The codes used to show the status of files are::
5873 The codes used to show the status of files are::
5874
5874
5875 M = modified
5875 M = modified
5876 A = added
5876 A = added
5877 R = removed
5877 R = removed
5878 C = clean
5878 C = clean
5879 ! = missing (deleted by non-hg command, but still tracked)
5879 ! = missing (deleted by non-hg command, but still tracked)
5880 ? = not tracked
5880 ? = not tracked
5881 I = ignored
5881 I = ignored
5882 = origin of the previous file (with --copies)
5882 = origin of the previous file (with --copies)
5883
5883
5884 .. container:: verbose
5884 .. container:: verbose
5885
5885
5886 Examples:
5886 Examples:
5887
5887
5888 - show changes in the working directory relative to a
5888 - show changes in the working directory relative to a
5889 changeset::
5889 changeset::
5890
5890
5891 hg status --rev 9353
5891 hg status --rev 9353
5892
5892
5893 - show changes in the working directory relative to the
5893 - show changes in the working directory relative to the
5894 current directory (see :hg:`help patterns` for more information)::
5894 current directory (see :hg:`help patterns` for more information)::
5895
5895
5896 hg status re:
5896 hg status re:
5897
5897
5898 - show all changes including copies in an existing changeset::
5898 - show all changes including copies in an existing changeset::
5899
5899
5900 hg status --copies --change 9353
5900 hg status --copies --change 9353
5901
5901
5902 - get a NUL separated list of added files, suitable for xargs::
5902 - get a NUL separated list of added files, suitable for xargs::
5903
5903
5904 hg status -an0
5904 hg status -an0
5905
5905
5906 Returns 0 on success.
5906 Returns 0 on success.
5907 """
5907 """
5908
5908
5909 revs = opts.get('rev')
5909 revs = opts.get('rev')
5910 change = opts.get('change')
5910 change = opts.get('change')
5911
5911
5912 if revs and change:
5912 if revs and change:
5913 msg = _('cannot specify --rev and --change at the same time')
5913 msg = _('cannot specify --rev and --change at the same time')
5914 raise error.Abort(msg)
5914 raise error.Abort(msg)
5915 elif change:
5915 elif change:
5916 node2 = scmutil.revsingle(repo, change, None).node()
5916 node2 = scmutil.revsingle(repo, change, None).node()
5917 node1 = repo[node2].p1().node()
5917 node1 = repo[node2].p1().node()
5918 else:
5918 else:
5919 node1, node2 = scmutil.revpair(repo, revs)
5919 node1, node2 = scmutil.revpair(repo, revs)
5920
5920
5921 if pats:
5921 if pats:
5922 cwd = repo.getcwd()
5922 cwd = repo.getcwd()
5923 else:
5923 else:
5924 cwd = ''
5924 cwd = ''
5925
5925
5926 if opts.get('print0'):
5926 if opts.get('print0'):
5927 end = '\0'
5927 end = '\0'
5928 else:
5928 else:
5929 end = '\n'
5929 end = '\n'
5930 copy = {}
5930 copy = {}
5931 states = 'modified added removed deleted unknown ignored clean'.split()
5931 states = 'modified added removed deleted unknown ignored clean'.split()
5932 show = [k for k in states if opts.get(k)]
5932 show = [k for k in states if opts.get(k)]
5933 if opts.get('all'):
5933 if opts.get('all'):
5934 show += ui.quiet and (states[:4] + ['clean']) or states
5934 show += ui.quiet and (states[:4] + ['clean']) or states
5935 if not show:
5935 if not show:
5936 if ui.quiet:
5936 if ui.quiet:
5937 show = states[:4]
5937 show = states[:4]
5938 else:
5938 else:
5939 show = states[:5]
5939 show = states[:5]
5940
5940
5941 m = scmutil.match(repo[node2], pats, opts)
5941 m = scmutil.match(repo[node2], pats, opts)
5942 stat = repo.status(node1, node2, m,
5942 stat = repo.status(node1, node2, m,
5943 'ignored' in show, 'clean' in show, 'unknown' in show,
5943 'ignored' in show, 'clean' in show, 'unknown' in show,
5944 opts.get('subrepos'))
5944 opts.get('subrepos'))
5945 changestates = zip(states, 'MAR!?IC', stat)
5945 changestates = zip(states, 'MAR!?IC', stat)
5946
5946
5947 if (opts.get('all') or opts.get('copies')
5947 if (opts.get('all') or opts.get('copies')
5948 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
5948 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
5949 copy = copies.pathcopies(repo[node1], repo[node2], m)
5949 copy = copies.pathcopies(repo[node1], repo[node2], m)
5950
5950
5951 fm = ui.formatter('status', opts)
5951 fm = ui.formatter('status', opts)
5952 fmt = '%s' + end
5952 fmt = '%s' + end
5953 showchar = not opts.get('no_status')
5953 showchar = not opts.get('no_status')
5954
5954
5955 for state, char, files in changestates:
5955 for state, char, files in changestates:
5956 if state in show:
5956 if state in show:
5957 label = 'status.' + state
5957 label = 'status.' + state
5958 for f in files:
5958 for f in files:
5959 fm.startitem()
5959 fm.startitem()
5960 fm.condwrite(showchar, 'status', '%s ', char, label=label)
5960 fm.condwrite(showchar, 'status', '%s ', char, label=label)
5961 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
5961 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
5962 if f in copy:
5962 if f in copy:
5963 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
5963 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
5964 label='status.copied')
5964 label='status.copied')
5965 fm.end()
5965 fm.end()
5966
5966
5967 @command('^summary|sum',
5967 @command('^summary|sum',
5968 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
5968 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
5969 def summary(ui, repo, **opts):
5969 def summary(ui, repo, **opts):
5970 """summarize working directory state
5970 """summarize working directory state
5971
5971
5972 This generates a brief summary of the working directory state,
5972 This generates a brief summary of the working directory state,
5973 including parents, branch, commit status, phase and available updates.
5973 including parents, branch, commit status, phase and available updates.
5974
5974
5975 With the --remote option, this will check the default paths for
5975 With the --remote option, this will check the default paths for
5976 incoming and outgoing changes. This can be time-consuming.
5976 incoming and outgoing changes. This can be time-consuming.
5977
5977
5978 Returns 0 on success.
5978 Returns 0 on success.
5979 """
5979 """
5980
5980
5981 ctx = repo[None]
5981 ctx = repo[None]
5982 parents = ctx.parents()
5982 parents = ctx.parents()
5983 pnode = parents[0].node()
5983 pnode = parents[0].node()
5984 marks = []
5984 marks = []
5985
5985
5986 ms = None
5986 ms = None
5987 try:
5987 try:
5988 ms = mergemod.mergestate.read(repo)
5988 ms = mergemod.mergestate.read(repo)
5989 except error.UnsupportedMergeRecords as e:
5989 except error.UnsupportedMergeRecords as e:
5990 s = ' '.join(e.recordtypes)
5990 s = ' '.join(e.recordtypes)
5991 ui.warn(
5991 ui.warn(
5992 _('warning: merge state has unsupported record types: %s\n') % s)
5992 _('warning: merge state has unsupported record types: %s\n') % s)
5993 unresolved = 0
5993 unresolved = 0
5994 else:
5994 else:
5995 unresolved = [f for f in ms if ms[f] == 'u']
5995 unresolved = [f for f in ms if ms[f] == 'u']
5996
5996
5997 for p in parents:
5997 for p in parents:
5998 # label with log.changeset (instead of log.parent) since this
5998 # label with log.changeset (instead of log.parent) since this
5999 # shows a working directory parent *changeset*:
5999 # shows a working directory parent *changeset*:
6000 # i18n: column positioning for "hg summary"
6000 # i18n: column positioning for "hg summary"
6001 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
6001 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
6002 label=cmdutil._changesetlabels(p))
6002 label=cmdutil._changesetlabels(p))
6003 ui.write(' '.join(p.tags()), label='log.tag')
6003 ui.write(' '.join(p.tags()), label='log.tag')
6004 if p.bookmarks():
6004 if p.bookmarks():
6005 marks.extend(p.bookmarks())
6005 marks.extend(p.bookmarks())
6006 if p.rev() == -1:
6006 if p.rev() == -1:
6007 if not len(repo):
6007 if not len(repo):
6008 ui.write(_(' (empty repository)'))
6008 ui.write(_(' (empty repository)'))
6009 else:
6009 else:
6010 ui.write(_(' (no revision checked out)'))
6010 ui.write(_(' (no revision checked out)'))
6011 if p.troubled():
6011 if p.troubled():
6012 ui.write(' ('
6012 ui.write(' ('
6013 + ', '.join(ui.label(trouble, 'trouble.%s' % trouble)
6013 + ', '.join(ui.label(trouble, 'trouble.%s' % trouble)
6014 for trouble in p.troubles())
6014 for trouble in p.troubles())
6015 + ')')
6015 + ')')
6016 ui.write('\n')
6016 ui.write('\n')
6017 if p.description():
6017 if p.description():
6018 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
6018 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
6019 label='log.summary')
6019 label='log.summary')
6020
6020
6021 branch = ctx.branch()
6021 branch = ctx.branch()
6022 bheads = repo.branchheads(branch)
6022 bheads = repo.branchheads(branch)
6023 # i18n: column positioning for "hg summary"
6023 # i18n: column positioning for "hg summary"
6024 m = _('branch: %s\n') % branch
6024 m = _('branch: %s\n') % branch
6025 if branch != 'default':
6025 if branch != 'default':
6026 ui.write(m, label='log.branch')
6026 ui.write(m, label='log.branch')
6027 else:
6027 else:
6028 ui.status(m, label='log.branch')
6028 ui.status(m, label='log.branch')
6029
6029
6030 if marks:
6030 if marks:
6031 active = repo._activebookmark
6031 active = repo._activebookmark
6032 # i18n: column positioning for "hg summary"
6032 # i18n: column positioning for "hg summary"
6033 ui.write(_('bookmarks:'), label='log.bookmark')
6033 ui.write(_('bookmarks:'), label='log.bookmark')
6034 if active is not None:
6034 if active is not None:
6035 if active in marks:
6035 if active in marks:
6036 ui.write(' *' + active, label=activebookmarklabel)
6036 ui.write(' *' + active, label=activebookmarklabel)
6037 marks.remove(active)
6037 marks.remove(active)
6038 else:
6038 else:
6039 ui.write(' [%s]' % active, label=activebookmarklabel)
6039 ui.write(' [%s]' % active, label=activebookmarklabel)
6040 for m in marks:
6040 for m in marks:
6041 ui.write(' ' + m, label='log.bookmark')
6041 ui.write(' ' + m, label='log.bookmark')
6042 ui.write('\n', label='log.bookmark')
6042 ui.write('\n', label='log.bookmark')
6043
6043
6044 status = repo.status(unknown=True)
6044 status = repo.status(unknown=True)
6045
6045
6046 c = repo.dirstate.copies()
6046 c = repo.dirstate.copies()
6047 copied, renamed = [], []
6047 copied, renamed = [], []
6048 for d, s in c.iteritems():
6048 for d, s in c.iteritems():
6049 if s in status.removed:
6049 if s in status.removed:
6050 status.removed.remove(s)
6050 status.removed.remove(s)
6051 renamed.append(d)
6051 renamed.append(d)
6052 else:
6052 else:
6053 copied.append(d)
6053 copied.append(d)
6054 if d in status.added:
6054 if d in status.added:
6055 status.added.remove(d)
6055 status.added.remove(d)
6056
6056
6057 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6057 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6058
6058
6059 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
6059 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
6060 (ui.label(_('%d added'), 'status.added'), status.added),
6060 (ui.label(_('%d added'), 'status.added'), status.added),
6061 (ui.label(_('%d removed'), 'status.removed'), status.removed),
6061 (ui.label(_('%d removed'), 'status.removed'), status.removed),
6062 (ui.label(_('%d renamed'), 'status.copied'), renamed),
6062 (ui.label(_('%d renamed'), 'status.copied'), renamed),
6063 (ui.label(_('%d copied'), 'status.copied'), copied),
6063 (ui.label(_('%d copied'), 'status.copied'), copied),
6064 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
6064 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
6065 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
6065 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
6066 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
6066 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
6067 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
6067 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
6068 t = []
6068 t = []
6069 for l, s in labels:
6069 for l, s in labels:
6070 if s:
6070 if s:
6071 t.append(l % len(s))
6071 t.append(l % len(s))
6072
6072
6073 t = ', '.join(t)
6073 t = ', '.join(t)
6074 cleanworkdir = False
6074 cleanworkdir = False
6075
6075
6076 if repo.vfs.exists('graftstate'):
6076 if repo.vfs.exists('graftstate'):
6077 t += _(' (graft in progress)')
6077 t += _(' (graft in progress)')
6078 if repo.vfs.exists('updatestate'):
6078 if repo.vfs.exists('updatestate'):
6079 t += _(' (interrupted update)')
6079 t += _(' (interrupted update)')
6080 elif len(parents) > 1:
6080 elif len(parents) > 1:
6081 t += _(' (merge)')
6081 t += _(' (merge)')
6082 elif branch != parents[0].branch():
6082 elif branch != parents[0].branch():
6083 t += _(' (new branch)')
6083 t += _(' (new branch)')
6084 elif (parents[0].closesbranch() and
6084 elif (parents[0].closesbranch() and
6085 pnode in repo.branchheads(branch, closed=True)):
6085 pnode in repo.branchheads(branch, closed=True)):
6086 t += _(' (head closed)')
6086 t += _(' (head closed)')
6087 elif not (status.modified or status.added or status.removed or renamed or
6087 elif not (status.modified or status.added or status.removed or renamed or
6088 copied or subs):
6088 copied or subs):
6089 t += _(' (clean)')
6089 t += _(' (clean)')
6090 cleanworkdir = True
6090 cleanworkdir = True
6091 elif pnode not in bheads:
6091 elif pnode not in bheads:
6092 t += _(' (new branch head)')
6092 t += _(' (new branch head)')
6093
6093
6094 if parents:
6094 if parents:
6095 pendingphase = max(p.phase() for p in parents)
6095 pendingphase = max(p.phase() for p in parents)
6096 else:
6096 else:
6097 pendingphase = phases.public
6097 pendingphase = phases.public
6098
6098
6099 if pendingphase > phases.newcommitphase(ui):
6099 if pendingphase > phases.newcommitphase(ui):
6100 t += ' (%s)' % phases.phasenames[pendingphase]
6100 t += ' (%s)' % phases.phasenames[pendingphase]
6101
6101
6102 if cleanworkdir:
6102 if cleanworkdir:
6103 # i18n: column positioning for "hg summary"
6103 # i18n: column positioning for "hg summary"
6104 ui.status(_('commit: %s\n') % t.strip())
6104 ui.status(_('commit: %s\n') % t.strip())
6105 else:
6105 else:
6106 # i18n: column positioning for "hg summary"
6106 # i18n: column positioning for "hg summary"
6107 ui.write(_('commit: %s\n') % t.strip())
6107 ui.write(_('commit: %s\n') % t.strip())
6108
6108
6109 # all ancestors of branch heads - all ancestors of parent = new csets
6109 # all ancestors of branch heads - all ancestors of parent = new csets
6110 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
6110 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
6111 bheads))
6111 bheads))
6112
6112
6113 if new == 0:
6113 if new == 0:
6114 # i18n: column positioning for "hg summary"
6114 # i18n: column positioning for "hg summary"
6115 ui.status(_('update: (current)\n'))
6115 ui.status(_('update: (current)\n'))
6116 elif pnode not in bheads:
6116 elif pnode not in bheads:
6117 # i18n: column positioning for "hg summary"
6117 # i18n: column positioning for "hg summary"
6118 ui.write(_('update: %d new changesets (update)\n') % new)
6118 ui.write(_('update: %d new changesets (update)\n') % new)
6119 else:
6119 else:
6120 # i18n: column positioning for "hg summary"
6120 # i18n: column positioning for "hg summary"
6121 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
6121 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
6122 (new, len(bheads)))
6122 (new, len(bheads)))
6123
6123
6124 t = []
6124 t = []
6125 draft = len(repo.revs('draft()'))
6125 draft = len(repo.revs('draft()'))
6126 if draft:
6126 if draft:
6127 t.append(_('%d draft') % draft)
6127 t.append(_('%d draft') % draft)
6128 secret = len(repo.revs('secret()'))
6128 secret = len(repo.revs('secret()'))
6129 if secret:
6129 if secret:
6130 t.append(_('%d secret') % secret)
6130 t.append(_('%d secret') % secret)
6131
6131
6132 if draft or secret:
6132 if draft or secret:
6133 ui.status(_('phases: %s\n') % ', '.join(t))
6133 ui.status(_('phases: %s\n') % ', '.join(t))
6134
6134
6135 if obsolete.isenabled(repo, obsolete.createmarkersopt):
6135 if obsolete.isenabled(repo, obsolete.createmarkersopt):
6136 for trouble in ("unstable", "divergent", "bumped"):
6136 for trouble in ("unstable", "divergent", "bumped"):
6137 numtrouble = len(repo.revs(trouble + "()"))
6137 numtrouble = len(repo.revs(trouble + "()"))
6138 # We write all the possibilities to ease translation
6138 # We write all the possibilities to ease translation
6139 troublemsg = {
6139 troublemsg = {
6140 "unstable": _("unstable: %d changesets"),
6140 "unstable": _("unstable: %d changesets"),
6141 "divergent": _("divergent: %d changesets"),
6141 "divergent": _("divergent: %d changesets"),
6142 "bumped": _("bumped: %d changesets"),
6142 "bumped": _("bumped: %d changesets"),
6143 }
6143 }
6144 if numtrouble > 0:
6144 if numtrouble > 0:
6145 ui.status(troublemsg[trouble] % numtrouble + "\n")
6145 ui.status(troublemsg[trouble] % numtrouble + "\n")
6146
6146
6147 cmdutil.summaryhooks(ui, repo)
6147 cmdutil.summaryhooks(ui, repo)
6148
6148
6149 if opts.get('remote'):
6149 if opts.get('remote'):
6150 needsincoming, needsoutgoing = True, True
6150 needsincoming, needsoutgoing = True, True
6151 else:
6151 else:
6152 needsincoming, needsoutgoing = False, False
6152 needsincoming, needsoutgoing = False, False
6153 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
6153 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
6154 if i:
6154 if i:
6155 needsincoming = True
6155 needsincoming = True
6156 if o:
6156 if o:
6157 needsoutgoing = True
6157 needsoutgoing = True
6158 if not needsincoming and not needsoutgoing:
6158 if not needsincoming and not needsoutgoing:
6159 return
6159 return
6160
6160
6161 def getincoming():
6161 def getincoming():
6162 source, branches = hg.parseurl(ui.expandpath('default'))
6162 source, branches = hg.parseurl(ui.expandpath('default'))
6163 sbranch = branches[0]
6163 sbranch = branches[0]
6164 try:
6164 try:
6165 other = hg.peer(repo, {}, source)
6165 other = hg.peer(repo, {}, source)
6166 except error.RepoError:
6166 except error.RepoError:
6167 if opts.get('remote'):
6167 if opts.get('remote'):
6168 raise
6168 raise
6169 return source, sbranch, None, None, None
6169 return source, sbranch, None, None, None
6170 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
6170 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
6171 if revs:
6171 if revs:
6172 revs = [other.lookup(rev) for rev in revs]
6172 revs = [other.lookup(rev) for rev in revs]
6173 ui.debug('comparing with %s\n' % util.hidepassword(source))
6173 ui.debug('comparing with %s\n' % util.hidepassword(source))
6174 repo.ui.pushbuffer()
6174 repo.ui.pushbuffer()
6175 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
6175 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
6176 repo.ui.popbuffer()
6176 repo.ui.popbuffer()
6177 return source, sbranch, other, commoninc, commoninc[1]
6177 return source, sbranch, other, commoninc, commoninc[1]
6178
6178
6179 if needsincoming:
6179 if needsincoming:
6180 source, sbranch, sother, commoninc, incoming = getincoming()
6180 source, sbranch, sother, commoninc, incoming = getincoming()
6181 else:
6181 else:
6182 source = sbranch = sother = commoninc = incoming = None
6182 source = sbranch = sother = commoninc = incoming = None
6183
6183
6184 def getoutgoing():
6184 def getoutgoing():
6185 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
6185 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
6186 dbranch = branches[0]
6186 dbranch = branches[0]
6187 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
6187 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
6188 if source != dest:
6188 if source != dest:
6189 try:
6189 try:
6190 dother = hg.peer(repo, {}, dest)
6190 dother = hg.peer(repo, {}, dest)
6191 except error.RepoError:
6191 except error.RepoError:
6192 if opts.get('remote'):
6192 if opts.get('remote'):
6193 raise
6193 raise
6194 return dest, dbranch, None, None
6194 return dest, dbranch, None, None
6195 ui.debug('comparing with %s\n' % util.hidepassword(dest))
6195 ui.debug('comparing with %s\n' % util.hidepassword(dest))
6196 elif sother is None:
6196 elif sother is None:
6197 # there is no explicit destination peer, but source one is invalid
6197 # there is no explicit destination peer, but source one is invalid
6198 return dest, dbranch, None, None
6198 return dest, dbranch, None, None
6199 else:
6199 else:
6200 dother = sother
6200 dother = sother
6201 if (source != dest or (sbranch is not None and sbranch != dbranch)):
6201 if (source != dest or (sbranch is not None and sbranch != dbranch)):
6202 common = None
6202 common = None
6203 else:
6203 else:
6204 common = commoninc
6204 common = commoninc
6205 if revs:
6205 if revs:
6206 revs = [repo.lookup(rev) for rev in revs]
6206 revs = [repo.lookup(rev) for rev in revs]
6207 repo.ui.pushbuffer()
6207 repo.ui.pushbuffer()
6208 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
6208 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
6209 commoninc=common)
6209 commoninc=common)
6210 repo.ui.popbuffer()
6210 repo.ui.popbuffer()
6211 return dest, dbranch, dother, outgoing
6211 return dest, dbranch, dother, outgoing
6212
6212
6213 if needsoutgoing:
6213 if needsoutgoing:
6214 dest, dbranch, dother, outgoing = getoutgoing()
6214 dest, dbranch, dother, outgoing = getoutgoing()
6215 else:
6215 else:
6216 dest = dbranch = dother = outgoing = None
6216 dest = dbranch = dother = outgoing = None
6217
6217
6218 if opts.get('remote'):
6218 if opts.get('remote'):
6219 t = []
6219 t = []
6220 if incoming:
6220 if incoming:
6221 t.append(_('1 or more incoming'))
6221 t.append(_('1 or more incoming'))
6222 o = outgoing.missing
6222 o = outgoing.missing
6223 if o:
6223 if o:
6224 t.append(_('%d outgoing') % len(o))
6224 t.append(_('%d outgoing') % len(o))
6225 other = dother or sother
6225 other = dother or sother
6226 if 'bookmarks' in other.listkeys('namespaces'):
6226 if 'bookmarks' in other.listkeys('namespaces'):
6227 counts = bookmarks.summary(repo, other)
6227 counts = bookmarks.summary(repo, other)
6228 if counts[0] > 0:
6228 if counts[0] > 0:
6229 t.append(_('%d incoming bookmarks') % counts[0])
6229 t.append(_('%d incoming bookmarks') % counts[0])
6230 if counts[1] > 0:
6230 if counts[1] > 0:
6231 t.append(_('%d outgoing bookmarks') % counts[1])
6231 t.append(_('%d outgoing bookmarks') % counts[1])
6232
6232
6233 if t:
6233 if t:
6234 # i18n: column positioning for "hg summary"
6234 # i18n: column positioning for "hg summary"
6235 ui.write(_('remote: %s\n') % (', '.join(t)))
6235 ui.write(_('remote: %s\n') % (', '.join(t)))
6236 else:
6236 else:
6237 # i18n: column positioning for "hg summary"
6237 # i18n: column positioning for "hg summary"
6238 ui.status(_('remote: (synced)\n'))
6238 ui.status(_('remote: (synced)\n'))
6239
6239
6240 cmdutil.summaryremotehooks(ui, repo, opts,
6240 cmdutil.summaryremotehooks(ui, repo, opts,
6241 ((source, sbranch, sother, commoninc),
6241 ((source, sbranch, sother, commoninc),
6242 (dest, dbranch, dother, outgoing)))
6242 (dest, dbranch, dother, outgoing)))
6243
6243
6244 @command('tag',
6244 @command('tag',
6245 [('f', 'force', None, _('force tag')),
6245 [('f', 'force', None, _('force tag')),
6246 ('l', 'local', None, _('make the tag local')),
6246 ('l', 'local', None, _('make the tag local')),
6247 ('r', 'rev', '', _('revision to tag'), _('REV')),
6247 ('r', 'rev', '', _('revision to tag'), _('REV')),
6248 ('', 'remove', None, _('remove a tag')),
6248 ('', 'remove', None, _('remove a tag')),
6249 # -l/--local is already there, commitopts cannot be used
6249 # -l/--local is already there, commitopts cannot be used
6250 ('e', 'edit', None, _('invoke editor on commit messages')),
6250 ('e', 'edit', None, _('invoke editor on commit messages')),
6251 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
6251 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
6252 ] + commitopts2,
6252 ] + commitopts2,
6253 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
6253 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
6254 def tag(ui, repo, name1, *names, **opts):
6254 def tag(ui, repo, name1, *names, **opts):
6255 """add one or more tags for the current or given revision
6255 """add one or more tags for the current or given revision
6256
6256
6257 Name a particular revision using <name>.
6257 Name a particular revision using <name>.
6258
6258
6259 Tags are used to name particular revisions of the repository and are
6259 Tags are used to name particular revisions of the repository and are
6260 very useful to compare different revisions, to go back to significant
6260 very useful to compare different revisions, to go back to significant
6261 earlier versions or to mark branch points as releases, etc. Changing
6261 earlier versions or to mark branch points as releases, etc. Changing
6262 an existing tag is normally disallowed; use -f/--force to override.
6262 an existing tag is normally disallowed; use -f/--force to override.
6263
6263
6264 If no revision is given, the parent of the working directory is
6264 If no revision is given, the parent of the working directory is
6265 used.
6265 used.
6266
6266
6267 To facilitate version control, distribution, and merging of tags,
6267 To facilitate version control, distribution, and merging of tags,
6268 they are stored as a file named ".hgtags" which is managed similarly
6268 they are stored as a file named ".hgtags" which is managed similarly
6269 to other project files and can be hand-edited if necessary. This
6269 to other project files and can be hand-edited if necessary. This
6270 also means that tagging creates a new commit. The file
6270 also means that tagging creates a new commit. The file
6271 ".hg/localtags" is used for local tags (not shared among
6271 ".hg/localtags" is used for local tags (not shared among
6272 repositories).
6272 repositories).
6273
6273
6274 Tag commits are usually made at the head of a branch. If the parent
6274 Tag commits are usually made at the head of a branch. If the parent
6275 of the working directory is not a branch head, :hg:`tag` aborts; use
6275 of the working directory is not a branch head, :hg:`tag` aborts; use
6276 -f/--force to force the tag commit to be based on a non-head
6276 -f/--force to force the tag commit to be based on a non-head
6277 changeset.
6277 changeset.
6278
6278
6279 See :hg:`help dates` for a list of formats valid for -d/--date.
6279 See :hg:`help dates` for a list of formats valid for -d/--date.
6280
6280
6281 Since tag names have priority over branch names during revision
6281 Since tag names have priority over branch names during revision
6282 lookup, using an existing branch name as a tag name is discouraged.
6282 lookup, using an existing branch name as a tag name is discouraged.
6283
6283
6284 Returns 0 on success.
6284 Returns 0 on success.
6285 """
6285 """
6286 wlock = lock = None
6286 wlock = lock = None
6287 try:
6287 try:
6288 wlock = repo.wlock()
6288 wlock = repo.wlock()
6289 lock = repo.lock()
6289 lock = repo.lock()
6290 rev_ = "."
6290 rev_ = "."
6291 names = [t.strip() for t in (name1,) + names]
6291 names = [t.strip() for t in (name1,) + names]
6292 if len(names) != len(set(names)):
6292 if len(names) != len(set(names)):
6293 raise error.Abort(_('tag names must be unique'))
6293 raise error.Abort(_('tag names must be unique'))
6294 for n in names:
6294 for n in names:
6295 scmutil.checknewlabel(repo, n, 'tag')
6295 scmutil.checknewlabel(repo, n, 'tag')
6296 if not n:
6296 if not n:
6297 raise error.Abort(_('tag names cannot consist entirely of '
6297 raise error.Abort(_('tag names cannot consist entirely of '
6298 'whitespace'))
6298 'whitespace'))
6299 if opts.get('rev') and opts.get('remove'):
6299 if opts.get('rev') and opts.get('remove'):
6300 raise error.Abort(_("--rev and --remove are incompatible"))
6300 raise error.Abort(_("--rev and --remove are incompatible"))
6301 if opts.get('rev'):
6301 if opts.get('rev'):
6302 rev_ = opts['rev']
6302 rev_ = opts['rev']
6303 message = opts.get('message')
6303 message = opts.get('message')
6304 if opts.get('remove'):
6304 if opts.get('remove'):
6305 if opts.get('local'):
6305 if opts.get('local'):
6306 expectedtype = 'local'
6306 expectedtype = 'local'
6307 else:
6307 else:
6308 expectedtype = 'global'
6308 expectedtype = 'global'
6309
6309
6310 for n in names:
6310 for n in names:
6311 if not repo.tagtype(n):
6311 if not repo.tagtype(n):
6312 raise error.Abort(_("tag '%s' does not exist") % n)
6312 raise error.Abort(_("tag '%s' does not exist") % n)
6313 if repo.tagtype(n) != expectedtype:
6313 if repo.tagtype(n) != expectedtype:
6314 if expectedtype == 'global':
6314 if expectedtype == 'global':
6315 raise error.Abort(_("tag '%s' is not a global tag") % n)
6315 raise error.Abort(_("tag '%s' is not a global tag") % n)
6316 else:
6316 else:
6317 raise error.Abort(_("tag '%s' is not a local tag") % n)
6317 raise error.Abort(_("tag '%s' is not a local tag") % n)
6318 rev_ = 'null'
6318 rev_ = 'null'
6319 if not message:
6319 if not message:
6320 # we don't translate commit messages
6320 # we don't translate commit messages
6321 message = 'Removed tag %s' % ', '.join(names)
6321 message = 'Removed tag %s' % ', '.join(names)
6322 elif not opts.get('force'):
6322 elif not opts.get('force'):
6323 for n in names:
6323 for n in names:
6324 if n in repo.tags():
6324 if n in repo.tags():
6325 raise error.Abort(_("tag '%s' already exists "
6325 raise error.Abort(_("tag '%s' already exists "
6326 "(use -f to force)") % n)
6326 "(use -f to force)") % n)
6327 if not opts.get('local'):
6327 if not opts.get('local'):
6328 p1, p2 = repo.dirstate.parents()
6328 p1, p2 = repo.dirstate.parents()
6329 if p2 != nullid:
6329 if p2 != nullid:
6330 raise error.Abort(_('uncommitted merge'))
6330 raise error.Abort(_('uncommitted merge'))
6331 bheads = repo.branchheads()
6331 bheads = repo.branchheads()
6332 if not opts.get('force') and bheads and p1 not in bheads:
6332 if not opts.get('force') and bheads and p1 not in bheads:
6333 raise error.Abort(_('working directory is not at a branch head '
6333 raise error.Abort(_('working directory is not at a branch head '
6334 '(use -f to force)'))
6334 '(use -f to force)'))
6335 r = scmutil.revsingle(repo, rev_).node()
6335 r = scmutil.revsingle(repo, rev_).node()
6336
6336
6337 if not message:
6337 if not message:
6338 # we don't translate commit messages
6338 # we don't translate commit messages
6339 message = ('Added tag %s for changeset %s' %
6339 message = ('Added tag %s for changeset %s' %
6340 (', '.join(names), short(r)))
6340 (', '.join(names), short(r)))
6341
6341
6342 date = opts.get('date')
6342 date = opts.get('date')
6343 if date:
6343 if date:
6344 date = util.parsedate(date)
6344 date = util.parsedate(date)
6345
6345
6346 if opts.get('remove'):
6346 if opts.get('remove'):
6347 editform = 'tag.remove'
6347 editform = 'tag.remove'
6348 else:
6348 else:
6349 editform = 'tag.add'
6349 editform = 'tag.add'
6350 editor = cmdutil.getcommiteditor(editform=editform, **opts)
6350 editor = cmdutil.getcommiteditor(editform=editform, **opts)
6351
6351
6352 # don't allow tagging the null rev
6352 # don't allow tagging the null rev
6353 if (not opts.get('remove') and
6353 if (not opts.get('remove') and
6354 scmutil.revsingle(repo, rev_).rev() == nullrev):
6354 scmutil.revsingle(repo, rev_).rev() == nullrev):
6355 raise error.Abort(_("cannot tag null revision"))
6355 raise error.Abort(_("cannot tag null revision"))
6356
6356
6357 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
6357 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
6358 editor=editor)
6358 editor=editor)
6359 finally:
6359 finally:
6360 release(lock, wlock)
6360 release(lock, wlock)
6361
6361
6362 @command('tags', formatteropts, '')
6362 @command('tags', formatteropts, '')
6363 def tags(ui, repo, **opts):
6363 def tags(ui, repo, **opts):
6364 """list repository tags
6364 """list repository tags
6365
6365
6366 This lists both regular and local tags. When the -v/--verbose
6366 This lists both regular and local tags. When the -v/--verbose
6367 switch is used, a third column "local" is printed for local tags.
6367 switch is used, a third column "local" is printed for local tags.
6368 When the -q/--quiet switch is used, only the tag name is printed.
6368 When the -q/--quiet switch is used, only the tag name is printed.
6369
6369
6370 Returns 0 on success.
6370 Returns 0 on success.
6371 """
6371 """
6372
6372
6373 fm = ui.formatter('tags', opts)
6373 fm = ui.formatter('tags', opts)
6374 hexfunc = fm.hexfunc
6374 hexfunc = fm.hexfunc
6375 tagtype = ""
6375 tagtype = ""
6376
6376
6377 for t, n in reversed(repo.tagslist()):
6377 for t, n in reversed(repo.tagslist()):
6378 hn = hexfunc(n)
6378 hn = hexfunc(n)
6379 label = 'tags.normal'
6379 label = 'tags.normal'
6380 tagtype = ''
6380 tagtype = ''
6381 if repo.tagtype(t) == 'local':
6381 if repo.tagtype(t) == 'local':
6382 label = 'tags.local'
6382 label = 'tags.local'
6383 tagtype = 'local'
6383 tagtype = 'local'
6384
6384
6385 fm.startitem()
6385 fm.startitem()
6386 fm.write('tag', '%s', t, label=label)
6386 fm.write('tag', '%s', t, label=label)
6387 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
6387 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
6388 fm.condwrite(not ui.quiet, 'rev node', fmt,
6388 fm.condwrite(not ui.quiet, 'rev node', fmt,
6389 repo.changelog.rev(n), hn, label=label)
6389 repo.changelog.rev(n), hn, label=label)
6390 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
6390 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
6391 tagtype, label=label)
6391 tagtype, label=label)
6392 fm.plain('\n')
6392 fm.plain('\n')
6393 fm.end()
6393 fm.end()
6394
6394
6395 @command('tip',
6395 @command('tip',
6396 [('p', 'patch', None, _('show patch')),
6396 [('p', 'patch', None, _('show patch')),
6397 ('g', 'git', None, _('use git extended diff format')),
6397 ('g', 'git', None, _('use git extended diff format')),
6398 ] + templateopts,
6398 ] + templateopts,
6399 _('[-p] [-g]'))
6399 _('[-p] [-g]'))
6400 def tip(ui, repo, **opts):
6400 def tip(ui, repo, **opts):
6401 """show the tip revision (DEPRECATED)
6401 """show the tip revision (DEPRECATED)
6402
6402
6403 The tip revision (usually just called the tip) is the changeset
6403 The tip revision (usually just called the tip) is the changeset
6404 most recently added to the repository (and therefore the most
6404 most recently added to the repository (and therefore the most
6405 recently changed head).
6405 recently changed head).
6406
6406
6407 If you have just made a commit, that commit will be the tip. If
6407 If you have just made a commit, that commit will be the tip. If
6408 you have just pulled changes from another repository, the tip of
6408 you have just pulled changes from another repository, the tip of
6409 that repository becomes the current tip. The "tip" tag is special
6409 that repository becomes the current tip. The "tip" tag is special
6410 and cannot be renamed or assigned to a different changeset.
6410 and cannot be renamed or assigned to a different changeset.
6411
6411
6412 This command is deprecated, please use :hg:`heads` instead.
6412 This command is deprecated, please use :hg:`heads` instead.
6413
6413
6414 Returns 0 on success.
6414 Returns 0 on success.
6415 """
6415 """
6416 displayer = cmdutil.show_changeset(ui, repo, opts)
6416 displayer = cmdutil.show_changeset(ui, repo, opts)
6417 displayer.show(repo['tip'])
6417 displayer.show(repo['tip'])
6418 displayer.close()
6418 displayer.close()
6419
6419
6420 @command('unbundle',
6420 @command('unbundle',
6421 [('u', 'update', None,
6421 [('u', 'update', None,
6422 _('update to new branch head if changesets were unbundled'))],
6422 _('update to new branch head if changesets were unbundled'))],
6423 _('[-u] FILE...'))
6423 _('[-u] FILE...'))
6424 def unbundle(ui, repo, fname1, *fnames, **opts):
6424 def unbundle(ui, repo, fname1, *fnames, **opts):
6425 """apply one or more changegroup files
6425 """apply one or more changegroup files
6426
6426
6427 Apply one or more compressed changegroup files generated by the
6427 Apply one or more compressed changegroup files generated by the
6428 bundle command.
6428 bundle command.
6429
6429
6430 Returns 0 on success, 1 if an update has unresolved files.
6430 Returns 0 on success, 1 if an update has unresolved files.
6431 """
6431 """
6432 fnames = (fname1,) + fnames
6432 fnames = (fname1,) + fnames
6433
6433
6434 with repo.lock():
6434 with repo.lock():
6435 for fname in fnames:
6435 for fname in fnames:
6436 f = hg.openpath(ui, fname)
6436 f = hg.openpath(ui, fname)
6437 gen = exchange.readbundle(ui, f, fname)
6437 gen = exchange.readbundle(ui, f, fname)
6438 if isinstance(gen, bundle2.unbundle20):
6438 if isinstance(gen, bundle2.unbundle20):
6439 tr = repo.transaction('unbundle')
6439 tr = repo.transaction('unbundle')
6440 try:
6440 try:
6441 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
6441 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
6442 url='bundle:' + fname)
6442 url='bundle:' + fname)
6443 tr.close()
6443 tr.close()
6444 except error.BundleUnknownFeatureError as exc:
6444 except error.BundleUnknownFeatureError as exc:
6445 raise error.Abort(_('%s: unknown bundle feature, %s')
6445 raise error.Abort(_('%s: unknown bundle feature, %s')
6446 % (fname, exc),
6446 % (fname, exc),
6447 hint=_("see https://mercurial-scm.org/"
6447 hint=_("see https://mercurial-scm.org/"
6448 "wiki/BundleFeature for more "
6448 "wiki/BundleFeature for more "
6449 "information"))
6449 "information"))
6450 finally:
6450 finally:
6451 if tr:
6451 if tr:
6452 tr.release()
6452 tr.release()
6453 changes = [r.get('return', 0)
6453 changes = [r.get('return', 0)
6454 for r in op.records['changegroup']]
6454 for r in op.records['changegroup']]
6455 modheads = changegroup.combineresults(changes)
6455 modheads = changegroup.combineresults(changes)
6456 elif isinstance(gen, streamclone.streamcloneapplier):
6456 elif isinstance(gen, streamclone.streamcloneapplier):
6457 raise error.Abort(
6457 raise error.Abort(
6458 _('packed bundles cannot be applied with '
6458 _('packed bundles cannot be applied with '
6459 '"hg unbundle"'),
6459 '"hg unbundle"'),
6460 hint=_('use "hg debugapplystreamclonebundle"'))
6460 hint=_('use "hg debugapplystreamclonebundle"'))
6461 else:
6461 else:
6462 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
6462 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
6463
6463
6464 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
6464 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
6465
6465
6466 @command('^update|up|checkout|co',
6466 @command('^update|up|checkout|co',
6467 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
6467 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
6468 ('c', 'check', None, _('require clean working directory')),
6468 ('c', 'check', None, _('require clean working directory')),
6469 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6469 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6470 ('r', 'rev', '', _('revision'), _('REV'))
6470 ('r', 'rev', '', _('revision'), _('REV'))
6471 ] + mergetoolopts,
6471 ] + mergetoolopts,
6472 _('[-c] [-C] [-d DATE] [[-r] REV]'))
6472 _('[-c] [-C] [-d DATE] [[-r] REV]'))
6473 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
6473 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
6474 tool=None):
6474 tool=None):
6475 """update working directory (or switch revisions)
6475 """update working directory (or switch revisions)
6476
6476
6477 Update the repository's working directory to the specified
6477 Update the repository's working directory to the specified
6478 changeset. If no changeset is specified, update to the tip of the
6478 changeset. If no changeset is specified, update to the tip of the
6479 current named branch and move the active bookmark (see :hg:`help
6479 current named branch and move the active bookmark (see :hg:`help
6480 bookmarks`).
6480 bookmarks`).
6481
6481
6482 Update sets the working directory's parent revision to the specified
6482 Update sets the working directory's parent revision to the specified
6483 changeset (see :hg:`help parents`).
6483 changeset (see :hg:`help parents`).
6484
6484
6485 If the changeset is not a descendant or ancestor of the working
6485 If the changeset is not a descendant or ancestor of the working
6486 directory's parent and there are uncommitted changes, the update is
6486 directory's parent and there are uncommitted changes, the update is
6487 aborted. With the -c/--check option, the working directory is checked
6487 aborted. With the -c/--check option, the working directory is checked
6488 for uncommitted changes; if none are found, the working directory is
6488 for uncommitted changes; if none are found, the working directory is
6489 updated to the specified changeset.
6489 updated to the specified changeset.
6490
6490
6491 .. container:: verbose
6491 .. container:: verbose
6492
6492
6493 The following rules apply when the working directory contains
6493 The following rules apply when the working directory contains
6494 uncommitted changes:
6494 uncommitted changes:
6495
6495
6496 1. If neither -c/--check nor -C/--clean is specified, and if
6496 1. If neither -c/--check nor -C/--clean is specified, and if
6497 the requested changeset is an ancestor or descendant of
6497 the requested changeset is an ancestor or descendant of
6498 the working directory's parent, the uncommitted changes
6498 the working directory's parent, the uncommitted changes
6499 are merged into the requested changeset and the merged
6499 are merged into the requested changeset and the merged
6500 result is left uncommitted. If the requested changeset is
6500 result is left uncommitted. If the requested changeset is
6501 not an ancestor or descendant (that is, it is on another
6501 not an ancestor or descendant (that is, it is on another
6502 branch), the update is aborted and the uncommitted changes
6502 branch), the update is aborted and the uncommitted changes
6503 are preserved.
6503 are preserved.
6504
6504
6505 2. With the -c/--check option, the update is aborted and the
6505 2. With the -c/--check option, the update is aborted and the
6506 uncommitted changes are preserved.
6506 uncommitted changes are preserved.
6507
6507
6508 3. With the -C/--clean option, uncommitted changes are discarded and
6508 3. With the -C/--clean option, uncommitted changes are discarded and
6509 the working directory is updated to the requested changeset.
6509 the working directory is updated to the requested changeset.
6510
6510
6511 To cancel an uncommitted merge (and lose your changes), use
6511 To cancel an uncommitted merge (and lose your changes), use
6512 :hg:`update --clean .`.
6512 :hg:`update --clean .`.
6513
6513
6514 Use null as the changeset to remove the working directory (like
6514 Use null as the changeset to remove the working directory (like
6515 :hg:`clone -U`).
6515 :hg:`clone -U`).
6516
6516
6517 If you want to revert just one file to an older revision, use
6517 If you want to revert just one file to an older revision, use
6518 :hg:`revert [-r REV] NAME`.
6518 :hg:`revert [-r REV] NAME`.
6519
6519
6520 See :hg:`help dates` for a list of formats valid for -d/--date.
6520 See :hg:`help dates` for a list of formats valid for -d/--date.
6521
6521
6522 Returns 0 on success, 1 if there are unresolved files.
6522 Returns 0 on success, 1 if there are unresolved files.
6523 """
6523 """
6524 if rev and node:
6524 if rev and node:
6525 raise error.Abort(_("please specify just one revision"))
6525 raise error.Abort(_("please specify just one revision"))
6526
6526
6527 if rev is None or rev == '':
6527 if rev is None or rev == '':
6528 rev = node
6528 rev = node
6529
6529
6530 if date and rev is not None:
6530 if date and rev is not None:
6531 raise error.Abort(_("you can't specify a revision and a date"))
6531 raise error.Abort(_("you can't specify a revision and a date"))
6532
6532
6533 if check and clean:
6533 if check and clean:
6534 raise error.Abort(_("cannot specify both -c/--check and -C/--clean"))
6534 raise error.Abort(_("cannot specify both -c/--check and -C/--clean"))
6535
6535
6536 with repo.wlock():
6536 with repo.wlock():
6537 cmdutil.clearunfinished(repo)
6537 cmdutil.clearunfinished(repo)
6538
6538
6539 if date:
6539 if date:
6540 rev = cmdutil.finddate(ui, repo, date)
6540 rev = cmdutil.finddate(ui, repo, date)
6541
6541
6542 # if we defined a bookmark, we have to remember the original name
6542 # if we defined a bookmark, we have to remember the original name
6543 brev = rev
6543 brev = rev
6544 rev = scmutil.revsingle(repo, rev, rev).rev()
6544 rev = scmutil.revsingle(repo, rev, rev).rev()
6545
6545
6546 if check:
6546 if check:
6547 cmdutil.bailifchanged(repo, merge=False)
6547 cmdutil.bailifchanged(repo, merge=False)
6548
6548
6549 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
6549 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
6550
6550
6551 return hg.updatetotally(ui, repo, rev, brev, clean=clean, check=check)
6551 return hg.updatetotally(ui, repo, rev, brev, clean=clean, check=check)
6552
6552
6553 @command('verify', [])
6553 @command('verify', [])
6554 def verify(ui, repo):
6554 def verify(ui, repo):
6555 """verify the integrity of the repository
6555 """verify the integrity of the repository
6556
6556
6557 Verify the integrity of the current repository.
6557 Verify the integrity of the current repository.
6558
6558
6559 This will perform an extensive check of the repository's
6559 This will perform an extensive check of the repository's
6560 integrity, validating the hashes and checksums of each entry in
6560 integrity, validating the hashes and checksums of each entry in
6561 the changelog, manifest, and tracked files, as well as the
6561 the changelog, manifest, and tracked files, as well as the
6562 integrity of their crosslinks and indices.
6562 integrity of their crosslinks and indices.
6563
6563
6564 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
6564 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
6565 for more information about recovery from corruption of the
6565 for more information about recovery from corruption of the
6566 repository.
6566 repository.
6567
6567
6568 Returns 0 on success, 1 if errors are encountered.
6568 Returns 0 on success, 1 if errors are encountered.
6569 """
6569 """
6570 return hg.verify(repo)
6570 return hg.verify(repo)
6571
6571
6572 @command('version', [] + formatteropts, norepo=True)
6572 @command('version', [] + formatteropts, norepo=True)
6573 def version_(ui, **opts):
6573 def version_(ui, **opts):
6574 """output version and copyright information"""
6574 """output version and copyright information"""
6575 fm = ui.formatter("version", opts)
6575 fm = ui.formatter("version", opts)
6576 fm.startitem()
6576 fm.startitem()
6577 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
6577 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
6578 util.version())
6578 util.version())
6579 license = _(
6579 license = _(
6580 "(see https://mercurial-scm.org for more information)\n"
6580 "(see https://mercurial-scm.org for more information)\n"
6581 "\nCopyright (C) 2005-2016 Matt Mackall and others\n"
6581 "\nCopyright (C) 2005-2016 Matt Mackall and others\n"
6582 "This is free software; see the source for copying conditions. "
6582 "This is free software; see the source for copying conditions. "
6583 "There is NO\nwarranty; "
6583 "There is NO\nwarranty; "
6584 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6584 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6585 )
6585 )
6586 if not ui.quiet:
6586 if not ui.quiet:
6587 fm.plain(license)
6587 fm.plain(license)
6588
6588
6589 if ui.verbose:
6589 if ui.verbose:
6590 fm.plain(_("\nEnabled extensions:\n\n"))
6590 fm.plain(_("\nEnabled extensions:\n\n"))
6591 # format names and versions into columns
6591 # format names and versions into columns
6592 names = []
6592 names = []
6593 vers = []
6593 vers = []
6594 isinternals = []
6594 isinternals = []
6595 for name, module in extensions.extensions():
6595 for name, module in extensions.extensions():
6596 names.append(name)
6596 names.append(name)
6597 vers.append(extensions.moduleversion(module) or None)
6597 vers.append(extensions.moduleversion(module) or None)
6598 isinternals.append(extensions.ismoduleinternal(module))
6598 isinternals.append(extensions.ismoduleinternal(module))
6599 fn = fm.nested("extensions")
6599 fn = fm.nested("extensions")
6600 if names:
6600 if names:
6601 namefmt = " %%-%ds " % max(len(n) for n in names)
6601 namefmt = " %%-%ds " % max(len(n) for n in names)
6602 places = [_("external"), _("internal")]
6602 places = [_("external"), _("internal")]
6603 for n, v, p in zip(names, vers, isinternals):
6603 for n, v, p in zip(names, vers, isinternals):
6604 fn.startitem()
6604 fn.startitem()
6605 fn.condwrite(ui.verbose, "name", namefmt, n)
6605 fn.condwrite(ui.verbose, "name", namefmt, n)
6606 if ui.verbose:
6606 if ui.verbose:
6607 fn.plain("%s " % places[p])
6607 fn.plain("%s " % places[p])
6608 fn.data(bundled=p)
6608 fn.data(bundled=p)
6609 fn.condwrite(ui.verbose and v, "ver", "%s", v)
6609 fn.condwrite(ui.verbose and v, "ver", "%s", v)
6610 if ui.verbose:
6610 if ui.verbose:
6611 fn.plain("\n")
6611 fn.plain("\n")
6612 fn.end()
6612 fn.end()
6613 fm.end()
6613 fm.end()
6614
6614
6615 def loadcmdtable(ui, name, cmdtable):
6615 def loadcmdtable(ui, name, cmdtable):
6616 """Load command functions from specified cmdtable
6616 """Load command functions from specified cmdtable
6617 """
6617 """
6618 overrides = [cmd for cmd in cmdtable if cmd in table]
6618 overrides = [cmd for cmd in cmdtable if cmd in table]
6619 if overrides:
6619 if overrides:
6620 ui.warn(_("extension '%s' overrides commands: %s\n")
6620 ui.warn(_("extension '%s' overrides commands: %s\n")
6621 % (name, " ".join(overrides)))
6621 % (name, " ".join(overrides)))
6622 table.update(cmdtable)
6622 table.update(cmdtable)
General Comments 0
You need to be logged in to leave comments. Login now