1 |
commit: da19e604f1bf4146810681c32f06542be2fd4ceb |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun May 31 13:13:53 2020 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 31 13:16:28 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da19e604 |
7 |
|
8 |
dev-vcs/hg-git: drop unused files |
9 |
|
10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
11 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
12 |
|
13 |
dev-vcs/hg-git/files/hg-git-0.8.12-hg-4.8.patch | 219 ------------------------ |
14 |
1 file changed, 219 deletions(-) |
15 |
|
16 |
diff --git a/dev-vcs/hg-git/files/hg-git-0.8.12-hg-4.8.patch b/dev-vcs/hg-git/files/hg-git-0.8.12-hg-4.8.patch |
17 |
deleted file mode 100644 |
18 |
index c456ce53c74..00000000000 |
19 |
--- a/dev-vcs/hg-git/files/hg-git-0.8.12-hg-4.8.patch |
20 |
+++ /dev/null |
21 |
@@ -1,219 +0,0 @@ |
22 |
-https://bitbucket.org/durin42/hg-git/commits/ae6b1ba7482963bc9de51f299891e99005794e4e/raw |
23 |
-https://bitbucket.org/durin42/hg-git/commits/143b7511eadbea7507d847c805241a6db290ffe7/raw |
24 |
-https://bitbucket.org/durin42/hg-git/commits/8d00fde45adbc6c3c0ccab8e362b5f5c36c171e6/raw |
25 |
- |
26 |
-# HG changeset patch |
27 |
-# User Alain Leufroy |
28 |
-# Date 1541695757 -3600 |
29 |
-# Node ID ae6b1ba7482963bc9de51f299891e99005794e4e |
30 |
-# Parent 6ae26ba7b928019e48dd1c73358c18d6dd2d86f3 |
31 |
-compat: fix for hg 4.8 |
32 |
- |
33 |
-089fc0db0954 introduced a new `createopts` parameter. |
34 |
- |
35 |
-`hggit` does not support repository creation, so we can just ignore |
36 |
-it. |
37 |
- |
38 |
-diff --git a/hggit/gitrepo.py b/hggit/gitrepo.py |
39 |
---- a/hggit/gitrepo.py |
40 |
-+++ b/hggit/gitrepo.py |
41 |
-@@ -13,7 +13,7 @@ |
42 |
- |
43 |
- |
44 |
- class gitrepo(peerrepository): |
45 |
-- def __init__(self, ui, path, create, intents=None): |
46 |
-+ def __init__(self, ui, path, create, intents=None, **kwargs): |
47 |
- if create: # pragma: no cover |
48 |
- raise error.Abort('Cannot create a git repository.') |
49 |
- self._ui = ui |
50 |
- |
51 |
-# HG changeset patch |
52 |
-# User Kevin Bullock <kbullock@×××××××××.org> |
53 |
-# Date 1543713965 21600 |
54 |
-# Node ID 143b7511eadbea7507d847c805241a6db290ffe7 |
55 |
-# Parent ae6b1ba7482963bc9de51f299891e99005794e4e |
56 |
-compat: glob some verify output that changed in hg 4.8 |
57 |
- |
58 |
-diff --git a/tests/test-push-r.t b/tests/test-push-r.t |
59 |
---- a/tests/test-push-r.t |
60 |
-+++ b/tests/test-push-r.t |
61 |
-@@ -64,7 +64,7 @@ |
62 |
- checking manifests |
63 |
- crosschecking files in changesets and manifests |
64 |
- checking files |
65 |
-- 1 files, 1 changesets, 1 total revisions |
66 |
-+ *1 changesets* (glob) |
67 |
- pushing to test-1 |
68 |
- searching for changes |
69 |
- adding changesets |
70 |
-@@ -75,7 +75,7 @@ |
71 |
- checking manifests |
72 |
- crosschecking files in changesets and manifests |
73 |
- checking files |
74 |
-- 1 files, 2 changesets, 2 total revisions |
75 |
-+ *2 changesets* (glob) |
76 |
- pushing to test-2 |
77 |
- searching for changes |
78 |
- adding changesets |
79 |
-@@ -86,7 +86,7 @@ |
80 |
- checking manifests |
81 |
- crosschecking files in changesets and manifests |
82 |
- checking files |
83 |
-- 1 files, 3 changesets, 3 total revisions |
84 |
-+ *3 changesets* (glob) |
85 |
- pushing to test-3 |
86 |
- searching for changes |
87 |
- adding changesets |
88 |
-@@ -97,7 +97,7 @@ |
89 |
- checking manifests |
90 |
- crosschecking files in changesets and manifests |
91 |
- checking files |
92 |
-- 1 files, 4 changesets, 4 total revisions |
93 |
-+ *4 changesets* (glob) |
94 |
- pushing to test-4 |
95 |
- searching for changes |
96 |
- adding changesets |
97 |
-@@ -108,7 +108,7 @@ |
98 |
- checking manifests |
99 |
- crosschecking files in changesets and manifests |
100 |
- checking files |
101 |
-- 1 files, 2 changesets, 2 total revisions |
102 |
-+ *2 changesets* (glob) |
103 |
- pushing to test-5 |
104 |
- searching for changes |
105 |
- adding changesets |
106 |
-@@ -119,7 +119,7 @@ |
107 |
- checking manifests |
108 |
- crosschecking files in changesets and manifests |
109 |
- checking files |
110 |
-- 1 files, 3 changesets, 3 total revisions |
111 |
-+ *3 changesets* (glob) |
112 |
- pushing to test-6 |
113 |
- searching for changes |
114 |
- adding changesets |
115 |
-@@ -130,7 +130,7 @@ |
116 |
- checking manifests |
117 |
- crosschecking files in changesets and manifests |
118 |
- checking files |
119 |
-- 2 files, 4 changesets, 5 total revisions |
120 |
-+ *4 changesets* (glob) |
121 |
- pushing to test-7 |
122 |
- searching for changes |
123 |
- adding changesets |
124 |
-@@ -141,7 +141,7 @@ |
125 |
- checking manifests |
126 |
- crosschecking files in changesets and manifests |
127 |
- checking files |
128 |
-- 3 files, 5 changesets, 6 total revisions |
129 |
-+ *5 changesets* (glob) |
130 |
- pushing to test-8 |
131 |
- searching for changes |
132 |
- adding changesets |
133 |
-@@ -152,7 +152,7 @@ |
134 |
- checking manifests |
135 |
- crosschecking files in changesets and manifests |
136 |
- checking files |
137 |
-- 2 files, 5 changesets, 5 total revisions |
138 |
-+ *5 changesets* (glob) |
139 |
- $ cd test-8 |
140 |
- $ hg pull ../test-7 |
141 |
- pulling from ../test-7 |
142 |
-@@ -168,4 +168,4 @@ |
143 |
- checking manifests |
144 |
- crosschecking files in changesets and manifests |
145 |
- checking files |
146 |
-- 4 files, 9 changesets, 7 total revisions |
147 |
-+ *9 changesets* (glob) |
148 |
- |
149 |
-# HG changeset patch |
150 |
-# User Kevin Bullock <kbullock@×××××××××.org> |
151 |
-# Date 1543713996 21600 |
152 |
-# Node ID 8d00fde45adbc6c3c0ccab8e362b5f5c36c171e6 |
153 |
-# Parent 143b7511eadbea7507d847c805241a6db290ffe7 |
154 |
-compat: update how we register gitnode template keyword |
155 |
- |
156 |
-diff --git a/hggit/__init__.py b/hggit/__init__.py |
157 |
---- a/hggit/__init__.py |
158 |
-+++ b/hggit/__init__.py |
159 |
-@@ -94,9 +94,11 @@ |
160 |
- command = registrar.command(cmdtable) |
161 |
- configitem = registrar.configitem(configtable) |
162 |
- compat.registerconfigs(configitem) |
163 |
-+ templatekeyword = registrar.templatekeyword() |
164 |
- |
165 |
- except (ImportError, AttributeError): |
166 |
- command = cmdutil.command(cmdtable) |
167 |
-+ templatekeyword = compat.templatekeyword() |
168 |
- |
169 |
- # support for `hg clone git://github.com/defunkt/facebox.git` |
170 |
- # also hg clone git+ssh://git@××××××.com/schacon/simplegit.git |
171 |
-@@ -207,7 +209,6 @@ |
172 |
- |
173 |
- |
174 |
- def extsetup(ui): |
175 |
-- templatekw.keywords.update({'gitnode': gitnodekw}) |
176 |
- revset.symbols.update({ |
177 |
- 'fromgit': revset_fromgit, 'gitnode': revset_gitnode |
178 |
- }) |
179 |
-@@ -455,12 +456,30 @@ |
180 |
- raise LookupError(rev, git.map_file, _('ambiguous identifier')) |
181 |
- |
182 |
- |
183 |
--def gitnodekw(**args): |
184 |
-- """:gitnode: String. The Git changeset identification hash, as a 40 hexadecimal |
185 |
--digit string.""" |
186 |
-- node = args['ctx'] |
187 |
-- repo = args['repo'] |
188 |
-+def _gitnodekw(node, repo): |
189 |
- gitnode = repo.githandler.map_git_get(node.hex()) |
190 |
- if gitnode is None: |
191 |
- gitnode = '' |
192 |
- return gitnode |
193 |
-+ |
194 |
-+ |
195 |
-+if (hgutil.safehasattr(templatekw, 'templatekeyword') and |
196 |
-+ hgutil.safehasattr(templatekw.templatekeyword._table['node'], |
197 |
-+ '_requires')): |
198 |
-+ @templatekeyword('gitnode', requires={'ctx', 'repo'}) |
199 |
-+ def gitnodekw(context, mapping): |
200 |
-+ """:gitnode: String. The Git changeset identification hash, as a |
201 |
-+ 40 hexadecimal digit string.""" |
202 |
-+ node = context.resource(mapping, 'ctx') |
203 |
-+ repo = context.resource(mapping, 'repo') |
204 |
-+ return _gitnodekw(node, repo) |
205 |
-+ |
206 |
-+else: |
207 |
-+ # COMPAT: hg < 4.6 - templatekeyword API changed |
208 |
-+ @templatekeyword('gitnode') |
209 |
-+ def gitnodekw(**args): |
210 |
-+ """:gitnode: String. The Git changeset identification hash, as a |
211 |
-+ 40 hexadecimal digit string.""" |
212 |
-+ node = args['ctx'] |
213 |
-+ repo = args['repo'] |
214 |
-+ return _gitnodekw(node, repo) |
215 |
-diff --git a/hggit/compat.py b/hggit/compat.py |
216 |
---- a/hggit/compat.py |
217 |
-+++ b/hggit/compat.py |
218 |
-@@ -2,6 +2,7 @@ |
219 |
- bookmarks, |
220 |
- context, |
221 |
- phases, |
222 |
-+ templatekw, |
223 |
- url, |
224 |
- util as hgutil, |
225 |
- ) |
226 |
-@@ -192,3 +193,14 @@ |
227 |
- if hasconfigitems: |
228 |
- return getconfig(section, item) |
229 |
- return getconfig(section, item, CONFIG_DEFAULTS[section][item]) |
230 |
-+ |
231 |
-+ |
232 |
-+class templatekeyword(object): |
233 |
-+ def __init__(self): |
234 |
-+ self._table = {} |
235 |
-+ |
236 |
-+ def __call__(self, name): |
237 |
-+ def decorate(func): |
238 |
-+ templatekw.keywords.update({name: func}) |
239 |
-+ return func |
240 |
-+ return decorate |