comparison mercurial/commands.py @ 15197:7f65ce5cc011

import: improve error reporting

When applying a series of patch files, it's nice to be explicitly told *which* file is broken.

15196:7f78a4137f8f

        parents = repo.parents()
        for patchurl in patches:
            if patchurl == '-':
                ui.status(_('applying patch from stdin\n'))
                patchfile = ui.fin
            else:
                patchurl = os.path.join(base, patchurl)
                ui.status(_('applying %s\n') % patchurl)
                patchfile = url.open(ui, patchurl)

                    parents = repo.parents()
                else:
                    parents = [repo[node]]

            if not haspatch:
                raise util.Abort(_('no diffs found'))

        if msgs:
            repo.savecommitmessage('\n* * *\n'.join(msgs))
    finally:
        release(lock, wlock)

15197:7f65ce5cc011

        parents = repo.parents()
        for patchurl in patches:
            if patchurl == '-':
                ui.status(_('applying patch from stdin\n'))
                patchfile = ui.fin
                patchurl = 'stdin'      # for error message
            else:
                patchurl = os.path.join(base, patchurl)
                ui.status(_('applying %s\n') % patchurl)
                patchfile = url.open(ui, patchurl)

                    parents = repo.parents()
                else:
                    parents = [repo[node]]

            if not haspatch:
                raise util.Abort(_('%s: no diffs found') % patchurl)

        if msgs:
            repo.savecommitmessage('\n* * *\n'.join(msgs))
    finally:
        release(lock, wlock)