From ae8a1ccb8fd2fdbda490f2dfc0b8a16e8a260fc7 Mon Sep 17 00:00:00 2001 From: Jun Wu Date: Tue, 16 May 2017 15:42:30 -0700 Subject: [PATCH] lfs: update old PointerDeserializationError error handling Summary: The error was renamed to `InvalidPointer`. This diff updates error handling to catch that instead. Test Plan: arc unit Reviewers: davidsp, #mercurial, rmcelroy Reviewed By: rmcelroy Subscribers: rmcelroy, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D5067496 Signature: t1:5067496:1494955510:5f0162a8cc6f1d0d83e3ab6319ec3202028684d8 --- hgext3rd/lfs/wrapper.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hgext3rd/lfs/wrapper.py b/hgext3rd/lfs/wrapper.py index f7c5f44000..eb3306714a 100644 --- a/hgext3rd/lfs/wrapper.py +++ b/hgext3rd/lfs/wrapper.py @@ -196,9 +196,9 @@ def extractpointers(repo, revs): try: metadata = pointer.deserialize(fctx.rawdata()) pointers[metadata['oid']] = metadata - except pointer.PointerDeserializationError: - raise error.Abort(_('lfs: corrupted pointer (%s@%s)\n') - % (f, short(ctx.node()))) + except pointer.InvalidPointer as ex: + raise error.Abort(_('lfs: corrupted pointer (%s@%s): %s\n') + % (f, short(ctx.node()), ex)) return pointers.values() def uploadblobs(repo, pointers):