equal
deleted
inserted
replaced
1834 repository for patches (qinit -c may also be run later to convert |
1834 repository for patches (qinit -c may also be run later to convert |
1835 an unversioned patch repository into a versioned one). You can use |
1835 an unversioned patch repository into a versioned one). You can use |
1836 qcommit to commit changes to this queue repository. |
1836 qcommit to commit changes to this queue repository. |
1837 |
1837 |
1838 This command is deprecated. Without -c, it's implied by other relevant |
1838 This command is deprecated. Without -c, it's implied by other relevant |
1839 commands. With -c, use hg init --mq instead.""" |
1839 commands. With -c, use :hg:`init --mq` instead.""" |
1840 return qinit(ui, repo, create=opts['create_repo']) |
1840 return qinit(ui, repo, create=opts['create_repo']) |
1841 |
1841 |
1842 def clone(ui, source, dest=None, **opts): |
1842 def clone(ui, source, dest=None, **opts): |
1843 '''clone main and patch repository at same time |
1843 '''clone main and patch repository at same time |
1844 |
1844 |
1850 |
1850 |
1851 Source patch repository is looked for in <src>/.hg/patches by |
1851 Source patch repository is looked for in <src>/.hg/patches by |
1852 default. Use -p <url> to change. |
1852 default. Use -p <url> to change. |
1853 |
1853 |
1854 The patch directory must be a nested Mercurial repository, as |
1854 The patch directory must be a nested Mercurial repository, as |
1855 would be created by init --mq. |
1855 would be created by :hg:`init --mq`. |
1856 ''' |
1856 ''' |
1857 def patchdir(repo): |
1857 def patchdir(repo): |
1858 url = repo.url() |
1858 url = repo.url() |
1859 if url.endswith('/'): |
1859 if url.endswith('/'): |
1860 url = url[:-1] |
1860 url = url[:-1] |
1904 hg.update(dr, dr.changelog.tip()) |
1904 hg.update(dr, dr.changelog.tip()) |
1905 |
1905 |
1906 def commit(ui, repo, *pats, **opts): |
1906 def commit(ui, repo, *pats, **opts): |
1907 """commit changes in the queue repository (DEPRECATED) |
1907 """commit changes in the queue repository (DEPRECATED) |
1908 |
1908 |
1909 This command is deprecated; use hg commit --mq instead.""" |
1909 This command is deprecated; use :hg:`commit --mq` instead.""" |
1910 q = repo.mq |
1910 q = repo.mq |
1911 r = q.qrepo() |
1911 r = q.qrepo() |
1912 if not r: |
1912 if not r: |
1913 raise util.Abort('no queue repository') |
1913 raise util.Abort('no queue repository') |
1914 commands.commit(r.ui, r, *pats, **opts) |
1914 commands.commit(r.ui, r, *pats, **opts) |
2369 directory will automatically be updated to the most recent |
2369 directory will automatically be updated to the most recent |
2370 available ancestor of the stripped parent after the operation |
2370 available ancestor of the stripped parent after the operation |
2371 completes. |
2371 completes. |
2372 |
2372 |
2373 Any stripped changesets are stored in ``.hg/strip-backup`` as a |
2373 Any stripped changesets are stored in ``.hg/strip-backup`` as a |
2374 bundle (see ``hg help bundle`` and ``hg help unbundle``). They can |
2374 bundle (see :hg:`help bundle` and :hg:`help unbundle`). They can |
2375 be restored by running ``hg unbundle .hg/strip-backup/BUNDLE``, |
2375 be restored by running :hg:`unbundle .hg/strip-backup/BUNDLE`, |
2376 where BUNDLE is the bundle file created by the strip. Note that |
2376 where BUNDLE is the bundle file created by the strip. Note that |
2377 the local revision numbers will in general be different after the |
2377 the local revision numbers will in general be different after the |
2378 restore. |
2378 restore. |
2379 |
2379 |
2380 Use the --nobackup option to discard the backup bundle once the |
2380 Use the --nobackup option to discard the backup bundle once the |