Skip to content

Commit ffcd2b5

Browse files
committed
Review comments
1 parent 530faf7 commit ffcd2b5

3 files changed

Lines changed: 9 additions & 11 deletions

File tree

dfetch/commands/update_patch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ def __call__(self, args: argparse.Namespace) -> None:
129129
patch_text = superproject.diff(
130130
subproject.local_path,
131131
revisions=RevisionRange("", ""),
132-
ignore=[Metadata.FILENAME],
132+
ignore=(Metadata.FILENAME,),
133133
reverse=True,
134134
)
135135

dfetch/project/gitsuperproject.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ def diff(
119119
) -> str:
120120
"""Get the diff of two revisions in the given path."""
121121
local_repo = GitLocalRepo(path)
122-
diff_since_revision = str(
123-
local_repo.create_diff(revisions.old, revisions.new, ignore, reverse)
122+
diff_since_revision = local_repo.create_diff(
123+
revisions.old, revisions.new, ignore, reverse
124124
)
125125

126126
if revisions.new:

dfetch/project/superproject.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
logger = get_logger(__name__)
2525

2626

27-
@dataclass
27+
@dataclass(frozen=True)
2828
class RevisionRange:
2929
"""A revision pair."""
3030

@@ -78,13 +78,11 @@ def get_username(self) -> str:
7878

7979
def _get_username_fallback(self) -> str:
8080
"""Get the username of the superproject VCS."""
81-
username = ""
81+
try:
82+
username = getpass.getuser()
83+
except (ImportError, KeyError, OSError):
84+
username = ""
8285

83-
if not username:
84-
try:
85-
username = getpass.getuser()
86-
except (ImportError, KeyError, OSError):
87-
username = ""
8886
if not username:
8987
try:
9088
username = os.getlogin()
@@ -165,7 +163,7 @@ def get_file_revision(self, path: str | pathlib.Path) -> str:
165163
def import_projects() -> Sequence[ProjectEntry]:
166164
"""Import projects from underlying superproject."""
167165
raise RuntimeError(
168-
"Only git or SVN projects can be imported."
166+
"Only git or SVN projects can be imported. "
169167
"Run this command within either a git or SVN repository",
170168
)
171169

0 commit comments

Comments
 (0)