"""
from __future__ import absolute_import, print_function
-import os, sys, zlib, subprocess, struct, stat, re, tempfile, glob
+import os, sys, zlib, subprocess, struct, stat, re, glob
from array import array
from binascii import hexlify, unhexlify
from collections import namedtuple
+from contextlib import ExitStack
from itertools import islice
+from shutil import rmtree
from bup import _helpers, hashsplit, path, midx, bloom, xstat
from bup.compat import (buffer,
byte_int, bytes_from_byte, bytes_from_uint,
environ,
- ExitStack,
pending_raise,
reraise)
from bup.io import path_msg
mmap_read, mmap_readwrite,
nullcontext_if_not,
progress, qprogress, stat_if_exists,
+ temp_dir,
unlink,
utc_offset_str)
self.parentfd = None
self.count = 0
self.outbytes = 0
- self.filename = None
+ self.tmpdir = None
self.idx = None
self.objcache_maker = objcache_maker
self.objcache = None
def _open(self):
if not self.file:
- objdir = dir = os.path.join(self.repo_dir, b'objects')
- fd, name = tempfile.mkstemp(suffix=b'.pack', dir=objdir)
- try:
- self.file = os.fdopen(fd, 'w+b')
- except:
- os.close(fd)
- raise
- try:
- self.parentfd = os.open(objdir, os.O_RDONLY)
- except:
- f = self.file
- self.file = None
- f.close()
- raise
- assert name.endswith(b'.pack')
- self.filename = name[:-5]
- self.file.write(b'PACK\0\0\0\2\0\0\0\0')
- self.idx = PackIdxV2Writer()
+ with ExitStack() as err_stack:
+ objdir = dir = os.path.join(self.repo_dir, b'objects')
+ self.tmpdir = err_stack.enter_context(temp_dir(dir=objdir, prefix=b'pack-tmp-'))
+ self.file = err_stack.enter_context(open(self.tmpdir + b'/pack', 'w+b'))
+ self.parentfd = err_stack.enter_context(finalized(os.open(objdir, os.O_RDONLY),
+ lambda x: os.close(x)))
+ self.file.write(b'PACK\0\0\0\2\0\0\0\0')
+ self.idx = PackIdxV2Writer()
+ err_stack.pop_all()
def _raw_write(self, datalist, sha):
self._open()
def _end(self, run_midx=True, abort=False):
# Ignores run_midx during abort
+ self.tmpdir, tmpdir = None, self.tmpdir
self.parentfd, pfd, = None, self.parentfd
self.file, f = None, self.file
self.idx, idx = None, self.idx
with nullcontext_if_not(self.objcache), \
finalized(pfd, lambda x: x is not None and os.close(x)), \
nullcontext_if_not(f):
- if not f:
- return None
-
- if abort:
- os.unlink(self.filename + b'.pack')
+ if abort or not f:
return None
# update object count
fdatasync(f.fileno())
f.close()
- idx.write(self.filename + b'.idx', packbin)
+ idx.write(tmpdir + b'/idx', packbin)
nameprefix = os.path.join(self.repo_dir,
b'objects/pack/pack-' + hexlify(packbin))
- if os.path.exists(self.filename + b'.map'):
- os.unlink(self.filename + b'.map')
- os.rename(self.filename + b'.pack', nameprefix + b'.pack')
- os.rename(self.filename + b'.idx', nameprefix + b'.idx')
+ os.rename(tmpdir + b'/pack', nameprefix + b'.pack')
+ os.rename(tmpdir + b'/idx', nameprefix + b'.idx')
os.fsync(pfd)
if run_midx:
auto_midx(os.path.join(self.repo_dir, b'objects/pack'))
self.on_pack_finish(nameprefix)
return nameprefix
finally:
+ if tmpdir:
+ rmtree(tmpdir)
# Must be last -- some of the code above depends on it
self.objcache = None
_git_wait('git update-ref', p)
-def guess_repo(path=None):
- """Set the path value in the global variable "repodir".
- This makes bup look for an existing bup repository, but not fail if a
- repository doesn't exist. Usually, if you are interacting with a bup
- repository, you would not be calling this function but using
- check_repo_or_die().
+def guess_repo():
+ """Return the global repodir or BUP_DIR when either is set, or ~/.bup.
+ Usually, if you are interacting with a bup repository, you would
+ not be calling this function but using check_repo_or_die().
+
"""
- global repodir
- if path:
- repodir = path
- if not repodir:
- repodir = environ.get(b'BUP_DIR')
- if not repodir:
- repodir = os.path.expanduser(b'~/.bup')
+ if repodir:
+ return repodir
+ repo = environ.get(b'BUP_DIR')
+ if not repo:
+ repo = os.path.expanduser(b'~/.bup')
+ return repo
def init_repo(path=None):
"""Create the Git bare repository for bup in a given path."""
- guess_repo(path)
+ global repodir
+ repodir = path or guess_repo()
d = repo() # appends a / to the path
parent = os.path.dirname(os.path.dirname(d))
if parent and not os.path.exists(parent):
def check_repo_or_die(path=None):
"""Check to see if a bup repository probably exists, and abort if not."""
- guess_repo(path)
+ global repodir
+ repodir = path or guess_repo()
top = repo()
pst = stat_if_exists(top + b'/objects/pack')
if pst and stat.S_ISDIR(pst.st_mode):