vitalif
/
grive2
mirror of https://github.com/vitalif/grive2
1
0
Fork 0
Code Issues Releases Wiki Activity

Index allows us to not turn -f on when changing ignore regexp

datetime-serialize
Vitaliy Filippov 2016-01-03 17:40:23 +03:00
parent c647c5f89f
commit ca4a0b6b80
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libgrive/src/base/State.cc
View File

@ -42,13 +42,7 @@ State::State( const fs::path& filename, const Val& options ) :
m_force = options.Has( "force" ) ? options["force"].Bool() : false ;
if ( options.Has( "ignore" ) && options["ignore"].Str() != m_ign )
{
// also "-f" is implicitly turned on when ignore regexp is changed
// because without it grive would think that previously ignored files are deleted locally
if ( !m_ign.empty() )
m_force = true;
m_ign = options["ignore"].Str();
}
else if ( options.Has( "dir" ) )
{
const boost::regex trim_path( "^/+|/+$" );
@ -58,8 +52,6 @@ State::State( const fs::path& filename, const Val& options ) :
// "-s" is internally converted to an ignore regexp
const boost::regex esc( "[.^$|()\\[\\]{}*+?\\\\]" );
std::string ign = "^(?!"+regex_replace( m_dir, esc, "\\\\&", boost::format_sed )+"(/|$))";
if ( !m_ign.empty() && ign != m_ign )
m_force = true;
m_ign = ign;
}
}