[PATCH 5 of 5] merge.applyupdates: only attempt to merge files in mergeactions

[Martin von Zweigbergk]

On Thu, Nov 12, 2015 at 7:22 PM Siddharth Agarwal <sid at less-broken.com>
wrote:

> On 11/12/15 17:44, Martin von Zweigbergk wrote:
> >
> >
> > On Thu, Nov 12, 2015 at 2:33 PM Siddharth Agarwal <sid0 at fb.com
> > <mailto:sid0 at fb.com>> wrote:
> >
> >     # HG changeset patch
> >     # User Siddharth Agarwal <sid0 at fb.com <mailto:sid0 at fb.com>>
> >     # Date 1447367342 28800
> >     #      Thu Nov 12 14:29:02 2015 -0800
> >     # Node ID 7ef8c6fd040c8ff0efd49755ebbdc8e16ca50e47
> >     # Parent  bf354f5a168277cf493fc7c95d74d91c6d23447f
> >     merge.applyupdates: only attempt to merge files in mergeactions
> >
> >     This only makes a difference when a merge driver is active -- in
> >     that case we
> >     don't want to try and merge all the files, just the ones still
> >     unresolved after
> >     the merge driver's preprocess step is over.
> >
> >
> > What would be the consequence of merging all the files? Would they be
> > merged the same way as before, so it's just a waste of time? If not,
> > is it worth testing this case and/or applying this to stable?
>
> Yeah, it's just a waste of time. (Plus, this change leads nicely to some
> upcoming patches that I have.)
>
> The merge driver stuff is still experimental, so this has no
> user-visible impact in supported features. This shouldn't go on stable.
>

And no user-visible impact in unsupported features either, if I interpret
the paragraph above right :-)

Besides the HGMERGE patches that still are a mystery to me, this series
makes sense, so I'll push these 5 to the clowncopter once tests have
finished running.


>
> >
> >     diff --git a/mercurial/merge.py b/mercurial/merge.py
> >     --- a/mercurial/merge.py
> >     +++ b/mercurial/merge.py
> >     @@ -970,7 +970,7 @@ def applyupdates(repo, actions, wctx, mc
> >
> >          # premerge
> >          tocomplete = []
> >     -    for f, args, msg in actions['m']:
> >     +    for f, args, msg in mergeactions:
> >              repo.ui.debug(" %s: %s -> m (premerge)\n" % (f, msg))
> >              z += 1
> >              progress(_updating, z, item=f, total=numupdates,
> unit=_files)
> >     _______________________________________________
> >     Mercurial-devel mailing list
> >     Mercurial-devel at selenic.com <mailto:Mercurial-devel at selenic.com>
> >     https://selenic.com/mailman/listinfo/mercurial-devel
> >
> >
> >
> > _______________________________________________
> > Mercurial-devel mailing list
> > Mercurial-devel at selenic.com
> > https://selenic.com/mailman/listinfo/mercurial-devel
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20151113/de2a59a1/attachment.html>