mercurial-scm/hg: mercurial/merge.py comparison

comparison mercurial/merge.py @ 23385:91c24457c16a

merge: move calculateupdates() before applyupdated() calculateupdates() happens before applyupdates(), so move it before in the code. That also moves it close to manifestmerge(), which is a good location as calculateupdates() is the only caller of manifestmerge().

author	Martin von Zweigbergk <martinvonz@google.com>
date	Fri, 21 Nov 2014 13:06:04 -0800
parents	0791a10ad87c
children	8229f32d2b79

comparison

equal deleted inserted replaced

-:0791a10ad87c
+:91c24457c16a
 else:
 _checkcollision(repo, m1, actions)
 return actions
-def batchremove(repo, actions):
-"""apply removes to the working directory
-yields tuples for progress updates
-"""
-verbose = repo.ui.verbose
-unlink = util.unlinkpath
-wjoin = repo.wjoin
-audit = repo.wopener.audit
-i = 0
-for f, args, msg in actions:
-repo.ui.debug(" %s: %s -> r\n" % (f, msg))
-if verbose:
-repo.ui.note(_("removing %s\n") % f)
-audit(f)
-try:
-unlink(wjoin(f), ignoremissing=True)
-except OSError, inst:
-repo.ui.warn(_("update failed to remove %s: %s!\n") %
-(f, inst.strerror))
-if i == 100:
-yield i, f
-i = 0
-i += 1
-if i > 0:
-yield i, f
-def batchget(repo, mctx, actions):
-"""apply gets to the working directory
-mctx is the context to get from
-yields tuples for progress updates
-"""
-verbose = repo.ui.verbose
-fctx = mctx.filectx
-wwrite = repo.wwrite
-i = 0
-for f, args, msg in actions:
-repo.ui.debug(" %s: %s -> g\n" % (f, msg))
-if verbose:
-repo.ui.note(_("getting %s\n") % f)
-wwrite(f, fctx(f).data(), args[0])
-if i == 100:
-yield i, f
-i = 0
-i += 1
-if i > 0:
-yield i, f
-def applyupdates(repo, actions, wctx, mctx, overwrite, labels=None):
-"""apply the merge action list to the working directory
-wctx is the working copy context
-mctx is the context to be merged into the working copy
-Return a tuple of counts (updated, merged, removed, unresolved) that
-describes how many files were affected by the update.
-"""
-updated, merged, removed, unresolved = 0, 0, 0, 0
-ms = mergestate(repo)
-ms.reset(wctx.p1().node(), mctx.node())
-moves = []
-for m, l in actions.items():
-l.sort()
-# prescan for merges
-for f, args, msg in actions['m']:
-f1, f2, fa, move, anc = args
-if f == '.hgsubstate': # merged internally
-continue
-repo.ui.debug(" preserving %s for resolve of %s\n" % (f1, f))
-fcl = wctx[f1]
-fco = mctx[f2]
-actx = repo[anc]
-if fa in actx:
-fca = actx[fa]
-else:
-fca = repo.filectx(f1, fileid=nullrev)
-ms.add(fcl, fco, fca, f)
-if f1 != f and move:
-moves.append(f1)
-audit = repo.wopener.audit
-_updating = _('updating')
-_files = _('files')
-progress = repo.ui.progress
-# remove renamed files after safely stored
-for f in moves:
-if os.path.lexists(repo.wjoin(f)):
-repo.ui.debug("removing %s\n" % f)
-audit(f)
-util.unlinkpath(repo.wjoin(f))
-numupdates = sum(len(l) for m, l in actions.items() if m != 'k')
-if [a for a in actions['r'] if a[0] == '.hgsubstate']:
-subrepo.submerge(repo, wctx, mctx, wctx, overwrite)
-# remove in parallel (must come first)
-z = 0
-prog = worker.worker(repo.ui, 0.001, batchremove, (repo,), actions['r'])
-for i, item in prog:
-z += i
-progress(_updating, z, item=item, total=numupdates, unit=_files)
-removed = len(actions['r'])
-# get in parallel
-prog = worker.worker(repo.ui, 0.001, batchget, (repo, mctx), actions['g'])
-for i, item in prog:
-z += i
-progress(_updating, z, item=item, total=numupdates, unit=_files)
-updated = len(actions['g'])
-if [a for a in actions['g'] if a[0] == '.hgsubstate']:
-subrepo.submerge(repo, wctx, mctx, wctx, overwrite)
-# forget (manifest only, just log it) (must come first)
-for f, args, msg in actions['f']:
-repo.ui.debug(" %s: %s -> f\n" % (f, msg))
-z += 1
-progress(_updating, z, item=f, total=numupdates, unit=_files)
-# re-add (manifest only, just log it)
-for f, args, msg in actions['a']:
-repo.ui.debug(" %s: %s -> a\n" % (f, msg))
-z += 1
-progress(_updating, z, item=f, total=numupdates, unit=_files)
-# keep (noop, just log it)
-for f, args, msg in actions['k']:
-repo.ui.debug(" %s: %s -> k\n" % (f, msg))
-# no progress
-# merge
-for f, args, msg in actions['m']:
-repo.ui.debug(" %s: %s -> m\n" % (f, msg))
-z += 1
-progress(_updating, z, item=f, total=numupdates, unit=_files)
-f1, f2, fa, move, anc = args
-if f == '.hgsubstate': # subrepo states need updating
-subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx),
-overwrite)
-continue
-audit(f)
-r = ms.resolve(f, wctx, labels=labels)
-if r is not None and r > 0:
-unresolved += 1
-else:
-if r is None:
-updated += 1
-else:
-merged += 1
-# directory rename, move local
-for f, args, msg in actions['dm']:
-repo.ui.debug(" %s: %s -> dm\n" % (f, msg))
-z += 1
-progress(_updating, z, item=f, total=numupdates, unit=_files)
-f0, flags = args
-repo.ui.note(_("moving %s to %s\n") % (f0, f))
-audit(f)
-repo.wwrite(f, wctx.filectx(f0).data(), flags)
-util.unlinkpath(repo.wjoin(f0))
-updated += 1
-# local directory rename, get
-for f, args, msg in actions['dg']:
-repo.ui.debug(" %s: %s -> dg\n" % (f, msg))
-z += 1
-progress(_updating, z, item=f, total=numupdates, unit=_files)
-f0, flags = args
-repo.ui.note(_("getting %s to %s\n") % (f0, f))
-repo.wwrite(f, mctx.filectx(f0).data(), flags)
-updated += 1
-# divergent renames
-for f, args, msg in actions['dr']:
-repo.ui.debug(" %s: %s -> dr\n" % (f, msg))
-z += 1
-progress(_updating, z, item=f, total=numupdates, unit=_files)
-fl, = args
-repo.ui.warn(_("note: possible conflict - %s was renamed "
-"multiple times to:\n") % f)
-for nf in fl:
-repo.ui.warn(" %s\n" % nf)
-# rename and delete
-for f, args, msg in actions['rd']:
-repo.ui.debug(" %s: %s -> rd\n" % (f, msg))
-z += 1
-progress(_updating, z, item=f, total=numupdates, unit=_files)
-fl, = args
-repo.ui.warn(_("note: possible conflict - %s was deleted "
-"and renamed to:\n") % f)
-for nf in fl:
-repo.ui.warn(" %s\n" % nf)
-# exec
-for f, args, msg in actions['e']:
-repo.ui.debug(" %s: %s -> e\n" % (f, msg))
-z += 1
-progress(_updating, z, item=f, total=numupdates, unit=_files)
-flags, = args
-audit(f)
-util.setflags(repo.wjoin(f), 'l' in flags, 'x' in flags)
-updated += 1
-ms.commit()
-progress(_updating, None, total=numupdates, unit=_files)
-return updated, merged, removed, unresolved
 def calculateupdates(repo, wctx, mctx, ancestors, branchmerge, force, partial,
 acceptremote, followcopies):
 "Calculate the actions needed to merge mctx into wctx using ancestors"
 if len(ancestors) == 1: # default
 actions['r'].extend(ractions)
 actions['f'].extend(factions)
 return actions
