equal
deleted
inserted
replaced
12 from .interfaces import repository |
12 from .interfaces import repository |
13 from . import ( |
13 from . import ( |
14 error, |
14 error, |
15 match as matchmod, |
15 match as matchmod, |
16 merge, |
16 merge, |
|
17 mergestate as mergestatemod, |
17 scmutil, |
18 scmutil, |
18 sparse, |
19 sparse, |
19 util, |
20 util, |
20 ) |
21 ) |
21 |
22 |
270 repo.wvfs.unlinkpath(f) |
271 repo.wvfs.unlinkpath(f) |
271 |
272 |
272 |
273 |
273 def _writeaddedfiles(repo, pctx, files): |
274 def _writeaddedfiles(repo, pctx, files): |
274 actions = merge.emptyactions() |
275 actions = merge.emptyactions() |
275 addgaction = actions[merge.ACTION_GET].append |
276 addgaction = actions[mergestatemod.ACTION_GET].append |
276 mf = repo[b'.'].manifest() |
277 mf = repo[b'.'].manifest() |
277 for f in files: |
278 for f in files: |
278 if not repo.wvfs.exists(f): |
279 if not repo.wvfs.exists(f): |
279 addgaction((f, (mf.flags(f), False), b"narrowspec updated")) |
280 addgaction((f, (mf.flags(f), False), b"narrowspec updated")) |
280 merge.applyupdates( |
281 merge.applyupdates( |