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

comparison mercurial/merge.py @ 21391:cb15835456cb

merge: change debug logging - test output changes but no real changes Preparing for action list split-up, making sure the final change don't have any test changes. The patch moves debug statements around without really changing anything. Arguably, it temporarily makes the code worse. The only justification is that it makes it easier to review the test changes ... and in the end the big change will not change test output at all. The changes to test output are due to changes in the ordering of debug output. That is mainly because we now do the debug logging for files when we actually process them. Files are also processed in a slightly different but still correct order. It is now primarily ordered by action type, secondarily by filename. The patch introduces some redundancy. Some of it will be removed again, some of it will in the end help code readability and efficiency. It is possible that we later on could introduce a "process this action list and do some logging and progress reporting and apply this function". The "preserving X for resolve" debug statements will only have single space indentation. It will no longer have a leading single space indented "f: msg -> m" message. Having this message double indented would thus no longer make sense. The bid actions will temporarily be sorted using a custom sort key that happens to match the sort order the simplified code will have in the end.

author	Mads Kiilerich <madski@unity3d.com>
date	Tue, 22 Apr 2014 02:10:25 +0200
parents	26b84128c54d
children	b1ce47dadbdf

comparison

equal deleted inserted replaced

-:26b84128c54d
+:cb15835456cb
 wjoin = repo.wjoin
 fctx = mctx.filectx
 wwrite = repo.wwrite
 audit = repo.wopener.audit
 i = 0
-for arg in args:
+for f, m, args, msg in args:
-f = arg[0]
+repo.ui.debug(" %s: %s -> %s\n" % (f, msg, m))
-if arg[1] == 'r':
+if m == 'r':
 if verbose:
 repo.ui.note(_("removing %s\n") % f)
 audit(f)
 try:
 unlink(wjoin(f), ignoremissing=True)
 repo.ui.warn(_("update failed to remove %s: %s!\n") %
 (f, inst.strerror))
 else:
 if verbose:
 repo.ui.note(_("getting %s\n") % f)
-wwrite(f, fctx(f).data(), arg[2][0])
+wwrite(f, fctx(f).data(), args[0])
 if i == 100:
 yield i, f
 i = 0
 i += 1
 if i > 0:
 actions.sort(key=actionkey)
 # prescan for merges
 for a in actions:
 f, m, args, msg = a
-repo.ui.debug(" %s: %s -> %s\n" % (f, msg, m))
 if m == "m": # merge
 f1, f2, fa, move, anc = args
 if f == '.hgsubstate': # merged internally
 continue
-repo.ui.debug("  preserving %s for resolve of %s\n" % (f1, f))
+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]
 workeractions = [a for a in actions if a[1] in 'gr']
 updateactions = [a for a in workeractions if a[1] == 'g']
 updated = len(updateactions)
 removeactions = [a for a in workeractions if a[1] == 'r']
 removed = len(removeactions)
-actions = [a for a in actions if a[1] not in 'grk']
+actions = [a for a in actions if a[1] not in 'gr']
 hgsub = [a[1] for a in workeractions if a[0] == '.hgsubstate']
 if hgsub and hgsub[0] == 'r':
 subrepo.submerge(repo, wctx, mctx, wctx, overwrite)
 progress(_updating, z, item=item, total=numupdates, unit=_files)
 if hgsub and hgsub[0] == 'g':
 subrepo.submerge(repo, wctx, mctx, wctx, overwrite)
-for i, a in enumerate(actions):
+for f, m, args, msg in actions:
-f, m, args, msg = a
-progress(_updating, z + i + 1, item=f, total=numupdates, unit=_files)
+# forget (manifest only, just log it) (must come first)
-if m == "m": # merge
+if m == "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)
+elif m == "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)
+elif m == "k":
+repo.ui.debug(" %s: %s -> k\n" % (f, msg))
+# no progress
+# merge
+elif m == "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
 else:
 if r is None:
 updated += 1
 else:
 merged += 1
-elif m == "dm": # directory rename, move local
+# directory rename, move local
+elif m == "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
-elif m == "dg": # local directory rename, get
+# local directory rename, get
+elif m == "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
-elif m == "dr": # divergent renames
+# divergent renames
+elif m == "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)
-elif m == "rd": # rename and delete
+# rename and delete
+elif m == "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)
-elif m == "e": # exec
+# exec
+elif m == "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
 for ancestor in ancestors:
 repo.ui.note(_('\ncalculating bids for ancestor %s\n') % ancestor)
 actions = manifestmerge(repo, wctx, mctx, ancestor,
 branchmerge, force,
 partial, acceptremote, followcopies)
-for a in sorted(actions):
+for a in sorted(actions, key=lambda a: (a[1], a)):
 f, m, args, msg = a
 repo.ui.debug(' %s: %s -> %s\n' % (f, msg, m))
 if f in fbids:
 fbids[f].append(a)
 else:
 return newactions
 def recordupdates(repo, actions, branchmerge):
 "record merge actions to the dirstate"
-for a in actions:
+for f, m, args, msg in actions:
-f, m, args, msg = a
-if m == "r": # remove (must come first)
+# remove (must come first)
+if m == "r": # remove
 if branchmerge:
 repo.dirstate.remove(f)
 else:
 repo.dirstate.drop(f)
-elif m == "f": # forget (must come first)
+# forget (must come first)
+elif m == "f":
 repo.dirstate.drop(f)
-elif m == "a": # re-add
+# re-add
+elif m == "a":
 if not branchmerge:
 repo.dirstate.add(f)
-elif m == "e": # exec change
+# exec change
+elif m == "e":
 repo.dirstate.normallookup(f)
-elif m == "k": # keep
+# keep
+elif m == "k":
 pass
-elif m == "g": # get
+# get
+elif m == "g":
 if branchmerge:
 repo.dirstate.otherparent(f)
 else:
 repo.dirstate.normal(f)
-elif m == "m": # merge
+# merge
+elif m == "m":
 f1, f2, fa, move, anc = args
 if branchmerge:
 # We've done a branch merge, mark this file as merged
 # so that we properly record the merger later
 repo.dirstate.merge(f)
 # modification.
 if f2 == f: # file not locally copied/moved
 repo.dirstate.normallookup(f)
 if move:
 repo.dirstate.drop(f1)
-elif m == "dm": # directory rename, move local
+# directory rename, move local
+elif m == "dm":
 f0, flag = args
 if f0 not in repo.dirstate:
 # untracked file moved
 continue
 if branchmerge:
 repo.dirstate.remove(f0)
 repo.dirstate.copy(f0, f)
 else:
 repo.dirstate.normal(f)
 repo.dirstate.drop(f0)
-elif m == "dg": # directory rename, get
+# directory rename, get
+elif m == "dg":
 f0, flag = args
 if branchmerge:
 repo.dirstate.add(f)
 repo.dirstate.copy(f0, f)
 else:

Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 21391:cb15835456cb