# HG changeset patch # User Benoit Boissinot <benoit.boissinot@ens-lyon.org> # Date 1242521722 -7200 # Sun May 17 02:55:22 2009 +0200 # Node ID 6d4bf1c1a003f569448c8d10fa5e668a174c7ac4 # Parent d1ca637b0773283ae3165862ff1e30e93037e7f9 rebase: use set instead of dict diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -51,7 +51,8 @@ """ originalwd = target = None external = nullrev - state = skipped = {} + state = {} + skipped = set() lock = wlock = None try: @@ -143,7 +144,7 @@ finally: release(lock, wlock) -def concludenode(repo, rev, p1, p2, state, collapse, last=False, skipped={}, +def concludenode(repo, rev, p1, p2, state, collapse, last=False, skipped=None, extrafn=None): """Skip commit if collapsing has been required and rev is not the last revision, commit otherwise @@ -155,6 +156,9 @@ repo.dirstate.setparents(repo[p1].node(), repo[p2].node()) + if skipped is None: + skipped = set() + # Commit, record the old nodeid m, a, r = repo.status()[:3] newrev = nullrev @@ -234,7 +238,7 @@ if not collapse: repo.ui.note(_('no changes, revision %d skipped\n') % rev) repo.ui.debug(_('next revision set to %s\n') % p1) - skipped[rev] = True + skipped.add(rev) state[rev] = p1 def defineparents(repo, rev, target, state, targetancestors):