comparison hgext/largefiles/overrides.py @ 23541:495bc1b65d25

merge: move cd/dc prompts after largefiles prompts

By moving the cd/dc prompts out of calculateupdates(), we let
largefiles' overridecalculateupdates() so the unresolved values
(i.e. 'cd' or 'dc' rather than 'g', 'r', 'a' and missing). This allows
overridecalculateupdates() to ask the user whether to keep the normal
file or the largefile before the user gets the cd/dc prompt. Whichever
answer the user gives, we make overridecalculateupdates() replace 'cd'
or 'dc' action, saving the user one annoying (and less clear)
question.

23540:f274d27f1994

            elif lfutil.standin(f) in p1:
                lfiles.add(f)

    for lfile in lfiles:
        standin = lfutil.standin(lfile)
        lm = actionbyfile.get(lfile, (None, None, None))[0]
        sm = actionbyfile.get(standin, (None, None, None))[0]
        if sm == 'g' and lm != 'r':
            # Case 1: normal file in the working copy, largefile in
            # the second parent
            usermsg = _('remote turned local normal file %s into a largefile\n'
                        'use (l)argefile or keep (n)ormal file?'
                        '$$ &Largefile $$ &Normal file') % lfile
            if repo.ui.promptchoice(usermsg, 0) == 0: # pick remote largefile
                actionbyfile[lfile] = ('r', None, 'replaced by standin')
            else: # keep local normal file
                if branchmerge:
                    actionbyfile[standin] = ('k', None,
                                             'replaced by non-standin')
                else:
                    actionbyfile[standin] = ('r', None,
                                             'replaced by non-standin')
        elif lm == 'g' and sm != 'r':
            # Case 2: largefile in the working copy, normal file in
            # the second parent
            usermsg = _('remote turned local largefile %s into a normal file\n'
                    'keep (l)argefile or use (n)ormal file?'
                    '$$ &Largefile $$ &Normal file') % lfile
            if repo.ui.promptchoice(usermsg, 0) == 0: # keep local largefile
                if branchmerge:
                    # largefile can be restored from standin safely
                    actionbyfile[lfile] = ('k', None, 'replaced by standin')
                else:
                    # "lfile" should be marked as "removed" without
                    # removal of itself
                    actionbyfile[lfile] = ('lfmr', None,
                                           'forget non-standin largefile')

                    # linear-merge should treat this largefile as 're-added'
                    actionbyfile[standin] = ('a', None, 'keep standin')
            else: # pick remote normal file
                actionbyfile[standin] = ('r', None, 'replaced by non-standin')

    # Convert back to dictionary-of-lists format
    for l in actions.itervalues():
        l[:] = []

23541:495bc1b65d25

            elif lfutil.standin(f) in p1:
                lfiles.add(f)

    for lfile in lfiles:
        standin = lfutil.standin(lfile)
        (lm, largs, lmsg) = actionbyfile.get(lfile, (None, None, None))
        (sm, sargs, smsg) = actionbyfile.get(standin, (None, None, None))
        if sm in ('g', 'dc') and lm != 'r':
            # Case 1: normal file in the working copy, largefile in
            # the second parent
            usermsg = _('remote turned local normal file %s into a largefile\n'
                        'use (l)argefile or keep (n)ormal file?'
                        '$$ &Largefile $$ &Normal file') % lfile
            if repo.ui.promptchoice(usermsg, 0) == 0: # pick remote largefile
                actionbyfile[lfile] = ('r', None, 'replaced by standin')
                actionbyfile[standin] = ('g', sargs, 'replaces standin')
            else: # keep local normal file
                actionbyfile[lfile] = ('k', None, 'replaces standin')
                if branchmerge:
                    actionbyfile[standin] = ('k', None,
                                             'replaced by non-standin')
                else:
                    actionbyfile[standin] = ('r', None,
                                             'replaced by non-standin')
        elif lm in ('g', 'dc') and sm != 'r':
            # Case 2: largefile in the working copy, normal file in
            # the second parent
            usermsg = _('remote turned local largefile %s into a normal file\n'
                    'keep (l)argefile or use (n)ormal file?'
                    '$$ &Largefile $$ &Normal file') % lfile
            if repo.ui.promptchoice(usermsg, 0) == 0: # keep local largefile
                if branchmerge:
                    # largefile can be restored from standin safely
                    actionbyfile[lfile] = ('k', None, 'replaced by standin')
                    actionbyfile[standin] = ('k', None, 'replaces standin')
                else:
                    # "lfile" should be marked as "removed" without
                    # removal of itself
                    actionbyfile[lfile] = ('lfmr', None,
                                           'forget non-standin largefile')

                    # linear-merge should treat this largefile as 're-added'
                    actionbyfile[standin] = ('a', None, 'keep standin')
            else: # pick remote normal file
                actionbyfile[lfile] = ('g', largs, 'replaces standin')
                actionbyfile[standin] = ('r', None, 'replaced by non-standin')

    # Convert back to dictionary-of-lists format
    for l in actions.itervalues():
        l[:] = []