[PATCH 1/4] prune-older: remove extra space in --pretend output

[Rob Browning]

Match bup-prune-older(1).

Signed-off-by: Rob Browning <r...@defaultvalue.org>
Tested-by: Rob Browning <r...@defaultvalue.org>
---
lib/bup/cmd/prune_older.py | 2 +-
note/main.md | 4 ++++
test/ext/test_prune_older.py | 9 +++++----
3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/bup/cmd/prune_older.py b/lib/bup/cmd/prune_older.py
index ff2f3c85..c1c52187 100644
--- a/lib/bup/cmd/prune_older.py
+++ b/lib/bup/cmd/prune_older.py
@@ -146,7 +146,7 @@ def main(argv):
assert(keep_save in (False, True))
# FIXME: base removals on hashes
if opt.pretend:
- out.write(b'%s %s/%s\n' % (b'+ ' if keep_save else b'- ',
+ out.write(b'%s %s/%s\n' % (b'+' if keep_save else b'-',
branch, save_name))
elif not keep_save:
removals.append(b'%s/%s' % (branch, save_name))
diff --git a/note/main.md b/note/main.md
index 383b794f..047bab15 100644
--- a/note/main.md
+++ b/note/main.md
@@ -71,6 +71,10 @@ May require attention
* `bup` now only considers a `pack.packSizeLimit` set in the
destination repository.

+* `bup prune-older --pretend` now puts just one space, not two,
+ between the plus or minus and the save name in its output, matching
+ what `bup-prune-older(1)` specifies.
+
* `bup split --copy` now writes the split data to standard output
instead of Python memoryview representations like

diff --git a/test/ext/test_prune_older.py b/test/ext/test_prune_older.py
index 9eec9793..d6b841ad 100644
--- a/test/ext/test_prune_older.py
+++ b/test/ext/test_prune_older.py
@@ -110,9 +110,11 @@ def period_spec_to_period_args(spec):
return tuple(chain(*((b'--keep-' + kind + b'-for', period)
for kind, period in spec)))

+def utc_save_name(utc):
+ return strftime('%Y-%m-%d-%H%M%S', localtime(utc)).encode('ascii')
+
def result_diffline(x):
- return (b'%d %s\n'
- % (x, strftime(' %Y-%m-%d-%H%M%S', localtime(x)).encode('ascii')))
+ return (b'%d %s\n' % (x, utc_save_name(x)))

def check_prune_result(expected):
actual = sorted([int(x)
@@ -121,8 +123,7 @@ def check_prune_result(expected):

if expected != actual:
for x in expected:
- print('ex:', x, strftime('%Y-%m-%d-%H%M%S', localtime(x)),
- file=stderr)
+ print('ex:', x, utc_save_name(x), file=stderr)
for line in diff_bytes(unified_diff,
[result_diffline(x) for x in expected],
[result_diffline(x) for x in actual],
--
2.47.3