-#!/usr/bin/env python
-import sys, stat, time, math
-from cStringIO import StringIO
+#!/bin/sh
+"""": # -*-python-*-
+bup_python="$(dirname "$0")/bup-python" || exit $?
+exec "$bup_python" "$0" ${1+"$@"}
+"""
+# end of bup preamble
+
+from __future__ import absolute_import, print_function
from errno import EACCES
+from io import BytesIO
+import os, sys, stat, time, math
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
+from bup.helpers import (add_error, grafted_path_components, handle_ctrl_c,
+ hostname, istty2, log, parse_date_or_fatal, parse_num,
+ path_components, progress, qprogress, resolve_parent,
+ saved_errors, stripped_path_components,
+ valid_save_name)
+from bup.pwdgrp import userfullname, username
optspec = """
old_path, new_path = splitted_parameter
if not (old_path and new_path):
o.fatal("a graft point cannot be empty")
- graft_points.append((realpath(old_path), realpath(new_path)))
+ graft_points.append((resolve_parent(old_path),
+ resolve_parent(new_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")
-if opt.name and opt.name.startswith('.'):
+if opt.name and not valid_save_name(opt.name):
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:
try:
cli = client.Client(opt.remote)
- except client.ClientError, e:
+ except client.ClientError as e:
log('error: %s' % e)
sys.exit(1)
oldref = refname and cli.read_ref(refname) or None
else:
return dir
-
# Metadata is stored in a file named .bupm in each directory. The
# first metadata entry will be the metadata for the current directory.
# The remaining entries will be for each of the other directory
metalist = [('', dir_metadata)] + metalist[1:]
sorted_metalist = sorted(metalist, key = lambda x : x[0])
metadata = ''.join([m[1].encode() for m in sorted_metalist])
- metadata_f = StringIO(metadata)
+ metadata_f = BytesIO(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))
- tree = force_tree or w.new_tree(shalist)
+ # 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,
r = index.Reader(indexfile)
try:
msr = index.MetaStoreReader(indexfile + '.meta')
-except IOError, ex:
+except IOError as ex:
if ex.errno != EACCES:
raise
log('error: cannot access %r; have you run bup index?' % indexfile)
dir_name, fs_path = path_component
# 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:
+ meta = metadata.from_path(fs_path, normalized=True) \
+ if fs_path else metadata.Metadata()
+ except (OSError, IOError) as 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 stat.S_ISREG(ent.mode):
try:
f = hashsplit.open_noatime(ent.name)
- except (IOError, OSError), e:
+ except (IOError, OSError) as e:
add_error(e)
lastskip_name = ent.name
else:
(mode, id) = hashsplit.split_to_blob_or_tree(
w.new_blob, w.new_tree, [f],
keep_boundaries=False)
- except (IOError, OSError), e:
+ except (IOError, OSError) as e:
add_error('%s: %s' % (ent.name, e))
lastskip_name = ent.name
else:
elif stat.S_ISLNK(ent.mode):
try:
rl = os.readlink(ent.name)
- except (OSError, IOError), e:
+ except (OSError, IOError) as e:
add_error(e)
lastskip_name = ent.name
else:
sort_key = git.shalist_item_sort_key((ent.mode, file, id))
hlink = find_hardlink_target(hlink_db, ent)
try:
- meta = metadata.from_path(ent.name, hardlink_target=hlink)
- except (OSError, IOError), e:
+ meta = metadata.from_path(ent.name, hardlink_target=hlink,
+ normalized=True)
+ except (OSError, IOError) as e:
add_error(e)
lastskip_name = ent.name
else:
dir_metadata = metadata.Metadata() if root_collision else None)
if opt.tree:
- print tree.encode('hex')
+ print(tree.encode('hex'))
if opt.commit or opt.name:
msg = 'bup save\n\nGenerated by command:\n%r\n' % sys.argv
- commit = w.new_commit(oldref, tree, date, msg)
+ userline = '%s <%s@%s>' % (userfullname(), username(), hostname())
+ commit = w.new_commit(tree, oldref, userline, date, None,
+ userline, date, None, msg)
if opt.commit:
- print commit.encode('hex')
+ print(commit.encode('hex'))
msr.close()
w.close() # must close before we can update the ref
projects / bup.git / blobdiff