136     external = nullrev

   136     external = nullrev

   137     state = {}

   137     state = {}

   138     skipped = set()

   138     skipped = set()

   139     targetancestors = set()

   139     targetancestors = set()

   140 

   140 

   142 

   142 

   143     lock = wlock = None

   143     lock = wlock = None

   144     try:

   144     try:

   145         wlock = repo.wlock()

   145         wlock = repo.wlock()

   146         lock = repo.lock()

   146         lock = repo.lock()

   381             else:

   381             else:

   382                 commitmsg = 'Collapsed revision'

   382                 commitmsg = 'Collapsed revision'

   383                 for rebased in state:

   383                 for rebased in state:

   384                     if rebased not in skipped and state[rebased] > nullmerge:

   384                     if rebased not in skipped and state[rebased] > nullmerge:

   385                         commitmsg += '\n* %s' % repo[rebased].description()

   385                         commitmsg += '\n* %s' % repo[rebased].description()

   387             newrev = concludenode(repo, rev, p1, external, commitmsg=commitmsg,

   388             newrev = concludenode(repo, rev, p1, external, commitmsg=commitmsg,

   388                                   extrafn=extrafn, editor=editor)

   389                                   extrafn=extrafn, editor=editor)

   389             for oldrev in state.iterkeys():

   390             for oldrev in state.iterkeys():

   390                 if state[oldrev] > nullmerge:

   391                 if state[oldrev] > nullmerge:

   391                     state[oldrev] = newrev

   392                     state[oldrev] = newrev