Show More
@@ -123,9 +123,13 b' def openlfdirstate(ui, repo, create=True' | |||||
123 | # it. This ensures that we create it on the first meaningful |
|
123 | # it. This ensures that we create it on the first meaningful | |
124 | # largefiles operation in a new clone. |
|
124 | # largefiles operation in a new clone. | |
125 | if create and not os.path.exists(os.path.join(lfstoredir, 'dirstate')): |
|
125 | if create and not os.path.exists(os.path.join(lfstoredir, 'dirstate')): | |
|
126 | matcher = getstandinmatcher(repo) | |||
|
127 | standins = repo.dirstate.walk(matcher, [], False, False) | |||
|
128 | ||||
|
129 | if len(standins) > 0: | |||
126 | util.makedirs(lfstoredir) |
|
130 | util.makedirs(lfstoredir) | |
127 | matcher = getstandinmatcher(repo) |
|
131 | ||
128 | for standin in repo.dirstate.walk(matcher, [], False, False): |
|
132 | for standin in standins: | |
129 | lfile = splitstandin(standin) |
|
133 | lfile = splitstandin(standin) | |
130 | lfdirstate.normallookup(lfile) |
|
134 | lfdirstate.normallookup(lfile) | |
131 | return lfdirstate |
|
135 | return lfdirstate |
@@ -154,7 +154,20 b' Prepare test repo:' | |||||
154 | $ hg init merges |
|
154 | $ hg init merges | |
155 | $ cd merges |
|
155 | $ cd merges | |
156 | $ touch f1 |
|
156 | $ touch f1 | |
157 | $ hg ci -Aqm "0-root" |
|
157 | $ hg ci -Aqm "0-root" --config extensions.largefiles=! | |
|
158 | ||||
|
159 | Ensure that .hg/largefiles isn't created before largefiles are added | |||
|
160 | #if unix-permissions | |||
|
161 | $ chmod 555 .hg | |||
|
162 | #endif | |||
|
163 | $ hg status | |||
|
164 | #if unix-permissions | |||
|
165 | $ chmod 755 .hg | |||
|
166 | #endif | |||
|
167 | ||||
|
168 | $ find .hg/largefiles | |||
|
169 | find: `.hg/largefiles': No such file or directory | |||
|
170 | [1] | |||
158 |
|
171 | |||
159 | ancestor is "normal": |
|
172 | ancestor is "normal": | |
160 | $ echo normal > f |
|
173 | $ echo normal > f |
General Comments 0
You need to be logged in to leave comments.
Login now