##// END OF EJS Templates
import: improve error reporting...
Greg Ward -
r15197:7f65ce5c default
parent child Browse files
Show More
@@ -3375,6 +3375,7 b' def import_(ui, repo, patch1, *patches, '
3375 if patchurl == '-':
3375 if patchurl == '-':
3376 ui.status(_('applying patch from stdin\n'))
3376 ui.status(_('applying patch from stdin\n'))
3377 patchfile = ui.fin
3377 patchfile = ui.fin
3378 patchurl = 'stdin' # for error message
3378 else:
3379 else:
3379 patchurl = os.path.join(base, patchurl)
3380 patchurl = os.path.join(base, patchurl)
3380 ui.status(_('applying %s\n') % patchurl)
3381 ui.status(_('applying %s\n') % patchurl)
@@ -3392,7 +3393,7 b' def import_(ui, repo, patch1, *patches, '
3392 parents = [repo[node]]
3393 parents = [repo[node]]
3393
3394
3394 if not haspatch:
3395 if not haspatch:
3395 raise util.Abort(_('no diffs found'))
3396 raise util.Abort(_('%s: no diffs found') % patchurl)
3396
3397
3397 if msgs:
3398 if msgs:
3398 repo.savecommitmessage('\n* * *\n'.join(msgs))
3399 repo.savecommitmessage('\n* * *\n'.join(msgs))
General Comments 0
You need to be logged in to leave comments. Login now