Mercurial > public > mercurial-scm > hg-stable
diff mercurial/changegroup.py @ 24120:a450e0a2ba0a
revlog: in addgroup, reject ill-formed deltas based on censored nodes
To ensure interoperability when clones disagree about which file nodes are
censored, a restriction is made on deltas based on censored nodes. Any such
delta must replace the full text of the base in a single patch.
If the recipient of a delta considers the base to be censored and the delta
is not in the expected form, the recipient must reject it, as it can't know
if the source has also censored the base.
For background and broader design of the censorship feature, see:
http://mercurial.selenic.com/wiki/CensorPlan
| author | Mike Edgar <adgar@google.com> |
|---|---|
| date | Fri, 06 Feb 2015 00:55:29 +0000 |
| parents | f99a6e1865e5 |
| children | d8e0c591781c |
line wrap: on
line diff
--- a/mercurial/changegroup.py Wed Jan 21 16:35:09 2015 -0500 +++ b/mercurial/changegroup.py Fri Feb 06 00:55:29 2015 +0000 @@ -659,8 +659,11 @@ pr() fl = repo.file(f) o = len(fl) - if not fl.addgroup(source, revmap, trp): - raise util.Abort(_("received file revlog group is empty")) + try: + if not fl.addgroup(source, revmap, trp): + raise util.Abort(_("received file revlog group is empty")) + except error.CensoredBaseError, e: + raise util.Abort(_("received delta base is censored: %s") % e) revisions += len(fl) - o files += 1 if f in needfiles: