2331 ui.note(_('updating destination repository\n')) |
2331 ui.note(_('updating destination repository\n')) |
2332 hg.update(repo, repo.changelog.tip()) |
2332 hg.update(repo, repo.changelog.tip()) |
2333 |
2333 |
2334 @command("qcommit|qci", |
2334 @command("qcommit|qci", |
2335 commands.table["^commit|ci"][1], |
2335 commands.table["^commit|ci"][1], |
2336 _('hg qcommit [OPTION]... [FILE]...')) |
2336 _('hg qcommit [OPTION]... [FILE]...'), |
|
2337 inferrepo=True) |
2337 def commit(ui, repo, *pats, **opts): |
2338 def commit(ui, repo, *pats, **opts): |
2338 """commit changes in the queue repository (DEPRECATED) |
2339 """commit changes in the queue repository (DEPRECATED) |
2339 |
2340 |
2340 This command is deprecated; use :hg:`commit --mq` instead.""" |
2341 This command is deprecated; use :hg:`commit --mq` instead.""" |
2341 q = repo.mq |
2342 q = repo.mq |
2414 _('add "From: <USER>" to patch'), _('USER')), |
2415 _('add "From: <USER>" to patch'), _('USER')), |
2415 ('D', 'currentdate', None, _('add "Date: <current date>" to patch')), |
2416 ('D', 'currentdate', None, _('add "Date: <current date>" to patch')), |
2416 ('d', 'date', '', |
2417 ('d', 'date', '', |
2417 _('add "Date: <DATE>" to patch'), _('DATE')) |
2418 _('add "Date: <DATE>" to patch'), _('DATE')) |
2418 ] + commands.walkopts + commands.commitopts, |
2419 ] + commands.walkopts + commands.commitopts, |
2419 _('hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]...')) |
2420 _('hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]...'), |
|
2421 inferrepo=True) |
2420 def new(ui, repo, patch, *args, **opts): |
2422 def new(ui, repo, patch, *args, **opts): |
2421 """create a new patch |
2423 """create a new patch |
2422 |
2424 |
2423 qnew creates a new patch on top of the currently-applied patch (if |
2425 qnew creates a new patch on top of the currently-applied patch (if |
2424 any). The patch will be initialized with any outstanding changes |
2426 any). The patch will be initialized with any outstanding changes |
2462 ('D', 'currentdate', None, |
2464 ('D', 'currentdate', None, |
2463 _('add/update date field in patch with current date')), |
2465 _('add/update date field in patch with current date')), |
2464 ('d', 'date', '', |
2466 ('d', 'date', '', |
2465 _('add/update date field in patch with given date'), _('DATE')) |
2467 _('add/update date field in patch with given date'), _('DATE')) |
2466 ] + commands.walkopts + commands.commitopts, |
2468 ] + commands.walkopts + commands.commitopts, |
2467 _('hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]...')) |
2469 _('hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]...'), |
|
2470 inferrepo=True) |
2468 def refresh(ui, repo, *pats, **opts): |
2471 def refresh(ui, repo, *pats, **opts): |
2469 """update the current patch |
2472 """update the current patch |
2470 |
2473 |
2471 If any file patterns are provided, the refreshed patch will |
2474 If any file patterns are provided, the refreshed patch will |
2472 contain only the modifications that match those patterns; the |
2475 contain only the modifications that match those patterns; the |
2497 finally: |
2500 finally: |
2498 wlock.release() |
2501 wlock.release() |
2499 |
2502 |
2500 @command("^qdiff", |
2503 @command("^qdiff", |
2501 commands.diffopts + commands.diffopts2 + commands.walkopts, |
2504 commands.diffopts + commands.diffopts2 + commands.walkopts, |
2502 _('hg qdiff [OPTION]... [FILE]...')) |
2505 _('hg qdiff [OPTION]... [FILE]...'), |
|
2506 inferrepo=True) |
2503 def diff(ui, repo, *pats, **opts): |
2507 def diff(ui, repo, *pats, **opts): |
2504 """diff of the current patch and subsequent modifications |
2508 """diff of the current patch and subsequent modifications |
2505 |
2509 |
2506 Shows a diff which includes the current patch as well as any |
2510 Shows a diff which includes the current patch as well as any |
2507 changes which have been made in the working directory since the |
2511 changes which have been made in the working directory since the |
3454 'qguard.unguarded': 'green', |
3458 'qguard.unguarded': 'green', |
3455 'qseries.applied': 'blue bold underline', |
3459 'qseries.applied': 'blue bold underline', |
3456 'qseries.guarded': 'black bold', |
3460 'qseries.guarded': 'black bold', |
3457 'qseries.missing': 'red bold', |
3461 'qseries.missing': 'red bold', |
3458 'qseries.unapplied': 'black bold'} |
3462 'qseries.unapplied': 'black bold'} |
3459 |
|
3460 commands.inferrepo += " qnew qrefresh qdiff qcommit" |
|