##// END OF EJS Templates
debugobsolete: do not traceback on invalid node identifiers
Patrick Mezard -
r17292:8da6fe27 stable
parent child Browse files
Show More
@@ -1,5881 +1,5895 b''
1 1 # commands.py - command processing for mercurial
2 2 #
3 3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 4 #
5 5 # This software may be used and distributed according to the terms of the
6 6 # GNU General Public License version 2 or any later version.
7 7
8 8 from node import hex, bin, nullid, nullrev, short
9 9 from lock import release
10 10 from i18n import _, gettext
11 11 import os, re, difflib, time, tempfile, errno
12 12 import hg, scmutil, util, revlog, extensions, copies, error, bookmarks
13 13 import patch, help, url, encoding, templatekw, discovery
14 14 import archival, changegroup, cmdutil, hbisect
15 15 import sshserver, hgweb, hgweb.server, commandserver
16 16 import merge as mergemod
17 17 import minirst, revset, fileset
18 18 import dagparser, context, simplemerge, graphmod
19 19 import random, setdiscovery, treediscovery, dagutil, pvec, localrepo
20 20 import phases, obsolete
21 21
22 22 table = {}
23 23
24 24 command = cmdutil.command(table)
25 25
26 26 # common command options
27 27
28 28 globalopts = [
29 29 ('R', 'repository', '',
30 30 _('repository root directory or name of overlay bundle file'),
31 31 _('REPO')),
32 32 ('', 'cwd', '',
33 33 _('change working directory'), _('DIR')),
34 34 ('y', 'noninteractive', None,
35 35 _('do not prompt, automatically pick the first choice for all prompts')),
36 36 ('q', 'quiet', None, _('suppress output')),
37 37 ('v', 'verbose', None, _('enable additional output')),
38 38 ('', 'config', [],
39 39 _('set/override config option (use \'section.name=value\')'),
40 40 _('CONFIG')),
41 41 ('', 'debug', None, _('enable debugging output')),
42 42 ('', 'debugger', None, _('start debugger')),
43 43 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
44 44 _('ENCODE')),
45 45 ('', 'encodingmode', encoding.encodingmode,
46 46 _('set the charset encoding mode'), _('MODE')),
47 47 ('', 'traceback', None, _('always print a traceback on exception')),
48 48 ('', 'time', None, _('time how long the command takes')),
49 49 ('', 'profile', None, _('print command execution profile')),
50 50 ('', 'version', None, _('output version information and exit')),
51 51 ('h', 'help', None, _('display help and exit')),
52 52 ]
53 53
54 54 dryrunopts = [('n', 'dry-run', None,
55 55 _('do not perform actions, just print output'))]
56 56
57 57 remoteopts = [
58 58 ('e', 'ssh', '',
59 59 _('specify ssh command to use'), _('CMD')),
60 60 ('', 'remotecmd', '',
61 61 _('specify hg command to run on the remote side'), _('CMD')),
62 62 ('', 'insecure', None,
63 63 _('do not verify server certificate (ignoring web.cacerts config)')),
64 64 ]
65 65
66 66 walkopts = [
67 67 ('I', 'include', [],
68 68 _('include names matching the given patterns'), _('PATTERN')),
69 69 ('X', 'exclude', [],
70 70 _('exclude names matching the given patterns'), _('PATTERN')),
71 71 ]
72 72
73 73 commitopts = [
74 74 ('m', 'message', '',
75 75 _('use text as commit message'), _('TEXT')),
76 76 ('l', 'logfile', '',
77 77 _('read commit message from file'), _('FILE')),
78 78 ]
79 79
80 80 commitopts2 = [
81 81 ('d', 'date', '',
82 82 _('record the specified date as commit date'), _('DATE')),
83 83 ('u', 'user', '',
84 84 _('record the specified user as committer'), _('USER')),
85 85 ]
86 86
87 87 templateopts = [
88 88 ('', 'style', '',
89 89 _('display using template map file'), _('STYLE')),
90 90 ('', 'template', '',
91 91 _('display with template'), _('TEMPLATE')),
92 92 ]
93 93
94 94 logopts = [
95 95 ('p', 'patch', None, _('show patch')),
96 96 ('g', 'git', None, _('use git extended diff format')),
97 97 ('l', 'limit', '',
98 98 _('limit number of changes displayed'), _('NUM')),
99 99 ('M', 'no-merges', None, _('do not show merges')),
100 100 ('', 'stat', None, _('output diffstat-style summary of changes')),
101 101 ('G', 'graph', None, _("show the revision DAG")),
102 102 ] + templateopts
103 103
104 104 diffopts = [
105 105 ('a', 'text', None, _('treat all files as text')),
106 106 ('g', 'git', None, _('use git extended diff format')),
107 107 ('', 'nodates', None, _('omit dates from diff headers'))
108 108 ]
109 109
110 110 diffwsopts = [
111 111 ('w', 'ignore-all-space', None,
112 112 _('ignore white space when comparing lines')),
113 113 ('b', 'ignore-space-change', None,
114 114 _('ignore changes in the amount of white space')),
115 115 ('B', 'ignore-blank-lines', None,
116 116 _('ignore changes whose lines are all blank')),
117 117 ]
118 118
119 119 diffopts2 = [
120 120 ('p', 'show-function', None, _('show which function each change is in')),
121 121 ('', 'reverse', None, _('produce a diff that undoes the changes')),
122 122 ] + diffwsopts + [
123 123 ('U', 'unified', '',
124 124 _('number of lines of context to show'), _('NUM')),
125 125 ('', 'stat', None, _('output diffstat-style summary of changes')),
126 126 ]
127 127
128 128 mergetoolopts = [
129 129 ('t', 'tool', '', _('specify merge tool')),
130 130 ]
131 131
132 132 similarityopts = [
133 133 ('s', 'similarity', '',
134 134 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
135 135 ]
136 136
137 137 subrepoopts = [
138 138 ('S', 'subrepos', None,
139 139 _('recurse into subrepositories'))
140 140 ]
141 141
142 142 # Commands start here, listed alphabetically
143 143
144 144 @command('^add',
145 145 walkopts + subrepoopts + dryrunopts,
146 146 _('[OPTION]... [FILE]...'))
147 147 def add(ui, repo, *pats, **opts):
148 148 """add the specified files on the next commit
149 149
150 150 Schedule files to be version controlled and added to the
151 151 repository.
152 152
153 153 The files will be added to the repository at the next commit. To
154 154 undo an add before that, see :hg:`forget`.
155 155
156 156 If no names are given, add all files to the repository.
157 157
158 158 .. container:: verbose
159 159
160 160 An example showing how new (unknown) files are added
161 161 automatically by :hg:`add`::
162 162
163 163 $ ls
164 164 foo.c
165 165 $ hg status
166 166 ? foo.c
167 167 $ hg add
168 168 adding foo.c
169 169 $ hg status
170 170 A foo.c
171 171
172 172 Returns 0 if all files are successfully added.
173 173 """
174 174
175 175 m = scmutil.match(repo[None], pats, opts)
176 176 rejected = cmdutil.add(ui, repo, m, opts.get('dry_run'),
177 177 opts.get('subrepos'), prefix="", explicitonly=False)
178 178 return rejected and 1 or 0
179 179
180 180 @command('addremove',
181 181 similarityopts + walkopts + dryrunopts,
182 182 _('[OPTION]... [FILE]...'))
183 183 def addremove(ui, repo, *pats, **opts):
184 184 """add all new files, delete all missing files
185 185
186 186 Add all new files and remove all missing files from the
187 187 repository.
188 188
189 189 New files are ignored if they match any of the patterns in
190 190 ``.hgignore``. As with add, these changes take effect at the next
191 191 commit.
192 192
193 193 Use the -s/--similarity option to detect renamed files. This
194 194 option takes a percentage between 0 (disabled) and 100 (files must
195 195 be identical) as its parameter. With a parameter greater than 0,
196 196 this compares every removed file with every added file and records
197 197 those similar enough as renames. Detecting renamed files this way
198 198 can be expensive. After using this option, :hg:`status -C` can be
199 199 used to check which files were identified as moved or renamed. If
200 200 not specified, -s/--similarity defaults to 100 and only renames of
201 201 identical files are detected.
202 202
203 203 Returns 0 if all files are successfully added.
204 204 """
205 205 try:
206 206 sim = float(opts.get('similarity') or 100)
207 207 except ValueError:
208 208 raise util.Abort(_('similarity must be a number'))
209 209 if sim < 0 or sim > 100:
210 210 raise util.Abort(_('similarity must be between 0 and 100'))
211 211 return scmutil.addremove(repo, pats, opts, similarity=sim / 100.0)
212 212
213 213 @command('^annotate|blame',
214 214 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
215 215 ('', 'follow', None,
216 216 _('follow copies/renames and list the filename (DEPRECATED)')),
217 217 ('', 'no-follow', None, _("don't follow copies and renames")),
218 218 ('a', 'text', None, _('treat all files as text')),
219 219 ('u', 'user', None, _('list the author (long with -v)')),
220 220 ('f', 'file', None, _('list the filename')),
221 221 ('d', 'date', None, _('list the date (short with -q)')),
222 222 ('n', 'number', None, _('list the revision number (default)')),
223 223 ('c', 'changeset', None, _('list the changeset')),
224 224 ('l', 'line-number', None, _('show line number at the first appearance'))
225 225 ] + diffwsopts + walkopts,
226 226 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'))
227 227 def annotate(ui, repo, *pats, **opts):
228 228 """show changeset information by line for each file
229 229
230 230 List changes in files, showing the revision id responsible for
231 231 each line
232 232
233 233 This command is useful for discovering when a change was made and
234 234 by whom.
235 235
236 236 Without the -a/--text option, annotate will avoid processing files
237 237 it detects as binary. With -a, annotate will annotate the file
238 238 anyway, although the results will probably be neither useful
239 239 nor desirable.
240 240
241 241 Returns 0 on success.
242 242 """
243 243 if opts.get('follow'):
244 244 # --follow is deprecated and now just an alias for -f/--file
245 245 # to mimic the behavior of Mercurial before version 1.5
246 246 opts['file'] = True
247 247
248 248 datefunc = ui.quiet and util.shortdate or util.datestr
249 249 getdate = util.cachefunc(lambda x: datefunc(x[0].date()))
250 250
251 251 if not pats:
252 252 raise util.Abort(_('at least one filename or pattern is required'))
253 253
254 254 hexfn = ui.debugflag and hex or short
255 255
256 256 opmap = [('user', ' ', lambda x: ui.shortuser(x[0].user())),
257 257 ('number', ' ', lambda x: str(x[0].rev())),
258 258 ('changeset', ' ', lambda x: hexfn(x[0].node())),
259 259 ('date', ' ', getdate),
260 260 ('file', ' ', lambda x: x[0].path()),
261 261 ('line_number', ':', lambda x: str(x[1])),
262 262 ]
263 263
264 264 if (not opts.get('user') and not opts.get('changeset')
265 265 and not opts.get('date') and not opts.get('file')):
266 266 opts['number'] = True
267 267
268 268 linenumber = opts.get('line_number') is not None
269 269 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
270 270 raise util.Abort(_('at least one of -n/-c is required for -l'))
271 271
272 272 funcmap = [(func, sep) for op, sep, func in opmap if opts.get(op)]
273 273 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
274 274
275 275 def bad(x, y):
276 276 raise util.Abort("%s: %s" % (x, y))
277 277
278 278 ctx = scmutil.revsingle(repo, opts.get('rev'))
279 279 m = scmutil.match(ctx, pats, opts)
280 280 m.bad = bad
281 281 follow = not opts.get('no_follow')
282 282 diffopts = patch.diffopts(ui, opts, section='annotate')
283 283 for abs in ctx.walk(m):
284 284 fctx = ctx[abs]
285 285 if not opts.get('text') and util.binary(fctx.data()):
286 286 ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
287 287 continue
288 288
289 289 lines = fctx.annotate(follow=follow, linenumber=linenumber,
290 290 diffopts=diffopts)
291 291 pieces = []
292 292
293 293 for f, sep in funcmap:
294 294 l = [f(n) for n, dummy in lines]
295 295 if l:
296 296 sized = [(x, encoding.colwidth(x)) for x in l]
297 297 ml = max([w for x, w in sized])
298 298 pieces.append(["%s%s%s" % (sep, ' ' * (ml - w), x)
299 299 for x, w in sized])
300 300
301 301 if pieces:
302 302 for p, l in zip(zip(*pieces), lines):
303 303 ui.write("%s: %s" % ("".join(p), l[1]))
304 304
305 305 if lines and not lines[-1][1].endswith('\n'):
306 306 ui.write('\n')
307 307
308 308 @command('archive',
309 309 [('', 'no-decode', None, _('do not pass files through decoders')),
310 310 ('p', 'prefix', '', _('directory prefix for files in archive'),
311 311 _('PREFIX')),
312 312 ('r', 'rev', '', _('revision to distribute'), _('REV')),
313 313 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
314 314 ] + subrepoopts + walkopts,
315 315 _('[OPTION]... DEST'))
316 316 def archive(ui, repo, dest, **opts):
317 317 '''create an unversioned archive of a repository revision
318 318
319 319 By default, the revision used is the parent of the working
320 320 directory; use -r/--rev to specify a different revision.
321 321
322 322 The archive type is automatically detected based on file
323 323 extension (or override using -t/--type).
324 324
325 325 .. container:: verbose
326 326
327 327 Examples:
328 328
329 329 - create a zip file containing the 1.0 release::
330 330
331 331 hg archive -r 1.0 project-1.0.zip
332 332
333 333 - create a tarball excluding .hg files::
334 334
335 335 hg archive project.tar.gz -X ".hg*"
336 336
337 337 Valid types are:
338 338
339 339 :``files``: a directory full of files (default)
340 340 :``tar``: tar archive, uncompressed
341 341 :``tbz2``: tar archive, compressed using bzip2
342 342 :``tgz``: tar archive, compressed using gzip
343 343 :``uzip``: zip archive, uncompressed
344 344 :``zip``: zip archive, compressed using deflate
345 345
346 346 The exact name of the destination archive or directory is given
347 347 using a format string; see :hg:`help export` for details.
348 348
349 349 Each member added to an archive file has a directory prefix
350 350 prepended. Use -p/--prefix to specify a format string for the
351 351 prefix. The default is the basename of the archive, with suffixes
352 352 removed.
353 353
354 354 Returns 0 on success.
355 355 '''
356 356
357 357 ctx = scmutil.revsingle(repo, opts.get('rev'))
358 358 if not ctx:
359 359 raise util.Abort(_('no working directory: please specify a revision'))
360 360 node = ctx.node()
361 361 dest = cmdutil.makefilename(repo, dest, node)
362 362 if os.path.realpath(dest) == repo.root:
363 363 raise util.Abort(_('repository root cannot be destination'))
364 364
365 365 kind = opts.get('type') or archival.guesskind(dest) or 'files'
366 366 prefix = opts.get('prefix')
367 367
368 368 if dest == '-':
369 369 if kind == 'files':
370 370 raise util.Abort(_('cannot archive plain files to stdout'))
371 371 dest = cmdutil.makefileobj(repo, dest)
372 372 if not prefix:
373 373 prefix = os.path.basename(repo.root) + '-%h'
374 374
375 375 prefix = cmdutil.makefilename(repo, prefix, node)
376 376 matchfn = scmutil.match(ctx, [], opts)
377 377 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
378 378 matchfn, prefix, subrepos=opts.get('subrepos'))
379 379
380 380 @command('backout',
381 381 [('', 'merge', None, _('merge with old dirstate parent after backout')),
382 382 ('', 'parent', '',
383 383 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
384 384 ('r', 'rev', '', _('revision to backout'), _('REV')),
385 385 ] + mergetoolopts + walkopts + commitopts + commitopts2,
386 386 _('[OPTION]... [-r] REV'))
387 387 def backout(ui, repo, node=None, rev=None, **opts):
388 388 '''reverse effect of earlier changeset
389 389
390 390 Prepare a new changeset with the effect of REV undone in the
391 391 current working directory.
392 392
393 393 If REV is the parent of the working directory, then this new changeset
394 394 is committed automatically. Otherwise, hg needs to merge the
395 395 changes and the merged result is left uncommitted.
396 396
397 397 .. note::
398 398 backout cannot be used to fix either an unwanted or
399 399 incorrect merge.
400 400
401 401 .. container:: verbose
402 402
403 403 By default, the pending changeset will have one parent,
404 404 maintaining a linear history. With --merge, the pending
405 405 changeset will instead have two parents: the old parent of the
406 406 working directory and a new child of REV that simply undoes REV.
407 407
408 408 Before version 1.7, the behavior without --merge was equivalent
409 409 to specifying --merge followed by :hg:`update --clean .` to
410 410 cancel the merge and leave the child of REV as a head to be
411 411 merged separately.
412 412
413 413 See :hg:`help dates` for a list of formats valid for -d/--date.
414 414
415 415 Returns 0 on success.
416 416 '''
417 417 if rev and node:
418 418 raise util.Abort(_("please specify just one revision"))
419 419
420 420 if not rev:
421 421 rev = node
422 422
423 423 if not rev:
424 424 raise util.Abort(_("please specify a revision to backout"))
425 425
426 426 date = opts.get('date')
427 427 if date:
428 428 opts['date'] = util.parsedate(date)
429 429
430 430 cmdutil.bailifchanged(repo)
431 431 node = scmutil.revsingle(repo, rev).node()
432 432
433 433 op1, op2 = repo.dirstate.parents()
434 434 a = repo.changelog.ancestor(op1, node)
435 435 if a != node:
436 436 raise util.Abort(_('cannot backout change on a different branch'))
437 437
438 438 p1, p2 = repo.changelog.parents(node)
439 439 if p1 == nullid:
440 440 raise util.Abort(_('cannot backout a change with no parents'))
441 441 if p2 != nullid:
442 442 if not opts.get('parent'):
443 443 raise util.Abort(_('cannot backout a merge changeset'))
444 444 p = repo.lookup(opts['parent'])
445 445 if p not in (p1, p2):
446 446 raise util.Abort(_('%s is not a parent of %s') %
447 447 (short(p), short(node)))
448 448 parent = p
449 449 else:
450 450 if opts.get('parent'):
451 451 raise util.Abort(_('cannot use --parent on non-merge changeset'))
452 452 parent = p1
453 453
454 454 # the backout should appear on the same branch
455 455 wlock = repo.wlock()
456 456 try:
457 457 branch = repo.dirstate.branch()
458 458 hg.clean(repo, node, show_stats=False)
459 459 repo.dirstate.setbranch(branch)
460 460 revert_opts = opts.copy()
461 461 revert_opts['date'] = None
462 462 revert_opts['all'] = True
463 463 revert_opts['rev'] = hex(parent)
464 464 revert_opts['no_backup'] = None
465 465 revert(ui, repo, **revert_opts)
466 466 if not opts.get('merge') and op1 != node:
467 467 try:
468 468 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
469 469 return hg.update(repo, op1)
470 470 finally:
471 471 ui.setconfig('ui', 'forcemerge', '')
472 472
473 473 commit_opts = opts.copy()
474 474 commit_opts['addremove'] = False
475 475 if not commit_opts['message'] and not commit_opts['logfile']:
476 476 # we don't translate commit messages
477 477 commit_opts['message'] = "Backed out changeset %s" % short(node)
478 478 commit_opts['force_editor'] = True
479 479 commit(ui, repo, **commit_opts)
480 480 def nice(node):
481 481 return '%d:%s' % (repo.changelog.rev(node), short(node))
482 482 ui.status(_('changeset %s backs out changeset %s\n') %
483 483 (nice(repo.changelog.tip()), nice(node)))
484 484 if opts.get('merge') and op1 != node:
485 485 hg.clean(repo, op1, show_stats=False)
486 486 ui.status(_('merging with changeset %s\n')
487 487 % nice(repo.changelog.tip()))
488 488 try:
489 489 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
490 490 return hg.merge(repo, hex(repo.changelog.tip()))
491 491 finally:
492 492 ui.setconfig('ui', 'forcemerge', '')
493 493 finally:
494 494 wlock.release()
495 495 return 0
496 496
497 497 @command('bisect',
498 498 [('r', 'reset', False, _('reset bisect state')),
499 499 ('g', 'good', False, _('mark changeset good')),
500 500 ('b', 'bad', False, _('mark changeset bad')),
501 501 ('s', 'skip', False, _('skip testing changeset')),
502 502 ('e', 'extend', False, _('extend the bisect range')),
503 503 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
504 504 ('U', 'noupdate', False, _('do not update to target'))],
505 505 _("[-gbsr] [-U] [-c CMD] [REV]"))
506 506 def bisect(ui, repo, rev=None, extra=None, command=None,
507 507 reset=None, good=None, bad=None, skip=None, extend=None,
508 508 noupdate=None):
509 509 """subdivision search of changesets
510 510
511 511 This command helps to find changesets which introduce problems. To
512 512 use, mark the earliest changeset you know exhibits the problem as
513 513 bad, then mark the latest changeset which is free from the problem
514 514 as good. Bisect will update your working directory to a revision
515 515 for testing (unless the -U/--noupdate option is specified). Once
516 516 you have performed tests, mark the working directory as good or
517 517 bad, and bisect will either update to another candidate changeset
518 518 or announce that it has found the bad revision.
519 519
520 520 As a shortcut, you can also use the revision argument to mark a
521 521 revision as good or bad without checking it out first.
522 522
523 523 If you supply a command, it will be used for automatic bisection.
524 524 The environment variable HG_NODE will contain the ID of the
525 525 changeset being tested. The exit status of the command will be
526 526 used to mark revisions as good or bad: status 0 means good, 125
527 527 means to skip the revision, 127 (command not found) will abort the
528 528 bisection, and any other non-zero exit status means the revision
529 529 is bad.
530 530
531 531 .. container:: verbose
532 532
533 533 Some examples:
534 534
535 535 - start a bisection with known bad revision 12, and good revision 34::
536 536
537 537 hg bisect --bad 34
538 538 hg bisect --good 12
539 539
540 540 - advance the current bisection by marking current revision as good or
541 541 bad::
542 542
543 543 hg bisect --good
544 544 hg bisect --bad
545 545
546 546 - mark the current revision, or a known revision, to be skipped (eg. if
547 547 that revision is not usable because of another issue)::
548 548
549 549 hg bisect --skip
550 550 hg bisect --skip 23
551 551
552 552 - forget the current bisection::
553 553
554 554 hg bisect --reset
555 555
556 556 - use 'make && make tests' to automatically find the first broken
557 557 revision::
558 558
559 559 hg bisect --reset
560 560 hg bisect --bad 34
561 561 hg bisect --good 12
562 562 hg bisect --command 'make && make tests'
563 563
564 564 - see all changesets whose states are already known in the current
565 565 bisection::
566 566
567 567 hg log -r "bisect(pruned)"
568 568
569 569 - see the changeset currently being bisected (especially useful
570 570 if running with -U/--noupdate)::
571 571
572 572 hg log -r "bisect(current)"
573 573
574 574 - see all changesets that took part in the current bisection::
575 575
576 576 hg log -r "bisect(range)"
577 577
578 578 - with the graphlog extension, you can even get a nice graph::
579 579
580 580 hg log --graph -r "bisect(range)"
581 581
582 582 See :hg:`help revsets` for more about the `bisect()` keyword.
583 583
584 584 Returns 0 on success.
585 585 """
586 586 def extendbisectrange(nodes, good):
587 587 # bisect is incomplete when it ends on a merge node and
588 588 # one of the parent was not checked.
589 589 parents = repo[nodes[0]].parents()
590 590 if len(parents) > 1:
591 591 side = good and state['bad'] or state['good']
592 592 num = len(set(i.node() for i in parents) & set(side))
593 593 if num == 1:
594 594 return parents[0].ancestor(parents[1])
595 595 return None
596 596
597 597 def print_result(nodes, good):
598 598 displayer = cmdutil.show_changeset(ui, repo, {})
599 599 if len(nodes) == 1:
600 600 # narrowed it down to a single revision
601 601 if good:
602 602 ui.write(_("The first good revision is:\n"))
603 603 else:
604 604 ui.write(_("The first bad revision is:\n"))
605 605 displayer.show(repo[nodes[0]])
606 606 extendnode = extendbisectrange(nodes, good)
607 607 if extendnode is not None:
608 608 ui.write(_('Not all ancestors of this changeset have been'
609 609 ' checked.\nUse bisect --extend to continue the '
610 610 'bisection from\nthe common ancestor, %s.\n')
611 611 % extendnode)
612 612 else:
613 613 # multiple possible revisions
614 614 if good:
615 615 ui.write(_("Due to skipped revisions, the first "
616 616 "good revision could be any of:\n"))
617 617 else:
618 618 ui.write(_("Due to skipped revisions, the first "
619 619 "bad revision could be any of:\n"))
620 620 for n in nodes:
621 621 displayer.show(repo[n])
622 622 displayer.close()
623 623
624 624 def check_state(state, interactive=True):
625 625 if not state['good'] or not state['bad']:
626 626 if (good or bad or skip or reset) and interactive:
627 627 return
628 628 if not state['good']:
629 629 raise util.Abort(_('cannot bisect (no known good revisions)'))
630 630 else:
631 631 raise util.Abort(_('cannot bisect (no known bad revisions)'))
632 632 return True
633 633
634 634 # backward compatibility
635 635 if rev in "good bad reset init".split():
636 636 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
637 637 cmd, rev, extra = rev, extra, None
638 638 if cmd == "good":
639 639 good = True
640 640 elif cmd == "bad":
641 641 bad = True
642 642 else:
643 643 reset = True
644 644 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
645 645 raise util.Abort(_('incompatible arguments'))
646 646
647 647 if reset:
648 648 p = repo.join("bisect.state")
649 649 if os.path.exists(p):
650 650 os.unlink(p)
651 651 return
652 652
653 653 state = hbisect.load_state(repo)
654 654
655 655 if command:
656 656 changesets = 1
657 657 try:
658 658 node = state['current'][0]
659 659 except LookupError:
660 660 if noupdate:
661 661 raise util.Abort(_('current bisect revision is unknown - '
662 662 'start a new bisect to fix'))
663 663 node, p2 = repo.dirstate.parents()
664 664 if p2 != nullid:
665 665 raise util.Abort(_('current bisect revision is a merge'))
666 666 try:
667 667 while changesets:
668 668 # update state
669 669 state['current'] = [node]
670 670 hbisect.save_state(repo, state)
671 671 status = util.system(command,
672 672 environ={'HG_NODE': hex(node)},
673 673 out=ui.fout)
674 674 if status == 125:
675 675 transition = "skip"
676 676 elif status == 0:
677 677 transition = "good"
678 678 # status < 0 means process was killed
679 679 elif status == 127:
680 680 raise util.Abort(_("failed to execute %s") % command)
681 681 elif status < 0:
682 682 raise util.Abort(_("%s killed") % command)
683 683 else:
684 684 transition = "bad"
685 685 ctx = scmutil.revsingle(repo, rev, node)
686 686 rev = None # clear for future iterations
687 687 state[transition].append(ctx.node())
688 688 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
689 689 check_state(state, interactive=False)
690 690 # bisect
691 691 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
692 692 # update to next check
693 693 node = nodes[0]
694 694 if not noupdate:
695 695 cmdutil.bailifchanged(repo)
696 696 hg.clean(repo, node, show_stats=False)
697 697 finally:
698 698 state['current'] = [node]
699 699 hbisect.save_state(repo, state)
700 700 print_result(nodes, good)
701 701 return
702 702
703 703 # update state
704 704
705 705 if rev:
706 706 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
707 707 else:
708 708 nodes = [repo.lookup('.')]
709 709
710 710 if good or bad or skip:
711 711 if good:
712 712 state['good'] += nodes
713 713 elif bad:
714 714 state['bad'] += nodes
715 715 elif skip:
716 716 state['skip'] += nodes
717 717 hbisect.save_state(repo, state)
718 718
719 719 if not check_state(state):
720 720 return
721 721
722 722 # actually bisect
723 723 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
724 724 if extend:
725 725 if not changesets:
726 726 extendnode = extendbisectrange(nodes, good)
727 727 if extendnode is not None:
728 728 ui.write(_("Extending search to changeset %d:%s\n"
729 729 % (extendnode.rev(), extendnode)))
730 730 state['current'] = [extendnode.node()]
731 731 hbisect.save_state(repo, state)
732 732 if noupdate:
733 733 return
734 734 cmdutil.bailifchanged(repo)
735 735 return hg.clean(repo, extendnode.node())
736 736 raise util.Abort(_("nothing to extend"))
737 737
738 738 if changesets == 0:
739 739 print_result(nodes, good)
740 740 else:
741 741 assert len(nodes) == 1 # only a single node can be tested next
742 742 node = nodes[0]
743 743 # compute the approximate number of remaining tests
744 744 tests, size = 0, 2
745 745 while size <= changesets:
746 746 tests, size = tests + 1, size * 2
747 747 rev = repo.changelog.rev(node)
748 748 ui.write(_("Testing changeset %d:%s "
749 749 "(%d changesets remaining, ~%d tests)\n")
750 750 % (rev, short(node), changesets, tests))
751 751 state['current'] = [node]
752 752 hbisect.save_state(repo, state)
753 753 if not noupdate:
754 754 cmdutil.bailifchanged(repo)
755 755 return hg.clean(repo, node)
756 756
757 757 @command('bookmarks',
758 758 [('f', 'force', False, _('force')),
759 759 ('r', 'rev', '', _('revision'), _('REV')),
760 760 ('d', 'delete', False, _('delete a given bookmark')),
761 761 ('m', 'rename', '', _('rename a given bookmark'), _('NAME')),
762 762 ('i', 'inactive', False, _('mark a bookmark inactive'))],
763 763 _('hg bookmarks [-f] [-d] [-i] [-m NAME] [-r REV] [NAME]'))
764 764 def bookmark(ui, repo, mark=None, rev=None, force=False, delete=False,
765 765 rename=None, inactive=False):
766 766 '''track a line of development with movable markers
767 767
768 768 Bookmarks are pointers to certain commits that move when committing.
769 769 Bookmarks are local. They can be renamed, copied and deleted. It is
770 770 possible to use :hg:`merge NAME` to merge from a given bookmark, and
771 771 :hg:`update NAME` to update to a given bookmark.
772 772
773 773 You can use :hg:`bookmark NAME` to set a bookmark on the working
774 774 directory's parent revision with the given name. If you specify
775 775 a revision using -r REV (where REV may be an existing bookmark),
776 776 the bookmark is assigned to that revision.
777 777
778 778 Bookmarks can be pushed and pulled between repositories (see :hg:`help
779 779 push` and :hg:`help pull`). This requires both the local and remote
780 780 repositories to support bookmarks. For versions prior to 1.8, this means
781 781 the bookmarks extension must be enabled.
782 782
783 783 With -i/--inactive, the new bookmark will not be made the active
784 784 bookmark. If -r/--rev is given, the new bookmark will not be made
785 785 active even if -i/--inactive is not given. If no NAME is given, the
786 786 current active bookmark will be marked inactive.
787 787 '''
788 788 hexfn = ui.debugflag and hex or short
789 789 marks = repo._bookmarks
790 790 cur = repo.changectx('.').node()
791 791
792 792 if delete:
793 793 if mark is None:
794 794 raise util.Abort(_("bookmark name required"))
795 795 if mark not in marks:
796 796 raise util.Abort(_("bookmark '%s' does not exist") % mark)
797 797 if mark == repo._bookmarkcurrent:
798 798 bookmarks.setcurrent(repo, None)
799 799 del marks[mark]
800 800 bookmarks.write(repo)
801 801 return
802 802
803 803 if rename:
804 804 if rename not in marks:
805 805 raise util.Abort(_("bookmark '%s' does not exist") % rename)
806 806 if mark in marks and not force:
807 807 raise util.Abort(_("bookmark '%s' already exists "
808 808 "(use -f to force)") % mark)
809 809 if mark is None:
810 810 raise util.Abort(_("new bookmark name required"))
811 811 marks[mark] = marks[rename]
812 812 if repo._bookmarkcurrent == rename and not inactive:
813 813 bookmarks.setcurrent(repo, mark)
814 814 del marks[rename]
815 815 bookmarks.write(repo)
816 816 return
817 817
818 818 if mark is not None:
819 819 if "\n" in mark:
820 820 raise util.Abort(_("bookmark name cannot contain newlines"))
821 821 mark = mark.strip()
822 822 if not mark:
823 823 raise util.Abort(_("bookmark names cannot consist entirely of "
824 824 "whitespace"))
825 825 if inactive and mark == repo._bookmarkcurrent:
826 826 bookmarks.setcurrent(repo, None)
827 827 return
828 828 if mark in marks and not force:
829 829 raise util.Abort(_("bookmark '%s' already exists "
830 830 "(use -f to force)") % mark)
831 831 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
832 832 and not force):
833 833 raise util.Abort(
834 834 _("a bookmark cannot have the name of an existing branch"))
835 835 if rev:
836 836 marks[mark] = repo.lookup(rev)
837 837 else:
838 838 marks[mark] = cur
839 839 if not inactive and cur == marks[mark]:
840 840 bookmarks.setcurrent(repo, mark)
841 841 bookmarks.write(repo)
842 842 return
843 843
844 844 if mark is None:
845 845 if rev:
846 846 raise util.Abort(_("bookmark name required"))
847 847 if len(marks) == 0:
848 848 ui.status(_("no bookmarks set\n"))
849 849 else:
850 850 for bmark, n in sorted(marks.iteritems()):
851 851 current = repo._bookmarkcurrent
852 852 if bmark == current and n == cur:
853 853 prefix, label = '*', 'bookmarks.current'
854 854 else:
855 855 prefix, label = ' ', ''
856 856
857 857 if ui.quiet:
858 858 ui.write("%s\n" % bmark, label=label)
859 859 else:
860 860 ui.write(" %s %-25s %d:%s\n" % (
861 861 prefix, bmark, repo.changelog.rev(n), hexfn(n)),
862 862 label=label)
863 863 return
864 864
865 865 @command('branch',
866 866 [('f', 'force', None,
867 867 _('set branch name even if it shadows an existing branch')),
868 868 ('C', 'clean', None, _('reset branch name to parent branch name'))],
869 869 _('[-fC] [NAME]'))
870 870 def branch(ui, repo, label=None, **opts):
871 871 """set or show the current branch name
872 872
873 873 .. note::
874 874 Branch names are permanent and global. Use :hg:`bookmark` to create a
875 875 light-weight bookmark instead. See :hg:`help glossary` for more
876 876 information about named branches and bookmarks.
877 877
878 878 With no argument, show the current branch name. With one argument,
879 879 set the working directory branch name (the branch will not exist
880 880 in the repository until the next commit). Standard practice
881 881 recommends that primary development take place on the 'default'
882 882 branch.
883 883
884 884 Unless -f/--force is specified, branch will not let you set a
885 885 branch name that already exists, even if it's inactive.
886 886
887 887 Use -C/--clean to reset the working directory branch to that of
888 888 the parent of the working directory, negating a previous branch
889 889 change.
890 890
891 891 Use the command :hg:`update` to switch to an existing branch. Use
892 892 :hg:`commit --close-branch` to mark this branch as closed.
893 893
894 894 Returns 0 on success.
895 895 """
896 896 if not opts.get('clean') and not label:
897 897 ui.write("%s\n" % repo.dirstate.branch())
898 898 return
899 899
900 900 wlock = repo.wlock()
901 901 try:
902 902 if opts.get('clean'):
903 903 label = repo[None].p1().branch()
904 904 repo.dirstate.setbranch(label)
905 905 ui.status(_('reset working directory to branch %s\n') % label)
906 906 elif label:
907 907 if not opts.get('force') and label in repo.branchmap():
908 908 if label not in [p.branch() for p in repo.parents()]:
909 909 raise util.Abort(_('a branch of the same name already'
910 910 ' exists'),
911 911 # i18n: "it" refers to an existing branch
912 912 hint=_("use 'hg update' to switch to it"))
913 913 repo.dirstate.setbranch(label)
914 914 ui.status(_('marked working directory as branch %s\n') % label)
915 915 ui.status(_('(branches are permanent and global, '
916 916 'did you want a bookmark?)\n'))
917 917 finally:
918 918 wlock.release()
919 919
920 920 @command('branches',
921 921 [('a', 'active', False, _('show only branches that have unmerged heads')),
922 922 ('c', 'closed', False, _('show normal and closed branches'))],
923 923 _('[-ac]'))
924 924 def branches(ui, repo, active=False, closed=False):
925 925 """list repository named branches
926 926
927 927 List the repository's named branches, indicating which ones are
928 928 inactive. If -c/--closed is specified, also list branches which have
929 929 been marked closed (see :hg:`commit --close-branch`).
930 930
931 931 If -a/--active is specified, only show active branches. A branch
932 932 is considered active if it contains repository heads.
933 933
934 934 Use the command :hg:`update` to switch to an existing branch.
935 935
936 936 Returns 0.
937 937 """
938 938
939 939 hexfunc = ui.debugflag and hex or short
940 940
941 941 activebranches = set([repo[n].branch() for n in repo.heads()])
942 942 branches = []
943 943 for tag, heads in repo.branchmap().iteritems():
944 944 for h in reversed(heads):
945 945 ctx = repo[h]
946 946 isopen = not ctx.closesbranch()
947 947 if isopen:
948 948 tip = ctx
949 949 break
950 950 else:
951 951 tip = repo[heads[-1]]
952 952 isactive = tag in activebranches and isopen
953 953 branches.append((tip, isactive, isopen))
954 954 branches.sort(key=lambda i: (i[1], i[0].rev(), i[0].branch(), i[2]),
955 955 reverse=True)
956 956
957 957 for ctx, isactive, isopen in branches:
958 958 if (not active) or isactive:
959 959 if isactive:
960 960 label = 'branches.active'
961 961 notice = ''
962 962 elif not isopen:
963 963 if not closed:
964 964 continue
965 965 label = 'branches.closed'
966 966 notice = _(' (closed)')
967 967 else:
968 968 label = 'branches.inactive'
969 969 notice = _(' (inactive)')
970 970 if ctx.branch() == repo.dirstate.branch():
971 971 label = 'branches.current'
972 972 rev = str(ctx.rev()).rjust(31 - encoding.colwidth(ctx.branch()))
973 973 rev = ui.label('%s:%s' % (rev, hexfunc(ctx.node())),
974 974 'log.changeset')
975 975 tag = ui.label(ctx.branch(), label)
976 976 if ui.quiet:
977 977 ui.write("%s\n" % tag)
978 978 else:
979 979 ui.write("%s %s%s\n" % (tag, rev, notice))
980 980
981 981 @command('bundle',
982 982 [('f', 'force', None, _('run even when the destination is unrelated')),
983 983 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
984 984 _('REV')),
985 985 ('b', 'branch', [], _('a specific branch you would like to bundle'),
986 986 _('BRANCH')),
987 987 ('', 'base', [],
988 988 _('a base changeset assumed to be available at the destination'),
989 989 _('REV')),
990 990 ('a', 'all', None, _('bundle all changesets in the repository')),
991 991 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
992 992 ] + remoteopts,
993 993 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
994 994 def bundle(ui, repo, fname, dest=None, **opts):
995 995 """create a changegroup file
996 996
997 997 Generate a compressed changegroup file collecting changesets not
998 998 known to be in another repository.
999 999
1000 1000 If you omit the destination repository, then hg assumes the
1001 1001 destination will have all the nodes you specify with --base
1002 1002 parameters. To create a bundle containing all changesets, use
1003 1003 -a/--all (or --base null).
1004 1004
1005 1005 You can change compression method with the -t/--type option.
1006 1006 The available compression methods are: none, bzip2, and
1007 1007 gzip (by default, bundles are compressed using bzip2).
1008 1008
1009 1009 The bundle file can then be transferred using conventional means
1010 1010 and applied to another repository with the unbundle or pull
1011 1011 command. This is useful when direct push and pull are not
1012 1012 available or when exporting an entire repository is undesirable.
1013 1013
1014 1014 Applying bundles preserves all changeset contents including
1015 1015 permissions, copy/rename information, and revision history.
1016 1016
1017 1017 Returns 0 on success, 1 if no changes found.
1018 1018 """
1019 1019 revs = None
1020 1020 if 'rev' in opts:
1021 1021 revs = scmutil.revrange(repo, opts['rev'])
1022 1022
1023 1023 bundletype = opts.get('type', 'bzip2').lower()
1024 1024 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
1025 1025 bundletype = btypes.get(bundletype)
1026 1026 if bundletype not in changegroup.bundletypes:
1027 1027 raise util.Abort(_('unknown bundle type specified with --type'))
1028 1028
1029 1029 if opts.get('all'):
1030 1030 base = ['null']
1031 1031 else:
1032 1032 base = scmutil.revrange(repo, opts.get('base'))
1033 1033 if base:
1034 1034 if dest:
1035 1035 raise util.Abort(_("--base is incompatible with specifying "
1036 1036 "a destination"))
1037 1037 common = [repo.lookup(rev) for rev in base]
1038 1038 heads = revs and map(repo.lookup, revs) or revs
1039 1039 cg = repo.getbundle('bundle', heads=heads, common=common)
1040 1040 outgoing = None
1041 1041 else:
1042 1042 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1043 1043 dest, branches = hg.parseurl(dest, opts.get('branch'))
1044 1044 other = hg.peer(repo, opts, dest)
1045 1045 revs, checkout = hg.addbranchrevs(repo, other, branches, revs)
1046 1046 heads = revs and map(repo.lookup, revs) or revs
1047 1047 outgoing = discovery.findcommonoutgoing(repo, other,
1048 1048 onlyheads=heads,
1049 1049 force=opts.get('force'),
1050 1050 portable=True)
1051 1051 cg = repo.getlocalbundle('bundle', outgoing)
1052 1052 if not cg:
1053 1053 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1054 1054 return 1
1055 1055
1056 1056 changegroup.writebundle(cg, fname, bundletype)
1057 1057
1058 1058 @command('cat',
1059 1059 [('o', 'output', '',
1060 1060 _('print output to file with formatted name'), _('FORMAT')),
1061 1061 ('r', 'rev', '', _('print the given revision'), _('REV')),
1062 1062 ('', 'decode', None, _('apply any matching decode filter')),
1063 1063 ] + walkopts,
1064 1064 _('[OPTION]... FILE...'))
1065 1065 def cat(ui, repo, file1, *pats, **opts):
1066 1066 """output the current or given revision of files
1067 1067
1068 1068 Print the specified files as they were at the given revision. If
1069 1069 no revision is given, the parent of the working directory is used,
1070 1070 or tip if no revision is checked out.
1071 1071
1072 1072 Output may be to a file, in which case the name of the file is
1073 1073 given using a format string. The formatting rules are the same as
1074 1074 for the export command, with the following additions:
1075 1075
1076 1076 :``%s``: basename of file being printed
1077 1077 :``%d``: dirname of file being printed, or '.' if in repository root
1078 1078 :``%p``: root-relative path name of file being printed
1079 1079
1080 1080 Returns 0 on success.
1081 1081 """
1082 1082 ctx = scmutil.revsingle(repo, opts.get('rev'))
1083 1083 err = 1
1084 1084 m = scmutil.match(ctx, (file1,) + pats, opts)
1085 1085 for abs in ctx.walk(m):
1086 1086 fp = cmdutil.makefileobj(repo, opts.get('output'), ctx.node(),
1087 1087 pathname=abs)
1088 1088 data = ctx[abs].data()
1089 1089 if opts.get('decode'):
1090 1090 data = repo.wwritedata(abs, data)
1091 1091 fp.write(data)
1092 1092 fp.close()
1093 1093 err = 0
1094 1094 return err
1095 1095
1096 1096 @command('^clone',
1097 1097 [('U', 'noupdate', None,
1098 1098 _('the clone will include an empty working copy (only a repository)')),
1099 1099 ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')),
1100 1100 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1101 1101 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1102 1102 ('', 'pull', None, _('use pull protocol to copy metadata')),
1103 1103 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1104 1104 ] + remoteopts,
1105 1105 _('[OPTION]... SOURCE [DEST]'))
1106 1106 def clone(ui, source, dest=None, **opts):
1107 1107 """make a copy of an existing repository
1108 1108
1109 1109 Create a copy of an existing repository in a new directory.
1110 1110
1111 1111 If no destination directory name is specified, it defaults to the
1112 1112 basename of the source.
1113 1113
1114 1114 The location of the source is added to the new repository's
1115 1115 ``.hg/hgrc`` file, as the default to be used for future pulls.
1116 1116
1117 1117 Only local paths and ``ssh://`` URLs are supported as
1118 1118 destinations. For ``ssh://`` destinations, no working directory or
1119 1119 ``.hg/hgrc`` will be created on the remote side.
1120 1120
1121 1121 To pull only a subset of changesets, specify one or more revisions
1122 1122 identifiers with -r/--rev or branches with -b/--branch. The
1123 1123 resulting clone will contain only the specified changesets and
1124 1124 their ancestors. These options (or 'clone src#rev dest') imply
1125 1125 --pull, even for local source repositories. Note that specifying a
1126 1126 tag will include the tagged changeset but not the changeset
1127 1127 containing the tag.
1128 1128
1129 1129 To check out a particular version, use -u/--update, or
1130 1130 -U/--noupdate to create a clone with no working directory.
1131 1131
1132 1132 .. container:: verbose
1133 1133
1134 1134 For efficiency, hardlinks are used for cloning whenever the
1135 1135 source and destination are on the same filesystem (note this
1136 1136 applies only to the repository data, not to the working
1137 1137 directory). Some filesystems, such as AFS, implement hardlinking
1138 1138 incorrectly, but do not report errors. In these cases, use the
1139 1139 --pull option to avoid hardlinking.
1140 1140
1141 1141 In some cases, you can clone repositories and the working
1142 1142 directory using full hardlinks with ::
1143 1143
1144 1144 $ cp -al REPO REPOCLONE
1145 1145
1146 1146 This is the fastest way to clone, but it is not always safe. The
1147 1147 operation is not atomic (making sure REPO is not modified during
1148 1148 the operation is up to you) and you have to make sure your
1149 1149 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1150 1150 so). Also, this is not compatible with certain extensions that
1151 1151 place their metadata under the .hg directory, such as mq.
1152 1152
1153 1153 Mercurial will update the working directory to the first applicable
1154 1154 revision from this list:
1155 1155
1156 1156 a) null if -U or the source repository has no changesets
1157 1157 b) if -u . and the source repository is local, the first parent of
1158 1158 the source repository's working directory
1159 1159 c) the changeset specified with -u (if a branch name, this means the
1160 1160 latest head of that branch)
1161 1161 d) the changeset specified with -r
1162 1162 e) the tipmost head specified with -b
1163 1163 f) the tipmost head specified with the url#branch source syntax
1164 1164 g) the tipmost head of the default branch
1165 1165 h) tip
1166 1166
1167 1167 Examples:
1168 1168
1169 1169 - clone a remote repository to a new directory named hg/::
1170 1170
1171 1171 hg clone http://selenic.com/hg
1172 1172
1173 1173 - create a lightweight local clone::
1174 1174
1175 1175 hg clone project/ project-feature/
1176 1176
1177 1177 - clone from an absolute path on an ssh server (note double-slash)::
1178 1178
1179 1179 hg clone ssh://user@server//home/projects/alpha/
1180 1180
1181 1181 - do a high-speed clone over a LAN while checking out a
1182 1182 specified version::
1183 1183
1184 1184 hg clone --uncompressed http://server/repo -u 1.5
1185 1185
1186 1186 - create a repository without changesets after a particular revision::
1187 1187
1188 1188 hg clone -r 04e544 experimental/ good/
1189 1189
1190 1190 - clone (and track) a particular named branch::
1191 1191
1192 1192 hg clone http://selenic.com/hg#stable
1193 1193
1194 1194 See :hg:`help urls` for details on specifying URLs.
1195 1195
1196 1196 Returns 0 on success.
1197 1197 """
1198 1198 if opts.get('noupdate') and opts.get('updaterev'):
1199 1199 raise util.Abort(_("cannot specify both --noupdate and --updaterev"))
1200 1200
1201 1201 r = hg.clone(ui, opts, source, dest,
1202 1202 pull=opts.get('pull'),
1203 1203 stream=opts.get('uncompressed'),
1204 1204 rev=opts.get('rev'),
1205 1205 update=opts.get('updaterev') or not opts.get('noupdate'),
1206 1206 branch=opts.get('branch'))
1207 1207
1208 1208 return r is None
1209 1209
1210 1210 @command('^commit|ci',
1211 1211 [('A', 'addremove', None,
1212 1212 _('mark new/missing files as added/removed before committing')),
1213 1213 ('', 'close-branch', None,
1214 1214 _('mark a branch as closed, hiding it from the branch list')),
1215 1215 ('', 'amend', None, _('amend the parent of the working dir')),
1216 1216 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1217 1217 _('[OPTION]... [FILE]...'))
1218 1218 def commit(ui, repo, *pats, **opts):
1219 1219 """commit the specified files or all outstanding changes
1220 1220
1221 1221 Commit changes to the given files into the repository. Unlike a
1222 1222 centralized SCM, this operation is a local operation. See
1223 1223 :hg:`push` for a way to actively distribute your changes.
1224 1224
1225 1225 If a list of files is omitted, all changes reported by :hg:`status`
1226 1226 will be committed.
1227 1227
1228 1228 If you are committing the result of a merge, do not provide any
1229 1229 filenames or -I/-X filters.
1230 1230
1231 1231 If no commit message is specified, Mercurial starts your
1232 1232 configured editor where you can enter a message. In case your
1233 1233 commit fails, you will find a backup of your message in
1234 1234 ``.hg/last-message.txt``.
1235 1235
1236 1236 The --amend flag can be used to amend the parent of the
1237 1237 working directory with a new commit that contains the changes
1238 1238 in the parent in addition to those currently reported by :hg:`status`,
1239 1239 if there are any. The old commit is stored in a backup bundle in
1240 1240 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1241 1241 on how to restore it).
1242 1242
1243 1243 Message, user and date are taken from the amended commit unless
1244 1244 specified. When a message isn't specified on the command line,
1245 1245 the editor will open with the message of the amended commit.
1246 1246
1247 1247 It is not possible to amend public changesets (see :hg:`help phases`)
1248 1248 or changesets that have children.
1249 1249
1250 1250 See :hg:`help dates` for a list of formats valid for -d/--date.
1251 1251
1252 1252 Returns 0 on success, 1 if nothing changed.
1253 1253 """
1254 1254 if opts.get('subrepos'):
1255 1255 # Let --subrepos on the command line overide config setting.
1256 1256 ui.setconfig('ui', 'commitsubrepos', True)
1257 1257
1258 1258 extra = {}
1259 1259 if opts.get('close_branch'):
1260 1260 if repo['.'].node() not in repo.branchheads():
1261 1261 # The topo heads set is included in the branch heads set of the
1262 1262 # current branch, so it's sufficient to test branchheads
1263 1263 raise util.Abort(_('can only close branch heads'))
1264 1264 extra['close'] = 1
1265 1265
1266 1266 branch = repo[None].branch()
1267 1267 bheads = repo.branchheads(branch)
1268 1268
1269 1269 if opts.get('amend'):
1270 1270 if ui.configbool('ui', 'commitsubrepos'):
1271 1271 raise util.Abort(_('cannot amend recursively'))
1272 1272
1273 1273 old = repo['.']
1274 1274 if old.phase() == phases.public:
1275 1275 raise util.Abort(_('cannot amend public changesets'))
1276 1276 if len(old.parents()) > 1:
1277 1277 raise util.Abort(_('cannot amend merge changesets'))
1278 1278 if len(repo[None].parents()) > 1:
1279 1279 raise util.Abort(_('cannot amend while merging'))
1280 1280 if old.children():
1281 1281 raise util.Abort(_('cannot amend changeset with children'))
1282 1282
1283 1283 e = cmdutil.commiteditor
1284 1284 if opts.get('force_editor'):
1285 1285 e = cmdutil.commitforceeditor
1286 1286
1287 1287 def commitfunc(ui, repo, message, match, opts):
1288 1288 editor = e
1289 1289 # message contains text from -m or -l, if it's empty,
1290 1290 # open the editor with the old message
1291 1291 if not message:
1292 1292 message = old.description()
1293 1293 editor = cmdutil.commitforceeditor
1294 1294 return repo.commit(message,
1295 1295 opts.get('user') or old.user(),
1296 1296 opts.get('date') or old.date(),
1297 1297 match,
1298 1298 editor=editor,
1299 1299 extra=extra)
1300 1300
1301 1301 current = repo._bookmarkcurrent
1302 1302 marks = old.bookmarks()
1303 1303 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1304 1304 if node == old.node():
1305 1305 ui.status(_("nothing changed\n"))
1306 1306 return 1
1307 1307 elif marks:
1308 1308 ui.debug('moving bookmarks %r from %s to %s\n' %
1309 1309 (marks, old.hex(), hex(node)))
1310 1310 for bm in marks:
1311 1311 repo._bookmarks[bm] = node
1312 1312 if bm == current:
1313 1313 bookmarks.setcurrent(repo, bm)
1314 1314 bookmarks.write(repo)
1315 1315 else:
1316 1316 e = cmdutil.commiteditor
1317 1317 if opts.get('force_editor'):
1318 1318 e = cmdutil.commitforceeditor
1319 1319
1320 1320 def commitfunc(ui, repo, message, match, opts):
1321 1321 return repo.commit(message, opts.get('user'), opts.get('date'),
1322 1322 match, editor=e, extra=extra)
1323 1323
1324 1324 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1325 1325
1326 1326 if not node:
1327 1327 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
1328 1328 if stat[3]:
1329 1329 ui.status(_("nothing changed (%d missing files, see "
1330 1330 "'hg status')\n") % len(stat[3]))
1331 1331 else:
1332 1332 ui.status(_("nothing changed\n"))
1333 1333 return 1
1334 1334
1335 1335 ctx = repo[node]
1336 1336 parents = ctx.parents()
1337 1337
1338 1338 if (not opts.get('amend') and bheads and node not in bheads and not
1339 1339 [x for x in parents if x.node() in bheads and x.branch() == branch]):
1340 1340 ui.status(_('created new head\n'))
1341 1341 # The message is not printed for initial roots. For the other
1342 1342 # changesets, it is printed in the following situations:
1343 1343 #
1344 1344 # Par column: for the 2 parents with ...
1345 1345 # N: null or no parent
1346 1346 # B: parent is on another named branch
1347 1347 # C: parent is a regular non head changeset
1348 1348 # H: parent was a branch head of the current branch
1349 1349 # Msg column: whether we print "created new head" message
1350 1350 # In the following, it is assumed that there already exists some
1351 1351 # initial branch heads of the current branch, otherwise nothing is
1352 1352 # printed anyway.
1353 1353 #
1354 1354 # Par Msg Comment
1355 1355 # NN y additional topo root
1356 1356 #
1357 1357 # BN y additional branch root
1358 1358 # CN y additional topo head
1359 1359 # HN n usual case
1360 1360 #
1361 1361 # BB y weird additional branch root
1362 1362 # CB y branch merge
1363 1363 # HB n merge with named branch
1364 1364 #
1365 1365 # CC y additional head from merge
1366 1366 # CH n merge with a head
1367 1367 #
1368 1368 # HH n head merge: head count decreases
1369 1369
1370 1370 if not opts.get('close_branch'):
1371 1371 for r in parents:
1372 1372 if r.closesbranch() and r.branch() == branch:
1373 1373 ui.status(_('reopening closed branch head %d\n') % r)
1374 1374
1375 1375 if ui.debugflag:
1376 1376 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex()))
1377 1377 elif ui.verbose:
1378 1378 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx))
1379 1379
1380 1380 @command('copy|cp',
1381 1381 [('A', 'after', None, _('record a copy that has already occurred')),
1382 1382 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1383 1383 ] + walkopts + dryrunopts,
1384 1384 _('[OPTION]... [SOURCE]... DEST'))
1385 1385 def copy(ui, repo, *pats, **opts):
1386 1386 """mark files as copied for the next commit
1387 1387
1388 1388 Mark dest as having copies of source files. If dest is a
1389 1389 directory, copies are put in that directory. If dest is a file,
1390 1390 the source must be a single file.
1391 1391
1392 1392 By default, this command copies the contents of files as they
1393 1393 exist in the working directory. If invoked with -A/--after, the
1394 1394 operation is recorded, but no copying is performed.
1395 1395
1396 1396 This command takes effect with the next commit. To undo a copy
1397 1397 before that, see :hg:`revert`.
1398 1398
1399 1399 Returns 0 on success, 1 if errors are encountered.
1400 1400 """
1401 1401 wlock = repo.wlock(False)
1402 1402 try:
1403 1403 return cmdutil.copy(ui, repo, pats, opts)
1404 1404 finally:
1405 1405 wlock.release()
1406 1406
1407 1407 @command('debugancestor', [], _('[INDEX] REV1 REV2'))
1408 1408 def debugancestor(ui, repo, *args):
1409 1409 """find the ancestor revision of two revisions in a given index"""
1410 1410 if len(args) == 3:
1411 1411 index, rev1, rev2 = args
1412 1412 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1413 1413 lookup = r.lookup
1414 1414 elif len(args) == 2:
1415 1415 if not repo:
1416 1416 raise util.Abort(_("there is no Mercurial repository here "
1417 1417 "(.hg not found)"))
1418 1418 rev1, rev2 = args
1419 1419 r = repo.changelog
1420 1420 lookup = repo.lookup
1421 1421 else:
1422 1422 raise util.Abort(_('either two or three arguments required'))
1423 1423 a = r.ancestor(lookup(rev1), lookup(rev2))
1424 1424 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1425 1425
1426 1426 @command('debugbuilddag',
1427 1427 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1428 1428 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1429 1429 ('n', 'new-file', None, _('add new file at each rev'))],
1430 1430 _('[OPTION]... [TEXT]'))
1431 1431 def debugbuilddag(ui, repo, text=None,
1432 1432 mergeable_file=False,
1433 1433 overwritten_file=False,
1434 1434 new_file=False):
1435 1435 """builds a repo with a given DAG from scratch in the current empty repo
1436 1436
1437 1437 The description of the DAG is read from stdin if not given on the
1438 1438 command line.
1439 1439
1440 1440 Elements:
1441 1441
1442 1442 - "+n" is a linear run of n nodes based on the current default parent
1443 1443 - "." is a single node based on the current default parent
1444 1444 - "$" resets the default parent to null (implied at the start);
1445 1445 otherwise the default parent is always the last node created
1446 1446 - "<p" sets the default parent to the backref p
1447 1447 - "*p" is a fork at parent p, which is a backref
1448 1448 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1449 1449 - "/p2" is a merge of the preceding node and p2
1450 1450 - ":tag" defines a local tag for the preceding node
1451 1451 - "@branch" sets the named branch for subsequent nodes
1452 1452 - "#...\\n" is a comment up to the end of the line
1453 1453
1454 1454 Whitespace between the above elements is ignored.
1455 1455
1456 1456 A backref is either
1457 1457
1458 1458 - a number n, which references the node curr-n, where curr is the current
1459 1459 node, or
1460 1460 - the name of a local tag you placed earlier using ":tag", or
1461 1461 - empty to denote the default parent.
1462 1462
1463 1463 All string valued-elements are either strictly alphanumeric, or must
1464 1464 be enclosed in double quotes ("..."), with "\\" as escape character.
1465 1465 """
1466 1466
1467 1467 if text is None:
1468 1468 ui.status(_("reading DAG from stdin\n"))
1469 1469 text = ui.fin.read()
1470 1470
1471 1471 cl = repo.changelog
1472 1472 if len(cl) > 0:
1473 1473 raise util.Abort(_('repository is not empty'))
1474 1474
1475 1475 # determine number of revs in DAG
1476 1476 total = 0
1477 1477 for type, data in dagparser.parsedag(text):
1478 1478 if type == 'n':
1479 1479 total += 1
1480 1480
1481 1481 if mergeable_file:
1482 1482 linesperrev = 2
1483 1483 # make a file with k lines per rev
1484 1484 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1485 1485 initialmergedlines.append("")
1486 1486
1487 1487 tags = []
1488 1488
1489 1489 lock = tr = None
1490 1490 try:
1491 1491 lock = repo.lock()
1492 1492 tr = repo.transaction("builddag")
1493 1493
1494 1494 at = -1
1495 1495 atbranch = 'default'
1496 1496 nodeids = []
1497 1497 id = 0
1498 1498 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1499 1499 for type, data in dagparser.parsedag(text):
1500 1500 if type == 'n':
1501 1501 ui.note('node %s\n' % str(data))
1502 1502 id, ps = data
1503 1503
1504 1504 files = []
1505 1505 fctxs = {}
1506 1506
1507 1507 p2 = None
1508 1508 if mergeable_file:
1509 1509 fn = "mf"
1510 1510 p1 = repo[ps[0]]
1511 1511 if len(ps) > 1:
1512 1512 p2 = repo[ps[1]]
1513 1513 pa = p1.ancestor(p2)
1514 1514 base, local, other = [x[fn].data() for x in pa, p1, p2]
1515 1515 m3 = simplemerge.Merge3Text(base, local, other)
1516 1516 ml = [l.strip() for l in m3.merge_lines()]
1517 1517 ml.append("")
1518 1518 elif at > 0:
1519 1519 ml = p1[fn].data().split("\n")
1520 1520 else:
1521 1521 ml = initialmergedlines
1522 1522 ml[id * linesperrev] += " r%i" % id
1523 1523 mergedtext = "\n".join(ml)
1524 1524 files.append(fn)
1525 1525 fctxs[fn] = context.memfilectx(fn, mergedtext)
1526 1526
1527 1527 if overwritten_file:
1528 1528 fn = "of"
1529 1529 files.append(fn)
1530 1530 fctxs[fn] = context.memfilectx(fn, "r%i\n" % id)
1531 1531
1532 1532 if new_file:
1533 1533 fn = "nf%i" % id
1534 1534 files.append(fn)
1535 1535 fctxs[fn] = context.memfilectx(fn, "r%i\n" % id)
1536 1536 if len(ps) > 1:
1537 1537 if not p2:
1538 1538 p2 = repo[ps[1]]
1539 1539 for fn in p2:
1540 1540 if fn.startswith("nf"):
1541 1541 files.append(fn)
1542 1542 fctxs[fn] = p2[fn]
1543 1543
1544 1544 def fctxfn(repo, cx, path):
1545 1545 return fctxs.get(path)
1546 1546
1547 1547 if len(ps) == 0 or ps[0] < 0:
1548 1548 pars = [None, None]
1549 1549 elif len(ps) == 1:
1550 1550 pars = [nodeids[ps[0]], None]
1551 1551 else:
1552 1552 pars = [nodeids[p] for p in ps]
1553 1553 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
1554 1554 date=(id, 0),
1555 1555 user="debugbuilddag",
1556 1556 extra={'branch': atbranch})
1557 1557 nodeid = repo.commitctx(cx)
1558 1558 nodeids.append(nodeid)
1559 1559 at = id
1560 1560 elif type == 'l':
1561 1561 id, name = data
1562 1562 ui.note('tag %s\n' % name)
1563 1563 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
1564 1564 elif type == 'a':
1565 1565 ui.note('branch %s\n' % data)
1566 1566 atbranch = data
1567 1567 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1568 1568 tr.close()
1569 1569
1570 1570 if tags:
1571 1571 repo.opener.write("localtags", "".join(tags))
1572 1572 finally:
1573 1573 ui.progress(_('building'), None)
1574 1574 release(tr, lock)
1575 1575
1576 1576 @command('debugbundle', [('a', 'all', None, _('show all details'))], _('FILE'))
1577 1577 def debugbundle(ui, bundlepath, all=None, **opts):
1578 1578 """lists the contents of a bundle"""
1579 1579 f = url.open(ui, bundlepath)
1580 1580 try:
1581 1581 gen = changegroup.readbundle(f, bundlepath)
1582 1582 if all:
1583 1583 ui.write("format: id, p1, p2, cset, delta base, len(delta)\n")
1584 1584
1585 1585 def showchunks(named):
1586 1586 ui.write("\n%s\n" % named)
1587 1587 chain = None
1588 1588 while True:
1589 1589 chunkdata = gen.deltachunk(chain)
1590 1590 if not chunkdata:
1591 1591 break
1592 1592 node = chunkdata['node']
1593 1593 p1 = chunkdata['p1']
1594 1594 p2 = chunkdata['p2']
1595 1595 cs = chunkdata['cs']
1596 1596 deltabase = chunkdata['deltabase']
1597 1597 delta = chunkdata['delta']
1598 1598 ui.write("%s %s %s %s %s %s\n" %
1599 1599 (hex(node), hex(p1), hex(p2),
1600 1600 hex(cs), hex(deltabase), len(delta)))
1601 1601 chain = node
1602 1602
1603 1603 chunkdata = gen.changelogheader()
1604 1604 showchunks("changelog")
1605 1605 chunkdata = gen.manifestheader()
1606 1606 showchunks("manifest")
1607 1607 while True:
1608 1608 chunkdata = gen.filelogheader()
1609 1609 if not chunkdata:
1610 1610 break
1611 1611 fname = chunkdata['filename']
1612 1612 showchunks(fname)
1613 1613 else:
1614 1614 chunkdata = gen.changelogheader()
1615 1615 chain = None
1616 1616 while True:
1617 1617 chunkdata = gen.deltachunk(chain)
1618 1618 if not chunkdata:
1619 1619 break
1620 1620 node = chunkdata['node']
1621 1621 ui.write("%s\n" % hex(node))
1622 1622 chain = node
1623 1623 finally:
1624 1624 f.close()
1625 1625
1626 1626 @command('debugcheckstate', [], '')
1627 1627 def debugcheckstate(ui, repo):
1628 1628 """validate the correctness of the current dirstate"""
1629 1629 parent1, parent2 = repo.dirstate.parents()
1630 1630 m1 = repo[parent1].manifest()
1631 1631 m2 = repo[parent2].manifest()
1632 1632 errors = 0
1633 1633 for f in repo.dirstate:
1634 1634 state = repo.dirstate[f]
1635 1635 if state in "nr" and f not in m1:
1636 1636 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
1637 1637 errors += 1
1638 1638 if state in "a" and f in m1:
1639 1639 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
1640 1640 errors += 1
1641 1641 if state in "m" and f not in m1 and f not in m2:
1642 1642 ui.warn(_("%s in state %s, but not in either manifest\n") %
1643 1643 (f, state))
1644 1644 errors += 1
1645 1645 for f in m1:
1646 1646 state = repo.dirstate[f]
1647 1647 if state not in "nrm":
1648 1648 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
1649 1649 errors += 1
1650 1650 if errors:
1651 1651 error = _(".hg/dirstate inconsistent with current parent's manifest")
1652 1652 raise util.Abort(error)
1653 1653
1654 1654 @command('debugcommands', [], _('[COMMAND]'))
1655 1655 def debugcommands(ui, cmd='', *args):
1656 1656 """list all available commands and options"""
1657 1657 for cmd, vals in sorted(table.iteritems()):
1658 1658 cmd = cmd.split('|')[0].strip('^')
1659 1659 opts = ', '.join([i[1] for i in vals[1]])
1660 1660 ui.write('%s: %s\n' % (cmd, opts))
1661 1661
1662 1662 @command('debugcomplete',
1663 1663 [('o', 'options', None, _('show the command options'))],
1664 1664 _('[-o] CMD'))
1665 1665 def debugcomplete(ui, cmd='', **opts):
1666 1666 """returns the completion list associated with the given command"""
1667 1667
1668 1668 if opts.get('options'):
1669 1669 options = []
1670 1670 otables = [globalopts]
1671 1671 if cmd:
1672 1672 aliases, entry = cmdutil.findcmd(cmd, table, False)
1673 1673 otables.append(entry[1])
1674 1674 for t in otables:
1675 1675 for o in t:
1676 1676 if "(DEPRECATED)" in o[3]:
1677 1677 continue
1678 1678 if o[0]:
1679 1679 options.append('-%s' % o[0])
1680 1680 options.append('--%s' % o[1])
1681 1681 ui.write("%s\n" % "\n".join(options))
1682 1682 return
1683 1683
1684 1684 cmdlist = cmdutil.findpossible(cmd, table)
1685 1685 if ui.verbose:
1686 1686 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1687 1687 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1688 1688
1689 1689 @command('debugdag',
1690 1690 [('t', 'tags', None, _('use tags as labels')),
1691 1691 ('b', 'branches', None, _('annotate with branch names')),
1692 1692 ('', 'dots', None, _('use dots for runs')),
1693 1693 ('s', 'spaces', None, _('separate elements by spaces'))],
1694 1694 _('[OPTION]... [FILE [REV]...]'))
1695 1695 def debugdag(ui, repo, file_=None, *revs, **opts):
1696 1696 """format the changelog or an index DAG as a concise textual description
1697 1697
1698 1698 If you pass a revlog index, the revlog's DAG is emitted. If you list
1699 1699 revision numbers, they get labelled in the output as rN.
1700 1700
1701 1701 Otherwise, the changelog DAG of the current repo is emitted.
1702 1702 """
1703 1703 spaces = opts.get('spaces')
1704 1704 dots = opts.get('dots')
1705 1705 if file_:
1706 1706 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1707 1707 revs = set((int(r) for r in revs))
1708 1708 def events():
1709 1709 for r in rlog:
1710 1710 yield 'n', (r, list(set(p for p in rlog.parentrevs(r)
1711 1711 if p != -1)))
1712 1712 if r in revs:
1713 1713 yield 'l', (r, "r%i" % r)
1714 1714 elif repo:
1715 1715 cl = repo.changelog
1716 1716 tags = opts.get('tags')
1717 1717 branches = opts.get('branches')
1718 1718 if tags:
1719 1719 labels = {}
1720 1720 for l, n in repo.tags().items():
1721 1721 labels.setdefault(cl.rev(n), []).append(l)
1722 1722 def events():
1723 1723 b = "default"
1724 1724 for r in cl:
1725 1725 if branches:
1726 1726 newb = cl.read(cl.node(r))[5]['branch']
1727 1727 if newb != b:
1728 1728 yield 'a', newb
1729 1729 b = newb
1730 1730 yield 'n', (r, list(set(p for p in cl.parentrevs(r)
1731 1731 if p != -1)))
1732 1732 if tags:
1733 1733 ls = labels.get(r)
1734 1734 if ls:
1735 1735 for l in ls:
1736 1736 yield 'l', (r, l)
1737 1737 else:
1738 1738 raise util.Abort(_('need repo for changelog dag'))
1739 1739
1740 1740 for line in dagparser.dagtextlines(events(),
1741 1741 addspaces=spaces,
1742 1742 wraplabels=True,
1743 1743 wrapannotations=True,
1744 1744 wrapnonlinear=dots,
1745 1745 usedots=dots,
1746 1746 maxlinewidth=70):
1747 1747 ui.write(line)
1748 1748 ui.write("\n")
1749 1749
1750 1750 @command('debugdata',
1751 1751 [('c', 'changelog', False, _('open changelog')),
1752 1752 ('m', 'manifest', False, _('open manifest'))],
1753 1753 _('-c|-m|FILE REV'))
1754 1754 def debugdata(ui, repo, file_, rev = None, **opts):
1755 1755 """dump the contents of a data file revision"""
1756 1756 if opts.get('changelog') or opts.get('manifest'):
1757 1757 file_, rev = None, file_
1758 1758 elif rev is None:
1759 1759 raise error.CommandError('debugdata', _('invalid arguments'))
1760 1760 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
1761 1761 try:
1762 1762 ui.write(r.revision(r.lookup(rev)))
1763 1763 except KeyError:
1764 1764 raise util.Abort(_('invalid revision identifier %s') % rev)
1765 1765
1766 1766 @command('debugdate',
1767 1767 [('e', 'extended', None, _('try extended date formats'))],
1768 1768 _('[-e] DATE [RANGE]'))
1769 1769 def debugdate(ui, date, range=None, **opts):
1770 1770 """parse and display a date"""
1771 1771 if opts["extended"]:
1772 1772 d = util.parsedate(date, util.extendeddateformats)
1773 1773 else:
1774 1774 d = util.parsedate(date)
1775 1775 ui.write("internal: %s %s\n" % d)
1776 1776 ui.write("standard: %s\n" % util.datestr(d))
1777 1777 if range:
1778 1778 m = util.matchdate(range)
1779 1779 ui.write("match: %s\n" % m(d[0]))
1780 1780
1781 1781 @command('debugdiscovery',
1782 1782 [('', 'old', None, _('use old-style discovery')),
1783 1783 ('', 'nonheads', None,
1784 1784 _('use old-style discovery with non-heads included')),
1785 1785 ] + remoteopts,
1786 1786 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
1787 1787 def debugdiscovery(ui, repo, remoteurl="default", **opts):
1788 1788 """runs the changeset discovery protocol in isolation"""
1789 1789 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl),
1790 1790 opts.get('branch'))
1791 1791 remote = hg.peer(repo, opts, remoteurl)
1792 1792 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
1793 1793
1794 1794 # make sure tests are repeatable
1795 1795 random.seed(12323)
1796 1796
1797 1797 def doit(localheads, remoteheads, remote=remote):
1798 1798 if opts.get('old'):
1799 1799 if localheads:
1800 1800 raise util.Abort('cannot use localheads with old style '
1801 1801 'discovery')
1802 1802 if not util.safehasattr(remote, 'branches'):
1803 1803 # enable in-client legacy support
1804 1804 remote = localrepo.locallegacypeer(remote.local())
1805 1805 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
1806 1806 force=True)
1807 1807 common = set(common)
1808 1808 if not opts.get('nonheads'):
1809 1809 ui.write("unpruned common: %s\n" % " ".join([short(n)
1810 1810 for n in common]))
1811 1811 dag = dagutil.revlogdag(repo.changelog)
1812 1812 all = dag.ancestorset(dag.internalizeall(common))
1813 1813 common = dag.externalizeall(dag.headsetofconnecteds(all))
1814 1814 else:
1815 1815 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
1816 1816 common = set(common)
1817 1817 rheads = set(hds)
1818 1818 lheads = set(repo.heads())
1819 1819 ui.write("common heads: %s\n" % " ".join([short(n) for n in common]))
1820 1820 if lheads <= common:
1821 1821 ui.write("local is subset\n")
1822 1822 elif rheads <= common:
1823 1823 ui.write("remote is subset\n")
1824 1824
1825 1825 serverlogs = opts.get('serverlog')
1826 1826 if serverlogs:
1827 1827 for filename in serverlogs:
1828 1828 logfile = open(filename, 'r')
1829 1829 try:
1830 1830 line = logfile.readline()
1831 1831 while line:
1832 1832 parts = line.strip().split(';')
1833 1833 op = parts[1]
1834 1834 if op == 'cg':
1835 1835 pass
1836 1836 elif op == 'cgss':
1837 1837 doit(parts[2].split(' '), parts[3].split(' '))
1838 1838 elif op == 'unb':
1839 1839 doit(parts[3].split(' '), parts[2].split(' '))
1840 1840 line = logfile.readline()
1841 1841 finally:
1842 1842 logfile.close()
1843 1843
1844 1844 else:
1845 1845 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
1846 1846 opts.get('remote_head'))
1847 1847 localrevs = opts.get('local_head')
1848 1848 doit(localrevs, remoterevs)
1849 1849
1850 1850 @command('debugfileset', [], ('REVSPEC'))
1851 1851 def debugfileset(ui, repo, expr):
1852 1852 '''parse and apply a fileset specification'''
1853 1853 if ui.verbose:
1854 1854 tree = fileset.parse(expr)[0]
1855 1855 ui.note(tree, "\n")
1856 1856
1857 1857 for f in fileset.getfileset(repo[None], expr):
1858 1858 ui.write("%s\n" % f)
1859 1859
1860 1860 @command('debugfsinfo', [], _('[PATH]'))
1861 1861 def debugfsinfo(ui, path = "."):
1862 1862 """show information detected about current filesystem"""
1863 1863 util.writefile('.debugfsinfo', '')
1864 1864 ui.write('exec: %s\n' % (util.checkexec(path) and 'yes' or 'no'))
1865 1865 ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no'))
1866 1866 ui.write('case-sensitive: %s\n' % (util.checkcase('.debugfsinfo')
1867 1867 and 'yes' or 'no'))
1868 1868 os.unlink('.debugfsinfo')
1869 1869
1870 1870 @command('debuggetbundle',
1871 1871 [('H', 'head', [], _('id of head node'), _('ID')),
1872 1872 ('C', 'common', [], _('id of common node'), _('ID')),
1873 1873 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
1874 1874 _('REPO FILE [-H|-C ID]...'))
1875 1875 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
1876 1876 """retrieves a bundle from a repo
1877 1877
1878 1878 Every ID must be a full-length hex node id string. Saves the bundle to the
1879 1879 given file.
1880 1880 """
1881 1881 repo = hg.peer(ui, opts, repopath)
1882 1882 if not repo.capable('getbundle'):
1883 1883 raise util.Abort("getbundle() not supported by target repository")
1884 1884 args = {}
1885 1885 if common:
1886 1886 args['common'] = [bin(s) for s in common]
1887 1887 if head:
1888 1888 args['heads'] = [bin(s) for s in head]
1889 1889 bundle = repo.getbundle('debug', **args)
1890 1890
1891 1891 bundletype = opts.get('type', 'bzip2').lower()
1892 1892 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
1893 1893 bundletype = btypes.get(bundletype)
1894 1894 if bundletype not in changegroup.bundletypes:
1895 1895 raise util.Abort(_('unknown bundle type specified with --type'))
1896 1896 changegroup.writebundle(bundle, bundlepath, bundletype)
1897 1897
1898 1898 @command('debugignore', [], '')
1899 1899 def debugignore(ui, repo, *values, **opts):
1900 1900 """display the combined ignore pattern"""
1901 1901 ignore = repo.dirstate._ignore
1902 1902 includepat = getattr(ignore, 'includepat', None)
1903 1903 if includepat is not None:
1904 1904 ui.write("%s\n" % includepat)
1905 1905 else:
1906 1906 raise util.Abort(_("no ignore patterns found"))
1907 1907
1908 1908 @command('debugindex',
1909 1909 [('c', 'changelog', False, _('open changelog')),
1910 1910 ('m', 'manifest', False, _('open manifest')),
1911 1911 ('f', 'format', 0, _('revlog format'), _('FORMAT'))],
1912 1912 _('[-f FORMAT] -c|-m|FILE'))
1913 1913 def debugindex(ui, repo, file_ = None, **opts):
1914 1914 """dump the contents of an index file"""
1915 1915 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
1916 1916 format = opts.get('format', 0)
1917 1917 if format not in (0, 1):
1918 1918 raise util.Abort(_("unknown format %d") % format)
1919 1919
1920 1920 generaldelta = r.version & revlog.REVLOGGENERALDELTA
1921 1921 if generaldelta:
1922 1922 basehdr = ' delta'
1923 1923 else:
1924 1924 basehdr = ' base'
1925 1925
1926 1926 if format == 0:
1927 1927 ui.write(" rev offset length " + basehdr + " linkrev"
1928 1928 " nodeid p1 p2\n")
1929 1929 elif format == 1:
1930 1930 ui.write(" rev flag offset length"
1931 1931 " size " + basehdr + " link p1 p2"
1932 1932 " nodeid\n")
1933 1933
1934 1934 for i in r:
1935 1935 node = r.node(i)
1936 1936 if generaldelta:
1937 1937 base = r.deltaparent(i)
1938 1938 else:
1939 1939 base = r.chainbase(i)
1940 1940 if format == 0:
1941 1941 try:
1942 1942 pp = r.parents(node)
1943 1943 except Exception:
1944 1944 pp = [nullid, nullid]
1945 1945 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
1946 1946 i, r.start(i), r.length(i), base, r.linkrev(i),
1947 1947 short(node), short(pp[0]), short(pp[1])))
1948 1948 elif format == 1:
1949 1949 pr = r.parentrevs(i)
1950 1950 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
1951 1951 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
1952 1952 base, r.linkrev(i), pr[0], pr[1], short(node)))
1953 1953
1954 1954 @command('debugindexdot', [], _('FILE'))
1955 1955 def debugindexdot(ui, repo, file_):
1956 1956 """dump an index DAG as a graphviz dot file"""
1957 1957 r = None
1958 1958 if repo:
1959 1959 filelog = repo.file(file_)
1960 1960 if len(filelog):
1961 1961 r = filelog
1962 1962 if not r:
1963 1963 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1964 1964 ui.write("digraph G {\n")
1965 1965 for i in r:
1966 1966 node = r.node(i)
1967 1967 pp = r.parents(node)
1968 1968 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
1969 1969 if pp[1] != nullid:
1970 1970 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
1971 1971 ui.write("}\n")
1972 1972
1973 1973 @command('debuginstall', [], '')
1974 1974 def debuginstall(ui):
1975 1975 '''test Mercurial installation
1976 1976
1977 1977 Returns 0 on success.
1978 1978 '''
1979 1979
1980 1980 def writetemp(contents):
1981 1981 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
1982 1982 f = os.fdopen(fd, "wb")
1983 1983 f.write(contents)
1984 1984 f.close()
1985 1985 return name
1986 1986
1987 1987 problems = 0
1988 1988
1989 1989 # encoding
1990 1990 ui.status(_("checking encoding (%s)...\n") % encoding.encoding)
1991 1991 try:
1992 1992 encoding.fromlocal("test")
1993 1993 except util.Abort, inst:
1994 1994 ui.write(" %s\n" % inst)
1995 1995 ui.write(_(" (check that your locale is properly set)\n"))
1996 1996 problems += 1
1997 1997
1998 1998 # compiled modules
1999 1999 ui.status(_("checking installed modules (%s)...\n")
2000 2000 % os.path.dirname(__file__))
2001 2001 try:
2002 2002 import bdiff, mpatch, base85, osutil
2003 2003 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
2004 2004 except Exception, inst:
2005 2005 ui.write(" %s\n" % inst)
2006 2006 ui.write(_(" One or more extensions could not be found"))
2007 2007 ui.write(_(" (check that you compiled the extensions)\n"))
2008 2008 problems += 1
2009 2009
2010 2010 # templates
2011 2011 import templater
2012 2012 p = templater.templatepath()
2013 2013 ui.status(_("checking templates (%s)...\n") % ' '.join(p))
2014 2014 try:
2015 2015 templater.templater(templater.templatepath("map-cmdline.default"))
2016 2016 except Exception, inst:
2017 2017 ui.write(" %s\n" % inst)
2018 2018 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
2019 2019 problems += 1
2020 2020
2021 2021 # editor
2022 2022 ui.status(_("checking commit editor...\n"))
2023 2023 editor = ui.geteditor()
2024 2024 cmdpath = util.findexe(editor) or util.findexe(editor.split()[0])
2025 2025 if not cmdpath:
2026 2026 if editor == 'vi':
2027 2027 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
2028 2028 ui.write(_(" (specify a commit editor in your configuration"
2029 2029 " file)\n"))
2030 2030 else:
2031 2031 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
2032 2032 ui.write(_(" (specify a commit editor in your configuration"
2033 2033 " file)\n"))
2034 2034 problems += 1
2035 2035
2036 2036 # check username
2037 2037 ui.status(_("checking username...\n"))
2038 2038 try:
2039 2039 ui.username()
2040 2040 except util.Abort, e:
2041 2041 ui.write(" %s\n" % e)
2042 2042 ui.write(_(" (specify a username in your configuration file)\n"))
2043 2043 problems += 1
2044 2044
2045 2045 if not problems:
2046 2046 ui.status(_("no problems detected\n"))
2047 2047 else:
2048 2048 ui.write(_("%s problems detected,"
2049 2049 " please check your install!\n") % problems)
2050 2050
2051 2051 return problems
2052 2052
2053 2053 @command('debugknown', [], _('REPO ID...'))
2054 2054 def debugknown(ui, repopath, *ids, **opts):
2055 2055 """test whether node ids are known to a repo
2056 2056
2057 2057 Every ID must be a full-length hex node id string. Returns a list of 0s
2058 2058 and 1s indicating unknown/known.
2059 2059 """
2060 2060 repo = hg.peer(ui, opts, repopath)
2061 2061 if not repo.capable('known'):
2062 2062 raise util.Abort("known() not supported by target repository")
2063 2063 flags = repo.known([bin(s) for s in ids])
2064 2064 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2065 2065
2066 2066 @command('debugobsolete', [] + commitopts2,
2067 2067 _('[OBSOLETED [REPLACEMENT] [REPL... ]'))
2068 2068 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
2069 2069 """create arbitrary obsolete marker"""
2070 def parsenodeid(s):
2071 try:
2072 # We do not use revsingle/revrange functions here to accept
2073 # arbitrary node identifiers, possibly not present in the
2074 # local repository.
2075 n = bin(s)
2076 if len(n) != len(nullid):
2077 raise TypeError()
2078 return n
2079 except TypeError:
2080 raise util.Abort('changeset references must be full hexadecimal '
2081 'node identifiers')
2082
2070 2083 if precursor is not None:
2071 2084 metadata = {}
2072 2085 if 'date' in opts:
2073 2086 metadata['date'] = opts['date']
2074 2087 metadata['user'] = opts['user'] or ui.username()
2075 succs = tuple(bin(succ) for succ in successors)
2088 succs = tuple(parsenodeid(succ) for succ in successors)
2076 2089 l = repo.lock()
2077 2090 try:
2078 2091 tr = repo.transaction('debugobsolete')
2079 2092 try:
2080 repo.obsstore.create(tr, bin(precursor), succs, 0, metadata)
2093 repo.obsstore.create(tr, parsenodeid(precursor), succs, 0,
2094 metadata)
2081 2095 tr.close()
2082 2096 finally:
2083 2097 tr.release()
2084 2098 finally:
2085 2099 l.release()
2086 2100 else:
2087 2101 for m in obsolete.allmarkers(repo):
2088 2102 ui.write(hex(m.precnode()))
2089 2103 for repl in m.succnodes():
2090 2104 ui.write(' ')
2091 2105 ui.write(hex(repl))
2092 2106 ui.write(' %X ' % m._data[2])
2093 2107 ui.write(m.metadata())
2094 2108 ui.write('\n')
2095 2109
2096 2110 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'))
2097 2111 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
2098 2112 '''access the pushkey key/value protocol
2099 2113
2100 2114 With two args, list the keys in the given namespace.
2101 2115
2102 2116 With five args, set a key to new if it currently is set to old.
2103 2117 Reports success or failure.
2104 2118 '''
2105 2119
2106 2120 target = hg.peer(ui, {}, repopath)
2107 2121 if keyinfo:
2108 2122 key, old, new = keyinfo
2109 2123 r = target.pushkey(namespace, key, old, new)
2110 2124 ui.status(str(r) + '\n')
2111 2125 return not r
2112 2126 else:
2113 2127 for k, v in target.listkeys(namespace).iteritems():
2114 2128 ui.write("%s\t%s\n" % (k.encode('string-escape'),
2115 2129 v.encode('string-escape')))
2116 2130
2117 2131 @command('debugpvec', [], _('A B'))
2118 2132 def debugpvec(ui, repo, a, b=None):
2119 2133 ca = scmutil.revsingle(repo, a)
2120 2134 cb = scmutil.revsingle(repo, b)
2121 2135 pa = pvec.ctxpvec(ca)
2122 2136 pb = pvec.ctxpvec(cb)
2123 2137 if pa == pb:
2124 2138 rel = "="
2125 2139 elif pa > pb:
2126 2140 rel = ">"
2127 2141 elif pa < pb:
2128 2142 rel = "<"
2129 2143 elif pa | pb:
2130 2144 rel = "|"
2131 2145 ui.write(_("a: %s\n") % pa)
2132 2146 ui.write(_("b: %s\n") % pb)
2133 2147 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
2134 2148 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
2135 2149 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
2136 2150 pa.distance(pb), rel))
2137 2151
2138 2152 @command('debugrebuildstate',
2139 2153 [('r', 'rev', '', _('revision to rebuild to'), _('REV'))],
2140 2154 _('[-r REV] [REV]'))
2141 2155 def debugrebuildstate(ui, repo, rev="tip"):
2142 2156 """rebuild the dirstate as it would look like for the given revision"""
2143 2157 ctx = scmutil.revsingle(repo, rev)
2144 2158 wlock = repo.wlock()
2145 2159 try:
2146 2160 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
2147 2161 finally:
2148 2162 wlock.release()
2149 2163
2150 2164 @command('debugrename',
2151 2165 [('r', 'rev', '', _('revision to debug'), _('REV'))],
2152 2166 _('[-r REV] FILE'))
2153 2167 def debugrename(ui, repo, file1, *pats, **opts):
2154 2168 """dump rename information"""
2155 2169
2156 2170 ctx = scmutil.revsingle(repo, opts.get('rev'))
2157 2171 m = scmutil.match(ctx, (file1,) + pats, opts)
2158 2172 for abs in ctx.walk(m):
2159 2173 fctx = ctx[abs]
2160 2174 o = fctx.filelog().renamed(fctx.filenode())
2161 2175 rel = m.rel(abs)
2162 2176 if o:
2163 2177 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
2164 2178 else:
2165 2179 ui.write(_("%s not renamed\n") % rel)
2166 2180
2167 2181 @command('debugrevlog',
2168 2182 [('c', 'changelog', False, _('open changelog')),
2169 2183 ('m', 'manifest', False, _('open manifest')),
2170 2184 ('d', 'dump', False, _('dump index data'))],
2171 2185 _('-c|-m|FILE'))
2172 2186 def debugrevlog(ui, repo, file_ = None, **opts):
2173 2187 """show data and statistics about a revlog"""
2174 2188 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
2175 2189
2176 2190 if opts.get("dump"):
2177 2191 numrevs = len(r)
2178 2192 ui.write("# rev p1rev p2rev start end deltastart base p1 p2"
2179 2193 " rawsize totalsize compression heads\n")
2180 2194 ts = 0
2181 2195 heads = set()
2182 2196 for rev in xrange(numrevs):
2183 2197 dbase = r.deltaparent(rev)
2184 2198 if dbase == -1:
2185 2199 dbase = rev
2186 2200 cbase = r.chainbase(rev)
2187 2201 p1, p2 = r.parentrevs(rev)
2188 2202 rs = r.rawsize(rev)
2189 2203 ts = ts + rs
2190 2204 heads -= set(r.parentrevs(rev))
2191 2205 heads.add(rev)
2192 2206 ui.write("%d %d %d %d %d %d %d %d %d %d %d %d %d\n" %
2193 2207 (rev, p1, p2, r.start(rev), r.end(rev),
2194 2208 r.start(dbase), r.start(cbase),
2195 2209 r.start(p1), r.start(p2),
2196 2210 rs, ts, ts / r.end(rev), len(heads)))
2197 2211 return 0
2198 2212
2199 2213 v = r.version
2200 2214 format = v & 0xFFFF
2201 2215 flags = []
2202 2216 gdelta = False
2203 2217 if v & revlog.REVLOGNGINLINEDATA:
2204 2218 flags.append('inline')
2205 2219 if v & revlog.REVLOGGENERALDELTA:
2206 2220 gdelta = True
2207 2221 flags.append('generaldelta')
2208 2222 if not flags:
2209 2223 flags = ['(none)']
2210 2224
2211 2225 nummerges = 0
2212 2226 numfull = 0
2213 2227 numprev = 0
2214 2228 nump1 = 0
2215 2229 nump2 = 0
2216 2230 numother = 0
2217 2231 nump1prev = 0
2218 2232 nump2prev = 0
2219 2233 chainlengths = []
2220 2234
2221 2235 datasize = [None, 0, 0L]
2222 2236 fullsize = [None, 0, 0L]
2223 2237 deltasize = [None, 0, 0L]
2224 2238
2225 2239 def addsize(size, l):
2226 2240 if l[0] is None or size < l[0]:
2227 2241 l[0] = size
2228 2242 if size > l[1]:
2229 2243 l[1] = size
2230 2244 l[2] += size
2231 2245
2232 2246 numrevs = len(r)
2233 2247 for rev in xrange(numrevs):
2234 2248 p1, p2 = r.parentrevs(rev)
2235 2249 delta = r.deltaparent(rev)
2236 2250 if format > 0:
2237 2251 addsize(r.rawsize(rev), datasize)
2238 2252 if p2 != nullrev:
2239 2253 nummerges += 1
2240 2254 size = r.length(rev)
2241 2255 if delta == nullrev:
2242 2256 chainlengths.append(0)
2243 2257 numfull += 1
2244 2258 addsize(size, fullsize)
2245 2259 else:
2246 2260 chainlengths.append(chainlengths[delta] + 1)
2247 2261 addsize(size, deltasize)
2248 2262 if delta == rev - 1:
2249 2263 numprev += 1
2250 2264 if delta == p1:
2251 2265 nump1prev += 1
2252 2266 elif delta == p2:
2253 2267 nump2prev += 1
2254 2268 elif delta == p1:
2255 2269 nump1 += 1
2256 2270 elif delta == p2:
2257 2271 nump2 += 1
2258 2272 elif delta != nullrev:
2259 2273 numother += 1
2260 2274
2261 2275 # Adjust size min value for empty cases
2262 2276 for size in (datasize, fullsize, deltasize):
2263 2277 if size[0] is None:
2264 2278 size[0] = 0
2265 2279
2266 2280 numdeltas = numrevs - numfull
2267 2281 numoprev = numprev - nump1prev - nump2prev
2268 2282 totalrawsize = datasize[2]
2269 2283 datasize[2] /= numrevs
2270 2284 fulltotal = fullsize[2]
2271 2285 fullsize[2] /= numfull
2272 2286 deltatotal = deltasize[2]
2273 2287 if numrevs - numfull > 0:
2274 2288 deltasize[2] /= numrevs - numfull
2275 2289 totalsize = fulltotal + deltatotal
2276 2290 avgchainlen = sum(chainlengths) / numrevs
2277 2291 compratio = totalrawsize / totalsize
2278 2292
2279 2293 basedfmtstr = '%%%dd\n'
2280 2294 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
2281 2295
2282 2296 def dfmtstr(max):
2283 2297 return basedfmtstr % len(str(max))
2284 2298 def pcfmtstr(max, padding=0):
2285 2299 return basepcfmtstr % (len(str(max)), ' ' * padding)
2286 2300
2287 2301 def pcfmt(value, total):
2288 2302 return (value, 100 * float(value) / total)
2289 2303
2290 2304 ui.write('format : %d\n' % format)
2291 2305 ui.write('flags : %s\n' % ', '.join(flags))
2292 2306
2293 2307 ui.write('\n')
2294 2308 fmt = pcfmtstr(totalsize)
2295 2309 fmt2 = dfmtstr(totalsize)
2296 2310 ui.write('revisions : ' + fmt2 % numrevs)
2297 2311 ui.write(' merges : ' + fmt % pcfmt(nummerges, numrevs))
2298 2312 ui.write(' normal : ' + fmt % pcfmt(numrevs - nummerges, numrevs))
2299 2313 ui.write('revisions : ' + fmt2 % numrevs)
2300 2314 ui.write(' full : ' + fmt % pcfmt(numfull, numrevs))
2301 2315 ui.write(' deltas : ' + fmt % pcfmt(numdeltas, numrevs))
2302 2316 ui.write('revision size : ' + fmt2 % totalsize)
2303 2317 ui.write(' full : ' + fmt % pcfmt(fulltotal, totalsize))
2304 2318 ui.write(' deltas : ' + fmt % pcfmt(deltatotal, totalsize))
2305 2319
2306 2320 ui.write('\n')
2307 2321 fmt = dfmtstr(max(avgchainlen, compratio))
2308 2322 ui.write('avg chain length : ' + fmt % avgchainlen)
2309 2323 ui.write('compression ratio : ' + fmt % compratio)
2310 2324
2311 2325 if format > 0:
2312 2326 ui.write('\n')
2313 2327 ui.write('uncompressed data size (min/max/avg) : %d / %d / %d\n'
2314 2328 % tuple(datasize))
2315 2329 ui.write('full revision size (min/max/avg) : %d / %d / %d\n'
2316 2330 % tuple(fullsize))
2317 2331 ui.write('delta size (min/max/avg) : %d / %d / %d\n'
2318 2332 % tuple(deltasize))
2319 2333
2320 2334 if numdeltas > 0:
2321 2335 ui.write('\n')
2322 2336 fmt = pcfmtstr(numdeltas)
2323 2337 fmt2 = pcfmtstr(numdeltas, 4)
2324 2338 ui.write('deltas against prev : ' + fmt % pcfmt(numprev, numdeltas))
2325 2339 if numprev > 0:
2326 2340 ui.write(' where prev = p1 : ' + fmt2 % pcfmt(nump1prev,
2327 2341 numprev))
2328 2342 ui.write(' where prev = p2 : ' + fmt2 % pcfmt(nump2prev,
2329 2343 numprev))
2330 2344 ui.write(' other : ' + fmt2 % pcfmt(numoprev,
2331 2345 numprev))
2332 2346 if gdelta:
2333 2347 ui.write('deltas against p1 : ' + fmt % pcfmt(nump1, numdeltas))
2334 2348 ui.write('deltas against p2 : ' + fmt % pcfmt(nump2, numdeltas))
2335 2349 ui.write('deltas against other : ' + fmt % pcfmt(numother,
2336 2350 numdeltas))
2337 2351
2338 2352 @command('debugrevspec', [], ('REVSPEC'))
2339 2353 def debugrevspec(ui, repo, expr):
2340 2354 """parse and apply a revision specification
2341 2355
2342 2356 Use --verbose to print the parsed tree before and after aliases
2343 2357 expansion.
2344 2358 """
2345 2359 if ui.verbose:
2346 2360 tree = revset.parse(expr)[0]
2347 2361 ui.note(revset.prettyformat(tree), "\n")
2348 2362 newtree = revset.findaliases(ui, tree)
2349 2363 if newtree != tree:
2350 2364 ui.note(revset.prettyformat(newtree), "\n")
2351 2365 func = revset.match(ui, expr)
2352 2366 for c in func(repo, range(len(repo))):
2353 2367 ui.write("%s\n" % c)
2354 2368
2355 2369 @command('debugsetparents', [], _('REV1 [REV2]'))
2356 2370 def debugsetparents(ui, repo, rev1, rev2=None):
2357 2371 """manually set the parents of the current working directory
2358 2372
2359 2373 This is useful for writing repository conversion tools, but should
2360 2374 be used with care.
2361 2375
2362 2376 Returns 0 on success.
2363 2377 """
2364 2378
2365 2379 r1 = scmutil.revsingle(repo, rev1).node()
2366 2380 r2 = scmutil.revsingle(repo, rev2, 'null').node()
2367 2381
2368 2382 wlock = repo.wlock()
2369 2383 try:
2370 2384 repo.setparents(r1, r2)
2371 2385 finally:
2372 2386 wlock.release()
2373 2387
2374 2388 @command('debugstate',
2375 2389 [('', 'nodates', None, _('do not display the saved mtime')),
2376 2390 ('', 'datesort', None, _('sort by saved mtime'))],
2377 2391 _('[OPTION]...'))
2378 2392 def debugstate(ui, repo, nodates=None, datesort=None):
2379 2393 """show the contents of the current dirstate"""
2380 2394 timestr = ""
2381 2395 showdate = not nodates
2382 2396 if datesort:
2383 2397 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
2384 2398 else:
2385 2399 keyfunc = None # sort by filename
2386 2400 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
2387 2401 if showdate:
2388 2402 if ent[3] == -1:
2389 2403 # Pad or slice to locale representation
2390 2404 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ",
2391 2405 time.localtime(0)))
2392 2406 timestr = 'unset'
2393 2407 timestr = (timestr[:locale_len] +
2394 2408 ' ' * (locale_len - len(timestr)))
2395 2409 else:
2396 2410 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
2397 2411 time.localtime(ent[3]))
2398 2412 if ent[1] & 020000:
2399 2413 mode = 'lnk'
2400 2414 else:
2401 2415 mode = '%3o' % (ent[1] & 0777 & ~util.umask)
2402 2416 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
2403 2417 for f in repo.dirstate.copies():
2404 2418 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
2405 2419
2406 2420 @command('debugsub',
2407 2421 [('r', 'rev', '',
2408 2422 _('revision to check'), _('REV'))],
2409 2423 _('[-r REV] [REV]'))
2410 2424 def debugsub(ui, repo, rev=None):
2411 2425 ctx = scmutil.revsingle(repo, rev, None)
2412 2426 for k, v in sorted(ctx.substate.items()):
2413 2427 ui.write('path %s\n' % k)
2414 2428 ui.write(' source %s\n' % v[0])
2415 2429 ui.write(' revision %s\n' % v[1])
2416 2430
2417 2431 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'))
2418 2432 def debugwalk(ui, repo, *pats, **opts):
2419 2433 """show how files match on given patterns"""
2420 2434 m = scmutil.match(repo[None], pats, opts)
2421 2435 items = list(repo.walk(m))
2422 2436 if not items:
2423 2437 return
2424 2438 f = lambda fn: fn
2425 2439 if ui.configbool('ui', 'slash') and os.sep != '/':
2426 2440 f = lambda fn: util.normpath(fn)
2427 2441 fmt = 'f %%-%ds %%-%ds %%s' % (
2428 2442 max([len(abs) for abs in items]),
2429 2443 max([len(m.rel(abs)) for abs in items]))
2430 2444 for abs in items:
2431 2445 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
2432 2446 ui.write("%s\n" % line.rstrip())
2433 2447
2434 2448 @command('debugwireargs',
2435 2449 [('', 'three', '', 'three'),
2436 2450 ('', 'four', '', 'four'),
2437 2451 ('', 'five', '', 'five'),
2438 2452 ] + remoteopts,
2439 2453 _('REPO [OPTIONS]... [ONE [TWO]]'))
2440 2454 def debugwireargs(ui, repopath, *vals, **opts):
2441 2455 repo = hg.peer(ui, opts, repopath)
2442 2456 for opt in remoteopts:
2443 2457 del opts[opt[1]]
2444 2458 args = {}
2445 2459 for k, v in opts.iteritems():
2446 2460 if v:
2447 2461 args[k] = v
2448 2462 # run twice to check that we don't mess up the stream for the next command
2449 2463 res1 = repo.debugwireargs(*vals, **args)
2450 2464 res2 = repo.debugwireargs(*vals, **args)
2451 2465 ui.write("%s\n" % res1)
2452 2466 if res1 != res2:
2453 2467 ui.warn("%s\n" % res2)
2454 2468
2455 2469 @command('^diff',
2456 2470 [('r', 'rev', [], _('revision'), _('REV')),
2457 2471 ('c', 'change', '', _('change made by revision'), _('REV'))
2458 2472 ] + diffopts + diffopts2 + walkopts + subrepoopts,
2459 2473 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'))
2460 2474 def diff(ui, repo, *pats, **opts):
2461 2475 """diff repository (or selected files)
2462 2476
2463 2477 Show differences between revisions for the specified files.
2464 2478
2465 2479 Differences between files are shown using the unified diff format.
2466 2480
2467 2481 .. note::
2468 2482 diff may generate unexpected results for merges, as it will
2469 2483 default to comparing against the working directory's first
2470 2484 parent changeset if no revisions are specified.
2471 2485
2472 2486 When two revision arguments are given, then changes are shown
2473 2487 between those revisions. If only one revision is specified then
2474 2488 that revision is compared to the working directory, and, when no
2475 2489 revisions are specified, the working directory files are compared
2476 2490 to its parent.
2477 2491
2478 2492 Alternatively you can specify -c/--change with a revision to see
2479 2493 the changes in that changeset relative to its first parent.
2480 2494
2481 2495 Without the -a/--text option, diff will avoid generating diffs of
2482 2496 files it detects as binary. With -a, diff will generate a diff
2483 2497 anyway, probably with undesirable results.
2484 2498
2485 2499 Use the -g/--git option to generate diffs in the git extended diff
2486 2500 format. For more information, read :hg:`help diffs`.
2487 2501
2488 2502 .. container:: verbose
2489 2503
2490 2504 Examples:
2491 2505
2492 2506 - compare a file in the current working directory to its parent::
2493 2507
2494 2508 hg diff foo.c
2495 2509
2496 2510 - compare two historical versions of a directory, with rename info::
2497 2511
2498 2512 hg diff --git -r 1.0:1.2 lib/
2499 2513
2500 2514 - get change stats relative to the last change on some date::
2501 2515
2502 2516 hg diff --stat -r "date('may 2')"
2503 2517
2504 2518 - diff all newly-added files that contain a keyword::
2505 2519
2506 2520 hg diff "set:added() and grep(GNU)"
2507 2521
2508 2522 - compare a revision and its parents::
2509 2523
2510 2524 hg diff -c 9353 # compare against first parent
2511 2525 hg diff -r 9353^:9353 # same using revset syntax
2512 2526 hg diff -r 9353^2:9353 # compare against the second parent
2513 2527
2514 2528 Returns 0 on success.
2515 2529 """
2516 2530
2517 2531 revs = opts.get('rev')
2518 2532 change = opts.get('change')
2519 2533 stat = opts.get('stat')
2520 2534 reverse = opts.get('reverse')
2521 2535
2522 2536 if revs and change:
2523 2537 msg = _('cannot specify --rev and --change at the same time')
2524 2538 raise util.Abort(msg)
2525 2539 elif change:
2526 2540 node2 = scmutil.revsingle(repo, change, None).node()
2527 2541 node1 = repo[node2].p1().node()
2528 2542 else:
2529 2543 node1, node2 = scmutil.revpair(repo, revs)
2530 2544
2531 2545 if reverse:
2532 2546 node1, node2 = node2, node1
2533 2547
2534 2548 diffopts = patch.diffopts(ui, opts)
2535 2549 m = scmutil.match(repo[node2], pats, opts)
2536 2550 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
2537 2551 listsubrepos=opts.get('subrepos'))
2538 2552
2539 2553 @command('^export',
2540 2554 [('o', 'output', '',
2541 2555 _('print output to file with formatted name'), _('FORMAT')),
2542 2556 ('', 'switch-parent', None, _('diff against the second parent')),
2543 2557 ('r', 'rev', [], _('revisions to export'), _('REV')),
2544 2558 ] + diffopts,
2545 2559 _('[OPTION]... [-o OUTFILESPEC] [-r] REV...'))
2546 2560 def export(ui, repo, *changesets, **opts):
2547 2561 """dump the header and diffs for one or more changesets
2548 2562
2549 2563 Print the changeset header and diffs for one or more revisions.
2550 2564
2551 2565 The information shown in the changeset header is: author, date,
2552 2566 branch name (if non-default), changeset hash, parent(s) and commit
2553 2567 comment.
2554 2568
2555 2569 .. note::
2556 2570 export may generate unexpected diff output for merge
2557 2571 changesets, as it will compare the merge changeset against its
2558 2572 first parent only.
2559 2573
2560 2574 Output may be to a file, in which case the name of the file is
2561 2575 given using a format string. The formatting rules are as follows:
2562 2576
2563 2577 :``%%``: literal "%" character
2564 2578 :``%H``: changeset hash (40 hexadecimal digits)
2565 2579 :``%N``: number of patches being generated
2566 2580 :``%R``: changeset revision number
2567 2581 :``%b``: basename of the exporting repository
2568 2582 :``%h``: short-form changeset hash (12 hexadecimal digits)
2569 2583 :``%m``: first line of the commit message (only alphanumeric characters)
2570 2584 :``%n``: zero-padded sequence number, starting at 1
2571 2585 :``%r``: zero-padded changeset revision number
2572 2586
2573 2587 Without the -a/--text option, export will avoid generating diffs
2574 2588 of files it detects as binary. With -a, export will generate a
2575 2589 diff anyway, probably with undesirable results.
2576 2590
2577 2591 Use the -g/--git option to generate diffs in the git extended diff
2578 2592 format. See :hg:`help diffs` for more information.
2579 2593
2580 2594 With the --switch-parent option, the diff will be against the
2581 2595 second parent. It can be useful to review a merge.
2582 2596
2583 2597 .. container:: verbose
2584 2598
2585 2599 Examples:
2586 2600
2587 2601 - use export and import to transplant a bugfix to the current
2588 2602 branch::
2589 2603
2590 2604 hg export -r 9353 | hg import -
2591 2605
2592 2606 - export all the changesets between two revisions to a file with
2593 2607 rename information::
2594 2608
2595 2609 hg export --git -r 123:150 > changes.txt
2596 2610
2597 2611 - split outgoing changes into a series of patches with
2598 2612 descriptive names::
2599 2613
2600 2614 hg export -r "outgoing()" -o "%n-%m.patch"
2601 2615
2602 2616 Returns 0 on success.
2603 2617 """
2604 2618 changesets += tuple(opts.get('rev', []))
2605 2619 revs = scmutil.revrange(repo, changesets)
2606 2620 if not revs:
2607 2621 raise util.Abort(_("export requires at least one changeset"))
2608 2622 if len(revs) > 1:
2609 2623 ui.note(_('exporting patches:\n'))
2610 2624 else:
2611 2625 ui.note(_('exporting patch:\n'))
2612 2626 cmdutil.export(repo, revs, template=opts.get('output'),
2613 2627 switch_parent=opts.get('switch_parent'),
2614 2628 opts=patch.diffopts(ui, opts))
2615 2629
2616 2630 @command('^forget', walkopts, _('[OPTION]... FILE...'))
2617 2631 def forget(ui, repo, *pats, **opts):
2618 2632 """forget the specified files on the next commit
2619 2633
2620 2634 Mark the specified files so they will no longer be tracked
2621 2635 after the next commit.
2622 2636
2623 2637 This only removes files from the current branch, not from the
2624 2638 entire project history, and it does not delete them from the
2625 2639 working directory.
2626 2640
2627 2641 To undo a forget before the next commit, see :hg:`add`.
2628 2642
2629 2643 .. container:: verbose
2630 2644
2631 2645 Examples:
2632 2646
2633 2647 - forget newly-added binary files::
2634 2648
2635 2649 hg forget "set:added() and binary()"
2636 2650
2637 2651 - forget files that would be excluded by .hgignore::
2638 2652
2639 2653 hg forget "set:hgignore()"
2640 2654
2641 2655 Returns 0 on success.
2642 2656 """
2643 2657
2644 2658 if not pats:
2645 2659 raise util.Abort(_('no files specified'))
2646 2660
2647 2661 m = scmutil.match(repo[None], pats, opts)
2648 2662 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
2649 2663 return rejected and 1 or 0
2650 2664
2651 2665 @command(
2652 2666 'graft',
2653 2667 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2654 2668 ('c', 'continue', False, _('resume interrupted graft')),
2655 2669 ('e', 'edit', False, _('invoke editor on commit messages')),
2656 2670 ('', 'log', None, _('append graft info to log message')),
2657 2671 ('D', 'currentdate', False,
2658 2672 _('record the current date as commit date')),
2659 2673 ('U', 'currentuser', False,
2660 2674 _('record the current user as committer'), _('DATE'))]
2661 2675 + commitopts2 + mergetoolopts + dryrunopts,
2662 2676 _('[OPTION]... [-r] REV...'))
2663 2677 def graft(ui, repo, *revs, **opts):
2664 2678 '''copy changes from other branches onto the current branch
2665 2679
2666 2680 This command uses Mercurial's merge logic to copy individual
2667 2681 changes from other branches without merging branches in the
2668 2682 history graph. This is sometimes known as 'backporting' or
2669 2683 'cherry-picking'. By default, graft will copy user, date, and
2670 2684 description from the source changesets.
2671 2685
2672 2686 Changesets that are ancestors of the current revision, that have
2673 2687 already been grafted, or that are merges will be skipped.
2674 2688
2675 2689 If --log is specified, log messages will have a comment appended
2676 2690 of the form::
2677 2691
2678 2692 (grafted from CHANGESETHASH)
2679 2693
2680 2694 If a graft merge results in conflicts, the graft process is
2681 2695 interrupted so that the current merge can be manually resolved.
2682 2696 Once all conflicts are addressed, the graft process can be
2683 2697 continued with the -c/--continue option.
2684 2698
2685 2699 .. note::
2686 2700 The -c/--continue option does not reapply earlier options.
2687 2701
2688 2702 .. container:: verbose
2689 2703
2690 2704 Examples:
2691 2705
2692 2706 - copy a single change to the stable branch and edit its description::
2693 2707
2694 2708 hg update stable
2695 2709 hg graft --edit 9393
2696 2710
2697 2711 - graft a range of changesets with one exception, updating dates::
2698 2712
2699 2713 hg graft -D "2085::2093 and not 2091"
2700 2714
2701 2715 - continue a graft after resolving conflicts::
2702 2716
2703 2717 hg graft -c
2704 2718
2705 2719 - show the source of a grafted changeset::
2706 2720
2707 2721 hg log --debug -r tip
2708 2722
2709 2723 Returns 0 on successful completion.
2710 2724 '''
2711 2725
2712 2726 revs = list(revs)
2713 2727 revs.extend(opts['rev'])
2714 2728
2715 2729 if not opts.get('user') and opts.get('currentuser'):
2716 2730 opts['user'] = ui.username()
2717 2731 if not opts.get('date') and opts.get('currentdate'):
2718 2732 opts['date'] = "%d %d" % util.makedate()
2719 2733
2720 2734 editor = None
2721 2735 if opts.get('edit'):
2722 2736 editor = cmdutil.commitforceeditor
2723 2737
2724 2738 cont = False
2725 2739 if opts['continue']:
2726 2740 cont = True
2727 2741 if revs:
2728 2742 raise util.Abort(_("can't specify --continue and revisions"))
2729 2743 # read in unfinished revisions
2730 2744 try:
2731 2745 nodes = repo.opener.read('graftstate').splitlines()
2732 2746 revs = [repo[node].rev() for node in nodes]
2733 2747 except IOError, inst:
2734 2748 if inst.errno != errno.ENOENT:
2735 2749 raise
2736 2750 raise util.Abort(_("no graft state found, can't continue"))
2737 2751 else:
2738 2752 cmdutil.bailifchanged(repo)
2739 2753 if not revs:
2740 2754 raise util.Abort(_('no revisions specified'))
2741 2755 revs = scmutil.revrange(repo, revs)
2742 2756
2743 2757 # check for merges
2744 2758 for rev in repo.revs('%ld and merge()', revs):
2745 2759 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
2746 2760 revs.remove(rev)
2747 2761 if not revs:
2748 2762 return -1
2749 2763
2750 2764 # check for ancestors of dest branch
2751 2765 for rev in repo.revs('::. and %ld', revs):
2752 2766 ui.warn(_('skipping ancestor revision %s\n') % rev)
2753 2767 revs.remove(rev)
2754 2768 if not revs:
2755 2769 return -1
2756 2770
2757 2771 # analyze revs for earlier grafts
2758 2772 ids = {}
2759 2773 for ctx in repo.set("%ld", revs):
2760 2774 ids[ctx.hex()] = ctx.rev()
2761 2775 n = ctx.extra().get('source')
2762 2776 if n:
2763 2777 ids[n] = ctx.rev()
2764 2778
2765 2779 # check ancestors for earlier grafts
2766 2780 ui.debug('scanning for duplicate grafts\n')
2767 2781 for ctx in repo.set("::. - ::%ld", revs):
2768 2782 n = ctx.extra().get('source')
2769 2783 if n in ids:
2770 2784 r = repo[n].rev()
2771 2785 if r in revs:
2772 2786 ui.warn(_('skipping already grafted revision %s\n') % r)
2773 2787 revs.remove(r)
2774 2788 elif ids[n] in revs:
2775 2789 ui.warn(_('skipping already grafted revision %s '
2776 2790 '(same origin %d)\n') % (ids[n], r))
2777 2791 revs.remove(ids[n])
2778 2792 elif ctx.hex() in ids:
2779 2793 r = ids[ctx.hex()]
2780 2794 ui.warn(_('skipping already grafted revision %s '
2781 2795 '(was grafted from %d)\n') % (r, ctx.rev()))
2782 2796 revs.remove(r)
2783 2797 if not revs:
2784 2798 return -1
2785 2799
2786 2800 wlock = repo.wlock()
2787 2801 try:
2788 2802 for pos, ctx in enumerate(repo.set("%ld", revs)):
2789 2803 current = repo['.']
2790 2804
2791 2805 ui.status(_('grafting revision %s\n') % ctx.rev())
2792 2806 if opts.get('dry_run'):
2793 2807 continue
2794 2808
2795 2809 # we don't merge the first commit when continuing
2796 2810 if not cont:
2797 2811 # perform the graft merge with p1(rev) as 'ancestor'
2798 2812 try:
2799 2813 # ui.forcemerge is an internal variable, do not document
2800 2814 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
2801 2815 stats = mergemod.update(repo, ctx.node(), True, True, False,
2802 2816 ctx.p1().node())
2803 2817 finally:
2804 2818 repo.ui.setconfig('ui', 'forcemerge', '')
2805 2819 # report any conflicts
2806 2820 if stats and stats[3] > 0:
2807 2821 # write out state for --continue
2808 2822 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2809 2823 repo.opener.write('graftstate', ''.join(nodelines))
2810 2824 raise util.Abort(
2811 2825 _("unresolved conflicts, can't continue"),
2812 2826 hint=_('use hg resolve and hg graft --continue'))
2813 2827 else:
2814 2828 cont = False
2815 2829
2816 2830 # drop the second merge parent
2817 2831 repo.setparents(current.node(), nullid)
2818 2832 repo.dirstate.write()
2819 2833 # fix up dirstate for copies and renames
2820 2834 cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev())
2821 2835
2822 2836 # commit
2823 2837 source = ctx.extra().get('source')
2824 2838 if not source:
2825 2839 source = ctx.hex()
2826 2840 extra = {'source': source}
2827 2841 user = ctx.user()
2828 2842 if opts.get('user'):
2829 2843 user = opts['user']
2830 2844 date = ctx.date()
2831 2845 if opts.get('date'):
2832 2846 date = opts['date']
2833 2847 message = ctx.description()
2834 2848 if opts.get('log'):
2835 2849 message += '\n(grafted from %s)' % ctx.hex()
2836 2850 node = repo.commit(text=message, user=user,
2837 2851 date=date, extra=extra, editor=editor)
2838 2852 if node is None:
2839 2853 ui.status(_('graft for revision %s is empty\n') % ctx.rev())
2840 2854 finally:
2841 2855 wlock.release()
2842 2856
2843 2857 # remove state when we complete successfully
2844 2858 if not opts.get('dry_run') and os.path.exists(repo.join('graftstate')):
2845 2859 util.unlinkpath(repo.join('graftstate'))
2846 2860
2847 2861 return 0
2848 2862
2849 2863 @command('grep',
2850 2864 [('0', 'print0', None, _('end fields with NUL')),
2851 2865 ('', 'all', None, _('print all revisions that match')),
2852 2866 ('a', 'text', None, _('treat all files as text')),
2853 2867 ('f', 'follow', None,
2854 2868 _('follow changeset history,'
2855 2869 ' or file history across copies and renames')),
2856 2870 ('i', 'ignore-case', None, _('ignore case when matching')),
2857 2871 ('l', 'files-with-matches', None,
2858 2872 _('print only filenames and revisions that match')),
2859 2873 ('n', 'line-number', None, _('print matching line numbers')),
2860 2874 ('r', 'rev', [],
2861 2875 _('only search files changed within revision range'), _('REV')),
2862 2876 ('u', 'user', None, _('list the author (long with -v)')),
2863 2877 ('d', 'date', None, _('list the date (short with -q)')),
2864 2878 ] + walkopts,
2865 2879 _('[OPTION]... PATTERN [FILE]...'))
2866 2880 def grep(ui, repo, pattern, *pats, **opts):
2867 2881 """search for a pattern in specified files and revisions
2868 2882
2869 2883 Search revisions of files for a regular expression.
2870 2884
2871 2885 This command behaves differently than Unix grep. It only accepts
2872 2886 Python/Perl regexps. It searches repository history, not the
2873 2887 working directory. It always prints the revision number in which a
2874 2888 match appears.
2875 2889
2876 2890 By default, grep only prints output for the first revision of a
2877 2891 file in which it finds a match. To get it to print every revision
2878 2892 that contains a change in match status ("-" for a match that
2879 2893 becomes a non-match, or "+" for a non-match that becomes a match),
2880 2894 use the --all flag.
2881 2895
2882 2896 Returns 0 if a match is found, 1 otherwise.
2883 2897 """
2884 2898 reflags = re.M
2885 2899 if opts.get('ignore_case'):
2886 2900 reflags |= re.I
2887 2901 try:
2888 2902 regexp = re.compile(pattern, reflags)
2889 2903 except re.error, inst:
2890 2904 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
2891 2905 return 1
2892 2906 sep, eol = ':', '\n'
2893 2907 if opts.get('print0'):
2894 2908 sep = eol = '\0'
2895 2909
2896 2910 getfile = util.lrucachefunc(repo.file)
2897 2911
2898 2912 def matchlines(body):
2899 2913 begin = 0
2900 2914 linenum = 0
2901 2915 while True:
2902 2916 match = regexp.search(body, begin)
2903 2917 if not match:
2904 2918 break
2905 2919 mstart, mend = match.span()
2906 2920 linenum += body.count('\n', begin, mstart) + 1
2907 2921 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2908 2922 begin = body.find('\n', mend) + 1 or len(body) + 1
2909 2923 lend = begin - 1
2910 2924 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2911 2925
2912 2926 class linestate(object):
2913 2927 def __init__(self, line, linenum, colstart, colend):
2914 2928 self.line = line
2915 2929 self.linenum = linenum
2916 2930 self.colstart = colstart
2917 2931 self.colend = colend
2918 2932
2919 2933 def __hash__(self):
2920 2934 return hash((self.linenum, self.line))
2921 2935
2922 2936 def __eq__(self, other):
2923 2937 return self.line == other.line
2924 2938
2925 2939 matches = {}
2926 2940 copies = {}
2927 2941 def grepbody(fn, rev, body):
2928 2942 matches[rev].setdefault(fn, [])
2929 2943 m = matches[rev][fn]
2930 2944 for lnum, cstart, cend, line in matchlines(body):
2931 2945 s = linestate(line, lnum, cstart, cend)
2932 2946 m.append(s)
2933 2947
2934 2948 def difflinestates(a, b):
2935 2949 sm = difflib.SequenceMatcher(None, a, b)
2936 2950 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2937 2951 if tag == 'insert':
2938 2952 for i in xrange(blo, bhi):
2939 2953 yield ('+', b[i])
2940 2954 elif tag == 'delete':
2941 2955 for i in xrange(alo, ahi):
2942 2956 yield ('-', a[i])
2943 2957 elif tag == 'replace':
2944 2958 for i in xrange(alo, ahi):
2945 2959 yield ('-', a[i])
2946 2960 for i in xrange(blo, bhi):
2947 2961 yield ('+', b[i])
2948 2962
2949 2963 def display(fn, ctx, pstates, states):
2950 2964 rev = ctx.rev()
2951 2965 datefunc = ui.quiet and util.shortdate or util.datestr
2952 2966 found = False
2953 2967 filerevmatches = {}
2954 2968 def binary():
2955 2969 flog = getfile(fn)
2956 2970 return util.binary(flog.read(ctx.filenode(fn)))
2957 2971
2958 2972 if opts.get('all'):
2959 2973 iter = difflinestates(pstates, states)
2960 2974 else:
2961 2975 iter = [('', l) for l in states]
2962 2976 for change, l in iter:
2963 2977 cols = [fn, str(rev)]
2964 2978 before, match, after = None, None, None
2965 2979 if opts.get('line_number'):
2966 2980 cols.append(str(l.linenum))
2967 2981 if opts.get('all'):
2968 2982 cols.append(change)
2969 2983 if opts.get('user'):
2970 2984 cols.append(ui.shortuser(ctx.user()))
2971 2985 if opts.get('date'):
2972 2986 cols.append(datefunc(ctx.date()))
2973 2987 if opts.get('files_with_matches'):
2974 2988 c = (fn, rev)
2975 2989 if c in filerevmatches:
2976 2990 continue
2977 2991 filerevmatches[c] = 1
2978 2992 else:
2979 2993 before = l.line[:l.colstart]
2980 2994 match = l.line[l.colstart:l.colend]
2981 2995 after = l.line[l.colend:]
2982 2996 ui.write(sep.join(cols))
2983 2997 if before is not None:
2984 2998 if not opts.get('text') and binary():
2985 2999 ui.write(sep + " Binary file matches")
2986 3000 else:
2987 3001 ui.write(sep + before)
2988 3002 ui.write(match, label='grep.match')
2989 3003 ui.write(after)
2990 3004 ui.write(eol)
2991 3005 found = True
2992 3006 return found
2993 3007
2994 3008 skip = {}
2995 3009 revfiles = {}
2996 3010 matchfn = scmutil.match(repo[None], pats, opts)
2997 3011 found = False
2998 3012 follow = opts.get('follow')
2999 3013
3000 3014 def prep(ctx, fns):
3001 3015 rev = ctx.rev()
3002 3016 pctx = ctx.p1()
3003 3017 parent = pctx.rev()
3004 3018 matches.setdefault(rev, {})
3005 3019 matches.setdefault(parent, {})
3006 3020 files = revfiles.setdefault(rev, [])
3007 3021 for fn in fns:
3008 3022 flog = getfile(fn)
3009 3023 try:
3010 3024 fnode = ctx.filenode(fn)
3011 3025 except error.LookupError:
3012 3026 continue
3013 3027
3014 3028 copied = flog.renamed(fnode)
3015 3029 copy = follow and copied and copied[0]
3016 3030 if copy:
3017 3031 copies.setdefault(rev, {})[fn] = copy
3018 3032 if fn in skip:
3019 3033 if copy:
3020 3034 skip[copy] = True
3021 3035 continue
3022 3036 files.append(fn)
3023 3037
3024 3038 if fn not in matches[rev]:
3025 3039 grepbody(fn, rev, flog.read(fnode))
3026 3040
3027 3041 pfn = copy or fn
3028 3042 if pfn not in matches[parent]:
3029 3043 try:
3030 3044 fnode = pctx.filenode(pfn)
3031 3045 grepbody(pfn, parent, flog.read(fnode))
3032 3046 except error.LookupError:
3033 3047 pass
3034 3048
3035 3049 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
3036 3050 rev = ctx.rev()
3037 3051 parent = ctx.p1().rev()
3038 3052 for fn in sorted(revfiles.get(rev, [])):
3039 3053 states = matches[rev][fn]
3040 3054 copy = copies.get(rev, {}).get(fn)
3041 3055 if fn in skip:
3042 3056 if copy:
3043 3057 skip[copy] = True
3044 3058 continue
3045 3059 pstates = matches.get(parent, {}).get(copy or fn, [])
3046 3060 if pstates or states:
3047 3061 r = display(fn, ctx, pstates, states)
3048 3062 found = found or r
3049 3063 if r and not opts.get('all'):
3050 3064 skip[fn] = True
3051 3065 if copy:
3052 3066 skip[copy] = True
3053 3067 del matches[rev]
3054 3068 del revfiles[rev]
3055 3069
3056 3070 return not found
3057 3071
3058 3072 @command('heads',
3059 3073 [('r', 'rev', '',
3060 3074 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
3061 3075 ('t', 'topo', False, _('show topological heads only')),
3062 3076 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
3063 3077 ('c', 'closed', False, _('show normal and closed branch heads')),
3064 3078 ] + templateopts,
3065 3079 _('[-ct] [-r STARTREV] [REV]...'))
3066 3080 def heads(ui, repo, *branchrevs, **opts):
3067 3081 """show current repository heads or show branch heads
3068 3082
3069 3083 With no arguments, show all repository branch heads.
3070 3084
3071 3085 Repository "heads" are changesets with no child changesets. They are
3072 3086 where development generally takes place and are the usual targets
3073 3087 for update and merge operations. Branch heads are changesets that have
3074 3088 no child changeset on the same branch.
3075 3089
3076 3090 If one or more REVs are given, only branch heads on the branches
3077 3091 associated with the specified changesets are shown. This means
3078 3092 that you can use :hg:`heads foo` to see the heads on a branch
3079 3093 named ``foo``.
3080 3094
3081 3095 If -c/--closed is specified, also show branch heads marked closed
3082 3096 (see :hg:`commit --close-branch`).
3083 3097
3084 3098 If STARTREV is specified, only those heads that are descendants of
3085 3099 STARTREV will be displayed.
3086 3100
3087 3101 If -t/--topo is specified, named branch mechanics will be ignored and only
3088 3102 changesets without children will be shown.
3089 3103
3090 3104 Returns 0 if matching heads are found, 1 if not.
3091 3105 """
3092 3106
3093 3107 start = None
3094 3108 if 'rev' in opts:
3095 3109 start = scmutil.revsingle(repo, opts['rev'], None).node()
3096 3110
3097 3111 if opts.get('topo'):
3098 3112 heads = [repo[h] for h in repo.heads(start)]
3099 3113 else:
3100 3114 heads = []
3101 3115 for branch in repo.branchmap():
3102 3116 heads += repo.branchheads(branch, start, opts.get('closed'))
3103 3117 heads = [repo[h] for h in heads]
3104 3118
3105 3119 if branchrevs:
3106 3120 branches = set(repo[br].branch() for br in branchrevs)
3107 3121 heads = [h for h in heads if h.branch() in branches]
3108 3122
3109 3123 if opts.get('active') and branchrevs:
3110 3124 dagheads = repo.heads(start)
3111 3125 heads = [h for h in heads if h.node() in dagheads]
3112 3126
3113 3127 if branchrevs:
3114 3128 haveheads = set(h.branch() for h in heads)
3115 3129 if branches - haveheads:
3116 3130 headless = ', '.join(b for b in branches - haveheads)
3117 3131 msg = _('no open branch heads found on branches %s')
3118 3132 if opts.get('rev'):
3119 3133 msg += _(' (started at %s)') % opts['rev']
3120 3134 ui.warn((msg + '\n') % headless)
3121 3135
3122 3136 if not heads:
3123 3137 return 1
3124 3138
3125 3139 heads = sorted(heads, key=lambda x: -x.rev())
3126 3140 displayer = cmdutil.show_changeset(ui, repo, opts)
3127 3141 for ctx in heads:
3128 3142 displayer.show(ctx)
3129 3143 displayer.close()
3130 3144
3131 3145 @command('help',
3132 3146 [('e', 'extension', None, _('show only help for extensions')),
3133 3147 ('c', 'command', None, _('show only help for commands')),
3134 3148 ('k', 'keyword', '', _('show topics matching keyword')),
3135 3149 ],
3136 3150 _('[-ec] [TOPIC]'))
3137 3151 def help_(ui, name=None, unknowncmd=False, full=True, **opts):
3138 3152 """show help for a given topic or a help overview
3139 3153
3140 3154 With no arguments, print a list of commands with short help messages.
3141 3155
3142 3156 Given a topic, extension, or command name, print help for that
3143 3157 topic.
3144 3158
3145 3159 Returns 0 if successful.
3146 3160 """
3147 3161
3148 3162 textwidth = min(ui.termwidth(), 80) - 2
3149 3163
3150 3164 def helpcmd(name):
3151 3165 try:
3152 3166 aliases, entry = cmdutil.findcmd(name, table, strict=unknowncmd)
3153 3167 except error.AmbiguousCommand, inst:
3154 3168 # py3k fix: except vars can't be used outside the scope of the
3155 3169 # except block, nor can be used inside a lambda. python issue4617
3156 3170 prefix = inst.args[0]
3157 3171 select = lambda c: c.lstrip('^').startswith(prefix)
3158 3172 rst = helplist(select)
3159 3173 return rst
3160 3174
3161 3175 rst = []
3162 3176
3163 3177 # check if it's an invalid alias and display its error if it is
3164 3178 if getattr(entry[0], 'badalias', False):
3165 3179 if not unknowncmd:
3166 3180 ui.pushbuffer()
3167 3181 entry[0](ui)
3168 3182 rst.append(ui.popbuffer())
3169 3183 return rst
3170 3184
3171 3185 # synopsis
3172 3186 if len(entry) > 2:
3173 3187 if entry[2].startswith('hg'):
3174 3188 rst.append("%s\n" % entry[2])
3175 3189 else:
3176 3190 rst.append('hg %s %s\n' % (aliases[0], entry[2]))
3177 3191 else:
3178 3192 rst.append('hg %s\n' % aliases[0])
3179 3193 # aliases
3180 3194 if full and not ui.quiet and len(aliases) > 1:
3181 3195 rst.append(_("\naliases: %s\n") % ', '.join(aliases[1:]))
3182 3196 rst.append('\n')
3183 3197
3184 3198 # description
3185 3199 doc = gettext(entry[0].__doc__)
3186 3200 if not doc:
3187 3201 doc = _("(no help text available)")
3188 3202 if util.safehasattr(entry[0], 'definition'): # aliased command
3189 3203 if entry[0].definition.startswith('!'): # shell alias
3190 3204 doc = _('shell alias for::\n\n %s') % entry[0].definition[1:]
3191 3205 else:
3192 3206 doc = _('alias for: hg %s\n\n%s') % (entry[0].definition, doc)
3193 3207 doc = doc.splitlines(True)
3194 3208 if ui.quiet or not full:
3195 3209 rst.append(doc[0])
3196 3210 else:
3197 3211 rst.extend(doc)
3198 3212 rst.append('\n')
3199 3213
3200 3214 # check if this command shadows a non-trivial (multi-line)
3201 3215 # extension help text
3202 3216 try:
3203 3217 mod = extensions.find(name)
3204 3218 doc = gettext(mod.__doc__) or ''
3205 3219 if '\n' in doc.strip():
3206 3220 msg = _('use "hg help -e %s" to show help for '
3207 3221 'the %s extension') % (name, name)
3208 3222 rst.append('\n%s\n' % msg)
3209 3223 except KeyError:
3210 3224 pass
3211 3225
3212 3226 # options
3213 3227 if not ui.quiet and entry[1]:
3214 3228 rst.append('\n%s\n\n' % _("options:"))
3215 3229 rst.append(help.optrst(entry[1], ui.verbose))
3216 3230
3217 3231 if ui.verbose:
3218 3232 rst.append('\n%s\n\n' % _("global options:"))
3219 3233 rst.append(help.optrst(globalopts, ui.verbose))
3220 3234
3221 3235 if not ui.verbose:
3222 3236 if not full:
3223 3237 rst.append(_('\nuse "hg help %s" to show the full help text\n')
3224 3238 % name)
3225 3239 elif not ui.quiet:
3226 3240 rst.append(_('\nuse "hg -v help %s" to show more info\n')
3227 3241 % name)
3228 3242 return rst
3229 3243
3230 3244
3231 3245 def helplist(select=None):
3232 3246 # list of commands
3233 3247 if name == "shortlist":
3234 3248 header = _('basic commands:\n\n')
3235 3249 else:
3236 3250 header = _('list of commands:\n\n')
3237 3251
3238 3252 h = {}
3239 3253 cmds = {}
3240 3254 for c, e in table.iteritems():
3241 3255 f = c.split("|", 1)[0]
3242 3256 if select and not select(f):
3243 3257 continue
3244 3258 if (not select and name != 'shortlist' and
3245 3259 e[0].__module__ != __name__):
3246 3260 continue
3247 3261 if name == "shortlist" and not f.startswith("^"):
3248 3262 continue
3249 3263 f = f.lstrip("^")
3250 3264 if not ui.debugflag and f.startswith("debug"):
3251 3265 continue
3252 3266 doc = e[0].__doc__
3253 3267 if doc and 'DEPRECATED' in doc and not ui.verbose:
3254 3268 continue
3255 3269 doc = gettext(doc)
3256 3270 if not doc:
3257 3271 doc = _("(no help text available)")
3258 3272 h[f] = doc.splitlines()[0].rstrip()
3259 3273 cmds[f] = c.lstrip("^")
3260 3274
3261 3275 rst = []
3262 3276 if not h:
3263 3277 if not ui.quiet:
3264 3278 rst.append(_('no commands defined\n'))
3265 3279 return rst
3266 3280
3267 3281 if not ui.quiet:
3268 3282 rst.append(header)
3269 3283 fns = sorted(h)
3270 3284 for f in fns:
3271 3285 if ui.verbose:
3272 3286 commands = cmds[f].replace("|",", ")
3273 3287 rst.append(" :%s: %s\n" % (commands, h[f]))
3274 3288 else:
3275 3289 rst.append(' :%s: %s\n' % (f, h[f]))
3276 3290
3277 3291 if not name:
3278 3292 exts = help.listexts(_('enabled extensions:'), extensions.enabled())
3279 3293 if exts:
3280 3294 rst.append('\n')
3281 3295 rst.extend(exts)
3282 3296
3283 3297 rst.append(_("\nadditional help topics:\n\n"))
3284 3298 topics = []
3285 3299 for names, header, doc in help.helptable:
3286 3300 topics.append((sorted(names, key=len, reverse=True)[0], header))
3287 3301 for t, desc in topics:
3288 3302 rst.append(" :%s: %s\n" % (t, desc))
3289 3303
3290 3304 optlist = []
3291 3305 if not ui.quiet:
3292 3306 if ui.verbose:
3293 3307 optlist.append((_("global options:"), globalopts))
3294 3308 if name == 'shortlist':
3295 3309 optlist.append((_('use "hg help" for the full list '
3296 3310 'of commands'), ()))
3297 3311 else:
3298 3312 if name == 'shortlist':
3299 3313 msg = _('use "hg help" for the full list of commands '
3300 3314 'or "hg -v" for details')
3301 3315 elif name and not full:
3302 3316 msg = _('use "hg help %s" to show the full help '
3303 3317 'text') % name
3304 3318 else:
3305 3319 msg = _('use "hg -v help%s" to show builtin aliases and '
3306 3320 'global options') % (name and " " + name or "")
3307 3321 optlist.append((msg, ()))
3308 3322
3309 3323 if optlist:
3310 3324 for title, options in optlist:
3311 3325 rst.append('\n%s\n' % title)
3312 3326 if options:
3313 3327 rst.append('\n%s\n' % help.optrst(options, ui.verbose))
3314 3328 return rst
3315 3329
3316 3330 def helptopic(name):
3317 3331 for names, header, doc in help.helptable:
3318 3332 if name in names:
3319 3333 break
3320 3334 else:
3321 3335 raise error.UnknownCommand(name)
3322 3336
3323 3337 rst = ["%s\n\n" % header]
3324 3338 # description
3325 3339 if not doc:
3326 3340 rst.append(" %s\n" % _("(no help text available)"))
3327 3341 if util.safehasattr(doc, '__call__'):
3328 3342 rst += [" %s\n" % l for l in doc().splitlines()]
3329 3343
3330 3344 try:
3331 3345 cmdutil.findcmd(name, table)
3332 3346 rst.append(_('\nuse "hg help -c %s" to see help for '
3333 3347 'the %s command\n') % (name, name))
3334 3348 except error.UnknownCommand:
3335 3349 pass
3336 3350 return rst
3337 3351
3338 3352 def helpext(name):
3339 3353 try:
3340 3354 mod = extensions.find(name)
3341 3355 doc = gettext(mod.__doc__) or _('no help text available')
3342 3356 except KeyError:
3343 3357 mod = None
3344 3358 doc = extensions.disabledext(name)
3345 3359 if not doc:
3346 3360 raise error.UnknownCommand(name)
3347 3361
3348 3362 if '\n' not in doc:
3349 3363 head, tail = doc, ""
3350 3364 else:
3351 3365 head, tail = doc.split('\n', 1)
3352 3366 rst = [_('%s extension - %s\n\n') % (name.split('.')[-1], head)]
3353 3367 if tail:
3354 3368 rst.extend(tail.splitlines(True))
3355 3369 rst.append('\n')
3356 3370
3357 3371 if mod:
3358 3372 try:
3359 3373 ct = mod.cmdtable
3360 3374 except AttributeError:
3361 3375 ct = {}
3362 3376 modcmds = set([c.split('|', 1)[0] for c in ct])
3363 3377 rst.extend(helplist(modcmds.__contains__))
3364 3378 else:
3365 3379 rst.append(_('use "hg help extensions" for information on enabling '
3366 3380 'extensions\n'))
3367 3381 return rst
3368 3382
3369 3383 def helpextcmd(name):
3370 3384 cmd, ext, mod = extensions.disabledcmd(ui, name,
3371 3385 ui.configbool('ui', 'strict'))
3372 3386 doc = gettext(mod.__doc__).splitlines()[0]
3373 3387
3374 3388 rst = help.listexts(_("'%s' is provided by the following "
3375 3389 "extension:") % cmd, {ext: doc}, indent=4)
3376 3390 rst.append('\n')
3377 3391 rst.append(_('use "hg help extensions" for information on enabling '
3378 3392 'extensions\n'))
3379 3393 return rst
3380 3394
3381 3395
3382 3396 rst = []
3383 3397 kw = opts.get('keyword')
3384 3398 if kw:
3385 3399 matches = help.topicmatch(kw)
3386 3400 for t, title in (('topics', _('Topics')),
3387 3401 ('commands', _('Commands')),
3388 3402 ('extensions', _('Extensions')),
3389 3403 ('extensioncommands', _('Extension Commands'))):
3390 3404 if matches[t]:
3391 3405 rst.append('%s:\n\n' % title)
3392 3406 rst.extend(minirst.maketable(sorted(matches[t]), 1))
3393 3407 rst.append('\n')
3394 3408 elif name and name != 'shortlist':
3395 3409 i = None
3396 3410 if unknowncmd:
3397 3411 queries = (helpextcmd,)
3398 3412 elif opts.get('extension'):
3399 3413 queries = (helpext,)
3400 3414 elif opts.get('command'):
3401 3415 queries = (helpcmd,)
3402 3416 else:
3403 3417 queries = (helptopic, helpcmd, helpext, helpextcmd)
3404 3418 for f in queries:
3405 3419 try:
3406 3420 rst = f(name)
3407 3421 i = None
3408 3422 break
3409 3423 except error.UnknownCommand, inst:
3410 3424 i = inst
3411 3425 if i:
3412 3426 raise i
3413 3427 else:
3414 3428 # program name
3415 3429 if not ui.quiet:
3416 3430 rst = [_("Mercurial Distributed SCM\n"), '\n']
3417 3431 rst.extend(helplist())
3418 3432
3419 3433 keep = ui.verbose and ['verbose'] or []
3420 3434 formatted, pruned = minirst.format(''.join(rst), textwidth, keep=keep)
3421 3435 ui.write(formatted)
3422 3436
3423 3437
3424 3438 @command('identify|id',
3425 3439 [('r', 'rev', '',
3426 3440 _('identify the specified revision'), _('REV')),
3427 3441 ('n', 'num', None, _('show local revision number')),
3428 3442 ('i', 'id', None, _('show global revision id')),
3429 3443 ('b', 'branch', None, _('show branch')),
3430 3444 ('t', 'tags', None, _('show tags')),
3431 3445 ('B', 'bookmarks', None, _('show bookmarks')),
3432 3446 ] + remoteopts,
3433 3447 _('[-nibtB] [-r REV] [SOURCE]'))
3434 3448 def identify(ui, repo, source=None, rev=None,
3435 3449 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
3436 3450 """identify the working copy or specified revision
3437 3451
3438 3452 Print a summary identifying the repository state at REV using one or
3439 3453 two parent hash identifiers, followed by a "+" if the working
3440 3454 directory has uncommitted changes, the branch name (if not default),
3441 3455 a list of tags, and a list of bookmarks.
3442 3456
3443 3457 When REV is not given, print a summary of the current state of the
3444 3458 repository.
3445 3459
3446 3460 Specifying a path to a repository root or Mercurial bundle will
3447 3461 cause lookup to operate on that repository/bundle.
3448 3462
3449 3463 .. container:: verbose
3450 3464
3451 3465 Examples:
3452 3466
3453 3467 - generate a build identifier for the working directory::
3454 3468
3455 3469 hg id --id > build-id.dat
3456 3470
3457 3471 - find the revision corresponding to a tag::
3458 3472
3459 3473 hg id -n -r 1.3
3460 3474
3461 3475 - check the most recent revision of a remote repository::
3462 3476
3463 3477 hg id -r tip http://selenic.com/hg/
3464 3478
3465 3479 Returns 0 if successful.
3466 3480 """
3467 3481
3468 3482 if not repo and not source:
3469 3483 raise util.Abort(_("there is no Mercurial repository here "
3470 3484 "(.hg not found)"))
3471 3485
3472 3486 hexfunc = ui.debugflag and hex or short
3473 3487 default = not (num or id or branch or tags or bookmarks)
3474 3488 output = []
3475 3489 revs = []
3476 3490
3477 3491 if source:
3478 3492 source, branches = hg.parseurl(ui.expandpath(source))
3479 3493 peer = hg.peer(ui, opts, source)
3480 3494 repo = peer.local()
3481 3495 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3482 3496
3483 3497 if not repo:
3484 3498 if num or branch or tags:
3485 3499 raise util.Abort(
3486 3500 _("can't query remote revision number, branch, or tags"))
3487 3501 if not rev and revs:
3488 3502 rev = revs[0]
3489 3503 if not rev:
3490 3504 rev = "tip"
3491 3505
3492 3506 remoterev = peer.lookup(rev)
3493 3507 if default or id:
3494 3508 output = [hexfunc(remoterev)]
3495 3509
3496 3510 def getbms():
3497 3511 bms = []
3498 3512
3499 3513 if 'bookmarks' in peer.listkeys('namespaces'):
3500 3514 hexremoterev = hex(remoterev)
3501 3515 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
3502 3516 if bmr == hexremoterev]
3503 3517
3504 3518 return bms
3505 3519
3506 3520 if bookmarks:
3507 3521 output.extend(getbms())
3508 3522 elif default and not ui.quiet:
3509 3523 # multiple bookmarks for a single parent separated by '/'
3510 3524 bm = '/'.join(getbms())
3511 3525 if bm:
3512 3526 output.append(bm)
3513 3527 else:
3514 3528 if not rev:
3515 3529 ctx = repo[None]
3516 3530 parents = ctx.parents()
3517 3531 changed = ""
3518 3532 if default or id or num:
3519 3533 if (util.any(repo.status())
3520 3534 or util.any(ctx.sub(s).dirty() for s in ctx.substate)):
3521 3535 changed = '+'
3522 3536 if default or id:
3523 3537 output = ["%s%s" %
3524 3538 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
3525 3539 if num:
3526 3540 output.append("%s%s" %
3527 3541 ('+'.join([str(p.rev()) for p in parents]), changed))
3528 3542 else:
3529 3543 ctx = scmutil.revsingle(repo, rev)
3530 3544 if default or id:
3531 3545 output = [hexfunc(ctx.node())]
3532 3546 if num:
3533 3547 output.append(str(ctx.rev()))
3534 3548
3535 3549 if default and not ui.quiet:
3536 3550 b = ctx.branch()
3537 3551 if b != 'default':
3538 3552 output.append("(%s)" % b)
3539 3553
3540 3554 # multiple tags for a single parent separated by '/'
3541 3555 t = '/'.join(ctx.tags())
3542 3556 if t:
3543 3557 output.append(t)
3544 3558
3545 3559 # multiple bookmarks for a single parent separated by '/'
3546 3560 bm = '/'.join(ctx.bookmarks())
3547 3561 if bm:
3548 3562 output.append(bm)
3549 3563 else:
3550 3564 if branch:
3551 3565 output.append(ctx.branch())
3552 3566
3553 3567 if tags:
3554 3568 output.extend(ctx.tags())
3555 3569
3556 3570 if bookmarks:
3557 3571 output.extend(ctx.bookmarks())
3558 3572
3559 3573 ui.write("%s\n" % ' '.join(output))
3560 3574
3561 3575 @command('import|patch',
3562 3576 [('p', 'strip', 1,
3563 3577 _('directory strip option for patch. This has the same '
3564 3578 'meaning as the corresponding patch option'), _('NUM')),
3565 3579 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
3566 3580 ('e', 'edit', False, _('invoke editor on commit messages')),
3567 3581 ('f', 'force', None, _('skip check for outstanding uncommitted changes')),
3568 3582 ('', 'no-commit', None,
3569 3583 _("don't commit, just update the working directory")),
3570 3584 ('', 'bypass', None,
3571 3585 _("apply patch without touching the working directory")),
3572 3586 ('', 'exact', None,
3573 3587 _('apply patch to the nodes from which it was generated')),
3574 3588 ('', 'import-branch', None,
3575 3589 _('use any branch information in patch (implied by --exact)'))] +
3576 3590 commitopts + commitopts2 + similarityopts,
3577 3591 _('[OPTION]... PATCH...'))
3578 3592 def import_(ui, repo, patch1=None, *patches, **opts):
3579 3593 """import an ordered set of patches
3580 3594
3581 3595 Import a list of patches and commit them individually (unless
3582 3596 --no-commit is specified).
3583 3597
3584 3598 If there are outstanding changes in the working directory, import
3585 3599 will abort unless given the -f/--force flag.
3586 3600
3587 3601 You can import a patch straight from a mail message. Even patches
3588 3602 as attachments work (to use the body part, it must have type
3589 3603 text/plain or text/x-patch). From and Subject headers of email
3590 3604 message are used as default committer and commit message. All
3591 3605 text/plain body parts before first diff are added to commit
3592 3606 message.
3593 3607
3594 3608 If the imported patch was generated by :hg:`export`, user and
3595 3609 description from patch override values from message headers and
3596 3610 body. Values given on command line with -m/--message and -u/--user
3597 3611 override these.
3598 3612
3599 3613 If --exact is specified, import will set the working directory to
3600 3614 the parent of each patch before applying it, and will abort if the
3601 3615 resulting changeset has a different ID than the one recorded in
3602 3616 the patch. This may happen due to character set problems or other
3603 3617 deficiencies in the text patch format.
3604 3618
3605 3619 Use --bypass to apply and commit patches directly to the
3606 3620 repository, not touching the working directory. Without --exact,
3607 3621 patches will be applied on top of the working directory parent
3608 3622 revision.
3609 3623
3610 3624 With -s/--similarity, hg will attempt to discover renames and
3611 3625 copies in the patch in the same way as :hg:`addremove`.
3612 3626
3613 3627 To read a patch from standard input, use "-" as the patch name. If
3614 3628 a URL is specified, the patch will be downloaded from it.
3615 3629 See :hg:`help dates` for a list of formats valid for -d/--date.
3616 3630
3617 3631 .. container:: verbose
3618 3632
3619 3633 Examples:
3620 3634
3621 3635 - import a traditional patch from a website and detect renames::
3622 3636
3623 3637 hg import -s 80 http://example.com/bugfix.patch
3624 3638
3625 3639 - import a changeset from an hgweb server::
3626 3640
3627 3641 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
3628 3642
3629 3643 - import all the patches in an Unix-style mbox::
3630 3644
3631 3645 hg import incoming-patches.mbox
3632 3646
3633 3647 - attempt to exactly restore an exported changeset (not always
3634 3648 possible)::
3635 3649
3636 3650 hg import --exact proposed-fix.patch
3637 3651
3638 3652 Returns 0 on success.
3639 3653 """
3640 3654
3641 3655 if not patch1:
3642 3656 raise util.Abort(_('need at least one patch to import'))
3643 3657
3644 3658 patches = (patch1,) + patches
3645 3659
3646 3660 date = opts.get('date')
3647 3661 if date:
3648 3662 opts['date'] = util.parsedate(date)
3649 3663
3650 3664 editor = cmdutil.commiteditor
3651 3665 if opts.get('edit'):
3652 3666 editor = cmdutil.commitforceeditor
3653 3667
3654 3668 update = not opts.get('bypass')
3655 3669 if not update and opts.get('no_commit'):
3656 3670 raise util.Abort(_('cannot use --no-commit with --bypass'))
3657 3671 try:
3658 3672 sim = float(opts.get('similarity') or 0)
3659 3673 except ValueError:
3660 3674 raise util.Abort(_('similarity must be a number'))
3661 3675 if sim < 0 or sim > 100:
3662 3676 raise util.Abort(_('similarity must be between 0 and 100'))
3663 3677 if sim and not update:
3664 3678 raise util.Abort(_('cannot use --similarity with --bypass'))
3665 3679
3666 3680 if (opts.get('exact') or not opts.get('force')) and update:
3667 3681 cmdutil.bailifchanged(repo)
3668 3682
3669 3683 base = opts["base"]
3670 3684 strip = opts["strip"]
3671 3685 wlock = lock = tr = None
3672 3686 msgs = []
3673 3687
3674 3688 def checkexact(repo, n, nodeid):
3675 3689 if opts.get('exact') and hex(n) != nodeid:
3676 3690 repo.rollback()
3677 3691 raise util.Abort(_('patch is damaged or loses information'))
3678 3692
3679 3693 def tryone(ui, hunk, parents):
3680 3694 tmpname, message, user, date, branch, nodeid, p1, p2 = \
3681 3695 patch.extract(ui, hunk)
3682 3696
3683 3697 if not tmpname:
3684 3698 return (None, None)
3685 3699 msg = _('applied to working directory')
3686 3700
3687 3701 try:
3688 3702 cmdline_message = cmdutil.logmessage(ui, opts)
3689 3703 if cmdline_message:
3690 3704 # pickup the cmdline msg
3691 3705 message = cmdline_message
3692 3706 elif message:
3693 3707 # pickup the patch msg
3694 3708 message = message.strip()
3695 3709 else:
3696 3710 # launch the editor
3697 3711 message = None
3698 3712 ui.debug('message:\n%s\n' % message)
3699 3713
3700 3714 if len(parents) == 1:
3701 3715 parents.append(repo[nullid])
3702 3716 if opts.get('exact'):
3703 3717 if not nodeid or not p1:
3704 3718 raise util.Abort(_('not a Mercurial patch'))
3705 3719 p1 = repo[p1]
3706 3720 p2 = repo[p2 or nullid]
3707 3721 elif p2:
3708 3722 try:
3709 3723 p1 = repo[p1]
3710 3724 p2 = repo[p2]
3711 3725 # Without any options, consider p2 only if the
3712 3726 # patch is being applied on top of the recorded
3713 3727 # first parent.
3714 3728 if p1 != parents[0]:
3715 3729 p1 = parents[0]
3716 3730 p2 = repo[nullid]
3717 3731 except error.RepoError:
3718 3732 p1, p2 = parents
3719 3733 else:
3720 3734 p1, p2 = parents
3721 3735
3722 3736 n = None
3723 3737 if update:
3724 3738 if p1 != parents[0]:
3725 3739 hg.clean(repo, p1.node())
3726 3740 if p2 != parents[1]:
3727 3741 repo.setparents(p1.node(), p2.node())
3728 3742
3729 3743 if opts.get('exact') or opts.get('import_branch'):
3730 3744 repo.dirstate.setbranch(branch or 'default')
3731 3745
3732 3746 files = set()
3733 3747 patch.patch(ui, repo, tmpname, strip=strip, files=files,
3734 3748 eolmode=None, similarity=sim / 100.0)
3735 3749 files = list(files)
3736 3750 if opts.get('no_commit'):
3737 3751 if message:
3738 3752 msgs.append(message)
3739 3753 else:
3740 3754 if opts.get('exact') or p2:
3741 3755 # If you got here, you either use --force and know what
3742 3756 # you are doing or used --exact or a merge patch while
3743 3757 # being updated to its first parent.
3744 3758 m = None
3745 3759 else:
3746 3760 m = scmutil.matchfiles(repo, files or [])
3747 3761 n = repo.commit(message, opts.get('user') or user,
3748 3762 opts.get('date') or date, match=m,
3749 3763 editor=editor)
3750 3764 checkexact(repo, n, nodeid)
3751 3765 else:
3752 3766 if opts.get('exact') or opts.get('import_branch'):
3753 3767 branch = branch or 'default'
3754 3768 else:
3755 3769 branch = p1.branch()
3756 3770 store = patch.filestore()
3757 3771 try:
3758 3772 files = set()
3759 3773 try:
3760 3774 patch.patchrepo(ui, repo, p1, store, tmpname, strip,
3761 3775 files, eolmode=None)
3762 3776 except patch.PatchError, e:
3763 3777 raise util.Abort(str(e))
3764 3778 memctx = patch.makememctx(repo, (p1.node(), p2.node()),
3765 3779 message,
3766 3780 opts.get('user') or user,
3767 3781 opts.get('date') or date,
3768 3782 branch, files, store,
3769 3783 editor=cmdutil.commiteditor)
3770 3784 repo.savecommitmessage(memctx.description())
3771 3785 n = memctx.commit()
3772 3786 checkexact(repo, n, nodeid)
3773 3787 finally:
3774 3788 store.close()
3775 3789 if n:
3776 3790 # i18n: refers to a short changeset id
3777 3791 msg = _('created %s') % short(n)
3778 3792 return (msg, n)
3779 3793 finally:
3780 3794 os.unlink(tmpname)
3781 3795
3782 3796 try:
3783 3797 try:
3784 3798 wlock = repo.wlock()
3785 3799 if not opts.get('no_commit'):
3786 3800 lock = repo.lock()
3787 3801 tr = repo.transaction('import')
3788 3802 parents = repo.parents()
3789 3803 for patchurl in patches:
3790 3804 if patchurl == '-':
3791 3805 ui.status(_('applying patch from stdin\n'))
3792 3806 patchfile = ui.fin
3793 3807 patchurl = 'stdin' # for error message
3794 3808 else:
3795 3809 patchurl = os.path.join(base, patchurl)
3796 3810 ui.status(_('applying %s\n') % patchurl)
3797 3811 patchfile = url.open(ui, patchurl)
3798 3812
3799 3813 haspatch = False
3800 3814 for hunk in patch.split(patchfile):
3801 3815 (msg, node) = tryone(ui, hunk, parents)
3802 3816 if msg:
3803 3817 haspatch = True
3804 3818 ui.note(msg + '\n')
3805 3819 if update or opts.get('exact'):
3806 3820 parents = repo.parents()
3807 3821 else:
3808 3822 parents = [repo[node]]
3809 3823
3810 3824 if not haspatch:
3811 3825 raise util.Abort(_('%s: no diffs found') % patchurl)
3812 3826
3813 3827 if tr:
3814 3828 tr.close()
3815 3829 if msgs:
3816 3830 repo.savecommitmessage('\n* * *\n'.join(msgs))
3817 3831 except: # re-raises
3818 3832 # wlock.release() indirectly calls dirstate.write(): since
3819 3833 # we're crashing, we do not want to change the working dir
3820 3834 # parent after all, so make sure it writes nothing
3821 3835 repo.dirstate.invalidate()
3822 3836 raise
3823 3837 finally:
3824 3838 if tr:
3825 3839 tr.release()
3826 3840 release(lock, wlock)
3827 3841
3828 3842 @command('incoming|in',
3829 3843 [('f', 'force', None,
3830 3844 _('run even if remote repository is unrelated')),
3831 3845 ('n', 'newest-first', None, _('show newest record first')),
3832 3846 ('', 'bundle', '',
3833 3847 _('file to store the bundles into'), _('FILE')),
3834 3848 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3835 3849 ('B', 'bookmarks', False, _("compare bookmarks")),
3836 3850 ('b', 'branch', [],
3837 3851 _('a specific branch you would like to pull'), _('BRANCH')),
3838 3852 ] + logopts + remoteopts + subrepoopts,
3839 3853 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3840 3854 def incoming(ui, repo, source="default", **opts):
3841 3855 """show new changesets found in source
3842 3856
3843 3857 Show new changesets found in the specified path/URL or the default
3844 3858 pull location. These are the changesets that would have been pulled
3845 3859 if a pull at the time you issued this command.
3846 3860
3847 3861 For remote repository, using --bundle avoids downloading the
3848 3862 changesets twice if the incoming is followed by a pull.
3849 3863
3850 3864 See pull for valid source format details.
3851 3865
3852 3866 Returns 0 if there are incoming changes, 1 otherwise.
3853 3867 """
3854 3868 if opts.get('graph'):
3855 3869 cmdutil.checkunsupportedgraphflags([], opts)
3856 3870 def display(other, chlist, displayer):
3857 3871 revdag = cmdutil.graphrevs(other, chlist, opts)
3858 3872 showparents = [ctx.node() for ctx in repo[None].parents()]
3859 3873 cmdutil.displaygraph(ui, revdag, displayer, showparents,
3860 3874 graphmod.asciiedges)
3861 3875
3862 3876 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3863 3877 return 0
3864 3878
3865 3879 if opts.get('bundle') and opts.get('subrepos'):
3866 3880 raise util.Abort(_('cannot combine --bundle and --subrepos'))
3867 3881
3868 3882 if opts.get('bookmarks'):
3869 3883 source, branches = hg.parseurl(ui.expandpath(source),
3870 3884 opts.get('branch'))
3871 3885 other = hg.peer(repo, opts, source)
3872 3886 if 'bookmarks' not in other.listkeys('namespaces'):
3873 3887 ui.warn(_("remote doesn't support bookmarks\n"))
3874 3888 return 0
3875 3889 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3876 3890 return bookmarks.diff(ui, repo, other)
3877 3891
3878 3892 repo._subtoppath = ui.expandpath(source)
3879 3893 try:
3880 3894 return hg.incoming(ui, repo, source, opts)
3881 3895 finally:
3882 3896 del repo._subtoppath
3883 3897
3884 3898
3885 3899 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'))
3886 3900 def init(ui, dest=".", **opts):
3887 3901 """create a new repository in the given directory
3888 3902
3889 3903 Initialize a new repository in the given directory. If the given
3890 3904 directory does not exist, it will be created.
3891 3905
3892 3906 If no directory is given, the current directory is used.
3893 3907
3894 3908 It is possible to specify an ``ssh://`` URL as the destination.
3895 3909 See :hg:`help urls` for more information.
3896 3910
3897 3911 Returns 0 on success.
3898 3912 """
3899 3913 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3900 3914
3901 3915 @command('locate',
3902 3916 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3903 3917 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3904 3918 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3905 3919 ] + walkopts,
3906 3920 _('[OPTION]... [PATTERN]...'))
3907 3921 def locate(ui, repo, *pats, **opts):
3908 3922 """locate files matching specific patterns
3909 3923
3910 3924 Print files under Mercurial control in the working directory whose
3911 3925 names match the given patterns.
3912 3926
3913 3927 By default, this command searches all directories in the working
3914 3928 directory. To search just the current directory and its
3915 3929 subdirectories, use "--include .".
3916 3930
3917 3931 If no patterns are given to match, this command prints the names
3918 3932 of all files under Mercurial control in the working directory.
3919 3933
3920 3934 If you want to feed the output of this command into the "xargs"
3921 3935 command, use the -0 option to both this command and "xargs". This
3922 3936 will avoid the problem of "xargs" treating single filenames that
3923 3937 contain whitespace as multiple filenames.
3924 3938
3925 3939 Returns 0 if a match is found, 1 otherwise.
3926 3940 """
3927 3941 end = opts.get('print0') and '\0' or '\n'
3928 3942 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3929 3943
3930 3944 ret = 1
3931 3945 m = scmutil.match(repo[rev], pats, opts, default='relglob')
3932 3946 m.bad = lambda x, y: False
3933 3947 for abs in repo[rev].walk(m):
3934 3948 if not rev and abs not in repo.dirstate:
3935 3949 continue
3936 3950 if opts.get('fullpath'):
3937 3951 ui.write(repo.wjoin(abs), end)
3938 3952 else:
3939 3953 ui.write(((pats and m.rel(abs)) or abs), end)
3940 3954 ret = 0
3941 3955
3942 3956 return ret
3943 3957
3944 3958 @command('^log|history',
3945 3959 [('f', 'follow', None,
3946 3960 _('follow changeset history, or file history across copies and renames')),
3947 3961 ('', 'follow-first', None,
3948 3962 _('only follow the first parent of merge changesets (DEPRECATED)')),
3949 3963 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3950 3964 ('C', 'copies', None, _('show copied files')),
3951 3965 ('k', 'keyword', [],
3952 3966 _('do case-insensitive search for a given text'), _('TEXT')),
3953 3967 ('r', 'rev', [], _('show the specified revision or range'), _('REV')),
3954 3968 ('', 'removed', None, _('include revisions where files were removed')),
3955 3969 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3956 3970 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3957 3971 ('', 'only-branch', [],
3958 3972 _('show only changesets within the given named branch (DEPRECATED)'),
3959 3973 _('BRANCH')),
3960 3974 ('b', 'branch', [],
3961 3975 _('show changesets within the given named branch'), _('BRANCH')),
3962 3976 ('P', 'prune', [],
3963 3977 _('do not display revision or any of its ancestors'), _('REV')),
3964 3978 ('', 'hidden', False, _('show hidden changesets (DEPRECATED)')),
3965 3979 ] + logopts + walkopts,
3966 3980 _('[OPTION]... [FILE]'))
3967 3981 def log(ui, repo, *pats, **opts):
3968 3982 """show revision history of entire repository or files
3969 3983
3970 3984 Print the revision history of the specified files or the entire
3971 3985 project.
3972 3986
3973 3987 If no revision range is specified, the default is ``tip:0`` unless
3974 3988 --follow is set, in which case the working directory parent is
3975 3989 used as the starting revision.
3976 3990
3977 3991 File history is shown without following rename or copy history of
3978 3992 files. Use -f/--follow with a filename to follow history across
3979 3993 renames and copies. --follow without a filename will only show
3980 3994 ancestors or descendants of the starting revision.
3981 3995
3982 3996 By default this command prints revision number and changeset id,
3983 3997 tags, non-trivial parents, user, date and time, and a summary for
3984 3998 each commit. When the -v/--verbose switch is used, the list of
3985 3999 changed files and full commit message are shown.
3986 4000
3987 4001 .. note::
3988 4002 log -p/--patch may generate unexpected diff output for merge
3989 4003 changesets, as it will only compare the merge changeset against
3990 4004 its first parent. Also, only files different from BOTH parents
3991 4005 will appear in files:.
3992 4006
3993 4007 .. note::
3994 4008 for performance reasons, log FILE may omit duplicate changes
3995 4009 made on branches and will not show deletions. To see all
3996 4010 changes including duplicates and deletions, use the --removed
3997 4011 switch.
3998 4012
3999 4013 .. container:: verbose
4000 4014
4001 4015 Some examples:
4002 4016
4003 4017 - changesets with full descriptions and file lists::
4004 4018
4005 4019 hg log -v
4006 4020
4007 4021 - changesets ancestral to the working directory::
4008 4022
4009 4023 hg log -f
4010 4024
4011 4025 - last 10 commits on the current branch::
4012 4026
4013 4027 hg log -l 10 -b .
4014 4028
4015 4029 - changesets showing all modifications of a file, including removals::
4016 4030
4017 4031 hg log --removed file.c
4018 4032
4019 4033 - all changesets that touch a directory, with diffs, excluding merges::
4020 4034
4021 4035 hg log -Mp lib/
4022 4036
4023 4037 - all revision numbers that match a keyword::
4024 4038
4025 4039 hg log -k bug --template "{rev}\\n"
4026 4040
4027 4041 - check if a given changeset is included is a tagged release::
4028 4042
4029 4043 hg log -r "a21ccf and ancestor(1.9)"
4030 4044
4031 4045 - find all changesets by some user in a date range::
4032 4046
4033 4047 hg log -k alice -d "may 2008 to jul 2008"
4034 4048
4035 4049 - summary of all changesets after the last tag::
4036 4050
4037 4051 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4038 4052
4039 4053 See :hg:`help dates` for a list of formats valid for -d/--date.
4040 4054
4041 4055 See :hg:`help revisions` and :hg:`help revsets` for more about
4042 4056 specifying revisions.
4043 4057
4044 4058 See :hg:`help templates` for more about pre-packaged styles and
4045 4059 specifying custom templates.
4046 4060
4047 4061 Returns 0 on success.
4048 4062 """
4049 4063 if opts.get('graph'):
4050 4064 return cmdutil.graphlog(ui, repo, *pats, **opts)
4051 4065
4052 4066 matchfn = scmutil.match(repo[None], pats, opts)
4053 4067 limit = cmdutil.loglimit(opts)
4054 4068 count = 0
4055 4069
4056 4070 getrenamed, endrev = None, None
4057 4071 if opts.get('copies'):
4058 4072 if opts.get('rev'):
4059 4073 endrev = max(scmutil.revrange(repo, opts.get('rev'))) + 1
4060 4074 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
4061 4075
4062 4076 df = False
4063 4077 if opts["date"]:
4064 4078 df = util.matchdate(opts["date"])
4065 4079
4066 4080 branches = opts.get('branch', []) + opts.get('only_branch', [])
4067 4081 opts['branch'] = [repo.lookupbranch(b) for b in branches]
4068 4082
4069 4083 displayer = cmdutil.show_changeset(ui, repo, opts, True)
4070 4084 def prep(ctx, fns):
4071 4085 rev = ctx.rev()
4072 4086 parents = [p for p in repo.changelog.parentrevs(rev)
4073 4087 if p != nullrev]
4074 4088 if opts.get('no_merges') and len(parents) == 2:
4075 4089 return
4076 4090 if opts.get('only_merges') and len(parents) != 2:
4077 4091 return
4078 4092 if opts.get('branch') and ctx.branch() not in opts['branch']:
4079 4093 return
4080 4094 if not opts.get('hidden') and ctx.hidden():
4081 4095 return
4082 4096 if df and not df(ctx.date()[0]):
4083 4097 return
4084 4098
4085 4099 lower = encoding.lower
4086 4100 if opts.get('user'):
4087 4101 luser = lower(ctx.user())
4088 4102 for k in [lower(x) for x in opts['user']]:
4089 4103 if (k in luser):
4090 4104 break
4091 4105 else:
4092 4106 return
4093 4107 if opts.get('keyword'):
4094 4108 luser = lower(ctx.user())
4095 4109 ldesc = lower(ctx.description())
4096 4110 lfiles = lower(" ".join(ctx.files()))
4097 4111 for k in [lower(x) for x in opts['keyword']]:
4098 4112 if (k in luser or k in ldesc or k in lfiles):
4099 4113 break
4100 4114 else:
4101 4115 return
4102 4116
4103 4117 copies = None
4104 4118 if getrenamed is not None and rev:
4105 4119 copies = []
4106 4120 for fn in ctx.files():
4107 4121 rename = getrenamed(fn, rev)
4108 4122 if rename:
4109 4123 copies.append((fn, rename[0]))
4110 4124
4111 4125 revmatchfn = None
4112 4126 if opts.get('patch') or opts.get('stat'):
4113 4127 if opts.get('follow') or opts.get('follow_first'):
4114 4128 # note: this might be wrong when following through merges
4115 4129 revmatchfn = scmutil.match(repo[None], fns, default='path')
4116 4130 else:
4117 4131 revmatchfn = matchfn
4118 4132
4119 4133 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
4120 4134
4121 4135 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
4122 4136 if count == limit:
4123 4137 break
4124 4138 if displayer.flush(ctx.rev()):
4125 4139 count += 1
4126 4140 displayer.close()
4127 4141
4128 4142 @command('manifest',
4129 4143 [('r', 'rev', '', _('revision to display'), _('REV')),
4130 4144 ('', 'all', False, _("list files from all revisions"))],
4131 4145 _('[-r REV]'))
4132 4146 def manifest(ui, repo, node=None, rev=None, **opts):
4133 4147 """output the current or given revision of the project manifest
4134 4148
4135 4149 Print a list of version controlled files for the given revision.
4136 4150 If no revision is given, the first parent of the working directory
4137 4151 is used, or the null revision if no revision is checked out.
4138 4152
4139 4153 With -v, print file permissions, symlink and executable bits.
4140 4154 With --debug, print file revision hashes.
4141 4155
4142 4156 If option --all is specified, the list of all files from all revisions
4143 4157 is printed. This includes deleted and renamed files.
4144 4158
4145 4159 Returns 0 on success.
4146 4160 """
4147 4161 if opts.get('all'):
4148 4162 if rev or node:
4149 4163 raise util.Abort(_("can't specify a revision with --all"))
4150 4164
4151 4165 res = []
4152 4166 prefix = "data/"
4153 4167 suffix = ".i"
4154 4168 plen = len(prefix)
4155 4169 slen = len(suffix)
4156 4170 lock = repo.lock()
4157 4171 try:
4158 4172 for fn, b, size in repo.store.datafiles():
4159 4173 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
4160 4174 res.append(fn[plen:-slen])
4161 4175 finally:
4162 4176 lock.release()
4163 4177 for f in sorted(res):
4164 4178 ui.write("%s\n" % f)
4165 4179 return
4166 4180
4167 4181 if rev and node:
4168 4182 raise util.Abort(_("please specify just one revision"))
4169 4183
4170 4184 if not node:
4171 4185 node = rev
4172 4186
4173 4187 decor = {'l':'644 @ ', 'x':'755 * ', '':'644 '}
4174 4188 ctx = scmutil.revsingle(repo, node)
4175 4189 for f in ctx:
4176 4190 if ui.debugflag:
4177 4191 ui.write("%40s " % hex(ctx.manifest()[f]))
4178 4192 if ui.verbose:
4179 4193 ui.write(decor[ctx.flags(f)])
4180 4194 ui.write("%s\n" % f)
4181 4195
4182 4196 @command('^merge',
4183 4197 [('f', 'force', None, _('force a merge with outstanding changes')),
4184 4198 ('r', 'rev', '', _('revision to merge'), _('REV')),
4185 4199 ('P', 'preview', None,
4186 4200 _('review revisions to merge (no merge is performed)'))
4187 4201 ] + mergetoolopts,
4188 4202 _('[-P] [-f] [[-r] REV]'))
4189 4203 def merge(ui, repo, node=None, **opts):
4190 4204 """merge working directory with another revision
4191 4205
4192 4206 The current working directory is updated with all changes made in
4193 4207 the requested revision since the last common predecessor revision.
4194 4208
4195 4209 Files that changed between either parent are marked as changed for
4196 4210 the next commit and a commit must be performed before any further
4197 4211 updates to the repository are allowed. The next commit will have
4198 4212 two parents.
4199 4213
4200 4214 ``--tool`` can be used to specify the merge tool used for file
4201 4215 merges. It overrides the HGMERGE environment variable and your
4202 4216 configuration files. See :hg:`help merge-tools` for options.
4203 4217
4204 4218 If no revision is specified, the working directory's parent is a
4205 4219 head revision, and the current branch contains exactly one other
4206 4220 head, the other head is merged with by default. Otherwise, an
4207 4221 explicit revision with which to merge with must be provided.
4208 4222
4209 4223 :hg:`resolve` must be used to resolve unresolved files.
4210 4224
4211 4225 To undo an uncommitted merge, use :hg:`update --clean .` which
4212 4226 will check out a clean copy of the original merge parent, losing
4213 4227 all changes.
4214 4228
4215 4229 Returns 0 on success, 1 if there are unresolved files.
4216 4230 """
4217 4231
4218 4232 if opts.get('rev') and node:
4219 4233 raise util.Abort(_("please specify just one revision"))
4220 4234 if not node:
4221 4235 node = opts.get('rev')
4222 4236
4223 4237 if node:
4224 4238 node = scmutil.revsingle(repo, node).node()
4225 4239
4226 4240 if not node and repo._bookmarkcurrent:
4227 4241 bmheads = repo.bookmarkheads(repo._bookmarkcurrent)
4228 4242 curhead = repo[repo._bookmarkcurrent]
4229 4243 if len(bmheads) == 2:
4230 4244 if curhead == bmheads[0]:
4231 4245 node = bmheads[1]
4232 4246 else:
4233 4247 node = bmheads[0]
4234 4248 elif len(bmheads) > 2:
4235 4249 raise util.Abort(_("multiple matching bookmarks to merge - "
4236 4250 "please merge with an explicit rev or bookmark"),
4237 4251 hint=_("run 'hg heads' to see all heads"))
4238 4252 elif len(bmheads) <= 1:
4239 4253 raise util.Abort(_("no matching bookmark to merge - "
4240 4254 "please merge with an explicit rev or bookmark"),
4241 4255 hint=_("run 'hg heads' to see all heads"))
4242 4256
4243 4257 if not node and not repo._bookmarkcurrent:
4244 4258 branch = repo[None].branch()
4245 4259 bheads = repo.branchheads(branch)
4246 4260 nbhs = [bh for bh in bheads if not repo[bh].bookmarks()]
4247 4261
4248 4262 if len(nbhs) > 2:
4249 4263 raise util.Abort(_("branch '%s' has %d heads - "
4250 4264 "please merge with an explicit rev")
4251 4265 % (branch, len(bheads)),
4252 4266 hint=_("run 'hg heads .' to see heads"))
4253 4267
4254 4268 parent = repo.dirstate.p1()
4255 4269 if len(nbhs) == 1:
4256 4270 if len(bheads) > 1:
4257 4271 raise util.Abort(_("heads are bookmarked - "
4258 4272 "please merge with an explicit rev"),
4259 4273 hint=_("run 'hg heads' to see all heads"))
4260 4274 if len(repo.heads()) > 1:
4261 4275 raise util.Abort(_("branch '%s' has one head - "
4262 4276 "please merge with an explicit rev")
4263 4277 % branch,
4264 4278 hint=_("run 'hg heads' to see all heads"))
4265 4279 msg, hint = _('nothing to merge'), None
4266 4280 if parent != repo.lookup(branch):
4267 4281 hint = _("use 'hg update' instead")
4268 4282 raise util.Abort(msg, hint=hint)
4269 4283
4270 4284 if parent not in bheads:
4271 4285 raise util.Abort(_('working directory not at a head revision'),
4272 4286 hint=_("use 'hg update' or merge with an "
4273 4287 "explicit revision"))
4274 4288 if parent == nbhs[0]:
4275 4289 node = nbhs[-1]
4276 4290 else:
4277 4291 node = nbhs[0]
4278 4292
4279 4293 if opts.get('preview'):
4280 4294 # find nodes that are ancestors of p2 but not of p1
4281 4295 p1 = repo.lookup('.')
4282 4296 p2 = repo.lookup(node)
4283 4297 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4284 4298
4285 4299 displayer = cmdutil.show_changeset(ui, repo, opts)
4286 4300 for node in nodes:
4287 4301 displayer.show(repo[node])
4288 4302 displayer.close()
4289 4303 return 0
4290 4304
4291 4305 try:
4292 4306 # ui.forcemerge is an internal variable, do not document
4293 4307 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
4294 4308 return hg.merge(repo, node, force=opts.get('force'))
4295 4309 finally:
4296 4310 ui.setconfig('ui', 'forcemerge', '')
4297 4311
4298 4312 @command('outgoing|out',
4299 4313 [('f', 'force', None, _('run even when the destination is unrelated')),
4300 4314 ('r', 'rev', [],
4301 4315 _('a changeset intended to be included in the destination'), _('REV')),
4302 4316 ('n', 'newest-first', None, _('show newest record first')),
4303 4317 ('B', 'bookmarks', False, _('compare bookmarks')),
4304 4318 ('b', 'branch', [], _('a specific branch you would like to push'),
4305 4319 _('BRANCH')),
4306 4320 ] + logopts + remoteopts + subrepoopts,
4307 4321 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
4308 4322 def outgoing(ui, repo, dest=None, **opts):
4309 4323 """show changesets not found in the destination
4310 4324
4311 4325 Show changesets not found in the specified destination repository
4312 4326 or the default push location. These are the changesets that would
4313 4327 be pushed if a push was requested.
4314 4328
4315 4329 See pull for details of valid destination formats.
4316 4330
4317 4331 Returns 0 if there are outgoing changes, 1 otherwise.
4318 4332 """
4319 4333 if opts.get('graph'):
4320 4334 cmdutil.checkunsupportedgraphflags([], opts)
4321 4335 o = hg._outgoing(ui, repo, dest, opts)
4322 4336 if o is None:
4323 4337 return
4324 4338
4325 4339 revdag = cmdutil.graphrevs(repo, o, opts)
4326 4340 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
4327 4341 showparents = [ctx.node() for ctx in repo[None].parents()]
4328 4342 cmdutil.displaygraph(ui, revdag, displayer, showparents,
4329 4343 graphmod.asciiedges)
4330 4344 return 0
4331 4345
4332 4346 if opts.get('bookmarks'):
4333 4347 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4334 4348 dest, branches = hg.parseurl(dest, opts.get('branch'))
4335 4349 other = hg.peer(repo, opts, dest)
4336 4350 if 'bookmarks' not in other.listkeys('namespaces'):
4337 4351 ui.warn(_("remote doesn't support bookmarks\n"))
4338 4352 return 0
4339 4353 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
4340 4354 return bookmarks.diff(ui, other, repo)
4341 4355
4342 4356 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
4343 4357 try:
4344 4358 return hg.outgoing(ui, repo, dest, opts)
4345 4359 finally:
4346 4360 del repo._subtoppath
4347 4361
4348 4362 @command('parents',
4349 4363 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
4350 4364 ] + templateopts,
4351 4365 _('[-r REV] [FILE]'))
4352 4366 def parents(ui, repo, file_=None, **opts):
4353 4367 """show the parents of the working directory or revision
4354 4368
4355 4369 Print the working directory's parent revisions. If a revision is
4356 4370 given via -r/--rev, the parent of that revision will be printed.
4357 4371 If a file argument is given, the revision in which the file was
4358 4372 last changed (before the working directory revision or the
4359 4373 argument to --rev if given) is printed.
4360 4374
4361 4375 Returns 0 on success.
4362 4376 """
4363 4377
4364 4378 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
4365 4379
4366 4380 if file_:
4367 4381 m = scmutil.match(ctx, (file_,), opts)
4368 4382 if m.anypats() or len(m.files()) != 1:
4369 4383 raise util.Abort(_('can only specify an explicit filename'))
4370 4384 file_ = m.files()[0]
4371 4385 filenodes = []
4372 4386 for cp in ctx.parents():
4373 4387 if not cp:
4374 4388 continue
4375 4389 try:
4376 4390 filenodes.append(cp.filenode(file_))
4377 4391 except error.LookupError:
4378 4392 pass
4379 4393 if not filenodes:
4380 4394 raise util.Abort(_("'%s' not found in manifest!") % file_)
4381 4395 fl = repo.file(file_)
4382 4396 p = [repo.lookup(fl.linkrev(fl.rev(fn))) for fn in filenodes]
4383 4397 else:
4384 4398 p = [cp.node() for cp in ctx.parents()]
4385 4399
4386 4400 displayer = cmdutil.show_changeset(ui, repo, opts)
4387 4401 for n in p:
4388 4402 if n != nullid:
4389 4403 displayer.show(repo[n])
4390 4404 displayer.close()
4391 4405
4392 4406 @command('paths', [], _('[NAME]'))
4393 4407 def paths(ui, repo, search=None):
4394 4408 """show aliases for remote repositories
4395 4409
4396 4410 Show definition of symbolic path name NAME. If no name is given,
4397 4411 show definition of all available names.
4398 4412
4399 4413 Option -q/--quiet suppresses all output when searching for NAME
4400 4414 and shows only the path names when listing all definitions.
4401 4415
4402 4416 Path names are defined in the [paths] section of your
4403 4417 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
4404 4418 repository, ``.hg/hgrc`` is used, too.
4405 4419
4406 4420 The path names ``default`` and ``default-push`` have a special
4407 4421 meaning. When performing a push or pull operation, they are used
4408 4422 as fallbacks if no location is specified on the command-line.
4409 4423 When ``default-push`` is set, it will be used for push and
4410 4424 ``default`` will be used for pull; otherwise ``default`` is used
4411 4425 as the fallback for both. When cloning a repository, the clone
4412 4426 source is written as ``default`` in ``.hg/hgrc``. Note that
4413 4427 ``default`` and ``default-push`` apply to all inbound (e.g.
4414 4428 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
4415 4429 :hg:`bundle`) operations.
4416 4430
4417 4431 See :hg:`help urls` for more information.
4418 4432
4419 4433 Returns 0 on success.
4420 4434 """
4421 4435 if search:
4422 4436 for name, path in ui.configitems("paths"):
4423 4437 if name == search:
4424 4438 ui.status("%s\n" % util.hidepassword(path))
4425 4439 return
4426 4440 if not ui.quiet:
4427 4441 ui.warn(_("not found!\n"))
4428 4442 return 1
4429 4443 else:
4430 4444 for name, path in ui.configitems("paths"):
4431 4445 if ui.quiet:
4432 4446 ui.write("%s\n" % name)
4433 4447 else:
4434 4448 ui.write("%s = %s\n" % (name, util.hidepassword(path)))
4435 4449
4436 4450 @command('^phase',
4437 4451 [('p', 'public', False, _('set changeset phase to public')),
4438 4452 ('d', 'draft', False, _('set changeset phase to draft')),
4439 4453 ('s', 'secret', False, _('set changeset phase to secret')),
4440 4454 ('f', 'force', False, _('allow to move boundary backward')),
4441 4455 ('r', 'rev', [], _('target revision'), _('REV')),
4442 4456 ],
4443 4457 _('[-p|-d|-s] [-f] [-r] REV...'))
4444 4458 def phase(ui, repo, *revs, **opts):
4445 4459 """set or show the current phase name
4446 4460
4447 4461 With no argument, show the phase name of specified revisions.
4448 4462
4449 4463 With one of -p/--public, -d/--draft or -s/--secret, change the
4450 4464 phase value of the specified revisions.
4451 4465
4452 4466 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
4453 4467 lower phase to an higher phase. Phases are ordered as follows::
4454 4468
4455 4469 public < draft < secret
4456 4470
4457 4471 Return 0 on success, 1 if no phases were changed or some could not
4458 4472 be changed.
4459 4473 """
4460 4474 # search for a unique phase argument
4461 4475 targetphase = None
4462 4476 for idx, name in enumerate(phases.phasenames):
4463 4477 if opts[name]:
4464 4478 if targetphase is not None:
4465 4479 raise util.Abort(_('only one phase can be specified'))
4466 4480 targetphase = idx
4467 4481
4468 4482 # look for specified revision
4469 4483 revs = list(revs)
4470 4484 revs.extend(opts['rev'])
4471 4485 if not revs:
4472 4486 raise util.Abort(_('no revisions specified'))
4473 4487
4474 4488 revs = scmutil.revrange(repo, revs)
4475 4489
4476 4490 lock = None
4477 4491 ret = 0
4478 4492 if targetphase is None:
4479 4493 # display
4480 4494 for r in revs:
4481 4495 ctx = repo[r]
4482 4496 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
4483 4497 else:
4484 4498 lock = repo.lock()
4485 4499 try:
4486 4500 # set phase
4487 4501 if not revs:
4488 4502 raise util.Abort(_('empty revision set'))
4489 4503 nodes = [repo[r].node() for r in revs]
4490 4504 olddata = repo._phasecache.getphaserevs(repo)[:]
4491 4505 phases.advanceboundary(repo, targetphase, nodes)
4492 4506 if opts['force']:
4493 4507 phases.retractboundary(repo, targetphase, nodes)
4494 4508 finally:
4495 4509 lock.release()
4496 4510 newdata = repo._phasecache.getphaserevs(repo)
4497 4511 changes = sum(o != newdata[i] for i, o in enumerate(olddata))
4498 4512 rejected = [n for n in nodes
4499 4513 if newdata[repo[n].rev()] < targetphase]
4500 4514 if rejected:
4501 4515 ui.warn(_('cannot move %i changesets to a more permissive '
4502 4516 'phase, use --force\n') % len(rejected))
4503 4517 ret = 1
4504 4518 if changes:
4505 4519 msg = _('phase changed for %i changesets\n') % changes
4506 4520 if ret:
4507 4521 ui.status(msg)
4508 4522 else:
4509 4523 ui.note(msg)
4510 4524 else:
4511 4525 ui.warn(_('no phases changed\n'))
4512 4526 ret = 1
4513 4527 return ret
4514 4528
4515 4529 def postincoming(ui, repo, modheads, optupdate, checkout):
4516 4530 if modheads == 0:
4517 4531 return
4518 4532 if optupdate:
4519 4533 movemarkfrom = repo['.'].node()
4520 4534 try:
4521 4535 ret = hg.update(repo, checkout)
4522 4536 except util.Abort, inst:
4523 4537 ui.warn(_("not updating: %s\n") % str(inst))
4524 4538 return 0
4525 4539 if not ret and not checkout:
4526 4540 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
4527 4541 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
4528 4542 return ret
4529 4543 if modheads > 1:
4530 4544 currentbranchheads = len(repo.branchheads())
4531 4545 if currentbranchheads == modheads:
4532 4546 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
4533 4547 elif currentbranchheads > 1:
4534 4548 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
4535 4549 "merge)\n"))
4536 4550 else:
4537 4551 ui.status(_("(run 'hg heads' to see heads)\n"))
4538 4552 else:
4539 4553 ui.status(_("(run 'hg update' to get a working copy)\n"))
4540 4554
4541 4555 @command('^pull',
4542 4556 [('u', 'update', None,
4543 4557 _('update to new branch head if changesets were pulled')),
4544 4558 ('f', 'force', None, _('run even when remote repository is unrelated')),
4545 4559 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4546 4560 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4547 4561 ('b', 'branch', [], _('a specific branch you would like to pull'),
4548 4562 _('BRANCH')),
4549 4563 ] + remoteopts,
4550 4564 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
4551 4565 def pull(ui, repo, source="default", **opts):
4552 4566 """pull changes from the specified source
4553 4567
4554 4568 Pull changes from a remote repository to a local one.
4555 4569
4556 4570 This finds all changes from the repository at the specified path
4557 4571 or URL and adds them to a local repository (the current one unless
4558 4572 -R is specified). By default, this does not update the copy of the
4559 4573 project in the working directory.
4560 4574
4561 4575 Use :hg:`incoming` if you want to see what would have been added
4562 4576 by a pull at the time you issued this command. If you then decide
4563 4577 to add those changes to the repository, you should use :hg:`pull
4564 4578 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4565 4579
4566 4580 If SOURCE is omitted, the 'default' path will be used.
4567 4581 See :hg:`help urls` for more information.
4568 4582
4569 4583 Returns 0 on success, 1 if an update had unresolved files.
4570 4584 """
4571 4585 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4572 4586 other = hg.peer(repo, opts, source)
4573 4587 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4574 4588 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
4575 4589
4576 4590 if opts.get('bookmark'):
4577 4591 if not revs:
4578 4592 revs = []
4579 4593 rb = other.listkeys('bookmarks')
4580 4594 for b in opts['bookmark']:
4581 4595 if b not in rb:
4582 4596 raise util.Abort(_('remote bookmark %s not found!') % b)
4583 4597 revs.append(rb[b])
4584 4598
4585 4599 if revs:
4586 4600 try:
4587 4601 revs = [other.lookup(rev) for rev in revs]
4588 4602 except error.CapabilityError:
4589 4603 err = _("other repository doesn't support revision lookup, "
4590 4604 "so a rev cannot be specified.")
4591 4605 raise util.Abort(err)
4592 4606
4593 4607 modheads = repo.pull(other, heads=revs, force=opts.get('force'))
4594 4608 bookmarks.updatefromremote(ui, repo, other, source)
4595 4609 if checkout:
4596 4610 checkout = str(repo.changelog.rev(other.lookup(checkout)))
4597 4611 repo._subtoppath = source
4598 4612 try:
4599 4613 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
4600 4614
4601 4615 finally:
4602 4616 del repo._subtoppath
4603 4617
4604 4618 # update specified bookmarks
4605 4619 if opts.get('bookmark'):
4606 4620 for b in opts['bookmark']:
4607 4621 # explicit pull overrides local bookmark if any
4608 4622 ui.status(_("importing bookmark %s\n") % b)
4609 4623 repo._bookmarks[b] = repo[rb[b]].node()
4610 4624 bookmarks.write(repo)
4611 4625
4612 4626 return ret
4613 4627
4614 4628 @command('^push',
4615 4629 [('f', 'force', None, _('force push')),
4616 4630 ('r', 'rev', [],
4617 4631 _('a changeset intended to be included in the destination'),
4618 4632 _('REV')),
4619 4633 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4620 4634 ('b', 'branch', [],
4621 4635 _('a specific branch you would like to push'), _('BRANCH')),
4622 4636 ('', 'new-branch', False, _('allow pushing a new branch')),
4623 4637 ] + remoteopts,
4624 4638 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4625 4639 def push(ui, repo, dest=None, **opts):
4626 4640 """push changes to the specified destination
4627 4641
4628 4642 Push changesets from the local repository to the specified
4629 4643 destination.
4630 4644
4631 4645 This operation is symmetrical to pull: it is identical to a pull
4632 4646 in the destination repository from the current one.
4633 4647
4634 4648 By default, push will not allow creation of new heads at the
4635 4649 destination, since multiple heads would make it unclear which head
4636 4650 to use. In this situation, it is recommended to pull and merge
4637 4651 before pushing.
4638 4652
4639 4653 Use --new-branch if you want to allow push to create a new named
4640 4654 branch that is not present at the destination. This allows you to
4641 4655 only create a new branch without forcing other changes.
4642 4656
4643 4657 Use -f/--force to override the default behavior and push all
4644 4658 changesets on all branches.
4645 4659
4646 4660 If -r/--rev is used, the specified revision and all its ancestors
4647 4661 will be pushed to the remote repository.
4648 4662
4649 4663 If -B/--bookmark is used, the specified bookmarked revision, its
4650 4664 ancestors, and the bookmark will be pushed to the remote
4651 4665 repository.
4652 4666
4653 4667 Please see :hg:`help urls` for important details about ``ssh://``
4654 4668 URLs. If DESTINATION is omitted, a default path will be used.
4655 4669
4656 4670 Returns 0 if push was successful, 1 if nothing to push.
4657 4671 """
4658 4672
4659 4673 if opts.get('bookmark'):
4660 4674 for b in opts['bookmark']:
4661 4675 # translate -B options to -r so changesets get pushed
4662 4676 if b in repo._bookmarks:
4663 4677 opts.setdefault('rev', []).append(b)
4664 4678 else:
4665 4679 # if we try to push a deleted bookmark, translate it to null
4666 4680 # this lets simultaneous -r, -b options continue working
4667 4681 opts.setdefault('rev', []).append("null")
4668 4682
4669 4683 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4670 4684 dest, branches = hg.parseurl(dest, opts.get('branch'))
4671 4685 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4672 4686 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4673 4687 other = hg.peer(repo, opts, dest)
4674 4688 if revs:
4675 4689 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
4676 4690
4677 4691 repo._subtoppath = dest
4678 4692 try:
4679 4693 # push subrepos depth-first for coherent ordering
4680 4694 c = repo['']
4681 4695 subs = c.substate # only repos that are committed
4682 4696 for s in sorted(subs):
4683 4697 if c.sub(s).push(opts) == 0:
4684 4698 return False
4685 4699 finally:
4686 4700 del repo._subtoppath
4687 4701 result = repo.push(other, opts.get('force'), revs=revs,
4688 4702 newbranch=opts.get('new_branch'))
4689 4703
4690 4704 result = not result
4691 4705
4692 4706 if opts.get('bookmark'):
4693 4707 rb = other.listkeys('bookmarks')
4694 4708 for b in opts['bookmark']:
4695 4709 # explicit push overrides remote bookmark if any
4696 4710 if b in repo._bookmarks:
4697 4711 ui.status(_("exporting bookmark %s\n") % b)
4698 4712 new = repo[b].hex()
4699 4713 elif b in rb:
4700 4714 ui.status(_("deleting remote bookmark %s\n") % b)
4701 4715 new = '' # delete
4702 4716 else:
4703 4717 ui.warn(_('bookmark %s does not exist on the local '
4704 4718 'or remote repository!\n') % b)
4705 4719 return 2
4706 4720 old = rb.get(b, '')
4707 4721 r = other.pushkey('bookmarks', b, old, new)
4708 4722 if not r:
4709 4723 ui.warn(_('updating bookmark %s failed!\n') % b)
4710 4724 if not result:
4711 4725 result = 2
4712 4726
4713 4727 return result
4714 4728
4715 4729 @command('recover', [])
4716 4730 def recover(ui, repo):
4717 4731 """roll back an interrupted transaction
4718 4732
4719 4733 Recover from an interrupted commit or pull.
4720 4734
4721 4735 This command tries to fix the repository status after an
4722 4736 interrupted operation. It should only be necessary when Mercurial
4723 4737 suggests it.
4724 4738
4725 4739 Returns 0 if successful, 1 if nothing to recover or verify fails.
4726 4740 """
4727 4741 if repo.recover():
4728 4742 return hg.verify(repo)
4729 4743 return 1
4730 4744
4731 4745 @command('^remove|rm',
4732 4746 [('A', 'after', None, _('record delete for missing files')),
4733 4747 ('f', 'force', None,
4734 4748 _('remove (and delete) file even if added or modified')),
4735 4749 ] + walkopts,
4736 4750 _('[OPTION]... FILE...'))
4737 4751 def remove(ui, repo, *pats, **opts):
4738 4752 """remove the specified files on the next commit
4739 4753
4740 4754 Schedule the indicated files for removal from the current branch.
4741 4755
4742 4756 This command schedules the files to be removed at the next commit.
4743 4757 To undo a remove before that, see :hg:`revert`. To undo added
4744 4758 files, see :hg:`forget`.
4745 4759
4746 4760 .. container:: verbose
4747 4761
4748 4762 -A/--after can be used to remove only files that have already
4749 4763 been deleted, -f/--force can be used to force deletion, and -Af
4750 4764 can be used to remove files from the next revision without
4751 4765 deleting them from the working directory.
4752 4766
4753 4767 The following table details the behavior of remove for different
4754 4768 file states (columns) and option combinations (rows). The file
4755 4769 states are Added [A], Clean [C], Modified [M] and Missing [!]
4756 4770 (as reported by :hg:`status`). The actions are Warn, Remove
4757 4771 (from branch) and Delete (from disk):
4758 4772
4759 4773 ======= == == == ==
4760 4774 A C M !
4761 4775 ======= == == == ==
4762 4776 none W RD W R
4763 4777 -f R RD RD R
4764 4778 -A W W W R
4765 4779 -Af R R R R
4766 4780 ======= == == == ==
4767 4781
4768 4782 Note that remove never deletes files in Added [A] state from the
4769 4783 working directory, not even if option --force is specified.
4770 4784
4771 4785 Returns 0 on success, 1 if any warnings encountered.
4772 4786 """
4773 4787
4774 4788 ret = 0
4775 4789 after, force = opts.get('after'), opts.get('force')
4776 4790 if not pats and not after:
4777 4791 raise util.Abort(_('no files specified'))
4778 4792
4779 4793 m = scmutil.match(repo[None], pats, opts)
4780 4794 s = repo.status(match=m, clean=True)
4781 4795 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
4782 4796
4783 4797 for f in m.files():
4784 4798 if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
4785 4799 if os.path.exists(m.rel(f)):
4786 4800 ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
4787 4801 ret = 1
4788 4802
4789 4803 if force:
4790 4804 list = modified + deleted + clean + added
4791 4805 elif after:
4792 4806 list = deleted
4793 4807 for f in modified + added + clean:
4794 4808 ui.warn(_('not removing %s: file still exists (use -f'
4795 4809 ' to force removal)\n') % m.rel(f))
4796 4810 ret = 1
4797 4811 else:
4798 4812 list = deleted + clean
4799 4813 for f in modified:
4800 4814 ui.warn(_('not removing %s: file is modified (use -f'
4801 4815 ' to force removal)\n') % m.rel(f))
4802 4816 ret = 1
4803 4817 for f in added:
4804 4818 ui.warn(_('not removing %s: file has been marked for add'
4805 4819 ' (use forget to undo)\n') % m.rel(f))
4806 4820 ret = 1
4807 4821
4808 4822 for f in sorted(list):
4809 4823 if ui.verbose or not m.exact(f):
4810 4824 ui.status(_('removing %s\n') % m.rel(f))
4811 4825
4812 4826 wlock = repo.wlock()
4813 4827 try:
4814 4828 if not after:
4815 4829 for f in list:
4816 4830 if f in added:
4817 4831 continue # we never unlink added files on remove
4818 4832 try:
4819 4833 util.unlinkpath(repo.wjoin(f))
4820 4834 except OSError, inst:
4821 4835 if inst.errno != errno.ENOENT:
4822 4836 raise
4823 4837 repo[None].forget(list)
4824 4838 finally:
4825 4839 wlock.release()
4826 4840
4827 4841 return ret
4828 4842
4829 4843 @command('rename|move|mv',
4830 4844 [('A', 'after', None, _('record a rename that has already occurred')),
4831 4845 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4832 4846 ] + walkopts + dryrunopts,
4833 4847 _('[OPTION]... SOURCE... DEST'))
4834 4848 def rename(ui, repo, *pats, **opts):
4835 4849 """rename files; equivalent of copy + remove
4836 4850
4837 4851 Mark dest as copies of sources; mark sources for deletion. If dest
4838 4852 is a directory, copies are put in that directory. If dest is a
4839 4853 file, there can only be one source.
4840 4854
4841 4855 By default, this command copies the contents of files as they
4842 4856 exist in the working directory. If invoked with -A/--after, the
4843 4857 operation is recorded, but no copying is performed.
4844 4858
4845 4859 This command takes effect at the next commit. To undo a rename
4846 4860 before that, see :hg:`revert`.
4847 4861
4848 4862 Returns 0 on success, 1 if errors are encountered.
4849 4863 """
4850 4864 wlock = repo.wlock(False)
4851 4865 try:
4852 4866 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4853 4867 finally:
4854 4868 wlock.release()
4855 4869
4856 4870 @command('resolve',
4857 4871 [('a', 'all', None, _('select all unresolved files')),
4858 4872 ('l', 'list', None, _('list state of files needing merge')),
4859 4873 ('m', 'mark', None, _('mark files as resolved')),
4860 4874 ('u', 'unmark', None, _('mark files as unresolved')),
4861 4875 ('n', 'no-status', None, _('hide status prefix'))]
4862 4876 + mergetoolopts + walkopts,
4863 4877 _('[OPTION]... [FILE]...'))
4864 4878 def resolve(ui, repo, *pats, **opts):
4865 4879 """redo merges or set/view the merge status of files
4866 4880
4867 4881 Merges with unresolved conflicts are often the result of
4868 4882 non-interactive merging using the ``internal:merge`` configuration
4869 4883 setting, or a command-line merge tool like ``diff3``. The resolve
4870 4884 command is used to manage the files involved in a merge, after
4871 4885 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4872 4886 working directory must have two parents). See :hg:`help
4873 4887 merge-tools` for information on configuring merge tools.
4874 4888
4875 4889 The resolve command can be used in the following ways:
4876 4890
4877 4891 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4878 4892 files, discarding any previous merge attempts. Re-merging is not
4879 4893 performed for files already marked as resolved. Use ``--all/-a``
4880 4894 to select all unresolved files. ``--tool`` can be used to specify
4881 4895 the merge tool used for the given files. It overrides the HGMERGE
4882 4896 environment variable and your configuration files. Previous file
4883 4897 contents are saved with a ``.orig`` suffix.
4884 4898
4885 4899 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4886 4900 (e.g. after having manually fixed-up the files). The default is
4887 4901 to mark all unresolved files.
4888 4902
4889 4903 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4890 4904 default is to mark all resolved files.
4891 4905
4892 4906 - :hg:`resolve -l`: list files which had or still have conflicts.
4893 4907 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4894 4908
4895 4909 Note that Mercurial will not let you commit files with unresolved
4896 4910 merge conflicts. You must use :hg:`resolve -m ...` before you can
4897 4911 commit after a conflicting merge.
4898 4912
4899 4913 Returns 0 on success, 1 if any files fail a resolve attempt.
4900 4914 """
4901 4915
4902 4916 all, mark, unmark, show, nostatus = \
4903 4917 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
4904 4918
4905 4919 if (show and (mark or unmark)) or (mark and unmark):
4906 4920 raise util.Abort(_("too many options specified"))
4907 4921 if pats and all:
4908 4922 raise util.Abort(_("can't specify --all and patterns"))
4909 4923 if not (all or pats or show or mark or unmark):
4910 4924 raise util.Abort(_('no files or directories specified; '
4911 4925 'use --all to remerge all files'))
4912 4926
4913 4927 ms = mergemod.mergestate(repo)
4914 4928 m = scmutil.match(repo[None], pats, opts)
4915 4929 ret = 0
4916 4930
4917 4931 for f in ms:
4918 4932 if m(f):
4919 4933 if show:
4920 4934 if nostatus:
4921 4935 ui.write("%s\n" % f)
4922 4936 else:
4923 4937 ui.write("%s %s\n" % (ms[f].upper(), f),
4924 4938 label='resolve.' +
4925 4939 {'u': 'unresolved', 'r': 'resolved'}[ms[f]])
4926 4940 elif mark:
4927 4941 ms.mark(f, "r")
4928 4942 elif unmark:
4929 4943 ms.mark(f, "u")
4930 4944 else:
4931 4945 wctx = repo[None]
4932 4946 mctx = wctx.parents()[-1]
4933 4947
4934 4948 # backup pre-resolve (merge uses .orig for its own purposes)
4935 4949 a = repo.wjoin(f)
4936 4950 util.copyfile(a, a + ".resolve")
4937 4951
4938 4952 try:
4939 4953 # resolve file
4940 4954 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
4941 4955 if ms.resolve(f, wctx, mctx):
4942 4956 ret = 1
4943 4957 finally:
4944 4958 ui.setconfig('ui', 'forcemerge', '')
4945 4959
4946 4960 # replace filemerge's .orig file with our resolve file
4947 4961 util.rename(a + ".resolve", a + ".orig")
4948 4962
4949 4963 ms.commit()
4950 4964 return ret
4951 4965
4952 4966 @command('revert',
4953 4967 [('a', 'all', None, _('revert all changes when no arguments given')),
4954 4968 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4955 4969 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4956 4970 ('C', 'no-backup', None, _('do not save backup copies of files')),
4957 4971 ] + walkopts + dryrunopts,
4958 4972 _('[OPTION]... [-r REV] [NAME]...'))
4959 4973 def revert(ui, repo, *pats, **opts):
4960 4974 """restore files to their checkout state
4961 4975
4962 4976 .. note::
4963 4977
4964 4978 To check out earlier revisions, you should use :hg:`update REV`.
4965 4979 To cancel an uncommitted merge (and lose your changes), use
4966 4980 :hg:`update --clean .`.
4967 4981
4968 4982 With no revision specified, revert the specified files or directories
4969 4983 to the contents they had in the parent of the working directory.
4970 4984 This restores the contents of files to an unmodified
4971 4985 state and unschedules adds, removes, copies, and renames. If the
4972 4986 working directory has two parents, you must explicitly specify a
4973 4987 revision.
4974 4988
4975 4989 Using the -r/--rev or -d/--date options, revert the given files or
4976 4990 directories to their states as of a specific revision. Because
4977 4991 revert does not change the working directory parents, this will
4978 4992 cause these files to appear modified. This can be helpful to "back
4979 4993 out" some or all of an earlier change. See :hg:`backout` for a
4980 4994 related method.
4981 4995
4982 4996 Modified files are saved with a .orig suffix before reverting.
4983 4997 To disable these backups, use --no-backup.
4984 4998
4985 4999 See :hg:`help dates` for a list of formats valid for -d/--date.
4986 5000
4987 5001 Returns 0 on success.
4988 5002 """
4989 5003
4990 5004 if opts.get("date"):
4991 5005 if opts.get("rev"):
4992 5006 raise util.Abort(_("you can't specify a revision and a date"))
4993 5007 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4994 5008
4995 5009 parent, p2 = repo.dirstate.parents()
4996 5010 if not opts.get('rev') and p2 != nullid:
4997 5011 # revert after merge is a trap for new users (issue2915)
4998 5012 raise util.Abort(_('uncommitted merge with no revision specified'),
4999 5013 hint=_('use "hg update" or see "hg help revert"'))
5000 5014
5001 5015 ctx = scmutil.revsingle(repo, opts.get('rev'))
5002 5016
5003 5017 if not pats and not opts.get('all'):
5004 5018 msg = _("no files or directories specified")
5005 5019 if p2 != nullid:
5006 5020 hint = _("uncommitted merge, use --all to discard all changes,"
5007 5021 " or 'hg update -C .' to abort the merge")
5008 5022 raise util.Abort(msg, hint=hint)
5009 5023 dirty = util.any(repo.status())
5010 5024 node = ctx.node()
5011 5025 if node != parent:
5012 5026 if dirty:
5013 5027 hint = _("uncommitted changes, use --all to discard all"
5014 5028 " changes, or 'hg update %s' to update") % ctx.rev()
5015 5029 else:
5016 5030 hint = _("use --all to revert all files,"
5017 5031 " or 'hg update %s' to update") % ctx.rev()
5018 5032 elif dirty:
5019 5033 hint = _("uncommitted changes, use --all to discard all changes")
5020 5034 else:
5021 5035 hint = _("use --all to revert all files")
5022 5036 raise util.Abort(msg, hint=hint)
5023 5037
5024 5038 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
5025 5039
5026 5040 @command('rollback', dryrunopts +
5027 5041 [('f', 'force', False, _('ignore safety measures'))])
5028 5042 def rollback(ui, repo, **opts):
5029 5043 """roll back the last transaction (dangerous)
5030 5044
5031 5045 This command should be used with care. There is only one level of
5032 5046 rollback, and there is no way to undo a rollback. It will also
5033 5047 restore the dirstate at the time of the last transaction, losing
5034 5048 any dirstate changes since that time. This command does not alter
5035 5049 the working directory.
5036 5050
5037 5051 Transactions are used to encapsulate the effects of all commands
5038 5052 that create new changesets or propagate existing changesets into a
5039 5053 repository.
5040 5054
5041 5055 .. container:: verbose
5042 5056
5043 5057 For example, the following commands are transactional, and their
5044 5058 effects can be rolled back:
5045 5059
5046 5060 - commit
5047 5061 - import
5048 5062 - pull
5049 5063 - push (with this repository as the destination)
5050 5064 - unbundle
5051 5065
5052 5066 To avoid permanent data loss, rollback will refuse to rollback a
5053 5067 commit transaction if it isn't checked out. Use --force to
5054 5068 override this protection.
5055 5069
5056 5070 This command is not intended for use on public repositories. Once
5057 5071 changes are visible for pull by other users, rolling a transaction
5058 5072 back locally is ineffective (someone else may already have pulled
5059 5073 the changes). Furthermore, a race is possible with readers of the
5060 5074 repository; for example an in-progress pull from the repository
5061 5075 may fail if a rollback is performed.
5062 5076
5063 5077 Returns 0 on success, 1 if no rollback data is available.
5064 5078 """
5065 5079 return repo.rollback(dryrun=opts.get('dry_run'),
5066 5080 force=opts.get('force'))
5067 5081
5068 5082 @command('root', [])
5069 5083 def root(ui, repo):
5070 5084 """print the root (top) of the current working directory
5071 5085
5072 5086 Print the root directory of the current repository.
5073 5087
5074 5088 Returns 0 on success.
5075 5089 """
5076 5090 ui.write(repo.root + "\n")
5077 5091
5078 5092 @command('^serve',
5079 5093 [('A', 'accesslog', '', _('name of access log file to write to'),
5080 5094 _('FILE')),
5081 5095 ('d', 'daemon', None, _('run server in background')),
5082 5096 ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('NUM')),
5083 5097 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
5084 5098 # use string type, then we can check if something was passed
5085 5099 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
5086 5100 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
5087 5101 _('ADDR')),
5088 5102 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
5089 5103 _('PREFIX')),
5090 5104 ('n', 'name', '',
5091 5105 _('name to show in web pages (default: working directory)'), _('NAME')),
5092 5106 ('', 'web-conf', '',
5093 5107 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
5094 5108 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
5095 5109 _('FILE')),
5096 5110 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
5097 5111 ('', 'stdio', None, _('for remote clients')),
5098 5112 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
5099 5113 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
5100 5114 ('', 'style', '', _('template style to use'), _('STYLE')),
5101 5115 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
5102 5116 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
5103 5117 _('[OPTION]...'))
5104 5118 def serve(ui, repo, **opts):
5105 5119 """start stand-alone webserver
5106 5120
5107 5121 Start a local HTTP repository browser and pull server. You can use
5108 5122 this for ad-hoc sharing and browsing of repositories. It is
5109 5123 recommended to use a real web server to serve a repository for
5110 5124 longer periods of time.
5111 5125
5112 5126 Please note that the server does not implement access control.
5113 5127 This means that, by default, anybody can read from the server and
5114 5128 nobody can write to it by default. Set the ``web.allow_push``
5115 5129 option to ``*`` to allow everybody to push to the server. You
5116 5130 should use a real web server if you need to authenticate users.
5117 5131
5118 5132 By default, the server logs accesses to stdout and errors to
5119 5133 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
5120 5134 files.
5121 5135
5122 5136 To have the server choose a free port number to listen on, specify
5123 5137 a port number of 0; in this case, the server will print the port
5124 5138 number it uses.
5125 5139
5126 5140 Returns 0 on success.
5127 5141 """
5128 5142
5129 5143 if opts["stdio"] and opts["cmdserver"]:
5130 5144 raise util.Abort(_("cannot use --stdio with --cmdserver"))
5131 5145
5132 5146 def checkrepo():
5133 5147 if repo is None:
5134 5148 raise error.RepoError(_("there is no Mercurial repository here"
5135 5149 " (.hg not found)"))
5136 5150
5137 5151 if opts["stdio"]:
5138 5152 checkrepo()
5139 5153 s = sshserver.sshserver(ui, repo)
5140 5154 s.serve_forever()
5141 5155
5142 5156 if opts["cmdserver"]:
5143 5157 checkrepo()
5144 5158 s = commandserver.server(ui, repo, opts["cmdserver"])
5145 5159 return s.serve()
5146 5160
5147 5161 # this way we can check if something was given in the command-line
5148 5162 if opts.get('port'):
5149 5163 opts['port'] = util.getport(opts.get('port'))
5150 5164
5151 5165 baseui = repo and repo.baseui or ui
5152 5166 optlist = ("name templates style address port prefix ipv6"
5153 5167 " accesslog errorlog certificate encoding")
5154 5168 for o in optlist.split():
5155 5169 val = opts.get(o, '')
5156 5170 if val in (None, ''): # should check against default options instead
5157 5171 continue
5158 5172 baseui.setconfig("web", o, val)
5159 5173 if repo and repo.ui != baseui:
5160 5174 repo.ui.setconfig("web", o, val)
5161 5175
5162 5176 o = opts.get('web_conf') or opts.get('webdir_conf')
5163 5177 if not o:
5164 5178 if not repo:
5165 5179 raise error.RepoError(_("there is no Mercurial repository"
5166 5180 " here (.hg not found)"))
5167 5181 o = repo.root
5168 5182
5169 5183 app = hgweb.hgweb(o, baseui=ui)
5170 5184
5171 5185 class service(object):
5172 5186 def init(self):
5173 5187 util.setsignalhandler()
5174 5188 self.httpd = hgweb.server.create_server(ui, app)
5175 5189
5176 5190 if opts['port'] and not ui.verbose:
5177 5191 return
5178 5192
5179 5193 if self.httpd.prefix:
5180 5194 prefix = self.httpd.prefix.strip('/') + '/'
5181 5195 else:
5182 5196 prefix = ''
5183 5197
5184 5198 port = ':%d' % self.httpd.port
5185 5199 if port == ':80':
5186 5200 port = ''
5187 5201
5188 5202 bindaddr = self.httpd.addr
5189 5203 if bindaddr == '0.0.0.0':
5190 5204 bindaddr = '*'
5191 5205 elif ':' in bindaddr: # IPv6
5192 5206 bindaddr = '[%s]' % bindaddr
5193 5207
5194 5208 fqaddr = self.httpd.fqaddr
5195 5209 if ':' in fqaddr:
5196 5210 fqaddr = '[%s]' % fqaddr
5197 5211 if opts['port']:
5198 5212 write = ui.status
5199 5213 else:
5200 5214 write = ui.write
5201 5215 write(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
5202 5216 (fqaddr, port, prefix, bindaddr, self.httpd.port))
5203 5217
5204 5218 def run(self):
5205 5219 self.httpd.serve_forever()
5206 5220
5207 5221 service = service()
5208 5222
5209 5223 cmdutil.service(opts, initfn=service.init, runfn=service.run)
5210 5224
5211 5225 @command('showconfig|debugconfig',
5212 5226 [('u', 'untrusted', None, _('show untrusted configuration options'))],
5213 5227 _('[-u] [NAME]...'))
5214 5228 def showconfig(ui, repo, *values, **opts):
5215 5229 """show combined config settings from all hgrc files
5216 5230
5217 5231 With no arguments, print names and values of all config items.
5218 5232
5219 5233 With one argument of the form section.name, print just the value
5220 5234 of that config item.
5221 5235
5222 5236 With multiple arguments, print names and values of all config
5223 5237 items with matching section names.
5224 5238
5225 5239 With --debug, the source (filename and line number) is printed
5226 5240 for each config item.
5227 5241
5228 5242 Returns 0 on success.
5229 5243 """
5230 5244
5231 5245 for f in scmutil.rcpath():
5232 5246 ui.debug('read config from: %s\n' % f)
5233 5247 untrusted = bool(opts.get('untrusted'))
5234 5248 if values:
5235 5249 sections = [v for v in values if '.' not in v]
5236 5250 items = [v for v in values if '.' in v]
5237 5251 if len(items) > 1 or items and sections:
5238 5252 raise util.Abort(_('only one config item permitted'))
5239 5253 for section, name, value in ui.walkconfig(untrusted=untrusted):
5240 5254 value = str(value).replace('\n', '\\n')
5241 5255 sectname = section + '.' + name
5242 5256 if values:
5243 5257 for v in values:
5244 5258 if v == section:
5245 5259 ui.debug('%s: ' %
5246 5260 ui.configsource(section, name, untrusted))
5247 5261 ui.write('%s=%s\n' % (sectname, value))
5248 5262 elif v == sectname:
5249 5263 ui.debug('%s: ' %
5250 5264 ui.configsource(section, name, untrusted))
5251 5265 ui.write(value, '\n')
5252 5266 else:
5253 5267 ui.debug('%s: ' %
5254 5268 ui.configsource(section, name, untrusted))
5255 5269 ui.write('%s=%s\n' % (sectname, value))
5256 5270
5257 5271 @command('^status|st',
5258 5272 [('A', 'all', None, _('show status of all files')),
5259 5273 ('m', 'modified', None, _('show only modified files')),
5260 5274 ('a', 'added', None, _('show only added files')),
5261 5275 ('r', 'removed', None, _('show only removed files')),
5262 5276 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
5263 5277 ('c', 'clean', None, _('show only files without changes')),
5264 5278 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
5265 5279 ('i', 'ignored', None, _('show only ignored files')),
5266 5280 ('n', 'no-status', None, _('hide status prefix')),
5267 5281 ('C', 'copies', None, _('show source of copied files')),
5268 5282 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5269 5283 ('', 'rev', [], _('show difference from revision'), _('REV')),
5270 5284 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
5271 5285 ] + walkopts + subrepoopts,
5272 5286 _('[OPTION]... [FILE]...'))
5273 5287 def status(ui, repo, *pats, **opts):
5274 5288 """show changed files in the working directory
5275 5289
5276 5290 Show status of files in the repository. If names are given, only
5277 5291 files that match are shown. Files that are clean or ignored or
5278 5292 the source of a copy/move operation, are not listed unless
5279 5293 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
5280 5294 Unless options described with "show only ..." are given, the
5281 5295 options -mardu are used.
5282 5296
5283 5297 Option -q/--quiet hides untracked (unknown and ignored) files
5284 5298 unless explicitly requested with -u/--unknown or -i/--ignored.
5285 5299
5286 5300 .. note::
5287 5301 status may appear to disagree with diff if permissions have
5288 5302 changed or a merge has occurred. The standard diff format does
5289 5303 not report permission changes and diff only reports changes
5290 5304 relative to one merge parent.
5291 5305
5292 5306 If one revision is given, it is used as the base revision.
5293 5307 If two revisions are given, the differences between them are
5294 5308 shown. The --change option can also be used as a shortcut to list
5295 5309 the changed files of a revision from its first parent.
5296 5310
5297 5311 The codes used to show the status of files are::
5298 5312
5299 5313 M = modified
5300 5314 A = added
5301 5315 R = removed
5302 5316 C = clean
5303 5317 ! = missing (deleted by non-hg command, but still tracked)
5304 5318 ? = not tracked
5305 5319 I = ignored
5306 5320 = origin of the previous file listed as A (added)
5307 5321
5308 5322 .. container:: verbose
5309 5323
5310 5324 Examples:
5311 5325
5312 5326 - show changes in the working directory relative to a
5313 5327 changeset::
5314 5328
5315 5329 hg status --rev 9353
5316 5330
5317 5331 - show all changes including copies in an existing changeset::
5318 5332
5319 5333 hg status --copies --change 9353
5320 5334
5321 5335 - get a NUL separated list of added files, suitable for xargs::
5322 5336
5323 5337 hg status -an0
5324 5338
5325 5339 Returns 0 on success.
5326 5340 """
5327 5341
5328 5342 revs = opts.get('rev')
5329 5343 change = opts.get('change')
5330 5344
5331 5345 if revs and change:
5332 5346 msg = _('cannot specify --rev and --change at the same time')
5333 5347 raise util.Abort(msg)
5334 5348 elif change:
5335 5349 node2 = scmutil.revsingle(repo, change, None).node()
5336 5350 node1 = repo[node2].p1().node()
5337 5351 else:
5338 5352 node1, node2 = scmutil.revpair(repo, revs)
5339 5353
5340 5354 cwd = (pats and repo.getcwd()) or ''
5341 5355 end = opts.get('print0') and '\0' or '\n'
5342 5356 copy = {}
5343 5357 states = 'modified added removed deleted unknown ignored clean'.split()
5344 5358 show = [k for k in states if opts.get(k)]
5345 5359 if opts.get('all'):
5346 5360 show += ui.quiet and (states[:4] + ['clean']) or states
5347 5361 if not show:
5348 5362 show = ui.quiet and states[:4] or states[:5]
5349 5363
5350 5364 stat = repo.status(node1, node2, scmutil.match(repo[node2], pats, opts),
5351 5365 'ignored' in show, 'clean' in show, 'unknown' in show,
5352 5366 opts.get('subrepos'))
5353 5367 changestates = zip(states, 'MAR!?IC', stat)
5354 5368
5355 5369 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
5356 5370 copy = copies.pathcopies(repo[node1], repo[node2])
5357 5371
5358 5372 fm = ui.formatter('status', opts)
5359 5373 format = '%s %s' + end
5360 5374 if opts.get('no_status'):
5361 5375 format = '%.0s%s' + end
5362 5376
5363 5377 for state, char, files in changestates:
5364 5378 if state in show:
5365 5379 label = 'status.' + state
5366 5380 for f in files:
5367 5381 fm.startitem()
5368 5382 fm.write("status path", format, char,
5369 5383 repo.pathto(f, cwd), label=label)
5370 5384 if f in copy:
5371 5385 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
5372 5386 label='status.copied')
5373 5387 fm.end()
5374 5388
5375 5389 @command('^summary|sum',
5376 5390 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
5377 5391 def summary(ui, repo, **opts):
5378 5392 """summarize working directory state
5379 5393
5380 5394 This generates a brief summary of the working directory state,
5381 5395 including parents, branch, commit status, and available updates.
5382 5396
5383 5397 With the --remote option, this will check the default paths for
5384 5398 incoming and outgoing changes. This can be time-consuming.
5385 5399
5386 5400 Returns 0 on success.
5387 5401 """
5388 5402
5389 5403 ctx = repo[None]
5390 5404 parents = ctx.parents()
5391 5405 pnode = parents[0].node()
5392 5406 marks = []
5393 5407
5394 5408 for p in parents:
5395 5409 # label with log.changeset (instead of log.parent) since this
5396 5410 # shows a working directory parent *changeset*:
5397 5411 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
5398 5412 label='log.changeset')
5399 5413 ui.write(' '.join(p.tags()), label='log.tag')
5400 5414 if p.bookmarks():
5401 5415 marks.extend(p.bookmarks())
5402 5416 if p.rev() == -1:
5403 5417 if not len(repo):
5404 5418 ui.write(_(' (empty repository)'))
5405 5419 else:
5406 5420 ui.write(_(' (no revision checked out)'))
5407 5421 ui.write('\n')
5408 5422 if p.description():
5409 5423 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5410 5424 label='log.summary')
5411 5425
5412 5426 branch = ctx.branch()
5413 5427 bheads = repo.branchheads(branch)
5414 5428 m = _('branch: %s\n') % branch
5415 5429 if branch != 'default':
5416 5430 ui.write(m, label='log.branch')
5417 5431 else:
5418 5432 ui.status(m, label='log.branch')
5419 5433
5420 5434 if marks:
5421 5435 current = repo._bookmarkcurrent
5422 5436 ui.write(_('bookmarks:'), label='log.bookmark')
5423 5437 if current is not None:
5424 5438 try:
5425 5439 marks.remove(current)
5426 5440 ui.write(' *' + current, label='bookmarks.current')
5427 5441 except ValueError:
5428 5442 # current bookmark not in parent ctx marks
5429 5443 pass
5430 5444 for m in marks:
5431 5445 ui.write(' ' + m, label='log.bookmark')
5432 5446 ui.write('\n', label='log.bookmark')
5433 5447
5434 5448 st = list(repo.status(unknown=True))[:6]
5435 5449
5436 5450 c = repo.dirstate.copies()
5437 5451 copied, renamed = [], []
5438 5452 for d, s in c.iteritems():
5439 5453 if s in st[2]:
5440 5454 st[2].remove(s)
5441 5455 renamed.append(d)
5442 5456 else:
5443 5457 copied.append(d)
5444 5458 if d in st[1]:
5445 5459 st[1].remove(d)
5446 5460 st.insert(3, renamed)
5447 5461 st.insert(4, copied)
5448 5462
5449 5463 ms = mergemod.mergestate(repo)
5450 5464 st.append([f for f in ms if ms[f] == 'u'])
5451 5465
5452 5466 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5453 5467 st.append(subs)
5454 5468
5455 5469 labels = [ui.label(_('%d modified'), 'status.modified'),
5456 5470 ui.label(_('%d added'), 'status.added'),
5457 5471 ui.label(_('%d removed'), 'status.removed'),
5458 5472 ui.label(_('%d renamed'), 'status.copied'),
5459 5473 ui.label(_('%d copied'), 'status.copied'),
5460 5474 ui.label(_('%d deleted'), 'status.deleted'),
5461 5475 ui.label(_('%d unknown'), 'status.unknown'),
5462 5476 ui.label(_('%d ignored'), 'status.ignored'),
5463 5477 ui.label(_('%d unresolved'), 'resolve.unresolved'),
5464 5478 ui.label(_('%d subrepos'), 'status.modified')]
5465 5479 t = []
5466 5480 for s, l in zip(st, labels):
5467 5481 if s:
5468 5482 t.append(l % len(s))
5469 5483
5470 5484 t = ', '.join(t)
5471 5485 cleanworkdir = False
5472 5486
5473 5487 if len(parents) > 1:
5474 5488 t += _(' (merge)')
5475 5489 elif branch != parents[0].branch():
5476 5490 t += _(' (new branch)')
5477 5491 elif (parents[0].closesbranch() and
5478 5492 pnode in repo.branchheads(branch, closed=True)):
5479 5493 t += _(' (head closed)')
5480 5494 elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]):
5481 5495 t += _(' (clean)')
5482 5496 cleanworkdir = True
5483 5497 elif pnode not in bheads:
5484 5498 t += _(' (new branch head)')
5485 5499
5486 5500 if cleanworkdir:
5487 5501 ui.status(_('commit: %s\n') % t.strip())
5488 5502 else:
5489 5503 ui.write(_('commit: %s\n') % t.strip())
5490 5504
5491 5505 # all ancestors of branch heads - all ancestors of parent = new csets
5492 5506 new = [0] * len(repo)
5493 5507 cl = repo.changelog
5494 5508 for a in [cl.rev(n) for n in bheads]:
5495 5509 new[a] = 1
5496 5510 for a in cl.ancestors([cl.rev(n) for n in bheads]):
5497 5511 new[a] = 1
5498 5512 for a in [p.rev() for p in parents]:
5499 5513 if a >= 0:
5500 5514 new[a] = 0
5501 5515 for a in cl.ancestors([p.rev() for p in parents]):
5502 5516 new[a] = 0
5503 5517 new = sum(new)
5504 5518
5505 5519 if new == 0:
5506 5520 ui.status(_('update: (current)\n'))
5507 5521 elif pnode not in bheads:
5508 5522 ui.write(_('update: %d new changesets (update)\n') % new)
5509 5523 else:
5510 5524 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5511 5525 (new, len(bheads)))
5512 5526
5513 5527 if opts.get('remote'):
5514 5528 t = []
5515 5529 source, branches = hg.parseurl(ui.expandpath('default'))
5516 5530 other = hg.peer(repo, {}, source)
5517 5531 revs, checkout = hg.addbranchrevs(repo, other, branches,
5518 5532 opts.get('rev'))
5519 5533 ui.debug('comparing with %s\n' % util.hidepassword(source))
5520 5534 repo.ui.pushbuffer()
5521 5535 commoninc = discovery.findcommonincoming(repo, other)
5522 5536 _common, incoming, _rheads = commoninc
5523 5537 repo.ui.popbuffer()
5524 5538 if incoming:
5525 5539 t.append(_('1 or more incoming'))
5526 5540
5527 5541 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5528 5542 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5529 5543 if source != dest:
5530 5544 other = hg.peer(repo, {}, dest)
5531 5545 commoninc = None
5532 5546 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5533 5547 repo.ui.pushbuffer()
5534 5548 outgoing = discovery.findcommonoutgoing(repo, other,
5535 5549 commoninc=commoninc)
5536 5550 repo.ui.popbuffer()
5537 5551 o = outgoing.missing
5538 5552 if o:
5539 5553 t.append(_('%d outgoing') % len(o))
5540 5554 if 'bookmarks' in other.listkeys('namespaces'):
5541 5555 lmarks = repo.listkeys('bookmarks')
5542 5556 rmarks = other.listkeys('bookmarks')
5543 5557 diff = set(rmarks) - set(lmarks)
5544 5558 if len(diff) > 0:
5545 5559 t.append(_('%d incoming bookmarks') % len(diff))
5546 5560 diff = set(lmarks) - set(rmarks)
5547 5561 if len(diff) > 0:
5548 5562 t.append(_('%d outgoing bookmarks') % len(diff))
5549 5563
5550 5564 if t:
5551 5565 ui.write(_('remote: %s\n') % (', '.join(t)))
5552 5566 else:
5553 5567 ui.status(_('remote: (synced)\n'))
5554 5568
5555 5569 @command('tag',
5556 5570 [('f', 'force', None, _('force tag')),
5557 5571 ('l', 'local', None, _('make the tag local')),
5558 5572 ('r', 'rev', '', _('revision to tag'), _('REV')),
5559 5573 ('', 'remove', None, _('remove a tag')),
5560 5574 # -l/--local is already there, commitopts cannot be used
5561 5575 ('e', 'edit', None, _('edit commit message')),
5562 5576 ('m', 'message', '', _('use <text> as commit message'), _('TEXT')),
5563 5577 ] + commitopts2,
5564 5578 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5565 5579 def tag(ui, repo, name1, *names, **opts):
5566 5580 """add one or more tags for the current or given revision
5567 5581
5568 5582 Name a particular revision using <name>.
5569 5583
5570 5584 Tags are used to name particular revisions of the repository and are
5571 5585 very useful to compare different revisions, to go back to significant
5572 5586 earlier versions or to mark branch points as releases, etc. Changing
5573 5587 an existing tag is normally disallowed; use -f/--force to override.
5574 5588
5575 5589 If no revision is given, the parent of the working directory is
5576 5590 used, or tip if no revision is checked out.
5577 5591
5578 5592 To facilitate version control, distribution, and merging of tags,
5579 5593 they are stored as a file named ".hgtags" which is managed similarly
5580 5594 to other project files and can be hand-edited if necessary. This
5581 5595 also means that tagging creates a new commit. The file
5582 5596 ".hg/localtags" is used for local tags (not shared among
5583 5597 repositories).
5584 5598
5585 5599 Tag commits are usually made at the head of a branch. If the parent
5586 5600 of the working directory is not a branch head, :hg:`tag` aborts; use
5587 5601 -f/--force to force the tag commit to be based on a non-head
5588 5602 changeset.
5589 5603
5590 5604 See :hg:`help dates` for a list of formats valid for -d/--date.
5591 5605
5592 5606 Since tag names have priority over branch names during revision
5593 5607 lookup, using an existing branch name as a tag name is discouraged.
5594 5608
5595 5609 Returns 0 on success.
5596 5610 """
5597 5611 wlock = lock = None
5598 5612 try:
5599 5613 wlock = repo.wlock()
5600 5614 lock = repo.lock()
5601 5615 rev_ = "."
5602 5616 names = [t.strip() for t in (name1,) + names]
5603 5617 if len(names) != len(set(names)):
5604 5618 raise util.Abort(_('tag names must be unique'))
5605 5619 for n in names:
5606 5620 if n in ['tip', '.', 'null']:
5607 5621 raise util.Abort(_("the name '%s' is reserved") % n)
5608 5622 if not n:
5609 5623 raise util.Abort(_('tag names cannot consist entirely of '
5610 5624 'whitespace'))
5611 5625 if opts.get('rev') and opts.get('remove'):
5612 5626 raise util.Abort(_("--rev and --remove are incompatible"))
5613 5627 if opts.get('rev'):
5614 5628 rev_ = opts['rev']
5615 5629 message = opts.get('message')
5616 5630 if opts.get('remove'):
5617 5631 expectedtype = opts.get('local') and 'local' or 'global'
5618 5632 for n in names:
5619 5633 if not repo.tagtype(n):
5620 5634 raise util.Abort(_("tag '%s' does not exist") % n)
5621 5635 if repo.tagtype(n) != expectedtype:
5622 5636 if expectedtype == 'global':
5623 5637 raise util.Abort(_("tag '%s' is not a global tag") % n)
5624 5638 else:
5625 5639 raise util.Abort(_("tag '%s' is not a local tag") % n)
5626 5640 rev_ = nullid
5627 5641 if not message:
5628 5642 # we don't translate commit messages
5629 5643 message = 'Removed tag %s' % ', '.join(names)
5630 5644 elif not opts.get('force'):
5631 5645 for n in names:
5632 5646 if n in repo.tags():
5633 5647 raise util.Abort(_("tag '%s' already exists "
5634 5648 "(use -f to force)") % n)
5635 5649 if not opts.get('local'):
5636 5650 p1, p2 = repo.dirstate.parents()
5637 5651 if p2 != nullid:
5638 5652 raise util.Abort(_('uncommitted merge'))
5639 5653 bheads = repo.branchheads()
5640 5654 if not opts.get('force') and bheads and p1 not in bheads:
5641 5655 raise util.Abort(_('not at a branch head (use -f to force)'))
5642 5656 r = scmutil.revsingle(repo, rev_).node()
5643 5657
5644 5658 if not message:
5645 5659 # we don't translate commit messages
5646 5660 message = ('Added tag %s for changeset %s' %
5647 5661 (', '.join(names), short(r)))
5648 5662
5649 5663 date = opts.get('date')
5650 5664 if date:
5651 5665 date = util.parsedate(date)
5652 5666
5653 5667 if opts.get('edit'):
5654 5668 message = ui.edit(message, ui.username())
5655 5669
5656 5670 # don't allow tagging the null rev
5657 5671 if (not opts.get('remove') and
5658 5672 scmutil.revsingle(repo, rev_).rev() == nullrev):
5659 5673 raise util.Abort(_("null revision specified"))
5660 5674
5661 5675 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date)
5662 5676 finally:
5663 5677 release(lock, wlock)
5664 5678
5665 5679 @command('tags', [], '')
5666 5680 def tags(ui, repo):
5667 5681 """list repository tags
5668 5682
5669 5683 This lists both regular and local tags. When the -v/--verbose
5670 5684 switch is used, a third column "local" is printed for local tags.
5671 5685
5672 5686 Returns 0 on success.
5673 5687 """
5674 5688
5675 5689 hexfunc = ui.debugflag and hex or short
5676 5690 tagtype = ""
5677 5691
5678 5692 for t, n in reversed(repo.tagslist()):
5679 5693 if ui.quiet:
5680 5694 ui.write("%s\n" % t, label='tags.normal')
5681 5695 continue
5682 5696
5683 5697 hn = hexfunc(n)
5684 5698 r = "%5d:%s" % (repo.changelog.rev(n), hn)
5685 5699 rev = ui.label(r, 'log.changeset')
5686 5700 spaces = " " * (30 - encoding.colwidth(t))
5687 5701
5688 5702 tag = ui.label(t, 'tags.normal')
5689 5703 if ui.verbose:
5690 5704 if repo.tagtype(t) == 'local':
5691 5705 tagtype = " local"
5692 5706 tag = ui.label(t, 'tags.local')
5693 5707 else:
5694 5708 tagtype = ""
5695 5709 ui.write("%s%s %s%s\n" % (tag, spaces, rev, tagtype))
5696 5710
5697 5711 @command('tip',
5698 5712 [('p', 'patch', None, _('show patch')),
5699 5713 ('g', 'git', None, _('use git extended diff format')),
5700 5714 ] + templateopts,
5701 5715 _('[-p] [-g]'))
5702 5716 def tip(ui, repo, **opts):
5703 5717 """show the tip revision
5704 5718
5705 5719 The tip revision (usually just called the tip) is the changeset
5706 5720 most recently added to the repository (and therefore the most
5707 5721 recently changed head).
5708 5722
5709 5723 If you have just made a commit, that commit will be the tip. If
5710 5724 you have just pulled changes from another repository, the tip of
5711 5725 that repository becomes the current tip. The "tip" tag is special
5712 5726 and cannot be renamed or assigned to a different changeset.
5713 5727
5714 5728 Returns 0 on success.
5715 5729 """
5716 5730 displayer = cmdutil.show_changeset(ui, repo, opts)
5717 5731 displayer.show(repo[len(repo) - 1])
5718 5732 displayer.close()
5719 5733
5720 5734 @command('unbundle',
5721 5735 [('u', 'update', None,
5722 5736 _('update to new branch head if changesets were unbundled'))],
5723 5737 _('[-u] FILE...'))
5724 5738 def unbundle(ui, repo, fname1, *fnames, **opts):
5725 5739 """apply one or more changegroup files
5726 5740
5727 5741 Apply one or more compressed changegroup files generated by the
5728 5742 bundle command.
5729 5743
5730 5744 Returns 0 on success, 1 if an update has unresolved files.
5731 5745 """
5732 5746 fnames = (fname1,) + fnames
5733 5747
5734 5748 lock = repo.lock()
5735 5749 wc = repo['.']
5736 5750 try:
5737 5751 for fname in fnames:
5738 5752 f = url.open(ui, fname)
5739 5753 gen = changegroup.readbundle(f, fname)
5740 5754 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname)
5741 5755 finally:
5742 5756 lock.release()
5743 5757 bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch())
5744 5758 return postincoming(ui, repo, modheads, opts.get('update'), None)
5745 5759
5746 5760 @command('^update|up|checkout|co',
5747 5761 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5748 5762 ('c', 'check', None,
5749 5763 _('update across branches if no uncommitted changes')),
5750 5764 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5751 5765 ('r', 'rev', '', _('revision'), _('REV'))],
5752 5766 _('[-c] [-C] [-d DATE] [[-r] REV]'))
5753 5767 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False):
5754 5768 """update working directory (or switch revisions)
5755 5769
5756 5770 Update the repository's working directory to the specified
5757 5771 changeset. If no changeset is specified, update to the tip of the
5758 5772 current named branch and move the current bookmark (see :hg:`help
5759 5773 bookmarks`).
5760 5774
5761 5775 Update sets the working directory's parent revison to the specified
5762 5776 changeset (see :hg:`help parents`).
5763 5777
5764 5778 If the changeset is not a descendant or ancestor of the working
5765 5779 directory's parent, the update is aborted. With the -c/--check
5766 5780 option, the working directory is checked for uncommitted changes; if
5767 5781 none are found, the working directory is updated to the specified
5768 5782 changeset.
5769 5783
5770 5784 .. container:: verbose
5771 5785
5772 5786 The following rules apply when the working directory contains
5773 5787 uncommitted changes:
5774 5788
5775 5789 1. If neither -c/--check nor -C/--clean is specified, and if
5776 5790 the requested changeset is an ancestor or descendant of
5777 5791 the working directory's parent, the uncommitted changes
5778 5792 are merged into the requested changeset and the merged
5779 5793 result is left uncommitted. If the requested changeset is
5780 5794 not an ancestor or descendant (that is, it is on another
5781 5795 branch), the update is aborted and the uncommitted changes
5782 5796 are preserved.
5783 5797
5784 5798 2. With the -c/--check option, the update is aborted and the
5785 5799 uncommitted changes are preserved.
5786 5800
5787 5801 3. With the -C/--clean option, uncommitted changes are discarded and
5788 5802 the working directory is updated to the requested changeset.
5789 5803
5790 5804 To cancel an uncommitted merge (and lose your changes), use
5791 5805 :hg:`update --clean .`.
5792 5806
5793 5807 Use null as the changeset to remove the working directory (like
5794 5808 :hg:`clone -U`).
5795 5809
5796 5810 If you want to revert just one file to an older revision, use
5797 5811 :hg:`revert [-r REV] NAME`.
5798 5812
5799 5813 See :hg:`help dates` for a list of formats valid for -d/--date.
5800 5814
5801 5815 Returns 0 on success, 1 if there are unresolved files.
5802 5816 """
5803 5817 if rev and node:
5804 5818 raise util.Abort(_("please specify just one revision"))
5805 5819
5806 5820 if rev is None or rev == '':
5807 5821 rev = node
5808 5822
5809 5823 # with no argument, we also move the current bookmark, if any
5810 5824 movemarkfrom = None
5811 5825 if rev is None or node == '':
5812 5826 movemarkfrom = repo['.'].node()
5813 5827
5814 5828 # if we defined a bookmark, we have to remember the original bookmark name
5815 5829 brev = rev
5816 5830 rev = scmutil.revsingle(repo, rev, rev).rev()
5817 5831
5818 5832 if check and clean:
5819 5833 raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
5820 5834
5821 5835 if date:
5822 5836 if rev is not None:
5823 5837 raise util.Abort(_("you can't specify a revision and a date"))
5824 5838 rev = cmdutil.finddate(ui, repo, date)
5825 5839
5826 5840 if check:
5827 5841 c = repo[None]
5828 5842 if c.dirty(merge=False, branch=False):
5829 5843 raise util.Abort(_("uncommitted local changes"))
5830 5844 if rev is None:
5831 5845 rev = repo[repo[None].branch()].rev()
5832 5846 mergemod._checkunknown(repo, repo[None], repo[rev])
5833 5847
5834 5848 if clean:
5835 5849 ret = hg.clean(repo, rev)
5836 5850 else:
5837 5851 ret = hg.update(repo, rev)
5838 5852
5839 5853 if not ret and movemarkfrom:
5840 5854 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
5841 5855 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
5842 5856 elif brev in repo._bookmarks:
5843 5857 bookmarks.setcurrent(repo, brev)
5844 5858 elif brev:
5845 5859 bookmarks.unsetcurrent(repo)
5846 5860
5847 5861 return ret
5848 5862
5849 5863 @command('verify', [])
5850 5864 def verify(ui, repo):
5851 5865 """verify the integrity of the repository
5852 5866
5853 5867 Verify the integrity of the current repository.
5854 5868
5855 5869 This will perform an extensive check of the repository's
5856 5870 integrity, validating the hashes and checksums of each entry in
5857 5871 the changelog, manifest, and tracked files, as well as the
5858 5872 integrity of their crosslinks and indices.
5859 5873
5860 5874 Returns 0 on success, 1 if errors are encountered.
5861 5875 """
5862 5876 return hg.verify(repo)
5863 5877
5864 5878 @command('version', [])
5865 5879 def version_(ui):
5866 5880 """output version and copyright information"""
5867 5881 ui.write(_("Mercurial Distributed SCM (version %s)\n")
5868 5882 % util.version())
5869 5883 ui.status(_(
5870 5884 "(see http://mercurial.selenic.com for more information)\n"
5871 5885 "\nCopyright (C) 2005-2012 Matt Mackall and others\n"
5872 5886 "This is free software; see the source for copying conditions. "
5873 5887 "There is NO\nwarranty; "
5874 5888 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5875 5889 ))
5876 5890
5877 5891 norepo = ("clone init version help debugcommands debugcomplete"
5878 5892 " debugdate debuginstall debugfsinfo debugpushkey debugwireargs"
5879 5893 " debugknown debuggetbundle debugbundle")
5880 5894 optionalrepo = ("identify paths serve showconfig debugancestor debugdag"
5881 5895 " debugdata debugindex debugindexdot debugrevlog")
@@ -1,473 +1,479 b''
1 1 $ cat >> $HGRCPATH << EOF
2 2 > [extensions]
3 3 > graphlog=
4 4 > [phases]
5 5 > # public changeset are not obsolete
6 6 > publish=false
7 7 > EOF
8 8 $ mkcommit() {
9 9 > echo "$1" > "$1"
10 10 > hg add "$1"
11 11 > hg ci -m "add $1"
12 12 > }
13 13 $ getid() {
14 14 > hg id --debug -ir "desc('$1')"
15 15 > }
16 16
17 17 $ cat > debugkeys.py <<EOF
18 18 > def reposetup(ui, repo):
19 19 > class debugkeysrepo(repo.__class__):
20 20 > def listkeys(self, namespace):
21 21 > ui.write('listkeys %s\n' % (namespace,))
22 22 > return super(debugkeysrepo, self).listkeys(namespace)
23 23 >
24 24 > if repo.local():
25 25 > repo.__class__ = debugkeysrepo
26 26 > EOF
27 27
28 28 $ hg init tmpa
29 29 $ cd tmpa
30 30
31 31 Killing a single changeset without replacement
32 32
33 33 $ mkcommit kill_me
34 $ hg debugobsolete 0
35 abort: changeset references must be full hexadecimal node identifiers
36 [255]
37 $ hg debugobsolete '00'
38 abort: changeset references must be full hexadecimal node identifiers
39 [255]
34 40 $ hg debugobsolete -d '0 0' `getid kill_me` -u babar
35 41 $ hg debugobsolete
36 42 97b7c2d76b1845ed3eb988cd612611e72406cef0 0 {'date': '0 0', 'user': 'babar'}
37 43 $ cd ..
38 44
39 45 Killing a single changeset with replacement
40 46
41 47 $ hg init tmpb
42 48 $ cd tmpb
43 49 $ mkcommit a
44 50 $ mkcommit b
45 51 $ mkcommit original_c
46 52 $ hg up "desc('b')"
47 53 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
48 54 $ mkcommit new_c
49 55 created new head
50 56 $ hg debugobsolete `getid original_c` `getid new_c` -d '56 12'
51 57 $ hg debugobsolete
52 58 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f 0 {'date': '56 12', 'user': 'test'}
53 59
54 60 do it again (it read the obsstore before adding new changeset)
55 61
56 62 $ hg up '.^'
57 63 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
58 64 $ mkcommit new_2_c
59 65 created new head
60 66 $ hg debugobsolete -d '1337 0' `getid new_c` `getid new_2_c`
61 67 $ hg debugobsolete
62 68 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f 0 {'date': '56 12', 'user': 'test'}
63 69 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
64 70
65 71 Register two markers with a missing node
66 72
67 73 $ hg up '.^'
68 74 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
69 75 $ mkcommit new_3_c
70 76 created new head
71 77 $ hg debugobsolete -d '1338 0' `getid new_2_c` 1337133713371337133713371337133713371337
72 78 $ hg debugobsolete -d '1339 0' 1337133713371337133713371337133713371337 `getid new_3_c`
73 79 $ hg debugobsolete
74 80 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f 0 {'date': '56 12', 'user': 'test'}
75 81 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
76 82 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
77 83 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}
78 84
79 85 Check that graphlog detect that a changeset is obsolete:
80 86
81 87 $ hg glog
82 88 @ changeset: 5:5601fb93a350
83 89 | tag: tip
84 90 | parent: 1:7c3bad9141dc
85 91 | user: test
86 92 | date: Thu Jan 01 00:00:00 1970 +0000
87 93 | summary: add new_3_c
88 94 |
89 95 o changeset: 1:7c3bad9141dc
90 96 | user: test
91 97 | date: Thu Jan 01 00:00:00 1970 +0000
92 98 | summary: add b
93 99 |
94 100 o changeset: 0:1f0dee641bb7
95 101 user: test
96 102 date: Thu Jan 01 00:00:00 1970 +0000
97 103 summary: add a
98 104
99 105
100 106 Check that public changeset are not accounted as obsolete:
101 107
102 108 $ hg phase --public 2
103 109 $ hg --config 'extensions.graphlog=' glog
104 110 @ changeset: 5:5601fb93a350
105 111 | tag: tip
106 112 | parent: 1:7c3bad9141dc
107 113 | user: test
108 114 | date: Thu Jan 01 00:00:00 1970 +0000
109 115 | summary: add new_3_c
110 116 |
111 117 | o changeset: 2:245bde4270cd
112 118 |/ user: test
113 119 | date: Thu Jan 01 00:00:00 1970 +0000
114 120 | summary: add original_c
115 121 |
116 122 o changeset: 1:7c3bad9141dc
117 123 | user: test
118 124 | date: Thu Jan 01 00:00:00 1970 +0000
119 125 | summary: add b
120 126 |
121 127 o changeset: 0:1f0dee641bb7
122 128 user: test
123 129 date: Thu Jan 01 00:00:00 1970 +0000
124 130 summary: add a
125 131
126 132
127 133 $ cd ..
128 134
129 135 Exchange Test
130 136 ============================
131 137
132 138 Destination repo does not have any data
133 139 ---------------------------------------
134 140
135 141 Try to pull markers
136 142 (extinct changeset are excluded but marker are pushed)
137 143
138 144 $ hg init tmpc
139 145 $ cd tmpc
140 146 $ hg pull ../tmpb
141 147 pulling from ../tmpb
142 148 requesting all changes
143 149 adding changesets
144 150 adding manifests
145 151 adding file changes
146 152 added 4 changesets with 4 changes to 4 files (+1 heads)
147 153 (run 'hg heads' to see heads, 'hg merge' to merge)
148 154 $ hg debugobsolete
149 155 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f 0 {'date': '56 12', 'user': 'test'}
150 156 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
151 157 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
152 158 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}
153 159
154 160 Rollback//Transaction support
155 161
156 162 $ hg debugobsolete -d '1340 0' aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
157 163 $ hg debugobsolete
158 164 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f 0 {'date': '56 12', 'user': 'test'}
159 165 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
160 166 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
161 167 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}
162 168 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 {'date': '1340 0', 'user': 'test'}
163 169 $ hg rollback -n
164 170 repository tip rolled back to revision 3 (undo debugobsolete)
165 171 $ hg rollback
166 172 repository tip rolled back to revision 3 (undo debugobsolete)
167 173 $ hg debugobsolete
168 174 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f 0 {'date': '56 12', 'user': 'test'}
169 175 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
170 176 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
171 177 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}
172 178
173 179 $ cd ..
174 180
175 181 Try to pull markers
176 182
177 183 $ hg init tmpd
178 184 $ hg -R tmpb push tmpd
179 185 pushing to tmpd
180 186 searching for changes
181 187 adding changesets
182 188 adding manifests
183 189 adding file changes
184 190 added 4 changesets with 4 changes to 4 files (+1 heads)
185 191 $ hg -R tmpd debugobsolete
186 192 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f 0 {'date': '56 12', 'user': 'test'}
187 193 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
188 194 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
189 195 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}
190 196
191 197 Check obsolete keys are exchanged only if source has an obsolete store
192 198
193 199 $ hg init empty
194 200 $ hg --config extensions.debugkeys=debugkeys.py -R empty push tmpd
195 201 pushing to tmpd
196 202 no changes found
197 203 listkeys phases
198 204 listkeys bookmarks
199 205 [1]
200 206
201 207 clone support
202 208 (markers are copied and extinct changesets are included to allow hardlinks)
203 209
204 210 $ hg clone tmpb clone-dest
205 211 updating to branch default
206 212 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
207 213 $ hg -R clone-dest log -G --hidden
208 214 @ changeset: 5:5601fb93a350
209 215 | tag: tip
210 216 | parent: 1:7c3bad9141dc
211 217 | user: test
212 218 | date: Thu Jan 01 00:00:00 1970 +0000
213 219 | summary: add new_3_c
214 220 |
215 221 | x changeset: 4:ca819180edb9
216 222 |/ parent: 1:7c3bad9141dc
217 223 | user: test
218 224 | date: Thu Jan 01 00:00:00 1970 +0000
219 225 | summary: add new_2_c
220 226 |
221 227 | x changeset: 3:cdbce2fbb163
222 228 |/ parent: 1:7c3bad9141dc
223 229 | user: test
224 230 | date: Thu Jan 01 00:00:00 1970 +0000
225 231 | summary: add new_c
226 232 |
227 233 | o changeset: 2:245bde4270cd
228 234 |/ user: test
229 235 | date: Thu Jan 01 00:00:00 1970 +0000
230 236 | summary: add original_c
231 237 |
232 238 o changeset: 1:7c3bad9141dc
233 239 | user: test
234 240 | date: Thu Jan 01 00:00:00 1970 +0000
235 241 | summary: add b
236 242 |
237 243 o changeset: 0:1f0dee641bb7
238 244 user: test
239 245 date: Thu Jan 01 00:00:00 1970 +0000
240 246 summary: add a
241 247
242 248 $ hg -R clone-dest debugobsolete
243 249 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f 0 {'date': '56 12', 'user': 'test'}
244 250 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
245 251 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
246 252 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}
247 253
248 254
249 255 Destination repo have existing data
250 256 ---------------------------------------
251 257
252 258 On pull
253 259
254 260 $ hg init tmpe
255 261 $ cd tmpe
256 262 $ hg debugobsolete -d '1339 0' 2448244824482448244824482448244824482448 1339133913391339133913391339133913391339
257 263 $ hg pull ../tmpb
258 264 pulling from ../tmpb
259 265 requesting all changes
260 266 adding changesets
261 267 adding manifests
262 268 adding file changes
263 269 added 4 changesets with 4 changes to 4 files (+1 heads)
264 270 (run 'hg heads' to see heads, 'hg merge' to merge)
265 271 $ hg debugobsolete
266 272 2448244824482448244824482448244824482448 1339133913391339133913391339133913391339 0 {'date': '1339 0', 'user': 'test'}
267 273 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f 0 {'date': '56 12', 'user': 'test'}
268 274 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
269 275 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
270 276 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}
271 277
272 278
273 279 On push
274 280
275 281 $ hg push ../tmpc
276 282 pushing to ../tmpc
277 283 searching for changes
278 284 no changes found
279 285 [1]
280 286 $ hg -R ../tmpc debugobsolete
281 287 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f 0 {'date': '56 12', 'user': 'test'}
282 288 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
283 289 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
284 290 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}
285 291 2448244824482448244824482448244824482448 1339133913391339133913391339133913391339 0 {'date': '1339 0', 'user': 'test'}
286 292
287 293 detect outgoing obsolete and unstable
288 294 ---------------------------------------
289 295
290 296
291 297 $ hg glog
292 298 o changeset: 3:5601fb93a350
293 299 | tag: tip
294 300 | parent: 1:7c3bad9141dc
295 301 | user: test
296 302 | date: Thu Jan 01 00:00:00 1970 +0000
297 303 | summary: add new_3_c
298 304 |
299 305 | o changeset: 2:245bde4270cd
300 306 |/ user: test
301 307 | date: Thu Jan 01 00:00:00 1970 +0000
302 308 | summary: add original_c
303 309 |
304 310 o changeset: 1:7c3bad9141dc
305 311 | user: test
306 312 | date: Thu Jan 01 00:00:00 1970 +0000
307 313 | summary: add b
308 314 |
309 315 o changeset: 0:1f0dee641bb7
310 316 user: test
311 317 date: Thu Jan 01 00:00:00 1970 +0000
312 318 summary: add a
313 319
314 320 $ hg up 'desc("new_3_c")'
315 321 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
316 322 $ mkcommit original_d
317 323 $ mkcommit original_e
318 324 $ hg debugobsolete `getid original_d` -d '0 0'
319 325 $ hg log -r 'obsolete()'
320 326 changeset: 4:7c694bff0650
321 327 user: test
322 328 date: Thu Jan 01 00:00:00 1970 +0000
323 329 summary: add original_d
324 330
325 331 $ hg glog -r '::unstable()'
326 332 @ changeset: 5:6e572121998e
327 333 | tag: tip
328 334 | user: test
329 335 | date: Thu Jan 01 00:00:00 1970 +0000
330 336 | summary: add original_e
331 337 |
332 338 x changeset: 4:7c694bff0650
333 339 | user: test
334 340 | date: Thu Jan 01 00:00:00 1970 +0000
335 341 | summary: add original_d
336 342 |
337 343 o changeset: 3:5601fb93a350
338 344 | parent: 1:7c3bad9141dc
339 345 | user: test
340 346 | date: Thu Jan 01 00:00:00 1970 +0000
341 347 | summary: add new_3_c
342 348 |
343 349 o changeset: 1:7c3bad9141dc
344 350 | user: test
345 351 | date: Thu Jan 01 00:00:00 1970 +0000
346 352 | summary: add b
347 353 |
348 354 o changeset: 0:1f0dee641bb7
349 355 user: test
350 356 date: Thu Jan 01 00:00:00 1970 +0000
351 357 summary: add a
352 358
353 359
354 360 refuse to push obsolete changeset
355 361
356 362 $ hg push ../tmpc/ -r 'desc("original_d")'
357 363 pushing to ../tmpc/
358 364 searching for changes
359 365 abort: push includes an obsolete changeset: 7c694bff0650!
360 366 [255]
361 367
362 368 refuse to push unstable changeset
363 369
364 370 $ hg push ../tmpc/
365 371 pushing to ../tmpc/
366 372 searching for changes
367 373 abort: push includes an unstable changeset: 6e572121998e!
368 374 [255]
369 375
370 376 Test that extinct changeset are properly detected
371 377
372 378 $ hg log -r 'extinct()'
373 379
374 380 Don't try to push extinct changeset
375 381
376 382 $ hg init ../tmpf
377 383 $ hg out ../tmpf
378 384 comparing with ../tmpf
379 385 searching for changes
380 386 changeset: 0:1f0dee641bb7
381 387 user: test
382 388 date: Thu Jan 01 00:00:00 1970 +0000
383 389 summary: add a
384 390
385 391 changeset: 1:7c3bad9141dc
386 392 user: test
387 393 date: Thu Jan 01 00:00:00 1970 +0000
388 394 summary: add b
389 395
390 396 changeset: 2:245bde4270cd
391 397 user: test
392 398 date: Thu Jan 01 00:00:00 1970 +0000
393 399 summary: add original_c
394 400
395 401 changeset: 3:5601fb93a350
396 402 parent: 1:7c3bad9141dc
397 403 user: test
398 404 date: Thu Jan 01 00:00:00 1970 +0000
399 405 summary: add new_3_c
400 406
401 407 changeset: 4:7c694bff0650
402 408 user: test
403 409 date: Thu Jan 01 00:00:00 1970 +0000
404 410 summary: add original_d
405 411
406 412 changeset: 5:6e572121998e
407 413 tag: tip
408 414 user: test
409 415 date: Thu Jan 01 00:00:00 1970 +0000
410 416 summary: add original_e
411 417
412 418 $ hg push ../tmpf -f # -f because be push unstable too
413 419 pushing to ../tmpf
414 420 searching for changes
415 421 adding changesets
416 422 adding manifests
417 423 adding file changes
418 424 added 6 changesets with 6 changes to 6 files (+1 heads)
419 425
420 426 no warning displayed
421 427
422 428 $ hg push ../tmpf
423 429 pushing to ../tmpf
424 430 searching for changes
425 431 no changes found
426 432 [1]
427 433
428 434 Do not warn about new head when the new head is a successors of a remote one
429 435
430 436 $ hg glog
431 437 @ changeset: 5:6e572121998e
432 438 | tag: tip
433 439 | user: test
434 440 | date: Thu Jan 01 00:00:00 1970 +0000
435 441 | summary: add original_e
436 442 |
437 443 x changeset: 4:7c694bff0650
438 444 | user: test
439 445 | date: Thu Jan 01 00:00:00 1970 +0000
440 446 | summary: add original_d
441 447 |
442 448 o changeset: 3:5601fb93a350
443 449 | parent: 1:7c3bad9141dc
444 450 | user: test
445 451 | date: Thu Jan 01 00:00:00 1970 +0000
446 452 | summary: add new_3_c
447 453 |
448 454 | o changeset: 2:245bde4270cd
449 455 |/ user: test
450 456 | date: Thu Jan 01 00:00:00 1970 +0000
451 457 | summary: add original_c
452 458 |
453 459 o changeset: 1:7c3bad9141dc
454 460 | user: test
455 461 | date: Thu Jan 01 00:00:00 1970 +0000
456 462 | summary: add b
457 463 |
458 464 o changeset: 0:1f0dee641bb7
459 465 user: test
460 466 date: Thu Jan 01 00:00:00 1970 +0000
461 467 summary: add a
462 468
463 469 $ hg up -q 'desc(new_3_c)'
464 470 $ mkcommit obsolete_e
465 471 created new head
466 472 $ hg debugobsolete `getid 'original_e'` `getid 'obsolete_e'`
467 473 $ hg push ../tmpf
468 474 pushing to ../tmpf
469 475 searching for changes
470 476 adding changesets
471 477 adding manifests
472 478 adding file changes
473 479 added 1 changesets with 1 changes to 1 files (+1 heads)
General Comments 0
You need to be logged in to leave comments. Login now