Skip to content

Update source-maintenance script for git#26

Merged
yadij merged 1 commit intosquid-cache:masterfrom
yadij:maintenance-git
Jul 21, 2017
Merged

Update source-maintenance script for git#26
yadij merged 1 commit intosquid-cache:masterfrom
yadij:maintenance-git

Conversation

@yadij
Copy link
Contributor

@yadij yadij commented Jul 20, 2017

  • replace bzr calls with git equivalent
  • remove obsolete ROOT and PWD variables (git does not support non-recursive file listing)
  • add exceptions to ignore more files caught by git than bzr

NOTE: most of this script should become commit hooks for git, but the CI infrastructure needs more development for that. So for now just updating the script we have, so it can continue its work meanwhile.

* replace bzr calls with git equivalent
* remove obsolete ROOT and PWD variables (git does not support non-recursive file listing)
* add exceptions to ignore more files caught by git than bzr
@rousskov
Copy link
Contributor

most of this script should become commit hooks for git

It is even more complicated because the current script might seriously damage the code and because it is Wrong (tm) to commit anything without review. The ideal solution we should be moving towards is to both

  1. auto-check PR formatting and block malformed PRs (fairly easy and very safe)
  2. offer to format the PR branch via a bot command (difficult)

Item 1 may not be a good idea without item 2 because manually running the formatter is currently a little difficult.

AFAIK, there are projects that already do this kind of stuff but it is all custom software that is difficult to reuse. We may have to live with a commit hook (like we did with bzr) until item 2 is available.

Copy link
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.

I did not review closely but saw no problems.

@yadij yadij merged commit 114c821 into squid-cache:master Jul 21, 2017
yadij added a commit to yadij/squid that referenced this pull request Jul 22, 2017
* replace bzr calls with git equivalent
* remove obsolete ROOT and PWD variables (git does not support non-recursive file listing)
* add exceptions to ignore more files caught by git than bzr
squidadm pushed a commit to squidadm/squid that referenced this pull request Aug 19, 2017
* replace bzr calls with git equivalent
* remove obsolete ROOT and PWD variables (git does not support non-recursive file listing)
* add exceptions to ignore more files caught by git than bzr
yadij pushed a commit that referenced this pull request Aug 19, 2017
* Maintenance: update snapshot script for git (#24)

* Update snapshot script after git migration
 - Remove unused BZRROOT environment variable
 - Replace tag with branch name

* Update source-maintenance script for git (#26)

* replace bzr calls with git equivalent
* remove obsolete ROOT and PWD variables (git does not support non-recursive file listing)
* add exceptions to ignore more files caught by git than bzr

* Maintenance: remove unused .bzrignore (#29)

* Remove .bzrignore from git

* Prep for 3.5.27

* SourceFormat Enforcement
squidadm added a commit to squidadm/squid that referenced this pull request Aug 19, 2017
* Maintenance: update snapshot script for git (squid-cache#24)

* Update snapshot script after git migration
 - Remove unused BZRROOT environment variable
 - Replace tag with branch name

* Update source-maintenance script for git (squid-cache#26)

* replace bzr calls with git equivalent
* remove obsolete ROOT and PWD variables (git does not support non-recursive file listing)
* add exceptions to ignore more files caught by git than bzr

* Maintenance: remove unused .bzrignore (squid-cache#29)

* Remove .bzrignore from git

* Prep for 3.5.27

* SourceFormat Enforcement
yadij pushed a commit that referenced this pull request Aug 19, 2017
* Prep for 3.5.27 (#48)

* Maintenance: update snapshot script for git (#24)

* Update snapshot script after git migration
 - Remove unused BZRROOT environment variable
 - Replace tag with branch name

* Update source-maintenance script for git (#26)

* replace bzr calls with git equivalent
* remove obsolete ROOT and PWD variables (git does not support non-recursive file listing)
* add exceptions to ignore more files caught by git than bzr

* Maintenance: remove unused .bzrignore (#29)

* Remove .bzrignore from git

* Prep for 3.5.27

* SourceFormat Enforcement

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

Comments