This is an archive of the discontinued Mercurial Phabricator instance.

Differential D995

obbshelve: remove defaults to shelve.maxbackups
ClosedPublic

Authored by phillco on Oct 10 2017, 2:32 AM.
Tags
None
Subscribers
ryanmce

Details

Reviewers
None
Group Reviewers
Restricted Project
Commits
rFBHGX8f2d495f4c71: obbshelve: remove defaults to shelve.maxbackups
Summary

Conflicts in our test-config.t test with 18cd210535b3 which obviates the need to specify a default.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

phillco created this revision.Oct 10 2017, 2:32 AM
Herald added a reviewer: Restricted Project. · View Herald TranscriptOct 10 2017, 2:32 AM
phillco edited the summary of this revision. (Show Details)Oct 10 2017, 2:37 AM
Closed by commit rFBHGX8f2d495f4c71: obbshelve: remove defaults to shelve.maxbackups (authored by phillco). · Explain WhyOct 12 2017, 9:29 AM
This revision was automatically updated to reflect the committed changes.
ryanmce added a subscriber: ryanmce.Oct 13 2017, 9:09 AM

Looks like this broke unshelve.

ryanmce added a comment.Oct 13 2017, 9:29 AM

Conflicts in our test-config.t test with 18cd210535b3 which obviates the need to specify a default.

Except we don't load the shelve extension, do we?

extensions.shelve=!
extensions.obsshelve=

I'll back this commit out I guess.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/obsshelve.py (2 lines)

Diff 2561

hgext3rd/obsshelve.py

relations = [(unfi[n], ()) for n in self.nodestoremove] relations = [(unfi[n], ()) for n in self.nodestoremove]
obsolete.createmarkers(repo, relations) obsolete.createmarkers(repo, relations)
else: else:
repair.strip(ui, repo, self.nodestoremove, backup=False, repair.strip(ui, repo, self.nodestoremove, backup=False,
topic='shelve') topic='shelve')
def cleanupoldbackups(repo): def cleanupoldbackups(repo):
vfs = vfsmod.vfs(repo.vfs.join(backupdir)) vfs = vfsmod.vfs(repo.vfs.join(backupdir))
maxbackups = repo.ui.configint('shelve', 'maxbackups', 10) maxbackups = repo.ui.configint('shelve', 'maxbackups')
hgfiles = [f for f in vfs.listdir() hgfiles = [f for f in vfs.listdir()
if f.endswith('.' + patchextension)] if f.endswith('.' + patchextension)]
hgfiles = sorted([(vfs.stat(f).st_mtime, f) for f in hgfiles]) hgfiles = sorted([(vfs.stat(f).st_mtime, f) for f in hgfiles])
if 0 < maxbackups and maxbackups < len(hgfiles): if 0 < maxbackups and maxbackups < len(hgfiles):
bordermtime = hgfiles[-maxbackups][0] bordermtime = hgfiles[-maxbackups][0]
else: else:
bordermtime = None bordermtime = None
for mtime, f in hgfiles[:len(hgfiles) - maxbackups]: for mtime, f in hgfiles[:len(hgfiles) - maxbackups]: