Mercurial > public > mercurial-scm > hg
annotate hgext/largefiles/reposetup.py @ 15316:c65f5b6e26d4 stable
largefiles: rename functions and methods to match desired behavior
The original intent was that the largefiles would primarily be in the
repository, with the global cache being only that--a cache. The naming
conventions and actual intent have both strayed. In this first patch, the
naming conventions are switched to match the actual intent, as are the
configuration options.
| author | Benjamin Pollack <benjamin@bitquabit.com> |
|---|---|
| date | Thu, 20 Oct 2011 13:24:09 -0400 |
| parents | 8d862e7b96d4 |
| children | 9da7e96cd5c2 |
| rev | line source |
|---|---|
| 15168 | 1 # Copyright 2009-2010 Gregory P. Ward |
| 2 # Copyright 2009-2010 Intelerad Medical Systems Incorporated | |
| 3 # Copyright 2010-2011 Fog Creek Software | |
| 4 # Copyright 2010-2011 Unity Technologies | |
| 5 # | |
| 6 # This software may be used and distributed according to the terms of the | |
| 7 # GNU General Public License version 2 or any later version. | |
| 8 | |
| 9 '''setup for largefiles repositories: reposetup''' | |
| 10 import copy | |
| 11 import types | |
| 12 import os | |
| 13 import re | |
| 14 | |
| 15305 | 15 from mercurial import context, error, manifest, match as match_, node, util |
| 15168 | 16 from mercurial.i18n import _ |
| 17 | |
| 18 import lfcommands | |
| 19 import proto | |
| 20 import lfutil | |
| 21 | |
| 22 def reposetup(ui, repo): | |
| 23 # wire repositories should be given new wireproto functions but not the | |
| 24 # other largefiles modifications | |
| 25 if not repo.local(): | |
| 26 return proto.wirereposetup(ui, repo) | |
| 27 | |
| 28 for name in ('status', 'commitctx', 'commit', 'push'): | |
| 29 method = getattr(repo, name) | |
| 30 #if not (isinstance(method, types.MethodType) and | |
| 31 # method.im_func is repo.__class__.commitctx.im_func): | |
|
15255
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
32 if (isinstance(method, types.FunctionType) and |
|
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
33 method.func_name == 'wrap'): |
| 15168 | 34 ui.warn(_('largefiles: repo method %r appears to have already been' |
| 35 ' wrapped by another extension: ' | |
| 36 'largefiles may behave incorrectly\n') | |
| 37 % name) | |
| 38 | |
| 39 class lfiles_repo(repo.__class__): | |
| 40 lfstatus = False | |
| 41 def status_nolfiles(self, *args, **kwargs): | |
| 42 return super(lfiles_repo, self).status(*args, **kwargs) | |
| 43 | |
|
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15250
diff
changeset
|
44 # When lfstatus is set, return a context that gives the names |
|
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15250
diff
changeset
|
45 # of largefiles instead of their corresponding standins and |
|
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15250
diff
changeset
|
46 # identifies the largefiles as always binary, regardless of |
|
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15250
diff
changeset
|
47 # their actual contents. |
| 15168 | 48 def __getitem__(self, changeid): |
| 49 ctx = super(lfiles_repo, self).__getitem__(changeid) | |
| 50 if self.lfstatus: | |
| 51 class lfiles_manifestdict(manifest.manifestdict): | |
| 52 def __contains__(self, filename): | |
| 53 if super(lfiles_manifestdict, | |
| 54 self).__contains__(filename): | |
| 55 return True | |
| 56 return super(lfiles_manifestdict, | |
| 57 self).__contains__(lfutil.shortname+'/' + filename) | |
| 58 class lfiles_ctx(ctx.__class__): | |
| 59 def files(self): | |
| 60 filenames = super(lfiles_ctx, self).files() | |
|
15170
c1a4a3220711
largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents:
15168
diff
changeset
|
61 return [re.sub('^\\'+lfutil.shortname+'/', '', |
|
c1a4a3220711
largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents:
15168
diff
changeset
|
62 filename) for filename in filenames] |
| 15168 | 63 def manifest(self): |
| 64 man1 = super(lfiles_ctx, self).manifest() | |
| 65 man1.__class__ = lfiles_manifestdict | |
| 66 return man1 | |
| 67 def filectx(self, path, fileid=None, filelog=None): | |
| 68 try: | |
| 69 result = super(lfiles_ctx, self).filectx(path, | |
| 70 fileid, filelog) | |
| 71 except error.LookupError: | |
| 72 # Adding a null character will cause Mercurial to | |
| 73 # identify this as a binary file. | |
| 74 result = super(lfiles_ctx, self).filectx( | |
| 75 lfutil.shortname + '/' + path, fileid, | |
| 76 filelog) | |
| 77 olddata = result.data | |
| 78 result.data = lambda: olddata() + '\0' | |
| 79 return result | |
| 80 ctx.__class__ = lfiles_ctx | |
| 81 return ctx | |
| 82 | |
| 83 # Figure out the status of big files and insert them into the | |
|
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15250
diff
changeset
|
84 # appropriate list in the result. Also removes standin files |
|
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15250
diff
changeset
|
85 # from the listing. Revert to the original status if |
|
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15250
diff
changeset
|
86 # self.lfstatus is False. |
| 15168 | 87 def status(self, node1='.', node2=None, match=None, ignored=False, |
| 88 clean=False, unknown=False, listsubrepos=False): | |
| 89 listignored, listclean, listunknown = ignored, clean, unknown | |
| 90 if not self.lfstatus: | |
| 91 try: | |
| 92 return super(lfiles_repo, self).status(node1, node2, match, | |
| 93 listignored, listclean, listunknown, listsubrepos) | |
| 94 except TypeError: | |
| 95 return super(lfiles_repo, self).status(node1, node2, match, | |
| 96 listignored, listclean, listunknown) | |
| 97 else: | |
| 98 # some calls in this function rely on the old version of status | |
| 99 self.lfstatus = False | |
| 100 if isinstance(node1, context.changectx): | |
| 101 ctx1 = node1 | |
| 102 else: | |
| 103 ctx1 = repo[node1] | |
| 104 if isinstance(node2, context.changectx): | |
| 105 ctx2 = node2 | |
| 106 else: | |
| 107 ctx2 = repo[node2] | |
| 108 working = ctx2.rev() is None | |
| 109 parentworking = working and ctx1 == self['.'] | |
| 110 | |
| 111 def inctx(file, ctx): | |
| 112 try: | |
| 113 if ctx.rev() is None: | |
| 114 return file in ctx.manifest() | |
| 115 ctx[file] | |
| 116 return True | |
|
15171
547da6115d1d
largefiles: eliminate naked exceptions
Matt Mackall <mpm@selenic.com>
parents:
15170
diff
changeset
|
117 except KeyError: |
| 15168 | 118 return False |
| 119 | |
| 120 if match is None: | |
| 121 match = match_.always(self.root, self.getcwd()) | |
| 122 | |
|
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15253
diff
changeset
|
123 # Create a copy of match that matches standins instead |
|
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15253
diff
changeset
|
124 # of largefiles. |
| 15168 | 125 def tostandin(file): |
| 126 if inctx(lfutil.standin(file), ctx2): | |
| 127 return lfutil.standin(file) | |
| 128 return file | |
| 129 | |
| 130 m = copy.copy(match) | |
| 131 m._files = [tostandin(f) for f in m._files] | |
| 132 | |
|
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15250
diff
changeset
|
133 # get ignored, clean, and unknown but remove them |
|
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15250
diff
changeset
|
134 # later if they were not asked for |
| 15168 | 135 try: |
| 136 result = super(lfiles_repo, self).status(node1, node2, m, | |
| 137 True, True, True, listsubrepos) | |
| 138 except TypeError: | |
| 139 result = super(lfiles_repo, self).status(node1, node2, m, | |
| 140 True, True, True) | |
| 141 if working: | |
|
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15250
diff
changeset
|
142 # hold the wlock while we read largefiles and |
|
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15250
diff
changeset
|
143 # update the lfdirstate |
| 15168 | 144 wlock = repo.wlock() |
| 145 try: | |
|
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15250
diff
changeset
|
146 # Any non-largefiles that were explicitly listed must be |
| 15168 | 147 # taken out or lfdirstate.status will report an error. |
| 148 # The status of these files was already computed using | |
| 149 # super's status. | |
| 150 lfdirstate = lfutil.openlfdirstate(ui, self) | |
| 151 match._files = [f for f in match._files if f in | |
| 152 lfdirstate] | |
| 153 s = lfdirstate.status(match, [], listignored, | |
| 154 listclean, listunknown) | |
| 155 (unsure, modified, added, removed, missing, unknown, | |
| 156 ignored, clean) = s | |
| 157 if parentworking: | |
| 158 for lfile in unsure: | |
| 159 if ctx1[lfutil.standin(lfile)].data().strip() \ | |
| 160 != lfutil.hashfile(self.wjoin(lfile)): | |
| 161 modified.append(lfile) | |
| 162 else: | |
| 163 clean.append(lfile) | |
| 164 lfdirstate.normal(lfile) | |
| 165 lfdirstate.write() | |
| 166 else: | |
| 167 tocheck = unsure + modified + added + clean | |
| 168 modified, added, clean = [], [], [] | |
| 169 | |
| 170 for lfile in tocheck: | |
| 171 standin = lfutil.standin(lfile) | |
| 172 if inctx(standin, ctx1): | |
| 173 if ctx1[standin].data().strip() != \ | |
| 174 lfutil.hashfile(self.wjoin(lfile)): | |
| 175 modified.append(lfile) | |
| 176 else: | |
| 177 clean.append(lfile) | |
| 178 else: | |
| 179 added.append(lfile) | |
| 180 finally: | |
| 181 wlock.release() | |
| 182 | |
| 183 for standin in ctx1.manifest(): | |
| 184 if not lfutil.isstandin(standin): | |
| 185 continue | |
| 186 lfile = lfutil.splitstandin(standin) | |
| 187 if not match(lfile): | |
| 188 continue | |
| 189 if lfile not in lfdirstate: | |
| 190 removed.append(lfile) | |
| 191 # Handle unknown and ignored differently | |
| 192 lfiles = (modified, added, removed, missing, [], [], clean) | |
| 193 result = list(result) | |
| 194 # Unknown files | |
|
15255
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
195 result[4] = [f for f in unknown |
|
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
196 if (repo.dirstate[f] == '?' and |
|
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
197 not lfutil.isstandin(f))] |
| 15168 | 198 # Ignored files must be ignored by both the dirstate and |
| 199 # lfdirstate | |
| 200 result[5] = set(ignored).intersection(set(result[5])) | |
|
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15253
diff
changeset
|
201 # combine normal files and largefiles |
|
15255
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
202 normals = [[fn for fn in filelist |
|
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
203 if not lfutil.isstandin(fn)] |
|
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
204 for filelist in result] |
|
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
205 result = [sorted(list1 + list2) |
|
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
206 for (list1, list2) in zip(normals, lfiles)] |
| 15168 | 207 else: |
| 208 def toname(f): | |
| 209 if lfutil.isstandin(f): | |
| 210 return lfutil.splitstandin(f) | |
| 211 return f | |
| 212 result = [[toname(f) for f in items] for items in result] | |
| 213 | |
| 214 if not listunknown: | |
| 215 result[4] = [] | |
| 216 if not listignored: | |
| 217 result[5] = [] | |
| 218 if not listclean: | |
| 219 result[6] = [] | |
| 220 self.lfstatus = True | |
| 221 return result | |
| 222 | |
|
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15253
diff
changeset
|
223 # As part of committing, copy all of the largefiles into the |
|
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15253
diff
changeset
|
224 # cache. |
| 15168 | 225 def commitctx(self, *args, **kwargs): |
| 226 node = super(lfiles_repo, self).commitctx(*args, **kwargs) | |
| 227 ctx = self[node] | |
| 228 for filename in ctx.files(): | |
| 229 if lfutil.isstandin(filename) and filename in ctx.manifest(): | |
| 230 realfile = lfutil.splitstandin(filename) | |
|
15316
c65f5b6e26d4
largefiles: rename functions and methods to match desired behavior
Benjamin Pollack <benjamin@bitquabit.com>
parents:
15312
diff
changeset
|
231 lfutil.copytostore(self, ctx.node(), realfile) |
| 15168 | 232 |
| 233 return node | |
| 234 | |
|
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15253
diff
changeset
|
235 # Before commit, largefile standins have not had their |
|
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15253
diff
changeset
|
236 # contents updated to reflect the hash of their largefile. |
|
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15253
diff
changeset
|
237 # Do that here. |
| 15168 | 238 def commit(self, text="", user=None, date=None, match=None, |
| 239 force=False, editor=False, extra={}): | |
| 240 orig = super(lfiles_repo, self).commit | |
| 241 | |
| 242 wlock = repo.wlock() | |
| 243 try: | |
| 244 if getattr(repo, "_isrebasing", False): | |
|
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15253
diff
changeset
|
245 # We have to take the time to pull down the new |
|
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15253
diff
changeset
|
246 # largefiles now. Otherwise if we are rebasing, |
|
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15253
diff
changeset
|
247 # any largefiles that were modified in the |
|
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15253
diff
changeset
|
248 # destination changesets get overwritten, either |
|
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15253
diff
changeset
|
249 # by the rebase or in the first commit after the |
|
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15253
diff
changeset
|
250 # rebase. |
| 15168 | 251 lfcommands.updatelfiles(repo.ui, repo) |
| 252 # Case 1: user calls commit with no specific files or | |
|
15250
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
253 # include/exclude patterns: refresh and commit all files that |
|
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
254 # are "dirty". |
|
15255
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
255 if ((match is None) or |
|
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
256 (not match.anypats() and not match.files())): |
|
15250
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
257 # Spend a bit of time here to get a list of files we know |
|
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
258 # are modified so we can compare only against those. |
|
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
259 # It can cost a lot of time (several seconds) |
|
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
260 # otherwise to update all standins if the largefiles are |
|
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
261 # large. |
|
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
262 lfdirstate = lfutil.openlfdirstate(ui, self) |
|
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
263 dirtymatch = match_.always(repo.root, repo.getcwd()) |
|
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
264 s = lfdirstate.status(dirtymatch, [], False, False, False) |
|
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
265 modifiedfiles = [] |
|
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
266 for i in s: |
|
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
267 modifiedfiles.extend(i) |
| 15168 | 268 lfiles = lfutil.listlfiles(self) |
|
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15253
diff
changeset
|
269 # this only loops through largefiles that exist (not |
| 15168 | 270 # removed/renamed) |
| 271 for lfile in lfiles: | |
|
15250
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
272 if lfile in modifiedfiles: |
|
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
273 if os.path.exists(self.wjoin(lfutil.standin(lfile))): |
|
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
274 # this handles the case where a rebase is being |
|
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
275 # performed and the working copy is not updated |
|
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
276 # yet. |
|
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
277 if os.path.exists(self.wjoin(lfile)): |
|
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
278 lfutil.updatestandin(self, |
|
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
279 lfutil.standin(lfile)) |
|
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
280 lfdirstate.normal(lfile) |
| 15168 | 281 for lfile in lfdirstate: |
|
15250
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
282 if lfile in modifiedfiles: |
|
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
283 if not os.path.exists( |
|
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
284 repo.wjoin(lfutil.standin(lfile))): |
|
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
285 lfdirstate.drop(lfile) |
| 15168 | 286 lfdirstate.write() |
| 287 | |
| 288 return orig(text=text, user=user, date=date, match=match, | |
| 289 force=force, editor=editor, extra=extra) | |
| 290 | |
|
15253
67d010779907
largefiles: improve error reporting
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
291 for f in match.files(): |
|
67d010779907
largefiles: improve error reporting
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
292 if lfutil.isstandin(f): |
| 15168 | 293 raise util.Abort( |
|
15253
67d010779907
largefiles: improve error reporting
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
294 _('file "%s" is a largefile standin') % f, |
|
67d010779907
largefiles: improve error reporting
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
295 hint=('commit the largefile itself instead')) |
| 15168 | 296 |
| 297 # Case 2: user calls commit with specified patterns: refresh | |
| 298 # any matching big files. | |
| 299 smatcher = lfutil.composestandinmatcher(self, match) | |
| 300 standins = lfutil.dirstate_walk(self.dirstate, smatcher) | |
| 301 | |
| 302 # No matching big files: get out of the way and pass control to | |
| 303 # the usual commit() method. | |
| 304 if not standins: | |
| 305 return orig(text=text, user=user, date=date, match=match, | |
| 306 force=force, editor=editor, extra=extra) | |
| 307 | |
| 308 # Refresh all matching big files. It's possible that the | |
| 309 # commit will end up failing, in which case the big files will | |
| 310 # stay refreshed. No harm done: the user modified them and | |
| 311 # asked to commit them, so sooner or later we're going to | |
| 312 # refresh the standins. Might as well leave them refreshed. | |
| 313 lfdirstate = lfutil.openlfdirstate(ui, self) | |
| 314 for standin in standins: | |
| 315 lfile = lfutil.splitstandin(standin) | |
| 316 if lfdirstate[lfile] <> 'r': | |
| 317 lfutil.updatestandin(self, standin) | |
| 318 lfdirstate.normal(lfile) | |
| 319 else: | |
|
15224
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15171
diff
changeset
|
320 lfdirstate.drop(lfile) |
| 15168 | 321 lfdirstate.write() |
| 322 | |
| 323 # Cook up a new matcher that only matches regular files or | |
| 324 # standins corresponding to the big files requested by the | |
| 325 # user. Have to modify _files to prevent commit() from | |
| 326 # complaining "not tracked" for big files. | |
| 327 lfiles = lfutil.listlfiles(repo) | |
| 328 match = copy.copy(match) | |
| 329 orig_matchfn = match.matchfn | |
| 330 | |
|
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15253
diff
changeset
|
331 # Check both the list of largefiles and the list of |
|
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15253
diff
changeset
|
332 # standins because if a largefile was removed, it |
|
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15253
diff
changeset
|
333 # won't be in the list of largefiles at this point |
| 15168 | 334 match._files += sorted(standins) |
| 335 | |
| 336 actualfiles = [] | |
| 337 for f in match._files: | |
| 338 fstandin = lfutil.standin(f) | |
| 339 | |
|
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15250
diff
changeset
|
340 # ignore known largefiles and standins |
| 15168 | 341 if f in lfiles or fstandin in standins: |
| 342 continue | |
| 343 | |
|
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15250
diff
changeset
|
344 # append directory separator to avoid collisions |
| 15168 | 345 if not fstandin.endswith(os.sep): |
| 346 fstandin += os.sep | |
| 347 | |
|
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15250
diff
changeset
|
348 # prevalidate matching standin directories |
|
15255
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
349 if lfutil.any_(st for st in match._files |
|
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
350 if st.startswith(fstandin)): |
| 15168 | 351 continue |
| 352 actualfiles.append(f) | |
| 353 match._files = actualfiles | |
| 354 | |
| 355 def matchfn(f): | |
| 356 if orig_matchfn(f): | |
| 357 return f not in lfiles | |
| 358 else: | |
| 359 return f in standins | |
| 360 | |
| 361 match.matchfn = matchfn | |
| 362 return orig(text=text, user=user, date=date, match=match, | |
| 363 force=force, editor=editor, extra=extra) | |
| 364 finally: | |
| 365 wlock.release() | |
| 366 | |
| 367 def push(self, remote, force=False, revs=None, newbranch=False): | |
| 368 o = lfutil.findoutgoing(repo, remote, force) | |
| 369 if o: | |
| 370 toupload = set() | |
| 371 o = repo.changelog.nodesbetween(o, revs)[0] | |
| 372 for n in o: | |
|
15255
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
373 parents = [p for p in repo.changelog.parents(n) |
|
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
374 if p != node.nullid] |
| 15168 | 375 ctx = repo[n] |
| 376 files = set(ctx.files()) | |
| 377 if len(parents) == 2: | |
| 378 mc = ctx.manifest() | |
| 379 mp1 = ctx.parents()[0].manifest() | |
| 380 mp2 = ctx.parents()[1].manifest() | |
| 381 for f in mp1: | |
| 382 if f not in mc: | |
| 383 files.add(f) | |
| 384 for f in mp2: | |
| 385 if f not in mc: | |
| 386 files.add(f) | |
| 387 for f in mc: | |
| 388 if mc[f] != mp1.get(f, None) or mc[f] != mp2.get(f, | |
| 389 None): | |
| 390 files.add(f) | |
| 391 | |
|
15255
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
392 toupload = toupload.union( |
|
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
393 set([ctx[f].data().strip() |
|
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
394 for f in files |
|
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
395 if lfutil.isstandin(f) and f in ctx])) |
| 15168 | 396 lfcommands.uploadlfiles(ui, self, remote, toupload) |
|
15224
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15171
diff
changeset
|
397 return super(lfiles_repo, self).push(remote, force, revs, |
|
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15171
diff
changeset
|
398 newbranch) |
| 15168 | 399 |
| 400 repo.__class__ = lfiles_repo | |
| 401 | |
| 402 def checkrequireslfiles(ui, repo, **kwargs): | |
| 403 if 'largefiles' not in repo.requirements and lfutil.any_( | |
| 404 lfutil.shortname+'/' in f[0] for f in repo.store.datafiles()): | |
|
15312
8d862e7b96d4
largefiles: remove 1.9 compat code
Eli Carter <eli.carter@tektronix.com>
parents:
15305
diff
changeset
|
405 repo.requirements.add('largefiles') |
| 15168 | 406 repo._writerequirements() |
| 407 | |
| 408 checkrequireslfiles(ui, repo) | |
| 409 | |
| 410 ui.setconfig('hooks', 'changegroup.lfiles', checkrequireslfiles) | |
| 411 ui.setconfig('hooks', 'commit.lfiles', checkrequireslfiles) |