equal
deleted
inserted
replaced
1505 graftcmd = commands.table['graft'][0] |
1505 graftcmd = commands.table['graft'][0] |
1506 ret = graftcmd(ui, repo, old_obsolete=True, **{'continue': True}) |
1506 ret = graftcmd(ui, repo, old_obsolete=True, **{'continue': True}) |
1507 _evolvestatedelete(repo) |
1507 _evolvestatedelete(repo) |
1508 return ret |
1508 return ret |
1509 finally: |
1509 finally: |
1510 util.unlinkpath(repo.join('graftstate'), ignoremissing=True) |
1510 util.unlinkpath(repo.vfs.join('graftstate'), ignoremissing=True) |
1511 finally: |
1511 finally: |
1512 lock.release() |
1512 lock.release() |
1513 cmdutil.bailifchanged(repo) |
1513 cmdutil.bailifchanged(repo) |
1514 |
1514 |
1515 if revopt and allopt: |
1515 if revopt and allopt: |
3179 cmdutil.unfinishedstates.append(data) |
3179 cmdutil.unfinishedstates.append(data) |
3180 |
3180 |
3181 @eh.wrapfunction(hg, 'clean') |
3181 @eh.wrapfunction(hg, 'clean') |
3182 def clean(orig, repo, *args, **kwargs): |
3182 def clean(orig, repo, *args, **kwargs): |
3183 ret = orig(repo, *args, **kwargs) |
3183 ret = orig(repo, *args, **kwargs) |
3184 util.unlinkpath(repo.join('evolvestate'), ignoremissing=True) |
3184 util.unlinkpath(repo.vfs.join('evolvestate'), ignoremissing=True) |
3185 return ret |
3185 return ret |
3186 |
3186 |
3187 def _evolvestatewrite(repo, state): |
3187 def _evolvestatewrite(repo, state): |
3188 # [version] |
3188 # [version] |
3189 # [type][length][content] |
3189 # [type][length][content] |
3244 return state |
3244 return state |
3245 finally: |
3245 finally: |
3246 f.close() |
3246 f.close() |
3247 |
3247 |
3248 def _evolvestatedelete(repo): |
3248 def _evolvestatedelete(repo): |
3249 util.unlinkpath(repo.join('evolvestate'), ignoremissing=True) |
3249 util.unlinkpath(repo.vfs.join('evolvestate'), ignoremissing=True) |
3250 |
3250 |
3251 def _evolvemerge(repo, orig, dest, pctx, keepbranch): |
3251 def _evolvemerge(repo, orig, dest, pctx, keepbranch): |
3252 """Used by the evolve function to merge dest on top of pctx. |
3252 """Used by the evolve function to merge dest on top of pctx. |
3253 return the same tuple as merge.graft""" |
3253 return the same tuple as merge.graft""" |
3254 if repo['.'].rev() != dest.rev(): |
3254 if repo['.'].rev() != dest.rev(): |