##// END OF EJS Templates
import: limit scope of msg in tryimportone
timeless -
r27611:fa8c491f default
parent child Browse files
Show More
@@ -883,7 +883,6 b' def tryimportone(ui, repo, hunk, parents'
883 sim = float(opts.get('similarity') or 0)
883 sim = float(opts.get('similarity') or 0)
884 if not tmpname:
884 if not tmpname:
885 return (None, None, False)
885 return (None, None, False)
886 msg = _('applied to working directory')
887
886
888 rejects = False
887 rejects = False
889
888
@@ -1009,6 +1008,7 b' def tryimportone(ui, repo, hunk, parents'
1009 ui.warn(_("warning: can't check exact import with --no-commit\n"))
1008 ui.warn(_("warning: can't check exact import with --no-commit\n"))
1010 elif opts.get('exact') and hex(n) != nodeid:
1009 elif opts.get('exact') and hex(n) != nodeid:
1011 raise error.Abort(_('patch is damaged or loses information'))
1010 raise error.Abort(_('patch is damaged or loses information'))
1011 msg = _('applied to working directory')
1012 if n:
1012 if n:
1013 # i18n: refers to a short changeset id
1013 # i18n: refers to a short changeset id
1014 msg = _('created %s') % short(n)
1014 msg = _('created %s') % short(n)
General Comments 0
You need to be logged in to leave comments. Login now