From 6dcc6c48163b22f3ab996cb3dc6f51c6283de589 Mon Sep 17 00:00:00 2001 From: "Reynolds, AJ (ar380v)" Date: Fri, 1 Jan 2021 14:57:14 -0600 Subject: [PATCH 1/5] Corrected issues with the boolean operators in the config file being treated as strings. --- bumpversion/cli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bumpversion/cli.py b/bumpversion/cli.py index b107e10d..621b9a2f 100644 --- a/bumpversion/cli.py +++ b/bumpversion/cli.py @@ -294,7 +294,7 @@ def _load_configuration(config_file, explicit_config, defaults): except NoOptionError: pass # no default value then ;) - for boolvaluename in ("commit", "tag", "dry_run"): + for boolvaluename in ("commit", "tag", "dry_run", "allow-dirty", "push", "sign_tags"): try: defaults[boolvaluename] = config.getboolean( "bumpversion", boolvaluename From 579f21ce61f67aabea55aa70415712c5ec4bdfdb Mon Sep 17 00:00:00 2001 From: "Reynolds, AJ (ar380v)" Date: Fri, 1 Jan 2021 17:33:04 -0600 Subject: [PATCH 2/5] Added files needing commitment if allow dirty is selected. --- bumpversion/cli.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/bumpversion/cli.py b/bumpversion/cli.py index 621b9a2f..cf3be553 100644 --- a/bumpversion/cli.py +++ b/bumpversion/cli.py @@ -596,6 +596,7 @@ def _determine_vcs_dirty(possible_vcses, defaults): try: vcs.assert_nondirty() except WorkingDirectoryIsDirtyException as e: + vcs.commit_files_extended = e.message.split('\n')[1:] if not defaults["allow_dirty"]: logger.warning( "%s\n\nUse --allow-dirty to override this if you know what you're doing.", @@ -673,6 +674,15 @@ def _commit_to_vcs(files, context, config_file, config_file_exists, vcs, args, "Would prepare" if not do_commit else "Preparing", vcs.__name__, ) + + if hasattr(vcs, 'commit_files_extended'): + repr = re.compile('^(?P[A-Z]+\s)(?:\s*.*\s->\s)?(?P.*)$') + for path in vcs.commit_files_extended: + change = repr.match(path).groupdict() + filename = change.get('path').lstrip().rstrip() + if filename not in commit_files: + commit_files.append(filename) + for path in commit_files: logger.info( "%s changes in file '%s' to %s", From 77573ff2a7b7d5ce954e56987bb8edfe59aba988 Mon Sep 17 00:00:00 2001 From: "Reynolds, AJ (ar380v)" Date: Sat, 2 Jan 2021 12:07:45 -0600 Subject: [PATCH 3/5] =?UTF-8?q?Bump=20version:=201.0.2-dev=20=E2=86=92=201?= =?UTF-8?q?.0.3-dev?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- CHANGELOG.md | 1 + bumpversion/__init__.py | 2 +- setup.py | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 80df7fad..8a070f4a 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,7 +1,7 @@ [bumpversion] commit = True tag = True -current_version = 1.0.2-dev +current_version = 1.0.3-dev parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\-(?P[a-z]+))? serialize = {major}.{minor}.{patch}-{release} diff --git a/CHANGELOG.md b/CHANGELOG.md index fd3c6908..b5d322bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ **unreleased** +**v1.0.3-dev** **v1.0.2-dev** **v1.0.1** diff --git a/bumpversion/__init__.py b/bumpversion/__init__.py index ce53557b..a2f7d81b 100644 --- a/bumpversion/__init__.py +++ b/bumpversion/__init__.py @@ -1,3 +1,3 @@ -__version__ = "1.0.2-dev" +__version__ = "1.0.3-dev" __license__ = "MIT" __title__ = "bumpversion" diff --git a/setup.py b/setup.py index b1402ced..7ccb8f95 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ setup( name='bump2version', - version='1.0.2-dev', + version='1.0.3-dev', url='https://github.com/c4urself/bump2version', author='Christian Verkerk', author_email='christianverkerk@ymail.com', From 9b603ccb261928013aec73eb747c3c55cef9498d Mon Sep 17 00:00:00 2001 From: "Reynolds, AJ (ar380v)" Date: Sat, 2 Jan 2021 14:57:05 -0600 Subject: [PATCH 4/5] =?UTF-8?q?Bump=20version:=201.0.3-dev=20=E2=86=92=201?= =?UTF-8?q?.0.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- CHANGELOG.md | 1 + bumpversion/__init__.py | 2 +- setup.py | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 8a070f4a..e39aa71a 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,7 +1,7 @@ [bumpversion] commit = True tag = True -current_version = 1.0.3-dev +current_version = 1.0.3 parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\-(?P[a-z]+))? serialize = {major}.{minor}.{patch}-{release} diff --git a/CHANGELOG.md b/CHANGELOG.md index b5d322bc..21ffb3be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ **unreleased** +**v1.0.3** **v1.0.3-dev** **v1.0.2-dev** diff --git a/bumpversion/__init__.py b/bumpversion/__init__.py index a2f7d81b..c44680b4 100644 --- a/bumpversion/__init__.py +++ b/bumpversion/__init__.py @@ -1,3 +1,3 @@ -__version__ = "1.0.3-dev" +__version__ = "1.0.3" __license__ = "MIT" __title__ = "bumpversion" diff --git a/setup.py b/setup.py index 7ccb8f95..9fc8341f 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ setup( name='bump2version', - version='1.0.3-dev', + version='1.0.3', url='https://github.com/c4urself/bump2version', author='Christian Verkerk', author_email='christianverkerk@ymail.com', From 20a6c1607b778bf615f12f37ac221d21fe50ae27 Mon Sep 17 00:00:00 2001 From: "Reynolds, AJ (ar380v)" Date: Mon, 4 Jan 2021 17:50:06 -0600 Subject: [PATCH 5/5] Added files needing commitment if allow dirty is selected. --- bumpversion/cli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bumpversion/cli.py b/bumpversion/cli.py index cf3be553..ce93e2e1 100644 --- a/bumpversion/cli.py +++ b/bumpversion/cli.py @@ -294,7 +294,7 @@ def _load_configuration(config_file, explicit_config, defaults): except NoOptionError: pass # no default value then ;) - for boolvaluename in ("commit", "tag", "dry_run", "allow-dirty", "push", "sign_tags"): + for boolvaluename in ("commit", "tag", "dry_run"): try: defaults[boolvaluename] = config.getboolean( "bumpversion", boolvaluename