comparison mercurial/upgrade.py @ 38736:93777d16a25d

aggressivemergedeltas: rename variable internally

The "aggressivemergedeltas" name is not great. First, it is quite long,
second, we would rather have less "Aggressive" names within the project. We
are about to rename the config option, so it seems the appropriate time to
rename the internal variable.

38735:8891dc15b327

        return manifest.manifestrevlog(repo.svfs, dir=mandir)
    else:
        #reverse of "/".join(("data", path + ".i"))
        return filelog.filelog(repo.svfs, path[5:-2])

def _copyrevlogs(ui, srcrepo, dstrepo, tr, deltareuse, aggressivemergedeltas):
    """Copy revlogs between 2 repos."""
    revcount = 0
    srcsize = 0
    srcrawsize = 0
    dstsize = 0

        ui.note(_('cloning %d revisions from %s\n') % (len(oldrl), unencoded))
        oldrl.clone(tr, newrl, addrevisioncb=oncopiedrevision,
                    deltareuse=deltareuse,
                    aggressivemergedeltas=aggressivemergedeltas)

        datasize = 0
        idx = newrl.index
        for rev in newrl:
            datasize += idx[rev][1]

38736:93777d16a25d

        return manifest.manifestrevlog(repo.svfs, dir=mandir)
    else:
        #reverse of "/".join(("data", path + ".i"))
        return filelog.filelog(repo.svfs, path[5:-2])

def _copyrevlogs(ui, srcrepo, dstrepo, tr, deltareuse, deltabothparents):
    """Copy revlogs between 2 repos."""
    revcount = 0
    srcsize = 0
    srcrawsize = 0
    dstsize = 0

        ui.note(_('cloning %d revisions from %s\n') % (len(oldrl), unencoded))
        oldrl.clone(tr, newrl, addrevisioncb=oncopiedrevision,
                    deltareuse=deltareuse,
                    deltabothparents=deltabothparents)

        datasize = 0
        idx = newrl.index
        for rev in newrl:
            datasize += idx[rev][1]