Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Fabian Groffen (grobian)" <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-vcs/hg-git/files: hg-git-0.2.6-mercurial-1.9-1.patch hg-git-0.2.6-mercurial-1.9-3.patch hg-git-0.2.6-mercurial-1.9-4.patch hg-git-0.2.6-mercurial-1.9-2.patch
Date: Mon, 29 Aug 2011 18:38:04
Message-Id: 20110829183752.A8EBD2004C@flycatcher.gentoo.org
1 grobian 11/08/29 18:37:52
2
3 Added: hg-git-0.2.6-mercurial-1.9-1.patch
4 hg-git-0.2.6-mercurial-1.9-3.patch
5 hg-git-0.2.6-mercurial-1.9-4.patch
6 hg-git-0.2.6-mercurial-1.9-2.patch
7 Log:
8 Add patches from upstream to allow functioning properly with >=mercurial-1.9, take co-maintainership, bug #375433
9
10 (Portage version: 2.2.01.19074-prefix/cvs/Darwin i386)
11
12 Revision Changes Path
13 1.1 dev-vcs/hg-git/files/hg-git-0.2.6-mercurial-1.9-1.patch
14
15 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/hg-git/files/hg-git-0.2.6-mercurial-1.9-1.patch?rev=1.1&view=markup
16 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/hg-git/files/hg-git-0.2.6-mercurial-1.9-1.patch?rev=1.1&content-type=text/plain
17
18 Index: hg-git-0.2.6-mercurial-1.9-1.patch
19 ===================================================================
20 # HG changeset patch
21 # User Mads Kiilerich <mads@×××××××××.com>
22 # Date 1302003088 -7200
23 # Node ID 61865ad887403865743391e682ce116ad817cd55
24 # Parent f55869b556f0532604404966c612b326e360b7ca
25 compatibility with new url handling in Mercurial 1.9
26
27 diff -r f55869b556f0532604404966c612b326e360b7ca -r 61865ad887403865743391e682ce116ad817cd55 hggit/__init__.py
28 --- a/hggit/__init__.py Wed Mar 23 21:31:26 2011 -0500
29 +++ b/hggit/__init__.py Tue Apr 05 13:31:28 2011 +0200
30 @@ -24,6 +24,7 @@
31 from mercurial import hg
32 from mercurial import localrepo
33 from mercurial import util as hgutil
34 +from mercurial import url
35 from mercurial.i18n import _
36
37 demandimport.ignore.extend([
38 @@ -42,7 +43,10 @@
39 _oldlocal = hg.schemes['file']
40
41 def _local(path):
42 - p = hgutil.drop_scheme('file', path)
43 + try:
44 + p = hgutil.drop_scheme('file', path)
45 + except AttributeError:
46 + p = url.url(path).localpath()
47 if (os.path.exists(os.path.join(p, '.git')) and
48 not os.path.exists(os.path.join(p, '.hg'))):
49 return gitrepo
50
51
52
53 1.1 dev-vcs/hg-git/files/hg-git-0.2.6-mercurial-1.9-3.patch
54
55 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/hg-git/files/hg-git-0.2.6-mercurial-1.9-3.patch?rev=1.1&view=markup
56 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/hg-git/files/hg-git-0.2.6-mercurial-1.9-3.patch?rev=1.1&content-type=text/plain
57
58 Index: hg-git-0.2.6-mercurial-1.9-3.patch
59 ===================================================================
60 # HG changeset patch
61 # User Augie Fackler <durin42@×××××.com>
62 # Date 1305480384 18000
63 # Node ID 5fdff9b8e7420572624dae2941251f11cd9bd6d7
64 # Parent bcc79fa3fe09c43a011936f7d8b2c1075e0d94da
65 Cope with new discovery code without crashing.
66
67 diff -r bcc79fa3fe09c43a011936f7d8b2c1075e0d94da -r 5fdff9b8e7420572624dae2941251f11cd9bd6d7 hggit/__init__.py
68 --- a/hggit/__init__.py Sun May 15 12:26:03 2011 -0500
69 +++ b/hggit/__init__.py Sun May 15 12:26:24 2011 -0500
70 @@ -125,6 +125,8 @@
71 kwname = 'heads'
72 if hg.util.version() >= '1.7':
73 kwname = 'remoteheads'
74 + if getattr(discovery, 'findcommonoutgoing', None):
75 + kwname = 'onlyheads'
76 def findoutgoing(orig, local, remote, *args, **kwargs):
77 kw = {}
78 kw.update(kwargs)
79 @@ -141,8 +143,14 @@
80 if kwname == 'heads':
81 r = orig(local, remote, **kw)
82 return [x[0] for x in r]
83 + if kwname == 'onlyheads':
84 + del kw['base']
85 return orig(local, remote, **kw)
86 - extensions.wrapfunction(discovery, 'findoutgoing', findoutgoing)
87 + if getattr(discovery, 'findoutgoing', None):
88 + extensions.wrapfunction(discovery, 'findoutgoing', findoutgoing)
89 + else:
90 + extensions.wrapfunction(discovery, 'findcommonoutgoing',
91 + findoutgoing)
92 except ImportError:
93 pass
94
95
96
97
98 1.1 dev-vcs/hg-git/files/hg-git-0.2.6-mercurial-1.9-4.patch
99
100 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/hg-git/files/hg-git-0.2.6-mercurial-1.9-4.patch?rev=1.1&view=markup
101 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/hg-git/files/hg-git-0.2.6-mercurial-1.9-4.patch?rev=1.1&content-type=text/plain
102
103 Index: hg-git-0.2.6-mercurial-1.9-4.patch
104 ===================================================================
105 # HG changeset patch
106 # User Brendan Cully <brendan@××××××.com>
107 # Date 1308853770 25200
108 # Node ID 6867b01d1379cb27faca4c4cb06ed2fba38963e8
109 # Parent b8eeabb61c7b720713565a645aacffa7213128aa
110 Unbreak outgoing to non-git repos with hg pre-1.9
111
112 The wrapped version of findoutgoing unconditionally mangled the
113 keyword arguments, but doesn't do version fixups unless the
114 remote is a git repository. This change only mangles the argument
115 list when the remote is a git repository.
116
117 diff -r b8eeabb61c7b720713565a645aacffa7213128aa -r 6867b01d1379cb27faca4c4cb06ed2fba38963e8 hggit/__init__.py
118 --- a/hggit/__init__.py Fri Jun 17 15:01:31 2011 -0500
119 +++ b/hggit/__init__.py Thu Jun 23 11:29:30 2011 -0700
120 @@ -129,13 +129,13 @@
121 if getattr(discovery, 'findcommonoutgoing', None):
122 kwname = 'onlyheads'
123 def findoutgoing(orig, local, remote, *args, **kwargs):
124 - kw = {}
125 - kw.update(kwargs)
126 - for val, k in zip(args, ('base', kwname, 'force')):
127 - kw[k] = val
128 if isinstance(remote, gitrepo.gitrepo):
129 # clean up this cruft when we're 1.7-only, remoteheads and
130 # the return value change happened between 1.6 and 1.7.
131 + kw = {}
132 + kw.update(kwargs)
133 + for val, k in zip(args, ('base', kwname, 'force')):
134 + kw[k] = val
135 git = GitHandler(local, local.ui)
136 base, heads = git.get_refs(remote.path)
137 newkw = {'base': base, kwname: heads}
138 @@ -146,7 +146,8 @@
139 return [x[0] for x in r]
140 if kwname == 'onlyheads':
141 del kw['base']
142 - return orig(local, remote, **kw)
143 + return orig(local, remote, **kw)
144 + return orig(local, remote, *args, **kwargs)
145 if getattr(discovery, 'findoutgoing', None):
146 extensions.wrapfunction(discovery, 'findoutgoing', findoutgoing)
147 else:
148
149
150
151 1.1 dev-vcs/hg-git/files/hg-git-0.2.6-mercurial-1.9-2.patch
152
153 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/hg-git/files/hg-git-0.2.6-mercurial-1.9-2.patch?rev=1.1&view=markup
154 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/hg-git/files/hg-git-0.2.6-mercurial-1.9-2.patch?rev=1.1&content-type=text/plain
155
156 Index: hg-git-0.2.6-mercurial-1.9-2.patch
157 ===================================================================
158 # HG changeset patch
159 # User Augie Fackler <durin42@×××××.com>
160 # Date 1305480363 18000
161 # Node ID bcc79fa3fe09c43a011936f7d8b2c1075e0d94da
162 # Parent ed28dd69df6169396bfb72d4aa3349aac8a32ed1
163 url wasn't ever published as url.url, and is now util.url
164
165 diff -r ed28dd69df6169396bfb72d4aa3349aac8a32ed1 -r bcc79fa3fe09c43a011936f7d8b2c1075e0d94da hggit/__init__.py
166 --- a/hggit/__init__.py Sun May 15 12:24:25 2011 -0500
167 +++ b/hggit/__init__.py Sun May 15 12:26:03 2011 -0500
168 @@ -42,11 +42,18 @@
169 # support for `hg clone localgitrepo`
170 _oldlocal = hg.schemes['file']
171
172 +try:
173 + urlcls = hgutil.url
174 +except AttributeError:
175 + class urlcls(object):
176 + def __init__(self, path):
177 + self.p = hgutil.drop_scheme('file', path)
178 +
179 + def localpath(self):
180 + return self.p
181 +
182 def _local(path):
183 - try:
184 - p = hgutil.drop_scheme('file', path)
185 - except AttributeError:
186 - p = url.url(path).localpath()
187 + p = urlcls(path).localpath()
188 if (os.path.exists(os.path.join(p, '.git')) and
189 not os.path.exists(os.path.join(p, '.hg'))):
190 return gitrepo
Report Message
Find on MARC Find on Google Groups