Mercurial > hg
annotate hgext/largefiles/overrides.py @ 41365:876494fd967d
cleanup: delete lots of unused local variables
These were found by IntelliJ. There are many more, but these seemed
pretty safe.
Differential Revision: https://phab.mercurial-scm.org/D5629
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 17 Jan 2019 09:17:12 -0800 |
parents | f2601cbce209 |
children | 8d1dc380b026 |
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''' | |
29311
b76abae75161
py3: make largefiles/overrides.py use absolute_import
liscju <piotr.listkiewicz@gmail.com>
parents:
29305
diff
changeset
|
10 from __future__ import absolute_import |
15168 | 11 |
12 import copy | |
29311
b76abae75161
py3: make largefiles/overrides.py use absolute_import
liscju <piotr.listkiewicz@gmail.com>
parents:
29305
diff
changeset
|
13 import os |
15168 | 14 |
15 from mercurial.i18n import _ | |
16 | |
41062
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
17 from mercurial.hgweb import ( |
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
18 webcommands, |
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
19 ) |
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
20 |
29311
b76abae75161
py3: make largefiles/overrides.py use absolute_import
liscju <piotr.listkiewicz@gmail.com>
parents:
29305
diff
changeset
|
21 from mercurial import ( |
b76abae75161
py3: make largefiles/overrides.py use absolute_import
liscju <piotr.listkiewicz@gmail.com>
parents:
29305
diff
changeset
|
22 archival, |
b76abae75161
py3: make largefiles/overrides.py use absolute_import
liscju <piotr.listkiewicz@gmail.com>
parents:
29305
diff
changeset
|
23 cmdutil, |
41062
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
24 copies as copiesmod, |
29311
b76abae75161
py3: make largefiles/overrides.py use absolute_import
liscju <piotr.listkiewicz@gmail.com>
parents:
29305
diff
changeset
|
25 error, |
41062
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
26 exchange, |
41061
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
27 exthelper, |
41062
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
28 filemerge, |
29311
b76abae75161
py3: make largefiles/overrides.py use absolute_import
liscju <piotr.listkiewicz@gmail.com>
parents:
29305
diff
changeset
|
29 hg, |
35885
7625b4f7db70
cmdutil: split functions of log-like commands to new module (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35623
diff
changeset
|
30 logcmdutil, |
29318
2572bb2e06f8
largefiles: rename match_ to matchmod import in overrides
liscju <piotr.listkiewicz@gmail.com>
parents:
29311
diff
changeset
|
31 match as matchmod, |
41062
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
32 merge, |
29311
b76abae75161
py3: make largefiles/overrides.py use absolute_import
liscju <piotr.listkiewicz@gmail.com>
parents:
29305
diff
changeset
|
33 pathutil, |
35348
576ba8194fa8
py3: handle keyword arguments correctly in hgext/largefiles/
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35303
diff
changeset
|
34 pycompat, |
29311
b76abae75161
py3: make largefiles/overrides.py use absolute_import
liscju <piotr.listkiewicz@gmail.com>
parents:
29305
diff
changeset
|
35 scmutil, |
31023
aea06029919e
revset: import set classes directly from smartset module
Yuya Nishihara <yuya@tcha.org>
parents:
30215
diff
changeset
|
36 smartset, |
41062
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
37 subrepo, |
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
38 upgrade, |
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
39 url as urlmod, |
29311
b76abae75161
py3: make largefiles/overrides.py use absolute_import
liscju <piotr.listkiewicz@gmail.com>
parents:
29305
diff
changeset
|
40 util, |
b76abae75161
py3: make largefiles/overrides.py use absolute_import
liscju <piotr.listkiewicz@gmail.com>
parents:
29305
diff
changeset
|
41 ) |
b76abae75161
py3: make largefiles/overrides.py use absolute_import
liscju <piotr.listkiewicz@gmail.com>
parents:
29305
diff
changeset
|
42 |
b76abae75161
py3: make largefiles/overrides.py use absolute_import
liscju <piotr.listkiewicz@gmail.com>
parents:
29305
diff
changeset
|
43 from . import ( |
b76abae75161
py3: make largefiles/overrides.py use absolute_import
liscju <piotr.listkiewicz@gmail.com>
parents:
29305
diff
changeset
|
44 lfcommands, |
b76abae75161
py3: make largefiles/overrides.py use absolute_import
liscju <piotr.listkiewicz@gmail.com>
parents:
29305
diff
changeset
|
45 lfutil, |
b76abae75161
py3: make largefiles/overrides.py use absolute_import
liscju <piotr.listkiewicz@gmail.com>
parents:
29305
diff
changeset
|
46 storefactory, |
b76abae75161
py3: make largefiles/overrides.py use absolute_import
liscju <piotr.listkiewicz@gmail.com>
parents:
29305
diff
changeset
|
47 ) |
15168 | 48 |
41061
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
49 eh = exthelper.exthelper() |
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
50 |
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
51 # -- Utility functions: commonly/repeatedly needed functionality --------------- |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
52 |
23617
f1e6b86da4c0
largefiles: introduce the 'composelargefilematcher()' method
Matt Harbison <matt_harbison@yahoo.com>
parents:
23592
diff
changeset
|
53 def composelargefilematcher(match, manifest): |
f1e6b86da4c0
largefiles: introduce the 'composelargefilematcher()' method
Matt Harbison <matt_harbison@yahoo.com>
parents:
23592
diff
changeset
|
54 '''create a matcher that matches only the largefiles in the original |
f1e6b86da4c0
largefiles: introduce the 'composelargefilematcher()' method
Matt Harbison <matt_harbison@yahoo.com>
parents:
23592
diff
changeset
|
55 matcher''' |
f1e6b86da4c0
largefiles: introduce the 'composelargefilematcher()' method
Matt Harbison <matt_harbison@yahoo.com>
parents:
23592
diff
changeset
|
56 m = copy.copy(match) |
f1e6b86da4c0
largefiles: introduce the 'composelargefilematcher()' method
Matt Harbison <matt_harbison@yahoo.com>
parents:
23592
diff
changeset
|
57 lfile = lambda f: lfutil.standin(f) in manifest |
36311
b9da10f310f4
largfiles: replace filter() with listcomp when result needs to be a list
Augie Fackler <augie@google.com>
parents:
36205
diff
changeset
|
58 m._files = [lf for lf in m._files if lfile(lf)] |
32322
23c9a2a71c6e
match: make _fileroots a @propertycache and rename it to _fileset
Martin von Zweigbergk <martinvonz@google.com>
parents:
32308
diff
changeset
|
59 m._fileset = set(m._files) |
32388
4a23cdb32968
largefiles: replace always() method, not _always field
Martin von Zweigbergk <martinvonz@google.com>
parents:
32382
diff
changeset
|
60 m.always = lambda: False |
23617
f1e6b86da4c0
largefiles: introduce the 'composelargefilematcher()' method
Matt Harbison <matt_harbison@yahoo.com>
parents:
23592
diff
changeset
|
61 origmatchfn = m.matchfn |
f1e6b86da4c0
largefiles: introduce the 'composelargefilematcher()' method
Matt Harbison <matt_harbison@yahoo.com>
parents:
23592
diff
changeset
|
62 m.matchfn = lambda f: lfile(f) and origmatchfn(f) |
f1e6b86da4c0
largefiles: introduce the 'composelargefilematcher()' method
Matt Harbison <matt_harbison@yahoo.com>
parents:
23592
diff
changeset
|
63 return m |
f1e6b86da4c0
largefiles: introduce the 'composelargefilematcher()' method
Matt Harbison <matt_harbison@yahoo.com>
parents:
23592
diff
changeset
|
64 |
23769
bb3ee61cfaa1
largefiles: don't print files as both large and normal in addremove dryruns
Matt Harbison <matt_harbison@yahoo.com>
parents:
23768
diff
changeset
|
65 def composenormalfilematcher(match, manifest, exclude=None): |
bb3ee61cfaa1
largefiles: don't print files as both large and normal in addremove dryruns
Matt Harbison <matt_harbison@yahoo.com>
parents:
23768
diff
changeset
|
66 excluded = set() |
bb3ee61cfaa1
largefiles: don't print files as both large and normal in addremove dryruns
Matt Harbison <matt_harbison@yahoo.com>
parents:
23768
diff
changeset
|
67 if exclude is not None: |
bb3ee61cfaa1
largefiles: don't print files as both large and normal in addremove dryruns
Matt Harbison <matt_harbison@yahoo.com>
parents:
23768
diff
changeset
|
68 excluded.update(exclude) |
bb3ee61cfaa1
largefiles: don't print files as both large and normal in addremove dryruns
Matt Harbison <matt_harbison@yahoo.com>
parents:
23768
diff
changeset
|
69 |
23428
b5e3f3d25395
largefiles: split the creation of a normal matcher out of its install method
Matt Harbison <matt_harbison@yahoo.com>
parents:
23426
diff
changeset
|
70 m = copy.copy(match) |
b5e3f3d25395
largefiles: split the creation of a normal matcher out of its install method
Matt Harbison <matt_harbison@yahoo.com>
parents:
23426
diff
changeset
|
71 notlfile = lambda f: not (lfutil.isstandin(f) or lfutil.standin(f) in |
23769
bb3ee61cfaa1
largefiles: don't print files as both large and normal in addremove dryruns
Matt Harbison <matt_harbison@yahoo.com>
parents:
23768
diff
changeset
|
72 manifest or f in excluded) |
36311
b9da10f310f4
largfiles: replace filter() with listcomp when result needs to be a list
Augie Fackler <augie@google.com>
parents:
36205
diff
changeset
|
73 m._files = [lf for lf in m._files if notlfile(lf)] |
32322
23c9a2a71c6e
match: make _fileroots a @propertycache and rename it to _fileset
Martin von Zweigbergk <martinvonz@google.com>
parents:
32308
diff
changeset
|
74 m._fileset = set(m._files) |
32388
4a23cdb32968
largefiles: replace always() method, not _always field
Martin von Zweigbergk <martinvonz@google.com>
parents:
32382
diff
changeset
|
75 m.always = lambda: False |
23428
b5e3f3d25395
largefiles: split the creation of a normal matcher out of its install method
Matt Harbison <matt_harbison@yahoo.com>
parents:
23426
diff
changeset
|
76 origmatchfn = m.matchfn |
b5e3f3d25395
largefiles: split the creation of a normal matcher out of its install method
Matt Harbison <matt_harbison@yahoo.com>
parents:
23426
diff
changeset
|
77 m.matchfn = lambda f: notlfile(f) and origmatchfn(f) |
b5e3f3d25395
largefiles: split the creation of a normal matcher out of its install method
Matt Harbison <matt_harbison@yahoo.com>
parents:
23426
diff
changeset
|
78 return m |
b5e3f3d25395
largefiles: split the creation of a normal matcher out of its install method
Matt Harbison <matt_harbison@yahoo.com>
parents:
23426
diff
changeset
|
79 |
15168 | 80 def installnormalfilesmatchfn(manifest): |
21090
aa3d652ba1d5
largefiles: clarify installmatchfn documentation
Mads Kiilerich <madski@unity3d.com>
parents:
21089
diff
changeset
|
81 '''installmatchfn with a matchfn that ignores all largefiles''' |
26337
932330c3f469
largefiles: remove a mutable default argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26336
diff
changeset
|
82 def overridematch(ctx, pats=(), opts=None, globbed=False, |
25467
f64dbe06f3d0
scmutil: add an optional parameter to matcher factories for a bad() override
Matt Harbison <matt_harbison@yahoo.com>
parents:
25440
diff
changeset
|
83 default='relpath', badfn=None): |
26337
932330c3f469
largefiles: remove a mutable default argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26336
diff
changeset
|
84 if opts is None: |
932330c3f469
largefiles: remove a mutable default argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26336
diff
changeset
|
85 opts = {} |
25467
f64dbe06f3d0
scmutil: add an optional parameter to matcher factories for a bad() override
Matt Harbison <matt_harbison@yahoo.com>
parents:
25440
diff
changeset
|
86 match = oldmatch(ctx, pats, opts, globbed, default, badfn=badfn) |
23428
b5e3f3d25395
largefiles: split the creation of a normal matcher out of its install method
Matt Harbison <matt_harbison@yahoo.com>
parents:
23426
diff
changeset
|
87 return composenormalfilematcher(match, manifest) |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
88 oldmatch = installmatchfn(overridematch) |
15168 | 89 |
90 def installmatchfn(f): | |
21090
aa3d652ba1d5
largefiles: clarify installmatchfn documentation
Mads Kiilerich <madski@unity3d.com>
parents:
21089
diff
changeset
|
91 '''monkey patch the scmutil module with a custom match function. |
aa3d652ba1d5
largefiles: clarify installmatchfn documentation
Mads Kiilerich <madski@unity3d.com>
parents:
21089
diff
changeset
|
92 Warning: it is monkey patching the _module_ on runtime! Not thread safe!''' |
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
|
93 oldmatch = scmutil.match |
15168 | 94 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
|
95 scmutil.match = f |
15168 | 96 return oldmatch |
97 | |
98 def restorematchfn(): | |
21090
aa3d652ba1d5
largefiles: clarify installmatchfn documentation
Mads Kiilerich <madski@unity3d.com>
parents:
21089
diff
changeset
|
99 '''restores scmutil.match to what it was before installmatchfn |
15168 | 100 was called. no-op if scmutil.match is its original function. |
101 | |
21090
aa3d652ba1d5
largefiles: clarify installmatchfn documentation
Mads Kiilerich <madski@unity3d.com>
parents:
21089
diff
changeset
|
102 Note that n calls to installmatchfn will require n calls to |
23543
4dd8a6a1240d
spelling: fixes from proofreading of spell checker issues
Mads Kiilerich <madski@unity3d.com>
parents:
23541
diff
changeset
|
103 restore the original matchfn.''' |
21092
56fda512db9f
largefiles: remove silent handling of incorrect invocation of restorematchfn
Mads Kiilerich <madski@unity3d.com>
parents:
21091
diff
changeset
|
104 scmutil.match = getattr(scmutil.match, 'oldmatch') |
15168 | 105 |
21110
49e13e76ec5a
largefiles: changed overridelog to work with graphlog
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21096
diff
changeset
|
106 def installmatchandpatsfn(f): |
49e13e76ec5a
largefiles: changed overridelog to work with graphlog
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21096
diff
changeset
|
107 oldmatchandpats = scmutil.matchandpats |
49e13e76ec5a
largefiles: changed overridelog to work with graphlog
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21096
diff
changeset
|
108 setattr(f, 'oldmatchandpats', oldmatchandpats) |
49e13e76ec5a
largefiles: changed overridelog to work with graphlog
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21096
diff
changeset
|
109 scmutil.matchandpats = f |
49e13e76ec5a
largefiles: changed overridelog to work with graphlog
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21096
diff
changeset
|
110 return oldmatchandpats |
49e13e76ec5a
largefiles: changed overridelog to work with graphlog
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21096
diff
changeset
|
111 |
49e13e76ec5a
largefiles: changed overridelog to work with graphlog
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21096
diff
changeset
|
112 def restorematchandpatsfn(): |
49e13e76ec5a
largefiles: changed overridelog to work with graphlog
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21096
diff
changeset
|
113 '''restores scmutil.matchandpats to what it was before |
23139
e53f6b72a0e4
spelling: fixes from proofreading of spell checker issues
Mads Kiilerich <madski@unity3d.com>
parents:
23041
diff
changeset
|
114 installmatchandpatsfn was called. No-op if scmutil.matchandpats |
21110
49e13e76ec5a
largefiles: changed overridelog to work with graphlog
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21096
diff
changeset
|
115 is its original function. |
49e13e76ec5a
largefiles: changed overridelog to work with graphlog
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21096
diff
changeset
|
116 |
23139
e53f6b72a0e4
spelling: fixes from proofreading of spell checker issues
Mads Kiilerich <madski@unity3d.com>
parents:
23041
diff
changeset
|
117 Note that n calls to installmatchandpatsfn will require n calls |
23543
4dd8a6a1240d
spelling: fixes from proofreading of spell checker issues
Mads Kiilerich <madski@unity3d.com>
parents:
23541
diff
changeset
|
118 to restore the original matchfn.''' |
21110
49e13e76ec5a
largefiles: changed overridelog to work with graphlog
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21096
diff
changeset
|
119 scmutil.matchandpats = getattr(scmutil.matchandpats, 'oldmatchandpats', |
49e13e76ec5a
largefiles: changed overridelog to work with graphlog
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21096
diff
changeset
|
120 scmutil.matchandpats) |
49e13e76ec5a
largefiles: changed overridelog to work with graphlog
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21096
diff
changeset
|
121 |
23767
749dc66e9329
largefiles: align the output messages for an added file with core methods
Matt Harbison <matt_harbison@yahoo.com>
parents:
23766
diff
changeset
|
122 def addlargefiles(ui, repo, isaddremove, matcher, **opts): |
32157
09fb3d3b1b3a
py3: abuse r'' to access keys in keyword arguments
Pulkit Goyal <7895pulkit@gmail.com>
parents:
31892
diff
changeset
|
123 large = opts.get(r'large') |
15227
a7686abf73a6
largefiles: factor out lfutil.getminsize()
Greg Ward <greg@gerg.ca>
parents:
15224
diff
changeset
|
124 lfsize = lfutil.getminsize( |
32157
09fb3d3b1b3a
py3: abuse r'' to access keys in keyword arguments
Pulkit Goyal <7895pulkit@gmail.com>
parents:
31892
diff
changeset
|
125 ui, lfutil.islfilesrepo(repo), opts.get(r'lfsize')) |
15168 | 126 |
127 lfmatcher = None | |
15739
be55285470cf
largefiles: tiny code clean up
Michal Sznajder <michalsznajder@gmail.com>
parents:
15674
diff
changeset
|
128 if lfutil.islfilesrepo(repo): |
34756
3f3c6d12095d
configitems: register the 'largefiles.patterns' config
Boris Feld <boris.feld@octobus.net>
parents:
34344
diff
changeset
|
129 lfpats = ui.configlist(lfutil.longname, 'patterns') |
15168 | 130 if lfpats: |
29318
2572bb2e06f8
largefiles: rename match_ to matchmod import in overrides
liscju <piotr.listkiewicz@gmail.com>
parents:
29311
diff
changeset
|
131 lfmatcher = matchmod.match(repo.root, '', list(lfpats)) |
15168 | 132 |
133 lfnames = [] | |
25440
1a95c57959f6
largefiles: replace match.bad() monkey patching with match.badmatch()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25189
diff
changeset
|
134 m = matcher |
1a95c57959f6
largefiles: replace match.bad() monkey patching with match.badmatch()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25189
diff
changeset
|
135 |
15168 | 136 wctx = repo[None] |
32382
c87db79b9507
cleanup: reuse existing wctx variables instead of calling repo[None]
Martin von Zweigbergk <martinvonz@google.com>
parents:
32361
diff
changeset
|
137 for f in wctx.walk(matchmod.badmatch(m, lambda x, y: None)): |
15168 | 138 exact = m.exact(f) |
139 lfile = lfutil.standin(f) in wctx | |
140 nfile = f in wctx | |
141 exists = lfile or nfile | |
142 | |
23767
749dc66e9329
largefiles: align the output messages for an added file with core methods
Matt Harbison <matt_harbison@yahoo.com>
parents:
23766
diff
changeset
|
143 # addremove in core gets fancy with the name, add doesn't |
749dc66e9329
largefiles: align the output messages for an added file with core methods
Matt Harbison <matt_harbison@yahoo.com>
parents:
23766
diff
changeset
|
144 if isaddremove: |
749dc66e9329
largefiles: align the output messages for an added file with core methods
Matt Harbison <matt_harbison@yahoo.com>
parents:
23766
diff
changeset
|
145 name = m.uipath(f) |
749dc66e9329
largefiles: align the output messages for an added file with core methods
Matt Harbison <matt_harbison@yahoo.com>
parents:
23766
diff
changeset
|
146 else: |
749dc66e9329
largefiles: align the output messages for an added file with core methods
Matt Harbison <matt_harbison@yahoo.com>
parents:
23766
diff
changeset
|
147 name = m.rel(f) |
749dc66e9329
largefiles: align the output messages for an added file with core methods
Matt Harbison <matt_harbison@yahoo.com>
parents:
23766
diff
changeset
|
148 |
15168 | 149 # Don't warn the user when they attempt to add a normal tracked file. |
150 # The normal add code will do that for us. | |
151 if exact and exists: | |
152 if lfile: | |
23767
749dc66e9329
largefiles: align the output messages for an added file with core methods
Matt Harbison <matt_harbison@yahoo.com>
parents:
23766
diff
changeset
|
153 ui.warn(_('%s already a largefile\n') % name) |
15168 | 154 continue |
155 | |
17232
25248e2ebaee
largefiles: ensure addlargefiles() doesn't add a standin as a largefile
Matt Harbison <matt_harbison@yahoo.com>
parents:
17231
diff
changeset
|
156 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
|
157 # 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
|
158 # (issue3507) |
23733
86810cd85eb8
largefiles: convert addlargefiles() to vfs
Matt Harbison <matt_harbison@yahoo.com>
parents:
23726
diff
changeset
|
159 if not repo.wvfs.exists(f): |
17231
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
160 continue |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
161 |
15255
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
162 abovemin = (lfsize and |
23733
86810cd85eb8
largefiles: convert addlargefiles() to vfs
Matt Harbison <matt_harbison@yahoo.com>
parents:
23726
diff
changeset
|
163 repo.wvfs.lstat(f).st_size >= lfsize * 1024 * 1024) |
15255
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
164 if large or abovemin or (lfmatcher and lfmatcher(f)): |
15168 | 165 lfnames.append(f) |
166 if ui.verbose or not exact: | |
23767
749dc66e9329
largefiles: align the output messages for an added file with core methods
Matt Harbison <matt_harbison@yahoo.com>
parents:
23766
diff
changeset
|
167 ui.status(_('adding %s as a largefile\n') % name) |
15168 | 168 |
169 bad = [] | |
170 | |
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
171 # 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
|
172 # when standins are created and added to the repo. |
27821
bf3bf7158f69
with: use context manager for wlock in addlargefiles
Bryan O'Sullivan <bryano@fb.com>
parents:
27772
diff
changeset
|
173 with repo.wlock(): |
35348
576ba8194fa8
py3: handle keyword arguments correctly in hgext/largefiles/
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35303
diff
changeset
|
174 if not opts.get(r'dry_run'): |
23041
a36625ef1f35
largefiles: move initialization of standins variable to clarify its "scope"
Mads Kiilerich <madski@unity3d.com>
parents:
23040
diff
changeset
|
175 standins = [] |
15168 | 176 lfdirstate = lfutil.openlfdirstate(ui, repo) |
177 for f in lfnames: | |
178 standinname = lfutil.standin(f) | |
179 lfutil.writestandin(repo, standinname, hash='', | |
180 executable=lfutil.getexecutable(repo.wjoin(f))) | |
181 standins.append(standinname) | |
182 if lfdirstate[f] == 'r': | |
183 lfdirstate.normallookup(f) | |
184 else: | |
185 lfdirstate.add(f) | |
186 lfdirstate.write() | |
15255
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
187 bad += [lfutil.splitstandin(f) |
18154
93c697d9c158
largefiles: remove trivial portability wrappers
Mads Kiilerich <madski@unity3d.com>
parents:
18153
diff
changeset
|
188 for f in repo[None].add(standins) |
15255
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
189 if f in m.files()] |
23768
6b1428e55728
largefiles: return the list of added files from addlargefiles()
Matt Harbison <matt_harbison@yahoo.com>
parents:
23767
diff
changeset
|
190 |
6b1428e55728
largefiles: return the list of added files from addlargefiles()
Matt Harbison <matt_harbison@yahoo.com>
parents:
23767
diff
changeset
|
191 added = [f for f in lfnames if f not in bad] |
6b1428e55728
largefiles: return the list of added files from addlargefiles()
Matt Harbison <matt_harbison@yahoo.com>
parents:
23767
diff
changeset
|
192 return added, bad |
15168 | 193 |
37150
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
37088
diff
changeset
|
194 def removelargefiles(ui, repo, isaddremove, matcher, dryrun, **opts): |
35348
576ba8194fa8
py3: handle keyword arguments correctly in hgext/largefiles/
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35303
diff
changeset
|
195 after = opts.get(r'after') |
23741
f2893cd8d1e5
largefiles: pass a matcher instead of a raw file list to removelargefiles()
Matt Harbison <matt_harbison@yahoo.com>
parents:
23733
diff
changeset
|
196 m = composelargefilematcher(matcher, repo[None].manifest()) |
15168 | 197 try: |
198 repo.lfstatus = True | |
23741
f2893cd8d1e5
largefiles: pass a matcher instead of a raw file list to removelargefiles()
Matt Harbison <matt_harbison@yahoo.com>
parents:
23733
diff
changeset
|
199 s = repo.status(match=m, clean=not isaddremove) |
15168 | 200 finally: |
201 repo.lfstatus = False | |
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
202 manifest = repo[None].manifest() |
15255
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
203 modified, added, deleted, clean = [[f for f in list |
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
204 if lfutil.standin(f) in manifest] |
22919
1982bdb7e2cc
largefiles: access status fields by name rather than index
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22914
diff
changeset
|
205 for list in (s.modified, s.added, |
1982bdb7e2cc
largefiles: access status fields by name rather than index
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22914
diff
changeset
|
206 s.deleted, s.clean)] |
15168 | 207 |
18066
abe9799a86d6
largefiles: align rm warnings with warnings used in core
Mads Kiilerich <madski@unity3d.com>
parents:
18012
diff
changeset
|
208 def warn(files, msg): |
15168 | 209 for f in files: |
18066
abe9799a86d6
largefiles: align rm warnings with warnings used in core
Mads Kiilerich <madski@unity3d.com>
parents:
18012
diff
changeset
|
210 ui.warn(msg % m.rel(f)) |
17576
e0081bb5450e
largefiles: exit from remove with 1 on warnings
Matt Harbison <matt_harbison@yahoo.com>
parents:
17575
diff
changeset
|
211 return int(len(files) > 0) |
e0081bb5450e
largefiles: exit from remove with 1 on warnings
Matt Harbison <matt_harbison@yahoo.com>
parents:
17575
diff
changeset
|
212 |
15786
aca0f2b3c7e3
largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15663
diff
changeset
|
213 if after: |
22630
0290982e5ac7
largefiles: remove 'forget' list that's always empty
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22289
diff
changeset
|
214 remove = deleted |
18066
abe9799a86d6
largefiles: align rm warnings with warnings used in core
Mads Kiilerich <madski@unity3d.com>
parents:
18012
diff
changeset
|
215 result = warn(modified + added + clean, |
abe9799a86d6
largefiles: align rm warnings with warnings used in core
Mads Kiilerich <madski@unity3d.com>
parents:
18012
diff
changeset
|
216 _('not removing %s: file still exists\n')) |
15168 | 217 else: |
22630
0290982e5ac7
largefiles: remove 'forget' list that's always empty
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22289
diff
changeset
|
218 remove = deleted + clean |
18066
abe9799a86d6
largefiles: align rm warnings with warnings used in core
Mads Kiilerich <madski@unity3d.com>
parents:
18012
diff
changeset
|
219 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:
18012
diff
changeset
|
220 ' to force removal)\n')) |
abe9799a86d6
largefiles: align rm warnings with warnings used in core
Mads Kiilerich <madski@unity3d.com>
parents:
18012
diff
changeset
|
221 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:
18012
diff
changeset
|
222 ' (use forget to undo)\n')) or result |
15168 | 223 |
224 # Need to lock because standin files are deleted then removed from the | |
17424
e7cfe3587ea4
fix trivial spelling errors
Mads Kiilerich <mads@kiilerich.com>
parents:
17299
diff
changeset
|
225 # repository and we could race in-between. |
27822
bce0afa1921a
with: use context manager for wlock in removelargefiles
Bryan O'Sullivan <bryano@fb.com>
parents:
27821
diff
changeset
|
226 with repo.wlock(): |
15168 | 227 lfdirstate = lfutil.openlfdirstate(ui, repo) |
23658
55c92618fdd4
largefiles: eliminate a duplicate message when removing files in verbose mode
Matt Harbison <matt_harbison@yahoo.com>
parents:
23653
diff
changeset
|
228 for f in sorted(remove): |
23766
ce0731e58ac9
largefiles: align the output messages for a removed file with core methods
Matt Harbison <matt_harbison@yahoo.com>
parents:
23741
diff
changeset
|
229 if ui.verbose or not m.exact(f): |
ce0731e58ac9
largefiles: align the output messages for a removed file with core methods
Matt Harbison <matt_harbison@yahoo.com>
parents:
23741
diff
changeset
|
230 # addremove in core gets fancy with the name, remove doesn't |
ce0731e58ac9
largefiles: align the output messages for a removed file with core methods
Matt Harbison <matt_harbison@yahoo.com>
parents:
23741
diff
changeset
|
231 if isaddremove: |
ce0731e58ac9
largefiles: align the output messages for a removed file with core methods
Matt Harbison <matt_harbison@yahoo.com>
parents:
23741
diff
changeset
|
232 name = m.uipath(f) |
ce0731e58ac9
largefiles: align the output messages for a removed file with core methods
Matt Harbison <matt_harbison@yahoo.com>
parents:
23741
diff
changeset
|
233 else: |
ce0731e58ac9
largefiles: align the output messages for a removed file with core methods
Matt Harbison <matt_harbison@yahoo.com>
parents:
23741
diff
changeset
|
234 name = m.rel(f) |
ce0731e58ac9
largefiles: align the output messages for a removed file with core methods
Matt Harbison <matt_harbison@yahoo.com>
parents:
23741
diff
changeset
|
235 ui.status(_('removing %s\n') % name) |
23592
96d335e4eacb
largefiles: don't actually remove largefiles in an addremove dry run
Matt Harbison <matt_harbison@yahoo.com>
parents:
23419
diff
changeset
|
236 |
37150
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
37088
diff
changeset
|
237 if not dryrun: |
23592
96d335e4eacb
largefiles: don't actually remove largefiles in an addremove dry run
Matt Harbison <matt_harbison@yahoo.com>
parents:
23419
diff
changeset
|
238 if not after: |
31309
8908f985570c
vfs: use repo.wvfs.unlinkpath
Mads Kiilerich <madski@unity3d.com>
parents:
31099
diff
changeset
|
239 repo.wvfs.unlinkpath(f, ignoremissing=True) |
23592
96d335e4eacb
largefiles: don't actually remove largefiles in an addremove dry run
Matt Harbison <matt_harbison@yahoo.com>
parents:
23419
diff
changeset
|
240 |
37150
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
37088
diff
changeset
|
241 if dryrun: |
23592
96d335e4eacb
largefiles: don't actually remove largefiles in an addremove dry run
Matt Harbison <matt_harbison@yahoo.com>
parents:
23419
diff
changeset
|
242 return result |
96d335e4eacb
largefiles: don't actually remove largefiles in an addremove dry run
Matt Harbison <matt_harbison@yahoo.com>
parents:
23419
diff
changeset
|
243 |
15168 | 244 remove = [lfutil.standin(f) for f in remove] |
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
245 # 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
|
246 # function handle this. |
23038
3f581bfbb268
largefiles: replace repo._isaddremove hack with a simple function parameter
Mads Kiilerich <madski@unity3d.com>
parents:
22919
diff
changeset
|
247 if not isaddremove: |
18153
51837a31b425
largefiles: remove reporemove portability wrapper
Mads Kiilerich <madski@unity3d.com>
parents:
18152
diff
changeset
|
248 for f in remove: |
31309
8908f985570c
vfs: use repo.wvfs.unlinkpath
Mads Kiilerich <madski@unity3d.com>
parents:
31099
diff
changeset
|
249 repo.wvfs.unlinkpath(f, ignoremissing=True) |
18153
51837a31b425
largefiles: remove reporemove portability wrapper
Mads Kiilerich <madski@unity3d.com>
parents:
18152
diff
changeset
|
250 repo[None].forget(remove) |
23721
1b3df5ef5949
largefiles: properly sync lfdirstate after removing largefiles
Matt Harbison <matt_harbison@yahoo.com>
parents:
23695
diff
changeset
|
251 |
1b3df5ef5949
largefiles: properly sync lfdirstate after removing largefiles
Matt Harbison <matt_harbison@yahoo.com>
parents:
23695
diff
changeset
|
252 for f in remove: |
1b3df5ef5949
largefiles: properly sync lfdirstate after removing largefiles
Matt Harbison <matt_harbison@yahoo.com>
parents:
23695
diff
changeset
|
253 lfutil.synclfdirstate(repo, lfdirstate, lfutil.splitstandin(f), |
1b3df5ef5949
largefiles: properly sync lfdirstate after removing largefiles
Matt Harbison <matt_harbison@yahoo.com>
parents:
23695
diff
changeset
|
254 False) |
1b3df5ef5949
largefiles: properly sync lfdirstate after removing largefiles
Matt Harbison <matt_harbison@yahoo.com>
parents:
23695
diff
changeset
|
255 |
1b3df5ef5949
largefiles: properly sync lfdirstate after removing largefiles
Matt Harbison <matt_harbison@yahoo.com>
parents:
23695
diff
changeset
|
256 lfdirstate.write() |
15168 | 257 |
17576
e0081bb5450e
largefiles: exit from remove with 1 on warnings
Matt Harbison <matt_harbison@yahoo.com>
parents:
17575
diff
changeset
|
258 return result |
e0081bb5450e
largefiles: exit from remove with 1 on warnings
Matt Harbison <matt_harbison@yahoo.com>
parents:
17575
diff
changeset
|
259 |
16449
874a680a3e23
largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents:
16439
diff
changeset
|
260 # 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
|
261 # appear at their right place in the manifests. |
41062
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
262 @eh.wrapfunction(webcommands, 'decodepath') |
16449
874a680a3e23
largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents:
16439
diff
changeset
|
263 def decodepath(orig, path): |
874a680a3e23
largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents:
16439
diff
changeset
|
264 return lfutil.splitstandin(path) or path |
874a680a3e23
largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents:
16439
diff
changeset
|
265 |
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
266 # -- Wrappers: modify existing commands -------------------------------- |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
267 |
41061
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
268 @eh.wrapcommand('add', |
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
269 opts=[('', 'large', None, _('add as largefile')), |
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
270 ('', 'normal', None, _('add as normal file')), |
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
271 ('', 'lfsize', '', _('add all files above this size (in megabytes) ' |
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
272 'as largefiles (default: 10)'))]) |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
273 def overrideadd(orig, ui, repo, *pats, **opts): |
35348
576ba8194fa8
py3: handle keyword arguments correctly in hgext/largefiles/
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35303
diff
changeset
|
274 if opts.get(r'normal') and opts.get(r'large'): |
26587
56b2bcea2529
error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26427
diff
changeset
|
275 raise error.Abort(_('--normal cannot be used with --large')) |
23886
5ce8dcd05dc4
largefiles: enable subrepo support for add
Matt Harbison <matt_harbison@yahoo.com>
parents:
23884
diff
changeset
|
276 return orig(ui, repo, *pats, **opts) |
5ce8dcd05dc4
largefiles: enable subrepo support for add
Matt Harbison <matt_harbison@yahoo.com>
parents:
23884
diff
changeset
|
277 |
41062
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
278 @eh.wrapfunction(cmdutil, 'add') |
23886
5ce8dcd05dc4
largefiles: enable subrepo support for add
Matt Harbison <matt_harbison@yahoo.com>
parents:
23884
diff
changeset
|
279 def cmdutiladd(orig, ui, repo, matcher, prefix, explicitonly, **opts): |
5ce8dcd05dc4
largefiles: enable subrepo support for add
Matt Harbison <matt_harbison@yahoo.com>
parents:
23884
diff
changeset
|
280 # The --normal flag short circuits this override |
32157
09fb3d3b1b3a
py3: abuse r'' to access keys in keyword arguments
Pulkit Goyal <7895pulkit@gmail.com>
parents:
31892
diff
changeset
|
281 if opts.get(r'normal'): |
23886
5ce8dcd05dc4
largefiles: enable subrepo support for add
Matt Harbison <matt_harbison@yahoo.com>
parents:
23884
diff
changeset
|
282 return orig(ui, repo, matcher, prefix, explicitonly, **opts) |
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
283 |
23886
5ce8dcd05dc4
largefiles: enable subrepo support for add
Matt Harbison <matt_harbison@yahoo.com>
parents:
23884
diff
changeset
|
284 ladded, lbad = addlargefiles(ui, repo, False, matcher, **opts) |
5ce8dcd05dc4
largefiles: enable subrepo support for add
Matt Harbison <matt_harbison@yahoo.com>
parents:
23884
diff
changeset
|
285 normalmatcher = composenormalfilematcher(matcher, repo[None].manifest(), |
5ce8dcd05dc4
largefiles: enable subrepo support for add
Matt Harbison <matt_harbison@yahoo.com>
parents:
23884
diff
changeset
|
286 ladded) |
5ce8dcd05dc4
largefiles: enable subrepo support for add
Matt Harbison <matt_harbison@yahoo.com>
parents:
23884
diff
changeset
|
287 bad = orig(ui, repo, normalmatcher, prefix, explicitonly, **opts) |
5ce8dcd05dc4
largefiles: enable subrepo support for add
Matt Harbison <matt_harbison@yahoo.com>
parents:
23884
diff
changeset
|
288 |
5ce8dcd05dc4
largefiles: enable subrepo support for add
Matt Harbison <matt_harbison@yahoo.com>
parents:
23884
diff
changeset
|
289 bad.extend(f for f in lbad) |
5ce8dcd05dc4
largefiles: enable subrepo support for add
Matt Harbison <matt_harbison@yahoo.com>
parents:
23884
diff
changeset
|
290 return bad |
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
291 |
41062
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
292 @eh.wrapfunction(cmdutil, 'remove') |
37150
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
37088
diff
changeset
|
293 def cmdutilremove(orig, ui, repo, matcher, prefix, after, force, subrepos, |
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
37088
diff
changeset
|
294 dryrun): |
23782
304e69cb1ee9
largefiles: enable subrepo support for remove
Matt Harbison <matt_harbison@yahoo.com>
parents:
23769
diff
changeset
|
295 normalmatcher = composenormalfilematcher(matcher, repo[None].manifest()) |
37150
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
37088
diff
changeset
|
296 result = orig(ui, repo, normalmatcher, prefix, after, force, subrepos, |
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
37088
diff
changeset
|
297 dryrun) |
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
37088
diff
changeset
|
298 return removelargefiles(ui, repo, False, matcher, dryrun, after=after, |
23782
304e69cb1ee9
largefiles: enable subrepo support for remove
Matt Harbison <matt_harbison@yahoo.com>
parents:
23769
diff
changeset
|
299 force=force) or result |
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
300 |
41062
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
301 @eh.wrapfunction(subrepo.hgsubrepo, 'status') |
16515
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16449
diff
changeset
|
302 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
|
303 try: |
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16449
diff
changeset
|
304 repo._repo.lfstatus = True |
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16449
diff
changeset
|
305 return orig(repo, rev2, **opts) |
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16449
diff
changeset
|
306 finally: |
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16449
diff
changeset
|
307 repo._repo.lfstatus = False |
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16449
diff
changeset
|
308 |
41061
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
309 @eh.wrapcommand('status') |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
310 def overridestatus(orig, ui, repo, *pats, **opts): |
15168 | 311 try: |
312 repo.lfstatus = True | |
313 return orig(ui, repo, *pats, **opts) | |
314 finally: | |
315 repo.lfstatus = False | |
316 | |
41062
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
317 @eh.wrapfunction(subrepo.hgsubrepo, 'dirty') |
33364
bf2daeddd42b
subrepo: consider the parent repo dirty when a file is missing
Matt Harbison <matt_harbison@yahoo.com>
parents:
32945
diff
changeset
|
318 def overridedirty(orig, repo, ignoreupdate=False, missing=False): |
16516
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
319 try: |
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
320 repo._repo.lfstatus = True |
33364
bf2daeddd42b
subrepo: consider the parent repo dirty when a file is missing
Matt Harbison <matt_harbison@yahoo.com>
parents:
32945
diff
changeset
|
321 return orig(repo, ignoreupdate=ignoreupdate, missing=missing) |
16516
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
322 finally: |
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
323 repo._repo.lfstatus = False |
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
324 |
41061
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
325 @eh.wrapcommand('log') |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
326 def overridelog(orig, ui, repo, *pats, **opts): |
26339
4afdd4283d3e
largefiles: remove a mutable default argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26338
diff
changeset
|
327 def overridematchandpats(ctx, pats=(), opts=None, globbed=False, |
25467
f64dbe06f3d0
scmutil: add an optional parameter to matcher factories for a bad() override
Matt Harbison <matt_harbison@yahoo.com>
parents:
25440
diff
changeset
|
328 default='relpath', badfn=None): |
18341
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18154
diff
changeset
|
329 """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
|
330 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
|
331 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
|
332 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
|
333 """ |
26339
4afdd4283d3e
largefiles: remove a mutable default argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26338
diff
changeset
|
334 if opts is None: |
4afdd4283d3e
largefiles: remove a mutable default argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26338
diff
changeset
|
335 opts = {} |
25467
f64dbe06f3d0
scmutil: add an optional parameter to matcher factories for a bad() override
Matt Harbison <matt_harbison@yahoo.com>
parents:
25440
diff
changeset
|
336 matchandpats = oldmatchandpats(ctx, pats, opts, globbed, default, |
f64dbe06f3d0
scmutil: add an optional parameter to matcher factories for a bad() override
Matt Harbison <matt_harbison@yahoo.com>
parents:
25440
diff
changeset
|
337 badfn=badfn) |
21110
49e13e76ec5a
largefiles: changed overridelog to work with graphlog
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21096
diff
changeset
|
338 m, p = copy.copy(matchandpats) |
49e13e76ec5a
largefiles: changed overridelog to work with graphlog
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21096
diff
changeset
|
339 |
22170
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
340 if m.always(): |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
341 # We want to match everything anyway, so there's no benefit trying |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
342 # to add standins. |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
343 return matchandpats |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
344 |
21110
49e13e76ec5a
largefiles: changed overridelog to work with graphlog
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21096
diff
changeset
|
345 pats = set(p) |
24206
13c1e66f9653
largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24172
diff
changeset
|
346 |
13c1e66f9653
largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24172
diff
changeset
|
347 def fixpats(pat, tostandin=lfutil.standin): |
24813
2553ef7355ab
largefiles: don't mangle filesets when fixing up the log matcher
Matt Harbison <matt_harbison@yahoo.com>
parents:
24812
diff
changeset
|
348 if pat.startswith('set:'): |
2553ef7355ab
largefiles: don't mangle filesets when fixing up the log matcher
Matt Harbison <matt_harbison@yahoo.com>
parents:
24812
diff
changeset
|
349 return pat |
2553ef7355ab
largefiles: don't mangle filesets when fixing up the log matcher
Matt Harbison <matt_harbison@yahoo.com>
parents:
24812
diff
changeset
|
350 |
29318
2572bb2e06f8
largefiles: rename match_ to matchmod import in overrides
liscju <piotr.listkiewicz@gmail.com>
parents:
29311
diff
changeset
|
351 kindpat = matchmod._patsplit(pat, None) |
24206
13c1e66f9653
largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24172
diff
changeset
|
352 |
13c1e66f9653
largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24172
diff
changeset
|
353 if kindpat[0] is not None: |
13c1e66f9653
largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24172
diff
changeset
|
354 return kindpat[0] + ':' + tostandin(kindpat[1]) |
13c1e66f9653
largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24172
diff
changeset
|
355 return tostandin(kindpat[1]) |
13c1e66f9653
largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24172
diff
changeset
|
356 |
21110
49e13e76ec5a
largefiles: changed overridelog to work with graphlog
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21096
diff
changeset
|
357 if m._cwd: |
24208
e6b0de02a02e
largefiles: handle logging from outside the repo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24207
diff
changeset
|
358 hglf = lfutil.shortname |
e6b0de02a02e
largefiles: handle logging from outside the repo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24207
diff
changeset
|
359 back = util.pconvert(m.rel(hglf)[:-len(hglf)]) |
24206
13c1e66f9653
largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24172
diff
changeset
|
360 |
13c1e66f9653
largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24172
diff
changeset
|
361 def tostandin(f): |
26781
1aee2ab0f902
spelling: trivial spell checking
Mads Kiilerich <madski@unity3d.com>
parents:
26607
diff
changeset
|
362 # The file may already be a standin, so truncate the back |
24208
e6b0de02a02e
largefiles: handle logging from outside the repo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24207
diff
changeset
|
363 # prefix and test before mangling it. This avoids turning |
24207
d90e3faf96a9
largefiles: don't prefix standin patterns with '.hglf' when logging
Matt Harbison <matt_harbison@yahoo.com>
parents:
24206
diff
changeset
|
364 # 'glob:../.hglf/foo*' into 'glob:../.hglf/../.hglf/foo*'. |
d90e3faf96a9
largefiles: don't prefix standin patterns with '.hglf' when logging
Matt Harbison <matt_harbison@yahoo.com>
parents:
24206
diff
changeset
|
365 if f.startswith(back) and lfutil.splitstandin(f[len(back):]): |
d90e3faf96a9
largefiles: don't prefix standin patterns with '.hglf' when logging
Matt Harbison <matt_harbison@yahoo.com>
parents:
24206
diff
changeset
|
366 return f |
d90e3faf96a9
largefiles: don't prefix standin patterns with '.hglf' when logging
Matt Harbison <matt_harbison@yahoo.com>
parents:
24206
diff
changeset
|
367 |
24208
e6b0de02a02e
largefiles: handle logging from outside the repo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24207
diff
changeset
|
368 # An absolute path is from outside the repo, so truncate the |
e6b0de02a02e
largefiles: handle logging from outside the repo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24207
diff
changeset
|
369 # path to the root before building the standin. Otherwise cwd |
e6b0de02a02e
largefiles: handle logging from outside the repo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24207
diff
changeset
|
370 # is somewhere in the repo, relative to root, and needs to be |
e6b0de02a02e
largefiles: handle logging from outside the repo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24207
diff
changeset
|
371 # prepended before building the standin. |
e6b0de02a02e
largefiles: handle logging from outside the repo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24207
diff
changeset
|
372 if os.path.isabs(m._cwd): |
e6b0de02a02e
largefiles: handle logging from outside the repo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24207
diff
changeset
|
373 f = f[len(back):] |
e6b0de02a02e
largefiles: handle logging from outside the repo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24207
diff
changeset
|
374 else: |
e6b0de02a02e
largefiles: handle logging from outside the repo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24207
diff
changeset
|
375 f = m._cwd + '/' + f |
e6b0de02a02e
largefiles: handle logging from outside the repo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24207
diff
changeset
|
376 return back + lfutil.standin(f) |
21110
49e13e76ec5a
largefiles: changed overridelog to work with graphlog
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21096
diff
changeset
|
377 else: |
24207
d90e3faf96a9
largefiles: don't prefix standin patterns with '.hglf' when logging
Matt Harbison <matt_harbison@yahoo.com>
parents:
24206
diff
changeset
|
378 def tostandin(f): |
31614
d5d0e6ca62ad
largefiles: replace splitstandin() by isstandin() to omit str creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31613
diff
changeset
|
379 if lfutil.isstandin(f): |
24207
d90e3faf96a9
largefiles: don't prefix standin patterns with '.hglf' when logging
Matt Harbison <matt_harbison@yahoo.com>
parents:
24206
diff
changeset
|
380 return f |
d90e3faf96a9
largefiles: don't prefix standin patterns with '.hglf' when logging
Matt Harbison <matt_harbison@yahoo.com>
parents:
24206
diff
changeset
|
381 return lfutil.standin(f) |
32301
8a87bfc5bebb
largefiles: move identical statement to after if/else
Martin von Zweigbergk <martinvonz@google.com>
parents:
32157
diff
changeset
|
382 pats.update(fixpats(f, tostandin) for f in p) |
21110
49e13e76ec5a
largefiles: changed overridelog to work with graphlog
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21096
diff
changeset
|
383 |
19472
32e502b26983
largefiles: overridematch() should replace the file path instead of extending (issue3934)
Wei, Elson <elson.wei@gmail.com>
parents:
19226
diff
changeset
|
384 for i in range(0, len(m._files)): |
24206
13c1e66f9653
largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24172
diff
changeset
|
385 # Don't add '.hglf' to m.files, since that is already covered by '.' |
13c1e66f9653
largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24172
diff
changeset
|
386 if m._files[i] == '.': |
13c1e66f9653
largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24172
diff
changeset
|
387 continue |
19472
32e502b26983
largefiles: overridematch() should replace the file path instead of extending (issue3934)
Wei, Elson <elson.wei@gmail.com>
parents:
19226
diff
changeset
|
388 standin = lfutil.standin(m._files[i]) |
23976
344939126579
largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents:
23893
diff
changeset
|
389 # If the "standin" is a directory, append instead of replace to |
344939126579
largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents:
23893
diff
changeset
|
390 # support naming a directory on the command line with only |
344939126579
largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents:
23893
diff
changeset
|
391 # largefiles. The original directory is kept to support normal |
344939126579
largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents:
23893
diff
changeset
|
392 # files. |
31655
9d075911df49
largefiles: avoid meaningless changectx looking up
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31654
diff
changeset
|
393 if standin in ctx: |
19472
32e502b26983
largefiles: overridematch() should replace the file path instead of extending (issue3934)
Wei, Elson <elson.wei@gmail.com>
parents:
19226
diff
changeset
|
394 m._files[i] = standin |
31655
9d075911df49
largefiles: avoid meaningless changectx looking up
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31654
diff
changeset
|
395 elif m._files[i] not in ctx and repo.wvfs.isdir(standin): |
21275
c7e9fb881a5a
largefiles: include largefiles when doing log on a directory (issue4241)
Mads Kiilerich <madski@unity3d.com>
parents:
21209
diff
changeset
|
396 m._files.append(standin) |
21110
49e13e76ec5a
largefiles: changed overridelog to work with graphlog
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21096
diff
changeset
|
397 |
32322
23c9a2a71c6e
match: make _fileroots a @propertycache and rename it to _fileset
Martin von Zweigbergk <martinvonz@google.com>
parents:
32308
diff
changeset
|
398 m._fileset = set(m._files) |
32388
4a23cdb32968
largefiles: replace always() method, not _always field
Martin von Zweigbergk <martinvonz@google.com>
parents:
32382
diff
changeset
|
399 m.always = lambda: False |
18341
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18154
diff
changeset
|
400 origmatchfn = m.matchfn |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18154
diff
changeset
|
401 def lfmatchfn(f): |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18154
diff
changeset
|
402 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
|
403 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
|
404 return True |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18154
diff
changeset
|
405 r = origmatchfn(f) |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18154
diff
changeset
|
406 return r |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18154
diff
changeset
|
407 m.matchfn = lfmatchfn |
21110
49e13e76ec5a
largefiles: changed overridelog to work with graphlog
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21096
diff
changeset
|
408 |
32308
e8569cc131d1
py3: explicitly convert a list to bytes to pass in ui.debug
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32301
diff
changeset
|
409 ui.debug('updated patterns: %s\n' % ', '.join(sorted(pats))) |
21110
49e13e76ec5a
largefiles: changed overridelog to work with graphlog
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21096
diff
changeset
|
410 return m, pats |
49e13e76ec5a
largefiles: changed overridelog to work with graphlog
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21096
diff
changeset
|
411 |
22169
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22168
diff
changeset
|
412 # For hg log --patch, the match object is used in two different senses: |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22168
diff
changeset
|
413 # (1) to determine what revisions should be printed out, and |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22168
diff
changeset
|
414 # (2) to determine what files to print out diffs for. |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22168
diff
changeset
|
415 # The magic matchandpats override should be used for case (1) but not for |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22168
diff
changeset
|
416 # case (2). |
35887
572f36e9a780
logcmdutil: drop redundant "log" from function names (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35885
diff
changeset
|
417 def overridemakefilematcher(repo, pats, opts, badfn=None): |
24534
1925769b4ff8
log: prefer 'wctx' over 'pctx' for working context
Martin von Zweigbergk <martinvonz@google.com>
parents:
24474
diff
changeset
|
418 wctx = repo[None] |
25467
f64dbe06f3d0
scmutil: add an optional parameter to matcher factories for a bad() override
Matt Harbison <matt_harbison@yahoo.com>
parents:
25440
diff
changeset
|
419 match, pats = oldmatchandpats(wctx, pats, opts, badfn=badfn) |
36002
f8ad57d24252
log: pass ctx to makefilematcher() and makehunksfilter() functions
Yuya Nishihara <yuya@tcha.org>
parents:
35887
diff
changeset
|
420 return lambda ctx: match |
22169
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22168
diff
changeset
|
421 |
21110
49e13e76ec5a
largefiles: changed overridelog to work with graphlog
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21096
diff
changeset
|
422 oldmatchandpats = installmatchandpatsfn(overridematchandpats) |
35887
572f36e9a780
logcmdutil: drop redundant "log" from function names (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35885
diff
changeset
|
423 oldmakefilematcher = logcmdutil._makenofollowfilematcher |
572f36e9a780
logcmdutil: drop redundant "log" from function names (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35885
diff
changeset
|
424 setattr(logcmdutil, '_makenofollowfilematcher', overridemakefilematcher) |
22169
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22168
diff
changeset
|
425 |
15168 | 426 try: |
17577
0f39e9355d3c
largefiles: preserve the exit status of the log command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17576
diff
changeset
|
427 return orig(ui, repo, *pats, **opts) |
15168 | 428 finally: |
21110
49e13e76ec5a
largefiles: changed overridelog to work with graphlog
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21096
diff
changeset
|
429 restorematchandpatsfn() |
35887
572f36e9a780
logcmdutil: drop redundant "log" from function names (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35885
diff
changeset
|
430 setattr(logcmdutil, '_makenofollowfilematcher', oldmakefilematcher) |
15168 | 431 |
41061
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
432 @eh.wrapcommand('verify', |
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
433 opts=[('', 'large', None, |
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
434 _('verify that all largefiles in current revision exists')), |
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
435 ('', 'lfa', None, |
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
436 _('verify largefiles in all revisions, not just current')), |
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
437 ('', 'lfc', None, |
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
438 _('verify local largefile contents, not just existence'))]) |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
439 def overrideverify(orig, ui, repo, *pats, **opts): |
35348
576ba8194fa8
py3: handle keyword arguments correctly in hgext/largefiles/
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35303
diff
changeset
|
440 large = opts.pop(r'large', False) |
576ba8194fa8
py3: handle keyword arguments correctly in hgext/largefiles/
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35303
diff
changeset
|
441 all = opts.pop(r'lfa', False) |
576ba8194fa8
py3: handle keyword arguments correctly in hgext/largefiles/
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35303
diff
changeset
|
442 contents = opts.pop(r'lfc', False) |
15168 | 443 |
444 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
|
445 if large or all or contents: |
15168 | 446 result = result or lfcommands.verifylfiles(ui, repo, all, contents) |
447 return result | |
448 | |
41061
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
449 @eh.wrapcommand('debugstate', |
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
450 opts=[('', 'large', None, _('display largefiles dirstate'))]) |
18144
e16982a74bf7
largefiles: introduce basic debugstate --large functionality
Mads Kiilerich <madski@unity3d.com>
parents:
18142
diff
changeset
|
451 def overridedebugstate(orig, ui, repo, *pats, **opts): |
35348
576ba8194fa8
py3: handle keyword arguments correctly in hgext/largefiles/
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35303
diff
changeset
|
452 large = opts.pop(r'large', False) |
18144
e16982a74bf7
largefiles: introduce basic debugstate --large functionality
Mads Kiilerich <madski@unity3d.com>
parents:
18142
diff
changeset
|
453 if large: |
21088
e095626e8676
largefiles: full debugdirstate functionality for largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
21087
diff
changeset
|
454 class fakerepo(object): |
e095626e8676
largefiles: full debugdirstate functionality for largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
21087
diff
changeset
|
455 dirstate = lfutil.openlfdirstate(ui, repo) |
e095626e8676
largefiles: full debugdirstate functionality for largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
21087
diff
changeset
|
456 orig(ui, fakerepo, *pats, **opts) |
18144
e16982a74bf7
largefiles: introduce basic debugstate --large functionality
Mads Kiilerich <madski@unity3d.com>
parents:
18142
diff
changeset
|
457 else: |
e16982a74bf7
largefiles: introduce basic debugstate --large functionality
Mads Kiilerich <madski@unity3d.com>
parents:
18142
diff
changeset
|
458 orig(ui, repo, *pats, **opts) |
e16982a74bf7
largefiles: introduce basic debugstate --large functionality
Mads Kiilerich <madski@unity3d.com>
parents:
18142
diff
changeset
|
459 |
15663
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
460 # Before starting the manifest merge, merge.updates will call |
23543
4dd8a6a1240d
spelling: fixes from proofreading of spell checker issues
Mads Kiilerich <madski@unity3d.com>
parents:
23541
diff
changeset
|
461 # _checkunknownfile to check if there are any files in the merged-in |
15663
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
462 # 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
|
463 # |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
464 # 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
|
465 # 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
|
466 # |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
467 # 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
|
468 # largefiles. This makes the merge proceed and we can then handle this |
23307
9dd0d0d61a24
largefiles: update comments to refer to the right overridden method
Martin von Zweigbergk <martinvonz@google.com>
parents:
23276
diff
changeset
|
469 # case further in the overridden calculateupdates function below. |
41062
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
470 @eh.wrapfunction(merge, '_checkunknownfile') |
23653
0297d8469350
merge: don't overwrite untracked file at directory rename target
Martin von Zweigbergk <martinvonz@google.com>
parents:
23644
diff
changeset
|
471 def overridecheckunknownfile(origfn, repo, wctx, mctx, f, f2=None): |
19161
24877c50aada
largefiles: check unknown files with case awareness of the filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19001
diff
changeset
|
472 if lfutil.standin(repo.dirstate.normalize(f)) in wctx: |
16093
7e30f5f2285f
merge: refactor unknown file conflict checking
Matt Mackall <mpm@selenic.com>
parents:
16075
diff
changeset
|
473 return False |
23653
0297d8469350
merge: don't overwrite untracked file at directory rename target
Martin von Zweigbergk <martinvonz@google.com>
parents:
23644
diff
changeset
|
474 return origfn(repo, wctx, mctx, f, f2) |
15663
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
475 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
476 # 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
|
477 # 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
|
478 # |
23307
9dd0d0d61a24
largefiles: update comments to refer to the right overridden method
Martin von Zweigbergk <martinvonz@google.com>
parents:
23276
diff
changeset
|
479 # The strategy is to run the original calculateupdates and then process |
15663
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
480 # 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
|
481 # |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
482 # 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
|
483 # 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
|
484 # 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
|
485 # 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
|
486 # 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
|
487 # |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
488 # 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
|
489 # 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
|
490 # 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
|
491 # triggers a merge action. |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
492 # |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
493 # 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
|
494 # 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
|
495 # 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
|
496 # 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
|
497 # presumably changed on purpose. |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
498 # |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
499 # 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
|
500 # 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
|
501 # will update the largefiles. |
41062
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
502 @eh.wrapfunction(merge, 'calculateupdates') |
21081
ffd7b6ce46ff
merge: pass merge ancestor to calculateupdates as a list
Mads Kiilerich <madski@unity3d.com>
parents:
21080
diff
changeset
|
503 def overridecalculateupdates(origfn, repo, p1, p2, pas, branchmerge, force, |
28193
19775bc34da3
largefiles: don't explicitly list optional parameters that are not used
Tony Tung <tonytung@merly.org>
parents:
28020
diff
changeset
|
504 acceptremote, *args, **kwargs): |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18600
diff
changeset
|
505 overwrite = force and not branchmerge |
23526
a5887f2da5e6
merge: don't treat 'diverge' and 'renamedelete' like actions
Martin von Zweigbergk <martinvonz@google.com>
parents:
23503
diff
changeset
|
506 actions, diverge, renamedelete = origfn( |
28193
19775bc34da3
largefiles: don't explicitly list optional parameters that are not used
Tony Tung <tonytung@merly.org>
parents:
28020
diff
changeset
|
507 repo, p1, p2, pas, branchmerge, force, acceptremote, *args, **kwargs) |
19952
8eb99e5cec4a
largefiles: don't process merge actions at all when overwriting
Mads Kiilerich <madski@unity3d.com>
parents:
19805
diff
changeset
|
508 |
8eb99e5cec4a
largefiles: don't process merge actions at all when overwriting
Mads Kiilerich <madski@unity3d.com>
parents:
19805
diff
changeset
|
509 if overwrite: |
23526
a5887f2da5e6
merge: don't treat 'diverge' and 'renamedelete' like actions
Martin von Zweigbergk <martinvonz@google.com>
parents:
23503
diff
changeset
|
510 return actions, diverge, renamedelete |
15663
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
511 |
23529
38e55e55ae4d
largefiles: rewrite merge code using dictionary with entry per file
Martin von Zweigbergk <martinvonz@google.com>
parents:
23528
diff
changeset
|
512 # Convert to dictionary with filename as key and action as value. |
23530
42ae1b1f048f
largefiles: start by finding files of interest
Martin von Zweigbergk <martinvonz@google.com>
parents:
23529
diff
changeset
|
513 lfiles = set() |
23642
7fd1a6c27e60
largefiles: don't duplicate 'actions' into 'actionbyfile'
Martin von Zweigbergk <martinvonz@google.com>
parents:
23641
diff
changeset
|
514 for f in actions: |
27905
27f2f5c1d499
largefiles: actions will now always have a file - drop check
Mads Kiilerich <madski@unity3d.com>
parents:
27904
diff
changeset
|
515 splitstandin = lfutil.splitstandin(f) |
23641
a7a0f32a383f
merge: make calculateupdates() return file->action dict
Martin von Zweigbergk <martinvonz@google.com>
parents:
23635
diff
changeset
|
516 if splitstandin in p1: |
a7a0f32a383f
merge: make calculateupdates() return file->action dict
Martin von Zweigbergk <martinvonz@google.com>
parents:
23635
diff
changeset
|
517 lfiles.add(splitstandin) |
a7a0f32a383f
merge: make calculateupdates() return file->action dict
Martin von Zweigbergk <martinvonz@google.com>
parents:
23635
diff
changeset
|
518 elif lfutil.standin(f) in p1: |
a7a0f32a383f
merge: make calculateupdates() return file->action dict
Martin von Zweigbergk <martinvonz@google.com>
parents:
23635
diff
changeset
|
519 lfiles.add(f) |
15663
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
520 |
27904
ee3123e19db9
largefiles: make prompt order deterministic
Mads Kiilerich <madski@unity3d.com>
parents:
27826
diff
changeset
|
521 for lfile in sorted(lfiles): |
23530
42ae1b1f048f
largefiles: start by finding files of interest
Martin von Zweigbergk <martinvonz@google.com>
parents:
23529
diff
changeset
|
522 standin = lfutil.standin(lfile) |
23642
7fd1a6c27e60
largefiles: don't duplicate 'actions' into 'actionbyfile'
Martin von Zweigbergk <martinvonz@google.com>
parents:
23641
diff
changeset
|
523 (lm, largs, lmsg) = actions.get(lfile, (None, None, None)) |
7fd1a6c27e60
largefiles: don't duplicate 'actions' into 'actionbyfile'
Martin von Zweigbergk <martinvonz@google.com>
parents:
23641
diff
changeset
|
524 (sm, sargs, smsg) = actions.get(standin, (None, None, None)) |
23541
495bc1b65d25
merge: move cd/dc prompts after largefiles prompts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23537
diff
changeset
|
525 if sm in ('g', 'dc') and lm != 'r': |
26962
fa2daf0e61ab
merge: make 'cd' and 'dc' actions store the same arguments as 'm'
Siddharth Agarwal <sid0@fb.com>
parents:
26781
diff
changeset
|
526 if sm == 'dc': |
fa2daf0e61ab
merge: make 'cd' and 'dc' actions store the same arguments as 'm'
Siddharth Agarwal <sid0@fb.com>
parents:
26781
diff
changeset
|
527 f1, f2, fa, move, anc = sargs |
27655
af13eaf9ab8c
merge: add a new 'backup' argument to get actions
Siddharth Agarwal <sid0@fb.com>
parents:
27586
diff
changeset
|
528 sargs = (p2[f2].flags(), False) |
15663
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
529 # 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
|
530 # the second parent |
23470
2b23a25f06fd
largefiles: don't clobber merge action message with user message
Martin von Zweigbergk <martinvonz@google.com>
parents:
23441
diff
changeset
|
531 usermsg = _('remote turned local normal file %s into a largefile\n' |
2b23a25f06fd
largefiles: don't clobber merge action message with user message
Martin von Zweigbergk <martinvonz@google.com>
parents:
23441
diff
changeset
|
532 'use (l)argefile or keep (n)ormal file?' |
2b23a25f06fd
largefiles: don't clobber merge action message with user message
Martin von Zweigbergk <martinvonz@google.com>
parents:
23441
diff
changeset
|
533 '$$ &Largefile $$ &Normal file') % lfile |
23483
3805f4b0f5a9
largefiles: remove redundant checks for false modify/delete conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23471
diff
changeset
|
534 if repo.ui.promptchoice(usermsg, 0) == 0: # pick remote largefile |
23642
7fd1a6c27e60
largefiles: don't duplicate 'actions' into 'actionbyfile'
Martin von Zweigbergk <martinvonz@google.com>
parents:
23641
diff
changeset
|
535 actions[lfile] = ('r', None, 'replaced by standin') |
7fd1a6c27e60
largefiles: don't duplicate 'actions' into 'actionbyfile'
Martin von Zweigbergk <martinvonz@google.com>
parents:
23641
diff
changeset
|
536 actions[standin] = ('g', sargs, 'replaces standin') |
23419
a34a99181f36
largefiles: don't show largefile/normal prompts if one side is unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23041
diff
changeset
|
537 else: # keep local normal file |
23642
7fd1a6c27e60
largefiles: don't duplicate 'actions' into 'actionbyfile'
Martin von Zweigbergk <martinvonz@google.com>
parents:
23641
diff
changeset
|
538 actions[lfile] = ('k', None, 'replaces standin') |
23493
28f01c318c05
largefiles: don't use 'r' action for standin that doesn't exist
Martin von Zweigbergk <martinvonz@google.com>
parents:
23492
diff
changeset
|
539 if branchmerge: |
23642
7fd1a6c27e60
largefiles: don't duplicate 'actions' into 'actionbyfile'
Martin von Zweigbergk <martinvonz@google.com>
parents:
23641
diff
changeset
|
540 actions[standin] = ('k', None, 'replaced by non-standin') |
23493
28f01c318c05
largefiles: don't use 'r' action for standin that doesn't exist
Martin von Zweigbergk <martinvonz@google.com>
parents:
23492
diff
changeset
|
541 else: |
23642
7fd1a6c27e60
largefiles: don't duplicate 'actions' into 'actionbyfile'
Martin von Zweigbergk <martinvonz@google.com>
parents:
23641
diff
changeset
|
542 actions[standin] = ('r', None, 'replaced by non-standin') |
23541
495bc1b65d25
merge: move cd/dc prompts after largefiles prompts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23537
diff
changeset
|
543 elif lm in ('g', 'dc') and sm != 'r': |
26962
fa2daf0e61ab
merge: make 'cd' and 'dc' actions store the same arguments as 'm'
Siddharth Agarwal <sid0@fb.com>
parents:
26781
diff
changeset
|
544 if lm == 'dc': |
fa2daf0e61ab
merge: make 'cd' and 'dc' actions store the same arguments as 'm'
Siddharth Agarwal <sid0@fb.com>
parents:
26781
diff
changeset
|
545 f1, f2, fa, move, anc = largs |
27655
af13eaf9ab8c
merge: add a new 'backup' argument to get actions
Siddharth Agarwal <sid0@fb.com>
parents:
27586
diff
changeset
|
546 largs = (p2[f2].flags(), False) |
15663
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
547 # 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
|
548 # the second parent |
23470
2b23a25f06fd
largefiles: don't clobber merge action message with user message
Martin von Zweigbergk <martinvonz@google.com>
parents:
23441
diff
changeset
|
549 usermsg = _('remote turned local largefile %s into a normal file\n' |
19967
e92c6524a76d
largefiles: use 'remote'/'local' in merge prompts like in other merge prompts
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
550 'keep (l)argefile or use (n)ormal file?' |
19226
c58b6ab4c26f
ui: merge prompt text components into a singe string
Matt Mackall <mpm@selenic.com>
parents:
19161
diff
changeset
|
551 '$$ &Largefile $$ &Normal file') % lfile |
23483
3805f4b0f5a9
largefiles: remove redundant checks for false modify/delete conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23471
diff
changeset
|
552 if repo.ui.promptchoice(usermsg, 0) == 0: # keep local largefile |
22196
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22194
diff
changeset
|
553 if branchmerge: |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22194
diff
changeset
|
554 # largefile can be restored from standin safely |
23642
7fd1a6c27e60
largefiles: don't duplicate 'actions' into 'actionbyfile'
Martin von Zweigbergk <martinvonz@google.com>
parents:
23641
diff
changeset
|
555 actions[lfile] = ('k', None, 'replaced by standin') |
7fd1a6c27e60
largefiles: don't duplicate 'actions' into 'actionbyfile'
Martin von Zweigbergk <martinvonz@google.com>
parents:
23641
diff
changeset
|
556 actions[standin] = ('k', None, 'replaces standin') |
22196
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22194
diff
changeset
|
557 else: |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22194
diff
changeset
|
558 # "lfile" should be marked as "removed" without |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22194
diff
changeset
|
559 # removal of itself |
23642
7fd1a6c27e60
largefiles: don't duplicate 'actions' into 'actionbyfile'
Martin von Zweigbergk <martinvonz@google.com>
parents:
23641
diff
changeset
|
560 actions[lfile] = ('lfmr', None, |
7fd1a6c27e60
largefiles: don't duplicate 'actions' into 'actionbyfile'
Martin von Zweigbergk <martinvonz@google.com>
parents:
23641
diff
changeset
|
561 'forget non-standin largefile') |
22196
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22194
diff
changeset
|
562 |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22194
diff
changeset
|
563 # linear-merge should treat this largefile as 're-added' |
23642
7fd1a6c27e60
largefiles: don't duplicate 'actions' into 'actionbyfile'
Martin von Zweigbergk <martinvonz@google.com>
parents:
23641
diff
changeset
|
564 actions[standin] = ('a', None, 'keep standin') |
23419
a34a99181f36
largefiles: don't show largefile/normal prompts if one side is unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23041
diff
changeset
|
565 else: # pick remote normal file |
23642
7fd1a6c27e60
largefiles: don't duplicate 'actions' into 'actionbyfile'
Martin von Zweigbergk <martinvonz@google.com>
parents:
23641
diff
changeset
|
566 actions[lfile] = ('g', largs, 'replaces standin') |
7fd1a6c27e60
largefiles: don't duplicate 'actions' into 'actionbyfile'
Martin von Zweigbergk <martinvonz@google.com>
parents:
23641
diff
changeset
|
567 actions[standin] = ('r', None, 'replaced by non-standin') |
15663
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
568 |
23642
7fd1a6c27e60
largefiles: don't duplicate 'actions' into 'actionbyfile'
Martin von Zweigbergk <martinvonz@google.com>
parents:
23641
diff
changeset
|
569 return actions, diverge, renamedelete |
15663
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
570 |
41062
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
571 @eh.wrapfunction(merge, 'recordupdates') |
22196
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22194
diff
changeset
|
572 def mergerecordupdates(orig, repo, actions, branchmerge): |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22194
diff
changeset
|
573 if 'lfmr' in actions: |
23695
997a96cf6344
largefiles: mark lfile as added in lfdirstate when the standin is added
Mads Kiilerich <madski@unity3d.com>
parents:
23619
diff
changeset
|
574 lfdirstate = lfutil.openlfdirstate(repo.ui, repo) |
22196
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22194
diff
changeset
|
575 for lfile, args, msg in actions['lfmr']: |
23695
997a96cf6344
largefiles: mark lfile as added in lfdirstate when the standin is added
Mads Kiilerich <madski@unity3d.com>
parents:
23619
diff
changeset
|
576 # this should be executed before 'orig', to execute 'remove' |
997a96cf6344
largefiles: mark lfile as added in lfdirstate when the standin is added
Mads Kiilerich <madski@unity3d.com>
parents:
23619
diff
changeset
|
577 # before all other actions |
22196
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22194
diff
changeset
|
578 repo.dirstate.remove(lfile) |
23695
997a96cf6344
largefiles: mark lfile as added in lfdirstate when the standin is added
Mads Kiilerich <madski@unity3d.com>
parents:
23619
diff
changeset
|
579 # make sure lfile doesn't get synclfdirstate'd as normal |
997a96cf6344
largefiles: mark lfile as added in lfdirstate when the standin is added
Mads Kiilerich <madski@unity3d.com>
parents:
23619
diff
changeset
|
580 lfdirstate.add(lfile) |
997a96cf6344
largefiles: mark lfile as added in lfdirstate when the standin is added
Mads Kiilerich <madski@unity3d.com>
parents:
23619
diff
changeset
|
581 lfdirstate.write() |
22196
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22194
diff
changeset
|
582 |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22194
diff
changeset
|
583 return orig(repo, actions, branchmerge) |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22194
diff
changeset
|
584 |
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
585 # Override filemerge to prompt the user about how they wish to merge |
20295
36333ff8c54d
largefiles: drop redundant special handling of merges of renames
Mads Kiilerich <madski@unity3d.com>
parents:
20156
diff
changeset
|
586 # largefiles. This will handle identical edits without prompting the user. |
41062
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
587 @eh.wrapfunction(filemerge, '_filemerge') |
34122
c0ce60459d84
merge: pass wctx to premerge, filemerge
Phil Cohen <phillco@fb.com>
parents:
33499
diff
changeset
|
588 def overridefilemerge(origfn, premerge, repo, wctx, mynode, orig, fcd, fco, fca, |
26607
45a6233d5f50
filemerge: introduce a premerge flag and function
Siddharth Agarwal <sid0@fb.com>
parents:
26606
diff
changeset
|
589 labels=None): |
27050
df9b73d2d444
largefiles: fall back to the original for change/delete conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
27034
diff
changeset
|
590 if not lfutil.isstandin(orig) or fcd.isabsent() or fco.isabsent(): |
34122
c0ce60459d84
merge: pass wctx to premerge, filemerge
Phil Cohen <phillco@fb.com>
parents:
33499
diff
changeset
|
591 return origfn(premerge, repo, wctx, mynode, orig, fcd, fco, fca, |
26607
45a6233d5f50
filemerge: introduce a premerge flag and function
Siddharth Agarwal <sid0@fb.com>
parents:
26606
diff
changeset
|
592 labels=labels) |
20298
9d350fa0708e
largefiles: stylistic cleanup of filemerge
Mads Kiilerich <madski@unity3d.com>
parents:
20297
diff
changeset
|
593 |
31740
a40e979b9d97
largefiles: use readasstandin() to read hex hash directly from filectx
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31735
diff
changeset
|
594 ahash = lfutil.readasstandin(fca).lower() |
a40e979b9d97
largefiles: use readasstandin() to read hex hash directly from filectx
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31735
diff
changeset
|
595 dhash = lfutil.readasstandin(fcd).lower() |
a40e979b9d97
largefiles: use readasstandin() to read hex hash directly from filectx
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31735
diff
changeset
|
596 ohash = lfutil.readasstandin(fco).lower() |
20994
40800668e019
largefiles: don't prompt when one side of merge was changed but didn't change
Mads Kiilerich <madski@unity3d.com>
parents:
20638
diff
changeset
|
597 if (ohash != ahash and |
40800668e019
largefiles: don't prompt when one side of merge was changed but didn't change
Mads Kiilerich <madski@unity3d.com>
parents:
20638
diff
changeset
|
598 ohash != dhash and |
40800668e019
largefiles: don't prompt when one side of merge was changed but didn't change
Mads Kiilerich <madski@unity3d.com>
parents:
20638
diff
changeset
|
599 (dhash == ahash or |
40800668e019
largefiles: don't prompt when one side of merge was changed but didn't change
Mads Kiilerich <madski@unity3d.com>
parents:
20638
diff
changeset
|
600 repo.ui.promptchoice( |
40800668e019
largefiles: don't prompt when one side of merge was changed but didn't change
Mads Kiilerich <madski@unity3d.com>
parents:
20638
diff
changeset
|
601 _('largefile %s has a merge conflict\nancestor was %s\n' |
40800668e019
largefiles: don't prompt when one side of merge was changed but didn't change
Mads Kiilerich <madski@unity3d.com>
parents:
20638
diff
changeset
|
602 'keep (l)ocal %s or\ntake (o)ther %s?' |
40800668e019
largefiles: don't prompt when one side of merge was changed but didn't change
Mads Kiilerich <madski@unity3d.com>
parents:
20638
diff
changeset
|
603 '$$ &Local $$ &Other') % |
40800668e019
largefiles: don't prompt when one side of merge was changed but didn't change
Mads Kiilerich <madski@unity3d.com>
parents:
20638
diff
changeset
|
604 (lfutil.splitstandin(orig), ahash, dhash, ohash), |
40800668e019
largefiles: don't prompt when one side of merge was changed but didn't change
Mads Kiilerich <madski@unity3d.com>
parents:
20638
diff
changeset
|
605 0) == 1)): |
20298
9d350fa0708e
largefiles: stylistic cleanup of filemerge
Mads Kiilerich <madski@unity3d.com>
parents:
20297
diff
changeset
|
606 repo.wwrite(fcd.path(), fco.data(), fco.flags()) |
27034
86ede9eda252
filemerge: return whether the file was deleted
Siddharth Agarwal <sid0@fb.com>
parents:
26962
diff
changeset
|
607 return True, 0, False |
15168 | 608 |
41062
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
609 @eh.wrapfunction(copiesmod, 'pathcopies') |
24782
4906dc0e038c
copies: add matcher parameter to copy logic
Durham Goode <durham@fb.com>
parents:
24680
diff
changeset
|
610 def copiespathcopies(orig, ctx1, ctx2, match=None): |
4906dc0e038c
copies: add matcher parameter to copy logic
Durham Goode <durham@fb.com>
parents:
24680
diff
changeset
|
611 copies = orig(ctx1, ctx2, match=match) |
24230
23438bceba04
largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents:
24208
diff
changeset
|
612 updated = {} |
23438bceba04
largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents:
24208
diff
changeset
|
613 |
23438bceba04
largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents:
24208
diff
changeset
|
614 for k, v in copies.iteritems(): |
23438bceba04
largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents:
24208
diff
changeset
|
615 updated[lfutil.splitstandin(k) or k] = lfutil.splitstandin(v) or v |
23438bceba04
largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents:
24208
diff
changeset
|
616 |
23438bceba04
largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents:
24208
diff
changeset
|
617 return updated |
23438bceba04
largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents:
24208
diff
changeset
|
618 |
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
619 # 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
|
620 # 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
|
621 # 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
|
622 # 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
|
623 # dirstate updated. |
41062
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
624 @eh.wrapfunction(cmdutil, 'copy') |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
625 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
|
626 # doesn't remove largefile on rename |
15168 | 627 if len(pats) < 2: |
628 # this isn't legal, let the original function deal with it | |
629 return orig(ui, repo, pats, opts, rename) | |
630 | |
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
631 # 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
|
632 # 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
|
633 # 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
|
634 # match largefiles and run it again. |
15168 | 635 nonormalfiles = False |
636 nolfiles = False | |
21091
dd584d1a75e7
largefiles: copy override, install matchfn outside the try/except restoring it
Mads Kiilerich <madski@unity3d.com>
parents:
21090
diff
changeset
|
637 installnormalfilesmatchfn(repo[None].manifest()) |
15168 | 638 try: |
25079
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
639 result = orig(ui, repo, pats, opts, rename) |
26587
56b2bcea2529
error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26427
diff
changeset
|
640 except error.Abort as e: |
36653
2f7a3c90c0d7
py3: use pycompat.bytestr() to convert error messages to bytes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36400
diff
changeset
|
641 if pycompat.bytestr(e) != _('no files to copy'): |
25079
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
642 raise e |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
643 else: |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
644 nonormalfiles = True |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
645 result = 0 |
15168 | 646 finally: |
647 restorematchfn() | |
648 | |
649 # The first rename can cause our current working directory to be removed. | |
650 # In that case there is nothing left to copy/rename so just quit. | |
651 try: | |
652 repo.getcwd() | |
653 except OSError: | |
654 return result | |
655 | |
24006
42fa7eeb858e
largefiles: use the core file copy logic to validate the destination path
Matt Harbison <matt_harbison@yahoo.com>
parents:
23976
diff
changeset
|
656 def makestandin(relpath): |
42fa7eeb858e
largefiles: use the core file copy logic to validate the destination path
Matt Harbison <matt_harbison@yahoo.com>
parents:
23976
diff
changeset
|
657 path = pathutil.canonpath(repo.root, repo.getcwd(), relpath) |
28715
a7f7b7acf489
largefiles: replace invocation of os.path module by vfs in overrides.py
liscju <piotr.listkiewicz@gmail.com>
parents:
28394
diff
changeset
|
658 return repo.wvfs.join(lfutil.standin(path)) |
24006
42fa7eeb858e
largefiles: use the core file copy logic to validate the destination path
Matt Harbison <matt_harbison@yahoo.com>
parents:
23976
diff
changeset
|
659 |
42fa7eeb858e
largefiles: use the core file copy logic to validate the destination path
Matt Harbison <matt_harbison@yahoo.com>
parents:
23976
diff
changeset
|
660 fullpats = scmutil.expandpats(pats) |
42fa7eeb858e
largefiles: use the core file copy logic to validate the destination path
Matt Harbison <matt_harbison@yahoo.com>
parents:
23976
diff
changeset
|
661 dest = fullpats[-1] |
42fa7eeb858e
largefiles: use the core file copy logic to validate the destination path
Matt Harbison <matt_harbison@yahoo.com>
parents:
23976
diff
changeset
|
662 |
42fa7eeb858e
largefiles: use the core file copy logic to validate the destination path
Matt Harbison <matt_harbison@yahoo.com>
parents:
23976
diff
changeset
|
663 if os.path.isdir(dest): |
42fa7eeb858e
largefiles: use the core file copy logic to validate the destination path
Matt Harbison <matt_harbison@yahoo.com>
parents:
23976
diff
changeset
|
664 if not os.path.isdir(makestandin(dest)): |
42fa7eeb858e
largefiles: use the core file copy logic to validate the destination path
Matt Harbison <matt_harbison@yahoo.com>
parents:
23976
diff
changeset
|
665 os.makedirs(makestandin(dest)) |
42fa7eeb858e
largefiles: use the core file copy logic to validate the destination path
Matt Harbison <matt_harbison@yahoo.com>
parents:
23976
diff
changeset
|
666 |
15168 | 667 try: |
25079
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
668 # When we call orig below it creates the standins but we don't add |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
669 # them to the dir state until later so lock during that time. |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
670 wlock = repo.wlock() |
15168 | 671 |
25079
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
672 manifest = repo[None].manifest() |
26341
f46e7f3b70af
largefiles: remove a mutable default argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26340
diff
changeset
|
673 def overridematch(ctx, pats=(), opts=None, globbed=False, |
25467
f64dbe06f3d0
scmutil: add an optional parameter to matcher factories for a bad() override
Matt Harbison <matt_harbison@yahoo.com>
parents:
25440
diff
changeset
|
674 default='relpath', badfn=None): |
26341
f46e7f3b70af
largefiles: remove a mutable default argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26340
diff
changeset
|
675 if opts is None: |
f46e7f3b70af
largefiles: remove a mutable default argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26340
diff
changeset
|
676 opts = {} |
25079
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
677 newpats = [] |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
678 # The patterns were previously mangled to add the standin |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
679 # directory; we need to remove that now |
15168 | 680 for pat in pats: |
29318
2572bb2e06f8
largefiles: rename match_ to matchmod import in overrides
liscju <piotr.listkiewicz@gmail.com>
parents:
29311
diff
changeset
|
681 if matchmod.patkind(pat) is None and lfutil.shortname in pat: |
25079
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
682 newpats.append(pat.replace(lfutil.shortname, '')) |
15168 | 683 else: |
25079
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
684 newpats.append(pat) |
25467
f64dbe06f3d0
scmutil: add an optional parameter to matcher factories for a bad() override
Matt Harbison <matt_harbison@yahoo.com>
parents:
25440
diff
changeset
|
685 match = oldmatch(ctx, newpats, opts, globbed, default, badfn=badfn) |
25079
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
686 m = copy.copy(match) |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
687 lfile = lambda f: lfutil.standin(f) in manifest |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
688 m._files = [lfutil.standin(f) for f in m._files if lfile(f)] |
32322
23c9a2a71c6e
match: make _fileroots a @propertycache and rename it to _fileset
Martin von Zweigbergk <martinvonz@google.com>
parents:
32308
diff
changeset
|
689 m._fileset = set(m._files) |
25079
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
690 origmatchfn = m.matchfn |
31613
5c1d3f1b8f44
largefiles: omit redundant isstandin() before splitstandin()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31309
diff
changeset
|
691 def matchfn(f): |
5c1d3f1b8f44
largefiles: omit redundant isstandin() before splitstandin()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31309
diff
changeset
|
692 lfile = lfutil.splitstandin(f) |
5c1d3f1b8f44
largefiles: omit redundant isstandin() before splitstandin()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31309
diff
changeset
|
693 return (lfile is not None and |
5c1d3f1b8f44
largefiles: omit redundant isstandin() before splitstandin()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31309
diff
changeset
|
694 (f in manifest) and |
5c1d3f1b8f44
largefiles: omit redundant isstandin() before splitstandin()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31309
diff
changeset
|
695 origmatchfn(lfile) or |
5c1d3f1b8f44
largefiles: omit redundant isstandin() before splitstandin()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31309
diff
changeset
|
696 None) |
5c1d3f1b8f44
largefiles: omit redundant isstandin() before splitstandin()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31309
diff
changeset
|
697 m.matchfn = matchfn |
25079
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
698 return m |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
699 oldmatch = installmatchfn(overridematch) |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
700 listpats = [] |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
701 for pat in pats: |
29318
2572bb2e06f8
largefiles: rename match_ to matchmod import in overrides
liscju <piotr.listkiewicz@gmail.com>
parents:
29311
diff
changeset
|
702 if matchmod.patkind(pat) is not None: |
25079
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
703 listpats.append(pat) |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
704 else: |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
705 listpats.append(makestandin(pat)) |
15168 | 706 |
25079
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
707 try: |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
708 origcopyfile = util.copyfile |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
709 copiedfiles = [] |
37088
08890706366e
copyfile: preserve stat info (mtime, etc.) when doing copies/renames
Kyle Lippincott <spectral@google.com>
parents:
36939
diff
changeset
|
710 def overridecopyfile(src, dest, *args, **kwargs): |
15598
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15576
diff
changeset
|
711 if (lfutil.shortname in src and |
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15576
diff
changeset
|
712 dest.startswith(repo.wjoin(lfutil.shortname))): |
25079
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
713 destlfile = dest.replace(lfutil.shortname, '') |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
714 if not opts['force'] and os.path.exists(destlfile): |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
715 raise IOError('', |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
716 _('destination largefile already exists')) |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
717 copiedfiles.append((src, dest)) |
37088
08890706366e
copyfile: preserve stat info (mtime, etc.) when doing copies/renames
Kyle Lippincott <spectral@google.com>
parents:
36939
diff
changeset
|
718 origcopyfile(src, dest, *args, **kwargs) |
25079
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
719 |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
720 util.copyfile = overridecopyfile |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
721 result += orig(ui, repo, listpats, opts, rename) |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
722 finally: |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
723 util.copyfile = origcopyfile |
21196
5c0d5b95b824
largefiles: remove directories emptied after their files are moved (issue3515)
Matt Harbison <matt_harbison@yahoo.com>
parents:
21110
diff
changeset
|
724 |
25079
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
725 lfdirstate = lfutil.openlfdirstate(ui, repo) |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
726 for (src, dest) in copiedfiles: |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
727 if (lfutil.shortname in src and |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
728 dest.startswith(repo.wjoin(lfutil.shortname))): |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
729 srclfile = src.replace(repo.wjoin(lfutil.standin('')), '') |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
730 destlfile = dest.replace(repo.wjoin(lfutil.standin('')), '') |
28715
a7f7b7acf489
largefiles: replace invocation of os.path module by vfs in overrides.py
liscju <piotr.listkiewicz@gmail.com>
parents:
28394
diff
changeset
|
731 destlfiledir = repo.wvfs.dirname(repo.wjoin(destlfile)) or '.' |
25079
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
732 if not os.path.isdir(destlfiledir): |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
733 os.makedirs(destlfiledir) |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
734 if rename: |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
735 os.rename(repo.wjoin(srclfile), repo.wjoin(destlfile)) |
17245
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17232
diff
changeset
|
736 |
25079
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
737 # The file is gone, but this deletes any empty parent |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
738 # directories as a side-effect. |
31309
8908f985570c
vfs: use repo.wvfs.unlinkpath
Mads Kiilerich <madski@unity3d.com>
parents:
31099
diff
changeset
|
739 repo.wvfs.unlinkpath(srclfile, ignoremissing=True) |
25079
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
740 lfdirstate.remove(srclfile) |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
741 else: |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
742 util.copyfile(repo.wjoin(srclfile), |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
743 repo.wjoin(destlfile)) |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
744 |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
745 lfdirstate.add(destlfile) |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
746 lfdirstate.write() |
26587
56b2bcea2529
error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26427
diff
changeset
|
747 except error.Abort as e: |
36653
2f7a3c90c0d7
py3: use pycompat.bytestr() to convert error messages to bytes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36400
diff
changeset
|
748 if pycompat.bytestr(e) != _('no files to copy'): |
25079
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
749 raise e |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
750 else: |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
24954
diff
changeset
|
751 nolfiles = True |
15168 | 752 finally: |
753 restorematchfn() | |
754 wlock.release() | |
755 | |
756 if nolfiles and nonormalfiles: | |
26587
56b2bcea2529
error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26427
diff
changeset
|
757 raise error.Abort(_('no files to copy')) |
15168 | 758 |
759 return result | |
760 | |
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
761 # 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
|
762 # 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
|
763 # 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
|
764 # the necessary largefiles. |
15168 | 765 # |
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
766 # 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
|
767 # 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
|
768 # the matcher to hit standins instead of largefiles. Based on the |
21094
4643bfec2485
largefiles: simplify revert - use getstandinsstate like other commands do
Mads Kiilerich <madski@unity3d.com>
parents:
21093
diff
changeset
|
769 # resulting standins update the largefiles. |
41062
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
770 @eh.wrapfunction(cmdutil, 'revert') |
24436
66a69da9cde4
largefiles: override cmdutil.revert() instead of comands.revert()
Martin von Zweigbergk <martinvonz@google.com>
parents:
24336
diff
changeset
|
771 def overriderevert(orig, ui, repo, ctx, parents, *pats, **opts): |
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
772 # 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
|
773 # 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
|
774 # prevent others from changing them in their incorrect state. |
27823
37552634a7b9
with: use context manager for wlock in overriderevert
Bryan O'Sullivan <bryano@fb.com>
parents:
27822
diff
changeset
|
775 with repo.wlock(): |
15168 | 776 lfdirstate = lfutil.openlfdirstate(ui, repo) |
23039
1350b9170089
largefiles: remove confusing rev parameter for lfdirstatestatus
Mads Kiilerich <madski@unity3d.com>
parents:
23038
diff
changeset
|
777 s = lfutil.lfdirstatestatus(lfdirstate, repo) |
18140
e388273f3ad1
largefiles revert: update lfdirstate with result from first cleanliness check
Mads Kiilerich <madski@unity3d.com>
parents:
17894
diff
changeset
|
778 lfdirstate.write() |
22919
1982bdb7e2cc
largefiles: access status fields by name rather than index
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22914
diff
changeset
|
779 for lfile in s.modified: |
31659
0eec36112e58
largefiles: add lfile argument to updatestandin() for efficiency (API)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31656
diff
changeset
|
780 lfutil.updatestandin(repo, lfile, lfutil.standin(lfile)) |
22919
1982bdb7e2cc
largefiles: access status fields by name rather than index
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22914
diff
changeset
|
781 for lfile in s.deleted: |
31618
8228bc8fed8c
largefiles: avoid redundant standin() invocations
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31617
diff
changeset
|
782 fstandin = lfutil.standin(lfile) |
8228bc8fed8c
largefiles: avoid redundant standin() invocations
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31617
diff
changeset
|
783 if (repo.wvfs.exists(fstandin)): |
8228bc8fed8c
largefiles: avoid redundant standin() invocations
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31617
diff
changeset
|
784 repo.wvfs.unlink(fstandin) |
15168 | 785 |
21094
4643bfec2485
largefiles: simplify revert - use getstandinsstate like other commands do
Mads Kiilerich <madski@unity3d.com>
parents:
21093
diff
changeset
|
786 oldstandins = lfutil.getstandinsstate(repo) |
4643bfec2485
largefiles: simplify revert - use getstandinsstate like other commands do
Mads Kiilerich <madski@unity3d.com>
parents:
21093
diff
changeset
|
787 |
26343
019559aa2e80
largefiles: remove a mutable default argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26342
diff
changeset
|
788 def overridematch(mctx, pats=(), opts=None, globbed=False, |
25467
f64dbe06f3d0
scmutil: add an optional parameter to matcher factories for a bad() override
Matt Harbison <matt_harbison@yahoo.com>
parents:
25440
diff
changeset
|
789 default='relpath', badfn=None): |
26343
019559aa2e80
largefiles: remove a mutable default argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26342
diff
changeset
|
790 if opts is None: |
019559aa2e80
largefiles: remove a mutable default argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26342
diff
changeset
|
791 opts = {} |
25467
f64dbe06f3d0
scmutil: add an optional parameter to matcher factories for a bad() override
Matt Harbison <matt_harbison@yahoo.com>
parents:
25440
diff
changeset
|
792 match = oldmatch(mctx, pats, opts, globbed, default, badfn=badfn) |
21095
ec309395aa45
largefiles: revert override, install matchfn outside the try/except restoring it
Mads Kiilerich <madski@unity3d.com>
parents:
21094
diff
changeset
|
793 m = copy.copy(match) |
24133
79c2c29c71ae
largefiles: don't warn when reverting a forgotten largefile
Matt Harbison <matt_harbison@yahoo.com>
parents:
24029
diff
changeset
|
794 |
79c2c29c71ae
largefiles: don't warn when reverting a forgotten largefile
Matt Harbison <matt_harbison@yahoo.com>
parents:
24029
diff
changeset
|
795 # revert supports recursing into subrepos, and though largefiles |
79c2c29c71ae
largefiles: don't warn when reverting a forgotten largefile
Matt Harbison <matt_harbison@yahoo.com>
parents:
24029
diff
changeset
|
796 # currently doesn't work correctly in that case, this match is |
79c2c29c71ae
largefiles: don't warn when reverting a forgotten largefile
Matt Harbison <matt_harbison@yahoo.com>
parents:
24029
diff
changeset
|
797 # called, so the lfdirstate above may not be the correct one for |
79c2c29c71ae
largefiles: don't warn when reverting a forgotten largefile
Matt Harbison <matt_harbison@yahoo.com>
parents:
24029
diff
changeset
|
798 # this invocation of match. |
24436
66a69da9cde4
largefiles: override cmdutil.revert() instead of comands.revert()
Martin von Zweigbergk <martinvonz@google.com>
parents:
24336
diff
changeset
|
799 lfdirstate = lfutil.openlfdirstate(mctx.repo().ui, mctx.repo(), |
66a69da9cde4
largefiles: override cmdutil.revert() instead of comands.revert()
Martin von Zweigbergk <martinvonz@google.com>
parents:
24336
diff
changeset
|
800 False) |
24133
79c2c29c71ae
largefiles: don't warn when reverting a forgotten largefile
Matt Harbison <matt_harbison@yahoo.com>
parents:
24029
diff
changeset
|
801 |
31654
1af4a1641bdb
largefiles: avoid redundant changectx looking up at each repetitions
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31653
diff
changeset
|
802 wctx = repo[None] |
31656
0192aa8626c1
largefiles: avoid redundant loop to eliminate None from list
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31655
diff
changeset
|
803 matchfiles = [] |
0192aa8626c1
largefiles: avoid redundant loop to eliminate None from list
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31655
diff
changeset
|
804 for f in m._files: |
24437
2703eb73a3af
largefiles: extract and reuse 'standin' variable in overriderevert()
Martin von Zweigbergk <martinvonz@google.com>
parents:
24436
diff
changeset
|
805 standin = lfutil.standin(f) |
24438
5b85a5bc5bbb
revert: evaluate filesets against working directory (issue4497)
Martin von Zweigbergk <martinvonz@google.com>
parents:
24437
diff
changeset
|
806 if standin in ctx or standin in mctx: |
31656
0192aa8626c1
largefiles: avoid redundant loop to eliminate None from list
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31655
diff
changeset
|
807 matchfiles.append(standin) |
31654
1af4a1641bdb
largefiles: avoid redundant changectx looking up at each repetitions
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31653
diff
changeset
|
808 elif standin in wctx or lfdirstate[f] == 'r': |
31656
0192aa8626c1
largefiles: avoid redundant loop to eliminate None from list
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31655
diff
changeset
|
809 continue |
0192aa8626c1
largefiles: avoid redundant loop to eliminate None from list
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31655
diff
changeset
|
810 else: |
0192aa8626c1
largefiles: avoid redundant loop to eliminate None from list
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31655
diff
changeset
|
811 matchfiles.append(f) |
0192aa8626c1
largefiles: avoid redundant loop to eliminate None from list
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31655
diff
changeset
|
812 m._files = matchfiles |
32322
23c9a2a71c6e
match: make _fileroots a @propertycache and rename it to _fileset
Martin von Zweigbergk <martinvonz@google.com>
parents:
32308
diff
changeset
|
813 m._fileset = set(m._files) |
21095
ec309395aa45
largefiles: revert override, install matchfn outside the try/except restoring it
Mads Kiilerich <madski@unity3d.com>
parents:
21094
diff
changeset
|
814 origmatchfn = m.matchfn |
ec309395aa45
largefiles: revert override, install matchfn outside the try/except restoring it
Mads Kiilerich <madski@unity3d.com>
parents:
21094
diff
changeset
|
815 def matchfn(f): |
31613
5c1d3f1b8f44
largefiles: omit redundant isstandin() before splitstandin()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31309
diff
changeset
|
816 lfile = lfutil.splitstandin(f) |
5c1d3f1b8f44
largefiles: omit redundant isstandin() before splitstandin()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31309
diff
changeset
|
817 if lfile is not None: |
5c1d3f1b8f44
largefiles: omit redundant isstandin() before splitstandin()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31309
diff
changeset
|
818 return (origmatchfn(lfile) and |
24438
5b85a5bc5bbb
revert: evaluate filesets against working directory (issue4497)
Martin von Zweigbergk <martinvonz@google.com>
parents:
24437
diff
changeset
|
819 (f in ctx or f in mctx)) |
21095
ec309395aa45
largefiles: revert override, install matchfn outside the try/except restoring it
Mads Kiilerich <madski@unity3d.com>
parents:
21094
diff
changeset
|
820 return origmatchfn(f) |
ec309395aa45
largefiles: revert override, install matchfn outside the try/except restoring it
Mads Kiilerich <madski@unity3d.com>
parents:
21094
diff
changeset
|
821 m.matchfn = matchfn |
ec309395aa45
largefiles: revert override, install matchfn outside the try/except restoring it
Mads Kiilerich <madski@unity3d.com>
parents:
21094
diff
changeset
|
822 return m |
ec309395aa45
largefiles: revert override, install matchfn outside the try/except restoring it
Mads Kiilerich <madski@unity3d.com>
parents:
21094
diff
changeset
|
823 oldmatch = installmatchfn(overridematch) |
15168 | 824 try: |
24436
66a69da9cde4
largefiles: override cmdutil.revert() instead of comands.revert()
Martin von Zweigbergk <martinvonz@google.com>
parents:
24336
diff
changeset
|
825 orig(ui, repo, ctx, parents, *pats, **opts) |
15168 | 826 finally: |
827 restorematchfn() | |
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
828 |
21094
4643bfec2485
largefiles: simplify revert - use getstandinsstate like other commands do
Mads Kiilerich <madski@unity3d.com>
parents:
21093
diff
changeset
|
829 newstandins = lfutil.getstandinsstate(repo) |
4643bfec2485
largefiles: simplify revert - use getstandinsstate like other commands do
Mads Kiilerich <madski@unity3d.com>
parents:
21093
diff
changeset
|
830 filelist = lfutil.getlfilestoupdate(oldstandins, newstandins) |
21934
0cb34b3991f8
largefiles: use "normallookup" on "lfdirstate" while reverting
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21884
diff
changeset
|
831 # lfdirstate should be 'normallookup'-ed for updated files, |
0cb34b3991f8
largefiles: use "normallookup" on "lfdirstate" while reverting
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21884
diff
changeset
|
832 # because reverting doesn't touch dirstate for 'normal' files |
0cb34b3991f8
largefiles: use "normallookup" on "lfdirstate" while reverting
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21884
diff
changeset
|
833 # when target revision is explicitly specified: in such case, |
0cb34b3991f8
largefiles: use "normallookup" on "lfdirstate" while reverting
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21884
diff
changeset
|
834 # 'n' and valid timestamp in dirstate doesn't ensure 'clean' |
0cb34b3991f8
largefiles: use "normallookup" on "lfdirstate" while reverting
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21884
diff
changeset
|
835 # of target (standin) file. |
0cb34b3991f8
largefiles: use "normallookup" on "lfdirstate" while reverting
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21884
diff
changeset
|
836 lfcommands.updatelfiles(ui, repo, filelist, printmessage=False, |
0cb34b3991f8
largefiles: use "normallookup" on "lfdirstate" while reverting
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21884
diff
changeset
|
837 normallookup=True) |
21094
4643bfec2485
largefiles: simplify revert - use getstandinsstate like other commands do
Mads Kiilerich <madski@unity3d.com>
parents:
21093
diff
changeset
|
838 |
23183
51c9196a6bd0
largefiles: remove meaningless code path for "hg pull --rebase"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23145
diff
changeset
|
839 # after pulling changesets, we need to take some extra care to get |
51c9196a6bd0
largefiles: remove meaningless code path for "hg pull --rebase"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23145
diff
changeset
|
840 # largefiles updated remotely |
41061
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
841 @eh.wrapcommand('pull', |
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
842 opts=[('', 'all-largefiles', None, |
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
843 _('download all pulled versions of largefiles (DEPRECATED)')), |
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
844 ('', 'lfrev', [], |
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
845 _('download largefiles for these revisions'), _('REV'))]) |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
846 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
|
847 revsprepull = len(repo) |
18977
864232481e76
largefiles: refactor overridepull internals
Mads Kiilerich <madski@unity3d.com>
parents:
18974
diff
changeset
|
848 if not source: |
864232481e76
largefiles: refactor overridepull internals
Mads Kiilerich <madski@unity3d.com>
parents:
18974
diff
changeset
|
849 source = 'default' |
864232481e76
largefiles: refactor overridepull internals
Mads Kiilerich <madski@unity3d.com>
parents:
18974
diff
changeset
|
850 repo.lfpullsource = source |
23183
51c9196a6bd0
largefiles: remove meaningless code path for "hg pull --rebase"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23145
diff
changeset
|
851 result = orig(ui, repo, source, **opts) |
18977
864232481e76
largefiles: refactor overridepull internals
Mads Kiilerich <madski@unity3d.com>
parents:
18974
diff
changeset
|
852 revspostpull = len(repo) |
35348
576ba8194fa8
py3: handle keyword arguments correctly in hgext/largefiles/
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35303
diff
changeset
|
853 lfrevs = opts.get(r'lfrev', []) |
576ba8194fa8
py3: handle keyword arguments correctly in hgext/largefiles/
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35303
diff
changeset
|
854 if opts.get(r'all_largefiles'): |
18981
83ead8cb0ff2
largefiles: implement pull --all-largefiles as a special case of --lfrev
Mads Kiilerich <madski@unity3d.com>
parents:
18980
diff
changeset
|
855 lfrevs.append('pulled()') |
18978
8abaadab9abb
largefiles: introduce pull --lfrev option
Mads Kiilerich <madski@unity3d.com>
parents:
18977
diff
changeset
|
856 if lfrevs and revspostpull > revsprepull: |
8abaadab9abb
largefiles: introduce pull --lfrev option
Mads Kiilerich <madski@unity3d.com>
parents:
18977
diff
changeset
|
857 numcached = 0 |
18979
1176832fc757
largefiles: introduce pulled() revset expression for use in --lfrev
Mads Kiilerich <madski@unity3d.com>
parents:
18978
diff
changeset
|
858 repo.firstpulled = revsprepull # for pulled() revset expression |
1176832fc757
largefiles: introduce pulled() revset expression for use in --lfrev
Mads Kiilerich <madski@unity3d.com>
parents:
18978
diff
changeset
|
859 try: |
1176832fc757
largefiles: introduce pulled() revset expression for use in --lfrev
Mads Kiilerich <madski@unity3d.com>
parents:
18978
diff
changeset
|
860 for rev in scmutil.revrange(repo, lfrevs): |
36736
5c72b52d3dd0
largefiles: use %d instead of %s to process ints
Augie Fackler <augie@google.com>
parents:
36653
diff
changeset
|
861 ui.note(_('pulling largefiles for revision %d\n') % rev) |
18979
1176832fc757
largefiles: introduce pulled() revset expression for use in --lfrev
Mads Kiilerich <madski@unity3d.com>
parents:
18978
diff
changeset
|
862 (cached, missing) = lfcommands.cachelfiles(ui, repo, rev) |
1176832fc757
largefiles: introduce pulled() revset expression for use in --lfrev
Mads Kiilerich <madski@unity3d.com>
parents:
18978
diff
changeset
|
863 numcached += len(cached) |
1176832fc757
largefiles: introduce pulled() revset expression for use in --lfrev
Mads Kiilerich <madski@unity3d.com>
parents:
18978
diff
changeset
|
864 finally: |
1176832fc757
largefiles: introduce pulled() revset expression for use in --lfrev
Mads Kiilerich <madski@unity3d.com>
parents:
18978
diff
changeset
|
865 del repo.firstpulled |
18978
8abaadab9abb
largefiles: introduce pull --lfrev option
Mads Kiilerich <madski@unity3d.com>
parents:
18977
diff
changeset
|
866 ui.status(_("%d largefiles cached\n") % numcached) |
15168 | 867 return result |
868 | |
41061
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
869 @eh.wrapcommand('push', |
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
870 opts=[('', 'lfrev', [], |
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
871 _('upload largefiles for these revisions'), _('REV'))]) |
28878
a75c9665ef06
largefiles: introduce push --lfrev to control which revisions are pushed
Mads Kiilerich <madski@unity3d.com>
parents:
28715
diff
changeset
|
872 def overridepush(orig, ui, repo, *args, **kwargs): |
a75c9665ef06
largefiles: introduce push --lfrev to control which revisions are pushed
Mads Kiilerich <madski@unity3d.com>
parents:
28715
diff
changeset
|
873 """Override push command and store --lfrev parameters in opargs""" |
35348
576ba8194fa8
py3: handle keyword arguments correctly in hgext/largefiles/
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35303
diff
changeset
|
874 lfrevs = kwargs.pop(r'lfrev', None) |
28878
a75c9665ef06
largefiles: introduce push --lfrev to control which revisions are pushed
Mads Kiilerich <madski@unity3d.com>
parents:
28715
diff
changeset
|
875 if lfrevs: |
36400
7b86aa31b004
py3: fix handling of keyword arguments at more places
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36315
diff
changeset
|
876 opargs = kwargs.setdefault(r'opargs', {}) |
28878
a75c9665ef06
largefiles: introduce push --lfrev to control which revisions are pushed
Mads Kiilerich <madski@unity3d.com>
parents:
28715
diff
changeset
|
877 opargs['lfrevs'] = scmutil.revrange(repo, lfrevs) |
a75c9665ef06
largefiles: introduce push --lfrev to control which revisions are pushed
Mads Kiilerich <madski@unity3d.com>
parents:
28715
diff
changeset
|
878 return orig(ui, repo, *args, **kwargs) |
a75c9665ef06
largefiles: introduce push --lfrev to control which revisions are pushed
Mads Kiilerich <madski@unity3d.com>
parents:
28715
diff
changeset
|
879 |
41062
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
880 @eh.wrapfunction(exchange, 'pushoperation') |
28878
a75c9665ef06
largefiles: introduce push --lfrev to control which revisions are pushed
Mads Kiilerich <madski@unity3d.com>
parents:
28715
diff
changeset
|
881 def exchangepushoperation(orig, *args, **kwargs): |
a75c9665ef06
largefiles: introduce push --lfrev to control which revisions are pushed
Mads Kiilerich <madski@unity3d.com>
parents:
28715
diff
changeset
|
882 """Override pushoperation constructor and store lfrevs parameter""" |
35348
576ba8194fa8
py3: handle keyword arguments correctly in hgext/largefiles/
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35303
diff
changeset
|
883 lfrevs = kwargs.pop(r'lfrevs', None) |
28878
a75c9665ef06
largefiles: introduce push --lfrev to control which revisions are pushed
Mads Kiilerich <madski@unity3d.com>
parents:
28715
diff
changeset
|
884 pushop = orig(*args, **kwargs) |
a75c9665ef06
largefiles: introduce push --lfrev to control which revisions are pushed
Mads Kiilerich <madski@unity3d.com>
parents:
28715
diff
changeset
|
885 pushop.lfrevs = lfrevs |
a75c9665ef06
largefiles: introduce push --lfrev to control which revisions are pushed
Mads Kiilerich <madski@unity3d.com>
parents:
28715
diff
changeset
|
886 return pushop |
a75c9665ef06
largefiles: introduce push --lfrev to control which revisions are pushed
Mads Kiilerich <madski@unity3d.com>
parents:
28715
diff
changeset
|
887 |
41067
f2601cbce209
largefiles: port revset registration to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41062
diff
changeset
|
888 @eh.revsetpredicate('pulled()') |
18979
1176832fc757
largefiles: introduce pulled() revset expression for use in --lfrev
Mads Kiilerich <madski@unity3d.com>
parents:
18978
diff
changeset
|
889 def pulledrevsetsymbol(repo, subset, x): |
27586
42910f9fffeb
revset: use delayregistrar to register predicate in extension easily
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
27345
diff
changeset
|
890 """Changesets that just has been pulled. |
18979
1176832fc757
largefiles: introduce pulled() revset expression for use in --lfrev
Mads Kiilerich <madski@unity3d.com>
parents:
18978
diff
changeset
|
891 |
1176832fc757
largefiles: introduce pulled() revset expression for use in --lfrev
Mads Kiilerich <madski@unity3d.com>
parents:
18978
diff
changeset
|
892 Only available with largefiles from pull --lfrev expressions. |
1176832fc757
largefiles: introduce pulled() revset expression for use in --lfrev
Mads Kiilerich <madski@unity3d.com>
parents:
18978
diff
changeset
|
893 |
1176832fc757
largefiles: introduce pulled() revset expression for use in --lfrev
Mads Kiilerich <madski@unity3d.com>
parents:
18978
diff
changeset
|
894 .. container:: verbose |
1176832fc757
largefiles: introduce pulled() revset expression for use in --lfrev
Mads Kiilerich <madski@unity3d.com>
parents:
18978
diff
changeset
|
895 |
1176832fc757
largefiles: introduce pulled() revset expression for use in --lfrev
Mads Kiilerich <madski@unity3d.com>
parents:
18978
diff
changeset
|
896 Some examples: |
1176832fc757
largefiles: introduce pulled() revset expression for use in --lfrev
Mads Kiilerich <madski@unity3d.com>
parents:
18978
diff
changeset
|
897 |
1176832fc757
largefiles: introduce pulled() revset expression for use in --lfrev
Mads Kiilerich <madski@unity3d.com>
parents:
18978
diff
changeset
|
898 - pull largefiles for all new changesets:: |
1176832fc757
largefiles: introduce pulled() revset expression for use in --lfrev
Mads Kiilerich <madski@unity3d.com>
parents:
18978
diff
changeset
|
899 |
1176832fc757
largefiles: introduce pulled() revset expression for use in --lfrev
Mads Kiilerich <madski@unity3d.com>
parents:
18978
diff
changeset
|
900 hg pull -lfrev "pulled()" |
1176832fc757
largefiles: introduce pulled() revset expression for use in --lfrev
Mads Kiilerich <madski@unity3d.com>
parents:
18978
diff
changeset
|
901 |
1176832fc757
largefiles: introduce pulled() revset expression for use in --lfrev
Mads Kiilerich <madski@unity3d.com>
parents:
18978
diff
changeset
|
902 - pull largefiles for all new branch heads:: |
1176832fc757
largefiles: introduce pulled() revset expression for use in --lfrev
Mads Kiilerich <madski@unity3d.com>
parents:
18978
diff
changeset
|
903 |
1176832fc757
largefiles: introduce pulled() revset expression for use in --lfrev
Mads Kiilerich <madski@unity3d.com>
parents:
18978
diff
changeset
|
904 hg pull -lfrev "head(pulled()) and not closed()" |
1176832fc757
largefiles: introduce pulled() revset expression for use in --lfrev
Mads Kiilerich <madski@unity3d.com>
parents:
18978
diff
changeset
|
905 |
1176832fc757
largefiles: introduce pulled() revset expression for use in --lfrev
Mads Kiilerich <madski@unity3d.com>
parents:
18978
diff
changeset
|
906 """ |
1176832fc757
largefiles: introduce pulled() revset expression for use in --lfrev
Mads Kiilerich <madski@unity3d.com>
parents:
18978
diff
changeset
|
907 |
1176832fc757
largefiles: introduce pulled() revset expression for use in --lfrev
Mads Kiilerich <madski@unity3d.com>
parents:
18978
diff
changeset
|
908 try: |
1176832fc757
largefiles: introduce pulled() revset expression for use in --lfrev
Mads Kiilerich <madski@unity3d.com>
parents:
18978
diff
changeset
|
909 firstpulled = repo.firstpulled |
1176832fc757
largefiles: introduce pulled() revset expression for use in --lfrev
Mads Kiilerich <madski@unity3d.com>
parents:
18978
diff
changeset
|
910 except AttributeError: |
26587
56b2bcea2529
error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26427
diff
changeset
|
911 raise error.Abort(_("pulled() only available in --lfrev")) |
31023
aea06029919e
revset: import set classes directly from smartset module
Yuya Nishihara <yuya@tcha.org>
parents:
30215
diff
changeset
|
912 return smartset.baseset([r for r in subset if r >= firstpulled]) |
18979
1176832fc757
largefiles: introduce pulled() revset expression for use in --lfrev
Mads Kiilerich <madski@unity3d.com>
parents:
18978
diff
changeset
|
913 |
41061
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
914 @eh.wrapcommand('clone', |
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
915 opts=[('', 'all-largefiles', None, |
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
916 _('download all versions of all largefiles'))]) |
16644
98a9266db803
largefiles: add --all-largefiles flag to clone (issue3188)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16642
diff
changeset
|
917 def overrideclone(orig, ui, source, dest=None, **opts): |
17600
3a1c6b64e052
largefiles: don't convert dest=None to dest=hg.defaultdest() in clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17599
diff
changeset
|
918 d = dest |
3a1c6b64e052
largefiles: don't convert dest=None to dest=hg.defaultdest() in clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17599
diff
changeset
|
919 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:
17599
diff
changeset
|
920 d = hg.defaultdest(source) |
35348
576ba8194fa8
py3: handle keyword arguments correctly in hgext/largefiles/
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35303
diff
changeset
|
921 if opts.get(r'all_largefiles') and not hg.islocal(d): |
26587
56b2bcea2529
error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26427
diff
changeset
|
922 raise error.Abort(_( |
21096
a45ed365904a
i18n: fix "% inside _()" problem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21095
diff
changeset
|
923 '--all-largefiles is incompatible with non-local destination %s') % |
a45ed365904a
i18n: fix "% inside _()" problem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21095
diff
changeset
|
924 d) |
17601
6e2ab601be3f
largefiles: delegate to the wrapped clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17600
diff
changeset
|
925 |
6e2ab601be3f
largefiles: delegate to the wrapped clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17600
diff
changeset
|
926 return orig(ui, source, dest, **opts) |
6e2ab601be3f
largefiles: delegate to the wrapped clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17600
diff
changeset
|
927 |
41062
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
928 @eh.wrapfunction(hg, 'clone') |
17601
6e2ab601be3f
largefiles: delegate to the wrapped clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17600
diff
changeset
|
929 def hgclone(orig, ui, opts, *args, **kwargs): |
6e2ab601be3f
largefiles: delegate to the wrapped clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17600
diff
changeset
|
930 result = orig(ui, opts, *args, **kwargs) |
6e2ab601be3f
largefiles: delegate to the wrapped clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17600
diff
changeset
|
931 |
17824
221c9c3146eb
largefiles: always create the cache and standin directories when cloning
Matt Harbison <matt_harbison@yahoo.com>
parents:
17702
diff
changeset
|
932 if result is not None: |
16644
98a9266db803
largefiles: add --all-largefiles flag to clone (issue3188)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16642
diff
changeset
|
933 sourcerepo, destrepo = result |
17599
56136786000f
largefiles: restore caching of largefiles with 'clone -U --all-largefiles'
Matt Harbison <matt_harbison@yahoo.com>
parents:
17598
diff
changeset
|
934 repo = destrepo.local() |
56136786000f
largefiles: restore caching of largefiles with 'clone -U --all-largefiles'
Matt Harbison <matt_harbison@yahoo.com>
parents:
17598
diff
changeset
|
935 |
24812
e4e69cebeedd
largefiles: don't crash when cloning to a remote repo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24788
diff
changeset
|
936 # When cloning to a remote repo (like through SSH), no repo is available |
e4e69cebeedd
largefiles: don't crash when cloning to a remote repo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24788
diff
changeset
|
937 # from the peer. Therefore the largefiles can't be downloaded and the |
e4e69cebeedd
largefiles: don't crash when cloning to a remote repo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24788
diff
changeset
|
938 # hgrc can't be updated. |
e4e69cebeedd
largefiles: don't crash when cloning to a remote repo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24788
diff
changeset
|
939 if not repo: |
e4e69cebeedd
largefiles: don't crash when cloning to a remote repo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24788
diff
changeset
|
940 return result |
e4e69cebeedd
largefiles: don't crash when cloning to a remote repo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24788
diff
changeset
|
941 |
17599
56136786000f
largefiles: restore caching of largefiles with 'clone -U --all-largefiles'
Matt Harbison <matt_harbison@yahoo.com>
parents:
17598
diff
changeset
|
942 # 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
|
943 # 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
|
944 # this option, so attempt whether or not this is a largefile repo. |
37755
886754323bed
largefiles: opts appears to already be bytes in this instance
Augie Fackler <augie@google.com>
parents:
37269
diff
changeset
|
945 if opts.get('all_largefiles'): |
17824
221c9c3146eb
largefiles: always create the cache and standin directories when cloning
Matt Harbison <matt_harbison@yahoo.com>
parents:
17702
diff
changeset
|
946 success, missing = lfcommands.downloadlfiles(ui, repo, None) |
17601
6e2ab601be3f
largefiles: delegate to the wrapped clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17600
diff
changeset
|
947 |
17824
221c9c3146eb
largefiles: always create the cache and standin directories when cloning
Matt Harbison <matt_harbison@yahoo.com>
parents:
17702
diff
changeset
|
948 if missing != 0: |
221c9c3146eb
largefiles: always create the cache and standin directories when cloning
Matt Harbison <matt_harbison@yahoo.com>
parents:
17702
diff
changeset
|
949 return None |
17601
6e2ab601be3f
largefiles: delegate to the wrapped clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17600
diff
changeset
|
950 |
6e2ab601be3f
largefiles: delegate to the wrapped clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17600
diff
changeset
|
951 return result |
16644
98a9266db803
largefiles: add --all-largefiles flag to clone (issue3188)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16642
diff
changeset
|
952 |
41061
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
953 @eh.wrapcommand('rebase', extension='rebase') |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
954 def overriderebase(orig, ui, repo, **opts): |
24158
d414c28db84d
largefiles: access to specific fields only if largefiles enabled (issue4547)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23976
diff
changeset
|
955 if not util.safehasattr(repo, '_largefilesenabled'): |
d414c28db84d
largefiles: access to specific fields only if largefiles enabled (issue4547)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23976
diff
changeset
|
956 return orig(ui, repo, **opts) |
d414c28db84d
largefiles: access to specific fields only if largefiles enabled (issue4547)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23976
diff
changeset
|
957 |
35348
576ba8194fa8
py3: handle keyword arguments correctly in hgext/largefiles/
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35303
diff
changeset
|
958 resuming = opts.get(r'continue') |
23187
f726b05ecfe6
largefiles: update standins only at the 1st commit of "hg rebase --continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23183
diff
changeset
|
959 repo._lfcommithooks.append(lfutil.automatedcommithook(resuming)) |
23190
383ff455cab8
largefiles: avoid printing messages while rebasing by "_lfstatuswriters"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23189
diff
changeset
|
960 repo._lfstatuswriters.append(lambda *msg, **opts: None) |
15168 | 961 try: |
17578
40c988f108d0
largefiles: preserve the exit status of the rebase command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17577
diff
changeset
|
962 return orig(ui, repo, **opts) |
15168 | 963 finally: |
23190
383ff455cab8
largefiles: avoid printing messages while rebasing by "_lfstatuswriters"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23189
diff
changeset
|
964 repo._lfstatuswriters.pop() |
23187
f726b05ecfe6
largefiles: update standins only at the 1st commit of "hg rebase --continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23183
diff
changeset
|
965 repo._lfcommithooks.pop() |
15168 | 966 |
41061
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
967 @eh.wrapcommand('archive') |
25811
7699d3212994
largefiles: allow the archiving of largefiles to be disabled
Matt Harbison <matt_harbison@yahoo.com>
parents:
25660
diff
changeset
|
968 def overridearchivecmd(orig, ui, repo, dest, **opts): |
7699d3212994
largefiles: allow the archiving of largefiles to be disabled
Matt Harbison <matt_harbison@yahoo.com>
parents:
25660
diff
changeset
|
969 repo.unfiltered().lfstatus = True |
7699d3212994
largefiles: allow the archiving of largefiles to be disabled
Matt Harbison <matt_harbison@yahoo.com>
parents:
25660
diff
changeset
|
970 |
7699d3212994
largefiles: allow the archiving of largefiles to be disabled
Matt Harbison <matt_harbison@yahoo.com>
parents:
25660
diff
changeset
|
971 try: |
7699d3212994
largefiles: allow the archiving of largefiles to be disabled
Matt Harbison <matt_harbison@yahoo.com>
parents:
25660
diff
changeset
|
972 return orig(ui, repo.unfiltered(), dest, **opts) |
7699d3212994
largefiles: allow the archiving of largefiles to be disabled
Matt Harbison <matt_harbison@yahoo.com>
parents:
25660
diff
changeset
|
973 finally: |
7699d3212994
largefiles: allow the archiving of largefiles to be disabled
Matt Harbison <matt_harbison@yahoo.com>
parents:
25660
diff
changeset
|
974 repo.unfiltered().lfstatus = False |
7699d3212994
largefiles: allow the archiving of largefiles to be disabled
Matt Harbison <matt_harbison@yahoo.com>
parents:
25660
diff
changeset
|
975 |
41062
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
976 @eh.wrapfunction(webcommands, 'archive') |
36887
4daa22071d5d
hgweb: stop passing req and tmpl into @webcommand functions (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36736
diff
changeset
|
977 def hgwebarchive(orig, web): |
26417
9a466b9f9792
largefiles: restore archiving largefiles with hgweb (issue4859)
Matt Harbison <matt_harbison@yahoo.com>
parents:
25811
diff
changeset
|
978 web.repo.lfstatus = True |
9a466b9f9792
largefiles: restore archiving largefiles with hgweb (issue4859)
Matt Harbison <matt_harbison@yahoo.com>
parents:
25811
diff
changeset
|
979 |
9a466b9f9792
largefiles: restore archiving largefiles with hgweb (issue4859)
Matt Harbison <matt_harbison@yahoo.com>
parents:
25811
diff
changeset
|
980 try: |
36887
4daa22071d5d
hgweb: stop passing req and tmpl into @webcommand functions (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36736
diff
changeset
|
981 return orig(web) |
26417
9a466b9f9792
largefiles: restore archiving largefiles with hgweb (issue4859)
Matt Harbison <matt_harbison@yahoo.com>
parents:
25811
diff
changeset
|
982 finally: |
9a466b9f9792
largefiles: restore archiving largefiles with hgweb (issue4859)
Matt Harbison <matt_harbison@yahoo.com>
parents:
25811
diff
changeset
|
983 web.repo.lfstatus = False |
9a466b9f9792
largefiles: restore archiving largefiles with hgweb (issue4859)
Matt Harbison <matt_harbison@yahoo.com>
parents:
25811
diff
changeset
|
984 |
41062
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
985 @eh.wrapfunction(archival, 'archive') |
40407
3d76a8e627a6
archive: change "matcnfn" argument to a real matcher
Martin von Zweigbergk <martinvonz@google.com>
parents:
39854
diff
changeset
|
986 def overridearchive(orig, repo, dest, node, kind, decode=True, match=None, |
24172
e0f06228bb66
archive: change the default prefix to '' from None
Matt Harbison <matt_harbison@yahoo.com>
parents:
24167
diff
changeset
|
987 prefix='', mtime=None, subrepos=None): |
26417
9a466b9f9792
largefiles: restore archiving largefiles with hgweb (issue4859)
Matt Harbison <matt_harbison@yahoo.com>
parents:
25811
diff
changeset
|
988 # For some reason setting repo.lfstatus in hgwebarchive only changes the |
9a466b9f9792
largefiles: restore archiving largefiles with hgweb (issue4859)
Matt Harbison <matt_harbison@yahoo.com>
parents:
25811
diff
changeset
|
989 # unfiltered repo's attr, so check that as well. |
9a466b9f9792
largefiles: restore archiving largefiles with hgweb (issue4859)
Matt Harbison <matt_harbison@yahoo.com>
parents:
25811
diff
changeset
|
990 if not repo.lfstatus and not repo.unfiltered().lfstatus: |
40407
3d76a8e627a6
archive: change "matcnfn" argument to a real matcher
Martin von Zweigbergk <martinvonz@google.com>
parents:
39854
diff
changeset
|
991 return orig(repo, dest, node, kind, decode, match, prefix, mtime, |
25811
7699d3212994
largefiles: allow the archiving of largefiles to be disabled
Matt Harbison <matt_harbison@yahoo.com>
parents:
25660
diff
changeset
|
992 subrepos) |
7699d3212994
largefiles: allow the archiving of largefiles to be disabled
Matt Harbison <matt_harbison@yahoo.com>
parents:
25660
diff
changeset
|
993 |
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
994 # 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
|
995 # largefile caches, neither of which are modified. |
25601
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25467
diff
changeset
|
996 if node is not None: |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25467
diff
changeset
|
997 lfcommands.cachelfiles(repo.ui, repo, node) |
15168 | 998 |
999 if kind not in archival.archivers: | |
26587
56b2bcea2529
error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26427
diff
changeset
|
1000 raise error.Abort(_("unknown archive type '%s'") % kind) |
15168 | 1001 |
1002 ctx = repo[node] | |
1003 | |
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
|
1004 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
|
1005 if prefix: |
26587
56b2bcea2529
error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26427
diff
changeset
|
1006 raise error.Abort( |
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
|
1007 _('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
|
1008 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
|
1009 prefix = archival.tidyprefix(dest, kind, prefix) |
15168 | 1010 |
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
|
1011 def write(name, mode, islink, getdata): |
40407
3d76a8e627a6
archive: change "matcnfn" argument to a real matcher
Martin von Zweigbergk <martinvonz@google.com>
parents:
39854
diff
changeset
|
1012 if match and not match(name): |
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
|
1013 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
|
1014 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
|
1015 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
|
1016 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
|
1017 archiver.addfile(prefix + name, mode, islink, data) |
15168 | 1018 |
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
|
1019 archiver = archival.archivers[kind](dest, mtime or ctx.date()[0]) |
15168 | 1020 |
33499
0407a51b9d8c
codemod: register core configitems using a script
Jun Wu <quark@fb.com>
parents:
33364
diff
changeset
|
1021 if repo.ui.configbool("ui", "archivemeta"): |
25658
e93036747902
global: mass rewrite to use modern octal syntax
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25601
diff
changeset
|
1022 write('.hg_archival.txt', 0o644, False, |
24680
0974d3a0be29
largefiles: use common function to build content of .hg_archival.txt
Yuya Nishihara <yuya@tcha.org>
parents:
24670
diff
changeset
|
1023 lambda: archival.buildmetadata(ctx)) |
15168 | 1024 |
1025 for f in ctx: | |
1026 ff = ctx.flags(f) | |
1027 getdata = ctx[f].data | |
31613
5c1d3f1b8f44
largefiles: omit redundant isstandin() before splitstandin()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31309
diff
changeset
|
1028 lfile = lfutil.splitstandin(f) |
5c1d3f1b8f44
largefiles: omit redundant isstandin() before splitstandin()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31309
diff
changeset
|
1029 if lfile is not None: |
25601
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25467
diff
changeset
|
1030 if node is not None: |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25467
diff
changeset
|
1031 path = lfutil.findfile(repo, getdata().strip()) |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25467
diff
changeset
|
1032 |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25467
diff
changeset
|
1033 if path is None: |
26587
56b2bcea2529
error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26427
diff
changeset
|
1034 raise error.Abort( |
25601
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25467
diff
changeset
|
1035 _('largefile %s not found in repo store or system cache') |
31613
5c1d3f1b8f44
largefiles: omit redundant isstandin() before splitstandin()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31309
diff
changeset
|
1036 % lfile) |
25601
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25467
diff
changeset
|
1037 else: |
31613
5c1d3f1b8f44
largefiles: omit redundant isstandin() before splitstandin()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31309
diff
changeset
|
1038 path = lfile |
25601
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25467
diff
changeset
|
1039 |
31613
5c1d3f1b8f44
largefiles: omit redundant isstandin() before splitstandin()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31309
diff
changeset
|
1040 f = lfile |
15168 | 1041 |
27772
00bd72629a45
largefiles: use util.readfile in overrides
Bryan O'Sullivan <bryano@fb.com>
parents:
27655
diff
changeset
|
1042 getdata = lambda: util.readfile(path) |
25658
e93036747902
global: mass rewrite to use modern octal syntax
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25601
diff
changeset
|
1043 write(f, 'x' in ff and 0o755 or 0o644, 'l' in ff, getdata) |
15168 | 1044 |
1045 if subrepos: | |
18364
6252b4f1c4b4
subrepos: process subrepos in sorted order
Mads Kiilerich <mads@kiilerich.com>
parents:
18341
diff
changeset
|
1046 for subpath in sorted(ctx.substate): |
25601
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25467
diff
changeset
|
1047 sub = ctx.workingsub(subpath) |
40407
3d76a8e627a6
archive: change "matcnfn" argument to a real matcher
Martin von Zweigbergk <martinvonz@google.com>
parents:
39854
diff
changeset
|
1048 submatch = matchmod.subdirmatcher(subpath, match) |
25811
7699d3212994
largefiles: allow the archiving of largefiles to be disabled
Matt Harbison <matt_harbison@yahoo.com>
parents:
25660
diff
changeset
|
1049 sub._repo.lfstatus = True |
23575
a2f139d25845
subrepo: drop the 'ui' parameter to archive()
Matt Harbison <matt_harbison@yahoo.com>
parents:
23543
diff
changeset
|
1050 sub.archive(archiver, prefix, submatch) |
15168 | 1051 |
1052 archiver.done() | |
1053 | |
41062
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
1054 @eh.wrapfunction(subrepo.hgsubrepo, 'archive') |
31099
b44ab288358e
subrepo: run the repo decoders when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
31023
diff
changeset
|
1055 def hgsubrepoarchive(orig, repo, archiver, prefix, match=None, decode=True): |
32827
d3ab31bf9c0e
largefiles: avoid a crash when archiving a subrepo with largefiles disabled
Matt Harbison <matt_harbison@yahoo.com>
parents:
31892
diff
changeset
|
1056 lfenabled = util.safehasattr(repo._repo, '_largefilesenabled') |
d3ab31bf9c0e
largefiles: avoid a crash when archiving a subrepo with largefiles disabled
Matt Harbison <matt_harbison@yahoo.com>
parents:
31892
diff
changeset
|
1057 if not lfenabled or not repo._repo.lfstatus: |
31099
b44ab288358e
subrepo: run the repo decoders when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
31023
diff
changeset
|
1058 return orig(repo, archiver, prefix, match, decode) |
25811
7699d3212994
largefiles: allow the archiving of largefiles to be disabled
Matt Harbison <matt_harbison@yahoo.com>
parents:
25660
diff
changeset
|
1059 |
17695
75f25bd4c7d4
largefiles: download missing subrepo revs when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17658
diff
changeset
|
1060 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
|
1061 rev = repo._state[1] |
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
1062 ctx = repo._repo[rev] |
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
1063 |
25601
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25467
diff
changeset
|
1064 if ctx.node() is not None: |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25467
diff
changeset
|
1065 lfcommands.cachelfiles(repo.ui, repo._repo, ctx.node()) |
16578
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
1066 |
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
1067 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
|
1068 # 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
|
1069 # 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
|
1070 if match and not match(f): |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17107
diff
changeset
|
1071 return |
16578
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
1072 data = getdata() |
31099
b44ab288358e
subrepo: run the repo decoders when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
31023
diff
changeset
|
1073 if decode: |
b44ab288358e
subrepo: run the repo decoders when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
31023
diff
changeset
|
1074 data = repo._repo.wwritedata(name, data) |
16578
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
1075 |
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
1076 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
|
1077 |
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
1078 for f in ctx: |
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
1079 ff = ctx.flags(f) |
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
1080 getdata = ctx[f].data |
31613
5c1d3f1b8f44
largefiles: omit redundant isstandin() before splitstandin()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31309
diff
changeset
|
1081 lfile = lfutil.splitstandin(f) |
5c1d3f1b8f44
largefiles: omit redundant isstandin() before splitstandin()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31309
diff
changeset
|
1082 if lfile is not None: |
25601
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25467
diff
changeset
|
1083 if ctx.node() is not None: |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25467
diff
changeset
|
1084 path = lfutil.findfile(repo._repo, getdata().strip()) |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25467
diff
changeset
|
1085 |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25467
diff
changeset
|
1086 if path is None: |
26587
56b2bcea2529
error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26427
diff
changeset
|
1087 raise error.Abort( |
25601
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25467
diff
changeset
|
1088 _('largefile %s not found in repo store or system cache') |
31613
5c1d3f1b8f44
largefiles: omit redundant isstandin() before splitstandin()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31309
diff
changeset
|
1089 % lfile) |
25601
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25467
diff
changeset
|
1090 else: |
31613
5c1d3f1b8f44
largefiles: omit redundant isstandin() before splitstandin()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31309
diff
changeset
|
1091 path = lfile |
25601
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25467
diff
changeset
|
1092 |
31613
5c1d3f1b8f44
largefiles: omit redundant isstandin() before splitstandin()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31309
diff
changeset
|
1093 f = lfile |
16578
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
1094 |
27772
00bd72629a45
largefiles: use util.readfile in overrides
Bryan O'Sullivan <bryano@fb.com>
parents:
27655
diff
changeset
|
1095 getdata = lambda: util.readfile(os.path.join(prefix, path)) |
16578
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
1096 |
25658
e93036747902
global: mass rewrite to use modern octal syntax
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25601
diff
changeset
|
1097 write(f, 'x' in ff and 0o755 or 0o644, 'l' in ff, getdata) |
16578
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
1098 |
18364
6252b4f1c4b4
subrepos: process subrepos in sorted order
Mads Kiilerich <mads@kiilerich.com>
parents:
18341
diff
changeset
|
1099 for subpath in sorted(ctx.substate): |
25601
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25467
diff
changeset
|
1100 sub = ctx.workingsub(subpath) |
29318
2572bb2e06f8
largefiles: rename match_ to matchmod import in overrides
liscju <piotr.listkiewicz@gmail.com>
parents:
29311
diff
changeset
|
1101 submatch = matchmod.subdirmatcher(subpath, match) |
25811
7699d3212994
largefiles: allow the archiving of largefiles to be disabled
Matt Harbison <matt_harbison@yahoo.com>
parents:
25660
diff
changeset
|
1102 sub._repo.lfstatus = True |
31099
b44ab288358e
subrepo: run the repo decoders when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
31023
diff
changeset
|
1103 sub.archive(archiver, prefix + repo._path + '/', submatch, decode) |
16578
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16516
diff
changeset
|
1104 |
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
1105 # 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
|
1106 # 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
|
1107 # if the repo has uncommitted changes. Wrap it to also check if |
23441
d289ba74dba3
largefiles: drop the override for 'fetch'
Matt Harbison <matt_harbison@yahoo.com>
parents:
23428
diff
changeset
|
1108 # largefiles were changed. This is used by bisect, backout and fetch. |
41062
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
1109 @eh.wrapfunction(cmdutil, 'bailifchanged') |
24472
1bf71faf042e
cmdutil: allow bailifchanged to ignore merging in progress
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24438
diff
changeset
|
1110 def overridebailifchanged(orig, repo, *args, **kwargs): |
1bf71faf042e
cmdutil: allow bailifchanged to ignore merging in progress
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24438
diff
changeset
|
1111 orig(repo, *args, **kwargs) |
15168 | 1112 repo.lfstatus = True |
22919
1982bdb7e2cc
largefiles: access status fields by name rather than index
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22914
diff
changeset
|
1113 s = repo.status() |
15168 | 1114 repo.lfstatus = False |
22919
1982bdb7e2cc
largefiles: access status fields by name rather than index
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22914
diff
changeset
|
1115 if s.modified or s.added or s.removed or s.deleted: |
26587
56b2bcea2529
error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26427
diff
changeset
|
1116 raise error.Abort(_('uncommitted changes')) |
15168 | 1117 |
41062
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
1118 @eh.wrapfunction(cmdutil, 'postcommitstatus') |
27944
4511e8dac4c7
largefiles: report the missing file count after a commit that does nothing
Matt Harbison <matt_harbison@yahoo.com>
parents:
27905
diff
changeset
|
1119 def postcommitstatus(orig, repo, *args, **kwargs): |
4511e8dac4c7
largefiles: report the missing file count after a commit that does nothing
Matt Harbison <matt_harbison@yahoo.com>
parents:
27905
diff
changeset
|
1120 repo.lfstatus = True |
4511e8dac4c7
largefiles: report the missing file count after a commit that does nothing
Matt Harbison <matt_harbison@yahoo.com>
parents:
27905
diff
changeset
|
1121 try: |
4511e8dac4c7
largefiles: report the missing file count after a commit that does nothing
Matt Harbison <matt_harbison@yahoo.com>
parents:
27905
diff
changeset
|
1122 return orig(repo, *args, **kwargs) |
4511e8dac4c7
largefiles: report the missing file count after a commit that does nothing
Matt Harbison <matt_harbison@yahoo.com>
parents:
27905
diff
changeset
|
1123 finally: |
4511e8dac4c7
largefiles: report the missing file count after a commit that does nothing
Matt Harbison <matt_harbison@yahoo.com>
parents:
27905
diff
changeset
|
1124 repo.lfstatus = False |
4511e8dac4c7
largefiles: report the missing file count after a commit that does nothing
Matt Harbison <matt_harbison@yahoo.com>
parents:
27905
diff
changeset
|
1125 |
41062
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
1126 @eh.wrapfunction(cmdutil, 'forget') |
37778
f10cb49951e1
forget: rename --confirm to --interactive
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
37756
diff
changeset
|
1127 def cmdutilforget(orig, ui, repo, match, prefix, explicitonly, dryrun, |
f10cb49951e1
forget: rename --confirm to --interactive
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
37756
diff
changeset
|
1128 interactive): |
23837
2b79d124a12f
largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents:
23782
diff
changeset
|
1129 normalmatcher = composenormalfilematcher(match, repo[None].manifest()) |
37756
e7bf5a73e4e1
forget: add --confirm option
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
37755
diff
changeset
|
1130 bad, forgot = orig(ui, repo, normalmatcher, prefix, explicitonly, dryrun, |
37778
f10cb49951e1
forget: rename --confirm to --interactive
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
37756
diff
changeset
|
1131 interactive) |
23837
2b79d124a12f
largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents:
23782
diff
changeset
|
1132 m = composelargefilematcher(match, repo[None].manifest()) |
15168 | 1133 |
1134 try: | |
1135 repo.lfstatus = True | |
1136 s = repo.status(match=m, clean=True) | |
1137 finally: | |
1138 repo.lfstatus = False | |
31654
1af4a1641bdb
largefiles: avoid redundant changectx looking up at each repetitions
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31653
diff
changeset
|
1139 manifest = repo[None].manifest() |
22919
1982bdb7e2cc
largefiles: access status fields by name rather than index
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22914
diff
changeset
|
1140 forget = sorted(s.modified + s.added + s.deleted + s.clean) |
31654
1af4a1641bdb
largefiles: avoid redundant changectx looking up at each repetitions
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31653
diff
changeset
|
1141 forget = [f for f in forget if lfutil.standin(f) in manifest] |
15168 | 1142 |
1143 for f in forget: | |
31618
8228bc8fed8c
largefiles: avoid redundant standin() invocations
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31617
diff
changeset
|
1144 fstandin = lfutil.standin(f) |
8228bc8fed8c
largefiles: avoid redundant standin() invocations
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31617
diff
changeset
|
1145 if fstandin not in repo.dirstate and not repo.wvfs.isdir(fstandin): |
15168 | 1146 ui.warn(_('not removing %s: file is already untracked\n') |
1147 % m.rel(f)) | |
23837
2b79d124a12f
largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents:
23782
diff
changeset
|
1148 bad.append(f) |
15168 | 1149 |
1150 for f in forget: | |
1151 if ui.verbose or not m.exact(f): | |
1152 ui.status(_('removing %s\n') % m.rel(f)) | |
1153 | |
1154 # Need to lock because standin files are deleted then removed from the | |
17424
e7cfe3587ea4
fix trivial spelling errors
Mads Kiilerich <mads@kiilerich.com>
parents:
17299
diff
changeset
|
1155 # repository and we could race in-between. |
27824
0e55e93b50b5
with: use context manager for wlock in cmdutilforget
Bryan O'Sullivan <bryano@fb.com>
parents:
27823
diff
changeset
|
1156 with repo.wlock(): |
15168 | 1157 lfdirstate = lfutil.openlfdirstate(ui, repo) |
1158 for f in forget: | |
1159 if lfdirstate[f] == 'a': | |
1160 lfdirstate.drop(f) | |
1161 else: | |
1162 lfdirstate.remove(f) | |
1163 lfdirstate.write() | |
18153
51837a31b425
largefiles: remove reporemove portability wrapper
Mads Kiilerich <madski@unity3d.com>
parents:
18152
diff
changeset
|
1164 standins = [lfutil.standin(f) for f in forget] |
51837a31b425
largefiles: remove reporemove portability wrapper
Mads Kiilerich <madski@unity3d.com>
parents:
18152
diff
changeset
|
1165 for f in standins: |
31309
8908f985570c
vfs: use repo.wvfs.unlinkpath
Mads Kiilerich <madski@unity3d.com>
parents:
31099
diff
changeset
|
1166 repo.wvfs.unlinkpath(f, ignoremissing=True) |
23837
2b79d124a12f
largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents:
23782
diff
changeset
|
1167 rejected = repo[None].forget(standins) |
15168 | 1168 |
23837
2b79d124a12f
largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents:
23782
diff
changeset
|
1169 bad.extend(f for f in rejected if f in m.files()) |
2b79d124a12f
largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents:
23782
diff
changeset
|
1170 forgot.extend(f for f in forget if f not in rejected) |
2b79d124a12f
largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents:
23782
diff
changeset
|
1171 return bad, forgot |
17579
cbacb5a813dd
largefiles: preserve the exit status of the forget command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17578
diff
changeset
|
1172 |
21884
a858d3de0d32
largefiles: confirm existence of outgoing largefile entities in remote store
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21883
diff
changeset
|
1173 def _getoutgoings(repo, other, missing, addfunc): |
21882
12019e6aa8a2
largefiles: show also how many data entities are outgoing at "hg summary"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21545
diff
changeset
|
1174 """get pairs of filename and largefile hash in outgoing revisions |
12019e6aa8a2
largefiles: show also how many data entities are outgoing at "hg summary"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21545
diff
changeset
|
1175 in 'missing'. |
12019e6aa8a2
largefiles: show also how many data entities are outgoing at "hg summary"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21545
diff
changeset
|
1176 |
21884
a858d3de0d32
largefiles: confirm existence of outgoing largefile entities in remote store
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21883
diff
changeset
|
1177 largefiles already existing on 'other' repository are ignored. |
a858d3de0d32
largefiles: confirm existence of outgoing largefile entities in remote store
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21883
diff
changeset
|
1178 |
21882
12019e6aa8a2
largefiles: show also how many data entities are outgoing at "hg summary"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21545
diff
changeset
|
1179 'addfunc' is invoked with each unique pairs of filename and |
12019e6aa8a2
largefiles: show also how many data entities are outgoing at "hg summary"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21545
diff
changeset
|
1180 largefile hash value. |
12019e6aa8a2
largefiles: show also how many data entities are outgoing at "hg summary"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21545
diff
changeset
|
1181 """ |
12019e6aa8a2
largefiles: show also how many data entities are outgoing at "hg summary"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21545
diff
changeset
|
1182 knowns = set() |
21884
a858d3de0d32
largefiles: confirm existence of outgoing largefile entities in remote store
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21883
diff
changeset
|
1183 lfhashes = set() |
21882
12019e6aa8a2
largefiles: show also how many data entities are outgoing at "hg summary"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21545
diff
changeset
|
1184 def dedup(fn, lfhash): |
12019e6aa8a2
largefiles: show also how many data entities are outgoing at "hg summary"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21545
diff
changeset
|
1185 k = (fn, lfhash) |
12019e6aa8a2
largefiles: show also how many data entities are outgoing at "hg summary"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21545
diff
changeset
|
1186 if k not in knowns: |
12019e6aa8a2
largefiles: show also how many data entities are outgoing at "hg summary"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21545
diff
changeset
|
1187 knowns.add(k) |
21884
a858d3de0d32
largefiles: confirm existence of outgoing largefile entities in remote store
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21883
diff
changeset
|
1188 lfhashes.add(lfhash) |
21882
12019e6aa8a2
largefiles: show also how many data entities are outgoing at "hg summary"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21545
diff
changeset
|
1189 lfutil.getlfilestoupload(repo, missing, dedup) |
21884
a858d3de0d32
largefiles: confirm existence of outgoing largefile entities in remote store
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21883
diff
changeset
|
1190 if lfhashes: |
29355
85868ecf2c0d
largefiles: make storefactory._openstore public
liscju <piotr.listkiewicz@gmail.com>
parents:
29318
diff
changeset
|
1191 lfexists = storefactory.openstore(repo, other).exists(lfhashes) |
21884
a858d3de0d32
largefiles: confirm existence of outgoing largefile entities in remote store
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21883
diff
changeset
|
1192 for fn, lfhash in knowns: |
a858d3de0d32
largefiles: confirm existence of outgoing largefile entities in remote store
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21883
diff
changeset
|
1193 if not lfexists[lfhash]: # lfhash doesn't exist on "other" |
a858d3de0d32
largefiles: confirm existence of outgoing largefile entities in remote store
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21883
diff
changeset
|
1194 addfunc(fn, lfhash) |
21882
12019e6aa8a2
largefiles: show also how many data entities are outgoing at "hg summary"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21545
diff
changeset
|
1195 |
21052
cde32cb5a565
largefiles: use "outgoinghooks" to avoid redundant outgoing check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21048
diff
changeset
|
1196 def outgoinghook(ui, repo, other, opts, missing): |
15168 | 1197 if opts.pop('large', None): |
21883
87aa279f7073
largefiles: show also how many data entities are outgoing at "hg outgoing"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21882
diff
changeset
|
1198 lfhashes = set() |
87aa279f7073
largefiles: show also how many data entities are outgoing at "hg outgoing"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21882
diff
changeset
|
1199 if ui.debugflag: |
87aa279f7073
largefiles: show also how many data entities are outgoing at "hg outgoing"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21882
diff
changeset
|
1200 toupload = {} |
87aa279f7073
largefiles: show also how many data entities are outgoing at "hg outgoing"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21882
diff
changeset
|
1201 def addfunc(fn, lfhash): |
87aa279f7073
largefiles: show also how many data entities are outgoing at "hg outgoing"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21882
diff
changeset
|
1202 if fn not in toupload: |
87aa279f7073
largefiles: show also how many data entities are outgoing at "hg outgoing"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21882
diff
changeset
|
1203 toupload[fn] = [] |
87aa279f7073
largefiles: show also how many data entities are outgoing at "hg outgoing"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21882
diff
changeset
|
1204 toupload[fn].append(lfhash) |
87aa279f7073
largefiles: show also how many data entities are outgoing at "hg outgoing"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21882
diff
changeset
|
1205 lfhashes.add(lfhash) |
87aa279f7073
largefiles: show also how many data entities are outgoing at "hg outgoing"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21882
diff
changeset
|
1206 def showhashes(fn): |
87aa279f7073
largefiles: show also how many data entities are outgoing at "hg outgoing"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21882
diff
changeset
|
1207 for lfhash in sorted(toupload[fn]): |
87aa279f7073
largefiles: show also how many data entities are outgoing at "hg outgoing"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21882
diff
changeset
|
1208 ui.debug(' %s\n' % (lfhash)) |
87aa279f7073
largefiles: show also how many data entities are outgoing at "hg outgoing"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21882
diff
changeset
|
1209 else: |
87aa279f7073
largefiles: show also how many data entities are outgoing at "hg outgoing"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21882
diff
changeset
|
1210 toupload = set() |
87aa279f7073
largefiles: show also how many data entities are outgoing at "hg outgoing"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21882
diff
changeset
|
1211 def addfunc(fn, lfhash): |
87aa279f7073
largefiles: show also how many data entities are outgoing at "hg outgoing"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21882
diff
changeset
|
1212 toupload.add(fn) |
87aa279f7073
largefiles: show also how many data entities are outgoing at "hg outgoing"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21882
diff
changeset
|
1213 lfhashes.add(lfhash) |
87aa279f7073
largefiles: show also how many data entities are outgoing at "hg outgoing"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21882
diff
changeset
|
1214 def showhashes(fn): |
87aa279f7073
largefiles: show also how many data entities are outgoing at "hg outgoing"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21882
diff
changeset
|
1215 pass |
21884
a858d3de0d32
largefiles: confirm existence of outgoing largefile entities in remote store
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21883
diff
changeset
|
1216 _getoutgoings(repo, other, missing, addfunc) |
21883
87aa279f7073
largefiles: show also how many data entities are outgoing at "hg outgoing"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21882
diff
changeset
|
1217 |
21052
cde32cb5a565
largefiles: use "outgoinghooks" to avoid redundant outgoing check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21048
diff
changeset
|
1218 if not toupload: |
17835
08d11b82d9fc
largefiles: distinguish "no remote repo" from "no files to upload" (issue3651)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17824
diff
changeset
|
1219 ui.status(_('largefiles: no files to upload\n')) |
15168 | 1220 else: |
21883
87aa279f7073
largefiles: show also how many data entities are outgoing at "hg outgoing"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21882
diff
changeset
|
1221 ui.status(_('largefiles to upload (%d entities):\n') |
87aa279f7073
largefiles: show also how many data entities are outgoing at "hg outgoing"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21882
diff
changeset
|
1222 % (len(lfhashes))) |
21052
cde32cb5a565
largefiles: use "outgoinghooks" to avoid redundant outgoing check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21048
diff
changeset
|
1223 for file in sorted(toupload): |
15168 | 1224 ui.status(lfutil.splitstandin(file) + '\n') |
21883
87aa279f7073
largefiles: show also how many data entities are outgoing at "hg outgoing"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21882
diff
changeset
|
1225 showhashes(file) |
15168 | 1226 ui.status('\n') |
1227 | |
41061
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
1228 @eh.wrapcommand('outgoing', |
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
1229 opts=[('', 'large', None, _('display outgoing largefiles'))]) |
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
1230 def _outgoingcmd(orig, *args, **kwargs): |
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
1231 # Nothing to do here other than add the extra help option- the hook above |
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
1232 # processes it. |
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
1233 return orig(*args, **kwargs) |
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
1234 |
21048
ca7a57464fb3
largefiles: use "summaryremotehooks" to avoid redundant outgoing check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21042
diff
changeset
|
1235 def summaryremotehook(ui, repo, opts, changes): |
ca7a57464fb3
largefiles: use "summaryremotehooks" to avoid redundant outgoing check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21042
diff
changeset
|
1236 largeopt = opts.get('large', False) |
ca7a57464fb3
largefiles: use "summaryremotehooks" to avoid redundant outgoing check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21042
diff
changeset
|
1237 if changes is None: |
ca7a57464fb3
largefiles: use "summaryremotehooks" to avoid redundant outgoing check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21042
diff
changeset
|
1238 if largeopt: |
ca7a57464fb3
largefiles: use "summaryremotehooks" to avoid redundant outgoing check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21042
diff
changeset
|
1239 return (False, True) # only outgoing check is needed |
ca7a57464fb3
largefiles: use "summaryremotehooks" to avoid redundant outgoing check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21042
diff
changeset
|
1240 else: |
ca7a57464fb3
largefiles: use "summaryremotehooks" to avoid redundant outgoing check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21042
diff
changeset
|
1241 return (False, False) |
ca7a57464fb3
largefiles: use "summaryremotehooks" to avoid redundant outgoing check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21042
diff
changeset
|
1242 elif largeopt: |
ca7a57464fb3
largefiles: use "summaryremotehooks" to avoid redundant outgoing check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21042
diff
changeset
|
1243 url, branch, peer, outgoing = changes[1] |
ca7a57464fb3
largefiles: use "summaryremotehooks" to avoid redundant outgoing check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21042
diff
changeset
|
1244 if peer is None: |
ca7a57464fb3
largefiles: use "summaryremotehooks" to avoid redundant outgoing check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21042
diff
changeset
|
1245 # i18n: column positioning for "hg summary" |
ca7a57464fb3
largefiles: use "summaryremotehooks" to avoid redundant outgoing check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21042
diff
changeset
|
1246 ui.status(_('largefiles: (no remote repo)\n')) |
ca7a57464fb3
largefiles: use "summaryremotehooks" to avoid redundant outgoing check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21042
diff
changeset
|
1247 return |
ca7a57464fb3
largefiles: use "summaryremotehooks" to avoid redundant outgoing check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21042
diff
changeset
|
1248 |
ca7a57464fb3
largefiles: use "summaryremotehooks" to avoid redundant outgoing check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21042
diff
changeset
|
1249 toupload = set() |
21882
12019e6aa8a2
largefiles: show also how many data entities are outgoing at "hg summary"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21545
diff
changeset
|
1250 lfhashes = set() |
12019e6aa8a2
largefiles: show also how many data entities are outgoing at "hg summary"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21545
diff
changeset
|
1251 def addfunc(fn, lfhash): |
12019e6aa8a2
largefiles: show also how many data entities are outgoing at "hg summary"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21545
diff
changeset
|
1252 toupload.add(fn) |
12019e6aa8a2
largefiles: show also how many data entities are outgoing at "hg summary"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21545
diff
changeset
|
1253 lfhashes.add(lfhash) |
21884
a858d3de0d32
largefiles: confirm existence of outgoing largefile entities in remote store
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21883
diff
changeset
|
1254 _getoutgoings(repo, peer, outgoing.missing, addfunc) |
21882
12019e6aa8a2
largefiles: show also how many data entities are outgoing at "hg summary"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21545
diff
changeset
|
1255 |
21048
ca7a57464fb3
largefiles: use "summaryremotehooks" to avoid redundant outgoing check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21042
diff
changeset
|
1256 if not toupload: |
ca7a57464fb3
largefiles: use "summaryremotehooks" to avoid redundant outgoing check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21042
diff
changeset
|
1257 # i18n: column positioning for "hg summary" |
ca7a57464fb3
largefiles: use "summaryremotehooks" to avoid redundant outgoing check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21042
diff
changeset
|
1258 ui.status(_('largefiles: (no files to upload)\n')) |
ca7a57464fb3
largefiles: use "summaryremotehooks" to avoid redundant outgoing check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21042
diff
changeset
|
1259 else: |
ca7a57464fb3
largefiles: use "summaryremotehooks" to avoid redundant outgoing check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21042
diff
changeset
|
1260 # i18n: column positioning for "hg summary" |
21882
12019e6aa8a2
largefiles: show also how many data entities are outgoing at "hg summary"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21545
diff
changeset
|
1261 ui.status(_('largefiles: %d entities for %d files to upload\n') |
12019e6aa8a2
largefiles: show also how many data entities are outgoing at "hg summary"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21545
diff
changeset
|
1262 % (len(lfhashes), len(toupload))) |
21048
ca7a57464fb3
largefiles: use "summaryremotehooks" to avoid redundant outgoing check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21042
diff
changeset
|
1263 |
41061
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
1264 @eh.wrapcommand('summary', |
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
1265 opts=[('', 'large', None, _('display outgoing largefiles'))]) |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
1266 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
|
1267 try: |
0c7b83a057aa
largefiles: fix output of hg summary (issue3060)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15786
diff
changeset
|
1268 repo.lfstatus = True |
0c7b83a057aa
largefiles: fix output of hg summary (issue3060)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15786
diff
changeset
|
1269 orig(ui, repo, *pats, **opts) |
0c7b83a057aa
largefiles: fix output of hg summary (issue3060)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15786
diff
changeset
|
1270 finally: |
0c7b83a057aa
largefiles: fix output of hg summary (issue3060)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15786
diff
changeset
|
1271 repo.lfstatus = False |
15168 | 1272 |
41062
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
1273 @eh.wrapfunction(scmutil, 'addremove') |
37269
14cd5290c4e6
addremove: remove dry_run, similarity from scmutil.addremove (API)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
37150
diff
changeset
|
1274 def scmutiladdremove(orig, repo, matcher, prefix, opts=None): |
26344
cd9cc7f30427
largefiles: remove a mutable default argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26343
diff
changeset
|
1275 if opts is None: |
cd9cc7f30427
largefiles: remove a mutable default argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26343
diff
changeset
|
1276 opts = {} |
16636
b371056ae353
largefiles: follow normal codepath for addremove if non-largefiles repo (issue3249)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16516
diff
changeset
|
1277 if not lfutil.islfilesrepo(repo): |
37269
14cd5290c4e6
addremove: remove dry_run, similarity from scmutil.addremove (API)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
37150
diff
changeset
|
1278 return orig(repo, matcher, prefix, opts) |
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
1279 # 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:
17601
diff
changeset
|
1280 lfdirstate = lfutil.openlfdirstate(repo.ui, repo) |
34344
ac0cd81e2f83
dirstate: use keyword arguments to clarify status()'s callers
Martin von Zweigbergk <martinvonz@google.com>
parents:
34303
diff
changeset
|
1281 unsure, s = lfdirstate.status(matchmod.always(repo.root, repo.getcwd()), |
ac0cd81e2f83
dirstate: use keyword arguments to clarify status()'s callers
Martin von Zweigbergk <martinvonz@google.com>
parents:
34303
diff
changeset
|
1282 subrepos=[], ignored=False, clean=False, |
ac0cd81e2f83
dirstate: use keyword arguments to clarify status()'s callers
Martin von Zweigbergk <martinvonz@google.com>
parents:
34303
diff
changeset
|
1283 unknown=False) |
15168 | 1284 |
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
1285 # 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
|
1286 # 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
|
1287 # 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
|
1288 # confused state later. |
22919
1982bdb7e2cc
largefiles: access status fields by name rather than index
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22914
diff
changeset
|
1289 if s.deleted: |
23741
f2893cd8d1e5
largefiles: pass a matcher instead of a raw file list to removelargefiles()
Matt Harbison <matt_harbison@yahoo.com>
parents:
23733
diff
changeset
|
1290 m = copy.copy(matcher) |
f2893cd8d1e5
largefiles: pass a matcher instead of a raw file list to removelargefiles()
Matt Harbison <matt_harbison@yahoo.com>
parents:
23733
diff
changeset
|
1291 |
f2893cd8d1e5
largefiles: pass a matcher instead of a raw file list to removelargefiles()
Matt Harbison <matt_harbison@yahoo.com>
parents:
23733
diff
changeset
|
1292 # The m._files and m._map attributes are not changed to the deleted list |
f2893cd8d1e5
largefiles: pass a matcher instead of a raw file list to removelargefiles()
Matt Harbison <matt_harbison@yahoo.com>
parents:
23733
diff
changeset
|
1293 # because that affects the m.exact() test, which in turn governs whether |
f2893cd8d1e5
largefiles: pass a matcher instead of a raw file list to removelargefiles()
Matt Harbison <matt_harbison@yahoo.com>
parents:
23733
diff
changeset
|
1294 # or not the file name is printed, and how. Simply limit the original |
f2893cd8d1e5
largefiles: pass a matcher instead of a raw file list to removelargefiles()
Matt Harbison <matt_harbison@yahoo.com>
parents:
23733
diff
changeset
|
1295 # matches to those in the deleted status list. |
f2893cd8d1e5
largefiles: pass a matcher instead of a raw file list to removelargefiles()
Matt Harbison <matt_harbison@yahoo.com>
parents:
23733
diff
changeset
|
1296 matchfn = m.matchfn |
f2893cd8d1e5
largefiles: pass a matcher instead of a raw file list to removelargefiles()
Matt Harbison <matt_harbison@yahoo.com>
parents:
23733
diff
changeset
|
1297 m.matchfn = lambda f: f in s.deleted and matchfn(f) |
f2893cd8d1e5
largefiles: pass a matcher instead of a raw file list to removelargefiles()
Matt Harbison <matt_harbison@yahoo.com>
parents:
23733
diff
changeset
|
1298 |
37150
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
37088
diff
changeset
|
1299 removelargefiles(repo.ui, repo, True, m, opts.get('dry_run'), |
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
37088
diff
changeset
|
1300 **pycompat.strkwargs(opts)) |
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
1301 # 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
|
1302 # largefiles will be |
36315
398e96f77aa3
largefiles: give some **opts some strkwargs love
Augie Fackler <augie@google.com>
parents:
36311
diff
changeset
|
1303 added, bad = addlargefiles(repo.ui, repo, True, matcher, |
398e96f77aa3
largefiles: give some **opts some strkwargs love
Augie Fackler <augie@google.com>
parents:
36311
diff
changeset
|
1304 **pycompat.strkwargs(opts)) |
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
1305 # 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
|
1306 # function to take care of the rest. Make sure it doesn't do anything with |
23533
891aaa7c0c70
scmutil: pass a matcher to scmutil.addremove() instead of a list of patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
23530
diff
changeset
|
1307 # largefiles by passing a matcher that will ignore them. |
23769
bb3ee61cfaa1
largefiles: don't print files as both large and normal in addremove dryruns
Matt Harbison <matt_harbison@yahoo.com>
parents:
23768
diff
changeset
|
1308 matcher = composenormalfilematcher(matcher, repo[None].manifest(), added) |
37269
14cd5290c4e6
addremove: remove dry_run, similarity from scmutil.addremove (API)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
37150
diff
changeset
|
1309 return orig(repo, matcher, prefix, opts) |
15168 | 1310 |
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
1311 # Calling purge with --all will cause the largefiles to be deleted. |
15168 | 1312 # Override repo.status to prevent this from happening. |
41061
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
1313 @eh.wrapcommand('purge', extension='purge') |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
1314 def overridepurge(orig, ui, repo, *dirs, **opts): |
23635
faec11cfb645
largefile: explain why no monkey patching on a repoview
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23634
diff
changeset
|
1315 # XXX Monkey patching a repoview will not work. The assigned attribute will |
faec11cfb645
largefile: explain why no monkey patching on a repoview
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23634
diff
changeset
|
1316 # be set on the unfiltered repo, but we will only lookup attributes in the |
faec11cfb645
largefile: explain why no monkey patching on a repoview
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23634
diff
changeset
|
1317 # unfiltered repo if the lookup in the repoview object itself fails. As the |
faec11cfb645
largefile: explain why no monkey patching on a repoview
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23634
diff
changeset
|
1318 # monkey patched method exists on the repoview class the lookup will not |
faec11cfb645
largefile: explain why no monkey patching on a repoview
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23634
diff
changeset
|
1319 # fail. As a result, the original version will shadow the monkey patched |
faec11cfb645
largefile: explain why no monkey patching on a repoview
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23634
diff
changeset
|
1320 # one, defeating the monkey patch. |
faec11cfb645
largefile: explain why no monkey patching on a repoview
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23634
diff
changeset
|
1321 # |
faec11cfb645
largefile: explain why no monkey patching on a repoview
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23634
diff
changeset
|
1322 # As a work around we use an unfiltered repo here. We should do something |
faec11cfb645
largefile: explain why no monkey patching on a repoview
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23634
diff
changeset
|
1323 # cleaner instead. |
18012
848c428bb5ee
largefile: status is buggy on repoproxy, so run unfiltered
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17894
diff
changeset
|
1324 repo = repo.unfiltered() |
15168 | 1325 oldstatus = repo.status |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
1326 def overridestatus(node1='.', node2=None, match=None, ignored=False, |
15168 | 1327 clean=False, unknown=False, listsubrepos=False): |
1328 r = oldstatus(node1, node2, match, ignored, clean, unknown, | |
1329 listsubrepos) | |
1330 lfdirstate = lfutil.openlfdirstate(ui, repo) | |
22919
1982bdb7e2cc
largefiles: access status fields by name rather than index
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22914
diff
changeset
|
1331 unknown = [f for f in r.unknown if lfdirstate[f] == '?'] |
1982bdb7e2cc
largefiles: access status fields by name rather than index
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22914
diff
changeset
|
1332 ignored = [f for f in r.ignored if lfdirstate[f] == '?'] |
1982bdb7e2cc
largefiles: access status fields by name rather than index
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22914
diff
changeset
|
1333 return scmutil.status(r.modified, r.added, r.removed, r.deleted, |
1982bdb7e2cc
largefiles: access status fields by name rather than index
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22914
diff
changeset
|
1334 unknown, ignored, r.clean) |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
1335 repo.status = overridestatus |
15168 | 1336 orig(ui, repo, *dirs, **opts) |
1337 repo.status = oldstatus | |
35348
576ba8194fa8
py3: handle keyword arguments correctly in hgext/largefiles/
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35303
diff
changeset
|
1338 |
41061
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
1339 @eh.wrapcommand('rollback') |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
1340 def overriderollback(orig, ui, repo, **opts): |
27825
4692571df9ee
with: use context manager for wlock in overridepurge
Bryan O'Sullivan <bryano@fb.com>
parents:
27824
diff
changeset
|
1341 with repo.wlock(): |
22283
cb556ea76dcd
largefiles: omit restoring standins if working parent is not rollbacked
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22196
diff
changeset
|
1342 before = repo.dirstate.parents() |
22286
3f3b9483e7ef
largefiles: unlink standins not known to the restored dirstate at rollback
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22285
diff
changeset
|
1343 orphans = set(f for f in repo.dirstate |
3f3b9483e7ef
largefiles: unlink standins not known to the restored dirstate at rollback
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22285
diff
changeset
|
1344 if lfutil.isstandin(f) and repo.dirstate[f] != 'r') |
22094
7d7065476fea
largefiles: put whole rollback-ing process into the same "wlock" scope
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21934
diff
changeset
|
1345 result = orig(ui, repo, **opts) |
22283
cb556ea76dcd
largefiles: omit restoring standins if working parent is not rollbacked
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22196
diff
changeset
|
1346 after = repo.dirstate.parents() |
cb556ea76dcd
largefiles: omit restoring standins if working parent is not rollbacked
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22196
diff
changeset
|
1347 if before == after: |
cb556ea76dcd
largefiles: omit restoring standins if working parent is not rollbacked
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22196
diff
changeset
|
1348 return result # no need to restore standins |
cb556ea76dcd
largefiles: omit restoring standins if working parent is not rollbacked
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22196
diff
changeset
|
1349 |
22285
85bded43cc80
largefiles: restore standins according to restored dirstate
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22284
diff
changeset
|
1350 pctx = repo['.'] |
85bded43cc80
largefiles: restore standins according to restored dirstate
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22284
diff
changeset
|
1351 for f in repo.dirstate: |
85bded43cc80
largefiles: restore standins according to restored dirstate
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22284
diff
changeset
|
1352 if lfutil.isstandin(f): |
22286
3f3b9483e7ef
largefiles: unlink standins not known to the restored dirstate at rollback
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22285
diff
changeset
|
1353 orphans.discard(f) |
22285
85bded43cc80
largefiles: restore standins according to restored dirstate
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22284
diff
changeset
|
1354 if repo.dirstate[f] == 'r': |
85bded43cc80
largefiles: restore standins according to restored dirstate
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22284
diff
changeset
|
1355 repo.wvfs.unlinkpath(f, ignoremissing=True) |
85bded43cc80
largefiles: restore standins according to restored dirstate
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22284
diff
changeset
|
1356 elif f in pctx: |
85bded43cc80
largefiles: restore standins according to restored dirstate
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22284
diff
changeset
|
1357 fctx = pctx[f] |
85bded43cc80
largefiles: restore standins according to restored dirstate
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22284
diff
changeset
|
1358 repo.wwrite(f, fctx.data(), fctx.flags()) |
85bded43cc80
largefiles: restore standins according to restored dirstate
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22284
diff
changeset
|
1359 else: |
85bded43cc80
largefiles: restore standins according to restored dirstate
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22284
diff
changeset
|
1360 # content of standin is not so important in 'a', |
85bded43cc80
largefiles: restore standins according to restored dirstate
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22284
diff
changeset
|
1361 # 'm' or 'n' (coming from the 2nd parent) cases |
85bded43cc80
largefiles: restore standins according to restored dirstate
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22284
diff
changeset
|
1362 lfutil.writestandin(repo, f, '', False) |
22286
3f3b9483e7ef
largefiles: unlink standins not known to the restored dirstate at rollback
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22285
diff
changeset
|
1363 for standin in orphans: |
3f3b9483e7ef
largefiles: unlink standins not known to the restored dirstate at rollback
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22285
diff
changeset
|
1364 repo.wvfs.unlinkpath(standin, ignoremissing=True) |
22094
7d7065476fea
largefiles: put whole rollback-ing process into the same "wlock" scope
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21934
diff
changeset
|
1365 |
15794
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1366 lfdirstate = lfutil.openlfdirstate(ui, repo) |
22097
7d1eac06ab2b
largefiles: drop orphan entries from lfdristat at "hg rollback"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22096
diff
changeset
|
1367 orphans = set(lfdirstate) |
15794
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1368 lfiles = lfutil.listlfiles(repo) |
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1369 for file in lfiles: |
22096
61e526585b20
largefiles: restore R status of removed largefiles correctly at "hg rollback"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22094
diff
changeset
|
1370 lfutil.synclfdirstate(repo, lfdirstate, file, True) |
22097
7d1eac06ab2b
largefiles: drop orphan entries from lfdristat at "hg rollback"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22096
diff
changeset
|
1371 orphans.discard(file) |
7d1eac06ab2b
largefiles: drop orphan entries from lfdristat at "hg rollback"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22096
diff
changeset
|
1372 for lfile in orphans: |
7d1eac06ab2b
largefiles: drop orphan entries from lfdristat at "hg rollback"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22096
diff
changeset
|
1373 lfdirstate.drop(lfile) |
15794
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1374 lfdirstate.write() |
15168 | 1375 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
|
1376 |
41061
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
1377 @eh.wrapcommand('transplant', extension='transplant') |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16246
diff
changeset
|
1378 def overridetransplant(orig, ui, repo, *revs, **opts): |
35348
576ba8194fa8
py3: handle keyword arguments correctly in hgext/largefiles/
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35303
diff
changeset
|
1379 resuming = opts.get(r'continue') |
23274
0ec2e124fcc0
largefiles: update standins only at the 1st commit of "transplant --continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23273
diff
changeset
|
1380 repo._lfcommithooks.append(lfutil.automatedcommithook(resuming)) |
23275
fae708cb32d1
largefiles: avoid printing messages while transplanting by "_lfstatuswriters"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23274
diff
changeset
|
1381 repo._lfstatuswriters.append(lambda *msg, **opts: None) |
15982
bf502ccc46d7
largefiles: fix transplant for all cases (issue3192)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15967
diff
changeset
|
1382 try: |
bf502ccc46d7
largefiles: fix transplant for all cases (issue3192)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15967
diff
changeset
|
1383 result = orig(ui, repo, *revs, **opts) |
bf502ccc46d7
largefiles: fix transplant for all cases (issue3192)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15967
diff
changeset
|
1384 finally: |
23275
fae708cb32d1
largefiles: avoid printing messages while transplanting by "_lfstatuswriters"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23274
diff
changeset
|
1385 repo._lfstatuswriters.pop() |
23274
0ec2e124fcc0
largefiles: update standins only at the 1st commit of "transplant --continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23273
diff
changeset
|
1386 repo._lfcommithooks.pop() |
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
|
1387 return result |
16439
290850e7aa43
largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16248
diff
changeset
|
1388 |
41061
98681293c890
largefiles: port commands to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
40407
diff
changeset
|
1389 @eh.wrapcommand('cat') |
16439
290850e7aa43
largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16248
diff
changeset
|
1390 def overridecat(orig, ui, repo, file1, *pats, **opts): |
35348
576ba8194fa8
py3: handle keyword arguments correctly in hgext/largefiles/
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35303
diff
changeset
|
1391 opts = pycompat.byteskwargs(opts) |
17269
acfab0754584
largefiles: support revsets for cat
Matt Harbison <matt_harbison@yahoo.com>
parents:
17268
diff
changeset
|
1392 ctx = scmutil.revsingle(repo, opts.get('rev')) |
18491
b7da9c042b9e
largefiles: fix cat when using relative paths from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18459
diff
changeset
|
1393 err = 1 |
b7da9c042b9e
largefiles: fix cat when using relative paths from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18459
diff
changeset
|
1394 notbad = set() |
b7da9c042b9e
largefiles: fix cat when using relative paths from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18459
diff
changeset
|
1395 m = scmutil.match(ctx, (file1,) + pats, opts) |
b7da9c042b9e
largefiles: fix cat when using relative paths from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18459
diff
changeset
|
1396 origmatchfn = m.matchfn |
b7da9c042b9e
largefiles: fix cat when using relative paths from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18459
diff
changeset
|
1397 def lfmatchfn(f): |
21087
3fb2affb023f
largefiles: make cat on standins do something
Mads Kiilerich <madski@unity3d.com>
parents:
21086
diff
changeset
|
1398 if origmatchfn(f): |
3fb2affb023f
largefiles: make cat on standins do something
Mads Kiilerich <madski@unity3d.com>
parents:
21086
diff
changeset
|
1399 return True |
18491
b7da9c042b9e
largefiles: fix cat when using relative paths from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18459
diff
changeset
|
1400 lf = lfutil.splitstandin(f) |
b7da9c042b9e
largefiles: fix cat when using relative paths from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18459
diff
changeset
|
1401 if lf is None: |
21087
3fb2affb023f
largefiles: make cat on standins do something
Mads Kiilerich <madski@unity3d.com>
parents:
21086
diff
changeset
|
1402 return False |
18491
b7da9c042b9e
largefiles: fix cat when using relative paths from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18459
diff
changeset
|
1403 notbad.add(lf) |
b7da9c042b9e
largefiles: fix cat when using relative paths from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18459
diff
changeset
|
1404 return origmatchfn(lf) |
b7da9c042b9e
largefiles: fix cat when using relative paths from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18459
diff
changeset
|
1405 m.matchfn = lfmatchfn |
18974
d78a136a8036
largefiles: fix cat of non-largefiles from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18813
diff
changeset
|
1406 origbadfn = m.bad |
d78a136a8036
largefiles: fix cat of non-largefiles from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18813
diff
changeset
|
1407 def lfbadfn(f, msg): |
d78a136a8036
largefiles: fix cat of non-largefiles from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18813
diff
changeset
|
1408 if not f in notbad: |
21086
718f56c47414
largefiles: remove confusing handling of .bad return value - it is void
Mads Kiilerich <madski@unity3d.com>
parents:
21081
diff
changeset
|
1409 origbadfn(f, msg) |
18974
d78a136a8036
largefiles: fix cat of non-largefiles from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18813
diff
changeset
|
1410 m.bad = lfbadfn |
24670
dfb86af18a35
treemanifest: optimize treemanifest._walk() to skip directories
Drew Gottlieb <drgott@google.com>
parents:
24534
diff
changeset
|
1411 |
dfb86af18a35
treemanifest: optimize treemanifest._walk() to skip directories
Drew Gottlieb <drgott@google.com>
parents:
24534
diff
changeset
|
1412 origvisitdirfn = m.visitdir |
dfb86af18a35
treemanifest: optimize treemanifest._walk() to skip directories
Drew Gottlieb <drgott@google.com>
parents:
24534
diff
changeset
|
1413 def lfvisitdirfn(dir): |
dfb86af18a35
treemanifest: optimize treemanifest._walk() to skip directories
Drew Gottlieb <drgott@google.com>
parents:
24534
diff
changeset
|
1414 if dir == lfutil.shortname: |
dfb86af18a35
treemanifest: optimize treemanifest._walk() to skip directories
Drew Gottlieb <drgott@google.com>
parents:
24534
diff
changeset
|
1415 return True |
dfb86af18a35
treemanifest: optimize treemanifest._walk() to skip directories
Drew Gottlieb <drgott@google.com>
parents:
24534
diff
changeset
|
1416 ret = origvisitdirfn(dir) |
dfb86af18a35
treemanifest: optimize treemanifest._walk() to skip directories
Drew Gottlieb <drgott@google.com>
parents:
24534
diff
changeset
|
1417 if ret: |
dfb86af18a35
treemanifest: optimize treemanifest._walk() to skip directories
Drew Gottlieb <drgott@google.com>
parents:
24534
diff
changeset
|
1418 return ret |
dfb86af18a35
treemanifest: optimize treemanifest._walk() to skip directories
Drew Gottlieb <drgott@google.com>
parents:
24534
diff
changeset
|
1419 lf = lfutil.splitstandin(dir) |
dfb86af18a35
treemanifest: optimize treemanifest._walk() to skip directories
Drew Gottlieb <drgott@google.com>
parents:
24534
diff
changeset
|
1420 if lf is None: |
dfb86af18a35
treemanifest: optimize treemanifest._walk() to skip directories
Drew Gottlieb <drgott@google.com>
parents:
24534
diff
changeset
|
1421 return False |
dfb86af18a35
treemanifest: optimize treemanifest._walk() to skip directories
Drew Gottlieb <drgott@google.com>
parents:
24534
diff
changeset
|
1422 return origvisitdirfn(lf) |
dfb86af18a35
treemanifest: optimize treemanifest._walk() to skip directories
Drew Gottlieb <drgott@google.com>
parents:
24534
diff
changeset
|
1423 m.visitdir = lfvisitdirfn |
dfb86af18a35
treemanifest: optimize treemanifest._walk() to skip directories
Drew Gottlieb <drgott@google.com>
parents:
24534
diff
changeset
|
1424 |
18491
b7da9c042b9e
largefiles: fix cat when using relative paths from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18459
diff
changeset
|
1425 for f in ctx.walk(m): |
36205
976e1cfb2f64
cmdutil: pass ctx to makefileobj() in place of repo/node pair (API)
Yuya Nishihara <yuya@tcha.org>
parents:
36002
diff
changeset
|
1426 with cmdutil.makefileobj(ctx, opts.get('output'), pathname=f) as fp: |
30142
3dcaf1c4e90d
largefiles: use context for file closing
Mads Kiilerich <madski@unity3d.com>
parents:
29420
diff
changeset
|
1427 lf = lfutil.splitstandin(f) |
3dcaf1c4e90d
largefiles: use context for file closing
Mads Kiilerich <madski@unity3d.com>
parents:
29420
diff
changeset
|
1428 if lf is None or origmatchfn(f): |
3dcaf1c4e90d
largefiles: use context for file closing
Mads Kiilerich <madski@unity3d.com>
parents:
29420
diff
changeset
|
1429 # duplicating unreachable code from commands.cat |
3dcaf1c4e90d
largefiles: use context for file closing
Mads Kiilerich <madski@unity3d.com>
parents:
29420
diff
changeset
|
1430 data = ctx[f].data() |
3dcaf1c4e90d
largefiles: use context for file closing
Mads Kiilerich <madski@unity3d.com>
parents:
29420
diff
changeset
|
1431 if opts.get('decode'): |
3dcaf1c4e90d
largefiles: use context for file closing
Mads Kiilerich <madski@unity3d.com>
parents:
29420
diff
changeset
|
1432 data = repo.wwritedata(f, data) |
3dcaf1c4e90d
largefiles: use context for file closing
Mads Kiilerich <madski@unity3d.com>
parents:
29420
diff
changeset
|
1433 fp.write(data) |
3dcaf1c4e90d
largefiles: use context for file closing
Mads Kiilerich <madski@unity3d.com>
parents:
29420
diff
changeset
|
1434 else: |
31735
3e37b479ce2f
largefiles: replace readstandin() by readasstandin()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31659
diff
changeset
|
1435 hash = lfutil.readasstandin(ctx[f]) |
30142
3dcaf1c4e90d
largefiles: use context for file closing
Mads Kiilerich <madski@unity3d.com>
parents:
29420
diff
changeset
|
1436 if not lfutil.inusercache(repo.ui, hash): |
3dcaf1c4e90d
largefiles: use context for file closing
Mads Kiilerich <madski@unity3d.com>
parents:
29420
diff
changeset
|
1437 store = storefactory.openstore(repo) |
3dcaf1c4e90d
largefiles: use context for file closing
Mads Kiilerich <madski@unity3d.com>
parents:
29420
diff
changeset
|
1438 success, missing = store.get([(lf, hash)]) |
3dcaf1c4e90d
largefiles: use context for file closing
Mads Kiilerich <madski@unity3d.com>
parents:
29420
diff
changeset
|
1439 if len(success) != 1: |
3dcaf1c4e90d
largefiles: use context for file closing
Mads Kiilerich <madski@unity3d.com>
parents:
29420
diff
changeset
|
1440 raise error.Abort( |
3dcaf1c4e90d
largefiles: use context for file closing
Mads Kiilerich <madski@unity3d.com>
parents:
29420
diff
changeset
|
1441 _('largefile %s is not in cache and could not be ' |
3dcaf1c4e90d
largefiles: use context for file closing
Mads Kiilerich <madski@unity3d.com>
parents:
29420
diff
changeset
|
1442 'downloaded') % lf) |
3dcaf1c4e90d
largefiles: use context for file closing
Mads Kiilerich <madski@unity3d.com>
parents:
29420
diff
changeset
|
1443 path = lfutil.usercachepath(repo.ui, hash) |
3dcaf1c4e90d
largefiles: use context for file closing
Mads Kiilerich <madski@unity3d.com>
parents:
29420
diff
changeset
|
1444 with open(path, "rb") as fpin: |
30181
7356e6b1f5b8
util: increase filechunkiter size to 128k
Mads Kiilerich <madski@unity3d.com>
parents:
30142
diff
changeset
|
1445 for chunk in util.filechunkiter(fpin): |
30142
3dcaf1c4e90d
largefiles: use context for file closing
Mads Kiilerich <madski@unity3d.com>
parents:
29420
diff
changeset
|
1446 fp.write(chunk) |
18974
d78a136a8036
largefiles: fix cat of non-largefiles from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18813
diff
changeset
|
1447 err = 0 |
18491
b7da9c042b9e
largefiles: fix cat when using relative paths from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18459
diff
changeset
|
1448 return err |
17878
d1d0140287b8
largefiles: don't copy largefiles from working dir to the store while converting
Matt Harbison <matt_harbison@yahoo.com>
parents:
17847
diff
changeset
|
1449 |
41062
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
1450 @eh.wrapfunction(merge, 'update') |
27344
43c00ca887d1
merge: have merge.update use a matcher instead of partial fn
Augie Fackler <augie@google.com>
parents:
27050
diff
changeset
|
1451 def mergeupdate(orig, repo, node, branchmerge, force, |
22288
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
1452 *args, **kwargs): |
35348
576ba8194fa8
py3: handle keyword arguments correctly in hgext/largefiles/
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35303
diff
changeset
|
1453 matcher = kwargs.get(r'matcher', None) |
27344
43c00ca887d1
merge: have merge.update use a matcher instead of partial fn
Augie Fackler <augie@google.com>
parents:
27050
diff
changeset
|
1454 # note if this is a partial update |
43c00ca887d1
merge: have merge.update use a matcher instead of partial fn
Augie Fackler <augie@google.com>
parents:
27050
diff
changeset
|
1455 partial = matcher and not matcher.always() |
27826
f087b7095381
with: use context manager for wlock in mergeupdate
Bryan O'Sullivan <bryano@fb.com>
parents:
27825
diff
changeset
|
1456 with repo.wlock(): |
22288
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
1457 # branch | | | |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
1458 # merge | force | partial | action |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
1459 # -------+-------+---------+-------------- |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
1460 # x | x | x | linear-merge |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
1461 # o | x | x | branch-merge |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
1462 # x | o | x | overwrite (as clean update) |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
1463 # o | o | x | force-branch-merge (*1) |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
1464 # x | x | o | (*) |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
1465 # o | x | o | (*) |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
1466 # x | o | o | overwrite (as revert) |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
1467 # o | o | o | (*) |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
1468 # |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
1469 # (*) don't care |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
1470 # (*1) deprecated, but used internally (e.g: "rebase --collapse") |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
1471 |
24787
9d5c27890790
largefiles: for update -C, only update largefiles when necessary
Mads Kiilerich <madski@unity3d.com>
parents:
24782
diff
changeset
|
1472 lfdirstate = lfutil.openlfdirstate(repo.ui, repo) |
29318
2572bb2e06f8
largefiles: rename match_ to matchmod import in overrides
liscju <piotr.listkiewicz@gmail.com>
parents:
29311
diff
changeset
|
1473 unsure, s = lfdirstate.status(matchmod.always(repo.root, |
24787
9d5c27890790
largefiles: for update -C, only update largefiles when necessary
Mads Kiilerich <madski@unity3d.com>
parents:
24782
diff
changeset
|
1474 repo.getcwd()), |
34344
ac0cd81e2f83
dirstate: use keyword arguments to clarify status()'s callers
Martin von Zweigbergk <martinvonz@google.com>
parents:
34303
diff
changeset
|
1475 subrepos=[], ignored=False, |
ac0cd81e2f83
dirstate: use keyword arguments to clarify status()'s callers
Martin von Zweigbergk <martinvonz@google.com>
parents:
34303
diff
changeset
|
1476 clean=True, unknown=False) |
30190
56b930238036
largefiles: more safe handling of interruptions while updating modifications
Mads Kiilerich <madski@unity3d.com>
parents:
29420
diff
changeset
|
1477 oldclean = set(s.clean) |
24787
9d5c27890790
largefiles: for update -C, only update largefiles when necessary
Mads Kiilerich <madski@unity3d.com>
parents:
24782
diff
changeset
|
1478 pctx = repo['.'] |
31653
32d998dc2a00
largefiles: omit updating newly added standin at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31618
diff
changeset
|
1479 dctx = repo[node] |
24787
9d5c27890790
largefiles: for update -C, only update largefiles when necessary
Mads Kiilerich <madski@unity3d.com>
parents:
24782
diff
changeset
|
1480 for lfile in unsure + s.modified: |
9d5c27890790
largefiles: for update -C, only update largefiles when necessary
Mads Kiilerich <madski@unity3d.com>
parents:
24782
diff
changeset
|
1481 lfileabs = repo.wvfs.join(lfile) |
28715
a7f7b7acf489
largefiles: replace invocation of os.path module by vfs in overrides.py
liscju <piotr.listkiewicz@gmail.com>
parents:
28394
diff
changeset
|
1482 if not repo.wvfs.exists(lfileabs): |
24787
9d5c27890790
largefiles: for update -C, only update largefiles when necessary
Mads Kiilerich <madski@unity3d.com>
parents:
24782
diff
changeset
|
1483 continue |
31617
1f6c932862e5
largefiles: replace hashrepofile by hashfile (API)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31616
diff
changeset
|
1484 lfhash = lfutil.hashfile(lfileabs) |
24787
9d5c27890790
largefiles: for update -C, only update largefiles when necessary
Mads Kiilerich <madski@unity3d.com>
parents:
24782
diff
changeset
|
1485 standin = lfutil.standin(lfile) |
9d5c27890790
largefiles: for update -C, only update largefiles when necessary
Mads Kiilerich <madski@unity3d.com>
parents:
24782
diff
changeset
|
1486 lfutil.writestandin(repo, standin, lfhash, |
9d5c27890790
largefiles: for update -C, only update largefiles when necessary
Mads Kiilerich <madski@unity3d.com>
parents:
24782
diff
changeset
|
1487 lfutil.getexecutable(lfileabs)) |
9d5c27890790
largefiles: for update -C, only update largefiles when necessary
Mads Kiilerich <madski@unity3d.com>
parents:
24782
diff
changeset
|
1488 if (standin in pctx and |
31735
3e37b479ce2f
largefiles: replace readstandin() by readasstandin()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31659
diff
changeset
|
1489 lfhash == lfutil.readasstandin(pctx[standin])): |
30190
56b930238036
largefiles: more safe handling of interruptions while updating modifications
Mads Kiilerich <madski@unity3d.com>
parents:
29420
diff
changeset
|
1490 oldclean.add(lfile) |
24787
9d5c27890790
largefiles: for update -C, only update largefiles when necessary
Mads Kiilerich <madski@unity3d.com>
parents:
24782
diff
changeset
|
1491 for lfile in s.added: |
31653
32d998dc2a00
largefiles: omit updating newly added standin at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31618
diff
changeset
|
1492 fstandin = lfutil.standin(lfile) |
32d998dc2a00
largefiles: omit updating newly added standin at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31618
diff
changeset
|
1493 if fstandin not in dctx: |
32d998dc2a00
largefiles: omit updating newly added standin at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31618
diff
changeset
|
1494 # in this case, content of standin file is meaningless |
32d998dc2a00
largefiles: omit updating newly added standin at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31618
diff
changeset
|
1495 # (in dctx, lfile is unknown, or normal file) |
32d998dc2a00
largefiles: omit updating newly added standin at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31618
diff
changeset
|
1496 continue |
31659
0eec36112e58
largefiles: add lfile argument to updatestandin() for efficiency (API)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31656
diff
changeset
|
1497 lfutil.updatestandin(repo, lfile, fstandin) |
30190
56b930238036
largefiles: more safe handling of interruptions while updating modifications
Mads Kiilerich <madski@unity3d.com>
parents:
29420
diff
changeset
|
1498 # mark all clean largefiles as dirty, just in case the update gets |
56b930238036
largefiles: more safe handling of interruptions while updating modifications
Mads Kiilerich <madski@unity3d.com>
parents:
29420
diff
changeset
|
1499 # interrupted before largefiles and lfdirstate are synchronized |
56b930238036
largefiles: more safe handling of interruptions while updating modifications
Mads Kiilerich <madski@unity3d.com>
parents:
29420
diff
changeset
|
1500 for lfile in oldclean: |
56b930238036
largefiles: more safe handling of interruptions while updating modifications
Mads Kiilerich <madski@unity3d.com>
parents:
29420
diff
changeset
|
1501 lfdirstate.normallookup(lfile) |
24787
9d5c27890790
largefiles: for update -C, only update largefiles when necessary
Mads Kiilerich <madski@unity3d.com>
parents:
24782
diff
changeset
|
1502 lfdirstate.write() |
22288
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
1503 |
24787
9d5c27890790
largefiles: for update -C, only update largefiles when necessary
Mads Kiilerich <madski@unity3d.com>
parents:
24782
diff
changeset
|
1504 oldstandins = lfutil.getstandinsstate(repo) |
34303
575097b4dce0
largefiles: force an on-disk merge
Phil Cohen <phillco@fb.com>
parents:
34122
diff
changeset
|
1505 # Make sure the merge runs on disk, not in-memory. largefiles is not a |
575097b4dce0
largefiles: force an on-disk merge
Phil Cohen <phillco@fb.com>
parents:
34122
diff
changeset
|
1506 # good candidate for in-memory merge (large files, custom dirstate, |
575097b4dce0
largefiles: force an on-disk merge
Phil Cohen <phillco@fb.com>
parents:
34122
diff
changeset
|
1507 # matcher usage). |
35348
576ba8194fa8
py3: handle keyword arguments correctly in hgext/largefiles/
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35303
diff
changeset
|
1508 kwargs[r'wc'] = repo[None] |
27344
43c00ca887d1
merge: have merge.update use a matcher instead of partial fn
Augie Fackler <augie@google.com>
parents:
27050
diff
changeset
|
1509 result = orig(repo, node, branchmerge, force, *args, **kwargs) |
22288
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
1510 |
24787
9d5c27890790
largefiles: for update -C, only update largefiles when necessary
Mads Kiilerich <madski@unity3d.com>
parents:
24782
diff
changeset
|
1511 newstandins = lfutil.getstandinsstate(repo) |
9d5c27890790
largefiles: for update -C, only update largefiles when necessary
Mads Kiilerich <madski@unity3d.com>
parents:
24782
diff
changeset
|
1512 filelist = lfutil.getlfilestoupdate(oldstandins, newstandins) |
30190
56b930238036
largefiles: more safe handling of interruptions while updating modifications
Mads Kiilerich <madski@unity3d.com>
parents:
29420
diff
changeset
|
1513 |
56b930238036
largefiles: more safe handling of interruptions while updating modifications
Mads Kiilerich <madski@unity3d.com>
parents:
29420
diff
changeset
|
1514 # to avoid leaving all largefiles as dirty and thus rehash them, mark |
56b930238036
largefiles: more safe handling of interruptions while updating modifications
Mads Kiilerich <madski@unity3d.com>
parents:
29420
diff
changeset
|
1515 # all the ones that didn't change as clean |
56b930238036
largefiles: more safe handling of interruptions while updating modifications
Mads Kiilerich <madski@unity3d.com>
parents:
29420
diff
changeset
|
1516 for lfile in oldclean.difference(filelist): |
56b930238036
largefiles: more safe handling of interruptions while updating modifications
Mads Kiilerich <madski@unity3d.com>
parents:
29420
diff
changeset
|
1517 lfdirstate.normal(lfile) |
56b930238036
largefiles: more safe handling of interruptions while updating modifications
Mads Kiilerich <madski@unity3d.com>
parents:
29420
diff
changeset
|
1518 lfdirstate.write() |
56b930238036
largefiles: more safe handling of interruptions while updating modifications
Mads Kiilerich <madski@unity3d.com>
parents:
29420
diff
changeset
|
1519 |
24787
9d5c27890790
largefiles: for update -C, only update largefiles when necessary
Mads Kiilerich <madski@unity3d.com>
parents:
24782
diff
changeset
|
1520 if branchmerge or force or partial: |
9d5c27890790
largefiles: for update -C, only update largefiles when necessary
Mads Kiilerich <madski@unity3d.com>
parents:
24782
diff
changeset
|
1521 filelist.extend(s.deleted + s.removed) |
22288
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
1522 |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
1523 lfcommands.updatelfiles(repo.ui, repo, filelist=filelist, |
24788
b8c3a0994b37
largefiles: always consider updatelfiles 'checked' parameter set
Mads Kiilerich <madski@unity3d.com>
parents:
24787
diff
changeset
|
1524 normallookup=partial) |
22288
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
1525 |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
1526 return result |
22289
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
1527 |
41062
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
1528 @eh.wrapfunction(scmutil, 'marktouched') |
22289
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
1529 def scmutilmarktouched(orig, repo, files, *args, **kwargs): |
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
1530 result = orig(repo, files, *args, **kwargs) |
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
1531 |
31613
5c1d3f1b8f44
largefiles: omit redundant isstandin() before splitstandin()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31309
diff
changeset
|
1532 filelist = [] |
5c1d3f1b8f44
largefiles: omit redundant isstandin() before splitstandin()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31309
diff
changeset
|
1533 for f in files: |
5c1d3f1b8f44
largefiles: omit redundant isstandin() before splitstandin()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31309
diff
changeset
|
1534 lf = lfutil.splitstandin(f) |
5c1d3f1b8f44
largefiles: omit redundant isstandin() before splitstandin()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31309
diff
changeset
|
1535 if lf is not None: |
5c1d3f1b8f44
largefiles: omit redundant isstandin() before splitstandin()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
31309
diff
changeset
|
1536 filelist.append(lf) |
22289
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
1537 if filelist: |
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
1538 lfcommands.updatelfiles(repo.ui, repo, filelist=filelist, |
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
1539 printmessage=False, normallookup=True) |
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
1540 |
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
1541 return result |
35303
67b7e39b441b
largefiles: allow to run 'debugupgraderepo' on repo with largefiles
Boris Feld <boris.feld@octobus.net>
parents:
34756
diff
changeset
|
1542 |
41062
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
1543 @eh.wrapfunction(upgrade, 'preservedrequirements') |
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
1544 @eh.wrapfunction(upgrade, 'supporteddestrequirements') |
35303
67b7e39b441b
largefiles: allow to run 'debugupgraderepo' on repo with largefiles
Boris Feld <boris.feld@octobus.net>
parents:
34756
diff
changeset
|
1545 def upgraderequirements(orig, repo): |
67b7e39b441b
largefiles: allow to run 'debugupgraderepo' on repo with largefiles
Boris Feld <boris.feld@octobus.net>
parents:
34756
diff
changeset
|
1546 reqs = orig(repo) |
67b7e39b441b
largefiles: allow to run 'debugupgraderepo' on repo with largefiles
Boris Feld <boris.feld@octobus.net>
parents:
34756
diff
changeset
|
1547 if 'largefiles' in repo.requirements: |
67b7e39b441b
largefiles: allow to run 'debugupgraderepo' on repo with largefiles
Boris Feld <boris.feld@octobus.net>
parents:
34756
diff
changeset
|
1548 reqs.add('largefiles') |
67b7e39b441b
largefiles: allow to run 'debugupgraderepo' on repo with largefiles
Boris Feld <boris.feld@octobus.net>
parents:
34756
diff
changeset
|
1549 return reqs |
35564
cf841f2b5a72
largefiles: add support for 'largefiles://' url scheme
Boris Feld <boris.feld@octobus.net>
parents:
35348
diff
changeset
|
1550 |
cf841f2b5a72
largefiles: add support for 'largefiles://' url scheme
Boris Feld <boris.feld@octobus.net>
parents:
35348
diff
changeset
|
1551 _lfscheme = 'largefile://' |
41062
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
1552 |
0a7f582f6f1f
largefiles: port wrapped functions to exthelper
Matt Harbison <matt_harbison@yahoo.com>
parents:
41061
diff
changeset
|
1553 @eh.wrapfunction(urlmod, 'open') |
35564
cf841f2b5a72
largefiles: add support for 'largefiles://' url scheme
Boris Feld <boris.feld@octobus.net>
parents:
35348
diff
changeset
|
1554 def openlargefile(orig, ui, url_, data=None): |
cf841f2b5a72
largefiles: add support for 'largefiles://' url scheme
Boris Feld <boris.feld@octobus.net>
parents:
35348
diff
changeset
|
1555 if url_.startswith(_lfscheme): |
cf841f2b5a72
largefiles: add support for 'largefiles://' url scheme
Boris Feld <boris.feld@octobus.net>
parents:
35348
diff
changeset
|
1556 if data: |
cf841f2b5a72
largefiles: add support for 'largefiles://' url scheme
Boris Feld <boris.feld@octobus.net>
parents:
35348
diff
changeset
|
1557 msg = "cannot use data on a 'largefile://' url" |
cf841f2b5a72
largefiles: add support for 'largefiles://' url scheme
Boris Feld <boris.feld@octobus.net>
parents:
35348
diff
changeset
|
1558 raise error.ProgrammingError(msg) |
cf841f2b5a72
largefiles: add support for 'largefiles://' url scheme
Boris Feld <boris.feld@octobus.net>
parents:
35348
diff
changeset
|
1559 lfid = url_[len(_lfscheme):] |
cf841f2b5a72
largefiles: add support for 'largefiles://' url scheme
Boris Feld <boris.feld@octobus.net>
parents:
35348
diff
changeset
|
1560 return storefactory.getlfile(ui, lfid) |
cf841f2b5a72
largefiles: add support for 'largefiles://' url scheme
Boris Feld <boris.feld@octobus.net>
parents:
35348
diff
changeset
|
1561 else: |
cf841f2b5a72
largefiles: add support for 'largefiles://' url scheme
Boris Feld <boris.feld@octobus.net>
parents:
35348
diff
changeset
|
1562 return orig(ui, url_, data=data) |