Mercurial > hg-stable
annotate hgext/largefiles/overrides.py @ 16516:597ddcb41b32 stable
largefiles: notice dirty large files in a subrepo
Summary and commit use dirty() to check the status of a subrepository,
so this overrides dirty() in the subrepo in the same manner as
status() to check the large files instead of their standins.
Previously, if only a large file was changed in a subrepo, summary in
the top level repo would not report the subrepo was dirty and commit
-S would report nothing changed. If any type of file was changed in
the top repo and only a large file in the subrepo, commit -S would not
commit the changes to the subrepo.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sun, 22 Apr 2012 13:19:22 -0400 |
parents | 12dabc22de77 |
children | 43fb170a23bd b371056ae353 |
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 '''Overridden Mercurial commands and functions for the largefiles extension''' | |
10 | |
11 import os | |
12 import copy | |
13 | |
15305 | 14 from mercurial import hg, commands, util, cmdutil, scmutil, match as match_, \ |
15 node, archival, error, merge | |
15168 | 16 from mercurial.i18n import _ |
17 from mercurial.node import hex | |
18 from hgext import rebase | |
19 | |
20 import lfutil | |
21 import lfcommands | |
22 | |
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
23 # -- Utility functions: commonly/repeatedly needed functionality --------------- |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
24 |
15168 | 25 def installnormalfilesmatchfn(manifest): |
26 '''overrides scmutil.match so that the matcher it returns will ignore all | |
27 largefiles''' | |
28 oldmatch = None # for the closure | |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
29 def overridematch(ctx, pats=[], opts={}, globbed=False, |
15168 | 30 default='relpath'): |
15306
94527d67f3da
largefiles: fix some badly named function parameters
Greg Ward <greg@gerg.ca>
parents:
15305
diff
changeset
|
31 match = oldmatch(ctx, pats, opts, globbed, default) |
15168 | 32 m = copy.copy(match) |
33 notlfile = lambda f: not (lfutil.isstandin(f) or lfutil.standin(f) in | |
34 manifest) | |
35 m._files = filter(notlfile, m._files) | |
36 m._fmap = set(m._files) | |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
37 origmatchfn = m.matchfn |
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
38 m.matchfn = lambda f: notlfile(f) and origmatchfn(f) or None |
15168 | 39 return m |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
40 oldmatch = installmatchfn(overridematch) |
15168 | 41 |
42 def installmatchfn(f): | |
15224
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
43 oldmatch = scmutil.match |
15168 | 44 setattr(f, 'oldmatch', oldmatch) |
15224
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
45 scmutil.match = f |
15168 | 46 return oldmatch |
47 | |
48 def restorematchfn(): | |
49 '''restores scmutil.match to what it was before installnormalfilesmatchfn | |
50 was called. no-op if scmutil.match is its original function. | |
51 | |
52 Note that n calls to installnormalfilesmatchfn will require n calls to | |
53 restore matchfn to reverse''' | |
15224
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
54 scmutil.match = getattr(scmutil.match, 'oldmatch', scmutil.match) |
15168 | 55 |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
56 def addlargefiles(ui, repo, *pats, **opts): |
15168 | 57 large = opts.pop('large', None) |
15227
a7686abf73a6
largefiles: factor out lfutil.getminsize()
Greg Ward <greg@gerg.ca>
parents:
15224
diff
changeset
|
58 lfsize = lfutil.getminsize( |
a7686abf73a6
largefiles: factor out lfutil.getminsize()
Greg Ward <greg@gerg.ca>
parents:
15224
diff
changeset
|
59 ui, lfutil.islfilesrepo(repo), opts.pop('lfsize', None)) |
15168 | 60 |
61 lfmatcher = None | |
15739
be55285470cf
largefiles: tiny code clean up
Michal Sznajder <michalsznajder@gmail.com>
parents:
15674
diff
changeset
|
62 if lfutil.islfilesrepo(repo): |
15229
89e19ca2a90e
largefiles: use ui.configlist() to split largefiles.patterns
Greg Ward <greg@gerg.ca>
parents:
15227
diff
changeset
|
63 lfpats = ui.configlist(lfutil.longname, 'patterns', default=[]) |
15168 | 64 if lfpats: |
65 lfmatcher = match_.match(repo.root, '', list(lfpats)) | |
66 | |
67 lfnames = [] | |
15224
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
68 m = scmutil.match(repo[None], pats, opts) |
15168 | 69 m.bad = lambda x, y: None |
70 wctx = repo[None] | |
71 for f in repo.walk(m): | |
72 exact = m.exact(f) | |
73 lfile = lfutil.standin(f) in wctx | |
74 nfile = f in wctx | |
75 exists = lfile or nfile | |
76 | |
77 # Don't warn the user when they attempt to add a normal tracked file. | |
78 # The normal add code will do that for us. | |
79 if exact and exists: | |
80 if lfile: | |
81 ui.warn(_('%s already a largefile\n') % f) | |
82 continue | |
83 | |
84 if exact or not exists: | |
15255
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
85 abovemin = (lfsize and |
15369
b4ea79f88268
largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents:
15323
diff
changeset
|
86 os.lstat(repo.wjoin(f)).st_size >= lfsize * 1024 * 1024) |
15255
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
87 if large or abovemin or (lfmatcher and lfmatcher(f)): |
15168 | 88 lfnames.append(f) |
89 if ui.verbose or not exact: | |
90 ui.status(_('adding %s as a largefile\n') % m.rel(f)) | |
91 | |
92 bad = [] | |
93 standins = [] | |
94 | |
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
95 # Need to lock, otherwise there could be a race condition between |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
96 # when standins are created and added to the repo. |
15168 | 97 wlock = repo.wlock() |
98 try: | |
99 if not opts.get('dry_run'): | |
100 lfdirstate = lfutil.openlfdirstate(ui, repo) | |
101 for f in lfnames: | |
102 standinname = lfutil.standin(f) | |
103 lfutil.writestandin(repo, standinname, hash='', | |
104 executable=lfutil.getexecutable(repo.wjoin(f))) | |
105 standins.append(standinname) | |
106 if lfdirstate[f] == 'r': | |
107 lfdirstate.normallookup(f) | |
108 else: | |
109 lfdirstate.add(f) | |
110 lfdirstate.write() | |
15255
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
111 bad += [lfutil.splitstandin(f) |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
112 for f in lfutil.repoadd(repo, standins) |
15255
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
113 if f in m.files()] |
15168 | 114 finally: |
115 wlock.release() | |
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
116 return bad |
15168 | 117 |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
118 def removelargefiles(ui, repo, *pats, **opts): |
15786
aca0f2b3c7e3
largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15663
diff
changeset
|
119 after = opts.get('after') |
15168 | 120 if not pats and not after: |
121 raise util.Abort(_('no files specified')) | |
15224
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
122 m = scmutil.match(repo[None], pats, opts) |
15168 | 123 try: |
124 repo.lfstatus = True | |
125 s = repo.status(match=m, clean=True) | |
126 finally: | |
127 repo.lfstatus = False | |
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
128 manifest = repo[None].manifest() |
15255
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
129 modified, added, deleted, clean = [[f for f in list |
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
130 if lfutil.standin(f) in manifest] |
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
131 for list in [s[0], s[1], s[3], s[6]]] |
15168 | 132 |
133 def warn(files, reason): | |
134 for f in files: | |
15786
aca0f2b3c7e3
largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15663
diff
changeset
|
135 ui.warn(_('not removing %s: %s (use forget to undo)\n') |
15168 | 136 % (m.rel(f), reason)) |
137 | |
15786
aca0f2b3c7e3
largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15663
diff
changeset
|
138 if after: |
15168 | 139 remove, forget = deleted, [] |
15294
db7b09e689f1
largefiles: make parameter more i18n-friendly
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
15279
diff
changeset
|
140 warn(modified + added + clean, _('file still exists')) |
15168 | 141 else: |
142 remove, forget = deleted + clean, [] | |
15294
db7b09e689f1
largefiles: make parameter more i18n-friendly
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
15279
diff
changeset
|
143 warn(modified, _('file is modified')) |
db7b09e689f1
largefiles: make parameter more i18n-friendly
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
15279
diff
changeset
|
144 warn(added, _('file has been marked for add')) |
15168 | 145 |
146 for f in sorted(remove + forget): | |
147 if ui.verbose or not m.exact(f): | |
148 ui.status(_('removing %s\n') % m.rel(f)) | |
149 | |
150 # Need to lock because standin files are deleted then removed from the | |
151 # repository and we could race inbetween. | |
152 wlock = repo.wlock() | |
153 try: | |
154 lfdirstate = lfutil.openlfdirstate(ui, repo) | |
155 for f in remove: | |
156 if not after: | |
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
157 # If this is being called by addremove, notify the user that we |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
158 # are removing the file. |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
159 if getattr(repo, "_isaddremove", False): |
16231
ce292f1379ba
i18n: fix all remaining uses of % inside _()
Matt Mackall <mpm@selenic.com>
parents:
16103
diff
changeset
|
160 ui.status(_('removing %s\n') % f) |
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
161 if os.path.exists(repo.wjoin(f)): |
15930
2dc599583ebe
largefiles: test and simplify empty directory removal in remove
Patrick Mezard <pmezard@gmail.com>
parents:
15916
diff
changeset
|
162 util.unlinkpath(repo.wjoin(f)) |
15168 | 163 lfdirstate.remove(f) |
164 lfdirstate.write() | |
165 forget = [lfutil.standin(f) for f in forget] | |
166 remove = [lfutil.standin(f) for f in remove] | |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
167 lfutil.repoforget(repo, forget) |
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
168 # If this is being called by addremove, let the original addremove |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
169 # function handle this. |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
170 if not getattr(repo, "_isaddremove", False): |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
171 lfutil.reporemove(repo, remove, unlink=True) |
15168 | 172 finally: |
173 wlock.release() | |
174 | |
16449
874a680a3e23
largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents:
16439
diff
changeset
|
175 # For overriding mercurial.hgweb.webcommands so that largefiles will |
874a680a3e23
largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents:
16439
diff
changeset
|
176 # appear at their right place in the manifests. |
874a680a3e23
largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents:
16439
diff
changeset
|
177 def decodepath(orig, path): |
874a680a3e23
largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents:
16439
diff
changeset
|
178 return lfutil.splitstandin(path) or path |
874a680a3e23
largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents:
16439
diff
changeset
|
179 |
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
180 # -- Wrappers: modify existing commands -------------------------------- |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
181 |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
182 # Add works by going through the files that the user wanted to add and |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
183 # checking if they should be added as largefiles. Then it makes a new |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
184 # matcher which matches only the normal files and runs the original |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
185 # version of add. |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
186 def overrideadd(orig, ui, repo, *pats, **opts): |
15944
f19d5c852f9b
largefiles: add --normal option to hg add (issue3061)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15930
diff
changeset
|
187 normal = opts.pop('normal') |
f19d5c852f9b
largefiles: add --normal option to hg add (issue3061)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15930
diff
changeset
|
188 if normal: |
f19d5c852f9b
largefiles: add --normal option to hg add (issue3061)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15930
diff
changeset
|
189 if opts.get('large'): |
f19d5c852f9b
largefiles: add --normal option to hg add (issue3061)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15930
diff
changeset
|
190 raise util.Abort(_('--normal cannot be used with --large')) |
f19d5c852f9b
largefiles: add --normal option to hg add (issue3061)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15930
diff
changeset
|
191 return orig(ui, repo, *pats, **opts) |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
192 bad = addlargefiles(ui, repo, *pats, **opts) |
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
193 installnormalfilesmatchfn(repo[None].manifest()) |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
194 result = orig(ui, repo, *pats, **opts) |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
195 restorematchfn() |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
196 |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
197 return (result == 1 or bad) and 1 or 0 |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
198 |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
199 def overrideremove(orig, ui, repo, *pats, **opts): |
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
200 installnormalfilesmatchfn(repo[None].manifest()) |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
201 orig(ui, repo, *pats, **opts) |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
202 restorematchfn() |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
203 removelargefiles(ui, repo, *pats, **opts) |
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
204 |
16515
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16449
diff
changeset
|
205 def overridestatusfn(orig, repo, rev2, **opts): |
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16449
diff
changeset
|
206 try: |
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16449
diff
changeset
|
207 repo._repo.lfstatus = True |
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16449
diff
changeset
|
208 return orig(repo, rev2, **opts) |
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16449
diff
changeset
|
209 finally: |
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16449
diff
changeset
|
210 repo._repo.lfstatus = False |
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16449
diff
changeset
|
211 |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
212 def overridestatus(orig, ui, repo, *pats, **opts): |
15168 | 213 try: |
214 repo.lfstatus = True | |
215 return orig(ui, repo, *pats, **opts) | |
216 finally: | |
217 repo.lfstatus = False | |
218 | |
16516
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
219 def overridedirty(orig, repo, ignoreupdate=False): |
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
220 try: |
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
221 repo._repo.lfstatus = True |
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
222 return orig(repo, ignoreupdate) |
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
223 finally: |
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
224 repo._repo.lfstatus = False |
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
225 |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
226 def overridelog(orig, ui, repo, *pats, **opts): |
15168 | 227 try: |
228 repo.lfstatus = True | |
229 orig(ui, repo, *pats, **opts) | |
230 finally: | |
231 repo.lfstatus = False | |
232 | |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
233 def overrideverify(orig, ui, repo, *pats, **opts): |
15168 | 234 large = opts.pop('large', False) |
235 all = opts.pop('lfa', False) | |
236 contents = opts.pop('lfc', False) | |
237 | |
238 result = orig(ui, repo, *pats, **opts) | |
239 if large: | |
240 result = result or lfcommands.verifylfiles(ui, repo, all, contents) | |
241 return result | |
242 | |
243 # Override needs to refresh standins so that update's normal merge | |
244 # will go through properly. Then the other update hook (overriding repo.update) | |
245 # will get the new files. Filemerge is also overriden so that the merge | |
246 # will merge standins correctly. | |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
247 def overrideupdate(orig, ui, repo, *pats, **opts): |
15168 | 248 lfdirstate = lfutil.openlfdirstate(ui, repo) |
249 s = lfdirstate.status(match_.always(repo.root, repo.getcwd()), [], False, | |
250 False, False) | |
251 (unsure, modified, added, removed, missing, unknown, ignored, clean) = s | |
252 | |
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
253 # Need to lock between the standins getting updated and their |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
254 # largefiles getting updated |
15168 | 255 wlock = repo.wlock() |
256 try: | |
257 if opts['check']: | |
258 mod = len(modified) > 0 | |
259 for lfile in unsure: | |
260 standin = lfutil.standin(lfile) | |
261 if repo['.'][standin].data().strip() != \ | |
262 lfutil.hashfile(repo.wjoin(lfile)): | |
263 mod = True | |
264 else: | |
265 lfdirstate.normal(lfile) | |
266 lfdirstate.write() | |
267 if mod: | |
268 raise util.Abort(_('uncommitted local changes')) | |
269 # XXX handle removed differently | |
270 if not opts['clean']: | |
271 for lfile in unsure + modified + added: | |
272 lfutil.updatestandin(repo, lfutil.standin(lfile)) | |
273 finally: | |
274 wlock.release() | |
275 return orig(ui, repo, *pats, **opts) | |
276 | |
15663
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
277 # Before starting the manifest merge, merge.updates will call |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
278 # _checkunknown to check if there are any files in the merged-in |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
279 # changeset that collide with unknown files in the working copy. |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
280 # |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
281 # The largefiles are seen as unknown, so this prevents us from merging |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
282 # in a file 'foo' if we already have a largefile with the same name. |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
283 # |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
284 # The overridden function filters the unknown files by removing any |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
285 # largefiles. This makes the merge proceed and we can then handle this |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
286 # case further in the overridden manifestmerge function below. |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
287 def overridecheckunknownfile(origfn, repo, wctx, mctx, f): |
16093
7e30f5f2285f
merge: refactor unknown file conflict checking
Matt Mackall <mpm@selenic.com>
parents:
16075
diff
changeset
|
288 if lfutil.standin(f) in wctx: |
7e30f5f2285f
merge: refactor unknown file conflict checking
Matt Mackall <mpm@selenic.com>
parents:
16075
diff
changeset
|
289 return False |
7e30f5f2285f
merge: refactor unknown file conflict checking
Matt Mackall <mpm@selenic.com>
parents:
16075
diff
changeset
|
290 return origfn(repo, wctx, mctx, f) |
15663
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
291 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
292 # The manifest merge handles conflicts on the manifest level. We want |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
293 # to handle changes in largefile-ness of files at this level too. |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
294 # |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
295 # The strategy is to run the original manifestmerge and then process |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
296 # the action list it outputs. There are two cases we need to deal with: |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
297 # |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
298 # 1. Normal file in p1, largefile in p2. Here the largefile is |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
299 # detected via its standin file, which will enter the working copy |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
300 # with a "get" action. It is not "merge" since the standin is all |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
301 # Mercurial is concerned with at this level -- the link to the |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
302 # existing normal file is not relevant here. |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
303 # |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
304 # 2. Largefile in p1, normal file in p2. Here we get a "merge" action |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
305 # since the largefile will be present in the working copy and |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
306 # different from the normal file in p2. Mercurial therefore |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
307 # triggers a merge action. |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
308 # |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
309 # In both cases, we prompt the user and emit new actions to either |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
310 # remove the standin (if the normal file was kept) or to remove the |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
311 # normal file and get the standin (if the largefile was kept). The |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
312 # default prompt answer is to use the largefile version since it was |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
313 # presumably changed on purpose. |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
314 # |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
315 # Finally, the merge.applyupdates function will then take care of |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
316 # writing the files into the working copy and lfcommands.updatelfiles |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
317 # will update the largefiles. |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
318 def overridemanifestmerge(origfn, repo, p1, p2, pa, overwrite, partial): |
15663
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
319 actions = origfn(repo, p1, p2, pa, overwrite, partial) |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
320 processed = [] |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
321 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
322 for action in actions: |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
323 if overwrite: |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
324 processed.append(action) |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
325 continue |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
326 f, m = action[:2] |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
327 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
328 choices = (_('&Largefile'), _('&Normal file')) |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
329 if m == "g" and lfutil.splitstandin(f) in p1 and f in p2: |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
330 # Case 1: normal file in the working copy, largefile in |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
331 # the second parent |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
332 lfile = lfutil.splitstandin(f) |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
333 standin = f |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
334 msg = _('%s has been turned into a largefile\n' |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
335 'use (l)argefile or keep as (n)ormal file?') % lfile |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
336 if repo.ui.promptchoice(msg, choices, 0) == 0: |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
337 processed.append((lfile, "r")) |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
338 processed.append((standin, "g", p2.flags(standin))) |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
339 else: |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
340 processed.append((standin, "r")) |
16094
0776a6cababe
merge: don't use unknown()
Matt Mackall <mpm@selenic.com>
parents:
16093
diff
changeset
|
341 elif m == "g" and lfutil.standin(f) in p1 and f in p2: |
15663
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
342 # Case 2: largefile in the working copy, normal file in |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
343 # the second parent |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
344 standin = lfutil.standin(f) |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
345 lfile = f |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
346 msg = _('%s has been turned into a normal file\n' |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
347 'keep as (l)argefile or use (n)ormal file?') % lfile |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
348 if repo.ui.promptchoice(msg, choices, 0) == 0: |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
349 processed.append((lfile, "r")) |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
350 else: |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
351 processed.append((standin, "r")) |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
352 processed.append((lfile, "g", p2.flags(lfile))) |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
353 else: |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
354 processed.append(action) |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
355 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
356 return processed |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
357 |
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
358 # Override filemerge to prompt the user about how they wish to merge |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
359 # largefiles. This will handle identical edits, and copy/rename + |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
360 # edit without prompting the user. |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
361 def overridefilemerge(origfn, repo, mynode, orig, fcd, fco, fca): |
15168 | 362 # Use better variable names here. Because this is a wrapper we cannot |
363 # change the variable names in the function declaration. | |
364 fcdest, fcother, fcancestor = fcd, fco, fca | |
365 if not lfutil.isstandin(orig): | |
366 return origfn(repo, mynode, orig, fcdest, fcother, fcancestor) | |
367 else: | |
368 if not fcother.cmp(fcdest): # files identical? | |
369 return None | |
370 | |
371 # backwards, use working dir parent as ancestor | |
372 if fcancestor == fcother: | |
373 fcancestor = fcdest.parents()[0] | |
374 | |
375 if orig != fcother.path(): | |
376 repo.ui.status(_('merging %s and %s to %s\n') | |
377 % (lfutil.splitstandin(orig), | |
378 lfutil.splitstandin(fcother.path()), | |
379 lfutil.splitstandin(fcdest.path()))) | |
380 else: | |
381 repo.ui.status(_('merging %s\n') | |
382 % lfutil.splitstandin(fcdest.path())) | |
383 | |
384 if fcancestor.path() != fcother.path() and fcother.data() == \ | |
385 fcancestor.data(): | |
386 return 0 | |
387 if fcancestor.path() != fcdest.path() and fcdest.data() == \ | |
388 fcancestor.data(): | |
389 repo.wwrite(fcdest.path(), fcother.data(), fcother.flags()) | |
390 return 0 | |
391 | |
392 if repo.ui.promptchoice(_('largefile %s has a merge conflict\n' | |
393 'keep (l)ocal or take (o)ther?') % | |
394 lfutil.splitstandin(orig), | |
395 (_('&Local'), _('&Other')), 0) == 0: | |
396 return 0 | |
397 else: | |
398 repo.wwrite(fcdest.path(), fcother.data(), fcother.flags()) | |
399 return 0 | |
400 | |
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
401 # Copy first changes the matchers to match standins instead of |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
402 # largefiles. Then it overrides util.copyfile in that function it |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
403 # checks if the destination largefile already exists. It also keeps a |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
404 # list of copied files so that the largefiles can be copied and the |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
405 # dirstate updated. |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
406 def overridecopy(orig, ui, repo, pats, opts, rename=False): |
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
407 # doesn't remove largefile on rename |
15168 | 408 if len(pats) < 2: |
409 # this isn't legal, let the original function deal with it | |
410 return orig(ui, repo, pats, opts, rename) | |
411 | |
412 def makestandin(relpath): | |
15224
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
413 path = scmutil.canonpath(repo.root, repo.getcwd(), relpath) |
15323
19368c54a774
largefiles: remove all uses of os.path.relpath for 2.4 compatibility
Benjamin Pollack <benjamin@bitquabit.com>
parents:
15306
diff
changeset
|
414 return os.path.join(repo.wjoin(lfutil.standin(path))) |
15168 | 415 |
15224
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
416 fullpats = scmutil.expandpats(pats) |
15168 | 417 dest = fullpats[-1] |
418 | |
419 if os.path.isdir(dest): | |
420 if not os.path.isdir(makestandin(dest)): | |
421 os.makedirs(makestandin(dest)) | |
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
422 # This could copy both lfiles and normal files in one command, |
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
423 # but we don't want to do that. First replace their matcher to |
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
424 # only match normal files and run it, then replace it to just |
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
425 # match largefiles and run it again. |
15168 | 426 nonormalfiles = False |
427 nolfiles = False | |
428 try: | |
15279
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
429 try: |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
430 installnormalfilesmatchfn(repo[None].manifest()) |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
431 result = orig(ui, repo, pats, opts, rename) |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
432 except util.Abort, e: |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
433 if str(e) != 'no files to copy': |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
434 raise e |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
435 else: |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
436 nonormalfiles = True |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
437 result = 0 |
15168 | 438 finally: |
439 restorematchfn() | |
440 | |
441 # The first rename can cause our current working directory to be removed. | |
442 # In that case there is nothing left to copy/rename so just quit. | |
443 try: | |
444 repo.getcwd() | |
445 except OSError: | |
446 return result | |
447 | |
448 try: | |
15279
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
449 try: |
16248
51e6f318bdf1
largefiles: fix check-code errors.
Na'Tosha Bard <natosha@unity3d.com>
parents:
16247
diff
changeset
|
450 # When we call orig below it creates the standins but we don't add |
51e6f318bdf1
largefiles: fix check-code errors.
Na'Tosha Bard <natosha@unity3d.com>
parents:
16247
diff
changeset
|
451 # them to the dir state until later so lock during that time. |
15279
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
452 wlock = repo.wlock() |
15168 | 453 |
15279
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
454 manifest = repo[None].manifest() |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
455 oldmatch = None # for the closure |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
456 def overridematch(ctx, pats=[], opts={}, globbed=False, |
15279
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
457 default='relpath'): |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
458 newpats = [] |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
459 # The patterns were previously mangled to add the standin |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
460 # directory; we need to remove that now |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
461 for pat in pats: |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
462 if match_.patkind(pat) is None and lfutil.shortname in pat: |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
463 newpats.append(pat.replace(lfutil.shortname, '')) |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
464 else: |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
465 newpats.append(pat) |
15306
94527d67f3da
largefiles: fix some badly named function parameters
Greg Ward <greg@gerg.ca>
parents:
15305
diff
changeset
|
466 match = oldmatch(ctx, newpats, opts, globbed, default) |
15279
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
467 m = copy.copy(match) |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
468 lfile = lambda f: lfutil.standin(f) in manifest |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
469 m._files = [lfutil.standin(f) for f in m._files if lfile(f)] |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
470 m._fmap = set(m._files) |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
471 origmatchfn = m.matchfn |
15279
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
472 m.matchfn = lambda f: (lfutil.isstandin(f) and |
16075
d2e8e79a6361
largefiles: reduce redundant splitstandin/standin combination
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16074
diff
changeset
|
473 (f in manifest) and |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
474 origmatchfn(lfutil.splitstandin(f)) or |
15279
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
475 None) |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
476 return m |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
477 oldmatch = installmatchfn(overridematch) |
15279
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
478 listpats = [] |
15168 | 479 for pat in pats: |
15279
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
480 if match_.patkind(pat) is not None: |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
481 listpats.append(pat) |
15168 | 482 else: |
15279
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
483 listpats.append(makestandin(pat)) |
15168 | 484 |
15279
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
485 try: |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
486 origcopyfile = util.copyfile |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
487 copiedfiles = [] |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
488 def overridecopyfile(src, dest): |
15598
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15576
diff
changeset
|
489 if (lfutil.shortname in src and |
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15576
diff
changeset
|
490 dest.startswith(repo.wjoin(lfutil.shortname))): |
15279
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
491 destlfile = dest.replace(lfutil.shortname, '') |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
492 if not opts['force'] and os.path.exists(destlfile): |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
493 raise IOError('', |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
494 _('destination largefile already exists')) |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
495 copiedfiles.append((src, dest)) |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
496 origcopyfile(src, dest) |
15168 | 497 |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
498 util.copyfile = overridecopyfile |
15279
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
499 result += orig(ui, repo, listpats, opts, rename) |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
500 finally: |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
501 util.copyfile = origcopyfile |
15168 | 502 |
15279
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
503 lfdirstate = lfutil.openlfdirstate(ui, repo) |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
504 for (src, dest) in copiedfiles: |
15598
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15576
diff
changeset
|
505 if (lfutil.shortname in src and |
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15576
diff
changeset
|
506 dest.startswith(repo.wjoin(lfutil.shortname))): |
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15576
diff
changeset
|
507 srclfile = src.replace(repo.wjoin(lfutil.standin('')), '') |
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15576
diff
changeset
|
508 destlfile = dest.replace(repo.wjoin(lfutil.standin('')), '') |
15279
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
509 destlfiledir = os.path.dirname(destlfile) or '.' |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
510 if not os.path.isdir(destlfiledir): |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
511 os.makedirs(destlfiledir) |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
512 if rename: |
15598
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15576
diff
changeset
|
513 os.rename(repo.wjoin(srclfile), repo.wjoin(destlfile)) |
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15576
diff
changeset
|
514 lfdirstate.remove(srclfile) |
15279
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
515 else: |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
516 util.copyfile(srclfile, destlfile) |
15598
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15576
diff
changeset
|
517 lfdirstate.add(destlfile) |
15279
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
518 lfdirstate.write() |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
519 except util.Abort, e: |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
520 if str(e) != 'no files to copy': |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
521 raise e |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
522 else: |
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
523 nolfiles = True |
15168 | 524 finally: |
525 restorematchfn() | |
526 wlock.release() | |
527 | |
528 if nolfiles and nonormalfiles: | |
529 raise util.Abort(_('no files to copy')) | |
530 | |
531 return result | |
532 | |
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
533 # When the user calls revert, we have to be careful to not revert any |
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
534 # changes to other largefiles accidentally. This means we have to keep |
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
535 # track of the largefiles that are being reverted so we only pull down |
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
536 # the necessary largefiles. |
15168 | 537 # |
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
538 # Standins are only updated (to match the hash of largefiles) before |
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
539 # commits. Update the standins then run the original revert, changing |
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
540 # the matcher to hit standins instead of largefiles. Based on the |
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
541 # resulting standins update the largefiles. Then return the standins |
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
542 # to their proper state |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
543 def overriderevert(orig, ui, repo, *pats, **opts): |
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
544 # Because we put the standins in a bad state (by updating them) |
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
545 # and then return them to a correct state we need to lock to |
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
546 # prevent others from changing them in their incorrect state. |
15168 | 547 wlock = repo.wlock() |
548 try: | |
549 lfdirstate = lfutil.openlfdirstate(ui, repo) | |
550 (modified, added, removed, missing, unknown, ignored, clean) = \ | |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
551 lfutil.lfdirstatestatus(lfdirstate, repo, repo['.'].rev()) |
15168 | 552 for lfile in modified: |
553 lfutil.updatestandin(repo, lfutil.standin(lfile)) | |
15983
32b9aee3602c
largefiles: fix revert on missing largefile (issue3217)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15982
diff
changeset
|
554 for lfile in missing: |
32b9aee3602c
largefiles: fix revert on missing largefile (issue3217)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15982
diff
changeset
|
555 os.unlink(repo.wjoin(lfutil.standin(lfile))) |
15168 | 556 |
557 try: | |
558 ctx = repo[opts.get('rev')] | |
559 oldmatch = None # for the closure | |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
560 def overridematch(ctx, pats=[], opts={}, globbed=False, |
15168 | 561 default='relpath'): |
15306
94527d67f3da
largefiles: fix some badly named function parameters
Greg Ward <greg@gerg.ca>
parents:
15305
diff
changeset
|
562 match = oldmatch(ctx, pats, opts, globbed, default) |
15168 | 563 m = copy.copy(match) |
564 def tostandin(f): | |
16074
67a5bc8aeb1d
largefiles: reduce OR-ing of same conditions
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
565 if lfutil.standin(f) in ctx: |
15168 | 566 return lfutil.standin(f) |
567 elif lfutil.standin(f) in repo[None]: | |
568 return None | |
569 return f | |
570 m._files = [tostandin(f) for f in m._files] | |
571 m._files = [f for f in m._files if f is not None] | |
572 m._fmap = set(m._files) | |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
573 origmatchfn = m.matchfn |
15168 | 574 def matchfn(f): |
575 if lfutil.isstandin(f): | |
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
576 # We need to keep track of what largefiles are being |
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
577 # matched so we know which ones to update later -- |
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
578 # otherwise we accidentally revert changes to other |
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
579 # largefiles. This is repo-specific, so duckpunch the |
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
580 # repo object to keep the list of largefiles for us |
15168 | 581 # later. |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
582 if origmatchfn(lfutil.splitstandin(f)) and \ |
15168 | 583 (f in repo[None] or f in ctx): |
584 lfileslist = getattr(repo, '_lfilestoupdate', []) | |
585 lfileslist.append(lfutil.splitstandin(f)) | |
586 repo._lfilestoupdate = lfileslist | |
587 return True | |
588 else: | |
589 return False | |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
590 return origmatchfn(f) |
15168 | 591 m.matchfn = matchfn |
592 return m | |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
593 oldmatch = installmatchfn(overridematch) |
15224
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
594 scmutil.match |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
595 matches = overridematch(repo[None], pats, opts) |
15168 | 596 orig(ui, repo, *pats, **opts) |
597 finally: | |
598 restorematchfn() | |
599 lfileslist = getattr(repo, '_lfilestoupdate', []) | |
15170
c1a4a3220711
largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents:
15169
diff
changeset
|
600 lfcommands.updatelfiles(ui, repo, filelist=lfileslist, |
c1a4a3220711
largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents:
15169
diff
changeset
|
601 printmessage=False) |
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
602 |
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
603 # empty out the largefiles list so we start fresh next time |
15168 | 604 repo._lfilestoupdate = [] |
605 for lfile in modified: | |
606 if lfile in lfileslist: | |
607 if os.path.exists(repo.wjoin(lfutil.standin(lfile))) and lfile\ | |
608 in repo['.']: | |
609 lfutil.writestandin(repo, lfutil.standin(lfile), | |
610 repo['.'][lfile].data().strip(), | |
611 'x' in repo['.'][lfile].flags()) | |
612 lfdirstate = lfutil.openlfdirstate(ui, repo) | |
613 for lfile in added: | |
614 standin = lfutil.standin(lfile) | |
615 if standin not in ctx and (standin in matches or opts.get('all')): | |
616 if lfile in lfdirstate: | |
15224
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
617 lfdirstate.drop(lfile) |
15168 | 618 util.unlinkpath(repo.wjoin(standin)) |
619 lfdirstate.write() | |
620 finally: | |
621 wlock.release() | |
622 | |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
623 def hgupdate(orig, repo, node): |
16245
a18ad914aa21
largefiles: move calculation of largefiles for updating to utility function
Na'Tosha Bard <natosha@unity3d.com>
parents:
16232
diff
changeset
|
624 # Only call updatelfiles the standins that have changed to save time |
16120
47ee41fcf42b
largefiles: optimize update speed by only updating changed largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
16109
diff
changeset
|
625 oldstandins = lfutil.getstandinsstate(repo) |
15168 | 626 result = orig(repo, node) |
16120
47ee41fcf42b
largefiles: optimize update speed by only updating changed largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
16109
diff
changeset
|
627 newstandins = lfutil.getstandinsstate(repo) |
16245
a18ad914aa21
largefiles: move calculation of largefiles for updating to utility function
Na'Tosha Bard <natosha@unity3d.com>
parents:
16232
diff
changeset
|
628 filelist = lfutil.getlfilestoupdate(oldstandins, newstandins) |
16120
47ee41fcf42b
largefiles: optimize update speed by only updating changed largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
16109
diff
changeset
|
629 lfcommands.updatelfiles(repo.ui, repo, filelist=filelist, printmessage=True) |
15168 | 630 return result |
631 | |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
632 def hgclean(orig, repo, node, show_stats=True): |
15168 | 633 result = orig(repo, node, show_stats) |
634 lfcommands.updatelfiles(repo.ui, repo) | |
635 return result | |
636 | |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
637 def hgmerge(orig, repo, node, force=None, remind=True): |
15860
3ecce805ac13
largefiles: correctly download new largefiles when merging
Na'Tosha Bard <natosha@unity3d.com>
parents:
15794
diff
changeset
|
638 # Mark the repo as being in the middle of a merge, so that |
3ecce805ac13
largefiles: correctly download new largefiles when merging
Na'Tosha Bard <natosha@unity3d.com>
parents:
15794
diff
changeset
|
639 # updatelfiles() will know that it needs to trust the standins in |
3ecce805ac13
largefiles: correctly download new largefiles when merging
Na'Tosha Bard <natosha@unity3d.com>
parents:
15794
diff
changeset
|
640 # the working copy, not in the standins in the current node |
3ecce805ac13
largefiles: correctly download new largefiles when merging
Na'Tosha Bard <natosha@unity3d.com>
parents:
15794
diff
changeset
|
641 repo._ismerging = True |
3ecce805ac13
largefiles: correctly download new largefiles when merging
Na'Tosha Bard <natosha@unity3d.com>
parents:
15794
diff
changeset
|
642 try: |
3ecce805ac13
largefiles: correctly download new largefiles when merging
Na'Tosha Bard <natosha@unity3d.com>
parents:
15794
diff
changeset
|
643 result = orig(repo, node, force, remind) |
3ecce805ac13
largefiles: correctly download new largefiles when merging
Na'Tosha Bard <natosha@unity3d.com>
parents:
15794
diff
changeset
|
644 lfcommands.updatelfiles(repo.ui, repo) |
3ecce805ac13
largefiles: correctly download new largefiles when merging
Na'Tosha Bard <natosha@unity3d.com>
parents:
15794
diff
changeset
|
645 finally: |
3ecce805ac13
largefiles: correctly download new largefiles when merging
Na'Tosha Bard <natosha@unity3d.com>
parents:
15794
diff
changeset
|
646 repo._ismerging = False |
15168 | 647 return result |
648 | |
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
649 # When we rebase a repository with remotely changed largefiles, we need to |
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
650 # take some extra care so that the largefiles are correctly updated in the |
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
651 # working copy |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
652 def overridepull(orig, ui, repo, source=None, **opts): |
15168 | 653 if opts.get('rebase', False): |
654 repo._isrebasing = True | |
655 try: | |
656 if opts.get('update'): | |
657 del opts['update'] | |
658 ui.debug('--update and --rebase are not compatible, ignoring ' | |
659 'the update flag\n') | |
660 del opts['rebase'] | |
15224
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
661 cmdutil.bailifchanged(repo) |
15168 | 662 revsprepull = len(repo) |
663 origpostincoming = commands.postincoming | |
664 def _dummy(*args, **kwargs): | |
665 pass | |
666 commands.postincoming = _dummy | |
667 repo.lfpullsource = source | |
668 if not source: | |
669 source = 'default' | |
670 try: | |
671 result = commands.pull(ui, repo, source, **opts) | |
672 finally: | |
673 commands.postincoming = origpostincoming | |
674 revspostpull = len(repo) | |
675 if revspostpull > revsprepull: | |
676 result = result or rebase.rebase(ui, repo) | |
677 finally: | |
678 repo._isrebasing = False | |
679 else: | |
680 repo.lfpullsource = source | |
681 if not source: | |
682 source = 'default' | |
16103
3e1efb458e8b
largefiles: only cache largefiles in new heads
Na'Tosha Bard <natosha@unity3d.com>
parents:
15983
diff
changeset
|
683 oldheads = lfutil.getcurrentheads(repo) |
15168 | 684 result = orig(ui, repo, source, **opts) |
15916
c96148346af8
largefiles: cache new largefiles for new heads when pulling
Na'Tosha Bard <natosha@unity3d.com>
parents:
15914
diff
changeset
|
685 # If we do not have the new largefiles for any new heads we pulled, we |
c96148346af8
largefiles: cache new largefiles for new heads when pulling
Na'Tosha Bard <natosha@unity3d.com>
parents:
15914
diff
changeset
|
686 # will run into a problem later if we try to merge or rebase with one of |
c96148346af8
largefiles: cache new largefiles for new heads when pulling
Na'Tosha Bard <natosha@unity3d.com>
parents:
15914
diff
changeset
|
687 # these heads, so cache the largefiles now direclty into the system |
c96148346af8
largefiles: cache new largefiles for new heads when pulling
Na'Tosha Bard <natosha@unity3d.com>
parents:
15914
diff
changeset
|
688 # cache. |
c96148346af8
largefiles: cache new largefiles for new heads when pulling
Na'Tosha Bard <natosha@unity3d.com>
parents:
15914
diff
changeset
|
689 ui.status(_("caching new largefiles\n")) |
c96148346af8
largefiles: cache new largefiles for new heads when pulling
Na'Tosha Bard <natosha@unity3d.com>
parents:
15914
diff
changeset
|
690 numcached = 0 |
16103
3e1efb458e8b
largefiles: only cache largefiles in new heads
Na'Tosha Bard <natosha@unity3d.com>
parents:
15983
diff
changeset
|
691 heads = lfutil.getcurrentheads(repo) |
3e1efb458e8b
largefiles: only cache largefiles in new heads
Na'Tosha Bard <natosha@unity3d.com>
parents:
15983
diff
changeset
|
692 newheads = set(heads).difference(set(oldheads)) |
3e1efb458e8b
largefiles: only cache largefiles in new heads
Na'Tosha Bard <natosha@unity3d.com>
parents:
15983
diff
changeset
|
693 for head in newheads: |
3e1efb458e8b
largefiles: only cache largefiles in new heads
Na'Tosha Bard <natosha@unity3d.com>
parents:
15983
diff
changeset
|
694 (cached, missing) = lfcommands.cachelfiles(ui, repo, head) |
3e1efb458e8b
largefiles: only cache largefiles in new heads
Na'Tosha Bard <natosha@unity3d.com>
parents:
15983
diff
changeset
|
695 numcached += len(cached) |
16231
ce292f1379ba
i18n: fix all remaining uses of % inside _()
Matt Mackall <mpm@selenic.com>
parents:
16103
diff
changeset
|
696 ui.status(_("%d largefiles cached\n") % numcached) |
15168 | 697 return result |
698 | |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
699 def overriderebase(orig, ui, repo, **opts): |
15168 | 700 repo._isrebasing = True |
701 try: | |
702 orig(ui, repo, **opts) | |
703 finally: | |
704 repo._isrebasing = False | |
705 | |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
706 def overridearchive(orig, repo, dest, node, kind, decode=True, matchfn=None, |
15168 | 707 prefix=None, mtime=None, subrepos=None): |
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
708 # No need to lock because we are only reading history and |
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
709 # largefile caches, neither of which are modified. |
15168 | 710 lfcommands.cachelfiles(repo.ui, repo, node) |
711 | |
712 if kind not in archival.archivers: | |
713 raise util.Abort(_("unknown archive type '%s'") % kind) | |
714 | |
715 ctx = repo[node] | |
716 | |
15224
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
717 if kind == 'files': |
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
718 if prefix: |
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
719 raise util.Abort( |
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
720 _('cannot give prefix when archiving to files')) |
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
721 else: |
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
722 prefix = archival.tidyprefix(dest, kind, prefix) |
15168 | 723 |
15224
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
724 def write(name, mode, islink, getdata): |
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
725 if matchfn and not matchfn(name): |
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
726 return |
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
727 data = getdata() |
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
728 if decode: |
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
729 data = repo.wwritedata(name, data) |
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
730 archiver.addfile(prefix + name, mode, islink, data) |
15168 | 731 |
15224
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
732 archiver = archival.archivers[kind](dest, mtime or ctx.date()[0]) |
15168 | 733 |
734 if repo.ui.configbool("ui", "archivemeta", True): | |
735 def metadata(): | |
736 base = 'repo: %s\nnode: %s\nbranch: %s\n' % ( | |
737 hex(repo.changelog.node(0)), hex(node), ctx.branch()) | |
738 | |
739 tags = ''.join('tag: %s\n' % t for t in ctx.tags() | |
740 if repo.tagtype(t) == 'global') | |
741 if not tags: | |
742 repo.ui.pushbuffer() | |
743 opts = {'template': '{latesttag}\n{latesttagdistance}', | |
744 'style': '', 'patch': None, 'git': None} | |
745 cmdutil.show_changeset(repo.ui, repo, opts).show(ctx) | |
746 ltags, dist = repo.ui.popbuffer().split('\n') | |
747 tags = ''.join('latesttag: %s\n' % t for t in ltags.split(':')) | |
748 tags += 'latesttagdistance: %s\n' % dist | |
749 | |
750 return base + tags | |
751 | |
752 write('.hg_archival.txt', 0644, False, metadata) | |
753 | |
754 for f in ctx: | |
755 ff = ctx.flags(f) | |
756 getdata = ctx[f].data | |
757 if lfutil.isstandin(f): | |
758 path = lfutil.findfile(repo, getdata().strip()) | |
15914
264087940d5b
largefiles: check if largefile could be found when archiving (issue3193)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15860
diff
changeset
|
759 if path is None: |
264087940d5b
largefiles: check if largefile could be found when archiving (issue3193)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15860
diff
changeset
|
760 raise util.Abort( |
264087940d5b
largefiles: check if largefile could be found when archiving (issue3193)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15860
diff
changeset
|
761 _('largefile %s not found in repo store or system cache') |
264087940d5b
largefiles: check if largefile could be found when archiving (issue3193)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15860
diff
changeset
|
762 % lfutil.splitstandin(f)) |
15168 | 763 f = lfutil.splitstandin(f) |
764 | |
765 def getdatafn(): | |
15576
e387e760b207
largefiles: avoid use of uinitialized variable in case of errors
Mads Kiilerich <mads@kiilerich.com>
parents:
15383
diff
changeset
|
766 fd = None |
15168 | 767 try: |
768 fd = open(path, 'rb') | |
769 return fd.read() | |
770 finally: | |
15576
e387e760b207
largefiles: avoid use of uinitialized variable in case of errors
Mads Kiilerich <mads@kiilerich.com>
parents:
15383
diff
changeset
|
771 if fd: |
e387e760b207
largefiles: avoid use of uinitialized variable in case of errors
Mads Kiilerich <mads@kiilerich.com>
parents:
15383
diff
changeset
|
772 fd.close() |
15168 | 773 |
774 getdata = getdatafn | |
775 write(f, 'x' in ff and 0755 or 0644, 'l' in ff, getdata) | |
776 | |
777 if subrepos: | |
778 for subpath in ctx.substate: | |
779 sub = ctx.sub(subpath) | |
15626
931dc4af0d95
largefiles: remove pre-1.7 compatibility code
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
780 sub.archive(repo.ui, archiver, prefix) |
15168 | 781 |
782 archiver.done() | |
783 | |
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
784 # If a largefile is modified, the change is not reflected in its |
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
785 # standin until a commit. cmdutil.bailifchanged() raises an exception |
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
786 # if the repo has uncommitted changes. Wrap it to also check if |
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
787 # largefiles were changed. This is used by bisect and backout. |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
788 def overridebailifchanged(orig, repo): |
15168 | 789 orig(repo) |
790 repo.lfstatus = True | |
791 modified, added, removed, deleted = repo.status()[:4] | |
792 repo.lfstatus = False | |
793 if modified or added or removed or deleted: | |
794 raise util.Abort(_('outstanding uncommitted changes')) | |
795 | |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
796 # Fetch doesn't use cmdutil.bailifchanged so override it to add the check |
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
797 def overridefetch(orig, ui, repo, *pats, **opts): |
15168 | 798 repo.lfstatus = True |
799 modified, added, removed, deleted = repo.status()[:4] | |
800 repo.lfstatus = False | |
801 if modified or added or removed or deleted: | |
802 raise util.Abort(_('outstanding uncommitted changes')) | |
803 return orig(ui, repo, *pats, **opts) | |
804 | |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
805 def overrideforget(orig, ui, repo, *pats, **opts): |
15168 | 806 installnormalfilesmatchfn(repo[None].manifest()) |
807 orig(ui, repo, *pats, **opts) | |
808 restorematchfn() | |
15224
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
809 m = scmutil.match(repo[None], pats, opts) |
15168 | 810 |
811 try: | |
812 repo.lfstatus = True | |
813 s = repo.status(match=m, clean=True) | |
814 finally: | |
815 repo.lfstatus = False | |
816 forget = sorted(s[0] + s[1] + s[3] + s[6]) | |
817 forget = [f for f in forget if lfutil.standin(f) in repo[None].manifest()] | |
818 | |
819 for f in forget: | |
820 if lfutil.standin(f) not in repo.dirstate and not \ | |
821 os.path.isdir(m.rel(lfutil.standin(f))): | |
822 ui.warn(_('not removing %s: file is already untracked\n') | |
823 % m.rel(f)) | |
824 | |
825 for f in forget: | |
826 if ui.verbose or not m.exact(f): | |
827 ui.status(_('removing %s\n') % m.rel(f)) | |
828 | |
829 # Need to lock because standin files are deleted then removed from the | |
830 # repository and we could race inbetween. | |
831 wlock = repo.wlock() | |
832 try: | |
833 lfdirstate = lfutil.openlfdirstate(ui, repo) | |
834 for f in forget: | |
835 if lfdirstate[f] == 'a': | |
836 lfdirstate.drop(f) | |
837 else: | |
838 lfdirstate.remove(f) | |
839 lfdirstate.write() | |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
840 lfutil.reporemove(repo, [lfutil.standin(f) for f in forget], |
15168 | 841 unlink=True) |
842 finally: | |
843 wlock.release() | |
844 | |
845 def getoutgoinglfiles(ui, repo, dest=None, **opts): | |
846 dest = ui.expandpath(dest or 'default-push', dest or 'default') | |
847 dest, branches = hg.parseurl(dest, opts.get('branch')) | |
848 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev')) | |
849 if revs: | |
850 revs = [repo.lookup(rev) for rev in revs] | |
851 | |
15224
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
852 remoteui = hg.remoteui |
15168 | 853 |
854 try: | |
855 remote = hg.repository(remoteui(repo, opts), dest) | |
856 except error.RepoError: | |
857 return None | |
858 o = lfutil.findoutgoing(repo, remote, False) | |
859 if not o: | |
860 return None | |
861 o = repo.changelog.nodesbetween(o, revs)[0] | |
862 if opts.get('newest_first'): | |
863 o.reverse() | |
864 | |
865 toupload = set() | |
866 for n in o: | |
867 parents = [p for p in repo.changelog.parents(n) if p != node.nullid] | |
868 ctx = repo[n] | |
869 files = set(ctx.files()) | |
870 if len(parents) == 2: | |
871 mc = ctx.manifest() | |
872 mp1 = ctx.parents()[0].manifest() | |
873 mp2 = ctx.parents()[1].manifest() | |
874 for f in mp1: | |
875 if f not in mc: | |
876 files.add(f) | |
877 for f in mp2: | |
878 if f not in mc: | |
879 files.add(f) | |
880 for f in mc: | |
881 if mc[f] != mp1.get(f, None) or mc[f] != mp2.get(f, None): | |
882 files.add(f) | |
15255
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
883 toupload = toupload.union( |
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
884 set([f for f in files if lfutil.isstandin(f) and f in ctx])) |
15168 | 885 return toupload |
886 | |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
887 def overrideoutgoing(orig, ui, repo, dest=None, **opts): |
15168 | 888 orig(ui, repo, dest, **opts) |
889 | |
890 if opts.pop('large', None): | |
891 toupload = getoutgoinglfiles(ui, repo, dest, **opts) | |
892 if toupload is None: | |
893 ui.status(_('largefiles: No remote repo\n')) | |
894 else: | |
895 ui.status(_('largefiles to upload:\n')) | |
896 for file in toupload: | |
897 ui.status(lfutil.splitstandin(file) + '\n') | |
898 ui.status('\n') | |
899 | |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
900 def overridesummary(orig, ui, repo, *pats, **opts): |
15787
0c7b83a057aa
largefiles: fix output of hg summary (issue3060)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15786
diff
changeset
|
901 try: |
0c7b83a057aa
largefiles: fix output of hg summary (issue3060)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15786
diff
changeset
|
902 repo.lfstatus = True |
0c7b83a057aa
largefiles: fix output of hg summary (issue3060)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15786
diff
changeset
|
903 orig(ui, repo, *pats, **opts) |
0c7b83a057aa
largefiles: fix output of hg summary (issue3060)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15786
diff
changeset
|
904 finally: |
0c7b83a057aa
largefiles: fix output of hg summary (issue3060)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15786
diff
changeset
|
905 repo.lfstatus = False |
15168 | 906 |
907 if opts.pop('large', None): | |
908 toupload = getoutgoinglfiles(ui, repo, None, **opts) | |
909 if toupload is None: | |
910 ui.status(_('largefiles: No remote repo\n')) | |
911 else: | |
912 ui.status(_('largefiles: %d to upload\n') % len(toupload)) | |
913 | |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
914 def overrideaddremove(orig, ui, repo, *pats, **opts): |
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
915 # Get the list of missing largefiles so we can remove them |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
916 lfdirstate = lfutil.openlfdirstate(ui, repo) |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
917 s = lfdirstate.status(match_.always(repo.root, repo.getcwd()), [], False, |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
918 False, False) |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
919 (unsure, modified, added, removed, missing, unknown, ignored, clean) = s |
15168 | 920 |
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
921 # Call into the normal remove code, but the removing of the standin, we want |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
922 # to have handled by original addremove. Monkey patching here makes sure |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
923 # we don't remove the standin in the largefiles code, preventing a very |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
924 # confused state later. |
15967
295f8aeab363
largefiles: fix addremove when no largefiles are specified
Na'Tosha Bard <natosha@unity3d.com>
parents:
15944
diff
changeset
|
925 if missing: |
295f8aeab363
largefiles: fix addremove when no largefiles are specified
Na'Tosha Bard <natosha@unity3d.com>
parents:
15944
diff
changeset
|
926 repo._isaddremove = True |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
927 removelargefiles(ui, repo, *missing, **opts) |
15967
295f8aeab363
largefiles: fix addremove when no largefiles are specified
Na'Tosha Bard <natosha@unity3d.com>
parents:
15944
diff
changeset
|
928 repo._isaddremove = False |
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
929 # Call into the normal add code, and any files that *should* be added as |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
930 # largefiles will be |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
931 addlargefiles(ui, repo, *pats, **opts) |
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
932 # Now that we've handled largefiles, hand off to the original addremove |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
933 # function to take care of the rest. Make sure it doesn't do anything with |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
934 # largefiles by installing a matcher that will ignore them. |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
935 installnormalfilesmatchfn(repo[None].manifest()) |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
936 result = orig(ui, repo, *pats, **opts) |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
937 restorematchfn() |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
938 return result |
15168 | 939 |
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
940 # Calling purge with --all will cause the largefiles to be deleted. |
15168 | 941 # Override repo.status to prevent this from happening. |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
942 def overridepurge(orig, ui, repo, *dirs, **opts): |
15168 | 943 oldstatus = repo.status |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
944 def overridestatus(node1='.', node2=None, match=None, ignored=False, |
15168 | 945 clean=False, unknown=False, listsubrepos=False): |
946 r = oldstatus(node1, node2, match, ignored, clean, unknown, | |
947 listsubrepos) | |
948 lfdirstate = lfutil.openlfdirstate(ui, repo) | |
949 modified, added, removed, deleted, unknown, ignored, clean = r | |
950 unknown = [f for f in unknown if lfdirstate[f] == '?'] | |
951 ignored = [f for f in ignored if lfdirstate[f] == '?'] | |
952 return modified, added, removed, deleted, unknown, ignored, clean | |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
953 repo.status = overridestatus |
15168 | 954 orig(ui, repo, *dirs, **opts) |
955 repo.status = oldstatus | |
956 | |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
957 def overriderollback(orig, ui, repo, **opts): |
15168 | 958 result = orig(ui, repo, **opts) |
959 merge.update(repo, node=None, branchmerge=False, force=True, | |
960 partial=lfutil.isstandin) | |
15794
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
961 wlock = repo.wlock() |
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
962 try: |
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
963 lfdirstate = lfutil.openlfdirstate(ui, repo) |
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
964 lfiles = lfutil.listlfiles(repo) |
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
965 oldlfiles = lfutil.listlfiles(repo, repo[None].parents()[0].rev()) |
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
966 for file in lfiles: |
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
967 if file in oldlfiles: |
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
968 lfdirstate.normallookup(file) |
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
969 else: |
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
970 lfdirstate.add(file) |
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
971 lfdirstate.write() |
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
972 finally: |
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
973 wlock.release() |
15168 | 974 return result |
15383
155d0f8fb7e5
largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com>
parents:
15369
diff
changeset
|
975 |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
976 def overridetransplant(orig, ui, repo, *revs, **opts): |
15982
bf502ccc46d7
largefiles: fix transplant for all cases (issue3192)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15967
diff
changeset
|
977 try: |
16246
169525f8ffbb
largefiles: only update changed largefiles when transplanting
Na'Tosha Bard <natosha@unity3d.com>
parents:
16245
diff
changeset
|
978 oldstandins = lfutil.getstandinsstate(repo) |
15982
bf502ccc46d7
largefiles: fix transplant for all cases (issue3192)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15967
diff
changeset
|
979 repo._istransplanting = True |
bf502ccc46d7
largefiles: fix transplant for all cases (issue3192)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15967
diff
changeset
|
980 result = orig(ui, repo, *revs, **opts) |
16246
169525f8ffbb
largefiles: only update changed largefiles when transplanting
Na'Tosha Bard <natosha@unity3d.com>
parents:
16245
diff
changeset
|
981 newstandins = lfutil.getstandinsstate(repo) |
169525f8ffbb
largefiles: only update changed largefiles when transplanting
Na'Tosha Bard <natosha@unity3d.com>
parents:
16245
diff
changeset
|
982 filelist = lfutil.getlfilestoupdate(oldstandins, newstandins) |
169525f8ffbb
largefiles: only update changed largefiles when transplanting
Na'Tosha Bard <natosha@unity3d.com>
parents:
16245
diff
changeset
|
983 lfcommands.updatelfiles(repo.ui, repo, filelist=filelist, |
169525f8ffbb
largefiles: only update changed largefiles when transplanting
Na'Tosha Bard <natosha@unity3d.com>
parents:
16245
diff
changeset
|
984 printmessage=True) |
15982
bf502ccc46d7
largefiles: fix transplant for all cases (issue3192)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15967
diff
changeset
|
985 finally: |
bf502ccc46d7
largefiles: fix transplant for all cases (issue3192)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15967
diff
changeset
|
986 repo._istransplanting = False |
15383
155d0f8fb7e5
largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com>
parents:
15369
diff
changeset
|
987 return result |
16439
290850e7aa43
largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16248
diff
changeset
|
988 |
290850e7aa43
largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16248
diff
changeset
|
989 def overridecat(orig, ui, repo, file1, *pats, **opts): |
290850e7aa43
largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16248
diff
changeset
|
990 rev = opts.get('rev') |
290850e7aa43
largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16248
diff
changeset
|
991 if not lfutil.standin(file1) in repo[rev]: |
290850e7aa43
largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16248
diff
changeset
|
992 result = orig(ui, repo, file1, *pats, **opts) |
290850e7aa43
largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16248
diff
changeset
|
993 return result |
290850e7aa43
largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16248
diff
changeset
|
994 return lfcommands.catlfile(repo, file1, opts.get('rev'), opts.get('output')) |