1508 ('m', 'merge', None, 'allow merging of conflicts'), |
1508 ('m', 'merge', None, 'allow merging of conflicts'), |
1509 ('C', 'clean', None, 'overwrite locally modified files')], |
1509 ('C', 'clean', None, 'overwrite locally modified files')], |
1510 'hg update [-b TAG] [-m] [-C] [REV]'), |
1510 'hg update [-b TAG] [-m] [-C] [REV]'), |
1511 "verify": (verify, [], 'hg verify'), |
1511 "verify": (verify, [], 'hg verify'), |
1512 "version": (show_version, [], 'hg version'), |
1512 "version": (show_version, [], 'hg version'), |
1513 } |
1513 } |
1514 |
1514 |
1515 globalopts = [('v', 'verbose', None, 'verbose mode'), |
1515 globalopts = [ |
1516 ('', 'debug', None, 'debug mode'), |
1516 ('R', 'repository', "", 'repository root directory'), |
1517 ('q', 'quiet', None, 'quiet mode'), |
1517 ('', 'cwd', '', 'change working directory'), |
1518 ('', 'profile', None, 'profile'), |
1518 ('y', 'noninteractive', None, 'run non-interactively'), |
1519 ('', 'cwd', '', 'change working directory'), |
1519 ('q', 'quiet', None, 'quiet mode'), |
1520 ('R', 'repository', "", 'repository root directory'), |
1520 ('v', 'verbose', None, 'verbose mode'), |
1521 ('', 'traceback', None, 'print traceback on exception'), |
1521 ('', 'debug', None, 'debug mode'), |
1522 ('y', 'noninteractive', None, 'run non-interactively'), |
1522 ('', 'traceback', None, 'print traceback on exception'), |
1523 ('', 'version', None, 'output version information and exit'), |
1523 ('', 'time', None, 'time how long the command takes'), |
1524 ('', 'time', None, 'time how long the command takes'), |
1524 ('', 'profile', None, 'profile'), |
1525 ] |
1525 ('', 'version', None, 'output version information and exit'), |
|
1526 ] |
1526 |
1527 |
1527 norepo = "clone init version help debugconfig debugdata" + \ |
1528 norepo = "clone init version help debugconfig debugdata" + \ |
1528 " debugindex debugindexdot paths" |
1529 " debugindex debugindexdot paths" |
1529 |
1530 |
1530 def find(cmd): |
1531 def find(cmd): |