Mercurial > public > mercurial-scm > hg

comparison mercurial/cmdutil.py @ 39348:cde75233c415

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename: quote hg commands in warnings I think we usally use single quotes around hg commands in messages. Differential Revision: https://phab.mercurial-scm.org/D4417
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 29 Aug 2018 09:50:39 -0700
parents 6b81d2ff118f
children 534e451b6dda
comparison
equal deleted inserted replaced
39347:ad1c6bd3c676 39348:cde75233c415
1205 if after: 1205 if after:
1206 flags = '--after --force' 1206 flags = '--after --force'
1207 else: 1207 else:
1208 flags = '--force' 1208 flags = '--force'
1209 if rename: 1209 if rename:
1210 hint = _('(hg rename %s to replace the file by ' 1210 hint = _("('hg rename %s' to replace the file by "
1211 'recording a rename)\n') % flags 1211 'recording a rename)\n') % flags
1212 else: 1212 else:
1213 hint = _('(hg copy %s to replace the file by ' 1213 hint = _("('hg copy %s' to replace the file by "
1214 'recording a copy)\n') % flags 1214 'recording a copy)\n') % flags
1215 else: 1215 else:
1216 msg = _('%s: not overwriting - file exists\n') 1216 msg = _('%s: not overwriting - file exists\n')
1217 if rename: 1217 if rename:
1218 hint = _('(hg rename --after to record the rename)\n') 1218 hint = _("('hg rename --after' to record the rename)\n")
1219 else: 1219 else:
1220 hint = _('(hg copy --after to record the copy)\n') 1220 hint = _("('hg copy --after' to record the copy)\n")
1221 ui.warn(msg % reltarget) 1221 ui.warn(msg % reltarget)
1222 ui.warn(hint) 1222 ui.warn(hint)
1223 return 1223 return
1224 1224
1225 if after: 1225 if after: