Skip to content
Browse files

Merge pull request #1482 from resurtm/1212-webapp-git-hg

[ci skip] Fixes #1212: Added missing .gitignore files to the application generated by WebAppCommand
  • Loading branch information...
2 parents f7f96e7 + f34f868 commit 83d75cb6ceb936499d5b0774f5571530395cccdb @samdark samdark committed Sep 27, 2012
Showing with 9 additions and 5 deletions.
  1. +1 −0 CHANGELOG
  2. +5 −5 framework/cli/commands/WebAppCommand.php
  3. 0 framework/cli/views/webapp/{protected/runtime/git.gitignore → assets/git-gitignore}
  4. 0 framework/cli/views/webapp/{themes/classic/views/system/hg.hgkeep → assets/hg-hgkeep}
  5. 0 framework/cli/views/webapp/assets/hg.hgkeep
  6. +1 −0 framework/cli/views/webapp/{hg.hgignore → hg-hgignore}
  7. 0 framework/cli/views/webapp/{themes/classic/views/system/git.gitkeep → images/git-gitkeep}
  8. 0 framework/cli/views/webapp/{themes/classic/views/site/hg.hgkeep → images/hg-hgkeep}
  9. 0 ...k/cli/views/webapp/{themes/classic/views/site/git.gitkeep → protected/commands/shell/git-gitkeep}
  10. 0 ...rk/cli/views/webapp/{themes/classic/views/layouts/hg.hgkeep → protected/commands/shell/hg-hgkeep}
  11. 0 ...rk/cli/views/webapp/{themes/classic/views/layouts/git.gitkeep → protected/extensions/git-gitkeep}
  12. 0 framework/cli/views/webapp/protected/{tests/unit/hg.hgkeep → extensions/hg-hgkeep}
  13. 0 framework/cli/views/webapp/protected/{tests/unit/git.gitkeep → messages/git-gitkeep}
  14. 0 framework/cli/views/webapp/protected/{tests/report/hg.hgkeep → messages/hg-hgkeep}
  15. 0 framework/cli/views/webapp/protected/{tests/report/git.gitkeep → migrations/git-gitkeep}
  16. 0 framework/cli/views/webapp/protected/{tests/fixtures/hg.hgkeep → migrations/hg-hgkeep}
  17. 0 framework/cli/views/webapp/{assets/git.gitignore → protected/runtime/git-gitignore}
  18. 0 framework/cli/views/webapp/protected/{tests/fixtures/git.gitkeep → runtime/hg-hgkeep}
  19. 0 framework/cli/views/webapp/protected/{runtime/hg.hgkeep → tests/fixtures/git-gitkeep}
  20. 0 framework/cli/views/webapp/protected/{migrations/hg.hgkeep → tests/fixtures/hg-hgkeep}
  21. +2 −0 framework/cli/views/webapp/protected/tests/report/git-gitignore
  22. 0 framework/cli/views/webapp/protected/{migrations/git.gitkeep → tests/report/hg-hgkeep}
  23. 0 framework/cli/views/webapp/protected/{messages/hg.hgkeep → tests/unit/git-gitkeep}
  24. 0 framework/cli/views/webapp/protected/{messages/git.gitkeep → tests/unit/hg-hgkeep}
  25. 0 ...work/cli/views/webapp/{protected/extensions/hg.hgkeep → themes/classic/views/layouts/git-gitkeep}
  26. 0 ...work/cli/views/webapp/{protected/extensions/git.gitkeep → themes/classic/views/layouts/hg-hgkeep}
  27. 0 ...ork/cli/views/webapp/{protected/commands/shell/hg.hgkeep → themes/classic/views/site/git-gitkeep}
  28. 0 ...ork/cli/views/webapp/{protected/commands/shell/git.gitkeep → themes/classic/views/site/hg-hgkeep}
  29. 0 framework/cli/views/webapp/{images/hg.hgkeep → themes/classic/views/system/git-gitkeep}
  30. 0 framework/cli/views/webapp/{images/git.gitkeep → themes/classic/views/system/hg-hgkeep}
