Search code, repositories, users, issues, pull requests...

Copy link

Contributor

@mre mre commented Feb 18, 2021 •

edited

Loading

TODO:

Implement merge functionality
Add more tests
Make codeprints.json filenames unique (e.g. timestamp + repo name OR path OR unique hash)

mre added 7 commits

February 18, 2021 15:08


 Fix import

626ceb3


 Add subcommand for merge

975b7fb


 impl Default for Year (generating empty timelines)

214a2f9


 Split up parser into ParseState and core Parser

5ad51fc

This decouples the data representation from the parsing
process, making the internal data format usable for other
use-cases, such as merging timelines


 Work on merge setup

1fa6d45


 Execute run by default if there are no additional arguments

c48f9bb


 Update docs

38a27da

@mre mre changed the title ~~(削除) Add support for merging codeprints.json files (削除ここまで)~~ (追記) WIP: Add support for merging codeprints.json files (追記ここまで)

Feb 18, 2021

@mre mre marked this pull request as draft

February 18, 2021 14:15

mre and others added 7 commits

February 18, 2021 15:33


 Work on merger

1695eee


 Remove unused TryFrom

598df77


 Show full year

0777aa3


 handle start and end date in output

1b3610f


 Fix test

6149ac9


 work on merge

24d6f57


 WIP: merge multiple timeslines

6cf9f12

- adds a test for multiple timelines (is failing)
- adds a parameter update methods of a year

mre

mre commented

Mar 10, 2021

View reviewed changes

src/merge.rs Outdated Show resolved Hide resolved


 fix merge 2 test

babfe92

@mre mre marked this pull request as ready for review

March 10, 2021 00:32

mre added 6 commits

March 10, 2021 01:37


 Fix clippy warnings


 Add hash to timeline


 fix lints

d01be81


 Less clones

a48ee27


 Remove unused import

ee203c1


 fix merge call

fa390bc

@mre

Copy link

Contributor Author

mre commented Mar 10, 2021

This should be good to go now.

mre added 4 commits

March 11, 2021 22:04


 Fix import

2a553a2


 Add subcommand for merge

250b815


 impl Default for Year (generating empty timelines)

27adefe


 Split up parser into ParseState and core Parser

42ca666

This decouples the data representation from the parsing
process, making the internal data format usable for other
use-cases, such as merging timelines

mre and others added 19 commits

March 11, 2021 22:04


 Work on merge setup

19840f2


 Execute run by default if there are no additional arguments

fac6c44


 Update docs

a239c07


 Work on merger

a7a68b9


 Remove unused TryFrom

b013988


 Show full year

ea60627


 handle start and end date in output

a5fb023


 Fix test

622c4c6


 work on merge

615c0bf


 WIP: merge multiple timeslines

37de103

- adds a test for multiple timelines (is failing)
- adds a parameter update methods of a year


 fix merge 2 test

cfc6076


 Fix clippy warnings

7cb3063


 Add hash to timeline

fc822a1


 fix lints

452a2e3


 Less clones

05af9d2


 Remove unused import

5cc6726


 fix merge call

74fe53a


 txt for help option

ca4cac5


 test for intesity computation #5 -> failing

86202e4

@woolfg woolfg force-pushed the merge branch from cf5234c to 86202e4 Compare

March 11, 2021 21:05

mre added 2 commits

March 15, 2021 01:33


 Merge branch 'merge' of github.com:codeprintsdev/analyzer into merge

5b15954


 Add timestamp

6653dca

@mre mre changed the title ~~(削除) WIP: Add support for merging codeprints.json files (削除ここまで)~~ (追記) Add support for merging codeprints.json files (追記ここまで)

Mar 15, 2021

mre and others added 5 commits

March 15, 2021 14:36


 formatting

231ef0e


 changed output of merge to merged_codeprints_*.json

07054b3


 formatting

e80175c


 corrected fixture after fixing the api

6f4f175

Analyzer merge should not take previously created result file into account. #6


 fix typo in intensity string

6c51be2

@mre mre mentioned this pull request

Mar 18, 2021

Closed