Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/commands.py @ 1816:08f4398bdb1a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated help synopsises and reordered some options. Dropped [-n] from revert.
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 01 Mar 2006 09:08:56 +0100
parents a81f99dfaa2a
children 9bbc7b304c34
comparison
equal deleted inserted replaced
1815:3e2a2f230296 1816:08f4398bdb1a
2377 ('d', 'date', None, _('list the date')), 2377 ('d', 'date', None, _('list the date')),
2378 ('n', 'number', None, _('list the revision number (default)')), 2378 ('n', 'number', None, _('list the revision number (default)')),
2379 ('c', 'changeset', None, _('list the changeset')), 2379 ('c', 'changeset', None, _('list the changeset')),
2380 ('I', 'include', [], _('include names matching the given patterns')), 2380 ('I', 'include', [], _('include names matching the given patterns')),
2381 ('X', 'exclude', [], _('exclude names matching the given patterns'))], 2381 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2382 _('hg annotate [-r REV] [-a] [-u] [-n] [-c] [-d] [FILES...]')), 2382 _('hg annotate [-r REV] [-a] [-u] [-d] [-n] [-c] FILE...')),
2383 "bundle": 2383 "bundle":
2384 (bundle, 2384 (bundle,
2385 [], 2385 [],
2386 _('hg bundle FILE DEST')), 2386 _('hg bundle FILE DEST')),
2387 "cat": 2387 "cat":
2388 (cat, 2388 (cat,
2389 [('I', 'include', [], _('include names matching the given patterns')), 2389 [('o', 'output', '', _('print output to file with formatted name')),
2390 ('X', 'exclude', [], _('exclude names matching the given patterns')), 2390 ('r', 'rev', '', _('print the given revision')),
2391 ('o', 'output', '', _('print output to file with formatted name')), 2391 ('I', 'include', [], _('include names matching the given patterns')),
2392 ('r', 'rev', '', _('print the given revision'))], 2392 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2393 _('hg cat [OPTION]... FILE...')), 2393 _('hg cat [OPTION]... FILE...')),
2394 "^clone": 2394 "^clone":
2395 (clone, 2395 (clone,
2396 [('U', 'noupdate', None, _('do not update the new working directory')), 2396 [('U', 'noupdate', None, _('do not update the new working directory')),
2397 ('e', 'ssh', '', _('specify ssh command to use')),
2398 ('', 'pull', None, _('use pull protocol to copy metadata')),
2399 ('r', 'rev', [], 2397 ('r', 'rev', [],
2400 _('a changeset you would like to have after cloning')), 2398 _('a changeset you would like to have after cloning')),
2399 ('', 'pull', None, _('use pull protocol to copy metadata')),
2400 ('e', 'ssh', '', _('specify ssh command to use')),
2401 ('', 'remotecmd', '', 2401 ('', 'remotecmd', '',
2402 _('specify hg command to run on the remote side'))], 2402 _('specify hg command to run on the remote side'))],
2403 _('hg clone [OPTION]... SOURCE [DEST]')), 2403 _('hg clone [OPTION]... SOURCE [DEST]')),
2404 "^commit|ci": 2404 "^commit|ci":
2405 (commit, 2405 (commit,
2406 [('A', 'addremove', None, _('run addremove during commit')), 2406 [('A', 'addremove', None, _('run addremove during commit')),
2407 ('I', 'include', [], _('include names matching the given patterns')),
2408 ('X', 'exclude', [], _('exclude names matching the given patterns')),
2409 ('m', 'message', '', _('use <text> as commit message')), 2407 ('m', 'message', '', _('use <text> as commit message')),
2410 ('l', 'logfile', '', _('read the commit message from <file>')), 2408 ('l', 'logfile', '', _('read the commit message from <file>')),
2411 ('d', 'date', '', _('record datecode as commit date')), 2409 ('d', 'date', '', _('record datecode as commit date')),
2412 ('u', 'user', '', _('record user as commiter'))], 2410 ('u', 'user', '', _('record user as commiter')),
2411 ('I', 'include', [], _('include names matching the given patterns')),
2412 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2413 _('hg commit [OPTION]... [FILE]...')), 2413 _('hg commit [OPTION]... [FILE]...')),
2414 "copy|cp": 2414 "copy|cp":
2415 (copy, 2415 (copy,
2416 [('I', 'include', [], _('include names matching the given patterns')), 2416 [('A', 'after', None, _('record a copy that has already occurred')),
2417 ('X', 'exclude', [], _('exclude names matching the given patterns')),
2418 ('A', 'after', None, _('record a copy that has already occurred')),
2419 ('f', 'force', None, 2417 ('f', 'force', None,
2420 _('forcibly copy over an existing managed file'))], 2418 _('forcibly copy over an existing managed file')),
2419 ('I', 'include', [], _('include names matching the given patterns')),
2420 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2421 _('hg copy [OPTION]... [SOURCE]... DEST')), 2421 _('hg copy [OPTION]... [SOURCE]... DEST')),
2422 "debugancestor": (debugancestor, [], _('debugancestor INDEX REV1 REV2')), 2422 "debugancestor": (debugancestor, [], _('debugancestor INDEX REV1 REV2')),
2423 "debugrebuildstate": 2423 "debugrebuildstate":
2424 (debugrebuildstate, 2424 (debugrebuildstate,
2425 [('r', 'rev', "", _("revision to rebuild to"))], 2425 [('r', 'rev', '', _('revision to rebuild to'))],
2426 _('debugrebuildstate [-r REV] [REV]')), 2426 _('debugrebuildstate [-r REV] [REV]')),
2427 "debugcheckstate": (debugcheckstate, [], _('debugcheckstate')), 2427 "debugcheckstate": (debugcheckstate, [], _('debugcheckstate')),
2428 "debugconfig": (debugconfig, [], _('debugconfig')), 2428 "debugconfig": (debugconfig, [], _('debugconfig')),
2429 "debugsetparents": (debugsetparents, [], _('debugsetparents REV1 [REV2]')), 2429 "debugsetparents": (debugsetparents, [], _('debugsetparents REV1 [REV2]')),
2430 "debugstate": (debugstate, [], _('debugstate')), 2430 "debugstate": (debugstate, [], _('debugstate')),
2439 _('debugwalk [OPTION]... [FILE]...')), 2439 _('debugwalk [OPTION]... [FILE]...')),
2440 "^diff": 2440 "^diff":
2441 (diff, 2441 (diff,
2442 [('r', 'rev', [], _('revision')), 2442 [('r', 'rev', [], _('revision')),
2443 ('a', 'text', None, _('treat all files as text')), 2443 ('a', 'text', None, _('treat all files as text')),
2444 ('I', 'include', [], _('include names matching the given patterns')),
2445 ('p', 'show-function', None, 2444 ('p', 'show-function', None,
2446 _('show which function each change is in')), 2445 _('show which function each change is in')),
2447 ('w', 'ignore-all-space', None, 2446 ('w', 'ignore-all-space', None,
2448 _('ignore white space when comparing lines')), 2447 _('ignore white space when comparing lines')),
2449 ('X', 'exclude', [], 2448 ('I', 'include', [], _('include names matching the given patterns')),
2450 _('exclude names matching the given patterns'))], 2449 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2451 _('hg diff [-a] [-I] [-X] [-r REV1 [-r REV2]] [FILE]...')), 2450 _('hg diff [-a] [-I] [-X] [-r REV1 [-r REV2]] [FILE]...')),
2452 "^export": 2451 "^export":
2453 (export, 2452 (export,
2454 [('o', 'output', '', _('print output to file with formatted name')), 2453 [('o', 'output', '', _('print output to file with formatted name')),
2455 ('a', 'text', None, _('treat all files as text')), 2454 ('a', 'text', None, _('treat all files as text')),
2461 ('X', 'exclude', [], _('exclude names matching the given patterns'))], 2460 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2462 _('hg forget [OPTION]... FILE...')), 2461 _('hg forget [OPTION]... FILE...')),
2463 "grep": 2462 "grep":
2464 (grep, 2463 (grep,
2465 [('0', 'print0', None, _('end fields with NUL')), 2464 [('0', 'print0', None, _('end fields with NUL')),
2466 ('I', 'include', [], _('include names matching the given patterns')),
2467 ('X', 'exclude', [], _('exclude names matching the given patterns')),
2468 ('', 'all', None, _('print all revisions that match')), 2465 ('', 'all', None, _('print all revisions that match')),
2469 ('i', 'ignore-case', None, _('ignore case when matching')), 2466 ('i', 'ignore-case', None, _('ignore case when matching')),
2470 ('l', 'files-with-matches', None, 2467 ('l', 'files-with-matches', None,
2471 _('print only filenames and revs that match')), 2468 _('print only filenames and revs that match')),
2472 ('n', 'line-number', None, _('print matching line numbers')), 2469 ('n', 'line-number', None, _('print matching line numbers')),
2473 ('r', 'rev', [], _('search in given revision range')), 2470 ('r', 'rev', [], _('search in given revision range')),
2474 ('u', 'user', None, _('print user who committed change'))], 2471 ('u', 'user', None, _('print user who committed change')),
2472 ('I', 'include', [], _('include names matching the given patterns')),
2473 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2475 _('hg grep [OPTION]... PATTERN [FILE]...')), 2474 _('hg grep [OPTION]... PATTERN [FILE]...')),
2476 "heads": 2475 "heads":
2477 (heads, 2476 (heads,
2478 [('b', 'branches', None, _('show branches')), 2477 [('b', 'branches', None, _('show branches')),
2479 ('r', 'rev', '', _('show only heads which are descendants of rev'))], 2478 ('r', 'rev', '', _('show only heads which are descendants of rev'))],
2483 "import|patch": 2482 "import|patch":
2484 (import_, 2483 (import_,
2485 [('p', 'strip', 1, 2484 [('p', 'strip', 1,
2486 _('directory strip option for patch. This has the same\n') + 2485 _('directory strip option for patch. This has the same\n') +
2487 _('meaning as the corresponding patch option')), 2486 _('meaning as the corresponding patch option')),
2487 ('b', 'base', '', _('base path')),
2488 ('f', 'force', None, 2488 ('f', 'force', None,
2489 _('skip check for outstanding uncommitted changes')), 2489 _('skip check for outstanding uncommitted changes'))],
2490 ('b', 'base', '', _('base path'))], 2490 _('hg import [-p NUM] [-b BASE] [-f] PATCH...')),
2491 _('hg import [-f] [-p NUM] [-b BASE] PATCH...')),
2492 "incoming|in": (incoming, 2491 "incoming|in": (incoming,
2493 [('M', 'no-merges', None, _('do not show merges')), 2492 [('M', 'no-merges', None, _('do not show merges')),
2494 ('p', 'patch', None, _('show patch')), 2493 ('p', 'patch', None, _('show patch')),
2495 ('n', 'newest-first', None, _('show newest record first'))], 2494 ('n', 'newest-first', None, _('show newest record first'))],
2496 _('hg incoming [-p] [-n] [-M] [SOURCE]')), 2495 _('hg incoming [-p] [-n] [-M] [SOURCE]')),
2505 ('I', 'include', [], _('include names matching the given patterns')), 2504 ('I', 'include', [], _('include names matching the given patterns')),
2506 ('X', 'exclude', [], _('exclude names matching the given patterns'))], 2505 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2507 _('hg locate [OPTION]... [PATTERN]...')), 2506 _('hg locate [OPTION]... [PATTERN]...')),
2508 "^log|history": 2507 "^log|history":
2509 (log, 2508 (log,
2510 [('I', 'include', [], _('include names matching the given patterns')), 2509 [('b', 'branches', None, _('show branches')),
2511 ('X', 'exclude', [], _('exclude names matching the given patterns')),
2512 ('b', 'branches', None, _('show branches')),
2513 ('k', 'keyword', [], _('search for a keyword')), 2510 ('k', 'keyword', [], _('search for a keyword')),
2514 ('l', 'limit', '', _('limit number of changes displayed')), 2511 ('l', 'limit', '', _('limit number of changes displayed')),
2515 ('r', 'rev', [], _('show the specified revision or range')), 2512 ('r', 'rev', [], _('show the specified revision or range')),
2516 ('M', 'no-merges', None, _('do not show merges')), 2513 ('M', 'no-merges', None, _('do not show merges')),
2517 ('m', 'only-merges', None, _('show only merges')), 2514 ('m', 'only-merges', None, _('show only merges')),
2518 ('p', 'patch', None, _('show patch'))], 2515 ('p', 'patch', None, _('show patch')),
2519 _('hg log [-I] [-X] [-r REV]... [-p] [FILE]')), 2516 ('I', 'include', [], _('include names matching the given patterns')),
2517 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2518 _('hg log [OPTION]... [FILE]')),
2520 "manifest": (manifest, [], _('hg manifest [REV]')), 2519 "manifest": (manifest, [], _('hg manifest [REV]')),
2521 "outgoing|out": (outgoing, 2520 "outgoing|out": (outgoing,
2522 [('M', 'no-merges', None, _('do not show merges')), 2521 [('M', 'no-merges', None, _('do not show merges')),
2523 ('p', 'patch', None, _('show patch')), 2522 ('p', 'patch', None, _('show patch')),
2524 ('n', 'newest-first', None, _('show newest record first'))], 2523 ('n', 'newest-first', None, _('show newest record first'))],
2525 _('hg outgoing [-p] [-n] [-M] [DEST]')), 2524 _('hg outgoing [-M] [-p] [-n] [DEST]')),
2526 "^parents": 2525 "^parents":
2527 (parents, 2526 (parents,
2528 [('b', 'branches', None, _('show branches'))], 2527 [('b', 'branches', None, _('show branches'))],
2529 _('hg parents [-b] [REV]')), 2528 _('hg parents [-b] [REV]')),
2530 "paths": (paths, [], _('hg paths [NAME]')), 2529 "paths": (paths, [], _('hg paths [NAME]')),
2534 _('update the working directory to tip after pull')), 2533 _('update the working directory to tip after pull')),
2535 ('e', 'ssh', '', _('specify ssh command to use')), 2534 ('e', 'ssh', '', _('specify ssh command to use')),
2536 ('r', 'rev', [], _('a specific revision you would like to pull')), 2535 ('r', 'rev', [], _('a specific revision you would like to pull')),
2537 ('', 'remotecmd', '', 2536 ('', 'remotecmd', '',
2538 _('specify hg command to run on the remote side'))], 2537 _('specify hg command to run on the remote side'))],
2539 _('hg pull [-u] [-e FILE] [-r rev]... [--remotecmd FILE] [SOURCE]')), 2538 _('hg pull [-u] [-e FILE] [-r REV]... [--remotecmd FILE] [SOURCE]')),
2540 "^push": 2539 "^push":
2541 (push, 2540 (push,
2542 [('f', 'force', None, _('force push')), 2541 [('f', 'force', None, _('force push')),
2543 ('e', 'ssh', '', _('specify ssh command to use')), 2542 ('e', 'ssh', '', _('specify ssh command to use')),
2544 ('r', 'rev', [], _('a specific revision you would like to push')), 2543 ('r', 'rev', [], _('a specific revision you would like to push')),
2545 ('', 'remotecmd', '', 2544 ('', 'remotecmd', '',
2546 _('specify hg command to run on the remote side'))], 2545 _('specify hg command to run on the remote side'))],
2547 _('hg push [-f] [-e FILE] [-r rev]... [--remotecmd FILE] [DEST]')), 2546 _('hg push [-f] [-e FILE] [-r REV]... [--remotecmd FILE] [DEST]')),
2548 "rawcommit": 2547 "rawcommit":
2549 (rawcommit, 2548 (rawcommit,
2550 [('p', 'parent', [], _('parent')), 2549 [('p', 'parent', [], _('parent')),
2551 ('d', 'date', '', _('date code')), 2550 ('d', 'date', '', _('date code')),
2552 ('u', 'user', '', _('user')), 2551 ('u', 'user', '', _('user')),
2560 [('I', 'include', [], _('include names matching the given patterns')), 2559 [('I', 'include', [], _('include names matching the given patterns')),
2561 ('X', 'exclude', [], _('exclude names matching the given patterns'))], 2560 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2562 _('hg remove [OPTION]... FILE...')), 2561 _('hg remove [OPTION]... FILE...')),
2563 "rename|mv": 2562 "rename|mv":
2564 (rename, 2563 (rename,
2565 [('I', 'include', [], _('include names matching the given patterns')), 2564 [('A', 'after', None, _('record a rename that has already occurred')),
2566 ('X', 'exclude', [], _('exclude names matching the given patterns')),
2567 ('A', 'after', None, _('record a rename that has already occurred')),
2568 ('f', 'force', None, 2565 ('f', 'force', None,
2569 _('forcibly copy over an existing managed file'))], 2566 _('forcibly copy over an existing managed file')),
2567 ('I', 'include', [], _('include names matching the given patterns')),
2568 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2570 _('hg rename [OPTION]... [SOURCE]... DEST')), 2569 _('hg rename [OPTION]... [SOURCE]... DEST')),
2571 "^revert": 2570 "^revert":
2572 (revert, 2571 (revert,
2573 [('I', 'include', [], _('include names matching the given patterns')), 2572 [('r', 'rev', '', _('revision to revert to')),
2574 ('X', 'exclude', [], _('exclude names matching the given patterns')), 2573 ('I', 'include', [], _('include names matching the given patterns')),
2575 ('r', 'rev', '', _('revision to revert to'))], 2574 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2576 _('hg revert [-n] [-r REV] [NAME]...')), 2575 _('hg revert [-r REV] [NAME]...')),
2577 "root": (root, [], _('hg root')), 2576 "root": (root, [], _('hg root')),
2578 "^serve": 2577 "^serve":
2579 (serve, 2578 (serve,
2580 [('A', 'accesslog', '', _('name of access log file to write to')), 2579 [('A', 'accesslog', '', _('name of access log file to write to')),
2581 ('d', 'daemon', None, _('run server in background')), 2580 ('d', 'daemon', None, _('run server in background')),