Mercurial > hg-stable
comparison hgext/rebase.py @ 14572:8ff2957c1d82
mq: rename full_series to fullseries
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Mon, 13 Jun 2011 11:06:11 +0200 |
parents | 4f695345979c |
children | 92101ea35015 |
comparison
equal
deleted
inserted
replaced
14571:17c0cb1045e5 | 14572:8ff2957c1d82 |
---|---|
374 | 374 |
375 def updatemq(repo, state, skipped, **opts): | 375 def updatemq(repo, state, skipped, **opts): |
376 'Update rebased mq patches - finalize and then import them' | 376 'Update rebased mq patches - finalize and then import them' |
377 mqrebase = {} | 377 mqrebase = {} |
378 mq = repo.mq | 378 mq = repo.mq |
379 original_series = mq.full_series[:] | 379 original_series = mq.fullseries[:] |
380 | 380 |
381 for p in mq.applied: | 381 for p in mq.applied: |
382 rev = repo[p.node].rev() | 382 rev = repo[p.node].rev() |
383 if rev in state: | 383 if rev in state: |
384 repo.ui.debug('revision %d is an mq patch (%s), finalize it.\n' % | 384 repo.ui.debug('revision %d is an mq patch (%s), finalize it.\n' % |
397 rev=[str(state[rev])]) | 397 rev=[str(state[rev])]) |
398 | 398 |
399 # Restore missing guards | 399 # Restore missing guards |
400 for s in original_series: | 400 for s in original_series: |
401 pname = mq.guard_re.split(s, 1)[0] | 401 pname = mq.guard_re.split(s, 1)[0] |
402 if pname in mq.full_series: | 402 if pname in mq.fullseries: |
403 repo.ui.debug('restoring guard for patch %s' % (pname)) | 403 repo.ui.debug('restoring guard for patch %s' % (pname)) |
404 mq.full_series.remove(pname) | 404 mq.fullseries.remove(pname) |
405 mq.full_series.append(s) | 405 mq.fullseries.append(s) |
406 mq.series_dirty = True | 406 mq.series_dirty = True |
407 mq.save_dirty() | 407 mq.save_dirty() |
408 | 408 |
409 def storestatus(repo, originalwd, target, state, collapse, keep, keepbranches, | 409 def storestatus(repo, originalwd, target, state, collapse, keep, keepbranches, |
410 external): | 410 external): |