Mercurial > hg > mercurial-source
annotate hgext/largefiles/overrides.py @ 18600:8ba520003ae0
largefiles: make caching largefiles message more explicit
In some cases, caching largefiles may take a long time (if the user has
pulled a lot of new heads). This patch makes it more clear what is happening,
by showing the number of heads we are caching largefiles for.
| author | Na'Tosha Bard <natosha@unity3d.com> |
|---|---|
| date | Sat, 09 Feb 2013 15:08:21 +0000 |
| parents | 2e3ec9e6ee6e |
| children | bcf29565d89f |
| 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_, \ |
|
18152
4454607b5d25
largefiles: remove findoutgoing portability wrapper
Mads Kiilerich <madski@unity3d.com>
parents:
18150
diff
changeset
|
15 node, archival, error, merge, discovery |
| 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 | |
|
17232
25248e2ebaee
largefiles: ensure addlargefiles() doesn't add a standin as a largefile
Matt Harbison <matt_harbison@yahoo.com>
parents:
17231
diff
changeset
|
84 if (exact or not exists) and not lfutil.isstandin(f): |
|
17231
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
85 wfile = repo.wjoin(f) |
|
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
86 |
|
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
87 # In case the file was removed previously, but not committed |
|
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
88 # (issue3507) |
|
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
89 if not os.path.exists(wfile): |
|
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
90 continue |
|
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
91 |
|
15255
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
92 abovemin = (lfsize and |
|
17231
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
93 os.lstat(wfile).st_size >= lfsize * 1024 * 1024) |
|
15255
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
94 if large or abovemin or (lfmatcher and lfmatcher(f)): |
| 15168 | 95 lfnames.append(f) |
| 96 if ui.verbose or not exact: | |
| 97 ui.status(_('adding %s as a largefile\n') % m.rel(f)) | |
| 98 | |
| 99 bad = [] | |
| 100 standins = [] | |
| 101 | |
|
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
102 # 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
|
103 # when standins are created and added to the repo. |
| 15168 | 104 wlock = repo.wlock() |
| 105 try: | |
| 106 if not opts.get('dry_run'): | |
| 107 lfdirstate = lfutil.openlfdirstate(ui, repo) | |
| 108 for f in lfnames: | |
| 109 standinname = lfutil.standin(f) | |
| 110 lfutil.writestandin(repo, standinname, hash='', | |
| 111 executable=lfutil.getexecutable(repo.wjoin(f))) | |
| 112 standins.append(standinname) | |
| 113 if lfdirstate[f] == 'r': | |
| 114 lfdirstate.normallookup(f) | |
| 115 else: | |
| 116 lfdirstate.add(f) | |
| 117 lfdirstate.write() | |
|
15255
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
118 bad += [lfutil.splitstandin(f) |
|
18154
93c697d9c158
largefiles: remove trivial portability wrappers
Mads Kiilerich <madski@unity3d.com>
parents:
18153
diff
changeset
|
119 for f in repo[None].add(standins) |
|
15255
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
120 if f in m.files()] |
| 15168 | 121 finally: |
| 122 wlock.release() | |
|
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
123 return bad |
| 15168 | 124 |
|
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
125 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
|
126 after = opts.get('after') |
| 15168 | 127 if not pats and not after: |
| 128 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
|
129 m = scmutil.match(repo[None], pats, opts) |
| 15168 | 130 try: |
| 131 repo.lfstatus = True | |
| 132 s = repo.status(match=m, clean=True) | |
| 133 finally: | |
| 134 repo.lfstatus = False | |
|
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
135 manifest = repo[None].manifest() |
|
15255
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
136 modified, added, deleted, clean = [[f for f in list |
|
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
137 if lfutil.standin(f) in manifest] |
|
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
138 for list in [s[0], s[1], s[3], s[6]]] |
| 15168 | 139 |
|
18066
abe9799a86d6
largefiles: align rm warnings with warnings used in core
Mads Kiilerich <madski@unity3d.com>
parents:
18011
diff
changeset
|
140 def warn(files, msg): |
| 15168 | 141 for f in files: |
|
18066
abe9799a86d6
largefiles: align rm warnings with warnings used in core
Mads Kiilerich <madski@unity3d.com>
parents:
18011
diff
changeset
|
142 ui.warn(msg % m.rel(f)) |
|
17588
e0081bb5450e
largefiles: exit from remove with 1 on warnings
Matt Harbison <matt_harbison@yahoo.com>
parents:
17587
diff
changeset
|
143 return int(len(files) > 0) |
|
e0081bb5450e
largefiles: exit from remove with 1 on warnings
Matt Harbison <matt_harbison@yahoo.com>
parents:
17587
diff
changeset
|
144 |
|
e0081bb5450e
largefiles: exit from remove with 1 on warnings
Matt Harbison <matt_harbison@yahoo.com>
parents:
17587
diff
changeset
|
145 result = 0 |
| 15168 | 146 |
|
15786
aca0f2b3c7e3
largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15663
diff
changeset
|
147 if after: |
| 15168 | 148 remove, forget = deleted, [] |
|
18066
abe9799a86d6
largefiles: align rm warnings with warnings used in core
Mads Kiilerich <madski@unity3d.com>
parents:
18011
diff
changeset
|
149 result = warn(modified + added + clean, |
|
abe9799a86d6
largefiles: align rm warnings with warnings used in core
Mads Kiilerich <madski@unity3d.com>
parents:
18011
diff
changeset
|
150 _('not removing %s: file still exists\n')) |
| 15168 | 151 else: |
| 152 remove, forget = deleted + clean, [] | |
|
18066
abe9799a86d6
largefiles: align rm warnings with warnings used in core
Mads Kiilerich <madski@unity3d.com>
parents:
18011
diff
changeset
|
153 result = warn(modified, _('not removing %s: file is modified (use -f' |
|
abe9799a86d6
largefiles: align rm warnings with warnings used in core
Mads Kiilerich <madski@unity3d.com>
parents:
18011
diff
changeset
|
154 ' to force removal)\n')) |
|
abe9799a86d6
largefiles: align rm warnings with warnings used in core
Mads Kiilerich <madski@unity3d.com>
parents:
18011
diff
changeset
|
155 result = warn(added, _('not removing %s: file has been marked for add' |
|
abe9799a86d6
largefiles: align rm warnings with warnings used in core
Mads Kiilerich <madski@unity3d.com>
parents:
18011
diff
changeset
|
156 ' (use forget to undo)\n')) or result |
| 15168 | 157 |
| 158 for f in sorted(remove + forget): | |
| 159 if ui.verbose or not m.exact(f): | |
| 160 ui.status(_('removing %s\n') % m.rel(f)) | |
| 161 | |
| 162 # Need to lock because standin files are deleted then removed from the | |
|
17407
e7cfe3587ea4
fix trivial spelling errors
Mads Kiilerich <mads@kiilerich.com>
parents:
17299
diff
changeset
|
163 # repository and we could race in-between. |
| 15168 | 164 wlock = repo.wlock() |
| 165 try: | |
| 166 lfdirstate = lfutil.openlfdirstate(ui, repo) | |
| 167 for f in remove: | |
| 168 if not after: | |
|
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
169 # 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
|
170 # are removing the file. |
|
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
171 if getattr(repo, "_isaddremove", False): |
|
16231
ce292f1379ba
i18n: fix all remaining uses of % inside _()
Matt Mackall <mpm@selenic.com>
parents:
16103
diff
changeset
|
172 ui.status(_('removing %s\n') % f) |
|
18386
03442135dff4
refactoring: use unlinkpath with ignoremissing
Mads Kiilerich <madski@unity3d.com>
parents:
18368
diff
changeset
|
173 util.unlinkpath(repo.wjoin(f), ignoremissing=True) |
| 15168 | 174 lfdirstate.remove(f) |
| 175 lfdirstate.write() | |
| 176 forget = [lfutil.standin(f) for f in forget] | |
| 177 remove = [lfutil.standin(f) for f in remove] | |
|
18154
93c697d9c158
largefiles: remove trivial portability wrappers
Mads Kiilerich <madski@unity3d.com>
parents:
18153
diff
changeset
|
178 repo[None].forget(forget) |
|
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
179 # 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
|
180 # function handle this. |
|
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
181 if not getattr(repo, "_isaddremove", False): |
|
18153
51837a31b425
largefiles: remove reporemove portability wrapper
Mads Kiilerich <madski@unity3d.com>
parents:
18152
diff
changeset
|
182 for f in remove: |
|
51837a31b425
largefiles: remove reporemove portability wrapper
Mads Kiilerich <madski@unity3d.com>
parents:
18152
diff
changeset
|
183 util.unlinkpath(repo.wjoin(f), ignoremissing=True) |
|
51837a31b425
largefiles: remove reporemove portability wrapper
Mads Kiilerich <madski@unity3d.com>
parents:
18152
diff
changeset
|
184 repo[None].forget(remove) |
| 15168 | 185 finally: |
| 186 wlock.release() | |
| 187 | |
|
17588
e0081bb5450e
largefiles: exit from remove with 1 on warnings
Matt Harbison <matt_harbison@yahoo.com>
parents:
17587
diff
changeset
|
188 return result |
|
e0081bb5450e
largefiles: exit from remove with 1 on warnings
Matt Harbison <matt_harbison@yahoo.com>
parents:
17587
diff
changeset
|
189 |
|
16449
874a680a3e23
largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents:
16439
diff
changeset
|
190 # 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
|
191 # 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
|
192 def decodepath(orig, path): |
|
874a680a3e23
largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents:
16439
diff
changeset
|
193 return lfutil.splitstandin(path) or path |
|
874a680a3e23
largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents:
16439
diff
changeset
|
194 |
|
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
195 # -- Wrappers: modify existing commands -------------------------------- |
|
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 # 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
|
198 # 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
|
199 # 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
|
200 # version of add. |
|
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
201 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
|
202 normal = opts.pop('normal') |
|
f19d5c852f9b
largefiles: add --normal option to hg add (issue3061)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15930
diff
changeset
|
203 if normal: |
|
f19d5c852f9b
largefiles: add --normal option to hg add (issue3061)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15930
diff
changeset
|
204 if opts.get('large'): |
|
f19d5c852f9b
largefiles: add --normal option to hg add (issue3061)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15930
diff
changeset
|
205 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
|
206 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
|
207 bad = addlargefiles(ui, repo, *pats, **opts) |
|
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
208 installnormalfilesmatchfn(repo[None].manifest()) |
|
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
209 result = orig(ui, repo, *pats, **opts) |
|
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
210 restorematchfn() |
|
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
211 |
|
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
212 return (result == 1 or bad) and 1 or 0 |
|
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
213 |
|
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
214 def overrideremove(orig, ui, repo, *pats, **opts): |
|
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
215 installnormalfilesmatchfn(repo[None].manifest()) |
|
17588
e0081bb5450e
largefiles: exit from remove with 1 on warnings
Matt Harbison <matt_harbison@yahoo.com>
parents:
17587
diff
changeset
|
216 result = orig(ui, repo, *pats, **opts) |
|
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
217 restorematchfn() |
|
17588
e0081bb5450e
largefiles: exit from remove with 1 on warnings
Matt Harbison <matt_harbison@yahoo.com>
parents:
17587
diff
changeset
|
218 return removelargefiles(ui, repo, *pats, **opts) or result |
|
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
219 |
|
16515
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16449
diff
changeset
|
220 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
|
221 try: |
|
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16449
diff
changeset
|
222 repo._repo.lfstatus = True |
|
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16449
diff
changeset
|
223 return orig(repo, rev2, **opts) |
|
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16449
diff
changeset
|
224 finally: |
|
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16449
diff
changeset
|
225 repo._repo.lfstatus = False |
|
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16449
diff
changeset
|
226 |
|
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
227 def overridestatus(orig, ui, repo, *pats, **opts): |
| 15168 | 228 try: |
| 229 repo.lfstatus = True | |
| 230 return orig(ui, repo, *pats, **opts) | |
| 231 finally: | |
| 232 repo.lfstatus = False | |
| 233 | |
|
16516
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
234 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
|
235 try: |
|
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
236 repo._repo.lfstatus = True |
|
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
237 return orig(repo, ignoreupdate) |
|
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
238 finally: |
|
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
239 repo._repo.lfstatus = False |
|
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
240 |
|
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
241 def overridelog(orig, ui, repo, *pats, **opts): |
|
18341
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18154
diff
changeset
|
242 def overridematch(ctx, pats=[], opts={}, globbed=False, |
|
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18154
diff
changeset
|
243 default='relpath'): |
|
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18154
diff
changeset
|
244 """Matcher that merges root directory with .hglf, suitable for log. |
|
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18154
diff
changeset
|
245 It is still possible to match .hglf directly. |
|
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18154
diff
changeset
|
246 For any listed files run log on the standin too. |
|
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18154
diff
changeset
|
247 matchfn tries both the given filename and with .hglf stripped. |
|
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18154
diff
changeset
|
248 """ |
|
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18154
diff
changeset
|
249 match = oldmatch(ctx, pats, opts, globbed, default) |
|
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18154
diff
changeset
|
250 m = copy.copy(match) |
|
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18154
diff
changeset
|
251 standins = [lfutil.standin(f) for f in m._files] |
|
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18154
diff
changeset
|
252 m._files.extend(standins) |
|
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18154
diff
changeset
|
253 m._fmap = set(m._files) |
|
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18154
diff
changeset
|
254 origmatchfn = m.matchfn |
|
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18154
diff
changeset
|
255 def lfmatchfn(f): |
|
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18154
diff
changeset
|
256 lf = lfutil.splitstandin(f) |
|
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18154
diff
changeset
|
257 if lf is not None and origmatchfn(lf): |
|
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18154
diff
changeset
|
258 return True |
|
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18154
diff
changeset
|
259 r = origmatchfn(f) |
|
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18154
diff
changeset
|
260 return r |
|
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18154
diff
changeset
|
261 m.matchfn = lfmatchfn |
|
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18154
diff
changeset
|
262 return m |
|
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18154
diff
changeset
|
263 oldmatch = installmatchfn(overridematch) |
| 15168 | 264 try: |
| 265 repo.lfstatus = True | |
|
17589
0f39e9355d3c
largefiles: preserve the exit status of the log command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17588
diff
changeset
|
266 return orig(ui, repo, *pats, **opts) |
| 15168 | 267 finally: |
| 268 repo.lfstatus = False | |
|
18341
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18154
diff
changeset
|
269 restorematchfn() |
| 15168 | 270 |
|
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
271 def overrideverify(orig, ui, repo, *pats, **opts): |
| 15168 | 272 large = opts.pop('large', False) |
| 273 all = opts.pop('lfa', False) | |
| 274 contents = opts.pop('lfc', False) | |
| 275 | |
| 276 result = orig(ui, repo, *pats, **opts) | |
|
18547
2e3ec9e6ee6e
largefiles: make verify --lfa and --lfc work without --large
Mads Kiilerich <madski@unity3d.com>
parents:
18541
diff
changeset
|
277 if large or all or contents: |
| 15168 | 278 result = result or lfcommands.verifylfiles(ui, repo, all, contents) |
| 279 return result | |
| 280 | |
|
18144
e16982a74bf7
largefiles: introduce basic debugstate --large functionality
Mads Kiilerich <madski@unity3d.com>
parents:
18142
diff
changeset
|
281 def overridedebugstate(orig, ui, repo, *pats, **opts): |
|
e16982a74bf7
largefiles: introduce basic debugstate --large functionality
Mads Kiilerich <madski@unity3d.com>
parents:
18142
diff
changeset
|
282 large = opts.pop('large', False) |
|
e16982a74bf7
largefiles: introduce basic debugstate --large functionality
Mads Kiilerich <madski@unity3d.com>
parents:
18142
diff
changeset
|
283 if large: |
|
e16982a74bf7
largefiles: introduce basic debugstate --large functionality
Mads Kiilerich <madski@unity3d.com>
parents:
18142
diff
changeset
|
284 lfcommands.debugdirstate(ui, repo) |
|
e16982a74bf7
largefiles: introduce basic debugstate --large functionality
Mads Kiilerich <madski@unity3d.com>
parents:
18142
diff
changeset
|
285 else: |
|
e16982a74bf7
largefiles: introduce basic debugstate --large functionality
Mads Kiilerich <madski@unity3d.com>
parents:
18142
diff
changeset
|
286 orig(ui, repo, *pats, **opts) |
|
e16982a74bf7
largefiles: introduce basic debugstate --large functionality
Mads Kiilerich <madski@unity3d.com>
parents:
18142
diff
changeset
|
287 |
| 15168 | 288 # Override needs to refresh standins so that update's normal merge |
| 289 # will go through properly. Then the other update hook (overriding repo.update) | |
|
17407
e7cfe3587ea4
fix trivial spelling errors
Mads Kiilerich <mads@kiilerich.com>
parents:
17299
diff
changeset
|
290 # will get the new files. Filemerge is also overridden so that the merge |
| 15168 | 291 # 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
|
292 def overrideupdate(orig, ui, repo, *pats, **opts): |
| 15168 | 293 lfdirstate = lfutil.openlfdirstate(ui, repo) |
| 294 s = lfdirstate.status(match_.always(repo.root, repo.getcwd()), [], False, | |
| 295 False, False) | |
| 296 (unsure, modified, added, removed, missing, unknown, ignored, clean) = s | |
| 297 | |
|
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
298 # 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
|
299 # largefiles getting updated |
| 15168 | 300 wlock = repo.wlock() |
| 301 try: | |
| 302 if opts['check']: | |
| 303 mod = len(modified) > 0 | |
| 304 for lfile in unsure: | |
| 305 standin = lfutil.standin(lfile) | |
| 306 if repo['.'][standin].data().strip() != \ | |
| 307 lfutil.hashfile(repo.wjoin(lfile)): | |
| 308 mod = True | |
| 309 else: | |
| 310 lfdirstate.normal(lfile) | |
| 311 lfdirstate.write() | |
| 312 if mod: | |
| 313 raise util.Abort(_('uncommitted local changes')) | |
| 314 # XXX handle removed differently | |
| 315 if not opts['clean']: | |
| 316 for lfile in unsure + modified + added: | |
| 317 lfutil.updatestandin(repo, lfutil.standin(lfile)) | |
| 318 finally: | |
| 319 wlock.release() | |
| 320 return orig(ui, repo, *pats, **opts) | |
| 321 | |
|
15663
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
322 # 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
|
323 # _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
|
324 # 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
|
325 # |
|
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
326 # 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
|
327 # 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
|
328 # |
|
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
329 # 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
|
330 # 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
|
331 # 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
|
332 def overridecheckunknownfile(origfn, repo, wctx, mctx, f): |
|
16093
7e30f5f2285f
merge: refactor unknown file conflict checking
Matt Mackall <mpm@selenic.com>
parents:
16075
diff
changeset
|
333 if lfutil.standin(f) in wctx: |
|
7e30f5f2285f
merge: refactor unknown file conflict checking
Matt Mackall <mpm@selenic.com>
parents:
16075
diff
changeset
|
334 return False |
|
7e30f5f2285f
merge: refactor unknown file conflict checking
Matt Mackall <mpm@selenic.com>
parents:
16075
diff
changeset
|
335 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
|
336 |
|
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
337 # 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
|
338 # 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
|
339 # |
|
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
340 # 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
|
341 # 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
|
342 # |
|
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
343 # 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
|
344 # 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
|
345 # 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
|
346 # 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
|
347 # 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
|
348 # |
|
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
349 # 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
|
350 # 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
|
351 # 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
|
352 # triggers a merge action. |
|
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
353 # |
|
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
354 # 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
|
355 # 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
|
356 # 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
|
357 # 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
|
358 # presumably changed on purpose. |
|
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
359 # |
|
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
360 # 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
|
361 # 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
|
362 # 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
|
363 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
|
364 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
|
365 processed = [] |
|
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
366 |
|
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
367 for action in actions: |
|
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
368 if overwrite: |
|
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
369 processed.append(action) |
|
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
370 continue |
|
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18540
diff
changeset
|
371 f, m, args, msg = action |
|
15663
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
372 |
|
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
373 choices = (_('&Largefile'), _('&Normal file')) |
|
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
374 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
|
375 # 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
|
376 # the second parent |
|
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
377 lfile = lfutil.splitstandin(f) |
|
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
378 standin = f |
|
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
379 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
|
380 '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
|
381 if repo.ui.promptchoice(msg, choices, 0) == 0: |
|
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18540
diff
changeset
|
382 processed.append((lfile, "r", None, msg)) |
|
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18540
diff
changeset
|
383 processed.append((standin, "g", (p2.flags(standin),), msg)) |
|
15663
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
384 else: |
|
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18540
diff
changeset
|
385 processed.append((standin, "r", None, msg)) |
|
16094
0776a6cababe
merge: don't use unknown()
Matt Mackall <mpm@selenic.com>
parents:
16093
diff
changeset
|
386 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
|
387 # 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
|
388 # the second parent |
|
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
389 standin = lfutil.standin(f) |
|
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
390 lfile = f |
|
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
391 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
|
392 '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
|
393 if repo.ui.promptchoice(msg, choices, 0) == 0: |
|
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18540
diff
changeset
|
394 processed.append((lfile, "r", None, msg)) |
|
15663
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
395 else: |
|
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18540
diff
changeset
|
396 processed.append((standin, "r", None, msg)) |
|
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18540
diff
changeset
|
397 processed.append((lfile, "g", (p2.flags(lfile),), msg)) |
|
15663
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
398 else: |
|
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
399 processed.append(action) |
|
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
400 |
|
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
401 return processed |
|
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
402 |
|
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
403 # 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
|
404 # largefiles. This will handle identical edits, and copy/rename + |
|
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
405 # 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
|
406 def overridefilemerge(origfn, repo, mynode, orig, fcd, fco, fca): |
| 15168 | 407 # Use better variable names here. Because this is a wrapper we cannot |
| 408 # change the variable names in the function declaration. | |
| 409 fcdest, fcother, fcancestor = fcd, fco, fca | |
| 410 if not lfutil.isstandin(orig): | |
| 411 return origfn(repo, mynode, orig, fcdest, fcother, fcancestor) | |
| 412 else: | |
| 413 if not fcother.cmp(fcdest): # files identical? | |
| 414 return None | |
| 415 | |
| 416 # backwards, use working dir parent as ancestor | |
| 417 if fcancestor == fcother: | |
| 418 fcancestor = fcdest.parents()[0] | |
| 419 | |
| 420 if orig != fcother.path(): | |
| 421 repo.ui.status(_('merging %s and %s to %s\n') | |
| 422 % (lfutil.splitstandin(orig), | |
| 423 lfutil.splitstandin(fcother.path()), | |
| 424 lfutil.splitstandin(fcdest.path()))) | |
| 425 else: | |
| 426 repo.ui.status(_('merging %s\n') | |
| 427 % lfutil.splitstandin(fcdest.path())) | |
| 428 | |
| 429 if fcancestor.path() != fcother.path() and fcother.data() == \ | |
| 430 fcancestor.data(): | |
| 431 return 0 | |
| 432 if fcancestor.path() != fcdest.path() and fcdest.data() == \ | |
| 433 fcancestor.data(): | |
| 434 repo.wwrite(fcdest.path(), fcother.data(), fcother.flags()) | |
| 435 return 0 | |
| 436 | |
| 437 if repo.ui.promptchoice(_('largefile %s has a merge conflict\n' | |
| 438 'keep (l)ocal or take (o)ther?') % | |
| 439 lfutil.splitstandin(orig), | |
| 440 (_('&Local'), _('&Other')), 0) == 0: | |
| 441 return 0 | |
| 442 else: | |
| 443 repo.wwrite(fcdest.path(), fcother.data(), fcother.flags()) | |
| 444 return 0 | |
| 445 | |
|
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
446 # 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
|
447 # 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
|
448 # 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
|
449 # 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
|
450 # dirstate updated. |
|
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
451 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
|
452 # doesn't remove largefile on rename |
| 15168 | 453 if len(pats) < 2: |
| 454 # this isn't legal, let the original function deal with it | |
| 455 return orig(ui, repo, pats, opts, rename) | |
| 456 | |
| 457 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
|
458 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
|
459 return os.path.join(repo.wjoin(lfutil.standin(path))) |
| 15168 | 460 |
|
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
|
461 fullpats = scmutil.expandpats(pats) |
| 15168 | 462 dest = fullpats[-1] |
| 463 | |
| 464 if os.path.isdir(dest): | |
| 465 if not os.path.isdir(makestandin(dest)): | |
| 466 os.makedirs(makestandin(dest)) | |
|
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
467 # 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
|
468 # 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
|
469 # 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
|
470 # match largefiles and run it again. |
| 15168 | 471 nonormalfiles = False |
| 472 nolfiles = False | |
| 473 try: | |
|
15277
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
474 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
|
475 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
|
476 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
|
477 except util.Abort, e: |
|
17263
c4ebdc36c17e
largefiles: fix exception hack for i18n (issue3197)
Matt Mackall <mpm@selenic.com>
parents:
17245
diff
changeset
|
478 if str(e) != _('no files to copy'): |
|
15277
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
479 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
|
480 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
|
481 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
|
482 result = 0 |
| 15168 | 483 finally: |
| 484 restorematchfn() | |
| 485 | |
| 486 # The first rename can cause our current working directory to be removed. | |
| 487 # In that case there is nothing left to copy/rename so just quit. | |
| 488 try: | |
| 489 repo.getcwd() | |
| 490 except OSError: | |
| 491 return result | |
| 492 | |
| 493 try: | |
|
15277
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 try: |
|
16248
51e6f318bdf1
largefiles: fix check-code errors.
Na'Tosha Bard <natosha@unity3d.com>
parents:
16247
diff
changeset
|
495 # 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
|
496 # them to the dir state until later so lock during that time. |
|
15277
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
497 wlock = repo.wlock() |
| 15168 | 498 |
|
15277
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 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
|
500 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
|
501 def overridematch(ctx, pats=[], opts={}, globbed=False, |
|
15277
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
502 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
|
503 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
|
504 # 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
|
505 # 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
|
506 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
|
507 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
|
508 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
|
509 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
|
510 newpats.append(pat) |
|
15306
94527d67f3da
largefiles: fix some badly named function parameters
Greg Ward <greg@gerg.ca>
parents:
15305
diff
changeset
|
511 match = oldmatch(ctx, newpats, opts, globbed, default) |
|
15277
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 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
|
513 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
|
514 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
|
515 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
|
516 origmatchfn = m.matchfn |
|
15277
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
517 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
|
518 (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
|
519 origmatchfn(lfutil.splitstandin(f)) or |
|
15277
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 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
|
521 return m |
|
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
522 oldmatch = installmatchfn(overridematch) |
|
15277
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 listpats = [] |
| 15168 | 524 for pat in pats: |
|
15277
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
525 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
|
526 listpats.append(pat) |
| 15168 | 527 else: |
|
15277
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
528 listpats.append(makestandin(pat)) |
| 15168 | 529 |
|
15277
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
530 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
|
531 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
|
532 copiedfiles = [] |
|
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
533 def overridecopyfile(src, dest): |
|
15598
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15576
diff
changeset
|
534 if (lfutil.shortname in src and |
|
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15576
diff
changeset
|
535 dest.startswith(repo.wjoin(lfutil.shortname))): |
|
15277
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
536 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
|
537 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
|
538 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
|
539 _('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
|
540 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
|
541 origcopyfile(src, dest) |
| 15168 | 542 |
|
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
543 util.copyfile = overridecopyfile |
|
15277
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
544 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
|
545 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
|
546 util.copyfile = origcopyfile |
| 15168 | 547 |
|
15277
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
548 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
|
549 for (src, dest) in copiedfiles: |
|
15598
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15576
diff
changeset
|
550 if (lfutil.shortname in src and |
|
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15576
diff
changeset
|
551 dest.startswith(repo.wjoin(lfutil.shortname))): |
|
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15576
diff
changeset
|
552 srclfile = src.replace(repo.wjoin(lfutil.standin('')), '') |
|
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15576
diff
changeset
|
553 destlfile = dest.replace(repo.wjoin(lfutil.standin('')), '') |
|
17245
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17232
diff
changeset
|
554 destlfiledir = os.path.dirname(repo.wjoin(destlfile)) or '.' |
|
15277
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
555 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
|
556 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
|
557 if rename: |
|
15598
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15576
diff
changeset
|
558 os.rename(repo.wjoin(srclfile), repo.wjoin(destlfile)) |
|
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15576
diff
changeset
|
559 lfdirstate.remove(srclfile) |
|
15277
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
560 else: |
|
17245
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17232
diff
changeset
|
561 util.copyfile(repo.wjoin(srclfile), |
|
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17232
diff
changeset
|
562 repo.wjoin(destlfile)) |
|
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17232
diff
changeset
|
563 |
|
15598
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15576
diff
changeset
|
564 lfdirstate.add(destlfile) |
|
15277
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
565 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
|
566 except util.Abort, e: |
|
17263
c4ebdc36c17e
largefiles: fix exception hack for i18n (issue3197)
Matt Mackall <mpm@selenic.com>
parents:
17245
diff
changeset
|
567 if str(e) != _('no files to copy'): |
|
15277
018608160299
largefiles: use separate try/except and try/finally as needed for python2.4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15255
diff
changeset
|
568 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
|
569 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
|
570 nolfiles = True |
| 15168 | 571 finally: |
| 572 restorematchfn() | |
| 573 wlock.release() | |
| 574 | |
| 575 if nolfiles and nonormalfiles: | |
| 576 raise util.Abort(_('no files to copy')) | |
| 577 | |
| 578 return result | |
| 579 | |
|
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
580 # 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
|
581 # 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
|
582 # 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
|
583 # the necessary largefiles. |
| 15168 | 584 # |
|
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
585 # 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
|
586 # 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
|
587 # 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
|
588 # 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
|
589 # 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
|
590 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
|
591 # 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
|
592 # 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
|
593 # prevent others from changing them in their incorrect state. |
| 15168 | 594 wlock = repo.wlock() |
| 595 try: | |
| 596 lfdirstate = lfutil.openlfdirstate(ui, repo) | |
| 597 (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
|
598 lfutil.lfdirstatestatus(lfdirstate, repo, repo['.'].rev()) |
|
18140
e388273f3ad1
largefiles revert: update lfdirstate with result from first cleanliness check
Mads Kiilerich <madski@unity3d.com>
parents:
17894
diff
changeset
|
599 lfdirstate.write() |
| 15168 | 600 for lfile in modified: |
| 601 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
|
602 for lfile in missing: |
|
16646
29fe533fe447
largefiles: fix deletion of multiple missing largefiles (issue3329)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
603 if (os.path.exists(repo.wjoin(lfutil.standin(lfile)))): |
|
29fe533fe447
largefiles: fix deletion of multiple missing largefiles (issue3329)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
604 os.unlink(repo.wjoin(lfutil.standin(lfile))) |
| 15168 | 605 |
| 606 try: | |
|
17268
8c31b652bdfe
largefiles: support revsets for revert
Matt Harbison <matt_harbison@yahoo.com>
parents:
17263
diff
changeset
|
607 ctx = scmutil.revsingle(repo, opts.get('rev')) |
| 15168 | 608 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
|
609 def overridematch(ctx, pats=[], opts={}, globbed=False, |
| 15168 | 610 default='relpath'): |
|
15306
94527d67f3da
largefiles: fix some badly named function parameters
Greg Ward <greg@gerg.ca>
parents:
15305
diff
changeset
|
611 match = oldmatch(ctx, pats, opts, globbed, default) |
| 15168 | 612 m = copy.copy(match) |
| 613 def tostandin(f): | |
|
16074
67a5bc8aeb1d
largefiles: reduce OR-ing of same conditions
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
614 if lfutil.standin(f) in ctx: |
| 15168 | 615 return lfutil.standin(f) |
| 616 elif lfutil.standin(f) in repo[None]: | |
| 617 return None | |
| 618 return f | |
| 619 m._files = [tostandin(f) for f in m._files] | |
| 620 m._files = [f for f in m._files if f is not None] | |
| 621 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
|
622 origmatchfn = m.matchfn |
| 15168 | 623 def matchfn(f): |
| 624 if lfutil.isstandin(f): | |
|
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
625 # 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
|
626 # 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
|
627 # otherwise we accidentally revert changes to other |
|
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
628 # 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
|
629 # repo object to keep the list of largefiles for us |
| 15168 | 630 # later. |
|
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
631 if origmatchfn(lfutil.splitstandin(f)) and \ |
| 15168 | 632 (f in repo[None] or f in ctx): |
| 633 lfileslist = getattr(repo, '_lfilestoupdate', []) | |
| 634 lfileslist.append(lfutil.splitstandin(f)) | |
| 635 repo._lfilestoupdate = lfileslist | |
| 636 return True | |
| 637 else: | |
| 638 return False | |
|
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
639 return origmatchfn(f) |
| 15168 | 640 m.matchfn = matchfn |
| 641 return m | |
|
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
642 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
|
643 scmutil.match |
|
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
644 matches = overridematch(repo[None], pats, opts) |
| 15168 | 645 orig(ui, repo, *pats, **opts) |
| 646 finally: | |
| 647 restorematchfn() | |
| 648 lfileslist = getattr(repo, '_lfilestoupdate', []) | |
|
15170
c1a4a3220711
largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents:
15169
diff
changeset
|
649 lfcommands.updatelfiles(ui, repo, filelist=lfileslist, |
|
c1a4a3220711
largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents:
15169
diff
changeset
|
650 printmessage=False) |
|
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
651 |
|
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
652 # empty out the largefiles list so we start fresh next time |
| 15168 | 653 repo._lfilestoupdate = [] |
| 654 for lfile in modified: | |
| 655 if lfile in lfileslist: | |
| 656 if os.path.exists(repo.wjoin(lfutil.standin(lfile))) and lfile\ | |
| 657 in repo['.']: | |
| 658 lfutil.writestandin(repo, lfutil.standin(lfile), | |
| 659 repo['.'][lfile].data().strip(), | |
| 660 'x' in repo['.'][lfile].flags()) | |
| 661 lfdirstate = lfutil.openlfdirstate(ui, repo) | |
| 662 for lfile in added: | |
| 663 standin = lfutil.standin(lfile) | |
| 664 if standin not in ctx and (standin in matches or opts.get('all')): | |
| 665 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
|
666 lfdirstate.drop(lfile) |
| 15168 | 667 util.unlinkpath(repo.wjoin(standin)) |
| 668 lfdirstate.write() | |
| 669 finally: | |
| 670 wlock.release() | |
| 671 | |
|
18458
c9db897d5a43
largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
18386
diff
changeset
|
672 def hgupdaterepo(orig, repo, node, overwrite): |
|
c9db897d5a43
largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
18386
diff
changeset
|
673 if not overwrite: |
|
c9db897d5a43
largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
18386
diff
changeset
|
674 # Only call updatelfiles on the standins that have changed to save time |
|
c9db897d5a43
largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
18386
diff
changeset
|
675 oldstandins = lfutil.getstandinsstate(repo) |
| 15168 | 676 |
|
18458
c9db897d5a43
largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
18386
diff
changeset
|
677 result = orig(repo, node, overwrite) |
|
c9db897d5a43
largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
18386
diff
changeset
|
678 |
|
c9db897d5a43
largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
18386
diff
changeset
|
679 filelist = None |
|
c9db897d5a43
largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
18386
diff
changeset
|
680 if not overwrite: |
|
c9db897d5a43
largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
18386
diff
changeset
|
681 newstandins = lfutil.getstandinsstate(repo) |
|
c9db897d5a43
largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
18386
diff
changeset
|
682 filelist = lfutil.getlfilestoupdate(oldstandins, newstandins) |
|
c9db897d5a43
largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
18386
diff
changeset
|
683 lfcommands.updatelfiles(repo.ui, repo, filelist=filelist) |
| 15168 | 684 return result |
| 685 | |
|
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
686 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
|
687 # 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
|
688 # 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
|
689 # 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
|
690 repo._ismerging = True |
|
3ecce805ac13
largefiles: correctly download new largefiles when merging
Na'Tosha Bard <natosha@unity3d.com>
parents:
15794
diff
changeset
|
691 try: |
|
3ecce805ac13
largefiles: correctly download new largefiles when merging
Na'Tosha Bard <natosha@unity3d.com>
parents:
15794
diff
changeset
|
692 result = orig(repo, node, force, remind) |
|
3ecce805ac13
largefiles: correctly download new largefiles when merging
Na'Tosha Bard <natosha@unity3d.com>
parents:
15794
diff
changeset
|
693 lfcommands.updatelfiles(repo.ui, repo) |
|
3ecce805ac13
largefiles: correctly download new largefiles when merging
Na'Tosha Bard <natosha@unity3d.com>
parents:
15794
diff
changeset
|
694 finally: |
|
3ecce805ac13
largefiles: correctly download new largefiles when merging
Na'Tosha Bard <natosha@unity3d.com>
parents:
15794
diff
changeset
|
695 repo._ismerging = False |
| 15168 | 696 return result |
| 697 | |
|
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
698 # 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
|
699 # 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
|
700 # working copy |
|
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
701 def overridepull(orig, ui, repo, source=None, **opts): |
|
16692
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16691
diff
changeset
|
702 revsprepull = len(repo) |
| 15168 | 703 if opts.get('rebase', False): |
| 704 repo._isrebasing = True | |
| 705 try: | |
| 706 if opts.get('update'): | |
|
17299
e51d4aedace9
check-code: indent 4 spaces in py files
Mads Kiilerich <mads@kiilerich.com>
parents:
17276
diff
changeset
|
707 del opts['update'] |
|
e51d4aedace9
check-code: indent 4 spaces in py files
Mads Kiilerich <mads@kiilerich.com>
parents:
17276
diff
changeset
|
708 ui.debug('--update and --rebase are not compatible, ignoring ' |
|
e51d4aedace9
check-code: indent 4 spaces in py files
Mads Kiilerich <mads@kiilerich.com>
parents:
17276
diff
changeset
|
709 'the update flag\n') |
| 15168 | 710 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
|
711 cmdutil.bailifchanged(repo) |
| 15168 | 712 origpostincoming = commands.postincoming |
| 713 def _dummy(*args, **kwargs): | |
| 714 pass | |
| 715 commands.postincoming = _dummy | |
| 716 if not source: | |
| 717 source = 'default' | |
|
17850
1e4eb1faba6e
largefiles: use 'default' instead of 'default-push' when pulling (issue3584)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17835
diff
changeset
|
718 repo.lfpullsource = source |
| 15168 | 719 try: |
| 720 result = commands.pull(ui, repo, source, **opts) | |
| 721 finally: | |
| 722 commands.postincoming = origpostincoming | |
| 723 revspostpull = len(repo) | |
| 724 if revspostpull > revsprepull: | |
| 725 result = result or rebase.rebase(ui, repo) | |
| 726 finally: | |
| 727 repo._isrebasing = False | |
| 728 else: | |
| 729 if not source: | |
| 730 source = 'default' | |
|
17850
1e4eb1faba6e
largefiles: use 'default' instead of 'default-push' when pulling (issue3584)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17835
diff
changeset
|
731 repo.lfpullsource = source |
|
16103
3e1efb458e8b
largefiles: only cache largefiles in new heads
Na'Tosha Bard <natosha@unity3d.com>
parents:
15983
diff
changeset
|
732 oldheads = lfutil.getcurrentheads(repo) |
| 15168 | 733 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
|
734 # 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
|
735 # will run into a problem later if we try to merge or rebase with one of |
| 17484 | 736 # these heads, so cache the largefiles now directly into the system |
|
15916
c96148346af8
largefiles: cache new largefiles for new heads when pulling
Na'Tosha Bard <natosha@unity3d.com>
parents:
15914
diff
changeset
|
737 # cache. |
|
c96148346af8
largefiles: cache new largefiles for new heads when pulling
Na'Tosha Bard <natosha@unity3d.com>
parents:
15914
diff
changeset
|
738 numcached = 0 |
|
16103
3e1efb458e8b
largefiles: only cache largefiles in new heads
Na'Tosha Bard <natosha@unity3d.com>
parents:
15983
diff
changeset
|
739 heads = lfutil.getcurrentheads(repo) |
|
3e1efb458e8b
largefiles: only cache largefiles in new heads
Na'Tosha Bard <natosha@unity3d.com>
parents:
15983
diff
changeset
|
740 newheads = set(heads).difference(set(oldheads)) |
|
18600
8ba520003ae0
largefiles: make caching largefiles message more explicit
Na'Tosha Bard <natosha@unity3d.com>
parents:
18547
diff
changeset
|
741 if len(newheads) > 0: |
|
8ba520003ae0
largefiles: make caching largefiles message more explicit
Na'Tosha Bard <natosha@unity3d.com>
parents:
18547
diff
changeset
|
742 ui.status(_("caching largefiles for %s heads\n" % len(newheads))) |
|
16103
3e1efb458e8b
largefiles: only cache largefiles in new heads
Na'Tosha Bard <natosha@unity3d.com>
parents:
15983
diff
changeset
|
743 for head in newheads: |
|
3e1efb458e8b
largefiles: only cache largefiles in new heads
Na'Tosha Bard <natosha@unity3d.com>
parents:
15983
diff
changeset
|
744 (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
|
745 numcached += len(cached) |
|
16231
ce292f1379ba
i18n: fix all remaining uses of % inside _()
Matt Mackall <mpm@selenic.com>
parents:
16103
diff
changeset
|
746 ui.status(_("%d largefiles cached\n") % numcached) |
|
16692
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16691
diff
changeset
|
747 if opts.get('all_largefiles'): |
|
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16691
diff
changeset
|
748 revspostpull = len(repo) |
|
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16691
diff
changeset
|
749 revs = [] |
|
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16691
diff
changeset
|
750 for rev in xrange(revsprepull + 1, revspostpull): |
|
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16691
diff
changeset
|
751 revs.append(repo[rev].rev()) |
|
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16691
diff
changeset
|
752 lfcommands.downloadlfiles(ui, repo, revs) |
| 15168 | 753 return result |
| 754 | |
|
16652
98a9266db803
largefiles: add --all-largefiles flag to clone (issue3188)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16650
diff
changeset
|
755 def overrideclone(orig, ui, source, dest=None, **opts): |
|
17616
3a1c6b64e052
largefiles: don't convert dest=None to dest=hg.defaultdest() in clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17615
diff
changeset
|
756 d = dest |
|
3a1c6b64e052
largefiles: don't convert dest=None to dest=hg.defaultdest() in clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17615
diff
changeset
|
757 if d is None: |
|
3a1c6b64e052
largefiles: don't convert dest=None to dest=hg.defaultdest() in clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17615
diff
changeset
|
758 d = hg.defaultdest(source) |
|
3a1c6b64e052
largefiles: don't convert dest=None to dest=hg.defaultdest() in clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17615
diff
changeset
|
759 if opts.get('all_largefiles') and not hg.islocal(d): |
|
16725
68da5ae6e470
largefiles: don't attempt to clone all largefiles to non-local destinations
Levi Bard <levi@unity3d.com>
parents:
16692
diff
changeset
|
760 raise util.Abort(_( |
|
68da5ae6e470
largefiles: don't attempt to clone all largefiles to non-local destinations
Levi Bard <levi@unity3d.com>
parents:
16692
diff
changeset
|
761 '--all-largefiles is incompatible with non-local destination %s' % |
|
17616
3a1c6b64e052
largefiles: don't convert dest=None to dest=hg.defaultdest() in clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17615
diff
changeset
|
762 d)) |
|
17617
6e2ab601be3f
largefiles: delegate to the wrapped clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17616
diff
changeset
|
763 |
|
6e2ab601be3f
largefiles: delegate to the wrapped clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17616
diff
changeset
|
764 return orig(ui, source, dest, **opts) |
|
6e2ab601be3f
largefiles: delegate to the wrapped clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17616
diff
changeset
|
765 |
|
6e2ab601be3f
largefiles: delegate to the wrapped clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17616
diff
changeset
|
766 def hgclone(orig, ui, opts, *args, **kwargs): |
|
6e2ab601be3f
largefiles: delegate to the wrapped clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17616
diff
changeset
|
767 result = orig(ui, opts, *args, **kwargs) |
|
6e2ab601be3f
largefiles: delegate to the wrapped clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17616
diff
changeset
|
768 |
|
17824
221c9c3146eb
largefiles: always create the cache and standin directories when cloning
Matt Harbison <matt_harbison@yahoo.com>
parents:
17702
diff
changeset
|
769 if result is not None: |
|
16652
98a9266db803
largefiles: add --all-largefiles flag to clone (issue3188)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16650
diff
changeset
|
770 sourcerepo, destrepo = result |
|
17615
56136786000f
largefiles: restore caching of largefiles with 'clone -U --all-largefiles'
Matt Harbison <matt_harbison@yahoo.com>
parents:
17614
diff
changeset
|
771 repo = destrepo.local() |
|
56136786000f
largefiles: restore caching of largefiles with 'clone -U --all-largefiles'
Matt Harbison <matt_harbison@yahoo.com>
parents:
17614
diff
changeset
|
772 |
|
56136786000f
largefiles: restore caching of largefiles with 'clone -U --all-largefiles'
Matt Harbison <matt_harbison@yahoo.com>
parents:
17614
diff
changeset
|
773 # The .hglf directory must exist for the standin matcher to match |
|
56136786000f
largefiles: restore caching of largefiles with 'clone -U --all-largefiles'
Matt Harbison <matt_harbison@yahoo.com>
parents:
17614
diff
changeset
|
774 # anything (which listlfiles uses for each rev), and .hg/largefiles is |
|
56136786000f
largefiles: restore caching of largefiles with 'clone -U --all-largefiles'
Matt Harbison <matt_harbison@yahoo.com>
parents:
17614
diff
changeset
|
775 # assumed to exist by the code that caches the downloaded file. These |
|
17824
221c9c3146eb
largefiles: always create the cache and standin directories when cloning
Matt Harbison <matt_harbison@yahoo.com>
parents:
17702
diff
changeset
|
776 # directories exist if clone updated to any rev. (If the repo does not |
|
221c9c3146eb
largefiles: always create the cache and standin directories when cloning
Matt Harbison <matt_harbison@yahoo.com>
parents:
17702
diff
changeset
|
777 # have largefiles, download never gets to the point of needing |
|
221c9c3146eb
largefiles: always create the cache and standin directories when cloning
Matt Harbison <matt_harbison@yahoo.com>
parents:
17702
diff
changeset
|
778 # .hg/largefiles, and the standin matcher won't match anything anyway.) |
|
221c9c3146eb
largefiles: always create the cache and standin directories when cloning
Matt Harbison <matt_harbison@yahoo.com>
parents:
17702
diff
changeset
|
779 if 'largefiles' in repo.requirements: |
|
221c9c3146eb
largefiles: always create the cache and standin directories when cloning
Matt Harbison <matt_harbison@yahoo.com>
parents:
17702
diff
changeset
|
780 if opts.get('noupdate'): |
|
18150
14e31a631e41
largefiles: use plain wjoin instead of the complex pathto
Mads Kiilerich <madski@unity3d.com>
parents:
18144
diff
changeset
|
781 util.makedirs(repo.wjoin(lfutil.shortname)) |
|
17824
221c9c3146eb
largefiles: always create the cache and standin directories when cloning
Matt Harbison <matt_harbison@yahoo.com>
parents:
17702
diff
changeset
|
782 util.makedirs(repo.join(lfutil.longname)) |
|
17615
56136786000f
largefiles: restore caching of largefiles with 'clone -U --all-largefiles'
Matt Harbison <matt_harbison@yahoo.com>
parents:
17614
diff
changeset
|
783 |
|
56136786000f
largefiles: restore caching of largefiles with 'clone -U --all-largefiles'
Matt Harbison <matt_harbison@yahoo.com>
parents:
17614
diff
changeset
|
784 # Caching is implicitly limited to 'rev' option, since the dest repo was |
|
17824
221c9c3146eb
largefiles: always create the cache and standin directories when cloning
Matt Harbison <matt_harbison@yahoo.com>
parents:
17702
diff
changeset
|
785 # truncated at that point. The user may expect a download count with |
|
221c9c3146eb
largefiles: always create the cache and standin directories when cloning
Matt Harbison <matt_harbison@yahoo.com>
parents:
17702
diff
changeset
|
786 # this option, so attempt whether or not this is a largefile repo. |
|
221c9c3146eb
largefiles: always create the cache and standin directories when cloning
Matt Harbison <matt_harbison@yahoo.com>
parents:
17702
diff
changeset
|
787 if opts.get('all_largefiles'): |
|
221c9c3146eb
largefiles: always create the cache and standin directories when cloning
Matt Harbison <matt_harbison@yahoo.com>
parents:
17702
diff
changeset
|
788 success, missing = lfcommands.downloadlfiles(ui, repo, None) |
|
17617
6e2ab601be3f
largefiles: delegate to the wrapped clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17616
diff
changeset
|
789 |
|
17824
221c9c3146eb
largefiles: always create the cache and standin directories when cloning
Matt Harbison <matt_harbison@yahoo.com>
parents:
17702
diff
changeset
|
790 if missing != 0: |
|
221c9c3146eb
largefiles: always create the cache and standin directories when cloning
Matt Harbison <matt_harbison@yahoo.com>
parents:
17702
diff
changeset
|
791 return None |
|
17617
6e2ab601be3f
largefiles: delegate to the wrapped clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17616
diff
changeset
|
792 |
|
6e2ab601be3f
largefiles: delegate to the wrapped clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17616
diff
changeset
|
793 return result |
|
16652
98a9266db803
largefiles: add --all-largefiles flag to clone (issue3188)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16650
diff
changeset
|
794 |
|
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
795 def overriderebase(orig, ui, repo, **opts): |
| 15168 | 796 repo._isrebasing = True |
| 797 try: | |
|
17590
40c988f108d0
largefiles: preserve the exit status of the rebase command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17589
diff
changeset
|
798 return orig(ui, repo, **opts) |
| 15168 | 799 finally: |
| 800 repo._isrebasing = False | |
| 801 | |
|
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
802 def overridearchive(orig, repo, dest, node, kind, decode=True, matchfn=None, |
| 15168 | 803 prefix=None, mtime=None, subrepos=None): |
|
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
804 # 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
|
805 # largefile caches, neither of which are modified. |
| 15168 | 806 lfcommands.cachelfiles(repo.ui, repo, node) |
| 807 | |
| 808 if kind not in archival.archivers: | |
| 809 raise util.Abort(_("unknown archive type '%s'") % kind) | |
| 810 | |
| 811 ctx = repo[node] | |
| 812 | |
|
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
|
813 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
|
814 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
|
815 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
|
816 _('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
|
817 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
|
818 prefix = archival.tidyprefix(dest, kind, prefix) |
| 15168 | 819 |
|
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
|
820 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
|
821 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
|
822 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
|
823 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
|
824 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
|
825 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
|
826 archiver.addfile(prefix + name, mode, islink, data) |
| 15168 | 827 |
|
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
|
828 archiver = archival.archivers[kind](dest, mtime or ctx.date()[0]) |
| 15168 | 829 |
| 830 if repo.ui.configbool("ui", "archivemeta", True): | |
| 831 def metadata(): | |
| 832 base = 'repo: %s\nnode: %s\nbranch: %s\n' % ( | |
| 833 hex(repo.changelog.node(0)), hex(node), ctx.branch()) | |
| 834 | |
| 835 tags = ''.join('tag: %s\n' % t for t in ctx.tags() | |
| 836 if repo.tagtype(t) == 'global') | |
| 837 if not tags: | |
| 838 repo.ui.pushbuffer() | |
| 839 opts = {'template': '{latesttag}\n{latesttagdistance}', | |
| 840 'style': '', 'patch': None, 'git': None} | |
| 841 cmdutil.show_changeset(repo.ui, repo, opts).show(ctx) | |
| 842 ltags, dist = repo.ui.popbuffer().split('\n') | |
| 843 tags = ''.join('latesttag: %s\n' % t for t in ltags.split(':')) | |
| 844 tags += 'latesttagdistance: %s\n' % dist | |
| 845 | |
| 846 return base + tags | |
| 847 | |
| 848 write('.hg_archival.txt', 0644, False, metadata) | |
| 849 | |
| 850 for f in ctx: | |
| 851 ff = ctx.flags(f) | |
| 852 getdata = ctx[f].data | |
| 853 if lfutil.isstandin(f): | |
| 854 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
|
855 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
|
856 raise util.Abort( |
|
264087940d5b
largefiles: check if largefile could be found when archiving (issue3193)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15860
diff
changeset
|
857 _('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
|
858 % lfutil.splitstandin(f)) |
| 15168 | 859 f = lfutil.splitstandin(f) |
| 860 | |
| 861 def getdatafn(): | |
|
15576
e387e760b207
largefiles: avoid use of uinitialized variable in case of errors
Mads Kiilerich <mads@kiilerich.com>
parents:
15383
diff
changeset
|
862 fd = None |
| 15168 | 863 try: |
| 864 fd = open(path, 'rb') | |
| 865 return fd.read() | |
| 866 finally: | |
|
15576
e387e760b207
largefiles: avoid use of uinitialized variable in case of errors
Mads Kiilerich <mads@kiilerich.com>
parents:
15383
diff
changeset
|
867 if fd: |
|
e387e760b207
largefiles: avoid use of uinitialized variable in case of errors
Mads Kiilerich <mads@kiilerich.com>
parents:
15383
diff
changeset
|
868 fd.close() |
| 15168 | 869 |
| 870 getdata = getdatafn | |
| 871 write(f, 'x' in ff and 0755 or 0644, 'l' in ff, getdata) | |
| 872 | |
| 873 if subrepos: | |
|
18364
6252b4f1c4b4
subrepos: process subrepos in sorted order
Mads Kiilerich <mads@kiilerich.com>
parents:
18341
diff
changeset
|
874 for subpath in sorted(ctx.substate): |
| 15168 | 875 sub = ctx.sub(subpath) |
|
17108
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17107
diff
changeset
|
876 submatch = match_.narrowmatcher(subpath, matchfn) |
|
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17107
diff
changeset
|
877 sub.archive(repo.ui, archiver, prefix, submatch) |
| 15168 | 878 |
| 879 archiver.done() | |
| 880 | |
|
17108
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17107
diff
changeset
|
881 def hgsubrepoarchive(orig, repo, ui, archiver, prefix, match=None): |
|
17695
75f25bd4c7d4
largefiles: download missing subrepo revs when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17658
diff
changeset
|
882 repo._get(repo._state + ('hg',)) |
|
16578
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
883 rev = repo._state[1] |
|
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
884 ctx = repo._repo[rev] |
|
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
885 |
|
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
886 lfcommands.cachelfiles(ui, repo._repo, ctx.node()) |
|
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
887 |
|
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
888 def write(name, mode, islink, getdata): |
|
17108
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17107
diff
changeset
|
889 # At this point, the standin has been replaced with the largefile name, |
|
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17107
diff
changeset
|
890 # so the normal matcher works here without the lfutil variants. |
|
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17107
diff
changeset
|
891 if match and not match(f): |
|
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17107
diff
changeset
|
892 return |
|
16578
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
893 data = getdata() |
|
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
894 |
|
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
895 archiver.addfile(prefix + repo._path + '/' + name, mode, islink, data) |
|
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
896 |
|
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
897 for f in ctx: |
|
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
898 ff = ctx.flags(f) |
|
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
899 getdata = ctx[f].data |
|
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
900 if lfutil.isstandin(f): |
|
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
901 path = lfutil.findfile(repo._repo, getdata().strip()) |
|
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
902 if path is None: |
|
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
903 raise util.Abort( |
|
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
904 _('largefile %s not found in repo store or system cache') |
|
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
905 % lfutil.splitstandin(f)) |
|
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
906 f = lfutil.splitstandin(f) |
|
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
907 |
|
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
908 def getdatafn(): |
|
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
909 fd = None |
|
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
910 try: |
|
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
911 fd = open(os.path.join(prefix, path), 'rb') |
|
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
912 return fd.read() |
|
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
913 finally: |
|
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
914 if fd: |
|
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
915 fd.close() |
|
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
916 |
|
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
917 getdata = getdatafn |
|
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
918 |
|
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
919 write(f, 'x' in ff and 0755 or 0644, 'l' in ff, getdata) |
|
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
920 |
|
18364
6252b4f1c4b4
subrepos: process subrepos in sorted order
Mads Kiilerich <mads@kiilerich.com>
parents:
18341
diff
changeset
|
921 for subpath in sorted(ctx.substate): |
|
16578
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
922 sub = ctx.sub(subpath) |
|
17108
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17107
diff
changeset
|
923 submatch = match_.narrowmatcher(subpath, match) |
|
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17107
diff
changeset
|
924 sub.archive(ui, archiver, os.path.join(prefix, repo._path) + '/', |
|
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17107
diff
changeset
|
925 submatch) |
|
16578
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
926 |
|
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
927 # 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
|
928 # 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
|
929 # 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
|
930 # 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
|
931 def overridebailifchanged(orig, repo): |
| 15168 | 932 orig(repo) |
| 933 repo.lfstatus = True | |
| 934 modified, added, removed, deleted = repo.status()[:4] | |
| 935 repo.lfstatus = False | |
| 936 if modified or added or removed or deleted: | |
| 937 raise util.Abort(_('outstanding uncommitted changes')) | |
| 938 | |
|
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
939 # 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
|
940 def overridefetch(orig, ui, repo, *pats, **opts): |
| 15168 | 941 repo.lfstatus = True |
| 942 modified, added, removed, deleted = repo.status()[:4] | |
| 943 repo.lfstatus = False | |
| 944 if modified or added or removed or deleted: | |
| 945 raise util.Abort(_('outstanding uncommitted changes')) | |
| 946 return orig(ui, repo, *pats, **opts) | |
| 947 | |
|
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
948 def overrideforget(orig, ui, repo, *pats, **opts): |
| 15168 | 949 installnormalfilesmatchfn(repo[None].manifest()) |
|
17591
cbacb5a813dd
largefiles: preserve the exit status of the forget command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17590
diff
changeset
|
950 result = orig(ui, repo, *pats, **opts) |
| 15168 | 951 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
|
952 m = scmutil.match(repo[None], pats, opts) |
| 15168 | 953 |
| 954 try: | |
| 955 repo.lfstatus = True | |
| 956 s = repo.status(match=m, clean=True) | |
| 957 finally: | |
| 958 repo.lfstatus = False | |
| 959 forget = sorted(s[0] + s[1] + s[3] + s[6]) | |
| 960 forget = [f for f in forget if lfutil.standin(f) in repo[None].manifest()] | |
| 961 | |
| 962 for f in forget: | |
| 963 if lfutil.standin(f) not in repo.dirstate and not \ | |
| 964 os.path.isdir(m.rel(lfutil.standin(f))): | |
| 965 ui.warn(_('not removing %s: file is already untracked\n') | |
| 966 % m.rel(f)) | |
|
17591
cbacb5a813dd
largefiles: preserve the exit status of the forget command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17590
diff
changeset
|
967 result = 1 |
| 15168 | 968 |
| 969 for f in forget: | |
| 970 if ui.verbose or not m.exact(f): | |
| 971 ui.status(_('removing %s\n') % m.rel(f)) | |
| 972 | |
| 973 # Need to lock because standin files are deleted then removed from the | |
|
17407
e7cfe3587ea4
fix trivial spelling errors
Mads Kiilerich <mads@kiilerich.com>
parents:
17299
diff
changeset
|
974 # repository and we could race in-between. |
| 15168 | 975 wlock = repo.wlock() |
| 976 try: | |
| 977 lfdirstate = lfutil.openlfdirstate(ui, repo) | |
| 978 for f in forget: | |
| 979 if lfdirstate[f] == 'a': | |
| 980 lfdirstate.drop(f) | |
| 981 else: | |
| 982 lfdirstate.remove(f) | |
| 983 lfdirstate.write() | |
|
18153
51837a31b425
largefiles: remove reporemove portability wrapper
Mads Kiilerich <madski@unity3d.com>
parents:
18152
diff
changeset
|
984 standins = [lfutil.standin(f) for f in forget] |
|
51837a31b425
largefiles: remove reporemove portability wrapper
Mads Kiilerich <madski@unity3d.com>
parents:
18152
diff
changeset
|
985 for f in standins: |
|
51837a31b425
largefiles: remove reporemove portability wrapper
Mads Kiilerich <madski@unity3d.com>
parents:
18152
diff
changeset
|
986 util.unlinkpath(repo.wjoin(f), ignoremissing=True) |
|
51837a31b425
largefiles: remove reporemove portability wrapper
Mads Kiilerich <madski@unity3d.com>
parents:
18152
diff
changeset
|
987 repo[None].forget(standins) |
| 15168 | 988 finally: |
| 989 wlock.release() | |
| 990 | |
|
17591
cbacb5a813dd
largefiles: preserve the exit status of the forget command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17590
diff
changeset
|
991 return result |
|
cbacb5a813dd
largefiles: preserve the exit status of the forget command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17590
diff
changeset
|
992 |
| 15168 | 993 def getoutgoinglfiles(ui, repo, dest=None, **opts): |
| 994 dest = ui.expandpath(dest or 'default-push', dest or 'default') | |
| 995 dest, branches = hg.parseurl(dest, opts.get('branch')) | |
| 996 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev')) | |
| 997 if revs: | |
|
17271
a09cc6aeed4a
largefiles: support revsets for outgoing --large
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
998 revs = [repo.lookup(rev) for rev in scmutil.revrange(repo, revs)] |
| 15168 | 999 |
| 1000 try: | |
|
17276
eac3f9c2f9c5
largefiles: use hg.peer instead of hg.remoteui
Simon Heimberg <simohe@besonet.ch>
parents:
17271
diff
changeset
|
1001 remote = hg.peer(repo, opts, dest) |
| 15168 | 1002 except error.RepoError: |
| 1003 return None | |
|
18152
4454607b5d25
largefiles: remove findoutgoing portability wrapper
Mads Kiilerich <madski@unity3d.com>
parents:
18150
diff
changeset
|
1004 outgoing = discovery.findcommonoutgoing(repo, remote.peer(), force=False) |
|
4454607b5d25
largefiles: remove findoutgoing portability wrapper
Mads Kiilerich <madski@unity3d.com>
parents:
18150
diff
changeset
|
1005 if not outgoing.missing: |
|
4454607b5d25
largefiles: remove findoutgoing portability wrapper
Mads Kiilerich <madski@unity3d.com>
parents:
18150
diff
changeset
|
1006 return outgoing.missing |
|
4454607b5d25
largefiles: remove findoutgoing portability wrapper
Mads Kiilerich <madski@unity3d.com>
parents:
18150
diff
changeset
|
1007 o = repo.changelog.nodesbetween(outgoing.missing, revs)[0] |
| 15168 | 1008 if opts.get('newest_first'): |
| 1009 o.reverse() | |
| 1010 | |
| 1011 toupload = set() | |
| 1012 for n in o: | |
| 1013 parents = [p for p in repo.changelog.parents(n) if p != node.nullid] | |
| 1014 ctx = repo[n] | |
| 1015 files = set(ctx.files()) | |
| 1016 if len(parents) == 2: | |
| 1017 mc = ctx.manifest() | |
| 1018 mp1 = ctx.parents()[0].manifest() | |
| 1019 mp2 = ctx.parents()[1].manifest() | |
| 1020 for f in mp1: | |
| 1021 if f not in mc: | |
| 1022 files.add(f) | |
| 1023 for f in mp2: | |
| 1024 if f not in mc: | |
| 1025 files.add(f) | |
| 1026 for f in mc: | |
| 1027 if mc[f] != mp1.get(f, None) or mc[f] != mp2.get(f, None): | |
| 1028 files.add(f) | |
|
15255
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
1029 toupload = toupload.union( |
|
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
1030 set([f for f in files if lfutil.isstandin(f) and f in ctx])) |
|
18368
de685145f5c2
largefiles: upload files in sorted order
Mads Kiilerich <mads@kiilerich.com>
parents:
18364
diff
changeset
|
1031 return sorted(toupload) |
| 15168 | 1032 |
|
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
1033 def overrideoutgoing(orig, ui, repo, dest=None, **opts): |
|
17587
98d6a10bc401
largefiles: preserve exit code from outgoing command (issue3611)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17299
diff
changeset
|
1034 result = orig(ui, repo, dest, **opts) |
| 15168 | 1035 |
| 1036 if opts.pop('large', None): | |
| 1037 toupload = getoutgoinglfiles(ui, repo, dest, **opts) | |
| 1038 if toupload is None: | |
| 1039 ui.status(_('largefiles: No remote repo\n')) | |
|
17835
08d11b82d9fc
largefiles: distinguish "no remote repo" from "no files to upload" (issue3651)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17824
diff
changeset
|
1040 elif not toupload: |
|
08d11b82d9fc
largefiles: distinguish "no remote repo" from "no files to upload" (issue3651)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17824
diff
changeset
|
1041 ui.status(_('largefiles: no files to upload\n')) |
| 15168 | 1042 else: |
| 1043 ui.status(_('largefiles to upload:\n')) | |
| 1044 for file in toupload: | |
| 1045 ui.status(lfutil.splitstandin(file) + '\n') | |
| 1046 ui.status('\n') | |
| 1047 | |
|
17587
98d6a10bc401
largefiles: preserve exit code from outgoing command (issue3611)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17299
diff
changeset
|
1048 return result |
|
98d6a10bc401
largefiles: preserve exit code from outgoing command (issue3611)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17299
diff
changeset
|
1049 |
|
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
1050 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
|
1051 try: |
|
0c7b83a057aa
largefiles: fix output of hg summary (issue3060)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15786
diff
changeset
|
1052 repo.lfstatus = True |
|
0c7b83a057aa
largefiles: fix output of hg summary (issue3060)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15786
diff
changeset
|
1053 orig(ui, repo, *pats, **opts) |
|
0c7b83a057aa
largefiles: fix output of hg summary (issue3060)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15786
diff
changeset
|
1054 finally: |
|
0c7b83a057aa
largefiles: fix output of hg summary (issue3060)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15786
diff
changeset
|
1055 repo.lfstatus = False |
| 15168 | 1056 |
| 1057 if opts.pop('large', None): | |
| 1058 toupload = getoutgoinglfiles(ui, repo, None, **opts) | |
| 1059 if toupload is None: | |
|
17892
ba0a1701c81a
i18n: add "i18n" comment to column positioning messages of "hg summary"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17878
diff
changeset
|
1060 # i18n: column positioning for "hg summary" |
|
17894
afa7e6fa820b
i18n: change output of largefiles for summary to distinguish from one for outgoing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17892
diff
changeset
|
1061 ui.status(_('largefiles: (no remote repo)\n')) |
|
17835
08d11b82d9fc
largefiles: distinguish "no remote repo" from "no files to upload" (issue3651)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17824
diff
changeset
|
1062 elif not toupload: |
|
17892
ba0a1701c81a
i18n: add "i18n" comment to column positioning messages of "hg summary"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17878
diff
changeset
|
1063 # i18n: column positioning for "hg summary" |
|
17835
08d11b82d9fc
largefiles: distinguish "no remote repo" from "no files to upload" (issue3651)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17824
diff
changeset
|
1064 ui.status(_('largefiles: (no files to upload)\n')) |
| 15168 | 1065 else: |
|
17892
ba0a1701c81a
i18n: add "i18n" comment to column positioning messages of "hg summary"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17878
diff
changeset
|
1066 # i18n: column positioning for "hg summary" |
| 15168 | 1067 ui.status(_('largefiles: %d to upload\n') % len(toupload)) |
| 1068 | |
|
17658
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17617
diff
changeset
|
1069 def scmutiladdremove(orig, repo, pats=[], opts={}, dry_run=None, |
|
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17617
diff
changeset
|
1070 similarity=None): |
|
16644
b371056ae353
largefiles: follow normal codepath for addremove if non-largefiles repo (issue3249)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16516
diff
changeset
|
1071 if not lfutil.islfilesrepo(repo): |
|
17658
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17617
diff
changeset
|
1072 return orig(repo, pats, opts, dry_run, similarity) |
|
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
1073 # Get the list of missing largefiles so we can remove them |
|
17658
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17617
diff
changeset
|
1074 lfdirstate = lfutil.openlfdirstate(repo.ui, repo) |
|
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
1075 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
|
1076 False, False) |
|
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
1077 (unsure, modified, added, removed, missing, unknown, ignored, clean) = s |
| 15168 | 1078 |
|
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
1079 # 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
|
1080 # 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
|
1081 # 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
|
1082 # confused state later. |
|
15967
295f8aeab363
largefiles: fix addremove when no largefiles are specified
Na'Tosha Bard <natosha@unity3d.com>
parents:
15944
diff
changeset
|
1083 if missing: |
|
17229
a6d9b2d33040
largefiles: fix addremove with -R option
Matt Harbison <matt_harbison@yahoo.com>
parents:
17191
diff
changeset
|
1084 m = [repo.wjoin(f) for f in missing] |
|
15967
295f8aeab363
largefiles: fix addremove when no largefiles are specified
Na'Tosha Bard <natosha@unity3d.com>
parents:
15944
diff
changeset
|
1085 repo._isaddremove = True |
|
17658
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17617
diff
changeset
|
1086 removelargefiles(repo.ui, repo, *m, **opts) |
|
15967
295f8aeab363
largefiles: fix addremove when no largefiles are specified
Na'Tosha Bard <natosha@unity3d.com>
parents:
15944
diff
changeset
|
1087 repo._isaddremove = False |
|
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
1088 # 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
|
1089 # largefiles will be |
|
17658
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17617
diff
changeset
|
1090 addlargefiles(repo.ui, repo, *pats, **opts) |
|
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
1091 # 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
|
1092 # 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
|
1093 # largefiles by installing a matcher that will ignore them. |
|
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
1094 installnormalfilesmatchfn(repo[None].manifest()) |
|
17658
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17617
diff
changeset
|
1095 result = orig(repo, pats, opts, dry_run, similarity) |
|
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
1096 restorematchfn() |
|
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
1097 return result |
| 15168 | 1098 |
|
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
1099 # Calling purge with --all will cause the largefiles to be deleted. |
| 15168 | 1100 # 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
|
1101 def overridepurge(orig, ui, repo, *dirs, **opts): |
|
18011
848c428bb5ee
largefile: status is buggy on repoproxy, so run unfiltered
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17894
diff
changeset
|
1102 # XXX large file status is buggy when used on repo proxy. |
|
848c428bb5ee
largefile: status is buggy on repoproxy, so run unfiltered
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17894
diff
changeset
|
1103 # XXX this needs to be investigate. |
|
848c428bb5ee
largefile: status is buggy on repoproxy, so run unfiltered
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17894
diff
changeset
|
1104 repo = repo.unfiltered() |
| 15168 | 1105 oldstatus = repo.status |
|
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
1106 def overridestatus(node1='.', node2=None, match=None, ignored=False, |
| 15168 | 1107 clean=False, unknown=False, listsubrepos=False): |
| 1108 r = oldstatus(node1, node2, match, ignored, clean, unknown, | |
| 1109 listsubrepos) | |
| 1110 lfdirstate = lfutil.openlfdirstate(ui, repo) | |
| 1111 modified, added, removed, deleted, unknown, ignored, clean = r | |
| 1112 unknown = [f for f in unknown if lfdirstate[f] == '?'] | |
| 1113 ignored = [f for f in ignored if lfdirstate[f] == '?'] | |
| 1114 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
|
1115 repo.status = overridestatus |
| 15168 | 1116 orig(ui, repo, *dirs, **opts) |
| 1117 repo.status = oldstatus | |
| 1118 | |
|
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
1119 def overriderollback(orig, ui, repo, **opts): |
| 15168 | 1120 result = orig(ui, repo, **opts) |
| 1121 merge.update(repo, node=None, branchmerge=False, force=True, | |
| 1122 partial=lfutil.isstandin) | |
|
15794
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1123 wlock = repo.wlock() |
|
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1124 try: |
|
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1125 lfdirstate = lfutil.openlfdirstate(ui, repo) |
|
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1126 lfiles = lfutil.listlfiles(repo) |
|
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1127 oldlfiles = lfutil.listlfiles(repo, repo[None].parents()[0].rev()) |
|
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1128 for file in lfiles: |
|
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1129 if file in oldlfiles: |
|
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1130 lfdirstate.normallookup(file) |
|
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1131 else: |
|
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1132 lfdirstate.add(file) |
|
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1133 lfdirstate.write() |
|
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1134 finally: |
|
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1135 wlock.release() |
| 15168 | 1136 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
|
1137 |
|
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
1138 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
|
1139 try: |
|
16246
169525f8ffbb
largefiles: only update changed largefiles when transplanting
Na'Tosha Bard <natosha@unity3d.com>
parents:
16245
diff
changeset
|
1140 oldstandins = lfutil.getstandinsstate(repo) |
|
15982
bf502ccc46d7
largefiles: fix transplant for all cases (issue3192)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15967
diff
changeset
|
1141 repo._istransplanting = True |
|
bf502ccc46d7
largefiles: fix transplant for all cases (issue3192)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15967
diff
changeset
|
1142 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
|
1143 newstandins = lfutil.getstandinsstate(repo) |
|
169525f8ffbb
largefiles: only update changed largefiles when transplanting
Na'Tosha Bard <natosha@unity3d.com>
parents:
16245
diff
changeset
|
1144 filelist = lfutil.getlfilestoupdate(oldstandins, newstandins) |
|
169525f8ffbb
largefiles: only update changed largefiles when transplanting
Na'Tosha Bard <natosha@unity3d.com>
parents:
16245
diff
changeset
|
1145 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
|
1146 printmessage=True) |
|
15982
bf502ccc46d7
largefiles: fix transplant for all cases (issue3192)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15967
diff
changeset
|
1147 finally: |
|
bf502ccc46d7
largefiles: fix transplant for all cases (issue3192)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15967
diff
changeset
|
1148 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
|
1149 return result |
|
16439
290850e7aa43
largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16248
diff
changeset
|
1150 |
|
290850e7aa43
largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16248
diff
changeset
|
1151 def overridecat(orig, ui, repo, file1, *pats, **opts): |
|
17269
acfab0754584
largefiles: support revsets for cat
Matt Harbison <matt_harbison@yahoo.com>
parents:
17268
diff
changeset
|
1152 ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
18491
b7da9c042b9e
largefiles: fix cat when using relative paths from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18458
diff
changeset
|
1153 err = 1 |
|
b7da9c042b9e
largefiles: fix cat when using relative paths from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18458
diff
changeset
|
1154 notbad = set() |
|
b7da9c042b9e
largefiles: fix cat when using relative paths from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18458
diff
changeset
|
1155 m = scmutil.match(ctx, (file1,) + pats, opts) |
|
b7da9c042b9e
largefiles: fix cat when using relative paths from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18458
diff
changeset
|
1156 origmatchfn = m.matchfn |
|
b7da9c042b9e
largefiles: fix cat when using relative paths from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18458
diff
changeset
|
1157 def lfmatchfn(f): |
|
b7da9c042b9e
largefiles: fix cat when using relative paths from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18458
diff
changeset
|
1158 lf = lfutil.splitstandin(f) |
|
b7da9c042b9e
largefiles: fix cat when using relative paths from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18458
diff
changeset
|
1159 if lf is None: |
|
b7da9c042b9e
largefiles: fix cat when using relative paths from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18458
diff
changeset
|
1160 return origmatchfn(f) |
|
b7da9c042b9e
largefiles: fix cat when using relative paths from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18458
diff
changeset
|
1161 notbad.add(lf) |
|
b7da9c042b9e
largefiles: fix cat when using relative paths from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18458
diff
changeset
|
1162 return origmatchfn(lf) |
|
b7da9c042b9e
largefiles: fix cat when using relative paths from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18458
diff
changeset
|
1163 m.matchfn = lfmatchfn |
|
b7da9c042b9e
largefiles: fix cat when using relative paths from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18458
diff
changeset
|
1164 m.bad = lambda f, msg: f not in notbad |
|
b7da9c042b9e
largefiles: fix cat when using relative paths from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18458
diff
changeset
|
1165 for f in ctx.walk(m): |
|
b7da9c042b9e
largefiles: fix cat when using relative paths from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18458
diff
changeset
|
1166 lf = lfutil.splitstandin(f) |
|
b7da9c042b9e
largefiles: fix cat when using relative paths from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18458
diff
changeset
|
1167 if lf is None: |
|
b7da9c042b9e
largefiles: fix cat when using relative paths from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18458
diff
changeset
|
1168 err = orig(ui, repo, f, **opts) |
|
b7da9c042b9e
largefiles: fix cat when using relative paths from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18458
diff
changeset
|
1169 else: |
|
b7da9c042b9e
largefiles: fix cat when using relative paths from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18458
diff
changeset
|
1170 err = lfcommands.catlfile(repo, lf, ctx.rev(), opts.get('output')) |
|
b7da9c042b9e
largefiles: fix cat when using relative paths from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18458
diff
changeset
|
1171 return err |
|
17878
d1d0140287b8
largefiles: don't copy largefiles from working dir to the store while converting
Matt Harbison <matt_harbison@yahoo.com>
parents:
17850
diff
changeset
|
1172 |
|
d1d0140287b8
largefiles: don't copy largefiles from working dir to the store while converting
Matt Harbison <matt_harbison@yahoo.com>
parents:
17850
diff
changeset
|
1173 def mercurialsinkbefore(orig, sink): |
|
d1d0140287b8
largefiles: don't copy largefiles from working dir to the store while converting
Matt Harbison <matt_harbison@yahoo.com>
parents:
17850
diff
changeset
|
1174 sink.repo._isconverting = True |
|
d1d0140287b8
largefiles: don't copy largefiles from working dir to the store while converting
Matt Harbison <matt_harbison@yahoo.com>
parents:
17850
diff
changeset
|
1175 orig(sink) |
|
d1d0140287b8
largefiles: don't copy largefiles from working dir to the store while converting
Matt Harbison <matt_harbison@yahoo.com>
parents:
17850
diff
changeset
|
1176 |
|
d1d0140287b8
largefiles: don't copy largefiles from working dir to the store while converting
Matt Harbison <matt_harbison@yahoo.com>
parents:
17850
diff
changeset
|
1177 def mercurialsinkafter(orig, sink): |
|
d1d0140287b8
largefiles: don't copy largefiles from working dir to the store while converting
Matt Harbison <matt_harbison@yahoo.com>
parents:
17850
diff
changeset
|
1178 sink.repo._isconverting = False |
|
d1d0140287b8
largefiles: don't copy largefiles from working dir to the store while converting
Matt Harbison <matt_harbison@yahoo.com>
parents:
17850
diff
changeset
|
1179 orig(sink) |