Check-in [9dd163b504]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:More cleaning up..
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:9dd163b504e2ca0cf1e61e47551df738b1ebe478
User & Date: isafam 2014-01-16 00:14:16
Context
2014-01-16
22:52
Added more files.. check-in: 6c1ccf6a0a user: isafam tags: trunk
00:14
More cleaning up.. check-in: 9dd163b504 user: isafam tags: trunk
2014-01-15
23:45
Cleaning up of files check-in: 28afa0073a user: isafam tags: trunk
Changes

Changes to Fossil/Fossil.project.

8
9
10
11
12
13
14

15
16
17
18
19
20
21
22
23
24
25
26
27

28
29
30
31
32
33
34
  <VirtualDirectory Name="src">
    <File Name="fossil.cpp"/>
    <File Name="commitmessagescache.cpp"/>
    <File Name="fossil_view.cpp"/>
    <File Name="fossil_console.cpp"/>
    <File Name="fossil_ui.cpp"/>
    <File Name="fossil_settings_dialog.cpp"/>

  </VirtualDirectory>
  <VirtualDirectory Name="include">
    <File Name="fossil.h"/>
    <File Name="commitmessagescache.h"/>
    <File Name="fossilsettingsdata.h"/>
    <File Name="fossil_view.h"/>
    <File Name="fossil_console.h"/>
    <File Name="fossil_strings.h"/>
    <File Name="fossil_ui.h"/>
    <File Name="fossil_login_dialog.h"/>
    <File Name="fossil_settings_dialog.h"/>
    <File Name="fossilinfo.h"/>
    <File Name="fossiltreedata.h"/>

  </VirtualDirectory>
  <Dependencies/>
  <Dependencies Name="DebugUnicode"/>
  <Dependencies Name="ReleaseUnicode"/>
  <Dependencies Name="WinDebug_29"/>
  <Dependencies Name="WinDebugUnicode"/>
  <Dependencies Name="WinReleaseUnicode"/>







>













>







8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
  <VirtualDirectory Name="src">
    <File Name="fossil.cpp"/>
    <File Name="commitmessagescache.cpp"/>
    <File Name="fossil_view.cpp"/>
    <File Name="fossil_console.cpp"/>
    <File Name="fossil_ui.cpp"/>
    <File Name="fossil_settings_dialog.cpp"/>
    <File Name="commit_dialog.cpp"/>
  </VirtualDirectory>
  <VirtualDirectory Name="include">
    <File Name="fossil.h"/>
    <File Name="commitmessagescache.h"/>
    <File Name="fossilsettingsdata.h"/>
    <File Name="fossil_view.h"/>
    <File Name="fossil_console.h"/>
    <File Name="fossil_strings.h"/>
    <File Name="fossil_ui.h"/>
    <File Name="fossil_login_dialog.h"/>
    <File Name="fossil_settings_dialog.h"/>
    <File Name="fossilinfo.h"/>
    <File Name="fossiltreedata.h"/>
    <File Name="commit_dialog.h"/>
  </VirtualDirectory>
  <Dependencies/>
  <Dependencies Name="DebugUnicode"/>
  <Dependencies Name="ReleaseUnicode"/>
  <Dependencies Name="WinDebug_29"/>
  <Dependencies Name="WinDebugUnicode"/>
  <Dependencies Name="WinReleaseUnicode"/>

Changes to Fossil/commit_dialog.cpp.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
..
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
..
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
#include "commit_dialog.h"
#include <wx/tokenzr.h>
#include "windowattrmanager.h"
#include "imanager.h"
#include "subversion2.h"

class CommitMessageStringData : public wxClientData {
	wxString m_data;
public:
	CommitMessageStringData(const wxString &data) : m_data(data.c_str()){}
	virtual ~CommitMessageStringData(){}

	const wxString &GetData() const {return m_data;}
};

