[PATCH 1/2] Remove vestigial REVIEW comments

[Rob Browning]

Signed-off-by: Rob Browning <r...@defaultvalue.org>
---

Pushed to main.

configure | 2 --
lib/bup/rewrite.py | 2 --
lib/bup/url.py | 1 -
lib/bup/vfs.py | 1 -
4 files changed, 6 deletions(-)

diff --git a/configure b/configure
index 74650f1f..b1c6887f 100755
--- a/configure
+++ b/configure
@@ -420,8 +420,6 @@ echo -n "$bup_python_config" > config/tmp/config.var/bup-python-config
echo -n "$with_pylint" > config/tmp/config.var/with-pylint
mv config/tmp/config.var config/config.var

-# REVIEW: double-check these for missing ${foo...:-} defaults
-
dev/refresh config/config.vars <<EOF
CC = $CC
CFLAGS = ${CFLAGS:-}
diff --git a/lib/bup/rewrite.py b/lib/bup/rewrite.py
index f7d83648..e7999ecd 100755
--- a/lib/bup/rewrite.py
+++ b/lib/bup/rewrite.py
@@ -141,7 +141,6 @@ def _path_repaired(path, oid, replacement_oid, missing_oid, repairs):
log(f'repaired {ep} {oid.hex()} -> {replacement_oid.hex()}\n')

def _blob_replacement(repo, meta, content):
- # REVIEW: does all this seem reasonable?
now = time.time()
oid = repo.write_data(content)
rm = Metadata(frozen=False)
@@ -319,7 +318,6 @@ def _rewrite_link(path, item_mode, srcrepo, dstrepo, stack, repairs):
return

git_mode, oid = GIT_MODE_SYMLINK, dstrepo.write_symlink(target)
- # REVIEW: ok if oid != item.oid?
if change == 'restore':
_restored_link_blob(path, item.oid, repairs)
elif change == 'fix':
diff --git a/lib/bup/url.py b/lib/bup/url.py
index 1b7a7ab8..4b55c25c 100644
--- a/lib/bup/url.py
+++ b/lib/bup/url.py
@@ -149,7 +149,6 @@ def parse_path_oriented_url(url, require_auth=False):
user, colon_, passwd_ = user.partition(b':')
user = unquote_to_bytes(user)
port = int(port) if port else None
- # REVIEW: is ip_address exactly right for this?
if host and host[0] == b'['[0] and host[-1] == b']'[0]:
addr = parse_addr(host[1:-1])
if isinstance(addr, IPv6Address):
diff --git a/lib/bup/vfs.py b/lib/bup/vfs.py
index d12f1219..170d9143 100644
--- a/lib/bup/vfs.py
+++ b/lib/bup/vfs.py
@@ -638,7 +638,6 @@ def _lost_metadata_for_gitinfo(mode, kind):
return _lost_file_meta
if S_ISDIR(mode):
if kind == BUP_CHUNKED:
- # REVIEW: We've just lost any executable bit in this case, right?
return _lost_file_meta
return _lost_dir_meta
if S_ISLNK(mode):
--
2.47.3

[Rob Browning]

Restore HashSplitter_uncache() calls before EOF. A mistake in

e32d973c1bad0d1f388cc695b2f639d6231cd46d
hashsplit: augment error handling

prevented bup from uncaching data unless len == 0 (i.e. EOF). Restore
the intended behavior.

Thanks to Johannes Berg for reporting the problem.

Signed-off-by: Rob Browning <r...@defaultvalue.org>
Tested-by: Rob Browning <r...@defaultvalue.org>
---

Pushed to main.

lib/bup/_hashsplit.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/bup/_hashsplit.c b/lib/bup/_hashsplit.c
index a101cef0..237f64ea 100644
--- a/lib/bup/_hashsplit.c
+++ b/lib/bup/_hashsplit.c
@@ -492,10 +492,7 @@ static int HashSplitter_read(HashSplitter *self)
}

assert(self->uncached <= self->read);
- if (len == 0
- && self->read > self->uncached
- && self->read - self->uncached >= advise_chunk) {
- // REVIEW: len is always zero?
+ if (len == 0 || (self->read - self->uncached >= advise_chunk)) {
if(HashSplitter_uncache(self, len == 0))
return -1;
}
--
2.47.3