New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Close the dev branch #246

Merged
merged 20 commits into from Apr 6, 2018

Conversation

Projects
None yet
3 participants
@latk
Member

latk commented Mar 18, 2018

By now, all changes from the dev branch have been reimplemented on master. This PR merges the dev branch into master, without applying any of the dev changes. That way, the Git history is retained and dev can be safely deleted.

While dev and master took some different directions (e.g. the module structure), they are now functionally equivalent. All bug fixes and enhancements that were made on dev have also been done on master.

  • Modularization was implemented in #225
  • the driver/main was extracted in #214
  • a global "make clean" is useful but not strictly necessary
  • Travis config was committed independently in 0afac3a

Where large parts of code were extracted, I didn't review that carefully to ensure that no fixes were sneaked in together with the refactoring. The dev branch has one change to the HTML code that master doesn't have, but I don't understand why it might be necessary:

@@ -468,7 +470,7 @@ def _alpha(key):
     data = {}
     data['HEAD'] = "Head"
     data['VERSION'] = version_str()
-    data['TIME'] = str(int(time.time()))
+    data['TIME'] = str(int(time()))
     data['DATE'] = date.today().isoformat()
     data['ROWS'] = []
     data['low_color'] = low_color

I think it is safe to ignore that, as the dates in the HTML are known to work – and that field isn't actually used anywhere.

@codecov

This comment has been minimized.

codecov bot commented Mar 18, 2018

Codecov Report

Merging #246 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #246   +/-   ##
=======================================
  Coverage   88.76%   88.76%           
=======================================
  Files          13       13           
  Lines        1477     1477           
  Branches      267      267           
=======================================
  Hits         1311     1311           
  Misses        108      108           
  Partials       58       58

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 869bbc8...0bae381. Read the comment docs.

feature parity with dev branch
- the driver/main was extracted in #214
- Modularization was implemented in #225
- bugfixes have been superseded on master branch
- "make clean" is useful but not strictly necessary
- Travis config was committed independently in 0afac3a

@latk latk force-pushed the latk:dev-feature-parity branch from 2d5fe1d to 0bae381 Apr 6, 2018

@latk latk merged commit 0bae381 into gcovr:master Apr 6, 2018

0 of 2 checks passed

continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details

@latk latk deleted the latk:dev-feature-parity branch Apr 6, 2018

@latk latk removed the needs review label Apr 11, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment