evolve: hgext/evolve.py comparison

comparison hgext/evolve.py @ 1021:200f2d9b9f39

evolve: saner locking an transaction in `hg evolve` Each trouble solved used to handle locking and transaction on its own. We now have a top level locking and transaction. This will helps use making sure phase are moved within a transaction.

author	Pierre-Yves David <pierre-yves.david@fb.com>
date	Wed, 06 Aug 2014 18:06:17 -0700
parents	155949287628
children	6f4fd3e49d1c

comparison

equal deleted inserted replaced

-:155949287628
+:200f2d9b9f39
 class MergeFailure(util.Abort):
 pass
 def relocate(repo, orig, dest):
 """rewrite <rev> on dest"""
+if orig.rev() == dest.rev():
+raise util.Abort(_('tried to relocate a node on top of itself'),
+hint=_("This shouldn't happen. If you still "
+"need to move changesets, please do so "
+"manually with nothing to rebase - working "
+"directory parent is also destination"))
+rebase = extensions.find('rebase')
+# dummy state to trick rebase node
+if not orig.p2().rev() == node.nullrev:
+raise util.Abort(
+'no support for evolving merge changesets yet',
+hint="Redo the merge a use `hg prune` to obsolete the old one")
+destbookmarks = repo.nodebookmarks(dest.node())
+nodesrc = orig.node()
+destphase = repo[nodesrc].phase()
 try:
-if orig.rev() == dest.rev():
+r = rebase.rebasenode(repo, orig.node(), dest.node(),
-raise util.Abort(_('tried to relocate a node on top of itself'),
+{node.nullrev: node.nullrev}, False)
-hint=_("This shouldn't happen. If you still "
+if r[-1]: #some conflict
-"need to move changesets, please do so "
-"manually with nothing to rebase - working "
-"directory parent is also destination"))
-rebase = extensions.find('rebase')
-# dummy state to trick rebase node
-if not orig.p2().rev() == node.nullrev:
 raise util.Abort(
-'no support for evolving merge changesets yet',
+'unresolved merge conflicts (see hg help resolve)')
-hint="Redo the merge a use `hg prune` to obsolete the old one")
+cmdutil.duplicatecopies(repo, orig.node(), dest.node())
-destbookmarks = repo.nodebookmarks(dest.node())
+nodenew = rebase.concludenode(repo, orig.node(), dest.node(),
-nodesrc = orig.node()
+node.nullid)
-destphase = repo[nodesrc].phase()
+except util.Abort, exc:
-wlock = lock = None
+class LocalMergeFailure(MergeFailure, exc.__class__):
-try:
+pass
-wlock = repo.wlock()
+exc.__class__ = LocalMergeFailure
-lock = repo.lock()
+raise
-r = rebase.rebasenode(repo, orig.node(), dest.node(),
+oldbookmarks = repo.nodebookmarks(nodesrc)
-{node.nullrev: node.nullrev}, False)
+if nodenew is not None:
-if r[-1]: #some conflict
+retractboundary(repo, destphase, [nodenew])
-raise util.Abort(
+createmarkers(repo, [(repo[nodesrc], (repo[nodenew],))])
-'unresolved merge conflicts (see hg help resolve)')
+for book in oldbookmarks:
-cmdutil.duplicatecopies(repo, orig.node(), dest.node())
+repo._bookmarks[book] = nodenew
-nodenew = rebase.concludenode(repo, orig.node(), dest.node(),
+else:
-node.nullid)
+createmarkers(repo, [(repo[nodesrc], ())])
-except util.Abort, exc:
+# Behave like rebase, move bookmarks to dest
-class LocalMergeFailure(MergeFailure, exc.__class__):
+for book in oldbookmarks:
-pass
-exc.__class__ = LocalMergeFailure
-raise
-finally:
-lockmod.release(lock, wlock)
-oldbookmarks = repo.nodebookmarks(nodesrc)
-if nodenew is not None:
-retractboundary(repo, destphase, [nodenew])
-createmarkers(repo, [(repo[nodesrc], (repo[nodenew],))])
-for book in oldbookmarks:
-repo._bookmarks[book] = nodenew
-else:
-createmarkers(repo, [(repo[nodesrc], ())])
-# Behave like rebase, move bookmarks to dest
-for book in oldbookmarks:
-repo._bookmarks[book] = dest.node()
-for book in destbookmarks: # restore bookmark that rebase move
 repo._bookmarks[book] = dest.node()
-if oldbookmarks or destbookmarks:
+for book in destbookmarks: # restore bookmark that rebase move
-repo._bookmarks.write()
+repo._bookmarks[book] = dest.node()
-return nodenew
+if oldbookmarks or destbookmarks:
-except util.Abort:
+repo._bookmarks.write()
-# Invalidate the previous setparents
+return nodenew
-repo.dirstate.invalidate()
-raise
 def _bookmarksupdater(repo, oldid):
 """Return a callable update(newid) updating the current bookmark
 and bookmarks bound to oldid to newid.
 """
 seen = 1
 count = allopt and _counttroubled(ui, repo) or 1
 while tro is not None:
 progresscb()
-result = _evolveany(ui, repo, tro, dryrunopt, progresscb=progresscb)
+wlock = lock = tr = None
+try:
+wlock = repo.wlock()
+lock = repo.lock()
+tr = repo.transaction("evolve")
+result = _evolveany(ui, repo, tro, dryrunopt,
+progresscb=progresscb)
+tr.close()
+finally:
+lockmod.release(tr, lock, wlock)
 progresscb()
 seen += 1
 if not allopt:
 return result
 progresscb()
 if dryrun:
 repo.ui.write(todo)
 else:
 repo.ui.note(todo)
 if progresscb: progresscb()
-lock = repo.lock()
 try:
 relocate(repo, orig, target)
 except MergeFailure:
 repo.opener.write('graftstate', orig.hex() + '\n')
 repo.ui.write_err(_('evolve failed!\n'))
 repo.ui.write_err(
 _('fix conflict and run "hg evolve --continue"\n'))
 raise
-finally:
-lock.release()
 def _solvebumped(ui, repo, bumped, dryrun=False, progresscb=None):
 """Stabilize a bumped changeset"""
 # For now we deny bumped merge
 if len(bumped.parents()) > 1:
 repo.ui.write('hg update %s;\n' % prec)
 repo.ui.write('hg revert --all --rev %s;\n' % bumped)
 repo.ui.write('hg commit --msg "bumped update to %s"')
 return 0
 if progresscb: progresscb()
-wlock = repo.wlock()
+newid = tmpctx = None
+tmpctx = bumped
+bmupdate = _bookmarksupdater(repo, bumped.node())
+# Basic check for common parent. Far too complicated and fragile
+tr = repo.transaction('bumped-stabilize')
 try:
-newid = tmpctx = None
+if not list(repo.set('parents(%d) and parents(%d)', bumped, prec)):
-tmpctx = bumped
+# Need to rebase the changeset at the right place
-lock = repo.lock()
+repo.ui.status(
-try:
+_('rebasing to destination parent: %s\n') % prec.p1())
-bmupdate = _bookmarksupdater(repo, bumped.node())
-# Basic check for common parent. Far too complicated and fragile
-tr = repo.transaction('bumped-stabilize')
 try:
-if not list(repo.set('parents(%d) and parents(%d)', bumped, prec)):
+tmpid = relocate(repo, bumped, prec.p1())
-# Need to rebase the changeset at the right place
+if tmpid is not None:
-repo.ui.status(
+tmpctx = repo[tmpid]
-_('rebasing to destination parent: %s\n') % prec.p1())
+createmarkers(repo, [(bumped, (tmpctx,))])
-try:
+except MergeFailure:
-tmpid = relocate(repo, bumped, prec.p1())
+repo.opener.write('graftstate', bumped.hex() + '\n')
-if tmpid is not None:
+repo.ui.write_err(_('evolution failed!\n'))
-tmpctx = repo[tmpid]
+repo.ui.write_err(
-createmarkers(repo, [(bumped, (tmpctx,))])
+_('fix conflict and run "hg evolve --continue"\n'))
-except MergeFailure:
+raise
-repo.opener.write('graftstate', bumped.hex() + '\n')
+# Create the new commit context
-repo.ui.write_err(_('evolution failed!\n'))
+repo.ui.status(_('computing new diff\n'))
-repo.ui.write_err(
+files = set()
-_('fix conflict and run "hg evolve --continue"\n'))
+copied = copies.pathcopies(prec, bumped)
-raise
+precmanifest = prec.manifest()
-# Create the new commit context
+for key, val in bumped.manifest().iteritems():
-repo.ui.status(_('computing new diff\n'))
+if precmanifest.pop(key, None) != val:
-files = set()
+files.add(key)
-copied = copies.pathcopies(prec, bumped)
+files.update(precmanifest)  # add missing files
-precmanifest = prec.manifest()
+# commit it
-for key, val in bumped.manifest().iteritems():
+if files: # something to commit!
-if precmanifest.pop(key, None) != val:
+def filectxfn(repo, ctx, path):
-files.add(key)
+if path in bumped:
-files.update(precmanifest)  # add missing files
+fctx = bumped[path]
-# commit it
+flags = fctx.flags()
-if files: # something to commit!
+mctx = memfilectx(repo, fctx.path(), fctx.data(),
-def filectxfn(repo, ctx, path):
+islink='l' in flags,
-if path in bumped:
+isexec='x' in flags,
-fctx = bumped[path]
+copied=copied.get(path))
-flags = fctx.flags()
+return mctx
-mctx = memfilectx(repo, fctx.path(), fctx.data(),
+raise IOError()
-islink='l' in flags,
+text = 'bumped update to %s:\n\n' % prec
-isexec='x' in flags,
+text += bumped.description()
-copied=copied.get(path))
-return mctx
+new = context.memctx(repo,
-raise IOError()
+parents=[prec.node(), node.nullid],
-text = 'bumped update to %s:\n\n' % prec
+text=text,
-text += bumped.description()
+files=files,
+filectxfn=filectxfn,
-new = context.memctx(repo,
+user=bumped.user(),
-parents=[prec.node(), node.nullid],
+date=bumped.date(),
-text=text,
+extra=bumped.extra())
-files=files,
-filectxfn=filectxfn,
+newid = repo.commitctx(new)
-user=bumped.user(),
+if newid is None:
-date=bumped.date(),
+createmarkers(repo, [(tmpctx, ())])
-extra=bumped.extra())
+newid = prec.node()
+else:
-newid = repo.commitctx(new)
+retractboundary(repo, bumped.phase(), [newid])
-if newid is None:
+createmarkers(repo, [(tmpctx, (repo[newid],))],
-createmarkers(repo, [(tmpctx, ())])
+flag=obsolete.bumpedfix)
-newid = prec.node()
+bmupdate(newid)
-else:
+tr.close()
-retractboundary(repo, bumped.phase(), [newid])
+repo.ui.status(_('committed as %s\n') % node.short(newid))
-createmarkers(repo, [(tmpctx, (repo[newid],))],
-flag=obsolete.bumpedfix)
-bmupdate(newid)
-tr.close()
-repo.ui.status(_('committed as %s\n') % node.short(newid))
-finally:
-tr.release()
-finally:
-lock.release()
-# reroute the working copy parent to the new changeset
-repo.dirstate.setparents(newid, node.nullid)
 finally:
-wlock.release()
+tr.release()
+# reroute the working copy parent to the new changeset
+repo.dirstate.setparents(newid, node.nullid)
 def _solvedivergent(ui, repo, divergent, dryrun=False, progresscb=None):
 base, others = divergentdata(divergent)
 if len(others) > 1:
 othersstr = "[%s]" % (','.join([str(i) for i in others]))
 ui.write('hg up -C %s &&\n' % base)
 ui.write('hg revert --all --rev tip &&\n')
 ui.write('hg commit -m "`hg log -r %s --template={desc}`";\n'
 % divergent)
 return
-wlock = lock = None
+if divergent not in repo[None].parents():
-try:
+repo.ui.status(_('updating to "local" conflict\n'))
-wlock = repo.wlock()
+hg.update(repo, divergent.rev())
-lock = repo.lock()
+repo.ui.note(_('merging divergent changeset\n'))
-if divergent not in repo[None].parents():
+if progresscb: progresscb()
-repo.ui.status(_('updating to "local" conflict\n'))
+stats = merge.update(repo,
-hg.update(repo, divergent.rev())
+other.node(),
-repo.ui.note(_('merging divergent changeset\n'))
+branchmerge=True,
-if progresscb: progresscb()
+force=False,
-stats = merge.update(repo,
+partial=None,
-other.node(),
+ancestor=base.node(),
-branchmerge=True,
+mergeancestor=True)
-force=False,
+hg._showstats(repo, stats)
-partial=None,
+if stats[3]:
-ancestor=base.node(),
+repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "
-mergeancestor=True)
+"or 'hg update -C .' to abandon\n"))
-hg._showstats(repo, stats)
+if stats[3] > 0:
-if stats[3]:
+raise util.Abort('merge conflict between several amendments '
-repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "
+'(this is not automated yet)',
-"or 'hg update -C .' to abandon\n"))
+hint="""/!\ You can try:
-if stats[3] > 0:
-raise util.Abort('merge conflict between several amendments '
-'(this is not automated yet)',
-hint="""/!\ You can try:
 /!\ * manual merge + resolve => new cset X
 /!\ * hg up to the parent of the amended changeset (which are named W and Z)
 /!\ * hg revert --all -r X
 /!\ * hg ci -m "same message as the amended changeset" => new cset Y
 /!\ * hg kill -n Y W Z
 """)
 if progresscb: progresscb()
 tr = repo.transaction('stabilize-divergent')
 try:
 repo.dirstate.setparents(divergent.node(), node.nullid)
 oldlen = len(repo)
 amend(ui, repo, message='', logfile='')
 if oldlen == len(repo):
 new = divergent
 # no changes
 else:
 new = repo['.']
 createmarkers(repo, [(other, (new,))])
 retractboundary(repo, other.phase(), [new.node()])
 tr.close()
-finally:
-tr.release()
 finally:
-lockmod.release(lock, wlock)
+tr.release()
 def divergentdata(ctx):
 """return base, other part of a conflict
 This only return the first one.

Mercurial > evolve

comparison hgext/evolve.py @ 1021:200f2d9b9f39