Mercurial > hg-stable
annotate hgext/largefiles/reposetup.py @ 23139:e53f6b72a0e4
spelling: fixes from proofreading of spell checker issues
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Thu, 17 Apr 2014 22:47:38 +0200 |
parents | 24600c9d7f4e |
children | 5311de37b86f |
rev | line source |
---|---|
15168 | 1 # Copyright 2009-2010 Gregory P. Ward |
2 # Copyright 2009-2010 Intelerad Medical Systems Incorporated | |
3 # Copyright 2010-2011 Fog Creek Software | |
4 # Copyright 2010-2011 Unity Technologies | |
5 # | |
6 # This software may be used and distributed according to the terms of the | |
7 # GNU General Public License version 2 or any later version. | |
8 | |
9 '''setup for largefiles repositories: reposetup''' | |
10 import copy | |
11 import os | |
12 | |
21044
52a5eabf1f2f
largefiles: reuse "findcommonoutgoing()" result at "hg push"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21042
diff
changeset
|
13 from mercurial import error, manifest, match as match_, util |
15168 | 14 from mercurial.i18n import _ |
22914
c95db3208a33
status: update various other methods to return new class
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22911
diff
changeset
|
15 from mercurial import localrepo, scmutil |
15168 | 16 |
17 import lfcommands | |
18 import lfutil | |
19 | |
20 def reposetup(ui, repo): | |
20858
bc56ec9e64df
hg: introduce "wirepeersetupfuncs" to setup wire peer by extensions (issue4109)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20177
diff
changeset
|
21 # wire repositories should be given new wireproto functions |
bc56ec9e64df
hg: introduce "wirepeersetupfuncs" to setup wire peer by extensions (issue4109)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20177
diff
changeset
|
22 # by "proto.wirereposetup()" via "hg.wirepeersetupfuncs" |
15168 | 23 if not repo.local(): |
20858
bc56ec9e64df
hg: introduce "wirepeersetupfuncs" to setup wire peer by extensions (issue4109)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20177
diff
changeset
|
24 return |
15168 | 25 |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16141
diff
changeset
|
26 class lfilesrepo(repo.__class__): |
15168 | 27 lfstatus = False |
28 def status_nolfiles(self, *args, **kwargs): | |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16141
diff
changeset
|
29 return super(lfilesrepo, self).status(*args, **kwargs) |
15168 | 30 |
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15250
diff
changeset
|
31 # When lfstatus is set, return a context that gives the names |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15250
diff
changeset
|
32 # of largefiles instead of their corresponding standins and |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15250
diff
changeset
|
33 # identifies the largefiles as always binary, regardless of |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15250
diff
changeset
|
34 # their actual contents. |
15168 | 35 def __getitem__(self, changeid): |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16141
diff
changeset
|
36 ctx = super(lfilesrepo, self).__getitem__(changeid) |
15168 | 37 if self.lfstatus: |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16141
diff
changeset
|
38 class lfilesmanifestdict(manifest.manifestdict): |
15168 | 39 def __contains__(self, filename): |
22516
5e27eccbc0a4
largefiles: extract 'orig' method in lfilesmanifestdict.__contains__
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22515
diff
changeset
|
40 orig = super(lfilesmanifestdict, self).__contains__ |
5e27eccbc0a4
largefiles: extract 'orig' method in lfilesmanifestdict.__contains__
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22515
diff
changeset
|
41 return orig(filename) or orig(lfutil.standin(filename)) |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16141
diff
changeset
|
42 class lfilesctx(ctx.__class__): |
15168 | 43 def files(self): |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16141
diff
changeset
|
44 filenames = super(lfilesctx, self).files() |
15628
2b40513384ca
largefiles: use lfutil functions
Martin Geisler <mg@aragost.com>
parents:
15626
diff
changeset
|
45 return [lfutil.splitstandin(f) or f for f in filenames] |
15168 | 46 def manifest(self): |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16141
diff
changeset
|
47 man1 = super(lfilesctx, self).manifest() |
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16141
diff
changeset
|
48 man1.__class__ = lfilesmanifestdict |
15168 | 49 return man1 |
50 def filectx(self, path, fileid=None, filelog=None): | |
22517
e54a001ace06
largefiles: extract 'orig' method in lfilesctx.filectx
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22516
diff
changeset
|
51 orig = super(lfilesctx, self).filectx |
15168 | 52 try: |
16141
f346de4dff57
largefiles: don't break filesets
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
16110
diff
changeset
|
53 if filelog is not None: |
22517
e54a001ace06
largefiles: extract 'orig' method in lfilesctx.filectx
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22516
diff
changeset
|
54 result = orig(path, fileid, filelog) |
16141
f346de4dff57
largefiles: don't break filesets
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
16110
diff
changeset
|
55 else: |
22517
e54a001ace06
largefiles: extract 'orig' method in lfilesctx.filectx
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22516
diff
changeset
|
56 result = orig(path, fileid) |
15168 | 57 except error.LookupError: |
58 # Adding a null character will cause Mercurial to | |
59 # identify this as a binary file. | |
16141
f346de4dff57
largefiles: don't break filesets
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
16110
diff
changeset
|
60 if filelog is not None: |
22517
e54a001ace06
largefiles: extract 'orig' method in lfilesctx.filectx
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22516
diff
changeset
|
61 result = orig(lfutil.standin(path), fileid, |
e54a001ace06
largefiles: extract 'orig' method in lfilesctx.filectx
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22516
diff
changeset
|
62 filelog) |
16141
f346de4dff57
largefiles: don't break filesets
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
16110
diff
changeset
|
63 else: |
22517
e54a001ace06
largefiles: extract 'orig' method in lfilesctx.filectx
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22516
diff
changeset
|
64 result = orig(lfutil.standin(path), fileid) |
15168 | 65 olddata = result.data |
66 result.data = lambda: olddata() + '\0' | |
67 return result | |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16141
diff
changeset
|
68 ctx.__class__ = lfilesctx |
15168 | 69 return ctx |
70 | |
71 # Figure out the status of big files and insert them into the | |
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15250
diff
changeset
|
72 # appropriate list in the result. Also removes standin files |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15250
diff
changeset
|
73 # from the listing. Revert to the original status if |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15250
diff
changeset
|
74 # self.lfstatus is False. |
18012
848c428bb5ee
largefile: status is buggy on repoproxy, so run unfiltered
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17803
diff
changeset
|
75 # XXX large file status is buggy when used on repo proxy. |
848c428bb5ee
largefile: status is buggy on repoproxy, so run unfiltered
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17803
diff
changeset
|
76 # XXX this needs to be investigated. |
18016
2a393df0f5cc
clfilter: rename `unfilteredmeth` to `unfilteredmethod`
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18012
diff
changeset
|
77 @localrepo.unfilteredmethod |
15168 | 78 def status(self, node1='.', node2=None, match=None, ignored=False, |
79 clean=False, unknown=False, listsubrepos=False): | |
80 listignored, listclean, listunknown = ignored, clean, unknown | |
22518
52dd6e25121f
largefiles: extract 'orig' method in reposetup.status
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22517
diff
changeset
|
81 orig = super(lfilesrepo, self).status |
15168 | 82 if not self.lfstatus: |
22518
52dd6e25121f
largefiles: extract 'orig' method in reposetup.status
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22517
diff
changeset
|
83 return orig(node1, node2, match, listignored, listclean, |
52dd6e25121f
largefiles: extract 'orig' method in reposetup.status
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22517
diff
changeset
|
84 listunknown, listsubrepos) |
22515
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
85 |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
86 # some calls in this function rely on the old version of status |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
87 self.lfstatus = False |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
88 ctx1 = self[node1] |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
89 ctx2 = self[node2] |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
90 working = ctx2.rev() is None |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
91 parentworking = working and ctx1 == self['.'] |
15168 | 92 |
22515
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
93 if match is None: |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
94 match = match_.always(self.root, self.getcwd()) |
15168 | 95 |
22515
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
96 wlock = None |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
97 try: |
19056
ac41bb76c737
largefiles: wlock in status before lfdirstate.write()
Mads Kiilerich <madski@unity3d.com>
parents:
18969
diff
changeset
|
98 try: |
22515
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
99 # updating the dirstate is optional |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
100 # so we don't wait on the lock |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
101 wlock = self.wlock(False) |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
102 except error.LockError: |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
103 pass |
15653
93c77d5b9752
largefiles: optimize status when files are specified (issue3144)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15630
diff
changeset
|
104 |
22515
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
105 # First check if there were files specified on the |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
106 # command line. If there were, and none of them were |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
107 # largefiles, we should just bail here and let super |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
108 # handle it -- thus gaining a big performance boost. |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
109 lfdirstate = lfutil.openlfdirstate(ui, self) |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
110 if match.files() and not match.anypats(): |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
111 for f in lfdirstate: |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
112 if match(f): |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
113 break |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
114 else: |
22518
52dd6e25121f
largefiles: extract 'orig' method in reposetup.status
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22517
diff
changeset
|
115 return orig(node1, node2, match, listignored, listclean, |
52dd6e25121f
largefiles: extract 'orig' method in reposetup.status
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22517
diff
changeset
|
116 listunknown, listsubrepos) |
15168 | 117 |
22515
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
118 # Create a copy of match that matches standins instead |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
119 # of largefiles. |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
120 def tostandins(files): |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
121 if not working: |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
122 return files |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
123 newfiles = [] |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
124 dirstate = self.dirstate |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
125 for f in files: |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
126 sf = lfutil.standin(f) |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
127 if sf in dirstate: |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
128 newfiles.append(sf) |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
129 elif sf in dirstate.dirs(): |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
130 # Directory entries could be regular or |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
131 # standin, check both |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
132 newfiles.extend((f, sf)) |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
133 else: |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
134 newfiles.append(f) |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
135 return newfiles |
18149
2dcc3653b361
largefiles: unindent code
Mads Kiilerich <madski@unity3d.com>
parents:
18148
diff
changeset
|
136 |
22515
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
137 m = copy.copy(match) |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
138 m._files = tostandins(m._files) |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
139 |
22518
52dd6e25121f
largefiles: extract 'orig' method in reposetup.status
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22517
diff
changeset
|
140 result = orig(node1, node2, m, ignored, clean, unknown, |
52dd6e25121f
largefiles: extract 'orig' method in reposetup.status
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22517
diff
changeset
|
141 listsubrepos) |
22515
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
142 if working: |
15617
74e691b141c4
largefiles: optimize performance of status on largefiles repos (issue3136)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15385
diff
changeset
|
143 |
22515
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
144 def sfindirstate(f): |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
145 sf = lfutil.standin(f) |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
146 dirstate = self.dirstate |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
147 return sf in dirstate or sf in dirstate.dirs() |
18149
2dcc3653b361
largefiles: unindent code
Mads Kiilerich <madski@unity3d.com>
parents:
18148
diff
changeset
|
148 |
22515
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
149 match._files = [f for f in match._files |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
150 if sfindirstate(f)] |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
151 # Don't waste time getting the ignored and unknown |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
152 # files from lfdirstate |
22911
509e2cbee679
dirstate: separate 'lookup' status field from others
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22525
diff
changeset
|
153 unsure, s = lfdirstate.status(match, [], False, listclean, |
509e2cbee679
dirstate: separate 'lookup' status field from others
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22525
diff
changeset
|
154 False) |
22919
1982bdb7e2cc
largefiles: access status fields by name rather than index
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22914
diff
changeset
|
155 (modified, added, removed, clean) = (s.modified, s.added, |
1982bdb7e2cc
largefiles: access status fields by name rather than index
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22914
diff
changeset
|
156 s.removed, s.clean) |
22515
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
157 if parentworking: |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
158 for lfile in unsure: |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
159 standin = lfutil.standin(lfile) |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
160 if standin not in ctx1: |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
161 # from second parent |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
162 modified.append(lfile) |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
163 elif ctx1[standin].data().strip() \ |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
164 != lfutil.hashfile(self.wjoin(lfile)): |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
165 modified.append(lfile) |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
166 else: |
22523
8cd91f481ffd
largefiles: remove unnecessary clearing of status fields
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22518
diff
changeset
|
167 if listclean: |
8cd91f481ffd
largefiles: remove unnecessary clearing of status fields
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22518
diff
changeset
|
168 clean.append(lfile) |
22515
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
169 lfdirstate.normal(lfile) |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
170 else: |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
171 tocheck = unsure + modified + added + clean |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
172 modified, added, clean = [], [], [] |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
173 |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
174 for lfile in tocheck: |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
175 standin = lfutil.standin(lfile) |
23043
244dbb646ab7
largefiles: inline redundant inctx function in status
Mads Kiilerich <madski@unity3d.com>
parents:
22919
diff
changeset
|
176 if standin in ctx1: |
23090
24600c9d7f4e
largefiles: add examination of exec bit in "hg status --rev REV" case
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23089
diff
changeset
|
177 abslfile = self.wjoin(lfile) |
24600c9d7f4e
largefiles: add examination of exec bit in "hg status --rev REV" case
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23089
diff
changeset
|
178 if ((ctx1[standin].data().strip() != |
24600c9d7f4e
largefiles: add examination of exec bit in "hg status --rev REV" case
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23089
diff
changeset
|
179 lfutil.hashfile(abslfile)) or |
24600c9d7f4e
largefiles: add examination of exec bit in "hg status --rev REV" case
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23089
diff
changeset
|
180 (('x' in ctx1.flags(standin)) != |
24600c9d7f4e
largefiles: add examination of exec bit in "hg status --rev REV" case
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23089
diff
changeset
|
181 bool(lfutil.getexecutable(abslfile)))): |
15168 | 182 modified.append(lfile) |
22523
8cd91f481ffd
largefiles: remove unnecessary clearing of status fields
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22518
diff
changeset
|
183 elif listclean: |
15168 | 184 clean.append(lfile) |
22515
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
185 else: |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
186 added.append(lfile) |
15168 | 187 |
23089
197dc4580da2
largefiles: ignore removal status of files not managed in the target context
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23044
diff
changeset
|
188 # at this point, 'removed' contains largefiles |
197dc4580da2
largefiles: ignore removal status of files not managed in the target context
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23044
diff
changeset
|
189 # marked as 'R' in the working context. |
197dc4580da2
largefiles: ignore removal status of files not managed in the target context
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23044
diff
changeset
|
190 # then, largefiles not managed also in the target |
197dc4580da2
largefiles: ignore removal status of files not managed in the target context
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23044
diff
changeset
|
191 # context should be excluded from 'removed'. |
197dc4580da2
largefiles: ignore removal status of files not managed in the target context
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23044
diff
changeset
|
192 removed = [lfile for lfile in removed |
197dc4580da2
largefiles: ignore removal status of files not managed in the target context
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23044
diff
changeset
|
193 if lfutil.standin(lfile) in ctx1] |
197dc4580da2
largefiles: ignore removal status of files not managed in the target context
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23044
diff
changeset
|
194 |
22515
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
195 # Standins no longer found in lfdirstate has been |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
196 # removed |
22525
764127f58903
largefiles: simplify iteration over standins
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22524
diff
changeset
|
197 for standin in ctx1.walk(lfutil.getstandinmatcher(self)): |
22515
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
198 lfile = lfutil.splitstandin(standin) |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
199 if not match(lfile): |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
200 continue |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
201 if lfile not in lfdirstate: |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
202 removed.append(lfile) |
15663
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15629
diff
changeset
|
203 |
22515
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
204 # Filter result lists |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
205 result = list(result) |
19056
ac41bb76c737
largefiles: wlock in status before lfdirstate.write()
Mads Kiilerich <madski@unity3d.com>
parents:
18969
diff
changeset
|
206 |
22515
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
207 # Largefiles are not really removed when they're |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
208 # still in the normal dirstate. Likewise, normal |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
209 # files are not really removed if they are still in |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
210 # lfdirstate. This happens in merges where files |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
211 # change type. |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
212 removed = [f for f in removed |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
213 if f not in self.dirstate] |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
214 result[2] = [f for f in result[2] |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
215 if f not in lfdirstate] |
15663
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15629
diff
changeset
|
216 |
22515
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
217 lfiles = set(lfdirstate._map) |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
218 # Unknown files |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
219 result[4] = set(result[4]).difference(lfiles) |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
220 # Ignored files |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
221 result[5] = set(result[5]).difference(lfiles) |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
222 # combine normal files and largefiles |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
223 normals = [[fn for fn in filelist |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
224 if not lfutil.isstandin(fn)] |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
225 for filelist in result] |
22919
1982bdb7e2cc
largefiles: access status fields by name rather than index
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22914
diff
changeset
|
226 lfstatus = (modified, added, removed, s.deleted, [], [], |
22524
8c8fe120670f
largefiles: avoid using 'lfiles' variable for two purposes
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22523
diff
changeset
|
227 clean) |
22515
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
228 result = [sorted(list1 + list2) |
22524
8c8fe120670f
largefiles: avoid using 'lfiles' variable for two purposes
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22523
diff
changeset
|
229 for (list1, list2) in zip(normals, lfstatus)] |
23044
075f55a9c488
largefiles: inline redundant toname function in status
Mads Kiilerich <madski@unity3d.com>
parents:
23043
diff
changeset
|
230 else: # not against working directory |
075f55a9c488
largefiles: inline redundant toname function in status
Mads Kiilerich <madski@unity3d.com>
parents:
23043
diff
changeset
|
231 result = [[lfutil.splitstandin(f) or f for f in items] |
22515
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
232 for items in result] |
15663
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
15629
diff
changeset
|
233 |
22515
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
234 if wlock: |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
235 lfdirstate.write() |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
236 |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
237 finally: |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
238 if wlock: |
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
239 wlock.release() |
15168 | 240 |
22515
b4e251b7e9a8
largefiles: reduce indentation by dropping 'else' block after 'return'
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22514
diff
changeset
|
241 self.lfstatus = True |
22914
c95db3208a33
status: update various other methods to return new class
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22911
diff
changeset
|
242 return scmutil.status(*result) |
15168 | 243 |
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15253
diff
changeset
|
244 # As part of committing, copy all of the largefiles into the |
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15253
diff
changeset
|
245 # cache. |
15168 | 246 def commitctx(self, *args, **kwargs): |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16141
diff
changeset
|
247 node = super(lfilesrepo, self).commitctx(*args, **kwargs) |
15796
3e5b6045ccfc
largefiles: factor out a copyalltostore() function
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
15794
diff
changeset
|
248 lfutil.copyalltostore(self, node) |
15168 | 249 return node |
250 | |
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15253
diff
changeset
|
251 # Before commit, largefile standins have not had their |
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15253
diff
changeset
|
252 # contents updated to reflect the hash of their largefile. |
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15253
diff
changeset
|
253 # Do that here. |
15168 | 254 def commit(self, text="", user=None, date=None, match=None, |
255 force=False, editor=False, extra={}): | |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16141
diff
changeset
|
256 orig = super(lfilesrepo, self).commit |
15168 | 257 |
17803
1479572db256
largefile: use `self` in repo method instead of `repo`
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17424
diff
changeset
|
258 wlock = self.wlock() |
15168 | 259 try: |
22290
dcb95aadf850
largefiles: remove redundant "updatelfiles" invocation in "lfilesrepo.commit"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
260 # Case 0: Automated committing |
dcb95aadf850
largefiles: remove redundant "updatelfiles" invocation in "lfilesrepo.commit"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
261 # |
dcb95aadf850
largefiles: remove redundant "updatelfiles" invocation in "lfilesrepo.commit"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
262 # While automated committing (like rebase, transplant |
dcb95aadf850
largefiles: remove redundant "updatelfiles" invocation in "lfilesrepo.commit"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
263 # and so on), this code path is used to avoid: |
dcb95aadf850
largefiles: remove redundant "updatelfiles" invocation in "lfilesrepo.commit"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
264 # (1) updating standins, because standins should |
dcb95aadf850
largefiles: remove redundant "updatelfiles" invocation in "lfilesrepo.commit"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
265 # be already updated at this point |
23139
e53f6b72a0e4
spelling: fixes from proofreading of spell checker issues
Mads Kiilerich <madski@unity3d.com>
parents:
23090
diff
changeset
|
266 # (2) aborting when standins are matched by "match", |
22290
dcb95aadf850
largefiles: remove redundant "updatelfiles" invocation in "lfilesrepo.commit"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
267 # because automated committing may specify them directly |
dcb95aadf850
largefiles: remove redundant "updatelfiles" invocation in "lfilesrepo.commit"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
268 # |
17803
1479572db256
largefile: use `self` in repo method instead of `repo`
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17424
diff
changeset
|
269 if getattr(self, "_isrebasing", False) or \ |
1479572db256
largefile: use `self` in repo method instead of `repo`
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17424
diff
changeset
|
270 getattr(self, "_istransplanting", False): |
15793
3ef07ecdb0d5
largefiles: correctly handle dirstate status when rebasing
Na'Tosha Bard <natosha@unity3d.com>
parents:
15789
diff
changeset
|
271 result = orig(text=text, user=user, date=date, match=match, |
3ef07ecdb0d5
largefiles: correctly handle dirstate status when rebasing
Na'Tosha Bard <natosha@unity3d.com>
parents:
15789
diff
changeset
|
272 force=force, editor=editor, extra=extra) |
22098
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21044
diff
changeset
|
273 |
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21044
diff
changeset
|
274 if result: |
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21044
diff
changeset
|
275 lfdirstate = lfutil.openlfdirstate(ui, self) |
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21044
diff
changeset
|
276 for f in self[result].files(): |
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21044
diff
changeset
|
277 if lfutil.isstandin(f): |
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21044
diff
changeset
|
278 lfile = lfutil.splitstandin(f) |
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21044
diff
changeset
|
279 lfutil.synclfdirstate(self, lfdirstate, lfile, |
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21044
diff
changeset
|
280 False) |
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21044
diff
changeset
|
281 lfdirstate.write() |
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21044
diff
changeset
|
282 |
15793
3ef07ecdb0d5
largefiles: correctly handle dirstate status when rebasing
Na'Tosha Bard <natosha@unity3d.com>
parents:
15789
diff
changeset
|
283 return result |
15168 | 284 # Case 1: user calls commit with no specific files or |
15250
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
285 # include/exclude patterns: refresh and commit all files that |
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
286 # are "dirty". |
15255
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
287 if ((match is None) or |
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15254
diff
changeset
|
288 (not match.anypats() and not match.files())): |
15250
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
289 # Spend a bit of time here to get a list of files we know |
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
290 # are modified so we can compare only against those. |
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
291 # It can cost a lot of time (several seconds) |
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
292 # otherwise to update all standins if the largefiles are |
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
293 # large. |
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
294 lfdirstate = lfutil.openlfdirstate(ui, self) |
17803
1479572db256
largefile: use `self` in repo method instead of `repo`
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17424
diff
changeset
|
295 dirtymatch = match_.always(self.root, self.getcwd()) |
22911
509e2cbee679
dirstate: separate 'lookup' status field from others
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22525
diff
changeset
|
296 unsure, s = lfdirstate.status(dirtymatch, [], False, False, |
509e2cbee679
dirstate: separate 'lookup' status field from others
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22525
diff
changeset
|
297 False) |
22919
1982bdb7e2cc
largefiles: access status fields by name rather than index
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22914
diff
changeset
|
298 modifiedfiles = unsure + s.modified + s.added + s.removed |
15168 | 299 lfiles = lfutil.listlfiles(self) |
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15253
diff
changeset
|
300 # this only loops through largefiles that exist (not |
15168 | 301 # removed/renamed) |
302 for lfile in lfiles: | |
15250
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
303 if lfile in modifiedfiles: |
16248
51e6f318bdf1
largefiles: fix check-code errors.
Na'Tosha Bard <natosha@unity3d.com>
parents:
16247
diff
changeset
|
304 if os.path.exists( |
51e6f318bdf1
largefiles: fix check-code errors.
Na'Tosha Bard <natosha@unity3d.com>
parents:
16247
diff
changeset
|
305 self.wjoin(lfutil.standin(lfile))): |
15250
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
306 # this handles the case where a rebase is being |
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
307 # performed and the working copy is not updated |
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
308 # yet. |
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
309 if os.path.exists(self.wjoin(lfile)): |
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
310 lfutil.updatestandin(self, |
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
311 lfutil.standin(lfile)) |
f172292cd416
largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15224
diff
changeset
|
312 lfdirstate.normal(lfile) |
15794
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15793
diff
changeset
|
313 |
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15793
diff
changeset
|
314 result = orig(text=text, user=user, date=date, match=match, |
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15793
diff
changeset
|
315 force=force, editor=editor, extra=extra) |
17230
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16731
diff
changeset
|
316 |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16731
diff
changeset
|
317 if result is not None: |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16731
diff
changeset
|
318 for lfile in lfdirstate: |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16731
diff
changeset
|
319 if lfile in modifiedfiles: |
17803
1479572db256
largefile: use `self` in repo method instead of `repo`
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17424
diff
changeset
|
320 if (not os.path.exists(self.wjoin( |
17230
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16731
diff
changeset
|
321 lfutil.standin(lfile)))) or \ |
17803
1479572db256
largefile: use `self` in repo method instead of `repo`
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17424
diff
changeset
|
322 (not os.path.exists(self.wjoin(lfile))): |
17230
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16731
diff
changeset
|
323 lfdirstate.drop(lfile) |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16731
diff
changeset
|
324 |
15794
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15793
diff
changeset
|
325 # This needs to be after commit; otherwise precommit hooks |
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15793
diff
changeset
|
326 # get the wrong status |
15168 | 327 lfdirstate.write() |
15794
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15793
diff
changeset
|
328 return result |
15168 | 329 |
18064
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
330 lfiles = lfutil.listlfiles(self) |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
331 match._files = self._subdirlfs(match.files(), lfiles) |
15168 | 332 |
333 # Case 2: user calls commit with specified patterns: refresh | |
334 # any matching big files. | |
335 smatcher = lfutil.composestandinmatcher(self, match) | |
18154
93c697d9c158
largefiles: remove trivial portability wrappers
Mads Kiilerich <madski@unity3d.com>
parents:
18152
diff
changeset
|
336 standins = self.dirstate.walk(smatcher, [], False, False) |
15168 | 337 |
338 # No matching big files: get out of the way and pass control to | |
339 # the usual commit() method. | |
340 if not standins: | |
341 return orig(text=text, user=user, date=date, match=match, | |
342 force=force, editor=editor, extra=extra) | |
343 | |
344 # Refresh all matching big files. It's possible that the | |
345 # commit will end up failing, in which case the big files will | |
346 # stay refreshed. No harm done: the user modified them and | |
347 # asked to commit them, so sooner or later we're going to | |
348 # refresh the standins. Might as well leave them refreshed. | |
349 lfdirstate = lfutil.openlfdirstate(ui, self) | |
350 for standin in standins: | |
351 lfile = lfutil.splitstandin(standin) | |
18182
e6db64abfa87
largefiles: stop using <> operator in favor of !=
Augie Fackler <raf@durin42.com>
parents:
18154
diff
changeset
|
352 if lfdirstate[lfile] != 'r': |
15168 | 353 lfutil.updatestandin(self, standin) |
354 lfdirstate.normal(lfile) | |
355 else: | |
15224
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15171
diff
changeset
|
356 lfdirstate.drop(lfile) |
15168 | 357 |
358 # Cook up a new matcher that only matches regular files or | |
359 # standins corresponding to the big files requested by the | |
360 # user. Have to modify _files to prevent commit() from | |
361 # complaining "not tracked" for big files. | |
362 match = copy.copy(match) | |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16141
diff
changeset
|
363 origmatchfn = match.matchfn |
15168 | 364 |
15254
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15253
diff
changeset
|
365 # Check both the list of largefiles and the list of |
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15253
diff
changeset
|
366 # standins because if a largefile was removed, it |
dd03d3a9f888
largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents:
15253
diff
changeset
|
367 # won't be in the list of largefiles at this point |
15168 | 368 match._files += sorted(standins) |
369 | |
370 actualfiles = [] | |
371 for f in match._files: | |
372 fstandin = lfutil.standin(f) | |
373 | |
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15250
diff
changeset
|
374 # ignore known largefiles and standins |
15168 | 375 if f in lfiles or fstandin in standins: |
376 continue | |
377 | |
378 actualfiles.append(f) | |
379 match._files = actualfiles | |
380 | |
381 def matchfn(f): | |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16141
diff
changeset
|
382 if origmatchfn(f): |
15168 | 383 return f not in lfiles |
384 else: | |
385 return f in standins | |
386 | |
387 match.matchfn = matchfn | |
15794
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15793
diff
changeset
|
388 result = orig(text=text, user=user, date=date, match=match, |
15168 | 389 force=force, editor=editor, extra=extra) |
15794
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15793
diff
changeset
|
390 # This needs to be after commit; otherwise precommit hooks |
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15793
diff
changeset
|
391 # get the wrong status |
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15793
diff
changeset
|
392 lfdirstate.write() |
0d91211dd12f
largefiles: fix inappropriate locking (issue3182)
Levi Bard <levi@unity3d.com>
parents:
15793
diff
changeset
|
393 return result |
15168 | 394 finally: |
395 wlock.release() | |
396 | |
397 def push(self, remote, force=False, revs=None, newbranch=False): | |
19779
fb6e87d93948
largefiles: setup "largefiles" feature in each repositories individually
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19570
diff
changeset
|
398 if remote.local(): |
fb6e87d93948
largefiles: setup "largefiles" feature in each repositories individually
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19570
diff
changeset
|
399 missing = set(self.requirements) - remote.local().supported |
fb6e87d93948
largefiles: setup "largefiles" feature in each repositories individually
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19570
diff
changeset
|
400 if missing: |
fb6e87d93948
largefiles: setup "largefiles" feature in each repositories individually
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19570
diff
changeset
|
401 msg = _("required features are not" |
fb6e87d93948
largefiles: setup "largefiles" feature in each repositories individually
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19570
diff
changeset
|
402 " supported in the destination:" |
fb6e87d93948
largefiles: setup "largefiles" feature in each repositories individually
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19570
diff
changeset
|
403 " %s") % (', '.join(sorted(missing))) |
fb6e87d93948
largefiles: setup "largefiles" feature in each repositories individually
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19570
diff
changeset
|
404 raise util.Abort(msg) |
20177
c5f0574034ef
largefiles: call super class method with proper kwargs to respect API
Long Vu <long@tlvu.ca>
parents:
19779
diff
changeset
|
405 return super(lfilesrepo, self).push(remote, force=force, revs=revs, |
c5f0574034ef
largefiles: call super class method with proper kwargs to respect API
Long Vu <long@tlvu.ca>
parents:
19779
diff
changeset
|
406 newbranch=newbranch) |
15168 | 407 |
18064
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
408 def _subdirlfs(self, files, lfiles): |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
409 ''' |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
410 Adjust matched file list |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
411 If we pass a directory to commit whose only commitable files |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
412 are largefiles, the core commit code aborts before finding |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
413 the largefiles. |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
414 So we do the following: |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
415 For directories that only have largefiles as matches, |
18644
3e92772d5383
spelling: fix some minor issues found by spell checker
Mads Kiilerich <mads@kiilerich.com>
parents:
18182
diff
changeset
|
416 we explicitly add the largefiles to the match list and remove |
18064
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
417 the directory. |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
418 In other cases, we leave the match list unmodified. |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
419 ''' |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
420 actualfiles = [] |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
421 dirs = [] |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
422 regulars = [] |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
423 |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
424 for f in files: |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
425 if lfutil.isstandin(f + '/'): |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
426 raise util.Abort( |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
427 _('file "%s" is a largefile standin') % f, |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
428 hint=('commit the largefile itself instead')) |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
429 # Scan directories |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
430 if os.path.isdir(self.wjoin(f)): |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
431 dirs.append(f) |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
432 else: |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
433 regulars.append(f) |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
434 |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
435 for f in dirs: |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
436 matcheddir = False |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
437 d = self.dirstate.normalize(f) + '/' |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
438 # Check for matched normal files |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
439 for mf in regulars: |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
440 if self.dirstate.normalize(mf).startswith(d): |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
441 actualfiles.append(f) |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
442 matcheddir = True |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
443 break |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
444 if not matcheddir: |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
445 # If no normal match, manually append |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
446 # any matching largefiles |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
447 for lf in lfiles: |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
448 if self.dirstate.normalize(lf).startswith(d): |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
449 actualfiles.append(lf) |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
450 if not matcheddir: |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
451 actualfiles.append(lfutil.standin(f)) |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
452 matcheddir = True |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
453 # Nothing in dir, so readd it |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
454 # and let commit reject it |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
455 if not matcheddir: |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
456 actualfiles.append(f) |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
457 |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
458 # Always add normal files |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
459 actualfiles += regulars |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
460 return actualfiles |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17803
diff
changeset
|
461 |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16141
diff
changeset
|
462 repo.__class__ = lfilesrepo |
15168 | 463 |
21044
52a5eabf1f2f
largefiles: reuse "findcommonoutgoing()" result at "hg push"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21042
diff
changeset
|
464 def prepushoutgoinghook(local, remote, outgoing): |
52a5eabf1f2f
largefiles: reuse "findcommonoutgoing()" result at "hg push"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21042
diff
changeset
|
465 if outgoing.missing: |
52a5eabf1f2f
largefiles: reuse "findcommonoutgoing()" result at "hg push"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21042
diff
changeset
|
466 toupload = set() |
52a5eabf1f2f
largefiles: reuse "findcommonoutgoing()" result at "hg push"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21042
diff
changeset
|
467 addfunc = lambda fn, lfhash: toupload.add(lfhash) |
52a5eabf1f2f
largefiles: reuse "findcommonoutgoing()" result at "hg push"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21042
diff
changeset
|
468 lfutil.getlfilestoupload(local, outgoing.missing, addfunc) |
52a5eabf1f2f
largefiles: reuse "findcommonoutgoing()" result at "hg push"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21042
diff
changeset
|
469 lfcommands.uploadlfiles(ui, local, remote, toupload) |
52a5eabf1f2f
largefiles: reuse "findcommonoutgoing()" result at "hg push"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21042
diff
changeset
|
470 repo.prepushoutgoinghooks.add("largefiles", prepushoutgoinghook) |
52a5eabf1f2f
largefiles: reuse "findcommonoutgoing()" result at "hg push"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21042
diff
changeset
|
471 |
15168 | 472 def checkrequireslfiles(ui, repo, **kwargs): |
15319
9da7e96cd5c2
largefiles: remove redundant any_ function
Benjamin Pollack <benjamin@bitquabit.com>
parents:
15316
diff
changeset
|
473 if 'largefiles' not in repo.requirements and util.any( |
15168 | 474 lfutil.shortname+'/' in f[0] for f in repo.store.datafiles()): |
15312
8d862e7b96d4
largefiles: remove 1.9 compat code
Eli Carter <eli.carter@tektronix.com>
parents:
15305
diff
changeset
|
475 repo.requirements.add('largefiles') |
15168 | 476 repo._writerequirements() |
477 | |
20790
49f2d5644f04
config: set a 'source' in most cases where config don't come from file but code
Mads Kiilerich <madski@unity3d.com>
parents:
20177
diff
changeset
|
478 ui.setconfig('hooks', 'changegroup.lfiles', checkrequireslfiles, |
49f2d5644f04
config: set a 'source' in most cases where config don't come from file but code
Mads Kiilerich <madski@unity3d.com>
parents:
20177
diff
changeset
|
479 'largefiles') |
49f2d5644f04
config: set a 'source' in most cases where config don't come from file but code
Mads Kiilerich <madski@unity3d.com>
parents:
20177
diff
changeset
|
480 ui.setconfig('hooks', 'commit.lfiles', checkrequireslfiles, 'largefiles') |