[PATCH] hg: move return statement after finally block

Simon Heimberg simohe at besonet.ch
Mon Jun 10 11:53:01 CDT 2013


# HG changeset patch
# User simon at laptop-tosh
# Date 1370723828 -7200
# Node ID c38b726c2d54d6e03a5c40bee15146903522776c
# Parent  6f047263d6db2ac50b79a69d9bbb3379ccaf63b3
hg: move return statement after finally block

return is always run after finally block. Now we have same functionality,
but clearer readability.

diff -r 6f047263d6db -r c38b726c2d54 mercurial/hg.py
--- a/mercurial/hg.py	Sam Jun 08 20:20:14 2013 +0200
+++ b/mercurial/hg.py	Sam Jun 08 22:37:08 2013 +0200
@@ -437,14 +437,13 @@
                 _update(destrepo, uprev)
                 if update in destrepo._bookmarks:
                     bookmarks.setcurrent(destrepo, update)
-
-        return srcpeer, destpeer
     finally:
         release(srclock, destlock)
         if cleandir is not None:
             shutil.rmtree(cleandir, True)
         if srcpeer is not None:
             srcpeer.close()
+    return srcpeer, destpeer
 
 def _showstats(repo, stats):
     repo.ui.status(_("%d files updated, %d files merged, "


More information about the Mercurial-devel mailing list