# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1471218615 -7200
# Node ID b467fe4304045d03ee3b112de7c7cc66b4378cc1
# Parent  3c4a20244771196e1fa5f7883dc31e01285cde92
destmerge: honor the 'onheadcheck' argument

This argument was introduced in Mercurial some time ago but the topic extension
was never updated to take it in account. This is now fixed.

diff -r 3c4a20244771 -r b467fe430404 hgext3rd/topic/destination.py
--- a/hgext3rd/topic/destination.py	Sun Aug 14 23:17:09 2016 +0200
+++ b/hgext3rd/topic/destination.py	Mon Aug 15 01:50:15 2016 +0200
@@ -16,7 +16,7 @@
     top = p1.topic()
     if top:
         heads = repo.revs('heads(topic(.)::topic(.))')
-        if p1.rev() not in heads:
+        if onheadcheck and p1.rev() not in heads:
             raise error.Abort(_("not at topic head, update or explicit"))
         elif 1 == len(heads):
             # should look at all branch involved but... later