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