CommitDialog::CommitDialog(wxWindow* parent, Subversion2* plugin)
: CommitDialogBase( parent )
, m_plugin(plugin)
{
	m_checkListFiles->Clear();
	m_checkListFiles->Disable();
	m_panel1->Disable();
	wxArrayString lastMessages, previews;
................................................................................
		m_choiceMessages->Append(previews.Item(i), new CommitMessageStringData(lastMessages.Item(i)));
	}

	m_textCtrlMessage->SetFocus();
	WindowAttrManager::Load(this, wxT("CommitDialog"), m_plugin->GetManager()->GetConfigTool());
}

CommitDialog::CommitDialog( wxWindow* parent, const wxArrayString &paths, Subversion2 *plugin)
		: CommitDialogBase( parent )
		, m_plugin(plugin)
{
	for (size_t i=0; i<paths.GetCount(); i++) {
		int index = m_checkListFiles->Append(paths.Item(i));
		m_checkListFiles->Check((unsigned int)index);
	}
................................................................................
		if ( !line.StartsWith(wxT("#")) ) {
			normalizedStr << line << wxT("\n");
		}
	}

	normalizedStr.Trim().Trim(false);

	// SVN does not like any quotation marks in the comment -> escape them
	normalizedStr.Replace(wxT("\""), wxT("\\\""));
	return normalizedStr;
}

wxArrayString CommitDialog::GetPaths()
{
	wxArrayString paths;




|










|







 







|







 







|







1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
..
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
..
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
#include "commit_dialog.h"
#include <wx/tokenzr.h>
#include "windowattrmanager.h"
#include "imanager.h"
#include "fossil.h"

class CommitMessageStringData : public wxClientData {
	wxString m_data;
public:
	CommitMessageStringData(const wxString &data) : m_data(data.c_str()){}
	virtual ~CommitMessageStringData(){}

	const wxString &GetData() const {return m_data;}
};

CommitDialog::CommitDialog(wxWindow* parent, Fossil *plugin)
: CommitDialogBase( parent )
, m_plugin(plugin)
{
	m_checkListFiles->Clear();
	m_checkListFiles->Disable();
	m_panel1->Disable();
	wxArrayString lastMessages, previews;
................................................................................
		m_choiceMessages->Append(previews.Item(i), new CommitMessageStringData(lastMessages.Item(i)));
	}

	m_textCtrlMessage->SetFocus();
	WindowAttrManager::Load(this, wxT("CommitDialog"), m_plugin->GetManager()->GetConfigTool());
}

CommitDialog::CommitDialog( wxWindow* parent, const wxArrayString &paths, Fossil *plugin)
		: CommitDialogBase( parent )
		, m_plugin(plugin)
{
	for (size_t i=0; i<paths.GetCount(); i++) {
		int index = m_checkListFiles->Append(paths.Item(i));
		m_checkListFiles->Check((unsigned int)index);
	}
................................................................................
		if ( !line.StartsWith(wxT("#")) ) {
			normalizedStr << line << wxT("\n");
		}
	}

	normalizedStr.Trim().Trim(false);

	// FOSSIL does not like any quotation marks in the comment -> escape them
	normalizedStr.Replace(wxT("\""), wxT("\\\""));
	return normalizedStr;
}

wxArrayString CommitDialog::GetPaths()
{
	wxArrayString paths;

Changes to Fossil/commit_dialog.h.

2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
#define __commit_dialog__

/**
@file
Subclass of CommitDialogBase, which is generated by wxFormBuilder.
*/

#include "subversion2_ui.h"

class Subversion2;
/** Implementing CommitDialogBase */
class CommitDialog : public CommitDialogBase
{
	Subversion2 *m_plugin;

public:
	static wxString NormalizeMessage(const wxString &message);
	void OnChoiceMessage(wxCommandEvent &e);

public:
	/** Constructor */
	CommitDialog( wxWindow* parent, const wxArrayString &paths, Subversion2 *plugin );
	CommitDialog( wxWindow* parent, Subversion2 *plugin );
	virtual ~CommitDialog();

	wxString      GetMesasge();
	wxArrayString GetPaths();
};

#endif // __commit_dialog__







|

|



|







|
|







2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
#define __commit_dialog__

/**
@file
Subclass of CommitDialogBase, which is generated by wxFormBuilder.
*/

#include "fossil_ui.h"

class Fossil;
/** Implementing CommitDialogBase */
class CommitDialog : public CommitDialogBase
{
	Fossil *m_plugin;

public:
	static wxString NormalizeMessage(const wxString &message);
	void OnChoiceMessage(wxCommandEvent &e);

public:
	/** Constructor */
	CommitDialog( wxWindow* parent, const wxArrayString &paths, Fossil *plugin );
	CommitDialog( wxWindow* parent, Fossil *plugin );
	virtual ~CommitDialog();

	wxString      GetMesasge();
	wxArrayString GetPaths();
};

#endif // __commit_dialog__

Changes to Fossil/fossil.cpp.

7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
...
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
#include "fossil.h"
#include "procutils.h"
#include <wx/ffile.h>
#include <wx/stdpaths.h>
#include "fossil_login_dialog.h"
//#include "fossil_command_handlers.h"
#include <wx/textdlg.h>
//#include "commit_dialog.h"
//#include "fossilstatushandler.h"
#include "fossil_strings.h"
#include <wx/menu.h>
#include "fossil_settings_dialog.h"
#include "fossil_console.h"
#include "fossil_view.h"
#include <wx/xrc/xmlres.h>
................................................................................

	executeable << wxT(" --config-dir \"") << GetUserConfigDir() << wxT("\" ");
	return executeable;
}


////////////////////////////////////////////////
// File Explorer SVN command handlers
////////////////////////////////////////////////

#if 0

void Fossil::OnAdd(wxCommandEvent& event)
{
	wxString command;







|







 







|







7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
...
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
#include "fossil.h"
#include "procutils.h"
#include <wx/ffile.h>
#include <wx/stdpaths.h>
#include "fossil_login_dialog.h"
//#include "fossil_command_handlers.h"
#include <wx/textdlg.h>
#include "commit_dialog.h"
//#include "fossilstatushandler.h"
#include "fossil_strings.h"
#include <wx/menu.h>
#include "fossil_settings_dialog.h"
#include "fossil_console.h"
#include "fossil_view.h"
#include <wx/xrc/xmlres.h>
................................................................................

	executeable << wxT(" --config-dir \"") << GetUserConfigDir() << wxT("\" ");
	return executeable;
}


////////////////////////////////////////////////
// File Explorer FOSSIL command handlers
////////////////////////////////////////////////

#if 0

