From c8fff2cd061df7f1bc5668523531c9a36b8b3c8c Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Sun, 2 Jun 2019 00:01:56 -0500 Subject: [PATCH] Use changelog.isancestorrev() The old changelog.descendant() is deprecated in 4.7, gone in 4.8. Signed-off-by: Felipe Contreras --- git-remote-hg | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/git-remote-hg b/git-remote-hg index cd5b321..df81b7c 100755 --- a/git-remote-hg +++ b/git-remote-hg @@ -999,7 +999,12 @@ def checkheads_bmark(repo, ref, ctx): print "error %s unknown" % ref return False - if not repo.changelog.descendant(ctx_old.rev(), ctx_new.rev()): + if check_version(4, 7): + isancestorrev = repo.changelog.isancestorrev + else: + isancestorrev = repo.changelog.descendant + + if not isancestorrev(ctx_old.rev(), ctx_new.rev()): if force_push: print "ok %s forced update" % ref else: