hgext/rebase.py
changeset 30899 01512564ddd5
parent 30755 0fbb3a5c188e
child 31043 aea06029919e
equal deleted inserted replaced
30898:abf029200e19 30899:01512564ddd5
  1365 
  1365 
  1366 def _setrebasesetvisibility(repo, revs):
  1366 def _setrebasesetvisibility(repo, revs):
  1367     """store the currently rebased set on the repo object
  1367     """store the currently rebased set on the repo object
  1368 
  1368 
  1369     This is used by another function to prevent rebased revision to because
  1369     This is used by another function to prevent rebased revision to because
  1370     hidden (see issue4505)"""
  1370     hidden (see issue4504)"""
  1371     repo = repo.unfiltered()
  1371     repo = repo.unfiltered()
  1372     revs = set(revs)
  1372     revs = set(revs)
  1373     repo._rebaseset = revs
  1373     repo._rebaseset = revs
  1374     # invalidate cache if visibility changes
  1374     # invalidate cache if visibility changes
  1375     hiddens = repo.filteredrevcache.get('visible', set())
  1375     hiddens = repo.filteredrevcache.get('visible', set())
  1381     repo = repo.unfiltered()
  1381     repo = repo.unfiltered()
  1382     if '_rebaseset' in vars(repo):
  1382     if '_rebaseset' in vars(repo):
  1383         del repo._rebaseset
  1383         del repo._rebaseset
  1384 
  1384 
  1385 def _rebasedvisible(orig, repo):
  1385 def _rebasedvisible(orig, repo):
  1386     """ensure rebased revs stay visible (see issue4505)"""
  1386     """ensure rebased revs stay visible (see issue4504)"""
  1387     blockers = orig(repo)
  1387     blockers = orig(repo)
  1388     blockers.update(getattr(repo, '_rebaseset', ()))
  1388     blockers.update(getattr(repo, '_rebaseset', ()))
  1389     return blockers
  1389     return blockers
  1390 
  1390 
  1391 def _filterobsoleterevs(repo, revs):
  1391 def _filterobsoleterevs(repo, revs):