Permalink
Browse files

Fixes #1212.

  • Loading branch information...
1 parent ddd5cf8 commit b37498daeb7e47969ec7fce9de84333d43aaccae @resurtm committed Sep 27, 2012
Showing with 12 additions and 7 deletions.
  1. +2 −1 build/tasks/YiiInitTask.php
  2. +2 −1 framework/YiiBase.php
  3. +5 −5 framework/cli/commands/WebAppCommand.php
  4. 0 framework/cli/views/webapp/assets/{git.gitignore → git-gitignore}
  5. 0 framework/cli/views/webapp/assets/{hg.hgkeep → hg-hgkeep}
  6. +1 −0 framework/cli/views/webapp/{hg.hgignore → hg-hgignore}
  7. 0 framework/cli/views/webapp/images/{git.gitkeep → git-gitkeep}
  8. 0 framework/cli/views/webapp/images/{hg.hgkeep → hg-hgkeep}
  9. 0 framework/cli/views/webapp/protected/commands/shell/{git.gitkeep → git-gitkeep}
  10. 0 framework/cli/views/webapp/protected/commands/shell/{hg.hgkeep → hg-hgkeep}
  11. 0 framework/cli/views/webapp/protected/extensions/{git.gitkeep → git-gitkeep}
  12. 0 framework/cli/views/webapp/protected/extensions/{hg.hgkeep → hg-hgkeep}
  13. 0 framework/cli/views/webapp/protected/messages/{git.gitkeep → git-gitkeep}
  14. 0 framework/cli/views/webapp/protected/messages/{hg.hgkeep → hg-hgkeep}
  15. 0 framework/cli/views/webapp/protected/migrations/{git.gitkeep → git-gitkeep}
  16. 0 framework/cli/views/webapp/protected/migrations/{hg.hgkeep → hg-hgkeep}
  17. 0 framework/cli/views/webapp/protected/runtime/{git.gitignore → git-gitignore}
  18. 0 framework/cli/views/webapp/protected/runtime/{hg.hgkeep → hg-hgkeep}
  19. 0 framework/cli/views/webapp/protected/tests/fixtures/{git.gitkeep → git-gitkeep}
  20. 0 framework/cli/views/webapp/protected/tests/fixtures/{hg.hgkeep → hg-hgkeep}
  21. +2 −0 framework/cli/views/webapp/protected/tests/report/git-gitignore
  22. 0 framework/cli/views/webapp/protected/tests/report/{git.gitkeep → hg-hgkeep}
  23. 0 framework/cli/views/webapp/protected/tests/{report/hg.hgkeep → unit/git-gitkeep}
  24. 0 framework/cli/views/webapp/protected/tests/unit/{git.gitkeep → hg-hgkeep}
  25. 0 ...work/cli/views/webapp/{protected/tests/unit/hg.hgkeep → themes/classic/views/layouts/git-gitkeep}
  26. 0 framework/cli/views/webapp/themes/classic/views/layouts/{git.gitkeep → hg-hgkeep}
  27. 0 framework/cli/views/webapp/themes/classic/views/{layouts/hg.hgkeep → site/git-gitkeep}
  28. 0 framework/cli/views/webapp/themes/classic/views/site/{git.gitkeep → hg-hgkeep}
  29. 0 framework/cli/views/webapp/themes/classic/views/{site/hg.hgkeep → system/git-gitkeep}
  30. 0 framework/cli/views/webapp/themes/classic/views/system/{git.gitkeep → hg-hgkeep}
  31. 0 framework/cli/views/webapp/themes/classic/views/system/hg.hgkeep
@@ -33,7 +33,8 @@ class YiiInitTask extends PropertyTask
public function main()
{
$this->addProperty('yii.version',$this->getYiiVersion());
- $this->addProperty('yii.revision',$this->getYiiRevision());
+// $this->addProperty('yii.revision',$this->getYiiRevision());
+ $this->addProperty('yii.revision','unknown');
$this->addProperty('yii.winbuild', substr(PHP_OS, 0, 3) == 'WIN' ? 'true' : 'false');
$this->addProperty('yii.release',$this->getYiiRelease());
$this->addProperty('yii.date',date('M j, Y'));
View
@@ -702,8 +702,8 @@ public static function registerAutoloader($callback, $append=false)
'CMssqlColumnSchema' => '/db/schema/mssql/CMssqlColumnSchema.php',
'CMssqlCommandBuilder' => '/db/schema/mssql/CMssqlCommandBuilder.php',
'CMssqlPdoAdapter' => '/db/schema/mssql/CMssqlPdoAdapter.php',
- 'CMssqlSqlsrvPdoAdapter' => '/db/schema/mssql/CMssqlSqlsrvPdoAdapter.php',
'CMssqlSchema' => '/db/schema/mssql/CMssqlSchema.php',
+ 'CMssqlSqlsrvPdoAdapter' => '/db/schema/mssql/CMssqlSqlsrvPdoAdapter.php',
'CMssqlTableSchema' => '/db/schema/mssql/CMssqlTableSchema.php',
'CMysqlColumnSchema' => '/db/schema/mysql/CMysqlColumnSchema.php',
'CMysqlCommandBuilder' => '/db/schema/mysql/CMysqlCommandBuilder.php',
@@ -730,6 +730,7 @@ public static function registerAutoloader($callback, $append=false)
'CGettextFile' => '/i18n/gettext/CGettextFile.php',
'CGettextMoFile' => '/i18n/gettext/CGettextMoFile.php',
'CGettextPoFile' => '/i18n/gettext/CGettextPoFile.php',
+ 'CCombinedLogFilter' => '/logging/CCombinedLogFilter.php',
'CDbLogRoute' => '/logging/CDbLogRoute.php',
'CEmailLogRoute' => '/logging/CEmailLogRoute.php',
'CFileLogRoute' => '/logging/CFileLogRoute.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);
@@ -4,3 +4,4 @@ syntax: regexp
# ignore all except .hgkeep
assets/(?!.*\.hgkeep$).+
protected/runtime/(?!.*\.hgkeep$).+
+protected/tests/report/(?!.*\.hgkeep$).+
@@ -0,0 +1,2 @@
+*
+!.gitignore

0 comments on commit b37498d

Please sign in to comment.