##// END OF EJS Templates
share: replace the bookmarks.shared file with an entry on a new "shared" file...
Angel Ezquerra -
r23883:7e71898a default
parent child Browse files
Show More
@@ -79,12 +79,12 b' def extsetup(ui):'
79 def _hassharedbookmarks(repo):
79 def _hassharedbookmarks(repo):
80 """Returns whether this repo has shared bookmarks"""
80 """Returns whether this repo has shared bookmarks"""
81 try:
81 try:
82 repo.vfs.read('bookmarks.shared')
82 shared = repo.vfs.read('shared').splitlines()
83 return True
84 except IOError, inst:
83 except IOError, inst:
85 if inst.errno != errno.ENOENT:
84 if inst.errno != errno.ENOENT:
86 raise
85 raise
87 return False
86 return False
87 return 'bookmarks' in shared
88
88
89 def _getsrcrepo(repo):
89 def _getsrcrepo(repo):
90 """
90 """
@@ -226,7 +226,9 b' def share(ui, source, dest=None, update='
226 _update(r, uprev)
226 _update(r, uprev)
227
227
228 if bookmarks:
228 if bookmarks:
229 r.vfs('bookmarks.shared', 'w').close()
229 fp = r.vfs('shared', 'w')
230 fp.write('bookmarks\n')
231 fp.close()
230
232
231 def copystore(ui, srcrepo, destpath):
233 def copystore(ui, srcrepo, destpath):
232 '''copy files from store of srcrepo in destpath
234 '''copy files from store of srcrepo in destpath
General Comments 0
You need to be logged in to leave comments. Login now