Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Merge remote branch 'origin/master' into meta

* origin/master:
  doc/import-rsnapshot: small corrections and clarification
  cmd/midx, git.py: all else being equal, delete older midxes first.
  t/test.sh: a test for the recently-uncovered midx4 problem.
  _helpers.c: midx4 didn't handle multiple index with the same object.
  cmd/midx: add a --check option.
  Add git.shorten_hash(), printing only the first few bytes of a sha1.
  tclient.py: add some additional tests that objcache.refresh() is called.
  cmd/server: add a debug message saying which object caused a suggestion.
  cmd/list-idx: a quick tool for searching the contents of idx/midx files.
  Add tests around the bloom ruin and check options
  Add a bloom --ruin for testing failure cases
  One more constant for header lengths
  Split PackMidx from git.py into a new midx.py.
  bloom.py: move bloom.ShaBloom.create to just bloom.create.
  Move bloom-related stuff from git.py to a new bloom.py.
  cmd/bloom: add a --force option to forget regenerating the bloom.
  Use the new qprogress() function in more places.
  Bail out immediately instead of redownloading .idx
  Add a --check behavior to verify bloom
  Defines/preprocessor lengths > magic numbers
  cmd/{bloom,midx}: clean up progress messages.
  cmd/bloom: by default generate bloom filters in *all* index-cache dirs.
  cmd/newliner: avoid printing a blank line if the final output ended in \r.
  cmd/index: make the default mode '-u'.
  _helpers.c: don't cygwin doesn't set any win32 defines.
  _helpers.c: don'g unpythonize_argv() on win32.
  Remove .c and .o rules, apply flags to csetup.py
  Fix a valid warning that some compilers warned
  Move .idx file writing to C
  main.py: fix whitespace in the usage string.
  cmd/daemon: FD_CLOEXEC the listener socket and don't leak fd for the connection.
  cmd/daemon: close file descriptors correctly in parent process.
  cmd/daemon: use SO_REUSEADDR.
  cmd/daemon: pass extra options along to 'bup server'.
  cmd/daemon: correctly report socket binding/listening errors.
  main.py: use execvp() instead of subprocess.Popen() when possible.
  _helpers.c: Remove ugly 'python' junk from argv[0] so 'ps' is prettier.
  cmd/bloom: fix a message pluralization.
  cmd/join: add a new -o (output filename) option.
  cmd/ls: fix a typo causing 'bup ls foo/latest' to not work.
  cmd/server: add a new 'help' command.
  midx4: Fix the other side of my previous nasty bug

Conflicts:
	lib/bup/_helpers.c
	lib/bup/helpers.py
latest commit 37f43d741e
@apenwarr apenwarr authored
..
Failed to load latest commit information.
.gitignore make install: don't fail if documentation couldn't be built.
Makefile Rename Documentation/*.1.md to Documentation/*.md
bup-bloom.md Add a bloom --ruin for testing failure cases
bup-daemon.md Fix documentation for `bup daemon`
bup-damage.md Rename Documentation/*.1.md to Documentation/*.md
bup-drecurse.md Renames --exclude-file to --exclude-from and encaspulates exclude-par…
bup-fsck.md Rename Documentation/*.1.md to Documentation/*.md
bup-ftp.md cmd/restore: embarrassingly slow implementation of 'bup restore'
bup-fuse.md cmd/restore: embarrassingly slow implementation of 'bup restore'
bup-help.md Documentation/*.md: add some options that we forgot to document.
bup-import-rsnapshot.md doc/import-rsnapshot: small corrections and clarification
bup-index.md cmd/index: make the default mode '-u'.
bup-init.md Rename Documentation/*.1.md to Documentation/*.md
bup-join.md Rename Documentation/*.1.md to Documentation/*.md
bup-ls.md Update ls man page for new -a option
bup-margin.md cmd/margin: interpret the meaning of the margin bits.
bup-memtest.md Documentation/*.md: add some options that we forgot to document.
bup-meta.md Rename bup-meta.1.md to bup-meta.md.
bup-midx.md cmd/midx: add a --check option.
bup-mux.md Add DemuxConn and `bup mux` for client-server
bup-newliner.md Rename Documentation/*.1.md to Documentation/*.md
bup-on.md Rename 'bup rbackup' to 'bup on'
bup-random.md cmd/split: print a progress counter.
bup-restore.md cmd/restore: embarrassingly slow implementation of 'bup restore'
bup-save.md Adds examples for strip, strip-prefix and graft to bup save's documen…
bup-server.md Add optional dumb-server mode
bup-split.md Documentation/bup-split.md: fix a parser error.
bup-tag.md add a tag command
bup-tick.md Rename Documentation/*.1.md to Documentation/*.md
bup-web.md cmd/restore: embarrassingly slow implementation of 'bup restore'
bup.md cmd/restore: embarrassingly slow implementation of 'bup restore'
Something went wrong with that request. Please try again.