# HG changeset patch # User Mike Edgar # Date 1423187064 0 # Node ID 9cfd7c4f22f5da13ad202e9b9d1b39c4ff48ca93 # Parent 8b90a60181d17b7fd4990339d969547c52e287a7 filelog: allow censored files to contain padding data To ensure delta compatibility, when a revision is censored, it is padded to match the original data in size. The previous check does not allow for padding because it was added before padding was found to be a requirement. For more background and design of the censorship feature, see: mercurial.selenic.com/wiki/CensorPlan diff -r 8b90a60181d1 -r 9cfd7c4f22f5 mercurial/filelog.py --- a/mercurial/filelog.py Thu Jan 08 23:43:15 2015 +0900 +++ b/mercurial/filelog.py Fri Feb 06 01:44:24 2015 +0000 @@ -29,7 +29,7 @@ def _censoredtext(text): m, offs = parsemeta(text) - return m and "censored" in m and not text[offs:] + return m and "censored" in m class filelog(revlog.revlog): def __init__(self, opener, path):