[Updated] D10790: censor: drop size limitation on the tombstone
marmoute (Pierre-Yves David)
phabricator at mercurial-scm.org
Mon Jun 7 09:24:03 UTC 2021
Closed by commit rHG8089d0fa8400: censor: drop size limitation on the tombstone (authored by marmoute).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs Review".
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D10790?vs=28471&id=28493
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D10790/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D10790
AFFECTED FILES
mercurial/revlogutils/censor.py
tests/test-censor.t
CHANGE DETAILS
diff --git a/tests/test-censor.t b/tests/test-censor.t
--- a/tests/test-censor.t
+++ b/tests/test-censor.t
@@ -66,12 +66,6 @@
$ hg cat -r 0 target | head -n 10
Initially untainted file
-Try to censor revision with too large of a tombstone message
-
- $ hg censor -r $C1 -t 'blah blah blah blah blah blah blah blah bla' target
- abort: censor tombstone must be no longer than censored data
- [255]
-
Censor revision with 2 offenses
(this also tests file pattern matching: path relative to cwd case)
diff --git a/mercurial/revlogutils/censor.py b/mercurial/revlogutils/censor.py
--- a/mercurial/revlogutils/censor.py
+++ b/mercurial/revlogutils/censor.py
@@ -29,11 +29,6 @@
censorrev = rl.rev(censornode)
tombstone = storageutil.packmeta({b'censored': tombstone}, b'')
- if len(tombstone) > rl.rawsize(censorrev):
- raise error.Abort(
- _(b'censor tombstone must be no longer than censored data')
- )
-
# Rewriting the revlog in place is hard. Our strategy for censoring is
# to create a new revlog, copy all revisions to it, then replace the
# revlogs on transaction close.
To: marmoute, #hg-reviewers, Alphare
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mercurial-scm.org/pipermail/mercurial-patches/attachments/20210607/f6f70902/attachment.html>
More information about the Mercurial-patches
mailing list