Mercurial > public > mercurial-scm > hg-stable

diff mercurial/scmutil.py @ 39905:a89dd6d01df0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Boris Feld <boris.feld@octobus.net>
date Thu, 27 Sep 2018 16:55:06 +0200
parents f9232b0310ef
children 1857f50a9643
line wrap: on
line diff
--- a/mercurial/scmutil.py	Thu Sep 27 16:52:25 2018 +0200
+++ b/mercurial/scmutil.py	Thu Sep 27 16:55:06 2018 +0200
@@ -1652,7 +1652,9 @@
                 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: