widelands-dev team mailing list archive

["Jens Beyer \(Qcumber-some\)" <Qcumber-some@xxxxxxxxxxxxx>]

Jens Beyer (Qcumber-some) has proposed merging lp:~qcumber-some/widelands/svn-treatment into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  #536604 Messy hiding of directories
  https://bugs.launchpad.net/bugs/536604


Removed all occurencies of special .svn treatment.
Luckily BZR doesn't hide in the sources subfolders like SVN does, so the code gets cleaner.
-- 
https://code.launchpad.net/~qcumber-some/widelands/svn-treatment/+merge/39916
Your team Widelands Developers is requested to review the proposed merge of lp:~qcumber-some/widelands/svn-treatment into lp:widelands.

=== modified file 'src/editor/ui_menus/editor_main_menu_load_map.cc'
--- src/editor/ui_menus/editor_main_menu_load_map.cc	2010-10-17 19:42:01 +0000
+++ src/editor/ui_menus/editor_main_menu_load_map.cc	2010-11-03 01:09:49 +0000
@@ -230,9 +230,6 @@
 			(strcmp(FileSystem::FS_Filename(name), ".")    and
 			 // Upsy, appeared again. ignore
 			 strcmp(FileSystem::FS_Filename(name), "..")   and
-			 // HACK: we skip .svn dir (which is in normal checkout present) for
-			 // aesthetic reasons
-			 strcmp(FileSystem::FS_Filename(name), ".svn") and
 			 g_fs->IsDirectory(name)                       and
 			 not WL_Map_Loader::is_widelands_map(name))
 

=== modified file 'src/editor/ui_menus/editor_main_menu_save_map.cc'
--- src/editor/ui_menus/editor_main_menu_save_map.cc	2010-10-17 19:42:01 +0000
+++ src/editor/ui_menus/editor_main_menu_save_map.cc	2010-11-03 01:09:49 +0000
@@ -306,7 +306,6 @@
 		if
 			(strcmp(FileSystem::FS_Filename(name), ".")    and
 			 strcmp(FileSystem::FS_Filename(name), "..")   and
-			 strcmp(FileSystem::FS_Filename(name), ".svn") and
 			 g_fs->IsDirectory(name)                       and
 			 not Widelands::WL_Map_Loader::is_widelands_map(name))
 

=== modified file 'src/io/filesystem/disk_filesystem.cc'
--- src/io/filesystem/disk_filesystem.cc	2010-11-01 23:14:12 +0000
+++ src/io/filesystem/disk_filesystem.cc	2010-11-03 01:09:49 +0000
@@ -270,10 +270,6 @@
 		 ++pname)
 	{
 		std::string filename = FS_Filename(pname->c_str());
-		// HACK: ignore SVN directory for this might be a
-		// campaign directory or similar
-		if (filename == ".svn")
-			continue;
 		if (filename == "..")
 			continue;
 		if (filename == ".")

=== modified file 'src/ui_fsmenu/editor_mapselect.cc'
--- src/ui_fsmenu/editor_mapselect.cc	2010-10-17 19:32:07 +0000
+++ src/ui_fsmenu/editor_mapselect.cc	2010-11-03 01:09:49 +0000
@@ -231,9 +231,6 @@
 			(strcmp(FileSystem::FS_Filename(name), ".")    and
 			 // Upsy, appeared again. ignore
 			 strcmp(FileSystem::FS_Filename(name), "..")   and
-			 // HACK: we skip .svn dir (which is in normal checkout present) for
-			 // esthetic reasons
-			 strcmp(FileSystem::FS_Filename(name), ".svn") and
 			 g_fs->IsDirectory(name)                       and
 			 not WL_Map_Loader::is_widelands_map(name))
 

=== modified file 'src/ui_fsmenu/mapselect.cc'
--- src/ui_fsmenu/mapselect.cc	2010-10-30 21:08:28 +0000
+++ src/ui_fsmenu/mapselect.cc	2010-11-03 01:09:49 +0000
@@ -312,10 +312,6 @@
 		// Upsy, appeared again. ignore
 		if (!strcmp(FileSystem::FS_Filename(name), ".."))
 			continue;
-		// HACK: we skip .svn dir (which is in normal checkout present) for
-		// esthetic reasons
-		if (!strcmp(FileSystem::FS_Filename(name), ".svn"))
-			continue;
 		if (!g_fs->IsDirectory(name))
 			continue;
 		if (WL_Map_Loader::is_widelands_map(name))