comparison mercurial/scmutil.py @ 42576:ea6558db1011

extdata: avoid crashing inside subprocess when we get a revset parse error

Differential Revision: https://phab.mercurial-scm.org/D6616

42575:eec65b706caf

                data[revsingle(repo, k).rev()] = encoding.tolocal(v)
            except (error.LookupError, error.RepoLookupError):
                pass # we ignore data for nodes that don't exist locally
    finally:
        if proc:
            proc.communicate()
        if src:
            src.close()
    if proc and proc.returncode != 0:
        raise error.Abort(_("extdata command '%s' failed: %s")
                          % (cmd, procutil.explainexit(proc.returncode)))

42576:ea6558db1011

                data[revsingle(repo, k).rev()] = encoding.tolocal(v)
            except (error.LookupError, error.RepoLookupError):
                pass # we ignore data for nodes that don't exist locally
    finally:
        if proc:
            try:
                proc.communicate()
            except ValueError:
                # This happens if we started iterating src and then
                # get a parse error on a line. It should be safe to ignore.
                pass
        if src:
            src.close()
    if proc and proc.returncode != 0:
        raise error.Abort(_("extdata command '%s' failed: %s")
                          % (cmd, procutil.explainexit(proc.returncode)))