From 5ddcdd33ec41e2619cdfb50564c0b819439d1374 Mon Sep 17 00:00:00 2001 From: Mark Nauwelaerts Date: Sun, 9 Sep 2018 11:52:36 +0200 Subject: [PATCH] Adjust to Mercurial 4.7 wrt deprecated revlog method --- git-remote-hg | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git-remote-hg b/git-remote-hg index 02d6457..9bc3eda 100755 --- a/git-remote-hg +++ b/git-remote-hg @@ -1121,7 +1121,10 @@ def checkheads_bmark(repo, ref, ctx, force): print "error %s unknown" % ref return False - if not repo.changelog.descendant(ctx_old.rev(), ctx_new.rev()): + # replaced around Mercurial 4.7 + isancestor = repo.changelog.isancestorrev if hasattr(repo.changelog, 'isancestorrev') \ + else repo.changelog.descendant + if not isancestor(ctx_old.rev(), ctx_new.rev()): if force: print "ok %s forced update" % ref else: