Mercurial > public > mercurial-scm > hg-stable
diff mercurial/narrowspec.py @ 41229:50ca531f1f24
narrow: copy store narrowspec to working copy immediately
We no longer need to delay it until the end of the transaction since
we now restore a backup if the transaction aborts.
Differential Revision: https://phab.mercurial-scm.org/D5506
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Sat, 29 Dec 2018 23:01:12 -0800 |
| parents | b74481038438 |
| children | 8c366af085f4 |
line wrap: on
line diff
--- a/mercurial/narrowspec.py Sat Dec 29 22:34:38 2018 -0800 +++ b/mercurial/narrowspec.py Sat Dec 29 23:01:12 2018 -0800 @@ -161,17 +161,9 @@ spec = format(includepats, excludepats) repo.svfs.write(FILENAME, spec) -def copytoworkingcopy(repo, tr): - if tr: - def write(file): - spec = repo.svfs.read(FILENAME) - file.write(spec) - file.close() - tr.addfilegenerator('narrowspec', (DIRSTATE_FILENAME,), write, - location='plain') - else: - spec = repo.svfs.read(FILENAME) - repo.vfs.write(DIRSTATE_FILENAME, spec) +def copytoworkingcopy(repo): + spec = repo.svfs.read(FILENAME) + repo.vfs.write(DIRSTATE_FILENAME, spec) def savebackup(repo, backupname): if repository.NARROW_REQUIREMENT not in repo.requirements: