From 9c61c09ebf85a4387c95ba5758904d3381ad2876 Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Fri, 5 May 2023 09:51:33 -0600 Subject: [PATCH 1/2] Remove support for lock-based unbundling This was deprecated in 0.9.1 and support for those servers dropped in 4.4. Signed-off-by: Felipe Contreras --- git-remote-hg | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/git-remote-hg b/git-remote-hg index 6dbae86..c24f4f9 100755 --- a/git-remote-hg +++ b/git-remote-hg @@ -1038,13 +1038,9 @@ def push_unsafe(repo, remote, parsed_refs, p_revs): else: cg = changegroup.getchangegroup(repo, b'push', outgoing) - unbundle = remote.capable(b'unbundle') - if unbundle: - if force: - remoteheads = [b'force'] - ret = remote.unbundle(cg, remoteheads, b'push') - else: - ret = remote.addchangegroup(cg, b'push', repo.url()) + if force: + remoteheads = [b'force'] + ret = remote.unbundle(cg, remoteheads, b'push') phases = remote.listkeys(b'phases') if phases: @@ -1062,17 +1058,7 @@ def push(repo, remote, parsed_refs, p_revs): # nothing to push return - lock = None - unbundle = remote.capable(b'unbundle') - if not unbundle: - lock = remote.lock() - try: - ret = push_unsafe(repo, remote, parsed_refs, p_revs) - finally: - if lock is not None: - lock.release() - - return ret + return push_unsafe(repo, remote, parsed_refs, p_revs) def check_tip(ref, kind, name, heads): try: From 7713b7ecefea9f0df2970079086fe318e3d26311 Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Fri, 5 May 2023 10:43:04 -0600 Subject: [PATCH 2/2] Remove push_unsafe() It's not needed anymore. Signed-off-by: Felipe Contreras --- git-remote-hg | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/git-remote-hg b/git-remote-hg index c24f4f9..54a6949 100755 --- a/git-remote-hg +++ b/git-remote-hg @@ -1016,7 +1016,13 @@ def checkheads(repo, remote, p_revs): return ret -def push_unsafe(repo, remote, parsed_refs, p_revs): +def push(repo, remote, parsed_refs, p_revs): + if hasattr(remote, 'canpush') and not remote.canpush(): + print("error cannot push") + + if not p_revs: + # nothing to push + return force = force_push @@ -1050,16 +1056,6 @@ def push_unsafe(repo, remote, parsed_refs, p_revs): return ret -def push(repo, remote, parsed_refs, p_revs): - if hasattr(remote, 'canpush') and not remote.canpush(): - print("error cannot push") - - if not p_revs: - # nothing to push - return - - return push_unsafe(repo, remote, parsed_refs, p_revs) - def check_tip(ref, kind, name, heads): try: ename = '%s/%s' % (kind, name)