Show More
@@ -1,311 +1,320 b'' | |||
|
1 | 1 | from __future__ import absolute_import |
|
2 | 2 | |
|
3 | 3 | import contextlib |
|
4 | 4 | import errno |
|
5 | 5 | import os |
|
6 | 6 | |
|
7 | 7 | from mercurial import ( |
|
8 | 8 | error, |
|
9 | 9 | extensions, |
|
10 | 10 | match as matchmod, |
|
11 | 11 | node as nodemod, |
|
12 | 12 | pycompat, |
|
13 | 13 | scmutil, |
|
14 | 14 | util, |
|
15 | 15 | ) |
|
16 | 16 | from mercurial.interfaces import ( |
|
17 | 17 | dirstate as intdirstate, |
|
18 | 18 | util as interfaceutil, |
|
19 | 19 | ) |
|
20 | 20 | |
|
21 | 21 | from . import gitutil |
|
22 | 22 | |
|
23 | 23 | pygit2 = gitutil.get_pygit2() |
|
24 | 24 | |
|
25 | 25 | |
|
26 | 26 | def readpatternfile(orig, filepath, warn, sourceinfo=False): |
|
27 | 27 | if not (b'info/exclude' in filepath or filepath.endswith(b'.gitignore')): |
|
28 | 28 | return orig(filepath, warn, sourceinfo=False) |
|
29 | 29 | result = [] |
|
30 | 30 | warnings = [] |
|
31 | 31 | with open(filepath, b'rb') as fp: |
|
32 | 32 | for l in fp: |
|
33 | 33 | l = l.strip() |
|
34 | 34 | if not l or l.startswith(b'#'): |
|
35 | 35 | continue |
|
36 | 36 | if l.startswith(b'!'): |
|
37 | 37 | warnings.append(b'unsupported ignore pattern %s' % l) |
|
38 | 38 | continue |
|
39 | 39 | if l.startswith(b'/'): |
|
40 | 40 | result.append(b'rootglob:' + l[1:]) |
|
41 | 41 | else: |
|
42 | 42 | result.append(b'relglob:' + l) |
|
43 | 43 | return result, warnings |
|
44 | 44 | |
|
45 | 45 | |
|
46 | 46 | extensions.wrapfunction(matchmod, b'readpatternfile', readpatternfile) |
|
47 | 47 | |
|
48 | 48 | |
|
49 | 49 | _STATUS_MAP = {} |
|
50 | 50 | if pygit2: |
|
51 | 51 | _STATUS_MAP = { |
|
52 | 52 | pygit2.GIT_STATUS_CONFLICTED: b'm', |
|
53 | 53 | pygit2.GIT_STATUS_CURRENT: b'n', |
|
54 | 54 | pygit2.GIT_STATUS_IGNORED: b'?', |
|
55 | 55 | pygit2.GIT_STATUS_INDEX_DELETED: b'r', |
|
56 | 56 | pygit2.GIT_STATUS_INDEX_MODIFIED: b'n', |
|
57 | 57 | pygit2.GIT_STATUS_INDEX_NEW: b'a', |
|
58 | 58 | pygit2.GIT_STATUS_INDEX_RENAMED: b'a', |
|
59 | 59 | pygit2.GIT_STATUS_INDEX_TYPECHANGE: b'n', |
|
60 | 60 | pygit2.GIT_STATUS_WT_DELETED: b'r', |
|
61 | 61 | pygit2.GIT_STATUS_WT_MODIFIED: b'n', |
|
62 | 62 | pygit2.GIT_STATUS_WT_NEW: b'?', |
|
63 | 63 | pygit2.GIT_STATUS_WT_RENAMED: b'a', |
|
64 | 64 | pygit2.GIT_STATUS_WT_TYPECHANGE: b'n', |
|
65 | 65 | pygit2.GIT_STATUS_WT_UNREADABLE: b'?', |
|
66 | 66 | pygit2.GIT_STATUS_INDEX_MODIFIED | pygit2.GIT_STATUS_WT_MODIFIED: 'm', |
|
67 | 67 | } |
|
68 | 68 | |
|
69 | 69 | |
|
70 | 70 | @interfaceutil.implementer(intdirstate.idirstate) |
|
71 | 71 | class gitdirstate(object): |
|
72 | 72 | def __init__(self, ui, root, gitrepo): |
|
73 | 73 | self._ui = ui |
|
74 | 74 | self._root = os.path.dirname(root) |
|
75 | 75 | self.git = gitrepo |
|
76 | 76 | self._plchangecallbacks = {} |
|
77 | 77 | |
|
78 | 78 | def p1(self): |
|
79 | 79 | try: |
|
80 | 80 | return self.git.head.peel().id.raw |
|
81 | 81 | except pygit2.GitError: |
|
82 | 82 | # Typically happens when peeling HEAD fails, as in an |
|
83 | 83 | # empty repository. |
|
84 | 84 | return nodemod.nullid |
|
85 | 85 | |
|
86 | 86 | def p2(self): |
|
87 | 87 | # TODO: MERGE_HEAD? something like that, right? |
|
88 | 88 | return nodemod.nullid |
|
89 | 89 | |
|
90 | 90 | def setparents(self, p1, p2=nodemod.nullid): |
|
91 | 91 | assert p2 == nodemod.nullid, b'TODO merging support' |
|
92 | 92 | self.git.head.set_target(gitutil.togitnode(p1)) |
|
93 | 93 | |
|
94 | 94 | @util.propertycache |
|
95 | 95 | def identity(self): |
|
96 | 96 | return util.filestat.frompath( |
|
97 | 97 | os.path.join(self._root, b'.git', b'index') |
|
98 | 98 | ) |
|
99 | 99 | |
|
100 | 100 | def branch(self): |
|
101 | 101 | return b'default' |
|
102 | 102 | |
|
103 | 103 | def parents(self): |
|
104 | 104 | # TODO how on earth do we find p2 if a merge is in flight? |
|
105 | 105 | return self.p1(), nodemod.nullid |
|
106 | 106 | |
|
107 | 107 | def __iter__(self): |
|
108 | 108 | return (pycompat.fsencode(f.path) for f in self.git.index) |
|
109 | 109 | |
|
110 | 110 | def items(self): |
|
111 | 111 | for ie in self.git.index: |
|
112 | 112 | yield ie.path, None # value should be a dirstatetuple |
|
113 | 113 | |
|
114 | 114 | # py2,3 compat forward |
|
115 | 115 | iteritems = items |
|
116 | 116 | |
|
117 | 117 | def __getitem__(self, filename): |
|
118 | 118 | try: |
|
119 | 119 | gs = self.git.status_file(filename) |
|
120 | 120 | except KeyError: |
|
121 | 121 | return b'?' |
|
122 | 122 | return _STATUS_MAP[gs] |
|
123 | 123 | |
|
124 | 124 | def __contains__(self, filename): |
|
125 | 125 | try: |
|
126 | 126 | gs = self.git.status_file(filename) |
|
127 | 127 | return _STATUS_MAP[gs] != b'?' |
|
128 | 128 | except KeyError: |
|
129 | 129 | return False |
|
130 | 130 | |
|
131 | 131 | def status(self, match, subrepos, ignored, clean, unknown): |
|
132 | 132 | # TODO handling of clean files - can we get that from git.status()? |
|
133 | 133 | modified, added, removed, deleted, unknown, ignored, clean = ( |
|
134 | 134 | [], |
|
135 | 135 | [], |
|
136 | 136 | [], |
|
137 | 137 | [], |
|
138 | 138 | [], |
|
139 | 139 | [], |
|
140 | 140 | [], |
|
141 | 141 | ) |
|
142 | 142 | gstatus = self.git.status() |
|
143 | 143 | for path, status in gstatus.items(): |
|
144 | 144 | path = pycompat.fsencode(path) |
|
145 | 145 | if status == pygit2.GIT_STATUS_IGNORED: |
|
146 | 146 | if path.endswith(b'/'): |
|
147 | 147 | continue |
|
148 | 148 | ignored.append(path) |
|
149 | 149 | elif status in ( |
|
150 | 150 | pygit2.GIT_STATUS_WT_MODIFIED, |
|
151 | 151 | pygit2.GIT_STATUS_INDEX_MODIFIED, |
|
152 | 152 | pygit2.GIT_STATUS_WT_MODIFIED |
|
153 | 153 | | pygit2.GIT_STATUS_INDEX_MODIFIED, |
|
154 | 154 | ): |
|
155 | 155 | modified.append(path) |
|
156 | 156 | elif status == pygit2.GIT_STATUS_INDEX_NEW: |
|
157 | 157 | added.append(path) |
|
158 | 158 | elif status == pygit2.GIT_STATUS_WT_NEW: |
|
159 | 159 | unknown.append(path) |
|
160 | 160 | elif status == pygit2.GIT_STATUS_WT_DELETED: |
|
161 | 161 | deleted.append(path) |
|
162 | 162 | elif status == pygit2.GIT_STATUS_INDEX_DELETED: |
|
163 | 163 | removed.append(path) |
|
164 | 164 | else: |
|
165 | 165 | raise error.Abort( |
|
166 | 166 | b'unhandled case: status for %r is %r' % (path, status) |
|
167 | 167 | ) |
|
168 | 168 | |
|
169 | 169 | # TODO are we really always sure of status here? |
|
170 | 170 | return ( |
|
171 | 171 | False, |
|
172 | 172 | scmutil.status( |
|
173 | 173 | modified, added, removed, deleted, unknown, ignored, clean |
|
174 | 174 | ), |
|
175 | 175 | ) |
|
176 | 176 | |
|
177 | 177 | def flagfunc(self, buildfallback): |
|
178 | 178 | # TODO we can do better |
|
179 | 179 | return buildfallback() |
|
180 | 180 | |
|
181 | 181 | def getcwd(self): |
|
182 | 182 | # TODO is this a good way to do this? |
|
183 | 183 | return os.path.dirname( |
|
184 | 184 | os.path.dirname(pycompat.fsencode(self.git.path)) |
|
185 | 185 | ) |
|
186 | 186 | |
|
187 | 187 | def normalize(self, path): |
|
188 | 188 | normed = util.normcase(path) |
|
189 | 189 | assert normed == path, b"TODO handling of case folding: %s != %s" % ( |
|
190 | 190 | normed, |
|
191 | 191 | path, |
|
192 | 192 | ) |
|
193 | 193 | return path |
|
194 | 194 | |
|
195 | 195 | @property |
|
196 | 196 | def _checklink(self): |
|
197 | 197 | return util.checklink(os.path.dirname(pycompat.fsencode(self.git.path))) |
|
198 | 198 | |
|
199 | 199 | def copies(self): |
|
200 | 200 | # TODO support copies? |
|
201 | 201 | return {} |
|
202 | 202 | |
|
203 | 203 | # # TODO what the heck is this |
|
204 | 204 | _filecache = set() |
|
205 | 205 | |
|
206 | 206 | def pendingparentchange(self): |
|
207 | 207 | # TODO: we need to implement the context manager bits and |
|
208 | 208 | # correctly stage/revert index edits. |
|
209 | 209 | return False |
|
210 | 210 | |
|
211 | 211 | def write(self, tr): |
|
212 | 212 | # TODO: call parent change callbacks |
|
213 | 213 | |
|
214 | 214 | if tr: |
|
215 | 215 | |
|
216 | 216 | def writeinner(category): |
|
217 | 217 | self.git.index.write() |
|
218 | 218 | |
|
219 | 219 | tr.addpending(b'gitdirstate', writeinner) |
|
220 | 220 | else: |
|
221 | 221 | self.git.index.write() |
|
222 | 222 | |
|
223 | 223 | def pathto(self, f, cwd=None): |
|
224 | 224 | if cwd is None: |
|
225 | 225 | cwd = self.getcwd() |
|
226 | 226 | # TODO core dirstate does something about slashes here |
|
227 | 227 | assert isinstance(f, bytes) |
|
228 | 228 | r = util.pathto(self._root, cwd, f) |
|
229 | 229 | return r |
|
230 | 230 | |
|
231 | 231 | def matches(self, match): |
|
232 | 232 | for x in self.git.index: |
|
233 | 233 | p = pycompat.fsencode(x.path) |
|
234 | 234 | if match(p): |
|
235 | 235 | yield p |
|
236 | 236 | |
|
237 | 237 | def normal(self, f, parentfiledata=None): |
|
238 | 238 | """Mark a file normal and clean.""" |
|
239 | 239 | # TODO: for now we just let libgit2 re-stat the file. We can |
|
240 | 240 | # clearly do better. |
|
241 | 241 | |
|
242 | 242 | def normallookup(self, f): |
|
243 | 243 | """Mark a file normal, but possibly dirty.""" |
|
244 | 244 | # TODO: for now we just let libgit2 re-stat the file. We can |
|
245 | 245 | # clearly do better. |
|
246 | 246 | |
|
247 | 247 | def walk(self, match, subrepos, unknown, ignored, full=True): |
|
248 | 248 | # TODO: we need to use .status() and not iterate the index, |
|
249 | 249 | # because the index doesn't force a re-walk and so `hg add` of |
|
250 | 250 | # a new file without an intervening call to status will |
|
251 | 251 | # silently do nothing. |
|
252 | 252 | r = {} |
|
253 | 253 | cwd = self.getcwd() |
|
254 | 254 | for path, status in self.git.status().items(): |
|
255 | 255 | if path.startswith('.hg/'): |
|
256 | 256 | continue |
|
257 | 257 | path = pycompat.fsencode(path) |
|
258 | 258 | if not match(path): |
|
259 | 259 | continue |
|
260 | 260 | # TODO construct the stat info from the status object? |
|
261 | 261 | try: |
|
262 | 262 | s = os.stat(os.path.join(cwd, path)) |
|
263 | 263 | except OSError as e: |
|
264 | 264 | if e.errno != errno.ENOENT: |
|
265 | 265 | raise |
|
266 | 266 | continue |
|
267 | 267 | r[path] = s |
|
268 | 268 | return r |
|
269 | 269 | |
|
270 | 270 | def savebackup(self, tr, backupname): |
|
271 | 271 | # TODO: figure out a strategy for saving index backups. |
|
272 | 272 | pass |
|
273 | 273 | |
|
274 | 274 | def restorebackup(self, tr, backupname): |
|
275 | 275 | # TODO: figure out a strategy for saving index backups. |
|
276 | 276 | pass |
|
277 | 277 | |
|
278 | 278 | def add(self, f): |
|
279 | self.git.index.add(pycompat.fsdecode(f)) | |
|
279 | index = self.git.index | |
|
280 | index.read() | |
|
281 | index.add(pycompat.fsdecode(f)) | |
|
282 | index.write() | |
|
280 | 283 | |
|
281 | 284 | def drop(self, f): |
|
282 | self.git.index.remove(pycompat.fsdecode(f)) | |
|
285 | index = self.git.index | |
|
286 | index.read() | |
|
287 | index.remove(pycompat.fsdecode(f)) | |
|
288 | index.write() | |
|
283 | 289 | |
|
284 | 290 | def remove(self, f): |
|
285 | self.git.index.remove(pycompat.fsdecode(f)) | |
|
291 | index = self.git.index | |
|
292 | index.read() | |
|
293 | index.remove(pycompat.fsdecode(f)) | |
|
294 | index.write() | |
|
286 | 295 | |
|
287 | 296 | def copied(self, path): |
|
288 | 297 | # TODO: track copies? |
|
289 | 298 | return None |
|
290 | 299 | |
|
291 | 300 | def prefetch_parents(self): |
|
292 | 301 | # TODO |
|
293 | 302 | pass |
|
294 | 303 | |
|
295 | 304 | @contextlib.contextmanager |
|
296 | 305 | def parentchange(self): |
|
297 | 306 | # TODO: track this maybe? |
|
298 | 307 | yield |
|
299 | 308 | |
|
300 | 309 | def addparentchangecallback(self, category, callback): |
|
301 | 310 | # TODO: should this be added to the dirstate interface? |
|
302 | 311 | self._plchangecallbacks[category] = callback |
|
303 | 312 | |
|
304 | 313 | def clearbackup(self, tr, backupname): |
|
305 | 314 | # TODO |
|
306 | 315 | pass |
|
307 | 316 | |
|
308 | 317 | def setbranch(self, branch): |
|
309 | 318 | raise error.Abort( |
|
310 | 319 | b'git repos do not support branches. try using bookmarks' |
|
311 | 320 | ) |
General Comments 0
You need to be logged in to leave comments.
Login now