Mercurial > public > mercurial-scm > hg
comparison mercurial/commands.py @ 1823:adef8661c8f9
merge with crew.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Wed, 01 Mar 2006 21:27:23 -0800 |
parents | 64df4220b349 9bbc7b304c34 |
children | 7a58bf789965 |
comparison
equal
deleted
inserted
replaced
1822:64df4220b349 | 1823:adef8661c8f9 |
---|---|
2397 ('d', 'date', None, _('list the date')), | 2397 ('d', 'date', None, _('list the date')), |
2398 ('n', 'number', None, _('list the revision number (default)')), | 2398 ('n', 'number', None, _('list the revision number (default)')), |
2399 ('c', 'changeset', None, _('list the changeset')), | 2399 ('c', 'changeset', None, _('list the changeset')), |
2400 ('I', 'include', [], _('include names matching the given patterns')), | 2400 ('I', 'include', [], _('include names matching the given patterns')), |
2401 ('X', 'exclude', [], _('exclude names matching the given patterns'))], | 2401 ('X', 'exclude', [], _('exclude names matching the given patterns'))], |
2402 _('hg annotate [-r REV] [-a] [-u] [-n] [-c] [-d] [FILES...]')), | 2402 _('hg annotate [-r REV] [-a] [-u] [-d] [-n] [-c] FILE...')), |
2403 "bundle": | 2403 "bundle": |
2404 (bundle, | 2404 (bundle, |
2405 [], | 2405 [], |
2406 _('hg bundle FILE DEST')), | 2406 _('hg bundle FILE DEST')), |
2407 "cat": | 2407 "cat": |
2408 (cat, | 2408 (cat, |
2409 [('I', 'include', [], _('include names matching the given patterns')), | 2409 [('o', 'output', '', _('print output to file with formatted name')), |
2410 ('X', 'exclude', [], _('exclude names matching the given patterns')), | 2410 ('r', 'rev', '', _('print the given revision')), |
2411 ('o', 'output', '', _('print output to file with formatted name')), | 2411 ('I', 'include', [], _('include names matching the given patterns')), |
2412 ('r', 'rev', '', _('print the given revision'))], | 2412 ('X', 'exclude', [], _('exclude names matching the given patterns'))], |
2413 _('hg cat [OPTION]... FILE...')), | 2413 _('hg cat [OPTION]... FILE...')), |
2414 "^clone": | 2414 "^clone": |
2415 (clone, | 2415 (clone, |
2416 [('U', 'noupdate', None, _('do not update the new working directory')), | 2416 [('U', 'noupdate', None, _('do not update the new working directory')), |
2417 ('e', 'ssh', '', _('specify ssh command to use')), | |
2418 ('', 'pull', None, _('use pull protocol to copy metadata')), | |
2419 ('r', 'rev', [], | 2417 ('r', 'rev', [], |
2420 _('a changeset you would like to have after cloning')), | 2418 _('a changeset you would like to have after cloning')), |
2419 ('', 'pull', None, _('use pull protocol to copy metadata')), | |
2420 ('e', 'ssh', '', _('specify ssh command to use')), | |
2421 ('', 'remotecmd', '', | 2421 ('', 'remotecmd', '', |
2422 _('specify hg command to run on the remote side'))], | 2422 _('specify hg command to run on the remote side'))], |
2423 _('hg clone [OPTION]... SOURCE [DEST]')), | 2423 _('hg clone [OPTION]... SOURCE [DEST]')), |
2424 "^commit|ci": | 2424 "^commit|ci": |
2425 (commit, | 2425 (commit, |
2426 [('A', 'addremove', None, _('run addremove during commit')), | 2426 [('A', 'addremove', None, _('run addremove during commit')), |
2427 ('I', 'include', [], _('include names matching the given patterns')), | |
2428 ('X', 'exclude', [], _('exclude names matching the given patterns')), | |
2429 ('m', 'message', '', _('use <text> as commit message')), | 2427 ('m', 'message', '', _('use <text> as commit message')), |
2430 ('l', 'logfile', '', _('read the commit message from <file>')), | 2428 ('l', 'logfile', '', _('read the commit message from <file>')), |
2431 ('d', 'date', '', _('record datecode as commit date')), | 2429 ('d', 'date', '', _('record datecode as commit date')), |
2432 ('u', 'user', '', _('record user as commiter'))], | 2430 ('u', 'user', '', _('record user as commiter')), |
2431 ('I', 'include', [], _('include names matching the given patterns')), | |
2432 ('X', 'exclude', [], _('exclude names matching the given patterns'))], | |
2433 _('hg commit [OPTION]... [FILE]...')), | 2433 _('hg commit [OPTION]... [FILE]...')), |
2434 "copy|cp": | 2434 "copy|cp": |
2435 (copy, | 2435 (copy, |
2436 [('I', 'include', [], _('include names matching the given patterns')), | 2436 [('A', 'after', None, _('record a copy that has already occurred')), |
2437 ('X', 'exclude', [], _('exclude names matching the given patterns')), | |
2438 ('A', 'after', None, _('record a copy that has already occurred')), | |
2439 ('f', 'force', None, | 2437 ('f', 'force', None, |
2440 _('forcibly copy over an existing managed file'))], | 2438 _('forcibly copy over an existing managed file')), |
2439 ('I', 'include', [], _('include names matching the given patterns')), | |
2440 ('X', 'exclude', [], _('exclude names matching the given patterns'))], | |
2441 _('hg copy [OPTION]... [SOURCE]... DEST')), | 2441 _('hg copy [OPTION]... [SOURCE]... DEST')), |
2442 "debugancestor": (debugancestor, [], _('debugancestor INDEX REV1 REV2')), | 2442 "debugancestor": (debugancestor, [], _('debugancestor INDEX REV1 REV2')), |
2443 "debugrebuildstate": | 2443 "debugrebuildstate": |
2444 (debugrebuildstate, | 2444 (debugrebuildstate, |
2445 [('r', 'rev', "", _("revision to rebuild to"))], | 2445 [('r', 'rev', '', _('revision to rebuild to'))], |
2446 _('debugrebuildstate [-r REV] [REV]')), | 2446 _('debugrebuildstate [-r REV] [REV]')), |
2447 "debugcheckstate": (debugcheckstate, [], _('debugcheckstate')), | 2447 "debugcheckstate": (debugcheckstate, [], _('debugcheckstate')), |
2448 "debugconfig": (debugconfig, [], _('debugconfig')), | 2448 "debugconfig": (debugconfig, [], _('debugconfig')), |
2449 "debugsetparents": (debugsetparents, [], _('debugsetparents REV1 [REV2]')), | 2449 "debugsetparents": (debugsetparents, [], _('debugsetparents REV1 [REV2]')), |
2450 "debugstate": (debugstate, [], _('debugstate')), | 2450 "debugstate": (debugstate, [], _('debugstate')), |
2459 _('debugwalk [OPTION]... [FILE]...')), | 2459 _('debugwalk [OPTION]... [FILE]...')), |
2460 "^diff": | 2460 "^diff": |
2461 (diff, | 2461 (diff, |
2462 [('r', 'rev', [], _('revision')), | 2462 [('r', 'rev', [], _('revision')), |
2463 ('a', 'text', None, _('treat all files as text')), | 2463 ('a', 'text', None, _('treat all files as text')), |
2464 ('I', 'include', [], _('include names matching the given patterns')), | |
2465 ('p', 'show-function', None, | 2464 ('p', 'show-function', None, |
2466 _('show which function each change is in')), | 2465 _('show which function each change is in')), |
2467 ('w', 'ignore-all-space', None, | 2466 ('w', 'ignore-all-space', None, |
2468 _('ignore white space when comparing lines')), | 2467 _('ignore white space when comparing lines')), |
2469 ('X', 'exclude', [], | 2468 ('I', 'include', [], _('include names matching the given patterns')), |
2470 _('exclude names matching the given patterns'))], | 2469 ('X', 'exclude', [], _('exclude names matching the given patterns'))], |
2471 _('hg diff [-a] [-I] [-X] [-r REV1 [-r REV2]] [FILE]...')), | 2470 _('hg diff [-a] [-I] [-X] [-r REV1 [-r REV2]] [FILE]...')), |
2472 "^export": | 2471 "^export": |
2473 (export, | 2472 (export, |
2474 [('o', 'output', '', _('print output to file with formatted name')), | 2473 [('o', 'output', '', _('print output to file with formatted name')), |
2475 ('a', 'text', None, _('treat all files as text')), | 2474 ('a', 'text', None, _('treat all files as text')), |
2481 ('X', 'exclude', [], _('exclude names matching the given patterns'))], | 2480 ('X', 'exclude', [], _('exclude names matching the given patterns'))], |
2482 _('hg forget [OPTION]... FILE...')), | 2481 _('hg forget [OPTION]... FILE...')), |
2483 "grep": | 2482 "grep": |
2484 (grep, | 2483 (grep, |
2485 [('0', 'print0', None, _('end fields with NUL')), | 2484 [('0', 'print0', None, _('end fields with NUL')), |
2486 ('I', 'include', [], _('include names matching the given patterns')), | |
2487 ('X', 'exclude', [], _('exclude names matching the given patterns')), | |
2488 ('', 'all', None, _('print all revisions that match')), | 2485 ('', 'all', None, _('print all revisions that match')), |
2489 ('i', 'ignore-case', None, _('ignore case when matching')), | 2486 ('i', 'ignore-case', None, _('ignore case when matching')), |
2490 ('l', 'files-with-matches', None, | 2487 ('l', 'files-with-matches', None, |
2491 _('print only filenames and revs that match')), | 2488 _('print only filenames and revs that match')), |
2492 ('n', 'line-number', None, _('print matching line numbers')), | 2489 ('n', 'line-number', None, _('print matching line numbers')), |
2493 ('r', 'rev', [], _('search in given revision range')), | 2490 ('r', 'rev', [], _('search in given revision range')), |
2494 ('u', 'user', None, _('print user who committed change'))], | 2491 ('u', 'user', None, _('print user who committed change')), |
2492 ('I', 'include', [], _('include names matching the given patterns')), | |
2493 ('X', 'exclude', [], _('exclude names matching the given patterns'))], | |
2495 _('hg grep [OPTION]... PATTERN [FILE]...')), | 2494 _('hg grep [OPTION]... PATTERN [FILE]...')), |
2496 "heads": | 2495 "heads": |
2497 (heads, | 2496 (heads, |
2498 [('b', 'branches', None, _('show branches')), | 2497 [('b', 'branches', None, _('show branches')), |
2499 ('r', 'rev', '', _('show only heads which are descendants of rev'))], | 2498 ('r', 'rev', '', _('show only heads which are descendants of rev'))], |
2503 "import|patch": | 2502 "import|patch": |
2504 (import_, | 2503 (import_, |
2505 [('p', 'strip', 1, | 2504 [('p', 'strip', 1, |
2506 _('directory strip option for patch. This has the same\n') + | 2505 _('directory strip option for patch. This has the same\n') + |
2507 _('meaning as the corresponding patch option')), | 2506 _('meaning as the corresponding patch option')), |
2507 ('b', 'base', '', _('base path')), | |
2508 ('f', 'force', None, | 2508 ('f', 'force', None, |
2509 _('skip check for outstanding uncommitted changes')), | 2509 _('skip check for outstanding uncommitted changes'))], |
2510 ('b', 'base', '', _('base path'))], | 2510 _('hg import [-p NUM] [-b BASE] [-f] PATCH...')), |
2511 _('hg import [-f] [-p NUM] [-b BASE] PATCH...')), | |
2512 "incoming|in": (incoming, | 2511 "incoming|in": (incoming, |
2513 [('M', 'no-merges', None, _('do not show merges')), | 2512 [('M', 'no-merges', None, _('do not show merges')), |
2514 ('p', 'patch', None, _('show patch')), | 2513 ('p', 'patch', None, _('show patch')), |
2515 ('n', 'newest-first', None, _('show newest record first'))], | 2514 ('n', 'newest-first', None, _('show newest record first'))], |
2516 _('hg incoming [-p] [-n] [-M] [SOURCE]')), | 2515 _('hg incoming [-p] [-n] [-M] [SOURCE]')), |
2525 ('I', 'include', [], _('include names matching the given patterns')), | 2524 ('I', 'include', [], _('include names matching the given patterns')), |
2526 ('X', 'exclude', [], _('exclude names matching the given patterns'))], | 2525 ('X', 'exclude', [], _('exclude names matching the given patterns'))], |
2527 _('hg locate [OPTION]... [PATTERN]...')), | 2526 _('hg locate [OPTION]... [PATTERN]...')), |
2528 "^log|history": | 2527 "^log|history": |
2529 (log, | 2528 (log, |
2530 [('I', 'include', [], _('include names matching the given patterns')), | 2529 [('b', 'branches', None, _('show branches')), |
2531 ('X', 'exclude', [], _('exclude names matching the given patterns')), | |
2532 ('b', 'branches', None, _('show branches')), | |
2533 ('k', 'keyword', [], _('search for a keyword')), | 2530 ('k', 'keyword', [], _('search for a keyword')), |
2534 ('l', 'limit', '', _('limit number of changes displayed')), | 2531 ('l', 'limit', '', _('limit number of changes displayed')), |
2535 ('r', 'rev', [], _('show the specified revision or range')), | 2532 ('r', 'rev', [], _('show the specified revision or range')), |
2536 ('M', 'no-merges', None, _('do not show merges')), | 2533 ('M', 'no-merges', None, _('do not show merges')), |
2537 ('m', 'only-merges', None, _('show only merges')), | 2534 ('m', 'only-merges', None, _('show only merges')), |
2538 ('p', 'patch', None, _('show patch'))], | 2535 ('p', 'patch', None, _('show patch')), |
2539 _('hg log [-I] [-X] [-r REV]... [-p] [FILE]')), | 2536 ('I', 'include', [], _('include names matching the given patterns')), |
2537 ('X', 'exclude', [], _('exclude names matching the given patterns'))], | |
2538 _('hg log [OPTION]... [FILE]')), | |
2540 "manifest": (manifest, [], _('hg manifest [REV]')), | 2539 "manifest": (manifest, [], _('hg manifest [REV]')), |
2541 "outgoing|out": (outgoing, | 2540 "outgoing|out": (outgoing, |
2542 [('M', 'no-merges', None, _('do not show merges')), | 2541 [('M', 'no-merges', None, _('do not show merges')), |
2543 ('p', 'patch', None, _('show patch')), | 2542 ('p', 'patch', None, _('show patch')), |
2544 ('n', 'newest-first', None, _('show newest record first'))], | 2543 ('n', 'newest-first', None, _('show newest record first'))], |
2545 _('hg outgoing [-p] [-n] [-M] [DEST]')), | 2544 _('hg outgoing [-M] [-p] [-n] [DEST]')), |
2546 "^parents": | 2545 "^parents": |
2547 (parents, | 2546 (parents, |
2548 [('b', 'branches', None, _('show branches'))], | 2547 [('b', 'branches', None, _('show branches'))], |
2549 _('hg parents [-b] [REV]')), | 2548 _('hg parents [-b] [REV]')), |
2550 "paths": (paths, [], _('hg paths [NAME]')), | 2549 "paths": (paths, [], _('hg paths [NAME]')), |
2554 _('update the working directory to tip after pull')), | 2553 _('update the working directory to tip after pull')), |
2555 ('e', 'ssh', '', _('specify ssh command to use')), | 2554 ('e', 'ssh', '', _('specify ssh command to use')), |
2556 ('r', 'rev', [], _('a specific revision you would like to pull')), | 2555 ('r', 'rev', [], _('a specific revision you would like to pull')), |
2557 ('', 'remotecmd', '', | 2556 ('', 'remotecmd', '', |
2558 _('specify hg command to run on the remote side'))], | 2557 _('specify hg command to run on the remote side'))], |
2559 _('hg pull [-u] [-e FILE] [-r rev]... [--remotecmd FILE] [SOURCE]')), | 2558 _('hg pull [-u] [-e FILE] [-r REV]... [--remotecmd FILE] [SOURCE]')), |
2560 "^push": | 2559 "^push": |
2561 (push, | 2560 (push, |
2562 [('f', 'force', None, _('force push')), | 2561 [('f', 'force', None, _('force push')), |
2563 ('e', 'ssh', '', _('specify ssh command to use')), | 2562 ('e', 'ssh', '', _('specify ssh command to use')), |
2564 ('r', 'rev', [], _('a specific revision you would like to push')), | 2563 ('r', 'rev', [], _('a specific revision you would like to push')), |
2565 ('', 'remotecmd', '', | 2564 ('', 'remotecmd', '', |
2566 _('specify hg command to run on the remote side'))], | 2565 _('specify hg command to run on the remote side'))], |
2567 _('hg push [-f] [-e FILE] [-r rev]... [--remotecmd FILE] [DEST]')), | 2566 _('hg push [-f] [-e FILE] [-r REV]... [--remotecmd FILE] [DEST]')), |
2568 "rawcommit": | 2567 "debugrawcommit|rawcommit": |
2569 (rawcommit, | 2568 (rawcommit, |
2570 [('p', 'parent', [], _('parent')), | 2569 [('p', 'parent', [], _('parent')), |
2571 ('d', 'date', '', _('date code')), | 2570 ('d', 'date', '', _('date code')), |
2572 ('u', 'user', '', _('user')), | 2571 ('u', 'user', '', _('user')), |
2573 ('F', 'files', '', _('file list')), | 2572 ('F', 'files', '', _('file list')), |
2574 ('m', 'message', '', _('commit message')), | 2573 ('m', 'message', '', _('commit message')), |
2575 ('l', 'logfile', '', _('commit message file'))], | 2574 ('l', 'logfile', '', _('commit message file'))], |
2576 _('hg rawcommit [OPTION]... [FILE]...')), | 2575 _('hg debugrawcommit [OPTION]... [FILE]...')), |
2577 "recover": (recover, [], _('hg recover')), | 2576 "recover": (recover, [], _('hg recover')), |
2578 "^remove|rm": | 2577 "^remove|rm": |
2579 (remove, | 2578 (remove, |
2580 [('I', 'include', [], _('include names matching the given patterns')), | 2579 [('I', 'include', [], _('include names matching the given patterns')), |
2581 ('X', 'exclude', [], _('exclude names matching the given patterns'))], | 2580 ('X', 'exclude', [], _('exclude names matching the given patterns'))], |
2582 _('hg remove [OPTION]... FILE...')), | 2581 _('hg remove [OPTION]... FILE...')), |
2583 "rename|mv": | 2582 "rename|mv": |
2584 (rename, | 2583 (rename, |
2585 [('I', 'include', [], _('include names matching the given patterns')), | 2584 [('A', 'after', None, _('record a rename that has already occurred')), |
2586 ('X', 'exclude', [], _('exclude names matching the given patterns')), | |
2587 ('A', 'after', None, _('record a rename that has already occurred')), | |
2588 ('f', 'force', None, | 2585 ('f', 'force', None, |
2589 _('forcibly copy over an existing managed file'))], | 2586 _('forcibly copy over an existing managed file')), |
2587 ('I', 'include', [], _('include names matching the given patterns')), | |
2588 ('X', 'exclude', [], _('exclude names matching the given patterns'))], | |
2590 _('hg rename [OPTION]... [SOURCE]... DEST')), | 2589 _('hg rename [OPTION]... [SOURCE]... DEST')), |
2591 "^revert": | 2590 "^revert": |
2592 (revert, | 2591 (revert, |
2593 [('I', 'include', [], _('include names matching the given patterns')), | 2592 [('r', 'rev', '', _('revision to revert to')), |
2594 ('X', 'exclude', [], _('exclude names matching the given patterns')), | 2593 ('I', 'include', [], _('include names matching the given patterns')), |
2595 ('r', 'rev', '', _('revision to revert to'))], | 2594 ('X', 'exclude', [], _('exclude names matching the given patterns'))], |
2596 _('hg revert [-n] [-r REV] [NAME]...')), | 2595 _('hg revert [-r REV] [NAME]...')), |
2597 "root": (root, [], _('hg root')), | 2596 "root": (root, [], _('hg root')), |
2598 "^serve": | 2597 "^serve": |
2599 (serve, | 2598 (serve, |
2600 [('A', 'accesslog', '', _('name of access log file to write to')), | 2599 [('A', 'accesslog', '', _('name of access log file to write to')), |
2601 ('d', 'daemon', None, _('run server in background')), | 2600 ('d', 'daemon', None, _('run server in background')), |