comparison mercurial/shelve.py @ 46284:d7f763c8c58e

shelve: make gennames() helper generate relative backup paths

When I saw `gennames()`, I thought it was meant to take a relative
filename as argument. Maybe it was or maybe it wasn't, but it seems
simpler to pass it a relative path anyway, so that's what this patch
does. That also makes the call to backupvfs.exists() more natural (I
expect a relative path to be passed there too).

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

46283:8db5fa212ab0

            yield base
            base, ext = base.rsplit(b'.', 1)
            for i in itertools.count(1):
                yield b'%s-%d.%s' % (base, i, ext)

        name = self.backupvfs.join(self.fname)
        for n in gennames(name):
            if not self.backupvfs.exists(n):
                return n

    def movetobackup(self):
        if not self.backupvfs.isdir():
            self.backupvfs.makedir()
        util.rename(self.vfs.join(self.fname), self.backupfilename())

46284:d7f763c8c58e

            yield base
            base, ext = base.rsplit(b'.', 1)
            for i in itertools.count(1):
                yield b'%s-%d.%s' % (base, i, ext)

        for n in gennames(self.fname):
            if not self.backupvfs.exists(n):
                return self.backupvfs.join(n)

    def movetobackup(self):
        if not self.backupvfs.isdir():
            self.backupvfs.makedir()
        util.rename(self.vfs.join(self.fname), self.backupfilename())