Show More
@@ -233,7 +233,7 b' def openlfdirstate(ui, repo, create=True' | |||||
233 | # largefiles operation in a new clone. |
|
233 | # largefiles operation in a new clone. | |
234 | if create and not vfs.exists(vfs.join(lfstoredir, b'dirstate')): |
|
234 | if create and not vfs.exists(vfs.join(lfstoredir, b'dirstate')): | |
235 | try: |
|
235 | try: | |
236 | with repo.wlock(wait=False): |
|
236 | with repo.wlock(wait=False), lfdirstate.changing_files(repo): | |
237 | matcher = getstandinmatcher(repo) |
|
237 | matcher = getstandinmatcher(repo) | |
238 | standins = repo.dirstate.walk( |
|
238 | standins = repo.dirstate.walk( | |
239 | matcher, subrepos=[], unknown=False, ignored=False |
|
239 | matcher, subrepos=[], unknown=False, ignored=False | |
@@ -250,8 +250,6 b' def openlfdirstate(ui, repo, create=True' | |||||
250 | wc_tracked=True, |
|
250 | wc_tracked=True, | |
251 | possibly_dirty=True, |
|
251 | possibly_dirty=True, | |
252 | ) |
|
252 | ) | |
253 | # avoid getting dirty dirstate before other operations |
|
|||
254 | lfdirstate.write(repo.currenttransaction()) |
|
|||
255 | except error.LockError: |
|
253 | except error.LockError: | |
256 | # Assume that whatever was holding the lock was important. |
|
254 | # Assume that whatever was holding the lock was important. | |
257 | # If we were doing something important, we would already have |
|
255 | # If we were doing something important, we would already have |
General Comments 0
You need to be logged in to leave comments.
Login now