comparison hgext/largefiles/overrides.py @ 23483:3805f4b0f5a9

largefiles: remove redundant checks for false modify/delete conflicts

In a34a99181f36 (largefiles: don't show largefile/normal prompts if
one side is unchanged, 2014-12-01), overridecalculateupdates() started
checking for false modify/delete conflicts in large files and their
standins. Then, in the very next changeset, 902554884335 (merge:
before cd/dc prompt, check that changed side really changed,
2014-12-01), calculateupdates() itself started checking for false
modify/delete conflicts in all files. Since "large files and their
standins" is a subset of "all files", we can now drop the checks in
overridecalculateupdates().

23482:208ec8ca7c79

            lfile = splitstandin
            standin = f
            usermsg = _('remote turned local normal file %s into a largefile\n'
                        'use (l)argefile or keep (n)ormal file?'
                        '$$ &Largefile $$ &Normal file') % lfile
            if (# local has unchanged normal file, pick remote largefile
                pas and lfile in pas[0] and
                not pas[0][lfile].cmp(p1[lfile]) or
                # if remote has unchanged largefile, pick local normal file
                not (pas and standin in pas[0] and
                     not pas[0][standin].cmp(p2[standin])) and
                # else, prompt
                repo.ui.promptchoice(usermsg, 0) == 0
                ): # pick remote largefile
                actions['r'].append((lfile, None, 'replaced by standin'))
                newglist.append((standin, (p2.flags(standin),), msg))
            else: # keep local normal file
                actions['r'].append((standin, None, 'replaced by non-standin'))
        elif lfutil.standin(f) in p1 and lfutil.standin(f) not in removes:

            standin = lfutil.standin(f)
            lfile = f
            usermsg = _('remote turned local largefile %s into a normal file\n'
                    'keep (l)argefile or use (n)ormal file?'
                    '$$ &Largefile $$ &Normal file') % lfile
            if (# if remote has unchanged normal file, pick local largefile
                pas and f in pas[0] and
                not pas[0][f].cmp(p2[f]) or
                # if local has unchanged largefile, pick remote normal file
                not (pas and standin in pas[0] and
                     not pas[0][standin].cmp(p1[standin])) and
                # else, prompt
                repo.ui.promptchoice(usermsg, 0) == 0
                ): # keep local largefile
                if branchmerge:
                    # largefile can be restored from standin safely
                    actions['r'].append((lfile, None, 'replaced by standin'))
                else:
                    # "lfile" should be marked as "removed" without

23483:3805f4b0f5a9

            lfile = splitstandin
            standin = f
            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
                actions['r'].append((lfile, None, 'replaced by standin'))
                newglist.append((standin, (p2.flags(standin),), msg))
            else: # keep local normal file
                actions['r'].append((standin, None, 'replaced by non-standin'))
        elif lfutil.standin(f) in p1 and lfutil.standin(f) not in removes:

            standin = lfutil.standin(f)
            lfile = f
            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
                    actions['r'].append((lfile, None, 'replaced by standin'))
                else:
                    # "lfile" should be marked as "removed" without