equal
deleted
inserted
replaced
5 # |
5 # |
6 # This software may be used and distributed according to the terms |
6 # This software may be used and distributed according to the terms |
7 # of the GNU General Public License, incorporated herein by reference. |
7 # of the GNU General Public License, incorporated herein by reference. |
8 |
8 |
9 from i18n import _ |
9 from i18n import _ |
|
10 from lock import release |
10 import localrepo, bundlerepo, httprepo, sshrepo, statichttprepo |
11 import localrepo, bundlerepo, httprepo, sshrepo, statichttprepo |
11 import errno, lock, os, shutil, util, extensions, error |
12 import errno, lock, os, shutil, util, extensions, error |
12 import merge as _merge |
13 import merge as _merge |
13 import verify as _verify |
14 import verify as _verify |
14 |
15 |
247 continue |
248 continue |
248 _update(dest_repo, uprev) |
249 _update(dest_repo, uprev) |
249 |
250 |
250 return src_repo, dest_repo |
251 return src_repo, dest_repo |
251 finally: |
252 finally: |
252 del src_lock, dest_lock, dir_cleanup |
253 release(src_lock, dest_lock) |
|
254 del dir_cleanup |
253 |
255 |
254 def _showstats(repo, stats): |
256 def _showstats(repo, stats): |
255 stats = ((stats[0], _("updated")), |
257 stats = ((stats[0], _("updated")), |
256 (stats[1], _("merged")), |
258 (stats[1], _("merged")), |
257 (stats[2], _("removed")), |
259 (stats[2], _("removed")), |