( )⚙ D6339 repair: reword comments that I noticed while working on source formatting

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6339

repair: reword comments that I noticed while working on source formatting
ClosedPublic

Authored by durin42 on May 4 2019, 10:37 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd811f17090a3: repair: reword comments that I noticed while working on source formatting
Summary

I think this is clearer, and one will also keep us from upsetting
check-code when other formatting cleanups happen.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.May 4 2019, 10:37 AM
martinvonz added a subscriber: martinvonz.May 4 2019, 12:03 PM
martinvonz added inline comments.
mercurial/repair.py
421

Nit: use same message as above

durin42 marked an inline comment as done.May 4 2019, 11:03 PM
durin42 updated this revision to Diff 15008.
Closed by commit rHGd811f17090a3: repair: reword comments that I noticed while working on source formatting (authored by durin42). · Explain WhyMay 5 2019, 1:14 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/repair.py (10 lines)

Diff 15002

mercurial/repair.py

callback.addnodes(nodelist) callback.addnodes(nodelist)
def stripmanifest(repo, striprev, tr, files): def stripmanifest(repo, striprev, tr, files):
revlog = repo.manifestlog.getstorage(b'') revlog = repo.manifestlog.getstorage(b'')
revlog.strip(striprev, tr) revlog.strip(striprev, tr)
striptrees(repo, tr, striprev, files) striptrees(repo, tr, striprev, files)
def striptrees(repo, tr, striprev, files): def striptrees(repo, tr, striprev, files):
if 'treemanifest' in repo.requirements: # safe but unnecessary if 'treemanifest' in repo.requirements:
# otherwise # This logic is safe if treemanifest isn't enabled, but also
# pointless, so we skip it if treemanifest isn't enabled.
for unencoded, encoded, size in repo.store.datafiles(): for unencoded, encoded, size in repo.store.datafiles():
if (unencoded.startswith('meta/') and if (unencoded.startswith('meta/') and
unencoded.endswith('00manifest.i')): unencoded.endswith('00manifest.i')):
dir = unencoded[5:-12] dir = unencoded[5:-12]
repo.manifestlog.getstorage(dir).strip(striprev, tr) repo.manifestlog.getstorage(dir).strip(striprev, tr)
def rebuildfncache(ui, repo): def rebuildfncache(ui, repo):
"""Rebuilds the fncache file from repo history. """Rebuilds the fncache file from repo history.
if repo.store._exists(i): if repo.store._exists(i):
newentries.add(i) newentries.add(i)
if repo.store._exists(d): if repo.store._exists(d):
newentries.add(d) newentries.add(d)
progress.complete() progress.complete()
if 'treemanifest' in repo.requirements: # safe but unnecessary otherwise if 'treemanifest' in repo.requirements:
# otherwise This logic is safe if treemanifest isn't in
martinvonzUnsubmitted
Done

Nit: use same message as above

martinvonz: Nit: use same message as above
# use, but it's also not required so we skip it if it's
# not needed.
for dir in util.dirs(seenfiles): for dir in util.dirs(seenfiles):
i = 'meta/%s/00manifest.i' % dir i = 'meta/%s/00manifest.i' % dir
d = 'meta/%s/00manifest.d' % dir d = 'meta/%s/00manifest.d' % dir
if repo.store._exists(i): if repo.store._exists(i):
newentries.add(i) newentries.add(i)
if repo.store._exists(d): if repo.store._exists(d):
newentries.add(d) newentries.add(d)