##// END OF EJS Templates
narrow: drop explicit dirstate write...
Martin von Zweigbergk -
r41212:4475322b default
parent child Browse files
Show More
@@ -433,7 +433,7 def trackedcmd(ui, repo, remotepath=None
433
433
434 if update_working_copy:
434 if update_working_copy:
435 with repo.wlock(), repo.lock(), repo.transaction('narrow-wc') as tr:
435 with repo.wlock(), repo.lock(), repo.transaction('narrow-wc') as tr:
436 narrowspec.updateworkingcopy(repo, tr)
436 narrowspec.updateworkingcopy(repo)
437 narrowspec.copytoworkingcopy(repo, tr)
437 narrowspec.copytoworkingcopy(repo, tr)
438 return 0
438 return 0
439
439
@@ -266,7 +266,7 def checkworkingcopynarrowspec(repo):
266 raise error.Abort(_("working copy's narrowspec is stale"),
266 raise error.Abort(_("working copy's narrowspec is stale"),
267 hint=_("run 'hg tracked --update-working-copy'"))
267 hint=_("run 'hg tracked --update-working-copy'"))
268
268
269 def updateworkingcopy(repo, tr):
269 def updateworkingcopy(repo):
270 oldspec = repo.vfs.tryread(DIRSTATE_FILENAME)
270 oldspec = repo.vfs.tryread(DIRSTATE_FILENAME)
271 newspec = repo.svfs.tryread(FILENAME)
271 newspec = repo.svfs.tryread(FILENAME)
272
272
@@ -294,5 +294,3 def updateworkingcopy(repo, tr):
294 for f in newfiles:
294 for f in newfiles:
295 ds.normallookup(f)
295 ds.normallookup(f)
296 _writeaddedfiles(repo, pctx, newfiles)
296 _writeaddedfiles(repo, pctx, newfiles)
297
298 ds.write(tr)
General Comments 0
You need to be logged in to leave comments. Login now