Mercurial > hg
comparison hgext/mq.py @ 8027:9c7ca86fc658
expand "repo" to "repository" in help texts
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Tue, 07 Apr 2009 22:58:05 +0200 |
parents | 683d8ebcf434 |
children | 3aaca5901ade |
comparison
equal
deleted
inserted
replaced
8026:683d8ebcf434 | 8027:9c7ca86fc658 |
---|---|
1763 elif sr.capable('lookup'): | 1763 elif sr.capable('lookup'): |
1764 try: | 1764 try: |
1765 qbase = sr.lookup('qbase') | 1765 qbase = sr.lookup('qbase') |
1766 except error.RepoError: | 1766 except error.RepoError: |
1767 pass | 1767 pass |
1768 ui.note(_('cloning main repo\n')) | 1768 ui.note(_('cloning main repository\n')) |
1769 sr, dr = hg.clone(ui, sr.url(), dest, | 1769 sr, dr = hg.clone(ui, sr.url(), dest, |
1770 pull=opts['pull'], | 1770 pull=opts['pull'], |
1771 rev=destrev, | 1771 rev=destrev, |
1772 update=False, | 1772 update=False, |
1773 stream=opts['uncompressed']) | 1773 stream=opts['uncompressed']) |
1774 ui.note(_('cloning patch repo\n')) | 1774 ui.note(_('cloning patch repository\n')) |
1775 hg.clone(ui, opts['patches'] or patchdir(sr), patchdir(dr), | 1775 hg.clone(ui, opts['patches'] or patchdir(sr), patchdir(dr), |
1776 pull=opts['pull'], update=not opts['noupdate'], | 1776 pull=opts['pull'], update=not opts['noupdate'], |
1777 stream=opts['uncompressed']) | 1777 stream=opts['uncompressed']) |
1778 if dr.local(): | 1778 if dr.local(): |
1779 if qbase: | 1779 if qbase: |
1780 ui.note(_('stripping applied patches from destination repo\n')) | 1780 ui.note(_('stripping applied patches from destination ' |
1781 'repository\n')) | |
1781 dr.mq.strip(dr, qbase, update=False, backup=None) | 1782 dr.mq.strip(dr, qbase, update=False, backup=None) |
1782 if not opts['noupdate']: | 1783 if not opts['noupdate']: |
1783 ui.note(_('updating destination repo\n')) | 1784 ui.note(_('updating destination repository\n')) |
1784 hg.update(dr, dr.changelog.tip()) | 1785 hg.update(dr, dr.changelog.tip()) |
1785 | 1786 |
1786 def commit(ui, repo, *pats, **opts): | 1787 def commit(ui, repo, *pats, **opts): |
1787 """commit changes in the queue repository""" | 1788 """commit changes in the queue repository""" |
1788 q = repo.mq | 1789 q = repo.mq |
2478 (clone, | 2479 (clone, |
2479 [('', 'pull', None, _('use pull protocol to copy metadata')), | 2480 [('', 'pull', None, _('use pull protocol to copy metadata')), |
2480 ('U', 'noupdate', None, _('do not update the new working directories')), | 2481 ('U', 'noupdate', None, _('do not update the new working directories')), |
2481 ('', 'uncompressed', None, | 2482 ('', 'uncompressed', None, |
2482 _('use uncompressed transfer (fast over LAN)')), | 2483 _('use uncompressed transfer (fast over LAN)')), |
2483 ('p', 'patches', '', _('location of source patch repo')), | 2484 ('p', 'patches', '', _('location of source patch repository')), |
2484 ] + commands.remoteopts, | 2485 ] + commands.remoteopts, |
2485 _('hg qclone [OPTION]... SOURCE [DEST]')), | 2486 _('hg qclone [OPTION]... SOURCE [DEST]')), |
2486 "qcommit|qci": | 2487 "qcommit|qci": |
2487 (commit, | 2488 (commit, |
2488 commands.table["^commit|ci"][1], | 2489 commands.table["^commit|ci"][1], |