split: use // not / for division

[bup.git] / cmd / split-cmd.py

diff --git a/cmd/split-cmd.py b/cmd/split-cmd.py
index fd8a99c2ddc9f1758a5bd69930fdc64607ea804f..500fb194110679e11a184e13ce2acf39057e85b4 100755 (executable)
--- a/cmd/split-cmd.py
+++ b/cmd/split-cmd.py
@@ -5,7 +5,7 @@ exec "$bup_python" "$0" ${1+"$@"}
 """
 # end of bup preamble
 
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
 import os, sys, time
 
 from bup import hashsplit, git, options, client
@@ -42,11 +42,11 @@ fanout=    average number of blobs in a single tree
 bwlimit=   maximum bytes/sec to transmit to server
 #,compress=  set compression level to # (0-9, 9 is highest) [1]
 """
+handle_ctrl_c()
+
 o = options.Options(optspec)
 (opt, flags, extra) = o.parse(sys.argv[1:])
 
-handle_ctrl_c()
-git.check_repo_or_die()
 if not (opt.blobs or opt.tree or opt.commit or opt.name or
         opt.noop or opt.copy):
     o.fatal("use one or more of -b, -t, -c, -n, --noop, --copy")
@@ -87,9 +87,9 @@ def prog(filenum, nbytes):
     total_bytes += nbytes
     if filenum > 0:
         qprogress('Splitting: file #%d, %d kbytes\r'
-                  % (filenum+1, total_bytes/1024))
+                  % (filenum+1, total_bytes // 1024))
     else:
-        qprogress('Splitting: %d kbytes\r' % (total_bytes/1024))
+        qprogress('Splitting: %d kbytes\r' % (total_bytes // 1024))
 
 
 is_reverse = os.environ.get('BUP_SERVER_REVERSE')
@@ -100,15 +100,18 @@ start_time = time.time()
 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.noop or opt.copy:
     cli = pack_writer = oldref = None
 elif opt.remote or is_reverse:
+    git.check_repo_or_die()
     cli = client.Client(opt.remote)
     oldref = refname and cli.read_ref(refname) or None
     pack_writer = cli.new_packwriter(compression_level=opt.compress,
                                      max_pack_size=max_pack_size,
                                      max_pack_objects=max_pack_objects)
 else:
+    git.check_repo_or_die()
     cli = None
     oldref = refname and git.read_ref(refname) or None
     pack_writer = git.PackWriter(compression_level=opt.compress,
@@ -163,7 +166,7 @@ if opt.blobs:
                                        keep_boundaries=opt.keep_boundaries,
                                        progress=prog)
     for (sha, size, level) in shalist:
-        print sha.encode('hex')
+        print(sha.encode('hex'))
         reprogress()
 elif opt.tree or opt.commit or opt.name:
     if opt.name: # insert dummy_name which may be used as a restore target
@@ -187,14 +190,14 @@ else:
         hashsplit.total_split += len(blob)
         if opt.copy:
             sys.stdout.write(str(blob))
-        megs = hashsplit.total_split/1024/1024
+        megs = hashsplit.total_split // 1024 // 1024
         if not opt.quiet and last != megs:
             last = megs
 
 if opt.verbose:
     log('\n')
 if opt.tree:
-    print tree.encode('hex')
+    print(tree.encode('hex'))
 if opt.commit or opt.name:
     msg = 'bup split\n\nGenerated by command:\n%r\n' % sys.argv
     ref = opt.name and ('refs/heads/%s' % opt.name) or None
@@ -202,7 +205,7 @@ if opt.commit or opt.name:
     commit = pack_writer.new_commit(tree, oldref, userline, date, None,
                                     userline, date, None, msg)
     if opt.commit:
-        print commit.encode('hex')
+        print(commit.encode('hex'))
 
 if pack_writer:
     pack_writer.close()  # must close before we can update the ref
@@ -220,7 +223,7 @@ secs = time.time() - start_time
 size = hashsplit.total_split
 if opt.bench:
     log('bup: %.2f kbytes in %.2f secs = %.2f kbytes/sec\n'
-        % (size/1024., secs, size/1024./secs))
+        % (size / 1024, secs, size / 1024 / secs))
 
 if saved_errors:
     log('WARNING: %d errors encountered while saving.\n' % len(saved_errors))