Show More
@@ -257,14 +257,14 b' def reposetup(ui, repo):' | |||
|
257 | 257 | node = super(bookmark_repo, self).commit(*k, **kw) |
|
258 | 258 | if node is None: |
|
259 | 259 | return None |
|
260 |
parents = |
|
|
260 | parents = self.changelog.parents(node) | |
|
261 | 261 | if parents[1] == nullid: |
|
262 | 262 | parents = (parents[0],) |
|
263 |
marks = parse( |
|
|
263 | marks = parse(self) | |
|
264 | 264 | update = False |
|
265 | 265 | for mark, n in marks.items(): |
|
266 | 266 | if ui.configbool('bookmarks', 'track.current'): |
|
267 |
if mark == current( |
|
|
267 | if mark == current(self) and n in parents: | |
|
268 | 268 | marks[mark] = node |
|
269 | 269 | update = True |
|
270 | 270 | else: |
@@ -272,28 +272,28 b' def reposetup(ui, repo):' | |||
|
272 | 272 | marks[mark] = node |
|
273 | 273 | update = True |
|
274 | 274 | if update: |
|
275 |
write( |
|
|
275 | write(self, marks) | |
|
276 | 276 | return node |
|
277 | 277 | finally: |
|
278 | 278 | wlock.release() |
|
279 | 279 | |
|
280 | 280 | def addchangegroup(self, source, srctype, url, emptyok=False): |
|
281 |
parents = |
|
|
281 | parents = self.dirstate.parents() | |
|
282 | 282 | |
|
283 | 283 | result = super(bookmark_repo, self).addchangegroup( |
|
284 | 284 | source, srctype, url, emptyok) |
|
285 | 285 | if result > 1: |
|
286 | 286 | # We have more heads than before |
|
287 | 287 | return result |
|
288 |
node = |
|
|
289 |
marks = parse( |
|
|
288 | node = self.changelog.tip() | |
|
289 | marks = parse(self) | |
|
290 | 290 | update = False |
|
291 | 291 | for mark, n in marks.items(): |
|
292 | 292 | if n in parents: |
|
293 | 293 | marks[mark] = node |
|
294 | 294 | update = True |
|
295 | 295 | if update: |
|
296 |
write( |
|
|
296 | write(self, marks) | |
|
297 | 297 | return result |
|
298 | 298 | |
|
299 | 299 | def tags(self): |
@@ -302,7 +302,7 b' def reposetup(ui, repo):' | |||
|
302 | 302 | return self.tagscache |
|
303 | 303 | |
|
304 | 304 | tagscache = super(bookmark_repo, self).tags() |
|
305 |
tagscache.update(parse( |
|
|
305 | tagscache.update(parse(self)) | |
|
306 | 306 | return tagscache |
|
307 | 307 | |
|
308 | 308 | repo.__class__ = bookmark_repo |
General Comments 0
You need to be logged in to leave comments.
Login now