q,quiet don't show progress meter
smaller= only back up files smaller than n bytes
bwlimit= maximum bytes/sec to transmit to server
+f,indexfile= the name of the index file (normally BUP_DIR/bupindex)
+strip strips the path to every filename given
+strip-path= path-prefix to be stripped when saving
"""
o = options.Options('bup save', optspec)
(opt, flags, extra) = o.parse(sys.argv[1:])
else:
date = time.time()
+if opt.strip and opt.strip_path:
+ o.fatal("--strip is incompatible with --strip-path")
+
is_reverse = os.environ.get('BUP_SERVER_REVERSE')
if is_reverse and opt.remote:
o.fatal("don't use -r in reverse mode; it's automatic")
refname = opt.name and 'refs/heads/%s' % opt.name or None
if opt.remote or is_reverse:
- if opt.remote and opt.remote.find(":") == -1:
- o.fatal("--remote argument must contain a colon")
- try:
- cli = client.Client(opt.remote)
- except client.ClientError:
- o.fatal("server exited unexpectedly; see errors above")
+ cli = client.Client(opt.remote)
oldref = refname and cli.read_ref(refname) or None
w = cli.new_packwriter()
else:
shalist = shalists.pop()
tree = force_tree or w.new_tree(shalist)
if shalists:
- shalists[-1].append(('40000', part, tree))
+ shalists[-1].append(('40000',
+ git.mangle_name(part, 040000, 40000),
+ tree))
else: # this was the toplevel, so put it back for sanity
shalists.append(shalist)
return tree
log(s)
-r = index.Reader(git.repo('bupindex'))
+indexfile = opt.indexfile or git.repo('bupindex')
+print indexfile
+r = index.Reader(indexfile)
def already_saved(ent):
return ent.is_valid() and w.exists(ent.sha) and ent.sha
continue
assert(dir.startswith('/'))
- dirp = dir.split('/')
+ if opt.strip:
+ stripped_base_path = strip_base_path(dir, extra)
+ dirp = stripped_base_path.split('/')
+ elif opt.strip_path:
+ dirp = strip_path(opt.strip_path, dir).split('/')
+ else:
+ dirp = dir.split('/')
while parts > dirp:
_pop(force_tree = None)
if dir != '/':
add_error(e)
lastskip_name = ent.name
else:
- (mode, id) = hashsplit.split_to_blob_or_tree(w, [f], False)
+ try:
+ (mode, id) = hashsplit.split_to_blob_or_tree(w, [f],
+ keep_boundaries=False)
+ except IOError, e:
+ add_error('%s: %s' % (ent.name, e))
+ lastskip_name = ent.name
else:
if stat.S_ISDIR(ent.mode):
assert(0) # handled above