#!/usr/bin/env python
import sys, stat, time, math
+from cStringIO import StringIO
+from errno import EACCES
+
from bup import hashsplit, git, options, index, client, metadata, hlinkdb
from bup.helpers import *
from bup.hashsplit import GIT_MODE_TREE, GIT_MODE_FILE, GIT_MODE_SYMLINK
o.fatal("'%s' is not a valid branch name" % opt.name)
refname = opt.name and 'refs/heads/%s' % opt.name or None
if opt.remote or is_reverse:
- cli = client.Client(opt.remote)
+ try:
+ cli = client.Client(opt.remote)
+ except client.ClientError, e:
+ log('error: %s' % e)
+ sys.exit(1)
oldref = refname and cli.read_ref(refname) or None
- w = cli.new_packwriter()
+ w = cli.new_packwriter(compression_level=opt.compress)
else:
cli = None
oldref = refname and git.read_ref(refname) or None
metalist = [('', dir_metadata)] + metalist[1:]
sorted_metalist = sorted(metalist, key = lambda x : x[0])
metadata = ''.join([m[1].encode() for m in sorted_metalist])
- shalist.append((0100644, '.bupm', w.new_blob(metadata)))
- tree = force_tree or w.new_tree(shalist)
+ metadata_f = StringIO(metadata)
+ mode, id = hashsplit.split_to_blob_or_tree(w.new_blob, w.new_tree,
+ [metadata_f],
+ keep_boundaries=False)
+ shalist.append((mode, '.bupm', id))
+ # FIXME: only test if collision is possible (i.e. given --strip, etc.)?
+ if force_tree:
+ tree = force_tree
+ else:
+ names_seen = set()
+ clean_list = []
+ for x in shalist:
+ name = x[1]
+ if name in names_seen:
+ parent_path = '/'.join(parts) + '/'
+ add_error('error: ignoring duplicate path %r in %r'
+ % (name, parent_path))
+ else:
+ names_seen.add(name)
+ clean_list.append(x)
+ tree = w.new_tree(clean_list)
if shalists:
shalists[-1].append((GIT_MODE_TREE,
git.mangle_name(part,
indexfile = opt.indexfile or git.repo('bupindex')
r = index.Reader(indexfile)
-if not os.access(indexfile + '.meta', os.W_OK|os.R_OK):
- log('error: cannot access "%s"; have you run bup index?' % indexfile)
+try:
+ msr = index.MetaStoreReader(indexfile + '.meta')
+except IOError, ex:
+ if ex.errno != EACCES:
+ raise
+ log('error: cannot access %r; have you run bup index?' % indexfile)
sys.exit(1)
-msr = index.MetaStoreReader(indexfile + '.meta')
hlink_db = hlinkdb.HLinkDB(indexfile + '.hlink')
def already_saved(ent):
continue
if opt.smaller and ent.size >= opt.smaller:
if exists and not hashvalid:
- add_error('skipping large file "%s"' % ent.name)
+ if opt.verbose:
+ log('skipping large file "%s"\n' % ent.name)
lastskip_name = ent.name
continue
# ...].
if first_root == None:
- dir_name, fs_path = dirp[0]
first_root = dirp[0]
- # Not indexed, so just grab the FS metadata or use empty metadata.
- try:
- meta = metadata.from_path(fs_path) if fs_path else metadata.Metadata()
- except (OSError, IOError), e:
- add_error(e)
- lastskip_name = dir_name
- else:
- _push(dir_name, meta)
elif first_root != dirp[0]:
root_collision = True
except (OSError, IOError), e:
add_error(e)
lastskip_name = dir_name
- else:
- _push(dir_name, meta)
+ meta = metadata.Metadata()
+ _push(dir_name, meta)
if not file:
if len(parts) == 1:
if opt.tree:
print tree.encode('hex')
if opt.commit or opt.name:
- msg = 'bup save\n\nGenerated by command:\n%r' % sys.argv
+ msg = 'bup save\n\nGenerated by command:\n%r\n' % sys.argv
commit = w.new_commit(oldref, tree, date, msg)
if opt.commit:
print commit.encode('hex')