| 1 |
commit: cf99d7eb30f271ba41b457df92f33113a8c9c2dc |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 8 08:29:30 2019 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 8 08:29:30 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf99d7eb |
| 7 |
|
| 8 |
dev-vcs/hg-git: drop unused patches |
| 9 |
|
| 10 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 12 |
|
| 13 |
.../hg-git/files/hg-git-0.8.10-hg45-memctx.patch | 43 ------------- |
| 14 |
.../files/hg-git-0.8.10-hg45-memfilectx.patch | 73 ---------------------- |
| 15 |
2 files changed, 116 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
deleted file mode 100644 |
| 19 |
index ff9d4d66d15..00000000000 |
| 20 |
--- a/dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memctx.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,43 +0,0 @@ |
| 23 |
-# HG changeset patch |
| 24 |
-# User Tony Tung <tonytung@×××××.org> |
| 25 |
-# Date 1517901695 28800 |
| 26 |
-# Node ID 843f409526fbea3ffde674922b730075d5cfd4d3 |
| 27 |
-# Parent 6dc827703bfb995b89b0da5b2e9eaffe3479ea45 |
| 28 |
-compat: pass memctx to memfilectx constructor on hg 4.5+ |
| 29 |
- |
| 30 |
-diff --git a/hggit/git_handler.py b/hggit/git_handler.py |
| 31 |
---- a/hggit/git_handler.py |
| 32 |
-+++ b/hggit/git_handler.py |
| 33 |
-@@ -985,16 +985,22 @@ |
| 34 |
- if copied: |
| 35 |
- copied_path = copied[0] |
| 36 |
- |
| 37 |
-- try: |
| 38 |
-- return context.memfilectx(self.repo, f, data, |
| 39 |
-- islink='l' in e, |
| 40 |
-- isexec='x' in e, |
| 41 |
-- copied=copied_path) |
| 42 |
-- except TypeError: |
| 43 |
-- return context.memfilectx(f, data, |
| 44 |
-- islink='l' in e, |
| 45 |
-- isexec='x' in e, |
| 46 |
-- copied=copied_path) |
| 47 |
-+ # Different versions of mercurial have different parameters to |
| 48 |
-+ # memfilectx. Try them from newest to oldest. |
| 49 |
-+ args_to_try = ( |
| 50 |
-+ (self.repo, memctx, f, data), # hg 4.5+ |
| 51 |
-+ (self.repo, f, data), # hg 3.1 - 4.5 |
| 52 |
-+ (f, data), # hg < 3.1 |
| 53 |
-+ ) |
| 54 |
-+ for args in args_to_try: |
| 55 |
-+ try: |
| 56 |
-+ return context.memfilectx(*args, |
| 57 |
-+ islink='l' in e, |
| 58 |
-+ isexec='x' in e, |
| 59 |
-+ copied=copied_path) |
| 60 |
-+ except TypeError as ex: |
| 61 |
-+ last_ex = ex |
| 62 |
-+ raise last_ex |
| 63 |
- |
| 64 |
- p1, p2 = (nullid, nullid) |
| 65 |
- octopus = False |
| 66 |
|
| 67 |
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 |
| 68 |
deleted file mode 100644 |
| 69 |
index 5c94617f881..00000000000 |
| 70 |
--- a/dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memfilectx.patch |
| 71 |
+++ /dev/null |
| 72 |
@@ -1,73 +0,0 @@ |
| 73 |
-# HG changeset patch |
| 74 |
-# User Kevin Bullock <kbullock@×××××××××.org> |
| 75 |
-# Date 1517928348 21600 |
| 76 |
-# Node ID e326b349eba6b6ee57ac8df221727f79c313d04a |
| 77 |
-# Parent 89303af1c4aa76b37e6d16f99f6279012eda7100 |
| 78 |
-compat: extract function for memfilectx signature variants |
| 79 |
- |
| 80 |
-diff --git a/hggit/compat.py b/hggit/compat.py |
| 81 |
---- a/hggit/compat.py |
| 82 |
-+++ b/hggit/compat.py |
| 83 |
-@@ -1,4 +1,5 @@ |
| 84 |
- from mercurial import ( |
| 85 |
-+ context, |
| 86 |
- url, |
| 87 |
- util as hgutil, |
| 88 |
- ) |
| 89 |
-@@ -96,6 +97,26 @@ |
| 90 |
- return refs, set(server_capabilities) |
| 91 |
- |
| 92 |
- |
| 93 |
-+def memfilectx(repo, changectx, path, data, islink=False, |
| 94 |
-+ isexec=False, copied=None): |
| 95 |
-+ # Different versions of mercurial have different parameters to |
| 96 |
-+ # memfilectx. Try them from newest to oldest. |
| 97 |
-+ args_to_try = ( |
| 98 |
-+ (repo, changectx, path, data), # hg 4.5+ |
| 99 |
-+ (repo, path, data), # hg 3.1 - 4.5 |
| 100 |
-+ (path, data), # hg < 3.1 |
| 101 |
-+ ) |
| 102 |
-+ for args in args_to_try: |
| 103 |
-+ try: |
| 104 |
-+ return context.memfilectx(*args, |
| 105 |
-+ islink=islink, |
| 106 |
-+ isexec=isexec, |
| 107 |
-+ copied=copied) |
| 108 |
-+ except TypeError as ex: |
| 109 |
-+ last_ex = ex |
| 110 |
-+ raise last_ex |
| 111 |
-+ |
| 112 |
-+ |
| 113 |
- CONFIG_DEFAULTS = { |
| 114 |
- 'git': { |
| 115 |
- 'authors': None, |
| 116 |
-diff --git a/hggit/git_handler.py b/hggit/git_handler.py |
| 117 |
---- a/hggit/git_handler.py |
| 118 |
-+++ b/hggit/git_handler.py |
| 119 |
-@@ -985,22 +985,10 @@ |
| 120 |
- if copied: |
| 121 |
- copied_path = copied[0] |
| 122 |
- |
| 123 |
-- # Different versions of mercurial have different parameters to |
| 124 |
-- # memfilectx. Try them from newest to oldest. |
| 125 |
-- args_to_try = ( |
| 126 |
-- (self.repo, memctx, f, data), # hg 4.5+ |
| 127 |
-- (self.repo, f, data), # hg 3.1 - 4.5 |
| 128 |
-- (f, data), # hg < 3.1 |
| 129 |
-- ) |
| 130 |
-- for args in args_to_try: |
| 131 |
-- try: |
| 132 |
-- return context.memfilectx(*args, |
| 133 |
-- islink='l' in e, |
| 134 |
-- isexec='x' in e, |
| 135 |
-- copied=copied_path) |
| 136 |
-- except TypeError as ex: |
| 137 |
-- last_ex = ex |
| 138 |
-- raise last_ex |
| 139 |
-+ return compat.memfilectx(self.repo, memctx, f, data, |
| 140 |
-+ islink='l' in e, |
| 141 |
-+ isexec='x' in e, |
| 142 |
-+ copied=copied_path) |
| 143 |
- |
| 144 |
- p1, p2 = (nullid, nullid) |
| 145 |
- octopus = False |
Archives