View
1 CHANGELOG
@@ -14,6 +14,7 @@ Version 1.1.13 work in progress
- Bug #962: Fixed handling of negative timestamps in CDateFormatter::format() (johnmendonca)
- Bug #1095: Added missing retry_interval parameter of addServer function call in CMemCache (Lisio)
- Bug #1181: Fixed can read but not save binary data e.g. BYTEA on PostgreSQL (karmakaze)
+- Bug #1212: Added missing .gitignore files to the application generated by WebAppCommand (resurtm)
- Bug #1249: CHttpRequest::sendFile() outputs malformed file content in some specific circumstances (andyhu)
- Bug #1330: SQLite column default value was incorrect for column of type string and DEFAULT NULL (cebe)
- Bug #1344: Fixed URL problem in CGridView when enableHistory was true and unicode chars where used (mdomba, Redjik)
View
10 framework/cli/commands/WebAppCommand.php
@@ -77,16 +77,16 @@ public function run($args)
switch($vcs)
{
case 'git':
- $renameMap=array('git.gitignore'=>'.gitignore','git.gitkeep'=>'.gitkeep'); // move with rename git files
- $ignoreFiles=array('hg.hgignore','hg.hgkeep'); // ignore only hg files
+ $renameMap=array('git-gitignore'=>'.gitignore','git-gitkeep'=>'.gitkeep'); // move with rename git files
+ $ignoreFiles=array('hg-hgignore','hg-hgkeep'); // ignore only hg files
break;
case 'hg':
- $renameMap=array('hg.hgignore'=>'.hgignore','hg.hgkeep'=>'.hgkeep'); // move with rename hg files
- $ignoreFiles=array('git.gitignore','git.gitkeep'); // ignore only git files
+ $renameMap=array('hg-hgignore'=>'.hgignore','hg-hgkeep'=>'.hgkeep'); // move with rename hg files
+ $ignoreFiles=array('git-gitignore','git-gitkeep'); // ignore only git files
break;
default:
// no files for renaming
- $ignoreFiles=array('git.gitignore','git.gitkeep','hg.hgignore','hg.hgkeep'); // ignore both git and hg files
+ $ignoreFiles=array('git-gitignore','git-gitkeep','hg-hgignore','hg-hgkeep'); // ignore both git and hg files
break;
}
$list=$this->buildFileList($sourceDir,$path,'',$ignoreFiles,$renameMap);
View
0 ...ws/webapp/protected/runtime/git.gitignore → ...ork/cli/views/webapp/assets/git-gitignore
File renamed without changes.
View
0 ...app/themes/classic/views/system/hg.hgkeep → framework/cli/views/webapp/assets/hg-hgkeep
File renamed without changes.
View
0 framework/cli/views/webapp/assets/hg.hgkeep
No changes.
View
1 framework/cli/views/webapp/hg.hgignore → framework/cli/views/webapp/hg-hgignore
@@ -4,3 +4,4 @@ syntax: regexp
# ignore all except .hgkeep
assets/(?!.*\.hgkeep$).+
protected/runtime/(?!.*\.hgkeep$).+
+protected/tests/report/(?!.*\.hgkeep$).+
View
0 ...p/themes/classic/views/system/git.gitkeep → ...ework/cli/views/webapp/images/git-gitkeep
File renamed without changes.
View
0 ...ebapp/themes/classic/views/site/hg.hgkeep → framework/cli/views/webapp/images/hg-hgkeep
File renamed without changes.
View
0 ...app/themes/classic/views/site/git.gitkeep → ...bapp/protected/commands/shell/git-gitkeep
File renamed without changes.
View
0 ...pp/themes/classic/views/layouts/hg.hgkeep → ...webapp/protected/commands/shell/hg-hgkeep
File renamed without changes.
View
0 .../themes/classic/views/layouts/git.gitkeep → ...s/webapp/protected/extensions/git-gitkeep
File renamed without changes.
View
0 ...ews/webapp/protected/tests/unit/hg.hgkeep → ...ews/webapp/protected/extensions/hg-hgkeep
File renamed without changes.
View
0 ...s/webapp/protected/tests/unit/git.gitkeep → ...ews/webapp/protected/messages/git-gitkeep
File renamed without changes.
View
0 ...s/webapp/protected/tests/report/hg.hgkeep → ...views/webapp/protected/messages/hg-hgkeep
File renamed without changes.
View
0 ...webapp/protected/tests/report/git.gitkeep → ...s/webapp/protected/migrations/git-gitkeep
File renamed without changes.
View
0 ...webapp/protected/tests/fixtures/hg.hgkeep → ...ews/webapp/protected/migrations/hg-hgkeep
File renamed without changes.
View
0 ...ork/cli/views/webapp/assets/git.gitignore → ...ws/webapp/protected/runtime/git-gitignore
File renamed without changes.
View
0 ...bapp/protected/tests/fixtures/git.gitkeep → .../views/webapp/protected/runtime/hg-hgkeep
File renamed without changes.
View
0 .../views/webapp/protected/runtime/hg.hgkeep → ...bapp/protected/tests/fixtures/git-gitkeep
File renamed without changes.
View
0 ...ews/webapp/protected/migrations/hg.hgkeep → ...webapp/protected/tests/fixtures/hg-hgkeep
File renamed without changes.
View
2 framework/cli/views/webapp/protected/tests/report/git-gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
View
0 ...s/webapp/protected/migrations/git.gitkeep → ...s/webapp/protected/tests/report/hg-hgkeep
File renamed without changes.
View
0 ...views/webapp/protected/messages/hg.hgkeep → ...s/webapp/protected/tests/unit/git-gitkeep
File renamed without changes.
View
0 ...ews/webapp/protected/messages/git.gitkeep → ...ews/webapp/protected/tests/unit/hg-hgkeep
File renamed without changes.
View
0 ...ews/webapp/protected/extensions/hg.hgkeep → .../themes/classic/views/layouts/git-gitkeep
File renamed without changes.
View
0 ...s/webapp/protected/extensions/git.gitkeep → ...pp/themes/classic/views/layouts/hg-hgkeep
File renamed without changes.
View
0 ...webapp/protected/commands/shell/hg.hgkeep → ...app/themes/classic/views/site/git-gitkeep
File renamed without changes.
View
0 ...bapp/protected/commands/shell/git.gitkeep → ...ebapp/themes/classic/views/site/hg-hgkeep
File renamed without changes.
View
0 framework/cli/views/webapp/images/hg.hgkeep → ...p/themes/classic/views/system/git-gitkeep
File renamed without changes.
View
0 ...ework/cli/views/webapp/images/git.gitkeep → ...app/themes/classic/views/system/hg-hgkeep
File renamed without changes.

0 comments on commit 83d75cb

Please sign in to comment.
Something went wrong with that request. Please try again.