mercurial/changegroup.py
changeset 25660 328739ea70c3
parent 25624 f0745da75056
child 25695 ce3d4b858420
equal deleted inserted replaced
25659:d60678a567a9 25660:328739ea70c3
   489 
   489 
   490         prefix = ''
   490         prefix = ''
   491         if revlog.iscensored(base) or revlog.iscensored(rev):
   491         if revlog.iscensored(base) or revlog.iscensored(rev):
   492             try:
   492             try:
   493                 delta = revlog.revision(node)
   493                 delta = revlog.revision(node)
   494             except error.CensoredNodeError, e:
   494             except error.CensoredNodeError as e:
   495                 delta = e.tombstone
   495                 delta = e.tombstone
   496             if base == nullrev:
   496             if base == nullrev:
   497                 prefix = mdiff.trivialdiffheader(len(delta))
   497                 prefix = mdiff.trivialdiffheader(len(delta))
   498             else:
   498             else:
   499                 baselen = revlog.rawsize(base)
   499                 baselen = revlog.rawsize(base)
   663         fl = repo.file(f)
   663         fl = repo.file(f)
   664         o = len(fl)
   664         o = len(fl)
   665         try:
   665         try:
   666             if not fl.addgroup(source, revmap, trp):
   666             if not fl.addgroup(source, revmap, trp):
   667                 raise util.Abort(_("received file revlog group is empty"))
   667                 raise util.Abort(_("received file revlog group is empty"))
   668         except error.CensoredBaseError, e:
   668         except error.CensoredBaseError as e:
   669             raise util.Abort(_("received delta base is censored: %s") % e)
   669             raise util.Abort(_("received delta base is censored: %s") % e)
   670         revisions += len(fl) - o
   670         revisions += len(fl) - o
   671         files += 1
   671         files += 1
   672         if f in needfiles:
   672         if f in needfiles:
   673             needs = needfiles[f]
   673             needs = needfiles[f]