robossembler/ros2nix
7
0
Fork 0
mirror of https://github.com/wentasah/ros2nix.git synced 2025-06-09 15:52:23 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix formatting and typos

Browse source
This commit is contained in:
Michal Sojka 2025-02-07 15:17:19 +01:00
parent 2b569c35f0
commit e523ecb7f5
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
ros2nix/ros2nix.py
View file

@ -402,14 +402,11 @@ def ros2nix(args):
return subprocess.check_output(cmd, cwd=srcdir).decode().strip() return subprocess.check_output(cmd, cwd=srcdir).decode().strip()
url = check_output("git config remote.origin.url".split()) url = check_output("git config remote.origin.url".split())
prefix = check_output("git rev-parse --show-prefix".split()) prefix = check_output("git rev-parse --show-prefix".split())
toplevel = check_output("git rev-parse --show-toplevel".split()) toplevel = check_output("git rev-parse --show-toplevel".split())
head = check_output("git rev-parse HEAD".split()) head = check_output("git rev-parse HEAD".split())
def merge_base_to_upstream(commit: str)->str: def merge_base_to_upstream(commit: str) -> str:
return subprocess.check_output(f"git merge-base {head} $(git for-each-ref refs/remotes/origin --format='%(objectname)')", cwd=srcdir,shell=True).decode().strip() return subprocess.check_output(f"git merge-base {head} $(git for-each-ref refs/remotes/origin --format='%(objectname)')", cwd=srcdir,shell=True).decode().strip()
if args.use_package_git_hash: if args.use_package_git_hash:
@ -417,7 +414,7 @@ def ros2nix(args):
merge_base = merge_base_to_upstream(head) merge_base = merge_base_to_upstream(head)
head = check_output(f"git rev-list {merge_base} -1 -- .".split()) head = check_output(f"git rev-list {merge_base} -1 -- .".split())
if not args.use_package_git_hash and toplevel in git_cache: #only use cache if not using seperate checkout per package if not args.use_package_git_hash and toplevel in git_cache: #only use cache if not using separate checkout per package
info = git_cache[toplevel] info = git_cache[toplevel]
upstream_rev = info["rev"] upstream_rev = info["rev"]
else: else:
@ -428,7 +425,13 @@ def ros2nix(args):
upstream_rev = merge_base_to_upstream(head) upstream_rev = merge_base_to_upstream(head)
info = json.loads( info = json.loads(
subprocess.check_output( subprocess.check_output(
["nix-prefetch-git", "--quiet"]+ (["--sparse-checkout", prefix] if (prefix and args.use_package_git_hash) else [])+[ toplevel, upstream_rev], ["nix-prefetch-git", "--quiet"]
+ (
["--sparse-checkout", prefix]
if prefix and args.use_package_git_hash
else []
)
+ [toplevel, upstream_rev],
).decode() ).decode()
) )
git_cache[toplevel] = info git_cache[toplevel] = info
@ -442,7 +445,7 @@ def ros2nix(args):
owner = "{match["owner"]}"; owner = "{match["owner"]}";
repo = "{match["repo"]}"; repo = "{match["repo"]}";
rev = "{info["rev"]}"; rev = "{info["rev"]}";
sha256 = "{info["sha256"]}"; sha256 = "{info["sha256"]}";
{sparse_checkout} {sparse_checkout}
}}''').strip() }}''').strip()
else: else: