largefiles: use try/except/finally

hgext/largefiles/overrides.py

@@ -578,7 +578,6 def overridecopy(orig, ui, repo, pats, o
     nolfiles = False
     installnormalfilesmatchfn(repo[None].manifest())
     try:
-        try:
             result = orig(ui, repo, pats, opts, rename)
         except util.Abort, e:
             if str(e) != _('no files to copy'):
@@ -608,7 +607,6 def overridecopy(orig, ui, repo, pats, o
             os.makedirs(makestandin(dest))
 
     try:
-        try:
             # When we call orig below it creates the standins but we don't add
             # them to the dir state until later so lock during that time.
             wlock = repo.wlock()

hgext/largefiles/proto.py

@@ -31,7 +31,6 def putlfile(repo, proto, sha):
     tmpfp = util.atomictempfile(path, createmode=repo.store.createmode)
 
     try:
-        try:
             proto.getfile(tmpfp)
             tmpfp._fp.seek(0)
             if sha != lfutil.hexsha1(tmpfp._fp):

hgext/largefiles/remotestore.py

@@ -36,13 +36,12 class remotestore(basestore.basestore):
         self.ui.debug('remotestore: sendfile(%s, %s)\n' % (filename, hash))
         fd = None
         try:
-            try:
                 fd = lfutil.httpsendfile(self.ui, filename)
+            return self._put(hash, fd)
             except IOError, e:
                 raise util.Abort(
                     _('remotestore: could not open file %s: %s')
                     % (filename, str(e)))
-            return self._put(hash, fd)
         finally:
             if fd:
                 fd.close()