Skip to content

Source Format Enforcement#963

Closed
squidadm wants to merge 1 commit into
squid-cache:masterfrom
squidadm:maintenance-6
Closed

Source Format Enforcement#963
squidadm wants to merge 1 commit into
squid-cache:masterfrom
squidadm:maintenance-6

Conversation

@squidadm
Copy link
Copy Markdown
Collaborator

@squidadm squidadm commented Jan 18, 2022

Besides routine formatting enforcement, this change contains flag-day
updates and code polishing from code removals performed in the latter
half of 2021 (e.g., HERE removal).

(summary) log from the script execution:

UPDATE COPYRIGHT for ...
NOTICE: File ... changed: by scripts/maintenance/HERE-obsolete
NOTICE: File src/Makefile.am changed: by
scripts/format-makefile-am.pl
NOTICE: File src/sbuf/Stream.h changed: by
scripts/maintenance/sort-includes.pl
NOTICE: File src/tests/stub_store_client.cc changed: by
scripts/maintenance/sort-includes.pl

If you are worried about hitting all this at once when rebasing a
large patch you can split the rebase into steps as follows:

git fetch --all
git rebase [ commit ID prior to this one ]
git rebase [ this commit's ID ]
git rebase master

@squid-prbot
Copy link
Copy Markdown
Collaborator

Can one of the admins verify this patch?

@yadij
Copy link
Copy Markdown
Contributor

yadij commented Jan 18, 2022

OK to test

@yadij yadij added the M-cleared-for-merge https://github.com/measurement-factory/anubis#pull-request-labels label Jan 18, 2022
@rousskov rousskov self-requested a review January 18, 2022 15:18
@rousskov rousskov added S-waiting-for-reviewer ready for review: Set this when requesting a (re)review using GitHub PR Reviewers box and removed M-cleared-for-merge https://github.com/measurement-factory/anubis#pull-request-labels labels Jan 18, 2022
@yadij
Copy link
Copy Markdown
Contributor

yadij commented Jan 20, 2022

FYI; this is automated output of ./scripts/source-maintenance.sh run on the master release server.

You should be able to replicate the patch on any other machine by running that script yourself on the relevant Squid-6 commit ID checkout. Though caveat then is that you have the same astyle, auto-tools and (missing) gperf versions as the master server.

Copy link
Copy Markdown
Contributor

@rousskov rousskov left a comment

Choose a reason for hiding this comment

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

rousskov self-requested a review

Amos: FYI; this is automated output of ./scripts/source-maintenance.sh run on the master release server.

I hope so, but, last year, a similar "automated" PR had secret manual changes that had to be removed: #763 (review). This year, while I was not going to double check everything, I still wanted to at least look through the changes, just in case.

I am glad I did because the diff informed me about the HERE removal in this PR! I think that important event should be explicitly disclosed in the PR description. I edited the description to mention it, but you may need to adjust the description further because I do not know what "flag-day updates" and "code polishing from code removals performed in the latter half of 2021" actually means.

It is unfortunate that this PR combines copyright year changes, HERE removal, and routine formatting changes because such combination complicates review and merge conflict resolution. However, I am not going to insist on a split.

As you know, I think we should not update copyright years every year, but I see no reason to repeat that last year discussion this year.

@rousskov rousskov added S-waiting-for-author author action is expected (and usually required) and removed S-waiting-for-reviewer ready for review: Set this when requesting a (re)review using GitHub PR Reviewers box labels Jan 30, 2022
@squid-anubis squid-anubis added the M-failed-description https://github.com/measurement-factory/anubis#pull-request-labels label Feb 3, 2022
@yadij
Copy link
Copy Markdown
Contributor

yadij commented Feb 3, 2022

Reset the maintenance branch on top of cd7a599 and re-run the script to avoid collisions with PR #946

@yadij yadij added S-waiting-for-committer privileged action is expected (and usually required) and removed S-waiting-for-author author action is expected (and usually required) labels Feb 3, 2022
@squid-anubis squid-anubis removed the M-failed-description https://github.com/measurement-factory/anubis#pull-request-labels label Feb 3, 2022
squid-anubis pushed a commit that referenced this pull request Feb 3, 2022
Besides routine formatting enforcement, this change contains flag-day
updates and code polishing from code removals performed in the latter
half of 2021 (e.g., HERE removal).


(summary) log from the script execution:

 UPDATE COPYRIGHT for ...
 NOTICE: File ... changed: by scripts/maintenance/HERE-obsolete
 NOTICE: File src/Makefile.am changed: by
   scripts/format-makefile-am.pl
 NOTICE: File src/sbuf/Stream.h changed: by
   scripts/maintenance/sort-includes.pl
 NOTICE: File src/tests/stub_store_client.cc changed: by
   scripts/maintenance/sort-includes.pl


If you are worried about hitting all this at once when rebasing a
 large patch you can split the rebase into steps as follows:

    git fetch --all
    git rebase [ commit ID prior to this one ]
    git rebase [ this commit's ID ]
    git rebase master
@squid-anubis squid-anubis added M-waiting-staging-checks https://github.com/measurement-factory/anubis#pull-request-labels and removed M-waiting-staging-checks https://github.com/measurement-factory/anubis#pull-request-labels labels Feb 3, 2022
@yadij yadij added M-cleared-for-merge https://github.com/measurement-factory/anubis#pull-request-labels and removed S-waiting-for-committer privileged action is expected (and usually required) labels Feb 3, 2022
squid-anubis pushed a commit that referenced this pull request Feb 3, 2022
Besides routine formatting enforcement, this change contains flag-day
updates and code polishing from code removals performed in the latter
half of 2021 (e.g., HERE removal).


(summary) log from the script execution:

 UPDATE COPYRIGHT for ...
 NOTICE: File ... changed: by scripts/maintenance/HERE-obsolete
 NOTICE: File src/Makefile.am changed: by
   scripts/format-makefile-am.pl
 NOTICE: File src/sbuf/Stream.h changed: by
   scripts/maintenance/sort-includes.pl
 NOTICE: File src/tests/stub_store_client.cc changed: by
   scripts/maintenance/sort-includes.pl


If you are worried about hitting all this at once when rebasing a
 large patch you can split the rebase into steps as follows:

    git fetch --all
    git rebase [ commit ID prior to this one ]
    git rebase [ this commit's ID ]
    git rebase master
@squid-anubis squid-anubis added the M-waiting-staging-checks https://github.com/measurement-factory/anubis#pull-request-labels label Feb 3, 2022
@squid-anubis squid-anubis removed M-waiting-staging-checks https://github.com/measurement-factory/anubis#pull-request-labels M-cleared-for-merge https://github.com/measurement-factory/anubis#pull-request-labels labels Feb 3, 2022
@squid-anubis squid-anubis added the M-merged https://github.com/measurement-factory/anubis#pull-request-labels label Feb 3, 2022
@rousskov
Copy link
Copy Markdown
Contributor

rousskov commented Feb 4, 2022

@yadij, please apply the same HERE removal script to v5 (while keeping the HERE macro defined). We should not create such a huge (in surface area) but empty (in functionality changes) long-term difference between v5 and master/v6 IMO.

@yadij
Copy link
Copy Markdown
Contributor

yadij commented Feb 5, 2022

Okay. I will do that in the 5.4.1 version.

@yadij yadij mentioned this pull request Mar 29, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

M-merged https://github.com/measurement-factory/anubis#pull-request-labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants