mercurial-crew-with-dirclash: comparison mercurial/merge.py

equal deleted inserted replaced

-:26692d08c2f9
+:cc34be74eeec
 f2, fd, flags, move = a[2:]
 if f != fd:
 repo.ui.debug(_("copying %s to %s\n") % (f, fd))
 repo.wwrite(fd, repo.wread(f), flags)
+audit_path = util.path_auditor(repo.root)
 for a in action:
 f, m = a[:2]
 if f and f[0] == "/":
 continue
 if m == "r": # remove
 repo.ui.note(_("removing %s\n") % f)
-util.audit_path(f)
+audit_path(f)
 try:
 util.unlink(repo.wjoin(f))
 except OSError, inst:
 if inst.errno != errno.ENOENT:
 repo.ui.warn(_("update failed to remove %s: %s!\n") %
 for a in action:
 f, m = a[:2]
 if m == "r": # remove
 if branchmerge:
-repo.dirstate.update([f], 'r')
+repo.dirstate.remove(f)
 else:
-repo.dirstate.forget([f])
+repo.dirstate.forget(f)
 elif m == "f": # forget
-repo.dirstate.forget([f])
+repo.dirstate.forget(f)
 elif m in "ge": # get or exec change
 if branchmerge:
-repo.dirstate.update([f], 'n', st_mtime=-1)
+repo.dirstate.normaldirty(f)
 else:
-repo.dirstate.update([f], 'n')
+repo.dirstate.normal(f)
 elif m == "m": # merge
 f2, fd, flag, move = a[2:]
 if branchmerge:
 # We've done a branch merge, mark this file as merged
 # so that we properly record the merger later
-repo.dirstate.update([fd], 'm')
+repo.dirstate.merge(fd)
 if f != f2: # copy/rename
 if move:
-repo.dirstate.update([f], 'r')
+repo.dirstate.remove(f)
 if f != fd:
 repo.dirstate.copy(f, fd)
 else:
 repo.dirstate.copy(f2, fd)
 else:
 # We've update-merged a locally modified file, so
 # we set the dirstate to emulate a normal checkout
 # of that file some time in the past. Thus our
 # merge will appear as a normal local file
 # modification.
-repo.dirstate.update([fd], 'n', st_size=-1, st_mtime=-1)
+repo.dirstate.normallookup(fd)
 if move:
-repo.dirstate.forget([f])
+repo.dirstate.forget(f)
 elif m == "d": # directory rename
 f2, fd, flag = a[2:]
 if not f2 and f not in repo.dirstate:
 # untracked file moved
 continue
 if branchmerge:
-repo.dirstate.update([fd], 'a')
+repo.dirstate.add(fd)
 if f:
-repo.dirstate.update([f], 'r')
+repo.dirstate.remove(f)
 repo.dirstate.copy(f, fd)
 if f2:
 repo.dirstate.copy(f2, fd)
 else:
-repo.dirstate.update([fd], 'n')
+repo.dirstate.normal(fd)
 if f:
-repo.dirstate.forget([f])
+repo.dirstate.forget(f)
-def update(repo, node, branchmerge, force, partial, wlock):
+def update(repo, node, branchmerge, force, partial):
 """
 Perform a merge between the working directory and the given node
 branchmerge = whether to merge between branches
 force = whether to force branch merging or file overwriting
 partial = a function to filter file lists (dirstate not updated)
-wlock = working dir lock, if already held
+"""
-"""
+wlock = repo.wlock()
-if not wlock:
+try:
-wlock = repo.wlock()
+wc = repo.workingctx()
+if node is None:
-wc = repo.workingctx()
+# tip of current branch
-if node is None:
+try:
-# tip of current branch
+node = repo.branchtags()[wc.branch()]
-try:
+except KeyError:
-node = repo.branchtags()[wc.branch()]
+raise util.Abort(_("branch %s not found") % wc.branch())
-except KeyError:
+overwrite = force and not branchmerge
-raise util.Abort(_("branch %s not found") % wc.branch())
+forcemerge = force and branchmerge
-overwrite = force and not branchmerge
+pl = wc.parents()
-forcemerge = force and branchmerge
+p1, p2 = pl[0], repo.changectx(node)
-pl = wc.parents()
+pa = p1.ancestor(p2)
-p1, p2 = pl[0], repo.changectx(node)
+fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2)
-pa = p1.ancestor(p2)
+fastforward = False
-fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2)
-fastforward = False
+### check phase
+if not overwrite and len(pl) > 1:
-### check phase
+raise util.Abort(_("outstanding uncommitted merges"))
-if not overwrite and len(pl) > 1:
+if pa == p1 or pa == p2: # is there a linear path from p1 to p2?
-raise util.Abort(_("outstanding uncommitted merges"))
+if branchmerge:
-if pa == p1 or pa == p2: # is there a linear path from p1 to p2?
+if p1.branch() != p2.branch() and pa != p2:
-if branchmerge:
+fastforward = True
-if p1.branch() != p2.branch() and pa != p2:
+else:
-fastforward = True
+raise util.Abort(_("there is nothing to merge, just use "
-else:
+"'hg update' or look at 'hg heads'"))
-raise util.Abort(_("there is nothing to merge, just use "
+elif not (overwrite or branchmerge):
-"'hg update' or look at 'hg heads'"))
+raise util.Abort(_("update spans branches, use 'hg merge' "
-elif not (overwrite or branchmerge):
+"or 'hg update -C' to lose changes"))
-raise util.Abort(_("update spans branches, use 'hg merge' "
+if branchmerge and not forcemerge:
-"or 'hg update -C' to lose changes"))
+if wc.files():
-if branchmerge and not forcemerge:
+raise util.Abort(_("outstanding uncommitted changes"))
-if wc.files():
-raise util.Abort(_("outstanding uncommitted changes"))
+### calculate phase
+action = []
-### calculate phase
+if not force:
-action = []
+checkunknown(wc, p2)
-if not force:
+if not util.checkfolding(repo.path):
-checkunknown(wc, p2)
+checkcollision(p2)
-if not util.checkfolding(repo.path):
+if not branchmerge:
-checkcollision(p2)
+action += forgetremoved(wc, p2)
-if not branchmerge:
+action += manifestmerge(repo, wc, p2, pa, overwrite, partial)
-action += forgetremoved(wc, p2)
-action += manifestmerge(repo, wc, p2, pa, overwrite, partial)
+### apply phase
+if not branchmerge: # just jump to the new rev
-### apply phase
+fp1, fp2, xp1, xp2 = fp2, nullid, xp2, ''
-if not branchmerge: # just jump to the new rev
+if not partial:
-fp1, fp2, xp1, xp2 = fp2, nullid, xp2, ''
+repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2)
-if not partial:
-repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2)
+stats = applyupdates(repo, action, wc, p2)
-stats = applyupdates(repo, action, wc, p2)
+if not partial:
+recordupdates(repo, action, branchmerge)
-if not partial:
+repo.dirstate.setparents(fp1, fp2)
-recordupdates(repo, action, branchmerge)
+if not branchmerge and not fastforward:
-repo.dirstate.setparents(fp1, fp2)
+repo.dirstate.setbranch(p2.branch())
-if not branchmerge and not fastforward:
+repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3])
-repo.dirstate.setbranch(p2.branch())
-repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3])
+return stats
+finally:
-return stats
+del wlock

changeset 5344	cc34be74eeec
parent 5210	90d9ec0dc69d
child 5371	17ed9b9a0d03