mercurial/merge.py

42528:64a873ca7135

    mctx is the context to get from

    Yields arbitrarily many (False, tuple) for progress updates, followed by
    exactly one (True, filedata). When wantfiledata is false, filedata is an
    empty list. When wantfiledata is true, filedata[i] is a triple (mode, size,
    mtime) of the file written for action[i].
    """
    filedata = []
    verbose = repo.ui.verbose
    fctx = mctx.filectx
    ui = repo.ui
    i = 0
    with repo.wvfs.backgroundclosing(ui, expectedcount=len(actions)):

                               atomictemp=atomictemp)
            if wantfiledata:
                s = wfctx.lstat()
                mode = s.st_mode
                mtime = s[stat.ST_MTIME]
                filedata.append((mode, size, mtime)) # for dirstate.normal
            if i == 100:
                yield False, (i, f)
                i = 0
            i += 1
    if i > 0:

    prog = worker.worker(repo.ui, cost, batchget,
                         (repo, mctx, wctx, wantfiledata),
                         actions[ACTION_GET],
                         threadsafe=threadsafe,
                         hasretval=True)
    getfiledata = []
    for final, res in prog:
        if final:
            getfiledata = res
        else:
            i, item = res

        mfiles = set(a[0] for a in actions[ACTION_MERGE])
        for k, acts in extraactions.iteritems():
            actions[k].extend(acts)
            if k == ACTION_GET and wantfiledata:
                # no filedata until mergestate is updated to provide it
                getfiledata.extend([None] * len(acts))
            # Remove these files from actions[ACTION_MERGE] as well. This is
            # important because in recordupdates, files in actions[ACTION_MERGE]
            # are processed after files in other actions, and the merge driver
            # might add files to those actions via extraactions above. This can
            # lead to a file being recorded twice, with poor results. This is

    # keep
    for f, args, msg in actions.get(ACTION_KEEP, []):
        pass

    # get
    for i, (f, args, msg) in enumerate(actions.get(ACTION_GET, [])):
        if branchmerge:
            repo.dirstate.otherparent(f)
        else:
            parentfiledata = getfiledata[i] if getfiledata else None
            repo.dirstate.normal(f, parentfiledata=parentfiledata)

    # merge
    for f, args, msg in actions.get(ACTION_MERGE, []):
        f1, f2, fa, move, anc = args

42529:d29db0a0c4eb

    mctx is the context to get from

    Yields arbitrarily many (False, tuple) for progress updates, followed by
    exactly one (True, filedata). When wantfiledata is false, filedata is an
    empty dict. When wantfiledata is true, filedata[f] is a triple (mode, size,
    mtime) of the file f written for each action.
    """
    filedata = {}
    verbose = repo.ui.verbose
    fctx = mctx.filectx
    ui = repo.ui
    i = 0
    with repo.wvfs.backgroundclosing(ui, expectedcount=len(actions)):

                               atomictemp=atomictemp)
            if wantfiledata:
                s = wfctx.lstat()
                mode = s.st_mode
                mtime = s[stat.ST_MTIME]
                filedata[f] = ((mode, size, mtime)) # for dirstate.normal
            if i == 100:
                yield False, (i, f)
                i = 0
            i += 1
    if i > 0:

    prog = worker.worker(repo.ui, cost, batchget,
                         (repo, mctx, wctx, wantfiledata),
                         actions[ACTION_GET],
                         threadsafe=threadsafe,
                         hasretval=True)
    getfiledata = {}
    for final, res in prog:
        if final:
            getfiledata = res
        else:
            i, item = res

        mfiles = set(a[0] for a in actions[ACTION_MERGE])
        for k, acts in extraactions.iteritems():
            actions[k].extend(acts)
            if k == ACTION_GET and wantfiledata:
                # no filedata until mergestate is updated to provide it
                for a in acts:
                    getfiledata[a[0]] = None
            # Remove these files from actions[ACTION_MERGE] as well. This is
            # important because in recordupdates, files in actions[ACTION_MERGE]
            # are processed after files in other actions, and the merge driver
            # might add files to those actions via extraactions above. This can
            # lead to a file being recorded twice, with poor results. This is

    # keep
    for f, args, msg in actions.get(ACTION_KEEP, []):
        pass

    # get
    for f, args, msg in actions.get(ACTION_GET, []):
        if branchmerge:
            repo.dirstate.otherparent(f)
        else:
            parentfiledata = getfiledata[f] if getfiledata else None
            repo.dirstate.normal(f, parentfiledata=parentfiledata)

    # merge
    for f, args, msg in actions.get(ACTION_MERGE, []):
        f1, f2, fa, move, anc = args