comparison hgext/largefiles/overrides.py @ 45348:490607efc992

merge: remove emptyactions() and use collections.defaultdict(list) instead

emptyactions() used to return a dict which was populated and passed into
applyupdates(). However, with recent changes, we no longer pass a plain dict,
instead we pass the mergeresult object.

There was only one usage of emptyactions and that too inside mergeresult object.
That usage is replaced with collections.defaultdict(list) instead.

Not sure why we were not using collections.defaultdict(list) from the beginning.

Differential Revision: https://phab.mercurial-scm.org/D8903

45347:1aef38d973e8

            dirstate = lfutil.openlfdirstate(ui, repo)

        orig(ui, fakerepo, *pats, **opts)
    else:
        orig(ui, repo, *pats, **opts)


# Register the MERGE_ACTION_LARGEFILE_MARK_REMOVED in emptyactions() return type
@eh.wrapfunction(merge, b'emptyactions')
def overrideemptyactions(origfn):
    ret = origfn()
    ret[MERGE_ACTION_LARGEFILE_MARK_REMOVED] = []
    return ret


# Before starting the manifest merge, merge.updates will call
# _checkunknownfile to check if there are any files in the merged-in
# changeset that collide with unknown files in the working copy.

45348:490607efc992

            dirstate = lfutil.openlfdirstate(ui, repo)

        orig(ui, fakerepo, *pats, **opts)
    else:
        orig(ui, repo, *pats, **opts)


# Before starting the manifest merge, merge.updates will call
# _checkunknownfile to check if there are any files in the merged-in
# changeset that collide with unknown files in the working copy.