Use KeePassXC, either GUI or CLI, as indicated here:
https://blog.beardhatcode.be/2018/03/your-own-git-mergetool.html
| INFO: Analysed target //tools:drake_visualizer (8 packages loaded). | |
| INFO: Found 1 target... | |
| Target //tools:drake_visualizer up-to-date: | |
| bazel-bin/tools/drake_visualizer | |
| INFO: Elapsed time: 6.040s, Critical Path: 0.02s | |
| INFO: 0 processes. | |
| INFO: Build completed successfully, 1 total action | |
| /lib64/ld-linux-x86-64.so.2 (0x00007f98e0a3a000) | |
| libc.so.6 => /lib/x86_64-linux-gnu/libc.so.6 (0x00007f98dfec9000) | |
| libdl.so.2 => /lib/x86_64-linux-gnu/libdl.so.2 (0x00007f98d68d1000) |
| fcl(master)$ git diff 8fb2ce0e3463ab7e431d4e5afee05724d45c2eeb 91d9d4d5735e44f91ba9df013c9fcd16a22938e4 --stat | |
| .travis.yml | 4 +- | |
| CHANGELOG.md | 2 + | |
| include/fcl/common/types.h | 2 +- | |
| include/fcl/narrowphase/detail/convexity_based_algorithm/gjk_libccd-inl.h | 128 +++++----- | |
| include/fcl/narrowphase/detail/gjk_solver_indep-inl.h | 56 ++++- | |
| include/fcl/narrowphase/detail/gjk_solver_libccd-inl.h | 61 +++-- | |
| include/fcl/narrowphase/detail/primitive_shape_algorithm/sphere_capsule-inl.h | 18 +- | |
| include/fcl/narrowphase/detail/primitive_shape_algorithm/sphere_cylinder-inl.h | 276 +++++++++++++++++++++ | |
| include/fcl/narrowphase/detail/primitive_shape_algorithm/sphere_cylinder.h | 139 +++++++++++ |
Use KeePassXC, either GUI or CLI, as indicated here:
https://blog.beardhatcode.be/2018/03/your-own-git-mergetool.html
| #!/usr/bin/python | |
| import argparse | |
| import csv | |
| import sys | |
| parser = argparse.ArgumentParser() | |
| parser.add_argument("input", type=argparse.FileType("r")) | |
| parser.add_argument("-o", "--output", type=argparse.FileType("w"), default=None) | |
| parser.add_argument("-i", "--in-place", action="store_true") |
| diff --git a/tools/skylark/python_env.bzl b/tools/skylark/python_env.bzl | |
| index 1416421..f2c92e8 100644 | |
| --- a/tools/skylark/python_env.bzl | |
| +++ b/tools/skylark/python_env.bzl | |
| @@ -14,9 +14,5 @@ def hermetic_python_env(): | |
| # | |
| # If https://github.com/bazelbuild/bazel/issues/4939 gets fixed, we can | |
| # revisit whether manually specifying a hermetic env is still necessary. | |
| - return select({ | |
| - "@drake//tools/skylark:linux": { |
| #!/usr/bin/env python3 | |
| """ | |
| Given a URL (or a pattern that should expand to a URL), downloads the file, | |
| computes the sha256sum, and places it inside of Bazel's content-addressable | |
| cache. | |
| Examples: | |
| * Full URL - GitHub's download will parse the HEAD part and give you the |
| # For GCC | |
| build --cxxopt -fdiagnostics-color | |
| build --repository_cache /home/user/.cache/bazel-externals | |
| fetch --repository_cache /home/user/.cache/bazel-externals | |
| build \ | |
| --disk_cache /home/user/.cache/bazel_local_disk \ | |
| --experimental_strict_action_env | |
| test \ |
| import numpy as np | |
| from director import affordancemanager | |
| from director import lcmUtils | |
| from director import objectmodel as om | |
| from director.thirdparty import transformations | |
| from my_lcm_types import object_detection_t, object_detection_array_t | |
| def quat_to_rot(q): |
| /** | |
| Example usage: | |
| DrakeLcm lcm; | |
| PublishFramesToLcm("DRAKE_DRAW_FRAMES", { | |
| {"X_WF", Isometry3d::Identity()}, | |
| {"X_WG", Isometry3d::Identity()}, | |
| }); | |
| */ |