head	1.2;
access;
symbols
	pkgsrc-2023Q1:1.1.0.60
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.58
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.56
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.54
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.52
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.50
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.48
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.46
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.44
	pkgsrc-2021Q1-base:1.1
	pkgsrc-2020Q4:1.1.0.42
	pkgsrc-2020Q4-base:1.1
	pkgsrc-2020Q3:1.1.0.40
	pkgsrc-2020Q3-base:1.1
	pkgsrc-2020Q2:1.1.0.36
	pkgsrc-2020Q2-base:1.1
	pkgsrc-2020Q1:1.1.0.16
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.38
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.34
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.32
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.30
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.28
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.26
	pkgsrc-2018Q3-base:1.1
	pkgsrc-2018Q2:1.1.0.24
	pkgsrc-2018Q2-base:1.1
	pkgsrc-2018Q1:1.1.0.22
	pkgsrc-2018Q1-base:1.1
	pkgsrc-2017Q4:1.1.0.20
	pkgsrc-2017Q4-base:1.1
	pkgsrc-2017Q3:1.1.0.18
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.14
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.12
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.10
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.8
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.6
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.4
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.2
	pkgsrc-2015Q4-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2023.05.31.22.13.52;	author wiz;	state dead;
branches;
next	1.1;
commitid	tuPoOYWCoiV2karE;

1.1
date	2015.11.26.08.30.57;	author agc;	state Exp;
branches;
next	;
commitid	b0SygYLKLW9YVzKy;


desc
@@


1.2
log
@git-remote-hg: update to 0.6.

About 8 years of development, no summary found.
@
text
@$NetBSD: patch-git-remote-hg,v 1.1 2015/11/26 08:30:57 agc Exp $

Patch to fix a crash caused by incompatible changes in mercurial API,
see:

	https://github.com/felipec/git-remote-hg/issues/33

and

	https://github.com/felipec/git-remote-hg/pull/28/files

--- git-remote-hg	2015/11/25 21:51:36	1.1
+++ git-remote-hg	2015/11/25 21:56:29
@@@@ -430,7 +430,12 @@@@
             peer = hg.peer(repo.ui, {}, url)
         except:
             die('Repository error')
-        repo.pull(peer, heads=None, force=True)
+        
+        if check_version(3, 2):
+            from mercurial import exchange
+            exchange.pull(repo, peer, heads=None, force=True)
+        else:
+            repo.pull(peer, heads=None, force=True)
 
         updatebookmarks(repo, peer)
 
@@@@ -803,7 +808,11 @@@@
     def getfilectx(repo, memctx, f):
         of = files[f]
         if 'deleted' in of:
-            raise IOError
+            # the file is not available anymore - was deleted
+            if check_version(3, 2):
+                return None
+            else:
+                raise IOError
         if 'ctx' in of:
             return of['ctx']
         is_exec = of['mode'] == 'x'
@@@@ -1036,7 +1045,9 @@@@
     if not checkheads(repo, remote, p_revs):
         return None
 
-    if check_version(3, 0):
+    if check_version(3, 2):
+        cg = changegroup.getchangegroup(repo, 'push', heads=list(p_revs), common=common)
+    elif check_version(3, 0):
         cg = changegroup.getbundle(repo, 'push', heads=list(p_revs), common=common)
     else:
         cg = repo.getbundle('push', heads=list(p_revs), common=common)
@


1.1
log
@Add git-remote-hg, a tool for bridging between git and mercurial, to the
packages collection.

	git-remote-hg allows you to transparently clone, fetch and
	push to and from Mercurial repositories as if they were Git
	ones.
@
text
@d1 1
a1 1
$NetBSD$
@