Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Ensure that there are no paralellization hickups with xargs #16

Merged
merged 2 commits into from
Dec 14, 2016
Merged

Ensure that there are no paralellization hickups with xargs #16

merged 2 commits into from
Dec 14, 2016

Conversation

Inventitech
Copy link
Contributor

Refs #10

@Inventitech
Copy link
Contributor Author

Hi @dreamyguy,

I see there is some good stuff coming, but maybe you can accept this PR in the meantime to remove the parallelization hickups that introducing xargs caused.

dreamyguy
dreamyguy reviewed Dec 13, 2016
View reviewed changes
scripts/output-intermediate-gitlog.sh
cd $dir &&
echo -e "${Whi}Outputting ${Pur}${PWD##*/}${RCol}" >&2 &&
git log --all --no-merges --shortstat --reverse --pretty=format:'commits\trepository\t'"${PWD##*/}"'\tcommit_hash\t%H\tcommit_hash_abbreviated\t%h\ttree_hash\t%T\ttree_hash_abbreviated\t%t\tparent_hashes\t%P\tparent_hashes_abbreviated\t%p\tauthor_name\t%an\tauthor_name_mailmap\t%aN\tauthor_email\t%ae\tauthor_email_mailmap\t%aE\tauthor_date\t%ad\tauthor_date_RFC2822\t%aD\tauthor_date_relative\t%ar\tauthor_date_unix_timestamp\t%at\tauthor_date_iso_8601\t%ai\tauthor_date_iso_8601_strict\t%aI\tcommitter_name\t%cn\tcommitter_name_mailmap\t%cN\tcommitter_email\t%ce\tcommitter_email_mailmap\t%cE\tcommitter_date\t%cd\tcommitter_date_RFC2822\t%cD\tcommitter_date_relative\t%cr\tcommitter_date_unix_timestamp\t%ct\tcommitter_date_iso_8601\t%ci\tcommitter_date_iso_8601_strict\t%cI\tref_names\t%d\tref_names_no_wrapping\t%D\tencoding\t%e\tsubject\t%s\tsubject_sanitized\t%f\tcommit_notes\t%N\tstats\t' |
tempOutputFile="/home/mbeller/gitloggg/inventitech-gitlogg/_tmp/gitlogg.tmp"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I deleted this line while reviewing, but still got the error I posted in the PR.

@dreamyguy
Copy link
Owner

Got the following error:

Wallaces-iMac:gitlogg Wallace$ bash ./scripts/gitlogg-generate-log.sh
Info: Calculating in 7 thread(s)
Generating git log for all 4 repositories located at './_repos/*/'. This might take a while!
Outputting git.git
Outputting core.git
Outputting linux.git
Outputting odoo.git
./scripts/output-intermediate-gitlog.sh: line 30: _tmp/gitlogg.tmp.part.: No such file or directory
./scripts/output-intermediate-gitlog.sh: line 30: _tmp/gitlogg.tmp.part.: No such file or directory
./scripts/output-intermediate-gitlog.sh: line 30: _tmp/gitlogg.tmp.part.: No such file or directory
./scripts/output-intermediate-gitlog.sh: line 30: _tmp/gitlogg.tmp.part.: No such file or directory
cat: _tmp/gitlogg.tmp.part.*: No such file or directory
rm: _tmp/gitlogg.tmp.part.*: No such file or directory
The file _tmp/gitlogg.tmp generated in: 0s
Parsing JSON output...
JSON output parsed in: 7ms
The file _output/gitlogg.json was saved!
Wallaces-iMac:gitlogg Wallace$

Maybe there's some left-over code lying around? This line also seem displaced.

@dreamyguy dreamyguy changed the base branch from master to develop December 13, 2016 21:47
@dreamyguy
Copy link
Owner

I'll merge the patch for the xargs problem, but I'm changing the base at my end to develop instead of master branch. I do this everywhere else and might as well start doing it here. 🎸

@Inventitech
Copy link
Contributor Author

Oops, I think something went wrong while rebasing :-).

@Inventitech
Copy link
Contributor Author

Have a look now, please.

@dreamyguy dreamyguy changed the base branch from develop to xargs December 14, 2016 20:40
@dreamyguy dreamyguy merged commit c01dbe9 into dreamyguy:xargs Dec 14, 2016
@dreamyguy
Copy link
Owner

I've decided to merge to a dedicated branch instead, to keep develop relese-able. Will be testing it asap.

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

@dreamyguy dreamyguy dreamyguy left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Inventitech @dreamyguy