← Back to branch summary

~ubuntu-branches/ubuntu/karmic/codelite/karmic-backports

« back to all changes in this revision

Viewing changes to sdk/wxscintilla/src/scintilla/src/LexSVN.cxx

  • Committer: Bazaar Package Importer
  • Author(s): Ubuntu Archive Backport
  • Date: 2010-03-10 00:42:25 UTC
  • mfrom: (10.1.3 lucid)
  • Revision ID: james.westby@ubuntu.com-20100310004225-ccjgjj2vvdy4q7qs
Tags: 2.2.0.3681+dfsg-0ubuntu1~karmic1
Automated backport upload; no source changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sdk/wxscintilla/src/scintilla/src/LexSVN.cxx
57
57
                        lineBuffer[linePos] = '\0';
58
58
                        std::string str(lineBuffer);
59
59
 
 
60
                        // Trim
 
61
                        str.erase(0, str.find_first_not_of(" \t\r\n\v"));
 
62
 
60
63
                        if (str.length() > 2) {
61
64
                                if (str.at(0) == 'U' && str.at(1) == ' ') {
62
65
                                        styler.ColourTo(i, SCLEX_SVN_UPDATED);
 
66
 
63
67
                                } else if (str.at(0) == '_' && str.at(1) == 'U' && str.at(1) == ' ') {
64
68
                                        styler.ColourTo(i, SCLEX_SVN_UPDATED);
 
69
 
65
70
                                } else if (str.at(0) == 'U' && str.at(1) == 'U' && str.at(1) == ' ') {
66
71
                                        styler.ColourTo(i, SCLEX_SVN_UPDATED);
 
72
 
67
73
                                } else if (str.at(0) == 'C' && str.at(1) == ' ') {
68
74
                                        styler.ColourTo(i, SCLEX_SVN_CONFLICT);
 
75
 
69
76
                                } else if (str.at(0) == 'G' && str.at(1) == ' ') {
70
77
                                        styler.ColourTo(i, SCLEX_SVN_MERGED);
 
78
 
71
79
                                } else if (str.at(0) == 'M' && str.at(1) == ' ') {
72
80
                                        styler.ColourTo(i, SCLEX_SVN_MERGED);
 
81
 
73
82
                                } else if (str.at(0) == 'A' && str.at(1) == ' ') {
74
83
                                        styler.ColourTo(i, SCLEX_SVN_ADDED);
 
84
 
75
85
                                } else if (str.at(0) == 'D' && str.at(1) == ' ') {
76
86
                                        styler.ColourTo(i, SCLEX_SVN_DELETED);
 
87
 
 
88
                                } else if (str.at(0) == '=' && str.at(1) == '=') {
 
89
                                        styler.ColourTo(i, SCLEX_SVN_INFO);
 
90
 
 
91
                                } else if (str.at(0) == '-' && str.at(1) == '-') {
 
92
                                        styler.ColourTo(i, SCLEX_SVN_INFO);
 
93
 
77
94
                                } else {
78
95
                                        styler.ColourTo(i, SCLEX_SVN_DEFAULT);
79
96
                                }