Github/littlefs
1
Fork 0
Code Actions Activity

scripts: Renamed -w/--wait -> -t/--wait

Browse Source 
I'm trying to avoid the inevitable conflict with -w/--word, which will
probably become important when exploring non-32-bit filesystem
configurations.

Renaming this to -t/--wait still conflicts with -t/--tree and -t/--tiny,
but as a debug-only flag, I think these are less important.

Oh, and -t/--trace, but test.py/bench.py are already quite different in
their flag naming  (see -d/--disk vs -d/--diff).

---

Renamed a few other flags while tweaking things:

- -t/--tiny -> --tiny (dropped shortform)
- -w/--word-bits -> -w/--word/--word-bits
- -t/--tree -> -R/--tree/--rbyd/--tree-rbyd
- -R/--tree-rbyd -> -Y/--rbyd-all/--tree-rbyd-all
- -B/--tree-btree -> -B/--btree/--tree-btree

After tinkering with it a bit, I think the -R/-Y/-B set of flags are a
decent way to organize the tree renderers. At least --tree-rbyd-all does
a better job of describing the difference between --tree-rbyd and
--tree-rbyd-all.
This commit is contained in:
Christopher Haster
2025-11-16 15:00:33 -06:00
parent 9bc41099f0
commit efdcb912f5
15 changed files with 66 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/codemap.py
+1 -1
View File
@@ -1731,7 +1731,7 @@ if __name__ == "__main__":
if ':' in x else float(x)), if ':' in x else float(x)),
help="Aspect ratio to use with --to-scale. Defaults to 1:1.") help="Aspect ratio to use with --to-scale. Defaults to 1:1.")
parser.add_argument( parser.add_argument(
'-t', '--tiny', '--tiny',
action='store_true', action='store_true',
help="Tiny mode, alias for --to-scale=1 and --no-header.") help="Tiny mode, alias for --to-scale=1 and --no-header.")
parser.add_argument( parser.add_argument(
scripts/codemapsvg.py
+1 -1
View File
@@ -2400,7 +2400,7 @@ if __name__ == "__main__":
if ':' in x else float(x)), if ':' in x else float(x)),
help="Aspect ratio to use with --to-scale. Defaults to 1:1.") help="Aspect ratio to use with --to-scale. Defaults to 1:1.")
parser.add_argument( parser.add_argument(
'-t', '--tiny', '--tiny',
action='store_true', action='store_true',
help="Tiny mode, alias for --to-scale=1, --no-header, " help="Tiny mode, alias for --to-scale=1, --no-header, "
"--no-label, --no-stack, and --no-javascript.") "--no-label, --no-stack, and --no-javascript.")
scripts/dbg.gdb.py
+1 -1
View File
@@ -40,7 +40,7 @@ def gdbsplit(v):
# #
# Note some tricks to help interact with bash and gdb: # Note some tricks to help interact with bash and gdb:
# #
# - Flags are passed as is (-b4096, -t, --trunk) # - Flags are passed as is (-h, -b4096, --trunk)
# - All non-flags are parsed as expressions (file->b.shrub.blocks[0]) # - All non-flags are parsed as expressions (file->b.shrub.blocks[0])
# - String expressions may be useful for paths and stuff ("./disk") # - String expressions may be useful for paths and stuff ("./disk")
# #
scripts/dbgbmap.py
+1 -1
View File
@@ -5354,7 +5354,7 @@ if __name__ == "__main__":
if ':' in x else float(x)), if ':' in x else float(x)),
help="Aspect ratio to use with --to-scale. Defaults to 1:1.") help="Aspect ratio to use with --to-scale. Defaults to 1:1.")
parser.add_argument( parser.add_argument(
'-t', '--tiny', '--tiny',
action='store_true', action='store_true',
help="Tiny mode, alias for --block-ratio=1, --to-scale=1, " help="Tiny mode, alias for --block-ratio=1, --to-scale=1, "
"and --no-header.") "and --no-header.")
scripts/dbgbmapsvg.py
+1 -1
View File
@@ -5633,7 +5633,7 @@ if __name__ == "__main__":
if ':' in x else float(x)), if ':' in x else float(x)),
help="Aspect ratio to use with --to-scale. Defaults to 1:1.") help="Aspect ratio to use with --to-scale. Defaults to 1:1.")
parser.add_argument( parser.add_argument(
'-t', '--tiny', '--tiny',
action='store_true', action='store_true',
help="Tiny mode, alias for --block-ratio=1, --to-scale=1, " help="Tiny mode, alias for --block-ratio=1, --to-scale=1, "
"--padding=0, --no-header, --no-label, and --no-javascript.") "--padding=0, --no-header, --no-label, and --no-javascript.")
scripts/dbgbtree.py
+11 -8
View File
@@ -1432,7 +1432,7 @@ class TreeArt:
else: else:
alts[ralt.toff] |= {'nf': ralt.off, 'c': ralt.color} alts[ralt.toff] |= {'nf': ralt.off, 'c': ralt.color}
if args.get('tree_rbyd'): if args.get('tree_rbyd_all'):
# treat unreachable alts as converging paths # treat unreachable alts as converging paths
for j_, alt in alts.items(): for j_, alt in alts.items():
if 'f' not in alt: if 'f' not in alt:
@@ -1785,8 +1785,8 @@ def main(disk, roots=None, *,
# precompute tree renderings # precompute tree renderings
t_width = 0 t_width = 0
if (args.get('tree') if (args.get('tree_rbyd')
or args.get('tree_rbyd') or args.get('tree_rbyd_all')
or args.get('tree_btree')): or args.get('tree_btree')):
treeart = TreeArt.frombtree(btree, **args) treeart = TreeArt.frombtree(btree, **args)
t_width = treeart.width t_width = treeart.width
@@ -1807,8 +1807,8 @@ def main(disk, roots=None, *,
if prbyd is None or rbyd != prbyd if prbyd is None or rbyd != prbyd
else '', else '',
treeart.repr((bid-(name.weight-1), d, rattr.tag), color) treeart.repr((bid-(name.weight-1), d, rattr.tag), color)
if args.get('tree') if args.get('tree_rbyd')
or args.get('tree_rbyd') or args.get('tree_rbyd_all')
or args.get('tree_btree') or args.get('tree_btree')
else '', else '',
2*w_width+1, '%d-%d' % (bid-(rattr.weight-1), bid) 2*w_width+1, '%d-%d' % (bid-(rattr.weight-1), bid)
@@ -1918,15 +1918,18 @@ if __name__ == "__main__":
action='store_true', action='store_true',
help="Don't truncate, show the full contents.") help="Don't truncate, show the full contents.")
parser.add_argument( parser.add_argument(
'-t', '--tree', '-R', '--tree', '--rbyd', '--tree-rbyd',
dest='tree_rbyd',
action='store_true', action='store_true',
help="Show the rbyd tree.") help="Show the rbyd tree.")
parser.add_argument( parser.add_argument(
'-R', '--tree-rbyd', '-Y', '--rbyd-all', '--tree-rbyd-all',
dest='tree_rbyd_all',
action='store_true', action='store_true',
help="Show the full rbyd tree.") help="Show the full rbyd tree.")
parser.add_argument( parser.add_argument(
'-B', '--tree-btree', '-B', '--btree', '--tree-btree',
dest='tree_btree',
action='store_true', action='store_true',
help="Show a simplified btree tree.") help="Show a simplified btree tree.")
parser.add_argument( parser.add_argument(
scripts/dbgle32.py
+2 -1
View File
@@ -99,7 +99,8 @@ if __name__ == "__main__":
'-i', '--input', '-i', '--input',
help="Read le32s from this file. Can use - for stdin.") help="Read le32s from this file. Can use - for stdin.")
parser.add_argument( parser.add_argument(
'-w', '--word-bits', '-w', '--word', '--word-bits',
dest='word_bits',
nargs='?', nargs='?',
type=lambda x: int(x, 0), type=lambda x: int(x, 0),
const=0, const=0,
scripts/dbgleb128.py
+2 -1
View File
@@ -111,7 +111,8 @@ if __name__ == "__main__":
'-i', '--input', '-i', '--input',
help="Read leb128s from this file. Can use - for stdin.") help="Read leb128s from this file. Can use - for stdin.")
parser.add_argument( parser.add_argument(
'-w', '--word-bits', '-w', '--word', '--word-bits',
dest='word_bits',
nargs='?', nargs='?',
type=lambda x: int(x, 0), type=lambda x: int(x, 0),
const=0, const=0,
scripts/dbglfs3.py
+17 -14
View File
@@ -3876,7 +3876,7 @@ class TreeArt:
else: else:
alts[ralt.toff] |= {'nf': ralt.off, 'c': ralt.color} alts[ralt.toff] |= {'nf': ralt.off, 'c': ralt.color}
if args.get('tree_rbyd'): if args.get('tree_rbyd_all'):
# treat unreachable alts as converging paths # treat unreachable alts as converging paths
for j_, alt in alts.items(): for j_, alt in alts.items():
if 'f' not in alt: if 'f' not in alt:
@@ -4255,8 +4255,8 @@ def dbg_gstate(lfs, *,
# precompute tree renderings # precompute tree renderings
bt_width = 0 bt_width = 0
if (args.get('tree') if (args.get('tree_rbyd')
or args.get('tree_rbyd') or args.get('tree_rbyd_all')
or args.get('tree_btree')): or args.get('tree_btree')):
treeart = TreeArt.frombtree(gstate.btree, **args) treeart = TreeArt.frombtree(gstate.btree, **args)
bt_width = treeart.width bt_width = treeart.width
@@ -4280,8 +4280,8 @@ def dbg_gstate(lfs, *,
treeart.repr( treeart.repr(
(bid-(name.weight-1), d, rattr.tag), (bid-(name.weight-1), d, rattr.tag),
color) color)
if args.get('tree') if args.get('tree_rbyd')
or args.get('tree_rbyd') or args.get('tree_rbyd_all')
or args.get('tree_btree') or args.get('tree_btree')
else '', else '',
2*bw_width+1, '%d-%d' % (bid-(rattr.weight-1), bid) 2*bw_width+1, '%d-%d' % (bid-(rattr.weight-1), bid)
@@ -4573,8 +4573,8 @@ def dbg_files(lfs, paths, *,
# precompute tree renderings # precompute tree renderings
bt_width = 0 bt_width = 0
if (args.get('tree') if (args.get('tree_rbyd')
or args.get('tree_rbyd') or args.get('tree_rbyd_all')
or args.get('tree_btree')): or args.get('tree_btree')):
treeart = TreeArt.fromfile(file, **args) treeart = TreeArt.fromfile(file, **args)
bt_width = treeart.width bt_width = treeart.width
@@ -4596,8 +4596,8 @@ def dbg_files(lfs, paths, *,
treeart.repr( treeart.repr(
(bid-(name.weight-1), d, rattr.tag), (bid-(name.weight-1), d, rattr.tag),
color) color)
if args.get('tree') if args.get('tree_rbyd')
or args.get('tree_rbyd') or args.get('tree_rbyd_all')
or args.get('tree_btree') or args.get('tree_btree')
else '', else '',
2*bw_width+1, '%d-%d' % (bid-(rattr.weight-1), bid) 2*bw_width+1, '%d-%d' % (bid-(rattr.weight-1), bid)
@@ -4647,8 +4647,8 @@ def dbg_files(lfs, paths, *,
'\x1b[0m' if color and notes else '', '\x1b[0m' if color and notes else '',
2*w_width+1, '', 2*w_width+1, '',
treeart.repr((pos, d, bptr.tag), color) treeart.repr((pos, d, bptr.tag), color)
if args.get('tree') if args.get('tree_rbyd')
or args.get('tree_rbyd') or args.get('tree_rbyd_all')
or args.get('tree_btree') or args.get('tree_btree')
else '', else '',
'\x1b[31m' if color and notes else '', '\x1b[31m' if color and notes else '',
@@ -5050,15 +5050,18 @@ if __name__ == "__main__":
action='store_true', action='store_true',
help="Don't truncate, show the full contents.") help="Don't truncate, show the full contents.")
parser.add_argument( parser.add_argument(
'-t', '--tree', '-R', '--tree', '--rbyd', '--tree-rbyd',
dest='tree_rbyd',
action='store_true', action='store_true',
help="Show the rbyd tree.") help="Show the rbyd tree.")
parser.add_argument( parser.add_argument(
'-R', '--tree-rbyd', '-Y', '--rbyd-all', '--tree-rbyd-all',
dest='tree_rbyd_all',
action='store_true', action='store_true',
help="Show the full rbyd tree.") help="Show the full rbyd tree.")
parser.add_argument( parser.add_argument(
'-B', '--tree-btree', '-B', '--btree', '--tree-btree',
dest='tree_btree',
action='store_true', action='store_true',
help="Show a simplified btree tree.") help="Show a simplified btree tree.")
parser.add_argument( parser.add_argument(
scripts/dbgmtree.py
+13 -10
View File
@@ -2350,7 +2350,7 @@ class TreeArt:
else: else:
alts[ralt.toff] |= {'nf': ralt.off, 'c': ralt.color} alts[ralt.toff] |= {'nf': ralt.off, 'c': ralt.color}
if args.get('tree_rbyd'): if args.get('tree_rbyd_all'):
# treat unreachable alts as converging paths # treat unreachable alts as converging paths
for j_, alt in alts.items(): for j_, alt in alts.items():
if 'f' not in alt: if 'f' not in alt:
@@ -2899,8 +2899,8 @@ def main(disk, mroots=None, *,
# precompute tree renderings # precompute tree renderings
t_width = 0 t_width = 0
if (args.get('tree') if (args.get('tree_rbyd')
or args.get('tree_rbyd') or args.get('tree_rbyd_all')
or args.get('tree_btree')): or args.get('tree_btree')):
treeart = TreeArt.frommtree(mtree, **args) treeart = TreeArt.frommtree(mtree, **args)
t_width = treeart.width t_width = treeart.width
@@ -2929,8 +2929,8 @@ def main(disk, mroots=None, *,
if not isinstance(pmdir, Mdir) or mdir != pmdir if not isinstance(pmdir, Mdir) or mdir != pmdir
else '', else '',
treeart.repr((mid, d, rattr.tag), color) treeart.repr((mid, d, rattr.tag), color)
if args.get('tree') if args.get('tree_rbyd')
or args.get('tree_rbyd') or args.get('tree_rbyd_all')
or args.get('tree_btree') or args.get('tree_btree')
else '', else '',
'%*s %-*s%s' % ( '%*s %-*s%s' % (
@@ -2980,8 +2980,8 @@ def main(disk, mroots=None, *,
(mtree.mid(bid-(name.weight-1), -1), (mtree.mid(bid-(name.weight-1), -1),
d, rattr.tag), d, rattr.tag),
color) color)
if args.get('tree') if args.get('tree_rbyd')
or args.get('tree_rbyd') or args.get('tree_rbyd_all')
or args.get('tree_btree') or args.get('tree_btree')
else '', else '',
2*w_width+1, '%d-%d' % ( 2*w_width+1, '%d-%d' % (
@@ -3138,15 +3138,18 @@ if __name__ == "__main__":
action='store_true', action='store_true',
help="Don't truncate, show the full contents.") help="Don't truncate, show the full contents.")
parser.add_argument( parser.add_argument(
'-t', '--tree', '-R', '--tree', '--rbyd', '--tree-rbyd',
dest='tree_rbyd',
action='store_true', action='store_true',
help="Show the rbyd tree.") help="Show the rbyd tree.")
parser.add_argument( parser.add_argument(
'-R', '--tree-rbyd', '-Y', '--rbyd-all', '--tree-rbyd-all',
dest='tree_rbyd_all',
action='store_true', action='store_true',
help="Show the full rbyd tree.") help="Show the full rbyd tree.")
parser.add_argument( parser.add_argument(
'-B', '--tree-btree', '-B', '--btree', '--tree-btree',
dest='tree_btree',
action='store_true', action='store_true',
help="Show a simplified btree tree.") help="Show a simplified btree tree.")
parser.add_argument( parser.add_argument(
scripts/dbgrbyd.py
+11 -8
View File
@@ -1382,7 +1382,7 @@ class TreeArt:
else: else:
alts[ralt.toff] |= {'nf': ralt.off, 'c': ralt.color} alts[ralt.toff] |= {'nf': ralt.off, 'c': ralt.color}
if args.get('tree_rbyd'): if args.get('tree_rbyd_all'):
# treat unreachable alts as converging paths # treat unreachable alts as converging paths
for j_, alt in alts.items(): for j_, alt in alts.items():
if 'f' not in alt: if 'f' not in alt:
@@ -1700,8 +1700,8 @@ def dbg_tree(rbyd, *,
# precompute tree renderings # precompute tree renderings
t_width = 0 t_width = 0
if (args.get('tree') if (args.get('tree_rbyd')
or args.get('tree_rbyd') or args.get('tree_rbyd_all')
or args.get('tree_btree')): or args.get('tree_btree')):
tree = TreeArt.fromrbyd(rbyd, **args) tree = TreeArt.fromrbyd(rbyd, **args)
t_width = tree.width t_width = tree.width
@@ -1714,8 +1714,8 @@ def dbg_tree(rbyd, *,
print('%08x: %s%*s %-*s %s' % ( print('%08x: %s%*s %-*s %s' % (
rattr.toff, rattr.toff,
tree.repr((rid, rattr.tag), color) tree.repr((rid, rattr.tag), color)
if (args.get('tree') if (args.get('tree_rbyd')
or args.get('tree_rbyd') or args.get('tree_rbyd_all')
or args.get('tree_btree')) or args.get('tree_btree'))
else '', else '',
2*w_width+1, '%d-%d' % (rid-(rattr.weight-1), rid) 2*w_width+1, '%d-%d' % (rid-(rattr.weight-1), rid)
@@ -1867,15 +1867,18 @@ if __name__ == "__main__":
action='store_true', action='store_true',
help="Don't truncate, show the full contents.") help="Don't truncate, show the full contents.")
parser.add_argument( parser.add_argument(
'-t', '--tree', '-R', '--tree', '--rbyd', '--tree-rbyd',
dest='tree_rbyd',
action='store_true', action='store_true',
help="Show the rbyd tree.") help="Show the rbyd tree.")
parser.add_argument( parser.add_argument(
'-R', '--tree-rbyd', '-Y', '--rbyd-all', '--tree-rbyd-all',
dest='tree_rbyd_all',
action='store_true', action='store_true',
help="Show the full rbyd tree.") help="Show the full rbyd tree.")
parser.add_argument( parser.add_argument(
'-B', '--tree-btree', '-B', '--btree', '--tree-btree',
dest='tree_btree',
action='store_true', action='store_true',
help="Show a simplified btree tree.") help="Show a simplified btree tree.")
parser.add_argument( parser.add_argument(
scripts/dbgtag.py
+2 -1
View File
@@ -383,7 +383,8 @@ if __name__ == "__main__":
'-i', '--input', '-i', '--input',
help="Read tags from this file. Can use - for stdin.") help="Read tags from this file. Can use - for stdin.")
parser.add_argument( parser.add_argument(
'-w', '--word-bits', '-w', '--word', '--word-bits',
dest='word_bits',
nargs='?', nargs='?',
type=lambda x: int(x, 0), type=lambda x: int(x, 0),
const=0, const=0,
scripts/dbgtrace.py
+1 -1
View File
@@ -1890,7 +1890,7 @@ if __name__ == "__main__":
if ':' in x else float(x)), if ':' in x else float(x)),
help="Aspect ratio to use with --to-scale. Defaults to 1:1.") help="Aspect ratio to use with --to-scale. Defaults to 1:1.")
parser.add_argument( parser.add_argument(
'-t', '--tiny', '--tiny',
action='store_true', action='store_true',
help="Tiny mode, alias for --block-ratio=1, --to-scale=1, " help="Tiny mode, alias for --block-ratio=1, --to-scale=1, "
"and --no-header.") "and --no-header.")
scripts/treemap.py
+1 -1
View File
@@ -1557,7 +1557,7 @@ if __name__ == "__main__":
if ':' in x else float(x)), if ':' in x else float(x)),
help="Aspect ratio to use with --to-scale. Defaults to 1:1.") help="Aspect ratio to use with --to-scale. Defaults to 1:1.")
parser.add_argument( parser.add_argument(
'-t', '--tiny', '--tiny',
action='store_true', action='store_true',
help="Tiny mode, alias for --to-scale=1 and --no-header.") help="Tiny mode, alias for --to-scale=1 and --no-header.")
parser.add_argument( parser.add_argument(
scripts/treemapsvg.py
+1 -1
View File
@@ -1220,7 +1220,7 @@ if __name__ == "__main__":
if ':' in x else float(x)), if ':' in x else float(x)),
help="Aspect ratio to use with --to-scale. Defaults to 1:1.") help="Aspect ratio to use with --to-scale. Defaults to 1:1.")
parser.add_argument( parser.add_argument(
'-t', '--tiny', '--tiny',
action='store_true', action='store_true',
help="Tiny mode, alias for --to-scale=1, --no-header, and " help="Tiny mode, alias for --to-scale=1, --no-header, and "
"--no-label.") "--no-label.")