Skip to content

Commit 31f20de

Browse files
committed
Review comments
1 parent a208acc commit 31f20de

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

dfetch/project/subproject.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ def diff(self, old_rev: str, new_rev: str) -> str:
399399
raise RuntimeError(
400400
"When not providing any revisions, dfetch starts from"
401401
f" the last revision to {Metadata.FILENAME} in {self.local_path}."
402-
" Please either revision this, or specify a revision to start from with --revs"
402+
" Please either commit this, or specify a revision to start from with --revs"
403403
)
404404

405405
return self._diff_impl(old_rev, new_rev, ignore=(Metadata.FILENAME,))

dfetch/vcs/svn.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ def get_svn_version() -> tuple[str, str]:
1818
"""Get the name and version of svn."""
1919
result = run_on_cmdline(logger, ["svn", "--version", "--non-interactive"])
2020
first_line = result.stdout.decode().split("\n")[0]
21+
if "version" not in first_line.lower():
22+
raise RuntimeError(f"Unexpected svn --version output format: {first_line}")
2123
tool, version = first_line.replace(",", "").split("version", maxsplit=1)
2224
return (str(tool), str(version))
2325

@@ -251,7 +253,7 @@ def export(url: str, rev: str = "", dst: str = ".") -> None:
251253
run_on_cmdline(
252254
logger,
253255
["svn", "export", "--non-interactive", "--force"]
254-
+ rev.split(" ")
256+
+ (rev.split(" ") if rev else [])
255257
+ [url, dst],
256258
)
257259

0 commit comments

Comments
 (0)