widelands

Merge lp:~qcumber-some/widelands/svn-treatment into lp:widelands

  1. svn-treatment
  2. Merge into trunk
Proposed by Jens Beyer
Status: Merged
Merged at revision: 5682
Proposed branch: lp:~qcumber-some/widelands/svn-treatment
Merge into: lp:widelands
Diff against target: 69 lines (+0/-15)
5 files modified
src/editor/ui_menus/editor_main_menu_load_map.cc (+0/-3)
src/editor/ui_menus/editor_main_menu_save_map.cc (+0/-1)
src/io/filesystem/disk_filesystem.cc (+0/-4)
src/ui_fsmenu/editor_mapselect.cc (+0/-3)
src/ui_fsmenu/mapselect.cc (+0/-4)
To merge this branch: bzr merge lp:~qcumber-some/widelands/svn-treatment
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+39916@code.launchpad.net

Description of the change

Removed all occurencies of special .svn treatment.
Luckily BZR doesn't hide in the sources subfolders like SVN does, so the code gets cleaner.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/editor/ui_menus/editor_main_menu_load_map.cc'
2--- src/editor/ui_menus/editor_main_menu_load_map.cc 2010-10-17 19:42:01 +0000
3+++ src/editor/ui_menus/editor_main_menu_load_map.cc 2010-11-03 01:09:49 +0000
4@@ -230,9 +230,6 @@
5 (strcmp(FileSystem::FS_Filename(name), ".") and
6 // Upsy, appeared again. ignore
7 strcmp(FileSystem::FS_Filename(name), "..") and
8- // HACK: we skip .svn dir (which is in normal checkout present) for
9- // aesthetic reasons
10- strcmp(FileSystem::FS_Filename(name), ".svn") and
11 g_fs->IsDirectory(name) and
12 not WL_Map_Loader::is_widelands_map(name))
13
14
15=== modified file 'src/editor/ui_menus/editor_main_menu_save_map.cc'
16--- src/editor/ui_menus/editor_main_menu_save_map.cc 2010-10-17 19:42:01 +0000
17+++ src/editor/ui_menus/editor_main_menu_save_map.cc 2010-11-03 01:09:49 +0000
18@@ -306,7 +306,6 @@
19 if
20 (strcmp(FileSystem::FS_Filename(name), ".") and
21 strcmp(FileSystem::FS_Filename(name), "..") and
22- strcmp(FileSystem::FS_Filename(name), ".svn") and
23 g_fs->IsDirectory(name) and
24 not Widelands::WL_Map_Loader::is_widelands_map(name))
25
26
27=== modified file 'src/io/filesystem/disk_filesystem.cc'
28--- src/io/filesystem/disk_filesystem.cc 2010-11-01 23:14:12 +0000
29+++ src/io/filesystem/disk_filesystem.cc 2010-11-03 01:09:49 +0000
30@@ -270,10 +270,6 @@
31 ++pname)
32 {
33 std::string filename = FS_Filename(pname->c_str());
34- // HACK: ignore SVN directory for this might be a
35- // campaign directory or similar
36- if (filename == ".svn")
37- continue;
38 if (filename == "..")
39 continue;
40 if (filename == ".")
41
42=== modified file 'src/ui_fsmenu/editor_mapselect.cc'
43--- src/ui_fsmenu/editor_mapselect.cc 2010-10-17 19:32:07 +0000
44+++ src/ui_fsmenu/editor_mapselect.cc 2010-11-03 01:09:49 +0000
45@@ -231,9 +231,6 @@
46 (strcmp(FileSystem::FS_Filename(name), ".") and
47 // Upsy, appeared again. ignore
48 strcmp(FileSystem::FS_Filename(name), "..") and
49- // HACK: we skip .svn dir (which is in normal checkout present) for
50- // esthetic reasons
51- strcmp(FileSystem::FS_Filename(name), ".svn") and
52 g_fs->IsDirectory(name) and
53 not WL_Map_Loader::is_widelands_map(name))
54
55
56=== modified file 'src/ui_fsmenu/mapselect.cc'
57--- src/ui_fsmenu/mapselect.cc 2010-10-30 21:08:28 +0000
58+++ src/ui_fsmenu/mapselect.cc 2010-11-03 01:09:49 +0000
59@@ -312,10 +312,6 @@
60 // Upsy, appeared again. ignore
61 if (!strcmp(FileSystem::FS_Filename(name), ".."))
62 continue;
63- // HACK: we skip .svn dir (which is in normal checkout present) for
64- // esthetic reasons
65- if (!strcmp(FileSystem::FS_Filename(name), ".svn"))
66- continue;
67 if (!g_fs->IsDirectory(name))
68 continue;
69 if (WL_Map_Loader::is_widelands_map(name))

Subscribers

People subscribed via source and target branches

to status/vote changes: