Show More
@@ -51,7 +51,7 b' def parse(repo):' | |||
|
51 | 51 | pass |
|
52 | 52 | return bookmarks |
|
53 | 53 | |
|
54 |
def write(repo |
|
|
54 | def write(repo): | |
|
55 | 55 | '''Write bookmarks |
|
56 | 56 | |
|
57 | 57 | Write the given bookmark => hash dictionary to the .hg/bookmarks file |
@@ -60,6 +60,7 b' def write(repo, refs):' | |||
|
60 | 60 | We also store a backup of the previous state in undo.bookmarks that |
|
61 | 61 | can be copied back on rollback. |
|
62 | 62 | ''' |
|
63 | refs = repo._bookmarks | |
|
63 | 64 | if os.path.exists(repo.join('bookmarks')): |
|
64 | 65 | util.copyfile(repo.join('bookmarks'), repo.join('undo.bookmarks')) |
|
65 | 66 | if current(repo) not in refs: |
@@ -147,7 +148,7 b' def bookmark(ui, repo, mark=None, rev=No' | |||
|
147 | 148 | del marks[rename] |
|
148 | 149 | if current(repo) == rename: |
|
149 | 150 | setcurrent(repo, mark) |
|
150 |
write(repo |
|
|
151 | write(repo) | |
|
151 | 152 | return |
|
152 | 153 | |
|
153 | 154 | if delete: |
@@ -158,7 +159,7 b' def bookmark(ui, repo, mark=None, rev=No' | |||
|
158 | 159 | if mark == current(repo): |
|
159 | 160 | setcurrent(repo, None) |
|
160 | 161 | del marks[mark] |
|
161 |
write(repo |
|
|
162 | write(repo) | |
|
162 | 163 | return |
|
163 | 164 | |
|
164 | 165 | if mark != None: |
@@ -176,7 +177,7 b' def bookmark(ui, repo, mark=None, rev=No' | |||
|
176 | 177 | else: |
|
177 | 178 | marks[mark] = repo.changectx('.').node() |
|
178 | 179 | setcurrent(repo, mark) |
|
179 |
write(repo |
|
|
180 | write(repo) | |
|
180 | 181 | return |
|
181 | 182 | |
|
182 | 183 | if mark is None: |
@@ -226,7 +227,7 b' def strip(oldstrip, ui, repo, node, back' | |||
|
226 | 227 | if len(update) > 0: |
|
227 | 228 | for m in update: |
|
228 | 229 | marks[m] = repo.changectx('.').node() |
|
229 |
write(repo |
|
|
230 | write(repo) | |
|
230 | 231 | |
|
231 | 232 | def reposetup(ui, repo): |
|
232 | 233 | if not repo.local(): |
@@ -276,7 +277,7 b' def reposetup(ui, repo):' | |||
|
276 | 277 | marks[mark] = node |
|
277 | 278 | update = True |
|
278 | 279 | if update: |
|
279 |
write(self |
|
|
280 | write(self) | |
|
280 | 281 | return node |
|
281 | 282 | finally: |
|
282 | 283 | wlock.release() |
@@ -303,7 +304,7 b' def reposetup(ui, repo):' | |||
|
303 | 304 | marks[mark] = node |
|
304 | 305 | update = True |
|
305 | 306 | if update: |
|
306 |
write(self |
|
|
307 | write(self) | |
|
307 | 308 | return result |
|
308 | 309 | |
|
309 | 310 | def _findtags(self): |
General Comments 0
You need to be logged in to leave comments.
Login now