diff options
author | Fabian Groffen <grobian@gentoo.org> | 2019-01-08 09:29:30 +0100 |
---|---|---|
committer | Fabian Groffen <grobian@gentoo.org> | 2019-01-08 09:29:30 +0100 |
commit | cf99d7eb30f271ba41b457df92f33113a8c9c2dc (patch) | |
tree | a28473236c8d006c108d26da3d3644d761b1c053 /dev-vcs/hg-git | |
parent | dev-vcs/hg-git: revbump for hg-4.8 support (diff) | |
download | gentoo-cf99d7eb30f271ba41b457df92f33113a8c9c2dc.tar.gz gentoo-cf99d7eb30f271ba41b457df92f33113a8c9c2dc.tar.bz2 gentoo-cf99d7eb30f271ba41b457df92f33113a8c9c2dc.zip |
dev-vcs/hg-git: drop unused patches
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Diffstat (limited to 'dev-vcs/hg-git')
-rw-r--r-- | dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memctx.patch | 43 | ||||
-rw-r--r-- | dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memfilectx.patch | 73 |
2 files changed, 0 insertions, 116 deletions
diff --git a/dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memctx.patch b/dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memctx.patch deleted file mode 100644 index ff9d4d66d15f..000000000000 --- a/dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memctx.patch +++ /dev/null @@ -1,43 +0,0 @@ -# HG changeset patch -# User Tony Tung <tonytung@merly.org> -# Date 1517901695 28800 -# Node ID 843f409526fbea3ffde674922b730075d5cfd4d3 -# Parent 6dc827703bfb995b89b0da5b2e9eaffe3479ea45 -compat: pass memctx to memfilectx constructor on hg 4.5+ - -diff --git a/hggit/git_handler.py b/hggit/git_handler.py ---- a/hggit/git_handler.py -+++ b/hggit/git_handler.py -@@ -985,16 +985,22 @@ - if copied: - copied_path = copied[0] - -- try: -- return context.memfilectx(self.repo, f, data, -- islink='l' in e, -- isexec='x' in e, -- copied=copied_path) -- except TypeError: -- return context.memfilectx(f, data, -- islink='l' in e, -- isexec='x' in e, -- copied=copied_path) -+ # Different versions of mercurial have different parameters to -+ # memfilectx. Try them from newest to oldest. -+ args_to_try = ( -+ (self.repo, memctx, f, data), # hg 4.5+ -+ (self.repo, f, data), # hg 3.1 - 4.5 -+ (f, data), # hg < 3.1 -+ ) -+ for args in args_to_try: -+ try: -+ return context.memfilectx(*args, -+ islink='l' in e, -+ isexec='x' in e, -+ copied=copied_path) -+ except TypeError as ex: -+ last_ex = ex -+ raise last_ex - - p1, p2 = (nullid, nullid) - octopus = False diff --git a/dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memfilectx.patch b/dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memfilectx.patch deleted file mode 100644 index 5c94617f881b..000000000000 --- a/dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memfilectx.patch +++ /dev/null @@ -1,73 +0,0 @@ -# HG changeset patch -# User Kevin Bullock <kbullock@ringworld.org> -# Date 1517928348 21600 -# Node ID e326b349eba6b6ee57ac8df221727f79c313d04a -# Parent 89303af1c4aa76b37e6d16f99f6279012eda7100 -compat: extract function for memfilectx signature variants - -diff --git a/hggit/compat.py b/hggit/compat.py ---- a/hggit/compat.py -+++ b/hggit/compat.py -@@ -1,4 +1,5 @@ - from mercurial import ( -+ context, - url, - util as hgutil, - ) -@@ -96,6 +97,26 @@ - return refs, set(server_capabilities) - - -+def memfilectx(repo, changectx, path, data, islink=False, -+ isexec=False, copied=None): -+ # Different versions of mercurial have different parameters to -+ # memfilectx. Try them from newest to oldest. -+ args_to_try = ( -+ (repo, changectx, path, data), # hg 4.5+ -+ (repo, path, data), # hg 3.1 - 4.5 -+ (path, data), # hg < 3.1 -+ ) -+ for args in args_to_try: -+ try: -+ return context.memfilectx(*args, -+ islink=islink, -+ isexec=isexec, -+ copied=copied) -+ except TypeError as ex: -+ last_ex = ex -+ raise last_ex -+ -+ - CONFIG_DEFAULTS = { - 'git': { - 'authors': None, -diff --git a/hggit/git_handler.py b/hggit/git_handler.py ---- a/hggit/git_handler.py -+++ b/hggit/git_handler.py -@@ -985,22 +985,10 @@ - if copied: - copied_path = copied[0] - -- # Different versions of mercurial have different parameters to -- # memfilectx. Try them from newest to oldest. -- args_to_try = ( -- (self.repo, memctx, f, data), # hg 4.5+ -- (self.repo, f, data), # hg 3.1 - 4.5 -- (f, data), # hg < 3.1 -- ) -- for args in args_to_try: -- try: -- return context.memfilectx(*args, -- islink='l' in e, -- isexec='x' in e, -- copied=copied_path) -- except TypeError as ex: -- last_ex = ex -- raise last_ex -+ return compat.memfilectx(self.repo, memctx, f, data, -+ islink='l' in e, -+ isexec='x' in e, -+ copied=copied_path) - - p1, p2 = (nullid, nullid) - octopus = False |