##// END OF EJS Templates
bookmarks: make writing files out avoid ambiguity of file stat...
FUJIWARA Katsunori -
r29300:f92afd23 default
parent child Browse files
Show More
@@ -117,7 +117,8 b' class bmstore(dict):'
117 rbm._writeactive()
117 rbm._writeactive()
118
118
119 with repo.wlock():
119 with repo.wlock():
120 file_ = repo.vfs('bookmarks', 'w', atomictemp=True)
120 file_ = repo.vfs('bookmarks', 'w', atomictemp=True,
121 checkambig=True)
121 try:
122 try:
122 self._write(file_)
123 self._write(file_)
123 except: # re-raises
124 except: # re-raises
@@ -131,7 +132,8 b' class bmstore(dict):'
131 return
132 return
132 with self._repo.wlock():
133 with self._repo.wlock():
133 if self._active is not None:
134 if self._active is not None:
134 f = self._repo.vfs('bookmarks.current', 'w', atomictemp=True)
135 f = self._repo.vfs('bookmarks.current', 'w', atomictemp=True,
136 checkambig=True)
135 try:
137 try:
136 f.write(encoding.fromlocal(self._active))
138 f.write(encoding.fromlocal(self._active))
137 finally:
139 finally:
General Comments 0
You need to be logged in to leave comments. Login now