# HG changeset patch # User Klaus Koch # Date 2010-11-07 19:18:57 # Node ID ff083040a5553e86550ee9e31e6da29304359b87 # Parent ad63e5f834e15069cfb15e473fa47d9714e30914 bundlerepository: get rid of temporary bundle files (issue2478) This bug was introduced in 40935b59518b and 6277a9469dff. diff --git a/mercurial/bundlerepo.py b/mercurial/bundlerepo.py --- a/mercurial/bundlerepo.py +++ b/mercurial/bundlerepo.py @@ -249,6 +249,8 @@ class bundlerepository(localrepo.localre def close(self): """Close assigned bundle file immediately.""" self.bundle.close() + if self.tempfile is not None: + os.unlink(self.tempfile) def __del__(self): del self.bundle diff --git a/tests/test-mq-pull-from-bundle.t b/tests/test-mq-pull-from-bundle.t --- a/tests/test-mq-pull-from-bundle.t +++ b/tests/test-mq-pull-from-bundle.t @@ -33,6 +33,7 @@ Incoming to fresh repo: comparing with main.hg 0: main: one added 1: main: one updated + $ test -f ./fresh/.hg/hg-bundle* && echo 'temp. bundle file remained' || true $ hg -R fresh tincoming bundle:fresh+main.hg comparing with bundle:fresh+main.hg @@ -58,6 +59,7 @@ Bundle queue: $ hg -R .hg/patches bundle --base=null ../queue.hgq 1 changesets found + $ test -f ./fresh/.hg/hg-bundle* && echo 'temp. bundle file remained' || true $ cd .. @@ -75,6 +77,7 @@ Incoming queue bundle: $ hg -R .hg/patches tincoming ../queue.hgq comparing with ../queue.hgq 0: queue: two.patch added + $ test -f .hg/hg-bundle* && echo 'temp. bundle file remained' || true Pull queue bundle: @@ -87,6 +90,7 @@ Pull queue bundle: added 1 changesets with 3 changes to 3 files merging series 2 files updated, 1 files merged, 0 files removed, 0 files unresolved + $ test -f .hg/patches/hg-bundle* && echo 'temp. bundle file remained' || true $ hg -R .hg/patches theads 0: queue: two.patch added