void Fossil::OnAdd(wxCommandEvent& event)
{
	wxString command;

Changes to Fossil/fossil_console.cpp.

20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
..
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
...
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
FossilConsole::FossilConsole(wxWindow *parent, Fossil* plugin)
		: FossilShellBase(parent)
		//, m_handler(NULL)
		, m_process(NULL)
		, m_plugin (plugin)
		, m_printProcessOutput(true)
{
	m_sci->SetLexer(wxSCI_LEX_SVN);
	m_sci->StyleClearAll();

	for (int i=0; i<=wxSCI_STYLE_DEFAULT; i++) {
		m_sci->StyleSetBackground(i, wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
		m_sci->StyleSetForeground(i, *wxBLACK);
	}

................................................................................

	m_sci->SetWrapMode(wxSCI_WRAP_CHAR);
	m_sci->SetWrapStartIndent(4);
	m_sci->SetWrapVisualFlags(2);
	m_sci->SetScrollWidthTracking(true);

	/////////////////////////////////////////////////////////////////////////////
	// Set SVN styles
	/////////////////////////////////////////////////////////////////////////////
	m_sci->StyleSetForeground ( wxSCI_LEX_SVN_INFO,     wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT) );
	m_sci->StyleSetBackground ( wxSCI_LEX_SVN_INFO,     wxSystemSettings::GetColour (wxSYS_COLOUR_WINDOW ) );

	m_sci->StyleSetForeground ( wxSCI_LEX_SVN_ADDED,    wxT("FOREST GREEN") );
	m_sci->StyleSetBackground ( wxSCI_LEX_SVN_ADDED,    wxSystemSettings::GetColour (wxSYS_COLOUR_WINDOW ) );

	m_sci->StyleSetForeground ( wxSCI_LEX_SVN_MERGED,   wxT("FOREST GREEN") );
	m_sci->StyleSetBackground ( wxSCI_LEX_SVN_MERGED,   wxSystemSettings::GetColour (wxSYS_COLOUR_WINDOW ) );

	m_sci->StyleSetForeground ( wxSCI_LEX_SVN_UPDATED,  wxT("FOREST GREEN") );
	m_sci->StyleSetBackground ( wxSCI_LEX_SVN_UPDATED,  wxSystemSettings::GetColour (wxSYS_COLOUR_WINDOW ) );

	m_sci->StyleSetForeground ( wxSCI_LEX_SVN_CONFLICT, wxT("RED") );
	m_sci->StyleSetBackground ( wxSCI_LEX_SVN_CONFLICT, wxSystemSettings::GetColour (wxSYS_COLOUR_WINDOW ) );

	m_sci->StyleSetForeground ( wxSCI_LEX_SVN_DELETED,  wxT("FOREST GREEN") );
	m_sci->StyleSetBackground ( wxSCI_LEX_SVN_DELETED,  wxSystemSettings::GetColour ( wxSYS_COLOUR_WINDOW ) );

	m_sci->StyleSetFont ( wxSCI_LEX_SVN_INFO,     font );
	m_sci->StyleSetFont ( wxSCI_LEX_SVN_ADDED,    font );
	m_sci->StyleSetFont ( wxSCI_LEX_SVN_MERGED,   font );
	m_sci->StyleSetFont ( wxSCI_LEX_SVN_UPDATED,  font );
	m_sci->StyleSetFont ( wxSCI_LEX_SVN_CONFLICT, font );
	m_sci->StyleSetFont ( wxSCI_LEX_SVN_DELETED,  font );

	m_sci->SetReadOnly(true);
}

FossilConsole::~FossilConsole()
{
}
................................................................................
	if (s.Contains(wxT("(r)eject, accept (t)emporarily or accept (p)ermanently"))) {
		AppendText( wxT("\n(Answering 'p')\n") );
		m_process->Write(wxT("p"));

		wxString message;
		message << wxT(" ***********************************************\n");
		message << wxT(" * MESSAGE:                                    *\n");
		message << wxT(" * Terminating SVN process.                    *\n");
		message << wxT(" * Please run cleanup from the Fossil View,*\n");
		message << wxT(" * And re-try again                            *\n");
		message << wxT(" ***********************************************\n");

		wxThread::Sleep(100);
		AppendText( message );
		m_process->Terminate();







|







 







|

|
|

|
|

|
|

|
|

|
|

|
|

|
|
|
|
|
|







 







|







20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
..
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
...
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
FossilConsole::FossilConsole(wxWindow *parent, Fossil* plugin)
		: FossilShellBase(parent)
		//, m_handler(NULL)
		, m_process(NULL)
		, m_plugin (plugin)
		, m_printProcessOutput(true)
{
	m_sci->SetLexer(wxSCI_LEX_FOSSIL);
	m_sci->StyleClearAll();

	for (int i=0; i<=wxSCI_STYLE_DEFAULT; i++) {
		m_sci->StyleSetBackground(i, wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
		m_sci->StyleSetForeground(i, *wxBLACK);
	}

................................................................................

	m_sci->SetWrapMode(wxSCI_WRAP_CHAR);
	m_sci->SetWrapStartIndent(4);
	m_sci->SetWrapVisualFlags(2);
	m_sci->SetScrollWidthTracking(true);

	/////////////////////////////////////////////////////////////////////////////
	// Set FOSSIL styles
	/////////////////////////////////////////////////////////////////////////////
	m_sci->StyleSetForeground ( wxSCI_LEX_FOSSIL_INFO,     wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT) );
	m_sci->StyleSetBackground ( wxSCI_LEX_FOSSIL_INFO,     wxSystemSettings::GetColour (wxSYS_COLOUR_WINDOW ) );

	m_sci->StyleSetForeground ( wxSCI_LEX_FOSSIL_ADDED,    wxT("FOREST GREEN") );
	m_sci->StyleSetBackground ( wxSCI_LEX_FOSSIL_ADDED,    wxSystemSettings::GetColour (wxSYS_COLOUR_WINDOW ) );

	m_sci->StyleSetForeground ( wxSCI_LEX_FOSSIL_MERGED,   wxT("FOREST GREEN") );
	m_sci->StyleSetBackground ( wxSCI_LEX_FOSSIL_MERGED,   wxSystemSettings::GetColour (wxSYS_COLOUR_WINDOW ) );

	m_sci->StyleSetForeground ( wxSCI_LEX_FOSSIL_UPDATED,  wxT("FOREST GREEN") );
	m_sci->StyleSetBackground ( wxSCI_LEX_FOSSIL_UPDATED,  wxSystemSettings::GetColour (wxSYS_COLOUR_WINDOW ) );

	m_sci->StyleSetForeground ( wxSCI_LEX_FOSSIL_CONFLICT, wxT("RED") );
	m_sci->StyleSetBackground ( wxSCI_LEX_FOSSIL_CONFLICT, wxSystemSettings::GetColour (wxSYS_COLOUR_WINDOW ) );

	m_sci->StyleSetForeground ( wxSCI_LEX_FOSSIL_DELETED,  wxT("FOREST GREEN") );
	m_sci->StyleSetBackground ( wxSCI_LEX_FOSSIL_DELETED,  wxSystemSettings::GetColour ( wxSYS_COLOUR_WINDOW ) );

	m_sci->StyleSetFont ( wxSCI_LEX_FOSSIL_INFO,     font );
	m_sci->StyleSetFont ( wxSCI_LEX_FOSSIL_ADDED,    font );
	m_sci->StyleSetFont ( wxSCI_LEX_FOSSIL_MERGED,   font );
	m_sci->StyleSetFont ( wxSCI_LEX_FOSSIL_UPDATED,  font );
	m_sci->StyleSetFont ( wxSCI_LEX_FOSSIL_CONFLICT, font );
	m_sci->StyleSetFont ( wxSCI_LEX_FOSSIL_DELETED,  font );

	m_sci->SetReadOnly(true);
}

FossilConsole::~FossilConsole()
{
}
................................................................................
	if (s.Contains(wxT("(r)eject, accept (t)emporarily or accept (p)ermanently"))) {
		AppendText( wxT("\n(Answering 'p')\n") );
		m_process->Write(wxT("p"));

		wxString message;
		message << wxT(" ***********************************************\n");
		message << wxT(" * MESSAGE:                                    *\n");
		message << wxT(" * Terminating FOSSIL process.                    *\n");
		message << wxT(" * Please run cleanup from the Fossil View,*\n");
		message << wxT(" * And re-try again                            *\n");
		message << wxT(" ***********************************************\n");

		wxThread::Sleep(100);
		AppendText( message );
		m_process->Terminate();

Added Fossil/fossil_login_dialog.h.













































>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
#ifndef __fossil_login_dialog__
#define __fossil_login_dialog__

/**
@file
Subclass of FossilLoginDialogBase
*/

#include "fossil_ui.h"

/** Implementing FossilLoginDialogBase */
class FossilLoginDialog : public FossilLoginDialogBase
{
public:
	/** Constructor */
	FossilLoginDialog( wxWindow* parent );

	wxString GetUsername() {return m_textCtrlUsername->GetValue();}
	wxString GetPassword() {return m_textCtrlPassword->GetValue();}
};

#endif // __fossil_login_dialog__

Changes to Fossil/fossil_ui.cpp.

370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
	wxBoxSizer* bSizer24;
	bSizer24 = new wxBoxSizer( wxHORIZONTAL );
	
	m_staticText29 = new wxStaticText( m_panel6, wxID_ANY, _("Preprocessor name:"), wxDefaultPosition, wxDefaultSize, 0 );
	m_staticText29->Wrap( -1 );
	bSizer24->Add( m_staticText29, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
	
	m_textCtrlMacroName = new wxTextCtrl( m_panel6, wxID_ANY, _("SVN_REVISION"), wxDefaultPosition, wxDefaultSize, 0 );
	bSizer24->Add( m_textCtrlMacroName, 1, wxALL|wxEXPAND, 5 );
	
	bSizer23->Add( bSizer24, 0, wxEXPAND|wxALL, 5 );
	
	m_panel6->SetSizer( bSizer23 );
	m_panel6->Layout();
	bSizer23->Fit( m_panel6 );







|







370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
	wxBoxSizer* bSizer24;
	bSizer24 = new wxBoxSizer( wxHORIZONTAL );
	
	m_staticText29 = new wxStaticText( m_panel6, wxID_ANY, _("Preprocessor name:"), wxDefaultPosition, wxDefaultSize, 0 );
	m_staticText29->Wrap( -1 );
	bSizer24->Add( m_staticText29, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
	
	m_textCtrlMacroName = new wxTextCtrl( m_panel6, wxID_ANY, _("FOSSIL_REVISION"), wxDefaultPosition, wxDefaultSize, 0 );
	bSizer24->Add( m_textCtrlMacroName, 1, wxALL|wxEXPAND, 5 );
	
	bSizer23->Add( bSizer24, 0, wxEXPAND|wxALL, 5 );
	
	m_panel6->SetSizer( bSizer23 );
	m_panel6->Layout();
	bSizer23->Fit( m_panel6 );

Changes to Fossil/fossil_view.cpp.

5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
...
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
#include <wx/filedlg.h>
#include <wx/textdlg.h>
#include "plugin.h"
#include "procutils.h"
#include "fossil_login_dialog.h"
//#include "fossil_command_handlers.h"
//#include "fossil_copy_dialog.h"
//#include "commit_dialog.h"
//#include "fossil_default_command_handler.h"
#include <wx/menu.h>
#include <wx/dirdlg.h>
#include "fileextmanager.h"
#include "fossilsettingsdata.h"
//#include "fossilstatushandler.h"
#include <wx/wupdlock.h>
................................................................................
	}
}

void FossilView::OnFileRenamed(wxCommandEvent& event)
{
	wxArrayString *files = (wxArrayString*)event.GetClientData();

	// If the Fossil Client Version is set to 0.0 it means that we dont have SVN client installed
	if( m_plugin->GetFossilClientVersion() && files && (m_plugin->GetSettings().GetFlags() & FossilRenameFileInRepo) ) {
		wxString oldName = files->Item(0);
		wxString newName = files->Item(1);

		if(m_plugin->IsPathUnderFossil(oldName) == false) {
			event.Skip();
			return;







|







 







|







5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
...
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
#include <wx/filedlg.h>
#include <wx/textdlg.h>
#include "plugin.h"
#include "procutils.h"
#include "fossil_login_dialog.h"
//#include "fossil_command_handlers.h"
//#include "fossil_copy_dialog.h"
#include "commit_dialog.h"
//#include "fossil_default_command_handler.h"
#include <wx/menu.h>
#include <wx/dirdlg.h>
#include "fileextmanager.h"
#include "fossilsettingsdata.h"
//#include "fossilstatushandler.h"
#include <wx/wupdlock.h>
................................................................................
	}
}

void FossilView::OnFileRenamed(wxCommandEvent& event)
{
	wxArrayString *files = (wxArrayString*)event.GetClientData();

	// If the Fossil Client Version is set to 0.0 it means that we dont have FOSSIL client installed
	if( m_plugin->GetFossilClientVersion() && files && (m_plugin->GetSettings().GetFlags() & FossilRenameFileInRepo) ) {
		wxString oldName = files->Item(0);
		wxString newName = files->Item(1);

		if(m_plugin->IsPathUnderFossil(oldName) == false) {
			event.Skip();
			return;