Patchwork [7,of,7,mergedriver] merge.applyupdates: extend action queues with ones returned from mergestate

login
register
mail settings
Submitter Siddharth Agarwal
Date Nov. 21, 2015, 1:04 a.m.
Message ID <3e17318018fe01c93b9d.1448067842@dev666.prn1.facebook.com>
Download mbox | patch
Permalink /patch/11560/
State Accepted
Commit ae2d3782d8184366093efe82ddec0ab5b8f3b532
Delegated to: Martin von Zweigbergk
Headers show

Comments

Siddharth Agarwal - Nov. 21, 2015, 1:04 a.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1448047591 28800
#      Fri Nov 20 11:26:31 2015 -0800
# Node ID 3e17318018fe01c93b9dd4bbdfb9c8358b547ea5
# Parent  d3f3222f45eef7acf90322d4ba5cc9c21f25b7b1
# Available At http://42.netv6.net/sid0-wip/hg/
#              hg pull http://42.netv6.net/sid0-wip/hg/ -r 3e17318018fe
merge.applyupdates: extend action queues with ones returned from mergestate

These queues will always be empty at the moment -- we're going to fill them up
in upcoming patches.
Martin von Zweigbergk - Nov. 23, 2015, 5:41 a.m.
On Fri, Nov 20, 2015 at 5:07 PM Siddharth Agarwal <sid0@fb.com> wrote:

> # HG changeset patch
> # User Siddharth Agarwal <sid0@fb.com>
> # Date 1448047591 28800
> #      Fri Nov 20 11:26:31 2015 -0800
> # Node ID 3e17318018fe01c93b9dd4bbdfb9c8358b547ea5
> # Parent  d3f3222f45eef7acf90322d4ba5cc9c21f25b7b1
> # Available At http://42.netv6.net/sid0-wip/hg/
> #              hg pull http://42.netv6.net/sid0-wip/hg/ -r 3e17318018fe
> merge.applyupdates: extend action queues with ones returned from mergestate
>
> These queues will always be empty at the moment -- we're going to fill
> them up
> in upcoming patches.
>

I haven't bothered to understand these last 2 patches, but I'll trust that
they will be useful. Pushed to the clowncopter, thanks!


>
> diff --git a/mercurial/merge.py b/mercurial/merge.py
> --- a/mercurial/merge.py
> +++ b/mercurial/merge.py
> @@ -1119,6 +1119,11 @@ def applyupdates(repo, actions, wctx, mc
>      updated += msupdated
>      merged += msmerged
>      removed += msremoved
> +
> +    extraactions = ms.actions()
> +    for a in 'rag':
> +        actions[a].extend(extraactions[a])
> +
>      progress(_updating, None, total=numupdates, unit=_files)
>
>      return updated, merged, removed, unresolved
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> https://selenic.com/mailman/listinfo/mercurial-devel
>

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -1119,6 +1119,11 @@  def applyupdates(repo, actions, wctx, mc
     updated += msupdated
     merged += msmerged
     removed += msremoved
+
+    extraactions = ms.actions()
+    for a in 'rag':
+        actions[a].extend(extraactions[a])
+
     progress(_updating, None, total=numupdates, unit=_files)
 
     return updated, merged, removed, unresolved