technofab/bumpver
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/bumpver.git synced 2025-12-12 14:30:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve check for uncommitted files

Browse source 
Fixes #57
This commit is contained in:
Manuel Barkhau 2019-03-24 18:46:39 +01:00
parent 385521b596
commit 548fb871e0
4 changed files with 68 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/pycalver/__main__.py
View file

@ -190,11 +190,11 @@ def init(verbose: int = 0, dry: bool = False) -> None:
config.write_content(ctx)
def _assert_not_dirty(vcs, filepaths: typ.Set[str], allow_dirty: bool):
dirty_files = vcs.status()
def _assert_not_dirty(_vcs: vcs.VCS, filepaths: typ.Set[str], allow_dirty: bool):
dirty_files = _vcs.status(required_files=filepaths)
if dirty_files:
log.warning(f"{vcs.name} working directory is not clean:")
log.warning(f"{_vcs.name} working directory is not clean. Uncomitted file(s):")
for dirty_file in dirty_files:
log.warning(" " + dirty_file)

15
src/pycalver/vcs.py
View file

@ -40,7 +40,7 @@ VCS_SUBCOMMANDS_BY_NAME = {
'is_usable' : "hg root",
'fetch' : "hg pull",
'ls_tags' : "hg tags",
'status' : "hg status -mard",
'status' : "hg status -umard",
'add_path' : "hg add {path}",
'commit' : "hg commit --logfile {path}",
'tag' : "hg tag {tag} --message {tag}",
@ -109,13 +109,15 @@ class VCS:
if self.has_remote:
self('fetch')
def status(self) -> typ.List[str]:
def status(self, required_files: typ.Set[str]) -> typ.List[str]:
"""Get status lines."""
status_output = self('status')
status_items = [line.split(" ", 1) for line in status_output.splitlines()]
return [
line[2:].strip()
for line in status_output.splitlines()
if not line.strip().startswith("??")
filepath.strip()
for status, filepath in status_items
if filepath.strip() in required_files or status != "??"
]
def ls_tags(self) -> typ.List[str]:
@ -142,7 +144,8 @@ class VCS:
tmp_file = tempfile.NamedTemporaryFile("wb", delete=False)
assert " " not in tmp_file.name
fh : typ.IO[bytes]
fh: typ.IO[bytes]
with tmp_file as fh:
fh.write(message_data)