Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 42580:eb7bd7d64a9d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Augie Fackler <augie@google.com>
date Tue, 09 Jul 2019 10:09:46 -0400
parents b8d54f4625cb 93fed084ce36
children bb135a784b70
comparison
equal deleted inserted replaced
42579:b8d54f4625cb 42580:eb7bd7d64a9d
1870 1870
1871 @command('copy|cp', 1871 @command('copy|cp',
1872 [('A', 'after', None, _('record a copy that has already occurred')), 1872 [('A', 'after', None, _('record a copy that has already occurred')),
1873 ('f', 'force', None, _('forcibly copy over an existing managed file')), 1873 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1874 ] + walkopts + dryrunopts, 1874 ] + walkopts + dryrunopts,
1875 _('[OPTION]... [SOURCE]... DEST'), 1875 _('[OPTION]... SOURCE... DEST'),
1876 helpcategory=command.CATEGORY_FILE_CONTENTS) 1876 helpcategory=command.CATEGORY_FILE_CONTENTS)
1877 def copy(ui, repo, *pats, **opts): 1877 def copy(ui, repo, *pats, **opts):
1878 """mark files as copied for the next commit 1878 """mark files as copied for the next commit
1879 1879
1880 Mark dest as having copies of source files. If dest is a 1880 Mark dest as having copies of source files. If dest is a
4697 return cmdutil.remove(ui, repo, m, "", uipathfn, after, force, subrepos, 4697 return cmdutil.remove(ui, repo, m, "", uipathfn, after, force, subrepos,
4698 dryrun=dryrun) 4698 dryrun=dryrun)
4699 4699
4700 @command('rename|move|mv', 4700 @command('rename|move|mv',
4701 [('A', 'after', None, _('record a rename that has already occurred')), 4701 [('A', 'after', None, _('record a rename that has already occurred')),
4702 ('f', 'force', None, _('forcibly copy over an existing managed file')), 4702 ('f', 'force', None, _('forcibly move over an existing managed file')),
4703 ] + walkopts + dryrunopts, 4703 ] + walkopts + dryrunopts,
4704 _('[OPTION]... SOURCE... DEST'), 4704 _('[OPTION]... SOURCE... DEST'),
4705 helpcategory=command.CATEGORY_WORKING_DIRECTORY) 4705 helpcategory=command.CATEGORY_WORKING_DIRECTORY)
4706 def rename(ui, repo, *pats, **opts): 4706 def rename(ui, repo, *pats, **opts):
4707 """rename files; equivalent of copy + remove 4707 """rename files; equivalent of copy + remove