comparison tests/test-globalopts.t @ 40404:956ec6f1320d stable 4.8rc0

merge to stable for 4.8 release freeze
author Augie Fackler <augie@google.com>
date Mon, 22 Oct 2018 14:46:06 -0400
parents fabbf9310025
children 3de4f17f4824
comparison
equal deleted inserted replaced
40131:535fc8a22365 40404:956ec6f1320d
265 Testing --traceback: 265 Testing --traceback:
266 266
267 #if no-chg 267 #if no-chg
268 $ hg --cwd c --config x --traceback id 2>&1 | grep -i 'traceback' 268 $ hg --cwd c --config x --traceback id 2>&1 | grep -i 'traceback'
269 Traceback (most recent call last): 269 Traceback (most recent call last):
270 Traceback (most recent call last): (py3 !)
270 #else 271 #else
271 Traceback for '--config' errors not supported with chg. 272 Traceback for '--config' errors not supported with chg.
272 $ hg --cwd c --config x --traceback id 2>&1 | grep -i 'traceback' 273 $ hg --cwd c --config x --traceback id 2>&1 | grep -i 'traceback'
273 [1] 274 [1]
274 #endif 275 #endif
294 $ hg -h 295 $ hg -h
295 Mercurial Distributed SCM 296 Mercurial Distributed SCM
296 297
297 list of commands: 298 list of commands:
298 299
299 add add the specified files on the next commit 300 Repository creation:
300 addremove add all new files, delete all missing files 301
301 annotate show changeset information by line for each file 302 clone make a copy of an existing repository
302 archive create an unversioned archive of a repository revision 303 init create a new repository in the given directory
304
305 Remote repository management:
306
307 incoming show new changesets found in source
308 outgoing show changesets not found in the destination
309 paths show aliases for remote repositories
310 pull pull changes from the specified source
311 push push changes to the specified destination
312 serve start stand-alone webserver
313
314 Change creation:
315
316 commit commit the specified files or all outstanding changes
317
318 Change manipulation:
319
303 backout reverse effect of earlier changeset 320 backout reverse effect of earlier changeset
304 bisect subdivision search of changesets 321 graft copy changes from other branches onto the current branch
322 merge merge another revision into working directory
323
324 Change organization:
325
305 bookmarks create a new bookmark or list existing bookmarks 326 bookmarks create a new bookmark or list existing bookmarks
306 branch set or show the current branch name 327 branch set or show the current branch name
307 branches list repository named branches 328 branches list repository named branches
308 bundle create a bundle file 329 phase set or show the current phase name
330 tag add one or more tags for the current or given revision
331 tags list repository tags
332
333 File content management:
334
335 annotate show changeset information by line for each file
309 cat output the current or given revision of files 336 cat output the current or given revision of files
310 clone make a copy of an existing repository
311 commit commit the specified files or all outstanding changes
312 config show combined config settings from all hgrc files
313 copy mark files as copied for the next commit 337 copy mark files as copied for the next commit
314 diff diff repository (or selected files) 338 diff diff repository (or selected files)
315 export dump the header and diffs for one or more changesets 339 grep search revision history for a pattern in specified files
340
341 Change navigation:
342
343 bisect subdivision search of changesets
344 heads show branch heads
345 identify identify the working directory or specified revision
346 log show revision history of entire repository or files
347
348 Working directory management:
349
350 add add the specified files on the next commit
351 addremove add all new files, delete all missing files
316 files list tracked files 352 files list tracked files
317 forget forget the specified files on the next commit 353 forget forget the specified files on the next commit
318 graft copy changes from other branches onto the current branch
319 grep search revision history for a pattern in specified files
320 heads show branch heads
321 help show help for a given topic or a help overview
322 identify identify the working directory or specified revision
323 import import an ordered set of patches
324 incoming show new changesets found in source
325 init create a new repository in the given directory
326 log show revision history of entire repository or files
327 manifest output the current or given revision of the project manifest
328 merge merge another revision into working directory
329 outgoing show changesets not found in the destination
330 paths show aliases for remote repositories
331 phase set or show the current phase name
332 pull pull changes from the specified source
333 push push changes to the specified destination
334 recover roll back an interrupted transaction
335 remove remove the specified files on the next commit 354 remove remove the specified files on the next commit
336 rename rename files; equivalent of copy + remove 355 rename rename files; equivalent of copy + remove
337 resolve redo merges or set/view the merge status of files 356 resolve redo merges or set/view the merge status of files
338 revert restore files to their checkout state 357 revert restore files to their checkout state
339 root print the root (top) of the current working directory 358 root print the root (top) of the current working directory
340 serve start stand-alone webserver
341 status show changed files in the working directory 359 status show changed files in the working directory
342 summary summarize working directory state 360 summary summarize working directory state
343 tag add one or more tags for the current or given revision 361 update update working directory (or switch revisions)
344 tags list repository tags 362
363 Change import/export:
364
365 archive create an unversioned archive of a repository revision
366 bundle create a bundle file
367 export dump the header and diffs for one or more changesets
368 import import an ordered set of patches
345 unbundle apply one or more bundle files 369 unbundle apply one or more bundle files
346 update update working directory (or switch revisions) 370
371 Repository maintenance:
372
373 manifest output the current or given revision of the project manifest
374 recover roll back an interrupted transaction
347 verify verify the integrity of the repository 375 verify verify the integrity of the repository
376
377 Help:
378
379 config show combined config settings from all hgrc files
380 help show help for a given topic or a help overview
348 version output version and copyright information 381 version output version and copyright information
349 382
350 additional help topics: 383 additional help topics:
351 384
352 bundlespec Bundle File Formats 385 Mercurial identifiers:
386
387 filesets Specifying File Sets
388 hgignore Syntax for Mercurial Ignore Files
389 patterns File Name Patterns
390 revisions Specifying Revisions
391 urls URL Paths
392
393 Mercurial output:
394
353 color Colorizing Outputs 395 color Colorizing Outputs
396 dates Date Formats
397 diffs Diff Formats
398 templating Template Usage
399
400 Mercurial configuration:
401
354 config Configuration Files 402 config Configuration Files
355 dates Date Formats
356 deprecated Deprecated Features
357 diffs Diff Formats
358 environment Environment Variables 403 environment Environment Variables
359 extensions Using Additional Features 404 extensions Using Additional Features
360 filesets Specifying File Sets
361 flags Command-line flags 405 flags Command-line flags
362 glossary Glossary
363 hgignore Syntax for Mercurial Ignore Files
364 hgweb Configuring hgweb 406 hgweb Configuring hgweb
365 internals Technical implementation topics
366 merge-tools Merge Tools 407 merge-tools Merge Tools
367 pager Pager Support 408 pager Pager Support
368 patterns File Name Patterns 409
410 Concepts:
411
412 bundlespec Bundle File Formats
413 glossary Glossary
369 phases Working with Phases 414 phases Working with Phases
370 revisions Specifying Revisions 415 subrepos Subrepositories
416
417 Miscellaneous:
418
419 deprecated Deprecated Features
420 internals Technical implementation topics
371 scripting Using Mercurial from scripts and automation 421 scripting Using Mercurial from scripts and automation
372 subrepos Subrepositories
373 templating Template Usage
374 urls URL Paths
375 422
376 (use 'hg help -v' to show built-in aliases and global options) 423 (use 'hg help -v' to show built-in aliases and global options)
377 424
378 $ hg --help 425 $ hg --help
379 Mercurial Distributed SCM 426 Mercurial Distributed SCM
380 427
381 list of commands: 428 list of commands:
382 429
383 add add the specified files on the next commit 430 Repository creation:
384 addremove add all new files, delete all missing files 431
385 annotate show changeset information by line for each file 432 clone make a copy of an existing repository
386 archive create an unversioned archive of a repository revision 433 init create a new repository in the given directory
434
435 Remote repository management:
436
437 incoming show new changesets found in source
438 outgoing show changesets not found in the destination
439 paths show aliases for remote repositories
440 pull pull changes from the specified source
441 push push changes to the specified destination
442 serve start stand-alone webserver
443
444 Change creation:
445
446 commit commit the specified files or all outstanding changes
447
448 Change manipulation:
449
387 backout reverse effect of earlier changeset 450 backout reverse effect of earlier changeset
388 bisect subdivision search of changesets 451 graft copy changes from other branches onto the current branch
452 merge merge another revision into working directory
453
454 Change organization:
455
389 bookmarks create a new bookmark or list existing bookmarks 456 bookmarks create a new bookmark or list existing bookmarks
390 branch set or show the current branch name 457 branch set or show the current branch name
391 branches list repository named branches 458 branches list repository named branches
392 bundle create a bundle file 459 phase set or show the current phase name
460 tag add one or more tags for the current or given revision
461 tags list repository tags
462
463 File content management:
464
465 annotate show changeset information by line for each file
393 cat output the current or given revision of files 466 cat output the current or given revision of files
394 clone make a copy of an existing repository
395 commit commit the specified files or all outstanding changes
396 config show combined config settings from all hgrc files
397 copy mark files as copied for the next commit 467 copy mark files as copied for the next commit
398 diff diff repository (or selected files) 468 diff diff repository (or selected files)
399 export dump the header and diffs for one or more changesets 469 grep search revision history for a pattern in specified files
470
471 Change navigation:
472
473 bisect subdivision search of changesets
474 heads show branch heads
475 identify identify the working directory or specified revision
476 log show revision history of entire repository or files
477
478 Working directory management:
479
480 add add the specified files on the next commit
481 addremove add all new files, delete all missing files
400 files list tracked files 482 files list tracked files
401 forget forget the specified files on the next commit 483 forget forget the specified files on the next commit
402 graft copy changes from other branches onto the current branch
403 grep search revision history for a pattern in specified files
404 heads show branch heads
405 help show help for a given topic or a help overview
406 identify identify the working directory or specified revision
407 import import an ordered set of patches
408 incoming show new changesets found in source
409 init create a new repository in the given directory
410 log show revision history of entire repository or files
411 manifest output the current or given revision of the project manifest
412 merge merge another revision into working directory
413 outgoing show changesets not found in the destination
414 paths show aliases for remote repositories
415 phase set or show the current phase name
416 pull pull changes from the specified source
417 push push changes to the specified destination
418 recover roll back an interrupted transaction
419 remove remove the specified files on the next commit 484 remove remove the specified files on the next commit
420 rename rename files; equivalent of copy + remove 485 rename rename files; equivalent of copy + remove
421 resolve redo merges or set/view the merge status of files 486 resolve redo merges or set/view the merge status of files
422 revert restore files to their checkout state 487 revert restore files to their checkout state
423 root print the root (top) of the current working directory 488 root print the root (top) of the current working directory
424 serve start stand-alone webserver
425 status show changed files in the working directory 489 status show changed files in the working directory
426 summary summarize working directory state 490 summary summarize working directory state
427 tag add one or more tags for the current or given revision 491 update update working directory (or switch revisions)
428 tags list repository tags 492
493 Change import/export:
494
495 archive create an unversioned archive of a repository revision
496 bundle create a bundle file
497 export dump the header and diffs for one or more changesets
498 import import an ordered set of patches
429 unbundle apply one or more bundle files 499 unbundle apply one or more bundle files
430 update update working directory (or switch revisions) 500
501 Repository maintenance:
502
503 manifest output the current or given revision of the project manifest
504 recover roll back an interrupted transaction
431 verify verify the integrity of the repository 505 verify verify the integrity of the repository
506
507 Help:
508
509 config show combined config settings from all hgrc files
510 help show help for a given topic or a help overview
432 version output version and copyright information 511 version output version and copyright information
433 512
434 additional help topics: 513 additional help topics:
435 514
436 bundlespec Bundle File Formats 515 Mercurial identifiers:
516
517 filesets Specifying File Sets
518 hgignore Syntax for Mercurial Ignore Files
519 patterns File Name Patterns
520 revisions Specifying Revisions
521 urls URL Paths
522
523 Mercurial output:
524
437 color Colorizing Outputs 525 color Colorizing Outputs
526 dates Date Formats
527 diffs Diff Formats
528 templating Template Usage
529
530 Mercurial configuration:
531
438 config Configuration Files 532 config Configuration Files
439 dates Date Formats
440 deprecated Deprecated Features
441 diffs Diff Formats
442 environment Environment Variables 533 environment Environment Variables
443 extensions Using Additional Features 534 extensions Using Additional Features
444 filesets Specifying File Sets
445 flags Command-line flags 535 flags Command-line flags
446 glossary Glossary
447 hgignore Syntax for Mercurial Ignore Files
448 hgweb Configuring hgweb 536 hgweb Configuring hgweb
449 internals Technical implementation topics
450 merge-tools Merge Tools 537 merge-tools Merge Tools
451 pager Pager Support 538 pager Pager Support
452 patterns File Name Patterns 539
540 Concepts:
541
542 bundlespec Bundle File Formats
543 glossary Glossary
453 phases Working with Phases 544 phases Working with Phases
454 revisions Specifying Revisions 545 subrepos Subrepositories
546
547 Miscellaneous:
548
549 deprecated Deprecated Features
550 internals Technical implementation topics
455 scripting Using Mercurial from scripts and automation 551 scripting Using Mercurial from scripts and automation
456 subrepos Subrepositories
457 templating Template Usage
458 urls URL Paths
459 552
460 (use 'hg help -v' to show built-in aliases and global options) 553 (use 'hg help -v' to show built-in aliases and global options)
461 554
462 #endif 555 #endif
463 556