hgext/rebase.py
changeset 33068 2312e70cf78b
parent 32936 04c9dd951a41
child 33146 40ee74bfa111
equal deleted inserted replaced
33067:be3584712b20 33068:2312e70cf78b
  1146     return collapsemsg
  1146     return collapsemsg
  1147 
  1147 
  1148 def clearstatus(repo):
  1148 def clearstatus(repo):
  1149     'Remove the status files'
  1149     'Remove the status files'
  1150     _clearrebasesetvisibiliy(repo)
  1150     _clearrebasesetvisibiliy(repo)
       
  1151     # Make sure the active transaction won't write the state file
       
  1152     tr = repo.currenttransaction()
       
  1153     if tr:
       
  1154         tr.removefilegenerator('rebasestate')
  1151     repo.vfs.unlinkpath("rebasestate", ignoremissing=True)
  1155     repo.vfs.unlinkpath("rebasestate", ignoremissing=True)
  1152 
  1156 
  1153 def needupdate(repo, state):
  1157 def needupdate(repo, state):
  1154     '''check whether we should `update --clean` away from a merge, or if
  1158     '''check whether we should `update --clean` away from a merge, or if
  1155     somehow the working dir got forcibly updated, e.g. by older hg'''
  1159     somehow the working dir got forcibly updated, e.g. by older hg'''