2679             bytes += entry.get('bytes', 0)

  2679             bytes += entry.get('bytes', 0)

  2680             new += entry.get('new', 0)

  2680             new += entry.get('new', 0)

  2681         if 5 < bytes:

  2681         if 5 < bytes:

  2682             obsexcmsg(ui, "merging obsolescence markers (%i bytes)\n"

  2682             obsexcmsg(ui, "merging obsolescence markers (%i bytes)\n"

  2683                       % bytes)

  2683                       % bytes)

  2685             tr = op.gettransaction()

  2685             tr = op.gettransaction()

  2686         else:

  2686         else:

  2687             obsexcmsg(ui, "no unknown remote markers\n")

  2687             obsexcmsg(ui, "no unknown remote markers\n")

  2688         obsexcmsg(ui, "DONE\n")

  2688         obsexcmsg(ui, "DONE\n")

  2689     elif wirepull:

  2689     elif wirepull:

  2694                            % len(obsdata))

  2694                            % len(obsdata))

  2695             tr = pullop.gettransaction()

  2695             tr = pullop.gettransaction()

  2696             old = len(pullop.repo.obsstore._all)

  2696             old = len(pullop.repo.obsstore._all)

  2697             pullop.repo.obsstore.mergemarkers(tr, obsdata)

  2697             pullop.repo.obsstore.mergemarkers(tr, obsdata)

  2698             new = len(pullop.repo.obsstore._all) - old

  2698             new = len(pullop.repo.obsstore._all) - old

  2700         else:

  2700         else:

  2701             obsexcmsg(ui, "no unknown remote markers\n")

  2701             obsexcmsg(ui, "no unknown remote markers\n")

  2702         obsexcmsg(ui, "DONE\n")

  2702         obsexcmsg(ui, "DONE\n")

  2703     if new:

  2703     if new:

  2704         pullop.repo.invalidatevolatilesets()

  2704         pullop.repo.invalidatevolatilesets()