merge: make applyupdates() not mutate mresult argument We have an extension at work that overrides `merge.applyupdates()` to make it skip some writes and instead instruct the virtual filesystem we use to get a different version. That override doesn't work correctly when doing `hg co -m` and there's a modified file in the dirstate that's deleted in the destination. That's because `applyupdates()` mutates its `mresult` argument and our extension had passed in a modified copied of `mresult` to the overridden function, which resulted in the mutation not having any effect. This patch fixes that by letting the caller (i.e. `merge._update()`) update `mresult` with the extra actions instead. Besides fixing our internal extension, that seems cleaner to me anyway (better to not mutate `mresult` only in some cases and we can skip some of the logic if we're not going to update the dirstate anyway). Differential Revision: https://phab.mercurial-scm.org/D10830

     1

#!/usr/bin/env python3

     2

#

     3

# An example hgweb CGI script, edit as necessary

     4

# See also https://mercurial-scm.org/wiki/PublishingRepositories

     5

     6

# Path to repo or hgweb config to serve (see 'hg help hgweb')

     7

config = b"/path/to/repo/or/config"

     8

     9

# Uncomment and adjust if Mercurial is not installed system-wide

    10

# (consult "installed modules" path from 'hg debuginstall'):

    11

# import sys; sys.path.insert(0, "/path/to/python/lib")

    12

    13

# Uncomment to send python tracebacks to the browser if an error occurs:

    14

# import cgitb; cgitb.enable()

    15

    16

from mercurial import demandimport

    17

    18

demandimport.enable()

    19

from mercurial.hgweb import hgweb, wsgicgi

    20

    21

application = hgweb(config)

    22

wsgicgi.launch(application)