+def batchremove(repo, actions):
+"""apply removes to the working directory
+yields tuples for progress updates
+"""
+verbose = repo.ui.verbose
+unlink = util.unlinkpath
+wjoin = repo.wjoin
+audit = repo.wopener.audit
+i = 0
+for f, args, msg in actions:
+repo.ui.debug(" %s: %s -> r\n" % (f, msg))
+if verbose:
+repo.ui.note(_("removing %s\n") % f)
+audit(f)
+try:
+unlink(wjoin(f), ignoremissing=True)
+except OSError, inst:
+repo.ui.warn(_("update failed to remove %s: %s!\n") %
+(f, inst.strerror))
+if i == 100:
+yield i, f
+i = 0
+i += 1
+if i > 0:
+yield i, f
+def batchget(repo, mctx, actions):
+"""apply gets to the working directory
+mctx is the context to get from
+yields tuples for progress updates
+"""
+verbose = repo.ui.verbose
+fctx = mctx.filectx
+wwrite = repo.wwrite
+i = 0
+for f, args, msg in actions:
+repo.ui.debug(" %s: %s -> g\n" % (f, msg))
+if verbose:
+repo.ui.note(_("getting %s\n") % f)
+wwrite(f, fctx(f).data(), args[0])
+if i == 100:
+yield i, f
+i = 0
+i += 1
+if i > 0:
+yield i, f
+def applyupdates(repo, actions, wctx, mctx, overwrite, labels=None):
+"""apply the merge action list to the working directory
+wctx is the working copy context
+mctx is the context to be merged into the working copy
+Return a tuple of counts (updated, merged, removed, unresolved) that
+describes how many files were affected by the update.
+"""
+updated, merged, removed, unresolved = 0, 0, 0, 0
+ms = mergestate(repo)
+ms.reset(wctx.p1().node(), mctx.node())
+moves = []
+for m, l in actions.items():
+l.sort()
+# prescan for merges
+for f, args, msg in actions['m']:
+f1, f2, fa, move, anc = args
+if f == '.hgsubstate': # merged internally
+continue
+repo.ui.debug(" preserving %s for resolve of %s\n" % (f1, f))
+fcl = wctx[f1]
+fco = mctx[f2]
+actx = repo[anc]
+if fa in actx:
+fca = actx[fa]
+else:
+fca = repo.filectx(f1, fileid=nullrev)
+ms.add(fcl, fco, fca, f)
+if f1 != f and move:
+moves.append(f1)
+audit = repo.wopener.audit
+_updating = _('updating')
+_files = _('files')
+progress = repo.ui.progress
+# remove renamed files after safely stored
+for f in moves:
+if os.path.lexists(repo.wjoin(f)):
+repo.ui.debug("removing %s\n" % f)
+audit(f)
+util.unlinkpath(repo.wjoin(f))
+numupdates = sum(len(l) for m, l in actions.items() if m != 'k')
+if [a for a in actions['r'] if a[0] == '.hgsubstate']:
+subrepo.submerge(repo, wctx, mctx, wctx, overwrite)
+# remove in parallel (must come first)
+z = 0
+prog = worker.worker(repo.ui, 0.001, batchremove, (repo,), actions['r'])
+for i, item in prog:
+z += i
+progress(_updating, z, item=item, total=numupdates, unit=_files)
+removed = len(actions['r'])
+# get in parallel
+prog = worker.worker(repo.ui, 0.001, batchget, (repo, mctx), actions['g'])
+for i, item in prog:
+z += i
+progress(_updating, z, item=item, total=numupdates, unit=_files)
+updated = len(actions['g'])
+if [a for a in actions['g'] if a[0] == '.hgsubstate']:
+subrepo.submerge(repo, wctx, mctx, wctx, overwrite)
+# forget (manifest only, just log it) (must come first)
+for f, args, msg in actions['f']:
+repo.ui.debug(" %s: %s -> f\n" % (f, msg))
+z += 1
+progress(_updating, z, item=f, total=numupdates, unit=_files)
+# re-add (manifest only, just log it)
+for f, args, msg in actions['a']:
+repo.ui.debug(" %s: %s -> a\n" % (f, msg))
+z += 1
+progress(_updating, z, item=f, total=numupdates, unit=_files)
+# keep (noop, just log it)
+for f, args, msg in actions['k']:
+repo.ui.debug(" %s: %s -> k\n" % (f, msg))
+# no progress
+# merge
+for f, args, msg in actions['m']:
+repo.ui.debug(" %s: %s -> m\n" % (f, msg))
+z += 1
+progress(_updating, z, item=f, total=numupdates, unit=_files)
+f1, f2, fa, move, anc = args
+if f == '.hgsubstate': # subrepo states need updating
+subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx),
+overwrite)
+continue
+audit(f)
+r = ms.resolve(f, wctx, labels=labels)
+if r is not None and r > 0:
+unresolved += 1
+else:
+if r is None:
+updated += 1
+else:
+merged += 1
+# directory rename, move local
+for f, args, msg in actions['dm']:
+repo.ui.debug(" %s: %s -> dm\n" % (f, msg))
+z += 1
+progress(_updating, z, item=f, total=numupdates, unit=_files)
+f0, flags = args
+repo.ui.note(_("moving %s to %s\n") % (f0, f))
+audit(f)
+repo.wwrite(f, wctx.filectx(f0).data(), flags)
+util.unlinkpath(repo.wjoin(f0))
+updated += 1
+# local directory rename, get
+for f, args, msg in actions['dg']:
+repo.ui.debug(" %s: %s -> dg\n" % (f, msg))
+z += 1
+progress(_updating, z, item=f, total=numupdates, unit=_files)
+f0, flags = args
+repo.ui.note(_("getting %s to %s\n") % (f0, f))
+repo.wwrite(f, mctx.filectx(f0).data(), flags)
+updated += 1
+# divergent renames
+for f, args, msg in actions['dr']:
+repo.ui.debug(" %s: %s -> dr\n" % (f, msg))
+z += 1
+progress(_updating, z, item=f, total=numupdates, unit=_files)
+fl, = args
+repo.ui.warn(_("note: possible conflict - %s was renamed "
+"multiple times to:\n") % f)
+for nf in fl:
+repo.ui.warn(" %s\n" % nf)
+# rename and delete
+for f, args, msg in actions['rd']:
+repo.ui.debug(" %s: %s -> rd\n" % (f, msg))
+z += 1
+progress(_updating, z, item=f, total=numupdates, unit=_files)
+fl, = args
+repo.ui.warn(_("note: possible conflict - %s was deleted "
+"and renamed to:\n") % f)
+for nf in fl:
+repo.ui.warn(" %s\n" % nf)
+# exec
+for f, args, msg in actions['e']:
+repo.ui.debug(" %s: %s -> e\n" % (f, msg))
+z += 1
+progress(_updating, z, item=f, total=numupdates, unit=_files)
+flags, = args
+audit(f)
+util.setflags(repo.wjoin(f), 'l' in flags, 'x' in flags)
+updated += 1
+ms.commit()
+progress(_updating, None, total=numupdates, unit=_files)
+return updated, merged, removed, unresolved
 def recordupdates(repo, actions, branchmerge):
 "record merge actions to the dirstate"
 # remove (must come first)
 for f, args, msg in actions['r']:
 if branchmerge:

Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 23385:91c24457c16a