# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 2018-09-27 14:55:06
# Node ID a89dd6d01df0e282b93e73068f92248e565b587f
# Parent  f9232b0310efa493005d265051ef51d762e76d85

pullreport: rev duplicated and extinct into account

If we already have some obsolete and hidden nodes locally and the server send
them again to you, it seems useful to point it out instead of being silent about
it.

diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py
--- a/mercurial/scmutil.py
+++ b/mercurial/scmutil.py
@@ -1652,7 +1652,9 @@ def registersummarycallback(repo, otr, t
                 repo.ui.status(msg)
 
             # search new changesets directly pulled as obsolete
-            obsadded = unfi.revs('%d: and obsolete()', origrepolen)
+            duplicates = tr.changes.get('revduplicates', ())
+            obsadded = unfi.revs('(%d: + %ld) and obsolete()',
+                                 origrepolen, duplicates)
             cl = repo.changelog
             extinctadded = [r for r in obsadded if r not in cl]
             if extinctadded:
diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t
--- a/tests/test-obsolete.t
+++ b/tests/test-obsolete.t
@@ -806,6 +806,7 @@ check hgweb does not explode
   adding file changes
   added 62 changesets with 63 changes to 9 files (+60 heads)
   new changesets 50c51b361e60:c15e9edfca13 (62 drafts)
+  (2 other changesets obsolete on arrival)
   (run 'hg heads .' to see heads, 'hg merge' to merge)
   $ for node in `hg log -r 'desc(babar_)' --template '{node}\n'`;
   > do