-#!/usr/bin/env python
-import sys, os, re, stat, readline, fnmatch
-from bup import options, git, shquote, vfs
-from bup.helpers import *
-
-def print_node(text, n):
- if stat.S_ISDIR(n.mode):
- print '%s/' % text
- elif stat.S_ISLNK(n.mode):
- print '%s@' % text
- else:
- print '%s' % text
+#!/bin/sh
+"""": # -*-python-*-
+bup_python="$(dirname "$0")/bup-python" || exit $?
+exec "$bup_python" "$0" ${1+"$@"}
+"""
+# end of bup preamble
+# For now, this completely relies on the assumption that the current
+# encoding (LC_CTYPE, etc.) is ASCII compatible, and that it returns
+# the exact same bytes from a decode/encode round-trip (or the reverse
+# (e.g. ISO-8859-1).
-def do_ls(path, n):
- if stat.S_ISDIR(n.mode):
- for sub in n:
- print_node(sub.name, sub)
- else:
- print_node(path, n)
+from __future__ import absolute_import, print_function
+import sys, os, stat, fnmatch
+
+from bup import options, git, shquote, ls, vfs
+from bup.compat import argv_bytes, input
+from bup.helpers import chunkyreader, handle_ctrl_c, log
+from bup.io import byte_stream, path_msg
+from bup.repo import LocalRepo
+
+handle_ctrl_c()
+
+
+class OptionError(Exception):
+ pass
+
+
+def input_bytes(s):
+ return s.encode('iso-8859-1')
+
+
+def do_ls(repo, args, out):
+ try:
+ opt = ls.opts_from_cmdline(args, onabort=OptionError)
+ except OptionError as e:
+ log('error: %s' % e)
+ return
+ return ls.within_repo(repo, opt, out)
def write_to_file(inf, outf):
for blob in chunkyreader(inf):
outf.write(blob)
-
+
def inputiter():
if os.isatty(sys.stdin.fileno()):
while 1:
try:
- yield raw_input('bup> ')
+ yield input('bup> ')
except EOFError:
+ print() # Clear the line for the terminal's next prompt
break
else:
for line in sys.stdin:
yield line
-def _completer_get_subs(line):
+def _completer_get_subs(repo, line):
(qtype, lastword) = shquote.unfinished_word(line)
- (dir,name) = os.path.split(lastword)
- #log('\ncompleter: %r %r %r\n' % (qtype, lastword, text))
- n = pwd.resolve(dir)
- subs = list(filter(lambda x: x.name.startswith(name),
- n.subs()))
- return (dir, name, qtype, lastword, subs)
+ dir, name = os.path.split(lastword.encode('iso-8859-1'))
+ dir_path = vfs.resolve(repo, dir or b'/')
+ _, dir_item = dir_path[-1]
+ if not dir_item:
+ subs = tuple()
+ else:
+ subs = tuple(dir_path + (entry,)
+ for entry in vfs.contents(repo, dir_item)
+ if (entry[0] != b'.' and entry[0].startswith(name)))
+ return qtype, lastword, subs
_last_line = None
_last_res = None
-def completer(text, state):
+def completer(text, iteration):
+ global repo
global _last_line
global _last_res
try:
line = readline.get_line_buffer()[:readline.get_endidx()]
if _last_line != line:
- _last_res = _completer_get_subs(line)
+ _last_res = _completer_get_subs(repo, line)
_last_line = line
- (dir, name, qtype, lastword, subs) = _last_res
- if state < len(subs):
- sn = subs[state]
- sn1 = sn.resolve('') # deref symlinks
- fullname = os.path.join(dir, sn.name)
- if stat.S_ISDIR(sn1.mode):
- ret = shquote.what_to_add(qtype, lastword, fullname+'/',
+ qtype, lastword, subs = _last_res
+ if iteration < len(subs):
+ path = subs[iteration]
+ leaf_name, leaf_item = path[-1]
+ res = vfs.try_resolve(repo, leaf_name, parent=path[:-1])
+ leaf_name, leaf_item = res[-1]
+ fullname = os.path.join(*(name for name, item in res))
+ if stat.S_ISDIR(vfs.item_mode(leaf_item)):
+ ret = shquote.what_to_add(qtype, lastword,
+ fullname.decode('iso-8859-1') + '/',
terminate=False)
else:
- ret = shquote.what_to_add(qtype, lastword, fullname,
- terminate=True) + ' '
+ ret = shquote.what_to_add(qtype, lastword,
+ fullname.decode('iso-8859-1'),
+ terminate=True) + b' '
return text + ret
- except Exception, e:
- log('\nerror in completion: %s\n' % e)
+ except Exception as e:
+ log('\n')
+ try:
+ import traceback
+ traceback.print_tb(sys.exc_traceback)
+ except Exception as e2:
+ log('Error printing traceback: %s\n' % e2)
+ log('\nError in completion: %s\n' % e)
+
-
optspec = """
-bup ftp
+bup ftp [commands...]
"""
-o = options.Options('bup ftp', optspec)
+o = options.Options(optspec)
(opt, flags, extra) = o.parse(sys.argv[1:])
git.check_repo_or_die()
-top = vfs.RefList(None)
-pwd = top
+sys.stdout.flush()
+out = byte_stream(sys.stdout)
+repo = LocalRepo()
+pwd = vfs.resolve(repo, b'/')
+rv = 0
if extra:
lines = extra
else:
- readline.set_completer_delims(' \t\n\r/')
- readline.set_completer(completer)
- readline.parse_and_bind("tab: complete")
+ try:
+ import readline
+ except ImportError:
+ log('* readline module not available: line editing disabled.\n')
+ readline = None
+
+ if readline:
+ readline.set_completer_delims(' \t\n\r/')
+ readline.set_completer(completer)
+ if sys.platform.startswith('darwin'):
+ # MacOS uses a slightly incompatible clone of libreadline
+ readline.parse_and_bind('bind ^I rl_complete')
+ readline.parse_and_bind('tab: complete')
lines = inputiter()
for line in lines:
#log('execute: %r %r\n' % (cmd, parm))
try:
if cmd == 'ls':
- for parm in (words[1:] or ['.']):
- do_ls(parm, pwd.resolve(parm))
+ # FIXME: respect pwd (perhaps via ls accepting resolve path/parent)
+ do_ls(repo, words[1:], out)
elif cmd == 'cd':
+ np = pwd
for parm in words[1:]:
- pwd = pwd.resolve(parm)
+ res = vfs.resolve(repo, input_bytes(parm), parent=np)
+ _, leaf_item = res[-1]
+ if not leaf_item:
+ raise Exception('%s does not exist'
+ % path_msg(b'/'.join(name for name, item
+ in res)))
+ if not stat.S_ISDIR(vfs.item_mode(leaf_item)):
+ raise Exception('%s is not a directory' % path_msg(parm))
+ np = res
+ pwd = np
elif cmd == 'pwd':
- print pwd.fullname()
+ if len(pwd) == 1:
+ out.write(b'/')
+ out.write(b'/'.join(name for name, item in pwd) + b'\n')
elif cmd == 'cat':
for parm in words[1:]:
- write_to_file(pwd.resolve(parm).open(), sys.stdout)
+ res = vfs.resolve(repo, input_bytes(parm), parent=pwd)
+ _, leaf_item = res[-1]
+ if not leaf_item:
+ raise Exception('%s does not exist' %
+ path_msg(b'/'.join(name for name, item
+ in res)))
+ with vfs.fopen(repo, leaf_item) as srcfile:
+ write_to_file(srcfile, out)
elif cmd == 'get':
if len(words) not in [2,3]:
+ rv = 1
raise Exception('Usage: get <filename> [localname]')
- rname = words[1]
+ rname = input_bytes(words[1])
(dir,base) = os.path.split(rname)
- lname = len(words)>2 and words[2] or base
- log('Saving %r\n' % lname)
- inf = pwd.resolve(rname).open()
- write_to_file(inf, open(lname, 'wb'))
+ lname = input_bytes(len(words) > 2 and words[2] or base)
+ res = vfs.resolve(repo, rname, parent=pwd)
+ _, leaf_item = res[-1]
+ if not leaf_item:
+ raise Exception('%s does not exist' %
+ path_msg(b'/'.join(name for name, item in res)))
+ with vfs.fopen(repo, leaf_item) as srcfile:
+ with open(lname, 'wb') as destfile:
+ log('Saving %s\n' % path_msg(lname))
+ write_to_file(srcfile, destfile)
elif cmd == 'mget':
for parm in words[1:]:
- (dir,base) = os.path.split(parm)
- for n in pwd.resolve(dir).subs():
- if fnmatch.fnmatch(n.name, base):
- try:
- log('Saving %r\n' % n.name)
- inf = n.open()
- outf = open(n.name, 'wb')
- write_to_file(inf, outf)
- outf.close()
- except Exception, e:
- log(' error: %s\n' % e)
+ dir, base = os.path.split(input_bytes(parm))
+
+ res = vfs.resolve(repo, dir, parent=pwd)
+ _, dir_item = res[-1]
+ if not dir_item:
+ raise Exception('%s does not exist' % path_msg(dir))
+ for name, item in vfs.contents(repo, dir_item):
+ if name == b'.':
+ continue
+ if fnmatch.fnmatch(name, base):
+ if stat.S_ISLNK(vfs.item_mode(item)):
+ deref = vfs.resolve(repo, name, parent=res)
+ deref_name, deref_item = deref[-1]
+ if not deref_item:
+ raise Exception('%s does not exist' %
+ path_msg('/'.join(name for name, item
+ in deref)))
+ item = deref_item
+ with vfs.fopen(repo, item) as srcfile:
+ with open(name, 'wb') as destfile:
+ log('Saving %s\n' % path_msg(name))
+ write_to_file(srcfile, destfile)
elif cmd == 'help' or cmd == '?':
+ # FIXME: move to stdout
log('Commands: ls cd pwd cat get mget help quit\n')
- elif cmd == 'quit' or cmd == 'exit' or cmd == 'bye':
+ elif cmd in ('quit', 'exit', 'bye'):
break
else:
+ rv = 1
raise Exception('no such command %r' % cmd)
- except Exception, e:
+ except Exception as e:
+ rv = 1
log('error: %s\n' % e)
- #raise
+ raise
+
+sys.exit(rv)
projects / bup.git / blobdiff