largefiles: restore the original converter class after lfconvert --to-normal
authorMatt Harbison <matt_harbison@yahoo.com>
Fri, 12 Jun 2015 16:11:42 -0400
changeset 25560 2b2108c35bfc
parent 25559 521c1a3139c9
child 25563 69e8384a436c
largefiles: restore the original converter class after lfconvert --to-normal Not sure how much this really matters, but much of the largefiles code that monkey-patches like this restores things when it finishes.
hgext/largefiles/lfcommands.py
--- a/hgext/largefiles/lfcommands.py	Thu Jun 11 13:02:21 2015 -0700
+++ b/hgext/largefiles/lfcommands.py	Fri Jun 12 16:11:42 2015 -0400
@@ -159,8 +159,13 @@
             if missing != 0:
                 raise util.Abort(_("all largefiles must be present locally"))
 
+            orig = convcmd.converter
             convcmd.converter = converter
-            convcmd.convert(ui, src, dest)
+
+            try:
+                convcmd.convert(ui, src, dest)
+            finally:
+                convcmd.converter = orig
         success = True
     finally:
         if tolfile: