conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled
<<<<<<<
private string _hls_m3u8_master_url = "";
[global::ProtoBuf.ProtoMember(11, IsRequired = false, Name=@"hls_m3u8_master_url", DataFormat = global::ProtoBuf.DataFormat.Default)]
[global::System.ComponentModel.DefaultValue("")]
public string hls_m3u8_master_url
{
get { return _hls_m3u8_master_url; }
set { _hls_m3u8_master_url = value; }
}
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool viewer_tokenSpecified
{
get { return _viewer_token != null; }
set { if (value == (_viewer_token== null)) _viewer_token = value ? this.viewer_token : (ulong?)null; }
}
private bool ShouldSerializeviewer_token() { return viewer_tokenSpecified; }
private void Resetviewer_token() { viewer_tokenSpecified = false; }
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool viewer_tokenSpecified
{
get { return _viewer_token != null; }
set { if (value == (_viewer_token== null)) _viewer_token = value ? this.viewer_token : (ulong?)null; }
}
private bool ShouldSerializeviewer_token() { return viewer_tokenSpecified; }
private void Resetviewer_token() { viewer_tokenSpecified = false; }
private string _hls_m3u8_master_url;
[global::ProtoBuf.ProtoMember(11, IsRequired = false, Name=@"hls_m3u8_master_url", DataFormat = global::ProtoBuf.DataFormat.Default)]
public string hls_m3u8_master_url
{
get { return _hls_m3u8_master_url?? ""; }
set { _hls_m3u8_master_url = value; }
}
[global::System.Xml.Serialization.XmlIgnore]
public bool hls_m3u8_master_urlSpecified
{
get { return _hls_m3u8_master_url != null; }
set { if (value == (_hls_m3u8_master_url== null)) _hls_m3u8_master_url = value ? this.hls_m3u8_master_url : (string)null; }
}
private bool ShouldSerializehls_m3u8_master_url() { return hls_m3u8_master_urlSpecified; }
private void Resethls_m3u8_master_url() { hls_m3u8_master_urlSpecified = false; } |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"NewAuthentication")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool is_phone_verifiedSpecified
{
get { return _is_phone_verified != null; }
set { if (value == (_is_phone_verified== null)) _is_phone_verified = value ? this.is_phone_verified : (bool?)null; }
}
private bool ShouldSerializeis_phone_verified() { return is_phone_verifiedSpecified; }
private void Resetis_phone_verified() { is_phone_verifiedSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"NewAuthentication")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool is_phone_verifiedSpecified
{
get { return _is_phone_verified != null; }
set { if (value == (_is_phone_verified== null)) _is_phone_verified = value ? this.is_phone_verified : (bool?)null; }
}
private bool ShouldSerializeis_phone_verified() { return is_phone_verifiedSpecified; }
private void Resetis_phone_verified() { is_phone_verifiedSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"NewAuthentication")] |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"SingleObject")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool service_idSpecified
{
get { return _service_id != null; }
set { if (value == (_service_id== null)) _service_id = value ? this.service_id : (uint?)null; }
}
private bool ShouldSerializeservice_id() { return service_idSpecified; }
private void Resetservice_id() { service_idSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"SingleObject")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool service_idSpecified
{
get { return _service_id != null; }
set { if (value == (_service_id== null)) _service_id = value ? this.service_id : (uint?)null; }
}
private bool ShouldSerializeservice_id() { return service_idSpecified; }
private void Resetservice_id() { service_idSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"SingleObject")]
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"SubscribedType")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool sync_versionSpecified
{
get { return _sync_version != null; }
set { if (value == (_sync_version== null)) _sync_version = value ? this.sync_version : (ulong?)null; }
}
private bool ShouldSerializesync_version() { return sync_versionSpecified; }
private void Resetsync_version() { sync_versionSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"SubscribedType")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool sync_versionSpecified
{
get { return _sync_version != null; }
set { if (value == (_sync_version== null)) _sync_version = value ? this.sync_version : (ulong?)null; }
}
private bool ShouldSerializesync_version() { return sync_versionSpecified; }
private void Resetsync_version() { sync_versionSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"SubscribedType")]
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"Location")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool gc_socache_file_versionSpecified
{
get { return _gc_socache_file_version != null; }
set { if (value == (_gc_socache_file_version== null)) _gc_socache_file_version = value ? this.gc_socache_file_version : (uint?)null; }
}
private bool ShouldSerializegc_socache_file_version() { return gc_socache_file_versionSpecified; }
private void Resetgc_socache_file_version() { gc_socache_file_versionSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"Location")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool gc_socache_file_versionSpecified
{
get { return _gc_socache_file_version != null; }
set { if (value == (_gc_socache_file_version== null)) _gc_socache_file_version = value ? this.gc_socache_file_version : (uint?)null; }
}
private bool ShouldSerializegc_socache_file_version() { return gc_socache_file_versionSpecified; }
private void Resetgc_socache_file_version() { gc_socache_file_versionSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"Location")]
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"CMsgHaveVersions")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool subscribe_to_typeSpecified
{
get { return _subscribe_to_type != null; }
set { if (value == (_subscribe_to_type== null)) _subscribe_to_type = value ? this.subscribe_to_type : (uint?)null; }
}
private bool ShouldSerializesubscribe_to_type() { return subscribe_to_typeSpecified; }
private void Resetsubscribe_to_type() { subscribe_to_typeSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"CMsgHaveVersions")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool subscribe_to_typeSpecified
{
get { return _subscribe_to_type != null; }
set { if (value == (_subscribe_to_type== null)) _subscribe_to_type = value ? this.subscribe_to_type : (uint?)null; }
}
private bool ShouldSerializesubscribe_to_type() { return subscribe_to_typeSpecified; }
private void Resetsubscribe_to_type() { subscribe_to_typeSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"CMsgHaveVersions")]
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"TypeCache")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool gc_socache_file_versionSpecified
{
get { return _gc_socache_file_version != null; }
set { if (value == (_gc_socache_file_version== null)) _gc_socache_file_version = value ? this.gc_socache_file_version : (uint?)null; }
}
private bool ShouldSerializegc_socache_file_version() { return gc_socache_file_versionSpecified; }
private void Resetgc_socache_file_version() { gc_socache_file_versionSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"TypeCache")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool gc_socache_file_versionSpecified
{
get { return _gc_socache_file_version != null; }
set { if (value == (_gc_socache_file_version== null)) _gc_socache_file_version = value ? this.gc_socache_file_version : (uint?)null; }
}
private bool ShouldSerializegc_socache_file_version() { return gc_socache_file_versionSpecified; }
private void Resetgc_socache_file_version() { gc_socache_file_versionSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"TypeCache")] |
<<<<<<<
public void Hover(Element element)
{
var sequenceBuilder = new OpenQA.Selenium.Interactions.DefaultActionSequenceBuilder(selenium);
sequenceBuilder.MoveToElement((IWebElement) element.Native);
}
=======
>>>>>>>
public void Hover(Element element)
{
var sequenceBuilder = new OpenQA.Selenium.Interactions.DefaultActionSequenceBuilder(selenium);
sequenceBuilder.MoveToElement((IWebElement) element.Native);
} |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"GamePlayed")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool client_os_typeSpecified
{
get { return _client_os_type != null; }
set { if (value == (_client_os_type== null)) _client_os_type = value ? this.client_os_type : (uint?)null; }
}
private bool ShouldSerializeclient_os_type() { return client_os_typeSpecified; }
private void Resetclient_os_type() { client_os_typeSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"GamePlayed")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool client_os_typeSpecified
{
get { return _client_os_type != null; }
set { if (value == (_client_os_type== null)) _client_os_type = value ? this.client_os_type : (uint?)null; }
}
private bool ShouldSerializeclient_os_type() { return client_os_typeSpecified; }
private void Resetclient_os_type() { client_os_typeSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"GamePlayed")]
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"Friend")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool friends_limit_hitSpecified
{
get { return _friends_limit_hit != null; }
set { if (value == (_friends_limit_hit== null)) _friends_limit_hit = value ? this.friends_limit_hit : (bool?)null; }
}
private bool ShouldSerializefriends_limit_hit() { return friends_limit_hitSpecified; }
private void Resetfriends_limit_hit() { friends_limit_hitSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"Friend")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool friends_limit_hitSpecified
{
get { return _friends_limit_hit != null; }
set { if (value == (_friends_limit_hit== null)) _friends_limit_hit = value ? this.friends_limit_hit : (bool?)null; }
}
private bool ShouldSerializefriends_limit_hit() { return friends_limit_hitSpecified; }
private void Resetfriends_limit_hit() { friends_limit_hitSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"Friend")]
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"Server_Types_Available")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool server_type_for_auth_servicesSpecified
{
get { return _server_type_for_auth_services != null; }
set { if (value == (_server_type_for_auth_services== null)) _server_type_for_auth_services = value ? this.server_type_for_auth_services : (uint?)null; }
}
private bool ShouldSerializeserver_type_for_auth_services() { return server_type_for_auth_servicesSpecified; }
private void Resetserver_type_for_auth_services() { server_type_for_auth_servicesSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"Server_Types_Available")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool server_type_for_auth_servicesSpecified
{
get { return _server_type_for_auth_services != null; }
set { if (value == (_server_type_for_auth_services== null)) _server_type_for_auth_services = value ? this.server_type_for_auth_services : (uint?)null; }
}
private bool ShouldSerializeserver_type_for_auth_services() { return server_type_for_auth_servicesSpecified; }
private void Resetserver_type_for_auth_services() { server_type_for_auth_servicesSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"Server_Types_Available")]
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"Stats_Failed_Validation")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool stats_out_of_dateSpecified
{
get { return _stats_out_of_date != null; }
set { if (value == (_stats_out_of_date== null)) _stats_out_of_date = value ? this.stats_out_of_date : (bool?)null; }
}
private bool ShouldSerializestats_out_of_date() { return stats_out_of_dateSpecified; }
private void Resetstats_out_of_date() { stats_out_of_dateSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"Stats_Failed_Validation")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool stats_out_of_dateSpecified
{
get { return _stats_out_of_date != null; }
set { if (value == (_stats_out_of_date== null)) _stats_out_of_date = value ? this.stats_out_of_date : (bool?)null; }
}
private bool ShouldSerializestats_out_of_date() { return stats_out_of_dateSpecified; }
private void Resetstats_out_of_date() { stats_out_of_dateSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"Stats_Failed_Validation")]
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"App")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool bytes_availableSpecified
{
get { return _bytes_available != null; }
set { if (value == (_bytes_available== null)) _bytes_available = value ? this.bytes_available : (ulong?)null; }
}
private bool ShouldSerializebytes_available() { return bytes_availableSpecified; }
private void Resetbytes_available() { bytes_availableSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"App")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool bytes_availableSpecified
{
get { return _bytes_available != null; }
set { if (value == (_bytes_available== null)) _bytes_available = value ? this.bytes_available : (ulong?)null; }
}
private bool ShouldSerializebytes_available() { return bytes_availableSpecified; }
private void Resetbytes_available() { bytes_availableSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"App")]
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"Package")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool packages_pendingSpecified
{
get { return _packages_pending != null; }
set { if (value == (_packages_pending== null)) _packages_pending = value ? this.packages_pending : (uint?)null; }
}
private bool ShouldSerializepackages_pending() { return packages_pendingSpecified; }
private void Resetpackages_pending() { packages_pendingSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"Package")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool packages_pendingSpecified
{
get { return _packages_pending != null; }
set { if (value == (_packages_pending== null)) _packages_pending = value ? this.packages_pending : (uint?)null; }
}
private bool ShouldSerializepackages_pending() { return packages_pendingSpecified; }
private void Resetpackages_pending() { packages_pendingSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"Package")]
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"PackageChange")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool force_full_package_updateSpecified
{
get { return _force_full_package_update != null; }
set { if (value == (_force_full_package_update== null)) _force_full_package_update = value ? this.force_full_package_update : (bool?)null; }
}
private bool ShouldSerializeforce_full_package_update() { return force_full_package_updateSpecified; }
private void Resetforce_full_package_update() { force_full_package_updateSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"PackageChange")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool force_full_package_updateSpecified
{
get { return _force_full_package_update != null; }
set { if (value == (_force_full_package_update== null)) _force_full_package_update = value ? this.force_full_package_update : (bool?)null; }
}
private bool ShouldSerializeforce_full_package_update() { return force_full_package_updateSpecified; }
private void Resetforce_full_package_update() { force_full_package_updateSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"PackageChange")] |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled
<<<<<<<
private int _controller_type = (int)2;
[global::ProtoBuf.ProtoMember(5, IsRequired = false, Name=@"controller_type", DataFormat = global::ProtoBuf.DataFormat.TwosComplement)]
[global::System.ComponentModel.DefaultValue((int)2)]
public int controller_type
{
get { return _controller_type; }
set { _controller_type = value; }
}
private bool _only_for_this_serial = (bool)false;
[global::ProtoBuf.ProtoMember(6, IsRequired = false, Name=@"only_for_this_serial", DataFormat = global::ProtoBuf.DataFormat.Default)]
[global::System.ComponentModel.DefaultValue((bool)false)]
public bool only_for_this_serial
{
get { return _only_for_this_serial; }
set { _only_for_this_serial = value; }
}
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool appidornameSpecified
{
get { return _appidorname != null; }
set { if (value == (_appidorname== null)) _appidorname = value ? this.appidorname : (string)null; }
}
private bool ShouldSerializeappidorname() { return appidornameSpecified; }
private void Resetappidorname() { appidornameSpecified = false; }
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool appidornameSpecified
{
get { return _appidorname != null; }
set { if (value == (_appidorname== null)) _appidorname = value ? this.appidorname : (string)null; }
}
private bool ShouldSerializeappidorname() { return appidornameSpecified; }
private void Resetappidorname() { appidornameSpecified = false; }
private int? _controller_type;
[global::ProtoBuf.ProtoMember(5, IsRequired = false, Name=@"controller_type", DataFormat = global::ProtoBuf.DataFormat.TwosComplement)]
public int controller_type
{
get { return _controller_type?? (int)2; }
set { _controller_type = value; }
}
[global::System.Xml.Serialization.XmlIgnore]
public bool controller_typeSpecified
{
get { return _controller_type != null; }
set { if (value == (_controller_type== null)) _controller_type = value ? this.controller_type : (int?)null; }
}
private bool ShouldSerializecontroller_type() { return controller_typeSpecified; }
private void Resetcontroller_type() { controller_typeSpecified = false; }
private bool? _only_for_this_serial;
[global::ProtoBuf.ProtoMember(6, IsRequired = false, Name=@"only_for_this_serial", DataFormat = global::ProtoBuf.DataFormat.Default)]
public bool only_for_this_serial
{
get { return _only_for_this_serial?? (bool)false; }
set { _only_for_this_serial = value; }
}
[global::System.Xml.Serialization.XmlIgnore]
public bool only_for_this_serialSpecified
{
get { return _only_for_this_serial != null; }
set { if (value == (_only_for_this_serial== null)) _only_for_this_serial = value ? this.only_for_this_serial : (bool?)null; }
}
private bool ShouldSerializeonly_for_this_serial() { return only_for_this_serialSpecified; }
private void Resetonly_for_this_serial() { only_for_this_serialSpecified = false; } |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"Chunks")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool total_missing_bytesSpecified
{
get { return _total_missing_bytes != null; }
set { if (value == (_total_missing_bytes== null)) _total_missing_bytes = value ? this.total_missing_bytes : (ulong?)null; }
}
private bool ShouldSerializetotal_missing_bytes() { return total_missing_bytesSpecified; }
private void Resettotal_missing_bytes() { total_missing_bytesSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"Chunks")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool total_missing_bytesSpecified
{
get { return _total_missing_bytes != null; }
set { if (value == (_total_missing_bytes== null)) _total_missing_bytes = value ? this.total_missing_bytes : (ulong?)null; }
}
private bool ShouldSerializetotal_missing_bytes() { return total_missing_bytesSpecified; }
private void Resettotal_missing_bytes() { total_missing_bytesSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"Chunks")]
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"Depots")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool live_branchSpecified
{
get { return _live_branch != null; }
set { if (value == (_live_branch== null)) _live_branch = value ? this.live_branch : (string)null; }
}
private bool ShouldSerializelive_branch() { return live_branchSpecified; }
private void Resetlive_branch() { live_branchSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"Depots")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool live_branchSpecified
{
get { return _live_branch != null; }
set { if (value == (_live_branch== null)) _live_branch = value ? this.live_branch : (string)null; }
}
private bool ShouldSerializelive_branch() { return live_branchSpecified; }
private void Resetlive_branch() { live_branchSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"Depots")] |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"KeyValueTag")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool clear_in_progressSpecified
{
get { return _clear_in_progress != null; }
set { if (value == (_clear_in_progress== null)) _clear_in_progress = value ? this.clear_in_progress : (bool?)null; }
}
private bool ShouldSerializeclear_in_progress() { return clear_in_progressSpecified; }
private void Resetclear_in_progress() { clear_in_progressSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"KeyValueTag")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool clear_in_progressSpecified
{
get { return _clear_in_progress != null; }
set { if (value == (_clear_in_progress== null)) _clear_in_progress = value ? this.clear_in_progress : (bool?)null; }
}
private bool ShouldSerializeclear_in_progress() { return clear_in_progressSpecified; }
private void Resetclear_in_progress() { clear_in_progressSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"KeyValueTag")]
<<<<<<<
private ulong _total_bytes_restored = default(ulong);
[global::ProtoBuf.ProtoMember(16, IsRequired = false, Name=@"total_bytes_restored", DataFormat = global::ProtoBuf.DataFormat.TwosComplement)]
[global::System.ComponentModel.DefaultValue(default(ulong))]
public ulong total_bytes_restored
{
get { return _total_bytes_restored; }
set { _total_bytes_restored = value; }
}
private bool _is_borrowed = default(bool);
[global::ProtoBuf.ProtoMember(17, IsRequired = false, Name=@"is_borrowed", DataFormat = global::ProtoBuf.DataFormat.Default)]
[global::System.ComponentModel.DefaultValue(default(bool))]
public bool is_borrowed
{
get { return _is_borrowed; }
set { _is_borrowed = value; }
}
private bool _is_free_weekend = default(bool);
[global::ProtoBuf.ProtoMember(18, IsRequired = false, Name=@"is_free_weekend", DataFormat = global::ProtoBuf.DataFormat.Default)]
[global::System.ComponentModel.DefaultValue(default(bool))]
public bool is_free_weekend
{
get { return _is_free_weekend; }
set { _is_free_weekend = value; }
}
private ulong _total_bytes_legacy = default(ulong);
[global::ProtoBuf.ProtoMember(19, IsRequired = false, Name=@"total_bytes_legacy", DataFormat = global::ProtoBuf.DataFormat.TwosComplement)]
[global::System.ComponentModel.DefaultValue(default(ulong))]
public ulong total_bytes_legacy
{
get { return _total_bytes_legacy; }
set { _total_bytes_legacy = value; }
}
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool total_bytes_stagedSpecified
{
get { return _total_bytes_staged != null; }
set { if (value == (_total_bytes_staged== null)) _total_bytes_staged = value ? this.total_bytes_staged : (ulong?)null; }
}
private bool ShouldSerializetotal_bytes_staged() { return total_bytes_stagedSpecified; }
private void Resettotal_bytes_staged() { total_bytes_stagedSpecified = false; }
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool total_bytes_stagedSpecified
{
get { return _total_bytes_staged != null; }
set { if (value == (_total_bytes_staged== null)) _total_bytes_staged = value ? this.total_bytes_staged : (ulong?)null; }
}
private bool ShouldSerializetotal_bytes_staged() { return total_bytes_stagedSpecified; }
private void Resettotal_bytes_staged() { total_bytes_stagedSpecified = false; }
private ulong? _total_bytes_restored;
[global::ProtoBuf.ProtoMember(16, IsRequired = false, Name=@"total_bytes_restored", DataFormat = global::ProtoBuf.DataFormat.TwosComplement)]
public ulong total_bytes_restored
{
get { return _total_bytes_restored?? default(ulong); }
set { _total_bytes_restored = value; }
}
[global::System.Xml.Serialization.XmlIgnore]
public bool total_bytes_restoredSpecified
{
get { return _total_bytes_restored != null; }
set { if (value == (_total_bytes_restored== null)) _total_bytes_restored = value ? this.total_bytes_restored : (ulong?)null; }
}
private bool ShouldSerializetotal_bytes_restored() { return total_bytes_restoredSpecified; }
private void Resettotal_bytes_restored() { total_bytes_restoredSpecified = false; }
private bool? _is_borrowed;
[global::ProtoBuf.ProtoMember(17, IsRequired = false, Name=@"is_borrowed", DataFormat = global::ProtoBuf.DataFormat.Default)]
public bool is_borrowed
{
get { return _is_borrowed?? default(bool); }
set { _is_borrowed = value; }
}
[global::System.Xml.Serialization.XmlIgnore]
public bool is_borrowedSpecified
{
get { return _is_borrowed != null; }
set { if (value == (_is_borrowed== null)) _is_borrowed = value ? this.is_borrowed : (bool?)null; }
}
private bool ShouldSerializeis_borrowed() { return is_borrowedSpecified; }
private void Resetis_borrowed() { is_borrowedSpecified = false; }
private bool? _is_free_weekend;
[global::ProtoBuf.ProtoMember(18, IsRequired = false, Name=@"is_free_weekend", DataFormat = global::ProtoBuf.DataFormat.Default)]
public bool is_free_weekend
{
get { return _is_free_weekend?? default(bool); }
set { _is_free_weekend = value; }
}
[global::System.Xml.Serialization.XmlIgnore]
public bool is_free_weekendSpecified
{
get { return _is_free_weekend != null; }
set { if (value == (_is_free_weekend== null)) _is_free_weekend = value ? this.is_free_weekend : (bool?)null; }
}
private bool ShouldSerializeis_free_weekend() { return is_free_weekendSpecified; }
private void Resetis_free_weekend() { is_free_weekendSpecified = false; }
private ulong? _total_bytes_legacy;
[global::ProtoBuf.ProtoMember(19, IsRequired = false, Name=@"total_bytes_legacy", DataFormat = global::ProtoBuf.DataFormat.TwosComplement)]
public ulong total_bytes_legacy
{
get { return _total_bytes_legacy?? default(ulong); }
set { _total_bytes_legacy = value; }
}
[global::System.Xml.Serialization.XmlIgnore]
public bool total_bytes_legacySpecified
{
get { return _total_bytes_legacy != null; }
set { if (value == (_total_bytes_legacy== null)) _total_bytes_legacy = value ? this.total_bytes_legacy : (ulong?)null; }
}
private bool ShouldSerializetotal_bytes_legacy() { return total_bytes_legacySpecified; }
private void Resettotal_bytes_legacy() { total_bytes_legacySpecified = false; }
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"Player")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool mapSpecified
{
get { return _map != null; }
set { if (value == (_map== null)) _map = value ? this.map : (string)null; }
}
private bool ShouldSerializemap() { return mapSpecified; }
private void Resetmap() { mapSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"Player")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool mapSpecified
{
get { return _map != null; }
set { if (value == (_map== null)) _map = value ? this.map : (string)null; }
}
private bool ShouldSerializemap() { return mapSpecified; }
private void Resetmap() { mapSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"Player")]
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"Server")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool errorSpecified
{
get { return _error != null; }
set { if (value == (_error== null)) _error = value ? this.error : (string)null; }
}
private bool ShouldSerializeerror() { return errorSpecified; }
private void Reseterror() { errorSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"Server")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool errorSpecified
{
get { return _error != null; }
set { if (value == (_error== null)) _error = value ? this.error : (string)null; }
}
private bool ShouldSerializeerror() { return errorSpecified; }
private void Reseterror() { errorSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"Server")]
<<<<<<<
private ulong _local_device_token = default(ulong);
[global::ProtoBuf.ProtoMember(3, IsRequired = false, Name=@"local_device_token", DataFormat = global::ProtoBuf.DataFormat.TwosComplement)]
[global::System.ComponentModel.DefaultValue(default(ulong))]
public ulong local_device_token
{
get { return _local_device_token; }
set { _local_device_token = value; }
}
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool owner_account_idSpecified
{
get { return _owner_account_id != null; }
set { if (value == (_owner_account_id== null)) _owner_account_id = value ? this.owner_account_id : (uint?)null; }
}
private bool ShouldSerializeowner_account_id() { return owner_account_idSpecified; }
private void Resetowner_account_id() { owner_account_idSpecified = false; }
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool owner_account_idSpecified
{
get { return _owner_account_id != null; }
set { if (value == (_owner_account_id== null)) _owner_account_id = value ? this.owner_account_id : (uint?)null; }
}
private bool ShouldSerializeowner_account_id() { return owner_account_idSpecified; }
private void Resetowner_account_id() { owner_account_idSpecified = false; }
private ulong? _local_device_token;
[global::ProtoBuf.ProtoMember(3, IsRequired = false, Name=@"local_device_token", DataFormat = global::ProtoBuf.DataFormat.TwosComplement)]
public ulong local_device_token
{
get { return _local_device_token?? default(ulong); }
set { _local_device_token = value; }
}
[global::System.Xml.Serialization.XmlIgnore]
public bool local_device_tokenSpecified
{
get { return _local_device_token != null; }
set { if (value == (_local_device_token== null)) _local_device_token = value ? this.local_device_token : (ulong?)null; }
}
private bool ShouldSerializelocal_device_token() { return local_device_tokenSpecified; }
private void Resetlocal_device_token() { local_device_tokenSpecified = false; }
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"LockedLibrary")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool own_library_locked_bySpecified
{
get { return _own_library_locked_by != null; }
set { if (value == (_own_library_locked_by== null)) _own_library_locked_by = value ? this.own_library_locked_by : (uint?)null; }
}
private bool ShouldSerializeown_library_locked_by() { return own_library_locked_bySpecified; }
private void Resetown_library_locked_by() { own_library_locked_bySpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"LockedLibrary")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool own_library_locked_bySpecified
{
get { return _own_library_locked_by != null; }
set { if (value == (_own_library_locked_by== null)) _own_library_locked_by = value ? this.own_library_locked_by : (uint?)null; }
}
private bool ShouldSerializeown_library_locked_by() { return own_library_locked_bySpecified; }
private void Resetown_library_locked_by() { own_library_locked_bySpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"LockedLibrary")]
<<<<<<<
private uint _language = default(uint);
[global::ProtoBuf.ProtoMember(7, IsRequired = false, Name=@"language", DataFormat = global::ProtoBuf.DataFormat.TwosComplement)]
[global::System.ComponentModel.DefaultValue(default(uint))]
public uint language
{
get { return _language; }
set { _language = value; }
}
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool launcherSpecified
{
get { return _launcher != null; }
set { if (value == (_launcher== null)) _launcher = value ? this.launcher : (uint?)null; }
}
private bool ShouldSerializelauncher() { return launcherSpecified; }
private void Resetlauncher() { launcherSpecified = false; }
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool launcherSpecified
{
get { return _launcher != null; }
set { if (value == (_launcher== null)) _launcher = value ? this.launcher : (uint?)null; }
}
private bool ShouldSerializelauncher() { return launcherSpecified; }
private void Resetlauncher() { launcherSpecified = false; }
private uint? _language;
[global::ProtoBuf.ProtoMember(7, IsRequired = false, Name=@"language", DataFormat = global::ProtoBuf.DataFormat.TwosComplement)]
public uint language
{
get { return _language?? default(uint); }
set { _language = value; }
}
[global::System.Xml.Serialization.XmlIgnore]
public bool languageSpecified
{
get { return _language != null; }
set { if (value == (_language== null)) _language = value ? this.language : (uint?)null; }
}
private bool ShouldSerializelanguage() { return languageSpecified; }
private void Resetlanguage() { languageSpecified = false; } |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled
<<<<<<<
private uint _partner_srcid = default(uint);
[global::ProtoBuf.ProtoMember(5, IsRequired = false, Name=@"partner_srcid", DataFormat = global::ProtoBuf.DataFormat.TwosComplement)]
[global::System.ComponentModel.DefaultValue(default(uint))]
public uint partner_srcid
{
get { return _partner_srcid; }
set { _partner_srcid = value; }
}
private uint _partner_accountid = default(uint);
[global::ProtoBuf.ProtoMember(6, IsRequired = false, Name=@"partner_accountid", DataFormat = global::ProtoBuf.DataFormat.TwosComplement)]
[global::System.ComponentModel.DefaultValue(default(uint))]
public uint partner_accountid
{
get { return _partner_accountid; }
set { _partner_accountid = value; }
}
private uint _partner_accountflags = default(uint);
[global::ProtoBuf.ProtoMember(7, IsRequired = false, Name=@"partner_accountflags", DataFormat = global::ProtoBuf.DataFormat.TwosComplement)]
[global::System.ComponentModel.DefaultValue(default(uint))]
public uint partner_accountflags
{
get { return _partner_accountflags; }
set { _partner_accountflags = value; }
}
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool client_launcherSpecified
{
get { return _client_launcher != null; }
set { if (value == (_client_launcher== null)) _client_launcher = value ? this.client_launcher : (uint?)null; }
}
private bool ShouldSerializeclient_launcher() { return client_launcherSpecified; }
private void Resetclient_launcher() { client_launcherSpecified = false; }
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool client_launcherSpecified
{
get { return _client_launcher != null; }
set { if (value == (_client_launcher== null)) _client_launcher = value ? this.client_launcher : (uint?)null; }
}
private bool ShouldSerializeclient_launcher() { return client_launcherSpecified; }
private void Resetclient_launcher() { client_launcherSpecified = false; }
private uint? _partner_srcid;
[global::ProtoBuf.ProtoMember(5, IsRequired = false, Name=@"partner_srcid", DataFormat = global::ProtoBuf.DataFormat.TwosComplement)]
public uint partner_srcid
{
get { return _partner_srcid?? default(uint); }
set { _partner_srcid = value; }
}
[global::System.Xml.Serialization.XmlIgnore]
public bool partner_srcidSpecified
{
get { return _partner_srcid != null; }
set { if (value == (_partner_srcid== null)) _partner_srcid = value ? this.partner_srcid : (uint?)null; }
}
private bool ShouldSerializepartner_srcid() { return partner_srcidSpecified; }
private void Resetpartner_srcid() { partner_srcidSpecified = false; }
private uint? _partner_accountid;
[global::ProtoBuf.ProtoMember(6, IsRequired = false, Name=@"partner_accountid", DataFormat = global::ProtoBuf.DataFormat.TwosComplement)]
public uint partner_accountid
{
get { return _partner_accountid?? default(uint); }
set { _partner_accountid = value; }
}
[global::System.Xml.Serialization.XmlIgnore]
public bool partner_accountidSpecified
{
get { return _partner_accountid != null; }
set { if (value == (_partner_accountid== null)) _partner_accountid = value ? this.partner_accountid : (uint?)null; }
}
private bool ShouldSerializepartner_accountid() { return partner_accountidSpecified; }
private void Resetpartner_accountid() { partner_accountidSpecified = false; }
private uint? _partner_accountflags;
[global::ProtoBuf.ProtoMember(7, IsRequired = false, Name=@"partner_accountflags", DataFormat = global::ProtoBuf.DataFormat.TwosComplement)]
public uint partner_accountflags
{
get { return _partner_accountflags?? default(uint); }
set { _partner_accountflags = value; }
}
[global::System.Xml.Serialization.XmlIgnore]
public bool partner_accountflagsSpecified
{
get { return _partner_accountflags != null; }
set { if (value == (_partner_accountflags== null)) _partner_accountflags = value ? this.partner_accountflags : (uint?)null; }
}
private bool ShouldSerializepartner_accountflags() { return partner_accountflagsSpecified; }
private void Resetpartner_accountflags() { partner_accountflagsSpecified = false; }
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"Location")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool currencySpecified
{
get { return _currency != null; }
set { if (value == (_currency== null)) _currency = value ? this.currency : (uint?)null; }
}
private bool ShouldSerializecurrency() { return currencySpecified; }
private void Resetcurrency() { currencySpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"Location")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool currencySpecified
{
get { return _currency != null; }
set { if (value == (_currency== null)) _currency = value ? this.currency : (uint?)null; }
}
private bool ShouldSerializecurrency() { return currencySpecified; }
private void Resetcurrency() { currencySpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"Location")] |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"RequestHeader")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool absolute_timeoutSpecified
{
get { return _absolute_timeout != null; }
set { if (value == (_absolute_timeout== null)) _absolute_timeout = value ? this.absolute_timeout : (uint?)null; }
}
private bool ShouldSerializeabsolute_timeout() { return absolute_timeoutSpecified; }
private void Resetabsolute_timeout() { absolute_timeoutSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"RequestHeader")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool absolute_timeoutSpecified
{
get { return _absolute_timeout != null; }
set { if (value == (_absolute_timeout== null)) _absolute_timeout = value ? this.absolute_timeout : (uint?)null; }
}
private bool ShouldSerializeabsolute_timeout() { return absolute_timeoutSpecified; }
private void Resetabsolute_timeout() { absolute_timeoutSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"RequestHeader")]
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"ResponseHeader")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool bodySpecified
{
get { return _body != null; }
set { if (value == (_body== null)) _body = value ? this.body : (byte[])null; }
}
private bool ShouldSerializebody() { return bodySpecified; }
private void Resetbody() { bodySpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"ResponseHeader")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool bodySpecified
{
get { return _body != null; }
set { if (value == (_body== null)) _body = value ? this.body : (byte[])null; }
}
private bool ShouldSerializebody() { return bodySpecified; }
private void Resetbody() { bodySpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"ResponseHeader")]
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"MessageRange")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool gcsql_versionSpecified
{
get { return _gcsql_version != null; }
set { if (value == (_gcsql_version== null)) _gcsql_version = value ? this.gcsql_version : (CMsgGCMsgSetOptions.GCSQLVersion?)null; }
}
private bool ShouldSerializegcsql_version() { return gcsql_versionSpecified; }
private void Resetgcsql_version() { gcsql_versionSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"MessageRange")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool gcsql_versionSpecified
{
get { return _gcsql_version != null; }
set { if (value == (_gcsql_version== null)) _gcsql_version = value ? this.gcsql_version : (CMsgGCMsgSetOptions.GCSQLVersion?)null; }
}
private bool ShouldSerializegcsql_version() { return gcsql_versionSpecified; }
private void Resetgcsql_version() { gcsql_versionSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"MessageRange")] |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"Highlight")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool exists_on_diskSpecified
{
get { return _exists_on_disk != null; }
set { if (value == (_exists_on_disk== null)) _exists_on_disk = value ? this.exists_on_disk : (bool?)null; }
}
private bool ShouldSerializeexists_on_disk() { return exists_on_diskSpecified; }
private void Resetexists_on_disk() { exists_on_diskSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"Highlight")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool exists_on_diskSpecified
{
get { return _exists_on_disk != null; }
set { if (value == (_exists_on_disk== null)) _exists_on_disk = value ? this.exists_on_disk : (bool?)null; }
}
private bool ShouldSerializeexists_on_disk() { return exists_on_diskSpecified; }
private void Resetexists_on_disk() { exists_on_diskSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"Highlight")] |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"Price")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool expiration_timeSpecified
{
get { return _expiration_time != null; }
set { if (value == (_expiration_time== null)) _expiration_time = value ? this.expiration_time : (uint?)null; }
}
private bool ShouldSerializeexpiration_time() { return expiration_timeSpecified; }
private void Resetexpiration_time() { expiration_timeSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"Price")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool expiration_timeSpecified
{
get { return _expiration_time != null; }
set { if (value == (_expiration_time== null)) _expiration_time = value ? this.expiration_time : (uint?)null; }
}
private bool ShouldSerializeexpiration_time() { return expiration_timeSpecified; }
private void Resetexpiration_time() { expiration_timeSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"Price")]
<<<<<<<
private bool _is_online = default(bool);
[global::ProtoBuf.ProtoMember(2, IsRequired = false, Name=@"is_online", DataFormat = global::ProtoBuf.DataFormat.Default)]
[global::System.ComponentModel.DefaultValue(default(bool))]
public bool is_online
{
get { return _is_online; }
set { _is_online = value; }
}
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool server_steam_idSpecified
{
get { return _server_steam_id != null; }
set { if (value == (_server_steam_id== null)) _server_steam_id = value ? this.server_steam_id : (ulong?)null; }
}
private bool ShouldSerializeserver_steam_id() { return server_steam_idSpecified; }
private void Resetserver_steam_id() { server_steam_idSpecified = false; }
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool server_steam_idSpecified
{
get { return _server_steam_id != null; }
set { if (value == (_server_steam_id== null)) _server_steam_id = value ? this.server_steam_id : (ulong?)null; }
}
private bool ShouldSerializeserver_steam_id() { return server_steam_idSpecified; }
private void Resetserver_steam_id() { server_steam_idSpecified = false; }
private bool? _is_online;
[global::ProtoBuf.ProtoMember(2, IsRequired = false, Name=@"is_online", DataFormat = global::ProtoBuf.DataFormat.Default)]
public bool is_online
{
get { return _is_online?? default(bool); }
set { _is_online = value; }
}
[global::System.Xml.Serialization.XmlIgnore]
public bool is_onlineSpecified
{
get { return _is_online != null; }
set { if (value == (_is_online== null)) _is_online = value ? this.is_online : (bool?)null; }
}
private bool ShouldSerializeis_online() { return is_onlineSpecified; }
private void Resetis_online() { is_onlineSpecified = false; }
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"Item")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool audit_dataSpecified
{
get { return _audit_data != null; }
set { if (value == (_audit_data== null)) _audit_data = value ? this.audit_data : (ulong?)null; }
}
private bool ShouldSerializeaudit_data() { return audit_dataSpecified; }
private void Resetaudit_data() { audit_dataSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"Item")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool audit_dataSpecified
{
get { return _audit_data != null; }
set { if (value == (_audit_data== null)) _audit_data = value ? this.audit_data : (ulong?)null; }
}
private bool ShouldSerializeaudit_data() { return audit_dataSpecified; }
private void Resetaudit_data() { audit_dataSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"Item")]
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"DynamicAttribute")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool inventory_tokenSpecified
{
get { return _inventory_token != null; }
set { if (value == (_inventory_token== null)) _inventory_token = value ? this.inventory_token : (uint?)null; }
}
private bool ShouldSerializeinventory_token() { return inventory_tokenSpecified; }
private void Resetinventory_token() { inventory_tokenSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"DynamicAttribute")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool inventory_tokenSpecified
{
get { return _inventory_token != null; }
set { if (value == (_inventory_token== null)) _inventory_token = value ? this.inventory_token : (uint?)null; }
}
private bool ShouldSerializeinventory_token() { return inventory_tokenSpecified; }
private void Resetinventory_token() { inventory_tokenSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"DynamicAttribute")] |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled
<<<<<<<
private uint _return_playtime_stats = default(uint);
[global::ProtoBuf.ProtoMember(13, IsRequired = false, Name=@"return_playtime_stats", DataFormat = global::ProtoBuf.DataFormat.TwosComplement)]
[global::System.ComponentModel.DefaultValue(default(uint))]
public uint return_playtime_stats
{
get { return _return_playtime_stats; }
set { _return_playtime_stats = value; }
}
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool languageSpecified
{
get { return _language != null; }
set { if (value == (_language== null)) _language = value ? this.language : (int?)null; }
}
private bool ShouldSerializelanguage() { return languageSpecified; }
private void Resetlanguage() { languageSpecified = false; }
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool languageSpecified
{
get { return _language != null; }
set { if (value == (_language== null)) _language = value ? this.language : (int?)null; }
}
private bool ShouldSerializelanguage() { return languageSpecified; }
private void Resetlanguage() { languageSpecified = false; }
private uint? _return_playtime_stats;
[global::ProtoBuf.ProtoMember(13, IsRequired = false, Name=@"return_playtime_stats", DataFormat = global::ProtoBuf.DataFormat.TwosComplement)]
public uint return_playtime_stats
{
get { return _return_playtime_stats?? default(uint); }
set { _return_playtime_stats = value; }
}
[global::System.Xml.Serialization.XmlIgnore]
public bool return_playtime_statsSpecified
{
get { return _return_playtime_stats != null; }
set { if (value == (_return_playtime_stats== null)) _return_playtime_stats = value ? this.return_playtime_stats : (uint?)null; }
}
private bool ShouldSerializereturn_playtime_stats() { return return_playtime_statsSpecified; }
private void Resetreturn_playtime_stats() { return_playtime_statsSpecified = false; }
<<<<<<<
private PublishedFileDetails.PlaytimeStats _playtime_stats = null;
[global::ProtoBuf.ProtoMember(64, IsRequired = false, Name=@"playtime_stats", DataFormat = global::ProtoBuf.DataFormat.Default)]
[global::System.ComponentModel.DefaultValue(null)]
public PublishedFileDetails.PlaytimeStats playtime_stats
{
get { return _playtime_stats; }
set { _playtime_stats = value; }
}
private uint _time_subscribed = default(uint);
=======
private uint? _time_subscribed;
>>>>>>>
private PublishedFileDetails.PlaytimeStats _playtime_stats = null;
[global::ProtoBuf.ProtoMember(64, IsRequired = false, Name=@"playtime_stats", DataFormat = global::ProtoBuf.DataFormat.Default)]
[global::System.ComponentModel.DefaultValue(null)]
public PublishedFileDetails.PlaytimeStats playtime_stats
{
get { return _playtime_stats; }
set { _playtime_stats = value; }
}
private uint? _time_subscribed;
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"Tag")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool languageSpecified
{
get { return _language != null; }
set { if (value == (_language== null)) _language = value ? this.language : (int?)null; }
}
private bool ShouldSerializelanguage() { return languageSpecified; }
private void Resetlanguage() { languageSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"Tag")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool languageSpecified
{
get { return _language != null; }
set { if (value == (_language== null)) _language = value ? this.language : (int?)null; }
}
private bool ShouldSerializelanguage() { return languageSpecified; }
private void Resetlanguage() { languageSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"Tag")]
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"ChangeLog")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool totalSpecified
{
get { return _total != null; }
set { if (value == (_total== null)) _total = value ? this.total : (uint?)null; }
}
private bool ShouldSerializetotal() { return totalSpecified; }
private void Resettotal() { totalSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"ChangeLog")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool totalSpecified
{
get { return _total != null; }
set { if (value == (_total== null)) _total = value ? this.total : (uint?)null; }
}
private bool ShouldSerializetotal() { return totalSpecified; }
private void Resettotal() { totalSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"ChangeLog")] |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled
<<<<<<<
private bool _replayed = default(bool);
[global::ProtoBuf.ProtoMember(6, IsRequired = false, Name=@"replayed", DataFormat = global::ProtoBuf.DataFormat.Default)]
[global::System.ComponentModel.DefaultValue(default(bool))]
public bool replayed
{
get { return _replayed; }
set { _replayed = value; }
}
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool ticketSpecified
{
get { return _ticket != null; }
set { if (value == (_ticket== null)) _ticket = value ? this.ticket : (byte[])null; }
}
private bool ShouldSerializeticket() { return ticketSpecified; }
private void Resetticket() { ticketSpecified = false; }
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool ticketSpecified
{
get { return _ticket != null; }
set { if (value == (_ticket== null)) _ticket = value ? this.ticket : (byte[])null; }
}
private bool ShouldSerializeticket() { return ticketSpecified; }
private void Resetticket() { ticketSpecified = false; }
private bool? _replayed;
[global::ProtoBuf.ProtoMember(6, IsRequired = false, Name=@"replayed", DataFormat = global::ProtoBuf.DataFormat.Default)]
public bool replayed
{
get { return _replayed?? default(bool); }
set { _replayed = value; }
}
[global::System.Xml.Serialization.XmlIgnore]
public bool replayedSpecified
{
get { return _replayed != null; }
set { if (value == (_replayed== null)) _replayed = value ? this.replayed : (bool?)null; }
}
private bool ShouldSerializereplayed() { return replayedSpecified; }
private void Resetreplayed() { replayedSpecified = false; }
<<<<<<<
private ulong _requestid = default(ulong);
[global::ProtoBuf.ProtoMember(6, IsRequired = false, Name=@"requestid", DataFormat = global::ProtoBuf.DataFormat.TwosComplement)]
[global::System.ComponentModel.DefaultValue(default(ulong))]
public ulong requestid
{
get { return _requestid; }
set { _requestid = value; }
}
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool notifySpecified
{
get { return _notify != null; }
set { if (value == (_notify== null)) _notify = value ? this.notify : (bool?)null; }
}
private bool ShouldSerializenotify() { return notifySpecified; }
private void Resetnotify() { notifySpecified = false; }
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool notifySpecified
{
get { return _notify != null; }
set { if (value == (_notify== null)) _notify = value ? this.notify : (bool?)null; }
}
private bool ShouldSerializenotify() { return notifySpecified; }
private void Resetnotify() { notifySpecified = false; }
private ulong? _requestid;
[global::ProtoBuf.ProtoMember(6, IsRequired = false, Name=@"requestid", DataFormat = global::ProtoBuf.DataFormat.TwosComplement)]
public ulong requestid
{
get { return _requestid?? default(ulong); }
set { _requestid = value; }
}
[global::System.Xml.Serialization.XmlIgnore]
public bool requestidSpecified
{
get { return _requestid != null; }
set { if (value == (_requestid== null)) _requestid = value ? this.requestid : (ulong?)null; }
}
private bool ShouldSerializerequestid() { return requestidSpecified; }
private void Resetrequestid() { requestidSpecified = false; }
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"CInventory_ConsumeItem_Request")]
=======
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"CInventory_GetItemDefs_Request")]
public partial class CInventory_GetItemDefs_Request : global::ProtoBuf.IExtensible
{
public CInventory_GetItemDefs_Request() {}
private uint? _appid;
[global::ProtoBuf.ProtoMember(1, IsRequired = false, Name=@"appid", DataFormat = global::ProtoBuf.DataFormat.TwosComplement)]
public uint appid
{
get { return _appid?? default(uint); }
set { _appid = value; }
}
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool appidSpecified
{
get { return _appid != null; }
set { if (value == (_appid== null)) _appid = value ? this.appid : (uint?)null; }
}
private bool ShouldSerializeappid() { return appidSpecified; }
private void Resetappid() { appidSpecified = false; }
private string _modifiedsince;
[global::ProtoBuf.ProtoMember(2, IsRequired = false, Name=@"modifiedsince", DataFormat = global::ProtoBuf.DataFormat.Default)]
public string modifiedsince
{
get { return _modifiedsince?? ""; }
set { _modifiedsince = value; }
}
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool modifiedsinceSpecified
{
get { return _modifiedsince != null; }
set { if (value == (_modifiedsince== null)) _modifiedsince = value ? this.modifiedsince : (string)null; }
}
private bool ShouldSerializemodifiedsince() { return modifiedsinceSpecified; }
private void Resetmodifiedsince() { modifiedsinceSpecified = false; }
private readonly global::System.Collections.Generic.List<ulong> _itemdefids = new global::System.Collections.Generic.List<ulong>();
[global::ProtoBuf.ProtoMember(4, Name=@"itemdefids", DataFormat = global::ProtoBuf.DataFormat.TwosComplement)]
public global::System.Collections.Generic.List<ulong> itemdefids
{
get { return _itemdefids; }
}
private readonly global::System.Collections.Generic.List<ulong> _workshopids = new global::System.Collections.Generic.List<ulong>();
[global::ProtoBuf.ProtoMember(5, Name=@"workshopids", DataFormat = global::ProtoBuf.DataFormat.TwosComplement)]
public global::System.Collections.Generic.List<ulong> workshopids
{
get { return _workshopids; }
}
private uint? _cache_max_age_seconds;
[global::ProtoBuf.ProtoMember(7, IsRequired = false, Name=@"cache_max_age_seconds", DataFormat = global::ProtoBuf.DataFormat.TwosComplement)]
public uint cache_max_age_seconds
{
get { return _cache_max_age_seconds?? (uint)0; }
set { _cache_max_age_seconds = value; }
}
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool cache_max_age_secondsSpecified
{
get { return _cache_max_age_seconds != null; }
set { if (value == (_cache_max_age_seconds== null)) _cache_max_age_seconds = value ? this.cache_max_age_seconds : (uint?)null; }
}
private bool ShouldSerializecache_max_age_seconds() { return cache_max_age_secondsSpecified; }
private void Resetcache_max_age_seconds() { cache_max_age_secondsSpecified = false; }
private global::ProtoBuf.IExtension extensionObject;
global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing)
{ return global::ProtoBuf.Extensible.GetExtensionObject(ref extensionObject, createIfMissing); }
}
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"CInventory_ConsumeItem_Request")]
>>>>>>>
[global::ProtoBuf.ProtoContract(Name=@"CInventory_ConsumeItem_Request")]
<<<<<<<
private ulong _requestid = default(ulong);
[global::ProtoBuf.ProtoMember(6, IsRequired = false, Name=@"requestid", DataFormat = global::ProtoBuf.DataFormat.TwosComplement)]
[global::System.ComponentModel.DefaultValue(default(ulong))]
public ulong requestid
{
get { return _requestid; }
set { _requestid = value; }
}
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool steamidSpecified
{
get { return _steamid != null; }
set { if (value == (_steamid== null)) _steamid = value ? this.steamid : (ulong?)null; }
}
private bool ShouldSerializesteamid() { return steamidSpecified; }
private void Resetsteamid() { steamidSpecified = false; }
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool steamidSpecified
{
get { return _steamid != null; }
set { if (value == (_steamid== null)) _steamid = value ? this.steamid : (ulong?)null; }
}
private bool ShouldSerializesteamid() { return steamidSpecified; }
private void Resetsteamid() { steamidSpecified = false; }
private ulong? _requestid;
[global::ProtoBuf.ProtoMember(6, IsRequired = false, Name=@"requestid", DataFormat = global::ProtoBuf.DataFormat.TwosComplement)]
public ulong requestid
{
get { return _requestid?? default(ulong); }
set { _requestid = value; }
}
[global::System.Xml.Serialization.XmlIgnore]
public bool requestidSpecified
{
get { return _requestid != null; }
set { if (value == (_requestid== null)) _requestid = value ? this.requestid : (ulong?)null; }
}
private bool ShouldSerializerequestid() { return requestidSpecified; }
private void Resetrequestid() { requestidSpecified = false; } |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"Member")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool creation_dateSpecified
{
get { return _creation_date != null; }
set { if (value == (_creation_date== null)) _creation_date = value ? this.creation_date : (uint?)null; }
}
private bool ShouldSerializecreation_date() { return creation_dateSpecified; }
private void Resetcreation_date() { creation_dateSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"Member")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool creation_dateSpecified
{
get { return _creation_date != null; }
set { if (value == (_creation_date== null)) _creation_date = value ? this.creation_date : (uint?)null; }
}
private bool ShouldSerializecreation_date() { return creation_dateSpecified; }
private void Resetcreation_date() { creation_dateSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"Member")]
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"DiceRoll")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool terseSpecified
{
get { return _terse != null; }
set { if (value == (_terse== null)) _terse = value ? this.terse : (bool?)null; }
}
private bool ShouldSerializeterse() { return terseSpecified; }
private void Resetterse() { terseSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"DiceRoll")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool terseSpecified
{
get { return _terse != null; }
set { if (value == (_terse== null)) _terse = value ? this.terse : (bool?)null; }
}
private bool ShouldSerializeterse() { return terseSpecified; }
private void Resetterse() { terseSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"DiceRoll")] |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"Choice")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool in_game_prediction_voting_period_minutesSpecified
{
get { return _in_game_prediction_voting_period_minutes != null; }
set { if (value == (_in_game_prediction_voting_period_minutes== null)) _in_game_prediction_voting_period_minutes = value ? this.in_game_prediction_voting_period_minutes : (uint?)null; }
}
private bool ShouldSerializein_game_prediction_voting_period_minutes() { return in_game_prediction_voting_period_minutesSpecified; }
private void Resetin_game_prediction_voting_period_minutes() { in_game_prediction_voting_period_minutesSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"Choice")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool in_game_prediction_voting_period_minutesSpecified
{
get { return _in_game_prediction_voting_period_minutes != null; }
set { if (value == (_in_game_prediction_voting_period_minutes== null)) _in_game_prediction_voting_period_minutes = value ? this.in_game_prediction_voting_period_minutes : (uint?)null; }
}
private bool ShouldSerializein_game_prediction_voting_period_minutes() { return in_game_prediction_voting_period_minutesSpecified; }
private void Resetin_game_prediction_voting_period_minutes() { in_game_prediction_voting_period_minutesSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"Choice")]
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"Player")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool pre_game_durationSpecified
{
get { return _pre_game_duration != null; }
set { if (value == (_pre_game_duration== null)) _pre_game_duration = value ? this.pre_game_duration : (uint?)null; }
}
private bool ShouldSerializepre_game_duration() { return pre_game_durationSpecified; }
private void Resetpre_game_duration() { pre_game_durationSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"Player")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool pre_game_durationSpecified
{
get { return _pre_game_duration != null; }
set { if (value == (_pre_game_duration== null)) _pre_game_duration = value ? this.pre_game_duration : (uint?)null; }
}
private bool ShouldSerializepre_game_duration() { return pre_game_durationSpecified; }
private void Resetpre_game_duration() { pre_game_durationSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"Player")]
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"CustomGameData")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool bot_difficultySpecified
{
get { return _bot_difficulty != null; }
set { if (value == (_bot_difficulty== null)) _bot_difficulty = value ? this.bot_difficulty : (uint?)null; }
}
private bool ShouldSerializebot_difficulty() { return bot_difficultySpecified; }
private void Resetbot_difficulty() { bot_difficultySpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"CustomGameData")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool bot_difficultySpecified
{
get { return _bot_difficulty != null; }
set { if (value == (_bot_difficulty== null)) _bot_difficulty = value ? this.bot_difficulty : (uint?)null; }
}
private bool ShouldSerializebot_difficulty() { return bot_difficultySpecified; }
private void Resetbot_difficulty() { bot_difficultySpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"CustomGameData")] |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled |
<<<<<<<
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Xamarin.Forms;
=======
using System.Linq;
>>>>>>>
using System;
using System.Linq;
using Xamarin.Forms;
<<<<<<<
_dataGridRowTemplate.SetValue(DataGridViewCell.DataGridProperty, dataGrid);
if (items != null)
_dataGridRowTemplate.SetValue(DataGridViewCell.IndexProperty, items.IndexOf(item));
=======
_dataGridRowTemplate.SetValue(DataGridViewCell.RowContextProperty, item);
_dataGridRowTemplate.SetValue(DataGridViewCell.DataGridProperty, dataGrid);
_dataGridRowTemplate.SetValue(DataGridViewCell.IndexProperty, listView.ItemsSource.Cast<object>().ToList().IndexOf(item));
>>>>>>>
_dataGridRowTemplate.SetValue(DataGridViewCell.DataGridProperty, dataGrid);
_dataGridRowTemplate.SetValue(DataGridViewCell.RowContextProperty, item);
if (items != null)
_dataGridRowTemplate.SetValue(DataGridViewCell.IndexProperty, items.IndexOf(item)); |
<<<<<<<
#if ENABLE_BROADMODE
if (broadMode)
{
((Window)Parent).Branches.RefreshEmbedded();
}
#endif
=======
>>>>>>>
<<<<<<<
#if ENABLE_BROADMODE
if (broadMode)
OnBroadGUI();
else
#endif
=======
if (!HasRepository)
{
DoOfferToInitializeRepositoryGUI();
return;
}
>>>>>>>
<<<<<<<
#if ENABLE_BROADMODE
if (Event.current.type == EventType.Repaint && EvaluateBroadMode())
{
Refresh();
}
#endif
}
#if ENABLE_BROADMODE
public void OnBroadGUI()
{
GUILayout.BeginHorizontal();
{
GUILayout.BeginVertical(
GUILayout.MinWidth(Styles.BroadModeBranchesMinWidth),
GUILayout.MaxWidth(Mathf.Max(Styles.BroadModeBranchesMinWidth, Position.width * Styles.BroadModeBranchesRatio))
);
{
((Window)Parent).Branches.OnEmbeddedGUI();
}
GUILayout.EndVertical();
GUILayout.BeginVertical();
{
OnEmbeddedGUI();
}
GUILayout.EndVertical();
}
GUILayout.EndHorizontal();
=======
>>>>>>> |
<<<<<<<
NPath resultPath = null;
Assert.DoesNotThrow(async () => resultPath = await gitInstaller.SetupGitIfNeeded().Task);
=======
var autoResetEvent = new AutoResetEvent(false);
bool? result = null;
NPath? resultPath = null;
Exception ex = null;
gitInstaller.SetupGitIfNeeded(new ActionTask<NPath>(CancellationToken.None, (b, path) => {
result = true;
resultPath = path;
autoResetEvent.Set();
}),
new ActionTask(CancellationToken.None, (b, exception) => {
result = false;
ex = exception;
autoResetEvent.Set();
}));
autoResetEvent.WaitOne();
result.HasValue.Should().BeTrue();
result.Value.Should().BeTrue();
>>>>>>>
NPath? resultPath = null;
Assert.DoesNotThrow(async () => resultPath = await gitInstaller.SetupGitIfNeeded().Task); |
<<<<<<<
event Action<string> OnActiveBranchChanged;
event Action<ConfigRemote?> OnActiveRemoteChanged;
event Action<bool> OnIsBusyChanged;
=======
event Action OnActiveBranchChanged;
event Action OnActiveRemoteChanged;
event Action<bool> OnIsBusyChanged;
>>>>>>>
event Action<string> OnActiveBranchChanged;
event Action<ConfigRemote?> OnActiveRemoteChanged;
event Action<bool> OnIsBusyChanged;
<<<<<<<
event Action OnRemoteBranchListChanged;
event Action OnRemoteOrTrackingChanged;
void Initialize();
=======
event Action OnRemoteBranchListChanged;
event Action OnRemoteOrTrackingChanged;
Task Initialize();
>>>>>>>
event Action OnRemoteBranchListChanged;
event Action OnRemoteOrTrackingChanged;
void Initialize();
<<<<<<<
Dictionary<string, ConfigBranch> LocalBranches { get; }
Dictionary<string, Dictionary<string, ConfigBranch>> RemoteBranches { get; }
IGitConfig Config { get; }
ConfigBranch? ActiveBranch { get; }
ConfigRemote? ActiveRemote { get; }
IGitClient GitClient { get; }
bool IsBusy { get; }
int WaitForEvents();
=======
Dictionary<string, ConfigBranch> LocalBranches { get; }
Dictionary<string, Dictionary<string, ConfigBranch>> RemoteBranches { get; }
IRepository Repository { get; }
IGitConfig Config { get; }
ConfigBranch? ActiveBranch { get; }
ConfigRemote? ActiveRemote { get; }
IGitClient GitClient { get; }
bool IsBusy { get; }
>>>>>>>
Dictionary<string, ConfigBranch> LocalBranches { get; }
Dictionary<string, Dictionary<string, ConfigBranch>> RemoteBranches { get; }
IRepository Repository { get; }
IGitConfig Config { get; }
ConfigBranch? ActiveBranch { get; }
ConfigRemote? ActiveRemote { get; }
IGitClient GitClient { get; }
bool IsBusy { get; }
int WaitForEvents();
<<<<<<<
=======
class RepositoryManagerFactory
{
public RepositoryManager CreateRepositoryManager(IPlatform platform, ITaskManager taskManager,
IUsageTracker usageTracker, IGitClient gitClient, NPath repositoryRoot)
{
var repositoryPathConfiguration = new RepositoryPathConfiguration(repositoryRoot);
string filePath = repositoryPathConfiguration.DotGitConfig;
var gitConfig = new GitConfig(filePath);
var repositoryWatcher = new RepositoryWatcher(platform, repositoryPathConfiguration, taskManager.Token);
return new RepositoryManager(platform, taskManager, usageTracker, gitConfig, repositoryWatcher, gitClient,
repositoryPathConfiguration, taskManager.Token);
}
}
>>>>>>>
<<<<<<<
public event Action OnRemoteBranchListChanged;
public event Action OnRemoteOrTrackingChanged;
public event Action<GitStatus> OnStatusUpdated;
public static RepositoryManager CreateInstance(IPlatform platform, ITaskManager taskManager, IUsageTracker usageTracker,
IGitClient gitClient, NPath repositoryRoot)
{
var repositoryPathConfiguration = new RepositoryPathConfiguration(repositoryRoot);
string filePath = repositoryPathConfiguration.DotGitConfig;
var gitConfig = new GitConfig(filePath);
var repositoryWatcher = new RepositoryWatcher(platform, repositoryPathConfiguration, taskManager.Token);
return new RepositoryManager(platform, taskManager, usageTracker, gitConfig, repositoryWatcher,
gitClient, repositoryPathConfiguration, taskManager.Token);
}
=======
public event Action OnRemoteBranchListChanged;
public event Action OnRemoteOrTrackingChanged;
public event Action<GitStatus> OnStatusUpdated;
>>>>>>>
public event Action OnRemoteBranchListChanged;
public event Action OnRemoteOrTrackingChanged;
public event Action<GitStatus> OnStatusUpdated;
public static RepositoryManager CreateInstance(IPlatform platform, ITaskManager taskManager, IUsageTracker usageTracker,
IGitClient gitClient, NPath repositoryRoot)
{
var repositoryPathConfiguration = new RepositoryPathConfiguration(repositoryRoot);
string filePath = repositoryPathConfiguration.DotGitConfig;
var gitConfig = new GitConfig(filePath);
var repositoryWatcher = new RepositoryWatcher(platform, repositoryPathConfiguration, taskManager.Token);
return new RepositoryManager(platform, taskManager, usageTracker, gitConfig, repositoryWatcher,
gitClient, repositoryPathConfiguration, taskManager.Token);
}
<<<<<<<
SetupConfig(repositoryPaths);
SetupWatcher();
=======
config = gitConfig;
watcher = repositoryWatcher;
watcher.HeadChanged += Watcher_OnHeadChanged;
watcher.IndexChanged += Watcher_OnIndexChanged;
watcher.ConfigChanged += Watcher_OnConfigChanged;
watcher.LocalBranchChanged += Watcher_OnLocalBranchChanged;
watcher.LocalBranchCreated += Watcher_OnLocalBranchCreated;
watcher.LocalBranchDeleted += Watcher_OnLocalBranchDeleted;
watcher.RepositoryChanged += Watcher_OnRepositoryChanged;
watcher.RemoteBranchCreated += Watcher_OnRemoteBranchCreated;
watcher.RemoteBranchDeleted += Watcher_OnRemoteBranchDeleted;
var remote = config.GetRemote("origin");
if (!remote.HasValue)
{
remote = config.GetRemotes().Where(x => HostAddress
.Create(new UriString(x.Url).ToRepositoryUri()).IsGitHubDotCom()).FirstOrDefault();
}
UriString cloneUrl = "";
if (remote.Value.Url != null)
{
cloneUrl = new UriString(remote.Value.Url).ToRepositoryUrl();
}
repository = new Repository(gitClient, this, repositoryPaths.RepositoryPath.FileName, cloneUrl,
repositoryPaths.RepositoryPath);
>>>>>>>
SetupConfig(repositoryPaths);
SetupWatcher();
<<<<<<<
=======
private async Task<IRepository> InitializeRepository()
{
head = repositoryPaths.DotGitHead.ReadAllLines().FirstOrDefault();
RefreshConfigData();
var user = new User();
var res = await GitClient.GetConfig("user.name", GitConfigSource.User).StartAwait();
user.Name = res;
res = await gitClient.GetConfig("user.email", GitConfigSource.User).StartAwait();
if (res == null)
{
throw new InvalidOperationException("No user configured");
}
user.Email = res;
repository.User = user;
return repository;
}
>>>>>>> |
<<<<<<<
PopupWindow.Open(PopupWindow.PopupViewType.PublishView);
=======
var publishedClicked = GUILayout.Button(PublishButton, Styles.HistoryToolbarButtonStyle);
if (publishedClicked)
{
PublishWindow.Open();
}
>>>>>>>
var publishedClicked = GUILayout.Button(PublishButton, Styles.HistoryToolbarButtonStyle);
if (publishedClicked)
{
PopupWindow.Open(PopupWindow.PopupViewType.PublishView);
} |
<<<<<<<
tree = TreeBuilder.BuildTreeRoot(newEntries, entries, entryCommitTargets, foldedTreeEntries, stateChangeCallback, AssetDatabase.GetCachedIcon);
=======
// Remove what got nuked
for (var index = 0; index < entries.Count;)
{
if (!newEntries.Contains(entries[index]))
{
entries.RemoveAt(index);
entryCommitTargets.RemoveAt(index);
}
else
{
index++;
}
}
// Remove folding state of nuked items
for (var index = 0; index < foldedTreeEntries.Count;)
{
if (!newEntries.Any(e => e.Path.IndexOf(foldedTreeEntries[index]) == 0))
{
foldedTreeEntries.RemoveAt(index);
}
else
{
index++;
}
}
// Add new stuff
for (var index = 0; index < newEntries.Count; ++index)
{
var entry = newEntries[index];
if (!entries.Contains(entry))
{
entries.Add(entry);
entryCommitTargets.Add(new GitCommitTarget());
}
}
// TODO: Filter .meta files - consider adding them as children of the asset or folder they're supporting
// TODO: In stead of completely rebuilding the tree structure, figure out a way to migrate open/closed states from the old tree to the new
// Build tree structure
tree = new FileTreeNode(FileSystemHelpers.FindCommonPath(entries.Select(e => e.Path)));
tree.RepositoryPath = tree.Path;
for (var index = 0; index < entries.Count; index++)
{
var entryPath = entries[index].Path.ToNPath();
if (entryPath.IsChildOf(tree.Path))
entryPath = entryPath.RelativeTo(tree.Path.ToNPath());
var node = new FileTreeNode(entryPath) { Target = entryCommitTargets[index] };
if (!string.IsNullOrEmpty(entries[index].ProjectPath))
{
node.Icon = AssetDatabase.GetCachedIcon(entries[index].ProjectPath);
}
BuildTree(tree, node);
}
>>>>>>>
tree = TreeBuilder.BuildTreeRoot(newEntries, entries, entryCommitTargets, foldedTreeEntries, AssetDatabase.GetCachedIcon);
<<<<<<<
=======
private void BuildTree(FileTreeNode parent, FileTreeNode node)
{
if (string.IsNullOrEmpty(node.Label))
{
// TODO: We should probably reassign this target onto the parent? Depends on how we want to handle .meta files for folders
return;
}
node.RepositoryPath = parent.RepositoryPath.ToNPath().Combine(node.Label);
parent.Open = !foldedTreeEntries.Contains(parent.RepositoryPath);
// Is this node inside a folder?
var nodePath = node.Label.ToNPath();
if (nodePath.Elements.Count() > 1)
{
// Figure out what the root folder is and chop it from the path
var root = nodePath.Elements.First();
node.Label = new NPath("").Combine(nodePath.Elements.Skip(1).ToArray());
// Look for a branch matching our root in the existing children
var found = false;
foreach (var child in parent.Children)
{
// If we found the branch, continue building from that branch
if (child.Label.Equals(root))
{
found = true;
BuildTree(child, node);
break;
}
}
// No existing branch - we will have to add a new one to build from
if (!found)
{
var p = parent.RepositoryPath.ToNPath().Combine(root);
BuildTree(parent.Add(new FileTreeNode(root) { RepositoryPath = p }), node);
}
}
else if (nodePath.ExtensionWithDot == ".meta")
{
// Look for a branch matching our root in the existing children
var found = false;
foreach (var child in parent.Children)
{
// If we found the branch, continue building from that branch
if (child.Label.Equals(nodePath.Parent.Combine(nodePath.FileNameWithoutExtension)))
{
found = true;
BuildTree(child, node);
break;
}
}
if (!found)
{
parent.Add(node);
}
}
// Not inside a folder - just add this node right here
else
{
parent.Add(node);
}
}
>>>>>>>
<<<<<<<
=======
private enum CommitState
{
None,
Some,
All
}
private class FileTreeNode
{
private List<FileTreeNode> children;
private string path;
private CommitState state;
public Texture Icon;
public string Label;
public bool Open = true;
public string RepositoryPath;
public GitCommitTarget Target { get; set; }
public FileTreeNode(string path)
{
this.path = path ?? "";
Label = this.path;
children = new List<FileTreeNode>();
}
public FileTreeNode Add(FileTreeNode child)
{
children.Add(child);
return child;
}
public CommitState State
{
get
{
if (children == null)
return state;
var commitState = CommitState.None;
if (Target != null)
{
commitState = Target.All ? CommitState.All : Target.Any ? CommitState.Some : CommitState.None;
if (!children.Any())
{
state = commitState;
return state;
}
}
var allCount = children.Count(c => c.State == CommitState.All);
if (allCount == children.Count && (commitState == CommitState.All || Target == null))
{
state = CommitState.All;
return state;
}
if (allCount > 0 || commitState == CommitState.Some)
{
state = CommitState.Some;
return state;
}
var someCount = children.Count(c => c.State == CommitState.Some);
if (someCount > 0 || commitState == CommitState.Some)
{
state = CommitState.Some;
return state;
}
state = CommitState.None;
return state;
}
set
{
if (value == state)
{
return;
}
if (Target != null)
{
if (value == CommitState.None)
{
Target.Clear();
}
else if (value == CommitState.All)
{
Target.All = true;
}
}
state = value;
if (children == null)
{
return;
}
for (var index = 0; index < children.Count; ++index)
{
children[index].State = value;
}
}
}
public string Path
{
get { return path; }
}
public IEnumerable<FileTreeNode> Children
{
get {
if (children == null)
children = new List<FileTreeNode>();
return children;
}
}
private ILogging logger;
protected ILogging Logger
{
get
{
if (logger == null)
logger = Logging.GetLogger(GetType());
return logger;
}
}
}
>>>>>>> |
<<<<<<<
=======
private bool showLocalBranches = true;
private bool showRemoteBranches = true;
>>>>>>>
<<<<<<<
[NonSerialized] private bool favoritesHasChanged;
[NonSerialized] private List<string> favoritesList;
=======
>>>>>>>
[NonSerialized] private List<string> favoritesList;
<<<<<<<
[SerializeField] private bool disableDelete;
[NonSerialized] private bool branchesHasChanged;
=======
[SerializeField] private BranchTreeNode selectedNode;
>>>>>>>
[SerializeField] private bool disableDelete;
[NonSerialized] private bool branchesHasChanged;
<<<<<<<
if (!Application.isPlaying)
{
favoritesHasChanged = true;
}
=======
Refresh();
>>>>>>>
<<<<<<<
if (!treeLocals.IsInitialized || branchesHasChanged)
{
branchesHasChanged = false;
BuildTree(BranchCache.Instance.LocalBranches, BranchCache.Instance.RemoteBranches);
}
if (favoritesHasChanged)
{
favoritesList = Manager.LocalSettings.Get(FavoritesSetting, new List<string>());
favoritesHasChanged = false;
}
disableDelete = treeLocals.SelectedNode == null || treeLocals.SelectedNode.IsFolder || treeLocals.SelectedNode.IsActive;
=======
>>>>>>>
if (!treeLocals.IsInitialized || branchesHasChanged)
{
branchesHasChanged = false;
BuildTree(BranchCache.Instance.LocalBranches, BranchCache.Instance.RemoteBranches);
}
disableDelete = treeLocals.SelectedNode == null || treeLocals.SelectedNode.IsFolder || treeLocals.SelectedNode.IsActive;
<<<<<<<
var rect = GUILayoutUtility.GetLastRect();
OnTreeGUI(new Rect(0f, rect.height + Styles.CommitAreaPadding, Position.width, Position.height - rect.height + Styles.CommitAreaPadding));
=======
GUILayout.BeginVertical(Styles.CommitFileAreaStyle);
{
// Local branches and "create branch" button
showLocalBranches = EditorGUILayout.Foldout(showLocalBranches, LocalTitle);
if (showLocalBranches)
{
GUILayout.BeginHorizontal();
{
GUILayout.BeginVertical();
{
OnTreeNodeChildrenGUI(localRoot);
}
GUILayout.EndVertical();
}
GUILayout.EndHorizontal();
}
// Remotes
showRemoteBranches = EditorGUILayout.Foldout(showRemoteBranches, RemoteTitle);
if (showRemoteBranches)
{
GUILayout.BeginHorizontal();
{
GUILayout.BeginVertical();
for (var index = 0; index < remotes.Count; ++index)
{
var remote = remotes[index];
GUILayout.Label(new GUIContent(remote.Name, Styles.FolderIcon), GUILayout.MaxHeight(EditorGUIUtility.singleLineHeight));
// Branches of the remote
GUILayout.BeginHorizontal();
{
GUILayout.Space(Styles.TreeIndentation);
GUILayout.BeginVertical();
{
OnTreeNodeChildrenGUI(remote.Root);
}
GUILayout.EndVertical();
}
GUILayout.EndHorizontal();
GUILayout.Space(Styles.BranchListSeperation);
}
GUILayout.EndVertical();
}
GUILayout.EndHorizontal();
}
GUILayout.FlexibleSpace();
}
GUILayout.EndVertical();
>>>>>>>
GUILayout.Label(FavoritesTitle);
OnTreeGUI(new Rect(0f, rect.height + Styles.CommitAreaPadding, Position.width, Position.height - rect.height + Styles.CommitAreaPadding));
<<<<<<<
=======
if (a.Name.Equals("master"))
{
return -1;
}
if (b.Name.Equals("master"))
{
return 1;
}
return 0;
}
private void BuildTree(IEnumerable<GitBranch> local, IEnumerable<GitBranch> remote)
{
//Clear the selected node
selectedNode = null;
// Sort
var localBranches = new List<GitBranch>(local);
var remoteBranches = new List<GitBranch>(remote);
>>>>>>>
<<<<<<<
public TreeNode ActiveNode { get { return activeNode; } }
=======
var content = new GUIContent(node.Label, iconContent);
var style = node.Active ? Styles.BoldLabel : Styles.Label;
var rect = GUILayoutUtility.GetRect(content, style, GUILayout.MaxHeight(EditorGUIUtility.singleLineHeight));
var clickRect = new Rect(0f, rect.y, Position.width, rect.height);
>>>>>>>
public TreeNode ActiveNode { get { return activeNode; } }
<<<<<<<
foldersKeys = Folders.Keys.Cast<string>().ToList();
}
public Rect Render(Rect rect, Action<TreeNode> singleClick = null, Action<TreeNode> doubleClick = null)
{
RequiresRepaint = false;
rect = new Rect(0f, rect.y, rect.width, ItemHeight);
var titleNode = nodes[0];
bool selectionChanged = titleNode.Render(rect, 0f, selectedNode == titleNode, FolderStyle, TreeNodeStyle, ActiveTreeNodeStyle);
if (selectionChanged)
{
ToggleNodeVisibility(0, titleNode);
}
RequiresRepaint = HandleInput(rect, titleNode, 0);
rect.y += ItemHeight + ItemSpacing;
Indent();
int level = 1;
for (int i = 1; i < nodes.Count; i++)
{
var node = nodes[i];
if (node.Level > level && !node.IsHidden)
{
Indent();
}
var changed = node.Render(rect, Indentation, selectedNode == node, FolderStyle, TreeNodeStyle, ActiveTreeNodeStyle);
if (node.IsFolder && changed)
{
// toggle visibility for all the nodes under this one
ToggleNodeVisibility(i, node);
}
if (node.Level < level)
{
for (; node.Level > level && indents.Count > 1; level--)
{
Unindent();
}
}
level = node.Level;
if (!node.IsHidden)
{
RequiresRepaint = HandleInput(rect, node, i, singleClick, doubleClick);
rect.y += ItemHeight + ItemSpacing;
}
}
Unindent();
foldersKeys = Folders.Keys.Cast<string>().ToList();
return rect;
}
public void Focus()
{
bool selectionChanged = false;
if (Event.current.type == EventType.KeyDown)
{
int directionY = Event.current.keyCode == KeyCode.UpArrow ? -1 : Event.current.keyCode == KeyCode.DownArrow ? 1 : 0;
int directionX = Event.current.keyCode == KeyCode.LeftArrow ? -1 : Event.current.keyCode == KeyCode.RightArrow ? 1 : 0;
if (directionY != 0 || directionX != 0)
{
if (directionY < 0 || directionY < 0)
{
SelectedNode = nodes[nodes.Count - 1];
selectionChanged = true;
Event.current.Use();
}
else if (directionY > 0 || directionX > 0)
{
SelectedNode = nodes[0];
selectionChanged = true;
Event.current.Use();
}
}
}
RequiresRepaint = selectionChanged;
=======
>>>>>>>
foldersKeys = Folders.Keys.Cast<string>().ToList();
}
public Rect Render(Rect rect, Action<TreeNode> singleClick = null, Action<TreeNode> doubleClick = null)
{
RequiresRepaint = false;
rect = new Rect(0f, rect.y, rect.width, ItemHeight);
var titleNode = nodes[0];
bool selectionChanged = titleNode.Render(rect, 0f, selectedNode == titleNode, FolderStyle, TreeNodeStyle, ActiveTreeNodeStyle);
if (selectionChanged)
{
ToggleNodeVisibility(0, titleNode);
}
RequiresRepaint = HandleInput(rect, titleNode, 0);
rect.y += ItemHeight + ItemSpacing;
Indent();
int level = 1;
for (int i = 1; i < nodes.Count; i++)
{
var node = nodes[i];
if (node.Level > level && !node.IsHidden)
{
Indent();
}
var changed = node.Render(rect, Indentation, selectedNode == node, FolderStyle, TreeNodeStyle, ActiveTreeNodeStyle);
if (node.IsFolder && changed)
{
// toggle visibility for all the nodes under this one
ToggleNodeVisibility(i, node);
}
if (node.Level < level)
{
for (; node.Level > level && indents.Count > 1; level--)
{
Unindent();
}
}
level = node.Level;
if (!node.IsHidden)
{
RequiresRepaint = HandleInput(rect, node, i, singleClick, doubleClick);
rect.y += ItemHeight + ItemSpacing;
}
}
Unindent();
foldersKeys = Folders.Keys.Cast<string>().ToList();
return rect;
}
public void Focus()
{
bool selectionChanged = false;
if (Event.current.type == EventType.KeyDown)
{
int directionY = Event.current.keyCode == KeyCode.UpArrow ? -1 : Event.current.keyCode == KeyCode.DownArrow ? 1 : 0;
int directionX = Event.current.keyCode == KeyCode.LeftArrow ? -1 : Event.current.keyCode == KeyCode.RightArrow ? 1 : 0;
if (directionY != 0 || directionX != 0)
{
if (directionY < 0 || directionY < 0)
{
SelectedNode = nodes[nodes.Count - 1];
selectionChanged = true;
Event.current.Use();
}
else if (directionY > 0 || directionX > 0)
{
SelectedNode = nodes[0];
selectionChanged = true;
Event.current.Use();
}
}
}
RequiresRepaint = selectionChanged; |
<<<<<<<
=======
if (Repository != null)
{
Repository.CheckBranchCacheEvent(branchUpdateEvent);
}
>>>>>>>
if (Repository != null)
{
Repository.CheckBranchCacheEvent(branchUpdateEvent);
}
<<<<<<<
public override void OnGUI()
{
Render();
=======
repository.BranchCacheUpdated += Repository_BranchCacheUpdated;
>>>>>>>
public override void OnGUI()
{
Render();
<<<<<<<
public void Focus()
{
bool selectionChanged = false;
if (Event.current.type == EventType.KeyDown)
{
int directionY = Event.current.keyCode == KeyCode.UpArrow ? -1 : Event.current.keyCode == KeyCode.DownArrow ? 1 : 0;
int directionX = Event.current.keyCode == KeyCode.LeftArrow ? -1 : Event.current.keyCode == KeyCode.RightArrow ? 1 : 0;
if (directionY != 0 || directionX != 0)
{
if (directionY < 0 || directionY < 0)
=======
if (localBranches.Any(localBranch => localBranch.Name == branchName))
>>>>>>>
public void Focus()
{
bool selectionChanged = false;
if (Event.current.type == EventType.KeyDown)
{
int directionY = Event.current.keyCode == KeyCode.UpArrow ? -1 : Event.current.keyCode == KeyCode.DownArrow ? 1 : 0;
int directionX = Event.current.keyCode == KeyCode.LeftArrow ? -1 : Event.current.keyCode == KeyCode.RightArrow ? 1 : 0;
if (directionY != 0 || directionX != 0)
{
if (directionY < 0 || directionY < 0) |
<<<<<<<
modifiedStatusIcon,
addedStatusIcon,
deletedStatusIcon,
renamedStatusIcon,
=======
activeBranchIcon,
trackingBranchIcon,
favouriteIconOn,
favouriteIconOff,
>>>>>>>
modifiedStatusIcon,
addedStatusIcon,
deletedStatusIcon,
renamedStatusIcon,
activeBranchIcon,
trackingBranchIcon,
favouriteIconOn,
favouriteIconOff, |
<<<<<<<
event Action<string> OnActiveBranchChanged;
event Action<ConfigRemote?> OnActiveRemoteChanged;
event Action<string> OnHeadChanged;
=======
event Action OnActiveBranchChanged;
event Action OnActiveRemoteChanged;
event Action OnRemoteBranchListChanged;
event Action OnLocalBranchListChanged;
event Action<GitStatus> OnStatusUpdated;
event Action OnHeadChanged;
>>>>>>>
event Action<string> OnActiveBranchChanged;
event Action<ConfigRemote?> OnActiveRemoteChanged;
<<<<<<<
public event Action<string> OnActiveBranchChanged;
public event Action<ConfigRemote?> OnActiveRemoteChanged;
public event Action<string> OnHeadChanged;
=======
public event Action OnActiveBranchChanged;
public event Action OnActiveRemoteChanged;
public event Action OnRemoteBranchListChanged;
public event Action OnLocalBranchListChanged;
public event Action<GitStatus> OnStatusUpdated;
public event Action OnHeadChanged;
>>>>>>>
public event Action<string> OnActiveBranchChanged;
public event Action<ConfigRemote?> OnActiveRemoteChanged;
public event Action OnHeadChanged;
<<<<<<<
SetupConfig(repositoryPaths);
SetupWatcher();
const int debounceTimeout = 0;
this.repositoryUpdateCallback = debounceTimeout == 0 ?
OnRepositoryUpdatedHandler
: TaskExtensions.Debounce(OnRepositoryUpdatedHandler, debounceTimeout);
=======
config = gitConfig;
watcher = repositoryWatcher;
watcher.HeadChanged += Watcher_OnHeadChanged;
watcher.IndexChanged += Watcher_OnIndexChanged;
watcher.ConfigChanged += Watcher_OnConfigChanged;
watcher.LocalBranchChanged += Watcher_OnLocalBranchChanged;
watcher.LocalBranchCreated += Watcher_OnLocalBranchCreated;
watcher.LocalBranchDeleted += Watcher_OnLocalBranchDeleted;
watcher.RepositoryChanged += Watcher_OnRepositoryChanged;
watcher.RemoteBranchCreated += Watcher_OnRemoteBranchCreated;
watcher.RemoteBranchDeleted += Watcher_OnRemoteBranchDeleted;
var remote = config.GetRemote("origin");
if (!remote.HasValue)
remote = config.GetRemotes()
.Where(x => HostAddress.Create(new UriString(x.Url).ToRepositoryUri()).IsGitHubDotCom())
.FirstOrDefault();
UriString cloneUrl = "";
if (remote.Value.Url != null)
{
cloneUrl = new UriString(remote.Value.Url).ToRepositoryUrl();
}
repository = new Repository(gitClient, this, repositoryPaths.RepositoryPath.FileName, cloneUrl,
repositoryPaths.RepositoryPath);
>>>>>>>
SetupConfig(repositoryPaths);
SetupWatcher();
<<<<<<<
Logger.Trace($"HeadChanged {contents}");
=======
Logger.Trace("Watcher_OnHeadChanged");
>>>>>>>
Logger.Trace("Watcher_OnHeadChanged");
<<<<<<<
OnHeadChanged?.Invoke(head);
OnRepositoryUpdatedHandler();
=======
OnHeadChanged?.Invoke();
UpdateGitStatus();
>>>>>>>
OnHeadChanged?.Invoke();
UpdateGitStatus();
<<<<<<<
OnActiveBranchChanged?.Invoke(name);
OnRepositoryUpdatedHandler();
=======
OnActiveBranchChanged?.Invoke();
UpdateGitStatus();
>>>>>>>
OnActiveBranchChanged?.Invoke(name);
UpdateGitStatus(); |
<<<<<<<
IProcessManager processManager = null, ITaskManager taskManager = null, NPath nodeJsExecutablePath = null, NPath octorunScript = null)
=======
string authorizationNote = null,
string fingerprint = null,
IProcessManager processManager = null, ITaskManager taskManager = null, NPath? nodeJsExecutablePath = null, NPath? octorunScript = null)
>>>>>>>
IProcessManager processManager = null, ITaskManager taskManager = null, NPath? nodeJsExecutablePath = null, NPath? octorunScript = null)
<<<<<<<
var loginTask = new OctorunTask(taskManager.Token, nodeJsExecutablePath, octorunScript,
=======
if (!nodeJsExecutablePath.HasValue)
{
throw new InvalidOperationException("nodeJsExecutablePath must be set");
}
if (!octorunScript.HasValue)
{
throw new InvalidOperationException("octorunScript must be set");
}
ApplicationAuthorization auth;
var loginTask = new OctorunTask(taskManager.Token, nodeJsExecutablePath.Value, octorunScript.Value,
>>>>>>>
if (!nodeJsExecutablePath.HasValue)
{
throw new InvalidOperationException("nodeJsExecutablePath must be set");
}
if (!octorunScript.HasValue)
{
throw new InvalidOperationException("octorunScript must be set");
}
var loginTask = new OctorunTask(taskManager.Token, nodeJsExecutablePath.Value, octorunScript.Value,
<<<<<<<
var loginTask = new OctorunTask(taskManager.Token, nodeJsExecutablePath, octorunScript,
=======
ApplicationAuthorization auth;
var loginTask = new OctorunTask(taskManager.Token, nodeJsExecutablePath.Value, octorunScript.Value,
>>>>>>>
var loginTask = new OctorunTask(taskManager.Token, nodeJsExecutablePath.Value, octorunScript.Value, |
<<<<<<<
[SerializeField] private CacheUpdateEvent lastStatusChangedEvent;
[SerializeField] private ChangesTree treeChanges;
[SerializeField] private List<GitStatusEntry> gitStatusEntries;
=======
[SerializeField] private CacheUpdateEvent lastStatusEntriesChangedEvent;
[SerializeField] private ChangesetTreeView tree = new ChangesetTreeView();
public override void InitializeView(IView parent)
{
base.InitializeView(parent);
tree.InitializeView(this);
}
>>>>>>>
[SerializeField] private CacheUpdateEvent lastStatusEntriesChangedEvent;
[SerializeField] private ChangesTree treeChanges;
[SerializeField] private List<GitStatusEntry> gitStatusEntries;
<<<<<<<
Repository.CheckCurrentBranchChangedEvent(lastCurrentBranchChangedEvent);
Repository.CheckStatusChangedEvent(lastStatusChangedEvent);
=======
Repository.CheckCurrentBranchChangedEvent(lastCurrentBranchChangedEvent);
Repository.CheckStatusEntriesChangedEvent(lastStatusEntriesChangedEvent);
>>>>>>>
Repository.CheckCurrentBranchChangedEvent(lastCurrentBranchChangedEvent);
Repository.CheckStatusEntriesChangedEvent(lastStatusEntriesChangedEvent);
<<<<<<<
private void OnTreeGUI(Rect rect)
{
var initialRect = rect;
if (treeChanges.FolderStyle == null)
{
treeChanges.FolderStyle = Styles.Foldout;
treeChanges.TreeNodeStyle = Styles.TreeNode;
treeChanges.ActiveTreeNodeStyle = Styles.TreeNodeActive;
}
rect = treeChanges.Render(rect, scroll,
node => { },
node => {
},
node => {
});
if (treeChanges.RequiresRepaint)
Redraw();
GUILayout.Space(rect.y - initialRect.y);
}
private void RepositoryOnStatusChanged(CacheUpdateEvent cacheUpdateEvent)
=======
private void RepositoryOnStatusEntriesChanged(CacheUpdateEvent cacheUpdateEvent)
>>>>>>>
private void OnTreeGUI(Rect rect)
{
var initialRect = rect;
if (treeChanges.FolderStyle == null)
{
treeChanges.FolderStyle = Styles.Foldout;
treeChanges.TreeNodeStyle = Styles.TreeNode;
treeChanges.ActiveTreeNodeStyle = Styles.TreeNodeActive;
}
rect = treeChanges.Render(rect, scroll,
node => { },
node => {
},
node => {
});
if (treeChanges.RequiresRepaint)
Redraw();
GUILayout.Space(rect.y - initialRect.y);
}
private void RepositoryOnStatusEntriesChanged(CacheUpdateEvent cacheUpdateEvent)
<<<<<<<
currentStatusHasUpdate = false;
gitStatusEntries = Repository.CurrentChanges;
BuildTree();
}
}
private void BuildTree()
{
if (treeChanges == null)
{
treeChanges = new ChangesTree();
treeChanges.Title = "Changes";
treeChanges.DisplayRootNode = false;
treeChanges.IsCheckable = true;
treeChanges.PathSeparator = Environment.FileSystem.DirectorySeparatorChar.ToString();
UpdateTreeIcons();
}
TreeLoader.Load(treeChanges, gitStatusEntries.Where(x => x.Status != GitFileStatus.Ignored).Select(entry => new GitStatusEntryTreeData(entry)).Cast<ITreeData>());
Redraw();
}
private void UpdateTreeIcons()
{
if (treeChanges != null)
{
treeChanges.UpdateIcons(Styles.ActiveBranchIcon, Styles.BranchIcon, Styles.FolderIcon, Styles.GlobeIcon);
=======
currentStatusEntriesHasUpdate = false;
var entries = Repository.CurrentChanges;
tree.UpdateEntries(entries.Where(x => x.Status != GitFileStatus.Ignored).ToList());
>>>>>>>
currentStatusEntriesHasUpdate = false;
gitStatusEntries = Repository.CurrentChanges;
BuildTree();
}
}
private void BuildTree()
{
if (treeChanges == null)
{
treeChanges = new ChangesTree();
treeChanges.Title = "Changes";
treeChanges.DisplayRootNode = false;
treeChanges.IsCheckable = true;
treeChanges.PathSeparator = Environment.FileSystem.DirectorySeparatorChar.ToString();
UpdateTreeIcons();
}
TreeLoader.Load(treeChanges, gitStatusEntries.Where(x => x.Status != GitFileStatus.Ignored).Select(entry => new GitStatusEntryTreeData(entry)).Cast<ITreeData>());
Redraw();
}
private void UpdateTreeIcons()
{
if (treeChanges != null)
{
treeChanges.UpdateIcons(Styles.ActiveBranchIcon, Styles.BranchIcon, Styles.FolderIcon, Styles.GlobeIcon); |
<<<<<<<
psi.EnvironmentVariables.Add("OCTOKIT_USER_AGENT", $"{ApplicationInfo.ApplicationSafeName}/{ApplicationInfo.Version}");
=======
psi.WorkingDirectory = pathToOctorunJs.Parent.Parent;
>>>>>>>
psi.WorkingDirectory = pathToOctorunJs.Parent.Parent;
psi.EnvironmentVariables.Add("OCTOKIT_USER_AGENT", $"{ApplicationInfo.ApplicationSafeName}/{ApplicationInfo.Version}"); |
<<<<<<<
public override bool IsBusy
{
get { return isBusy || userSettingsView.IsBusy || gitPathView.IsBusy; }
}
public override void Refresh()
{
base.Refresh();
userSettingsView.Refresh();
gitPathView.Refresh();
}
=======
>>>>>>>
public override void Refresh()
{
base.Refresh();
userSettingsView.Refresh();
gitPathView.Refresh();
} |
<<<<<<<
string cacheDir = PathManager.Inst.GetCachePath(project.FilePath);
string[] cacheFiles = Directory.EnumerateFiles(cacheDir).ToArray();
=======
>>>>>>>
string cacheDir = PathManager.Inst.GetCachePath(project.FilePath);
string[] cacheFiles = Directory.EnumerateFiles(cacheDir).ToArray();
<<<<<<<
string cachefile = Path.Combine(cacheDir, string.Format("{0:x}.wav", item.HashParameters()));
if (!cacheFiles.Contains(cachefile))
{
System.Diagnostics.Debug.WriteLine("Sound {0:x} not found in cache, resampling {1}", item.HashParameters(), item.GetResamplerExeArgs());
ProcessStartInfo pinfo = new ProcessStartInfo(
PathManager.Inst.GetTool1Path(),
string.Format("{0} {1} {2}", item.RawFile, cachefile, item.GetResamplerExeArgs()));
pinfo.CreateNoWindow = true;
pinfo.UseShellExecute = false;
var p = Process.Start(pinfo);
p.WaitForExit();
}
else System.Diagnostics.Debug.WriteLine("Sound {0:x} found on disk {1}", item.HashParameters(), item.GetResamplerExeArgs());
sound = new CachedSound(cachefile);
=======
System.Diagnostics.Debug.WriteLine("Sound {0:x} resampling {1}", item.HashParameters(), item.GetResamplerExeArgs());
DriverModels.EngineInput engineArgs=DriverModels.CreateInputModel(item,0);
System.IO.Stream output=engine.DoResampler(engineArgs);
sound = new CachedSound(output);
>>>>>>>
string cachefile = Path.Combine(cacheDir, string.Format("{0:x}.wav", item.HashParameters()));
if (!cacheFiles.Contains(cachefile))
{
System.Diagnostics.Debug.WriteLine("Sound {0:x} resampling {1}", item.HashParameters(), item.GetResamplerExeArgs());
DriverModels.EngineInput engineArgs = DriverModels.CreateInputModel(item, 0);
System.IO.Stream output = engine.DoResampler(engineArgs);
sound = new CachedSound(output);
}
else
{
System.Diagnostics.Debug.WriteLine("Sound {0:x} found on disk {1}", item.HashParameters(), item.GetResamplerExeArgs());
sound = new CachedSound(cachefile);
}
<<<<<<<
private string BuildPitchArgs(UPhoneme phoneme, UVoicePart part, UProject project)
{
return string.Format("!{0} {1}", project.BPM, OpenUtau.Core.Util.Base64.Base64EncodeInt12(BuildPitchData(phoneme, part, project).ToArray()));
}
=======
>>>>>>>
<<<<<<<
=======
>>>>>>> |
<<<<<<<
Logger.Trace("Deleting tempZipPath:\"{0}\"", tempZipExtractPath);
tempZipExtractPath.DeleteIfExists();
})
.Finally((b, exception) => {
=======
Logger.Trace("Deleting targetGitLfsExecPath:\"{0}\"", targetGitLfsExecPath);
targetGitLfsExecPath.DeleteIfExists();
Logger.Trace("Deleting tempZipPath:\"{0}\"", tempZipPath);
tempZipPath.DeleteIfExists();
}).Finally((b, exception) => {
>>>>>>>
Logger.Trace("Deleting targetGitLfsExecPath:\"{0}\"", targetGitLfsExecPath);
targetGitLfsExecPath.DeleteIfExists();
Logger.Trace("Deleting tempZipPath:\"{0}\"", tempZipExtractPath);
tempZipExtractPath.DeleteIfExists();
})
.Finally((b, exception) => { |
<<<<<<<
rect = treeChanges.Render(initialRect, rect, treeScroll,
=======
var treeRenderRect = treeChanges.Render(rect, scroll,
node => { },
>>>>>>>
var treeRenderRect = treeChanges.Render(rect, treeScroll,
node => { }, |
<<<<<<<
using GitHub.Logging;
=======
using System.Runtime.Serialization;
>>>>>>>
using GitHub.Logging;
using System.Runtime.Serialization; |
<<<<<<<
"{0} {1:D} {2} {3} {4:D} {5} {6} {7:D} {8:D} {9}",
=======
"{0} {1:D} {2} {3:D} {4:D} {5:D} {6:D} {7:D} {8:D} {9} {10}",
>>>>>>>
"{0} {1:D} {2} {3} {4:D} {5} {6} {7:D} {8:D} {9} {10}", |
<<<<<<<
var gitExecutablePath = SystemSettings.Get(Constants.GitInstallPathKey)?.ToNPath();
if (gitExecutablePath != null && gitExecutablePath.FileExists()) // we have a git path
=======
var gitExecutablePath = SystemSettings.Get(Constants.GitInstallPathKey)?.ToNPath();
if (gitExecutablePath != null && gitExecutablePath.Value.FileExists()) // we have a git path
>>>>>>>
var gitExecutablePath = SystemSettings.Get(Constants.GitInstallPathKey)?.ToNPath();
if (gitExecutablePath != null && gitExecutablePath.Value.FileExists()) // we have a git path
<<<<<<<
isBusy = true;
var initEnvironmentTask = new ActionTask<NPath>(CancellationToken,
(b, path) => InitializeEnvironment(path)) { Affinity = TaskAffinity.UI };
=======
var initEnvironmentTask = new ActionTask<NPath>(CancellationToken, (_, path) => InitializeEnvironment(path)) { Affinity = TaskAffinity.UI };
>>>>>>>
isBusy = true;
var initEnvironmentTask = new ActionTask<NPath>(CancellationToken,
(b, path) => InitializeEnvironment(path)) { Affinity = TaskAffinity.UI };
<<<<<<<
//Logger.Trace("FindExecTask Success: {0}", path);
InitializeEnvironment(gitExecutablePath);
=======
Logger.Trace("FindExecTask Success: {0}", path);
InitializeEnvironment(path);
>>>>>>>
//Logger.Trace("FindExecTask Success: {0}", path);
InitializeEnvironment(path);
<<<<<<<
thisTask.Then(afterGitSetup);
};
task = credHelperTask;
=======
{
Logger.Warning("No Windows CredentialHelper found: Setting to wincred");
GitClient.SetConfig("credential.helper", "wincred", GitConfigSource.Global)
.Then(afterGitSetup)
.Start();
}
})
.Start();
}
else
{
afterGitSetup.Start();
>>>>>>>
thisTask.Then(afterGitSetup);
};
task = credHelperTask; |
<<<<<<<
public static IFileSystem FileSystem { get { return Environment.FileSystem; } }
public static IProcessEnvironment GitEnvironment { get { return ApplicationManager.GitEnvironment; } }
public static IUsageTracker UsageTracker { get { return ApplicationManager.UsageTracker; } }
public static IPlatform Platform { get { return ApplicationManager.Platform; } }
public static ICredentialManager CredentialManager { get { return Platform.CredentialManager; } }
public static IKeychain Keychain { get { return Platform.Keychain; } }
public static IProcessManager ProcessManager { get { return ApplicationManager.ProcessManager; } }
public static GitObjectFactory GitObjectFactory { get { return new GitObjectFactory(Environment); } }
public static ISettings LocalSettings { get { return ApplicationManager.LocalSettings; } }
public static ISettings UserSettings { get { return ApplicationManager.UserSettings; } }
public static ISettings SystemSettings { get { return ApplicationManager.SystemSettings; } }
public static ITaskResultDispatcher TaskResultDispatcher { get { return ApplicationManager.MainThreadResultDispatcher; } }
public static bool Initialized { get; private set; }
=======
>>>>>>>
public static IUsageTracker UsageTracker { get { return ApplicationManager.UsageTracker; } } |
<<<<<<<
private const string PublishViewCreateButton = "Create";
private const string SelectedOwnerLabel = "Owner";
private const string RepositoryNameLabel = "Repository Name";
private const string DescriptionLabel = "Description";
private const string CreatePrivateRepositoryLabel = "Create as a private repository";
=======
private const string PublishViewCreateButton = "Publish";
private const string OwnersDefaultText = "Select a user or org";
>>>>>>>
private const string PublishViewCreateButton = "Publish";
private const string OwnersDefaultText = "Select a user or org";
private const string SelectedOwnerLabel = "Owner";
private const string RepositoryNameLabel = "Repository Name";
private const string DescriptionLabel = "Description";
private const string CreatePrivateRepositoryLabel = "Create as a private repository";
<<<<<<<
selectedOwner = EditorGUILayout.Popup(0, owners);
}
GUILayout.EndVertical();
=======
GUI.enabled = !isBusy;
selectedOwner = EditorGUILayout.Popup(selectedOwner, owners);
GUI.enabled = true;
}
GUILayout.EndVertical();
>>>>>>>
selectedOwner = EditorGUILayout.Popup(selectedOwner, owners);
}
GUILayout.EndVertical();
<<<<<<<
=======
GUI.enabled = !string.IsNullOrEmpty(repoName) && !isBusy && selectedOwner != 0;
if (GUILayout.Button(PublishViewCreateButton))
{
isBusy = true;
>>>>>>> |
<<<<<<<
DateTimeOffset dt;
if (!DateTimeOffset.TryParseExact(firstRunAtString, Constants.Iso8601Format,
CultureInfo.InvariantCulture, DateTimeStyles.None, out dt))
{
dt = DateTimeOffset.Now;
}
FirstRunAt = dt;
=======
firstRunAtValue = DateTimeOffset.ParseExact(firstRunAtString, Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.None);
>>>>>>>
DateTimeOffset dt;
if (!DateTimeOffset.TryParseExact(firstRunAtString, Constants.Iso8601Formats,
CultureInfo.InvariantCulture, DateTimeStyles.None, out dt))
{
dt = DateTimeOffset.Now;
}
FirstRunAt = dt; |
<<<<<<<
private const string PublishButton = "Publish";
=======
private const string FetchActionTitle = "Fetch Changes";
private const string FetchButtonText = "Fetch";
private const string FetchFailureDescription = "Could not fetch changes";
>>>>>>>
private const string PublishButton = "Publish";
private const string FetchActionTitle = "Fetch Changes";
private const string FetchButtonText = "Fetch";
private const string FetchFailureDescription = "Could not fetch changes"; |
<<<<<<<
private const string GitInstallBrowseTitle = "Select git binary";
private const string GitInstallPickInvalidTitle = "Invalid Git install";
private const string GitInstallPickInvalidMessage = "The selected file is not a valid Git install. {0}";
private const string GitInstallPickInvalidOK = "OK";
private const string GitInstallFindButton = "Find install";
=======
private const string GitConfigTitle = "Git Configuration";
private const string GitConfigNameLabel = "Name";
private const string GitConfigEmailLabel = "Email";
private const string GitConfigUserSave = "Save User";
>>>>>>>
<<<<<<<
userSettingsView.OnEnable();
=======
gitPathView.OnEnable();
>>>>>>>
gitPathView.OnEnable();
userSettingsView.OnEnable();
<<<<<<<
userSettingsView.OnDisable();
=======
gitPathView.OnDisable();
>>>>>>>
gitPathView.OnDisable();
userSettingsView.OnDisable();
<<<<<<<
userSettingsView.OnDataUpdate();
=======
if (gitPathView != null)
{
gitPathView.OnDataUpdate();
}
>>>>>>>
userSettingsView.OnDataUpdate();
gitPathView.OnDataUpdate();
<<<<<<<
userSettingsView.OnRepositoryChanged(oldRepository);
=======
gitPathView.OnRepositoryChanged(oldRepository);
>>>>>>>
gitPathView.OnRepositoryChanged(oldRepository);
userSettingsView.OnRepositoryChanged(oldRepository);
<<<<<<<
userSettingsView.Refresh();
=======
gitPathView.Refresh();
>>>>>>>
gitPathView.Refresh();
userSettingsView.Refresh();
<<<<<<<
=======
{
if ((cachedUser == null || String.IsNullOrEmpty(cachedUser.Name)) && GitClient != null)
{
var user = new User();
GitClient.GetConfig("user.name", GitConfigSource.User)
.Then((success, value) => user.Name = value).Then(
GitClient.GetConfig("user.email", GitConfigSource.User)
.Then((success, value) => user.Email = value))
.FinallyInUI((success, ex) =>
{
if (success && !String.IsNullOrEmpty(user.Name))
{
cachedUser = user;
userDataHasChanged = true;
Redraw();
}
})
.Start();
}
if (userDataHasChanged)
{
newGitName = gitName = cachedUser.Name;
newGitEmail = gitEmail = cachedUser.Email;
userDataHasChanged = false;
}
>>>>>>>
<<<<<<<
private void OnInstallPathGUI()
{
string gitExecPath = null;
string gitExecParentPath = null;
string extension = null;
if (Environment != null)
{
extension = Environment.ExecutableExtension;
if (Environment.IsWindows)
{
extension = extension.TrimStart('.');
}
if (Environment.GitExecutablePath != null)
{
gitExecPath = Environment.GitExecutablePath.ToString();
gitExecParentPath = Environment.GitExecutablePath.Parent.ToString();
}
if (gitExecParentPath == null)
{
gitExecParentPath = Environment.GitInstallPath;
}
}
// Install path
GUILayout.Label(GitInstallTitle, EditorStyles.boldLabel);
EditorGUI.BeginDisabledGroup(IsBusy || gitExecPath == null);
{
// Install path field
EditorGUI.BeginChangeCheck();
{
//TODO: Verify necessary value for a non Windows OS
Styles.PathField(ref gitExecPath,
() => EditorUtility.OpenFilePanel(GitInstallBrowseTitle,
gitExecParentPath,
extension), ValidateGitInstall);
}
if (EditorGUI.EndChangeCheck())
{
Logger.Trace("Setting GitExecPath: " + gitExecPath);
Manager.SystemSettings.Set(Constants.GitInstallPathKey, gitExecPath);
Environment.GitExecutablePath = gitExecPath.ToNPath();
}
GUILayout.Space(EditorGUIUtility.standardVerticalSpacing);
GUILayout.BeginHorizontal();
{
// Find button - for attempting to locate a new install
if (GUILayout.Button(GitInstallFindButton, GUILayout.ExpandWidth(false)))
{
GUI.FocusControl(null);
isBusy = true;
new ProcessTask<NPath>(Manager.CancellationToken, new FirstLineIsPathOutputProcessor())
.Configure(Manager.ProcessManager, Environment.IsWindows ? "where" : "which", "git")
.FinallyInUI((success, ex, path) =>
{
if (success)
{
Logger.Trace("FindGit Path:{0}", path);
}
else
{
if (ex != null)
{
Logger.Error(ex, "FindGit Error Path:{0}", path);
}
else
{
Logger.Error("FindGit Failed Path:{0}", path);
}
}
if (success)
{
Manager.SystemSettings.Set(Constants.GitInstallPathKey, path);
Environment.GitExecutablePath = path;
}
isBusy = false;
}).Start();
}
}
GUILayout.EndHorizontal();
}
EditorGUI.EndDisabledGroup();
}
=======
>>>>>>>
<<<<<<<
public override bool IsBusy
{
get { return isBusy || userSettingsView.IsBusy; }
}
=======
>>>>>>>
public override bool IsBusy
{
get { return isBusy || userSettingsView.IsBusy || gitPathView.IsBusy; }
} |
<<<<<<<
gitExecHasChanged = true;
=======
metricsHasChanged = true;
>>>>>>>
metricsHasChanged = true;
gitExecHasChanged = true;
<<<<<<<
=======
string gitExecPath = null;
string gitExecParentPath = null;
string extension = null;
if (Environment != null)
{
extension = Environment.ExecutableExtension;
if (Environment.IsWindows)
{
extension = extension.TrimStart('.');
}
if (Environment.GitExecutablePath != null)
{
gitExecPath = Environment.GitExecutablePath.ToString();
gitExecParentPath = Environment.GitExecutablePath.Parent.ToString();
}
if (gitExecParentPath == null)
{
gitExecParentPath = Environment.GitInstallPath;
}
}
>>>>>>>
<<<<<<<
GUILayout.BeginHorizontal();
{
newGitExec = EditorGUILayout.TextField(PathToGit, newGitExec);
if (GUILayout.Button(BrowseButton, EditorStyles.miniButton, GUILayout.Width(25)))
{
GUI.FocusControl(null);
var newValue = EditorUtility.OpenFilePanel(GitInstallBrowseTitle,
gitExecParent,
gitExecExtension);
=======
EditorGUI.BeginChangeCheck();
{
//TODO: Verify necessary value for a non Windows OS
Styles.PathField(ref gitExecPath,
() => EditorUtility.OpenFilePanel(GitInstallBrowseTitle,
gitExecParentPath,
extension), ValidateGitInstall);
}
if (EditorGUI.EndChangeCheck())
{
Logger.Trace("Setting GitExecPath: " + gitExecPath);
>>>>>>>
GUILayout.BeginHorizontal();
{
newGitExec = EditorGUILayout.TextField(PathToGit, newGitExec);
if (GUILayout.Button(BrowseButton, EditorStyles.miniButton, GUILayout.Width(25)))
{
GUI.FocusControl(null);
var newValue = EditorUtility.OpenFilePanel(GitInstallBrowseTitle,
gitExecParent,
gitExecExtension);
<<<<<<<
GUI.FocusControl(null);
var task = new ProcessTask<NPath>(Manager.CancellationToken, new FirstLineIsPathOutputProcessor())
=======
GUI.FocusControl(null);
isBusy = true;
new ProcessTask<NPath>(Manager.CancellationToken, new FirstLineIsPathOutputProcessor())
>>>>>>>
GUI.FocusControl(null);
isBusy = true;
new ProcessTask<NPath>(Manager.CancellationToken, new FirstLineIsPathOutputProcessor())
<<<<<<<
gitExecHasChanged = true;
=======
>>>>>>>
gitExecHasChanged = true; |
<<<<<<<
//TODO: This is removed in another branch anyway
//OnInstallPathGUI();
}
Styles.EndInitialStateArea();
return false;
}
=======
OnInstallPathGUI();
}
Styles.EndInitialStateArea();
return false;
}
>>>>>>>
}
Styles.EndInitialStateArea();
return false;
}
<<<<<<<
=======
private void OnInstallPathGUI()
{
// Install path
GUILayout.Label(GitInstallTitle, EditorStyles.boldLabel);
EditorGUI.BeginDisabledGroup(isBusy);
{
// Install path field
//EditorGUI.BeginChangeCheck();
{
GUILayout.BeginHorizontal();
{
newGitExec = EditorGUILayout.TextField(PathToGit, newGitExec);
if (GUILayout.Button(BrowseButton, EditorStyles.miniButton, GUILayout.Width(25)))
{
GUI.FocusControl(null);
var newValue = EditorUtility.OpenFilePanel(GitInstallBrowseTitle,
gitExecParent,
gitExecExtension);
if (!string.IsNullOrEmpty(newValue))
{
newGitExec = newValue;
}
}
}
GUILayout.EndHorizontal();
}
GUILayout.Space(EditorGUIUtility.standardVerticalSpacing);
GUILayout.BeginHorizontal();
{
var needsSaving = !string.IsNullOrEmpty(newGitExec)
&& newGitExec != gitExec
&& newGitExec.ToNPath().FileExists();
EditorGUI.BeginDisabledGroup(!needsSaving);
{
if (GUILayout.Button(GitPathSaveButton, GUILayout.ExpandWidth(false)))
{
Logger.Trace("Saving Git Path:{0}", newGitExec);
GUI.FocusControl(null);
Manager.SystemSettings.Set(Constants.GitInstallPathKey, newGitExec);
Environment.GitExecutablePath = newGitExec.ToNPath();
gitExecHasChanged = true;
}
}
EditorGUI.EndDisabledGroup();
//Find button - for attempting to locate a new install
if (GUILayout.Button(GitInstallFindButton, GUILayout.ExpandWidth(false)))
{
GUI.FocusControl(null);
var task = new ProcessTask<NPath>(Manager.CancellationToken, new FirstLineIsPathOutputProcessor())
.Configure(Manager.ProcessManager, Environment.IsWindows ? "where" : "which", "git")
.FinallyInUI((success, ex, path) =>
{
Logger.Trace("Find Git Completed Success:{0} Path:{1}", success, path);
if (success && !string.IsNullOrEmpty(path))
{
Manager.SystemSettings.Set(Constants.GitInstallPathKey, path);
Environment.GitExecutablePath = path;
gitExecHasChanged = true;
}
});
}
}
GUILayout.EndHorizontal();
}
EditorGUI.EndDisabledGroup();
}
>>>>>>> |
<<<<<<<
[SerializeField] public string title;
[SerializeField] public string pathSeparator = "/";
[SerializeField] public bool displayRootNode = true;
[SerializeField] public bool isCheckable = false;
[SerializeField] public GUIStyle FolderStyle;
[SerializeField] public GUIStyle TreeNodeStyle;
[SerializeField] public GUIStyle ActiveTreeNodeStyle;
=======
[NonSerialized] public GUIStyle FolderStyle;
[NonSerialized] public GUIStyle TreeNodeStyle;
[NonSerialized] public GUIStyle ActiveTreeNodeStyle;
>>>>>>>
[SerializeField] public string title;
[SerializeField] public string pathSeparator = "/";
[SerializeField] public bool displayRootNode = true;
[SerializeField] public bool isCheckable = false;
[NonSerialized] public GUIStyle FolderStyle;
[NonSerialized] public GUIStyle TreeNodeStyle;
[NonSerialized] public GUIStyle ActiveTreeNodeStyle;
<<<<<<<
=======
if (Event.current.type != EventType.Repaint)
{
if (rightClickNextRender != null)
{
rightClickNextRender.Invoke(rightClickNextRenderNode);
rightClickNextRender = null;
rightClickNextRenderNode = null;
}
}
Profiler.BeginSample("TreeControl");
bool visible = true;
var availableHeight = rect.y + rect.height;
>>>>>>>
if (Event.current.type != EventType.Repaint)
{
if (rightClickNextRender != null)
{
rightClickNextRender.Invoke(rightClickNextRenderNode);
rightClickNextRender = null;
rightClickNextRenderNode = null;
}
} |
<<<<<<<
=======
[NonSerialized] private bool userDataHasChanged;
[NonSerialized] private bool locksHaveChanged;
>>>>>>>
[NonSerialized] private bool locksHaveChanged; |
<<<<<<<
UInt160 issuer = SignatureContract.CreateSignatureRedeemScript(Issuer).ToScriptHash();
return base.GetScriptHashesForVerifying().Union(new[] { issuer }).OrderBy(p => p).ToArray();
=======
UInt160 issuer = Contract.CreateSignatureRedeemScript(Issuer).ToScriptHash();
return base.GetScriptHashesForVerifying().Union(new UInt160[] { issuer, Admin }).OrderBy(p => p).ToArray();
>>>>>>>
UInt160 issuer = Contract.CreateSignatureRedeemScript(Issuer).ToScriptHash();
return base.GetScriptHashesForVerifying().Union(new[] { issuer }).OrderBy(p => p).ToArray(); |
<<<<<<<
repositoryManager = initRepositoryManager;
repositoryManager.OnCurrentBranchUpdated += RepositoryManager_OnCurrentBranchUpdated;
repositoryManager.OnCurrentRemoteUpdated += RepositoryManager_OnCurrentRemoteUpdated;
repositoryManager.OnRepositoryUpdated += RepositoryManager_OnRepositoryUpdated;
=======
repositoryManager.OnCurrentBranchAndRemoteUpdated += RepositoryManager_OnCurrentBranchAndRemoteUpdated;
repositoryManager.OnStatusUpdated += status => CurrentStatus = status;
repositoryManager.OnLocksUpdated += locks => CurrentLocks = locks;
>>>>>>>
repositoryManager = initRepositoryManager;
repositoryManager.OnCurrentBranchAndRemoteUpdated += RepositoryManager_OnCurrentBranchAndRemoteUpdated;
repositoryManager.OnRepositoryUpdated += RepositoryManager_OnRepositoryUpdated;
<<<<<<<
private void CacheContainer_OnCacheUpdated(CacheType cacheType, DateTimeOffset offset)
{
var cacheUpdateEvent = new CacheUpdateEvent { UpdatedTimeString = offset.ToString() };
switch (cacheType)
{
case CacheType.BranchCache:
HandleBranchCacheUpdatedEvent(cacheUpdateEvent);
break;
case CacheType.GitLogCache:
HandleGitLogCacheUpdatedEvent(cacheUpdateEvent);
break;
case CacheType.GitStatusCache:
HandleGitStatusCacheUpdatedEvent(cacheUpdateEvent);
break;
case CacheType.GitLocksCache:
HandleGitLocksCacheUpdatedEvent(cacheUpdateEvent);
break;
case CacheType.GitUserCache:
break;
case CacheType.RepositoryInfoCache:
HandleRepositoryInfoCacheUpdatedEvent(cacheUpdateEvent);
break;
default:
throw new ArgumentOutOfRangeException(nameof(cacheType), cacheType, null);
}
}
private void HandleRepositoryInfoCacheUpdatedEvent(CacheUpdateEvent cacheUpdateEvent)
{
Logger.Trace("RepositoryInfoCache Updated {0}", cacheUpdateEvent.UpdatedTimeString);
CurrentBranchChanged?.Invoke(cacheUpdateEvent);
CurrentRemoteChanged?.Invoke(cacheUpdateEvent);
CurrentBranchAndRemoteChanged?.Invoke(cacheUpdateEvent);
}
private void HandleGitLocksCacheUpdatedEvent(CacheUpdateEvent cacheUpdateEvent)
{
Logger.Trace("GitLocksCache Updated {0}", cacheUpdateEvent.UpdatedTimeString);
LocksChanged?.Invoke(cacheUpdateEvent);
}
private void HandleGitStatusCacheUpdatedEvent(CacheUpdateEvent cacheUpdateEvent)
{
Logger.Trace("GitStatusCache Updated {0}", cacheUpdateEvent.UpdatedTimeString);
StatusChanged?.Invoke(cacheUpdateEvent);
}
private void HandleGitLogCacheUpdatedEvent(CacheUpdateEvent cacheUpdateEvent)
{
Logger.Trace("GitLogCache Updated {0}", cacheUpdateEvent.UpdatedTimeString);
LogChanged?.Invoke(cacheUpdateEvent);
}
private void HandleBranchCacheUpdatedEvent(CacheUpdateEvent cacheUpdateEvent)
{
Logger.Trace("BranchCache Updated {0}", cacheUpdateEvent.UpdatedTimeString);
LocalBranchListChanged?.Invoke(cacheUpdateEvent);
RemoteBranchListChanged?.Invoke(cacheUpdateEvent);
LocalAndRemoteBranchListChanged?.Invoke(cacheUpdateEvent);
}
private void RepositoryManager_OnCurrentRemoteUpdated(ConfigRemote? remote)
{
new ActionTask(CancellationToken.None, () => {
if (!Nullable.Equals(CurrentConfigRemote, remote))
{
CurrentConfigRemote = remote;
CurrentRemote = GetGitRemote(remote.Value);
UpdateRepositoryInfo();
}
}) { Affinity = TaskAffinity.UI }.Start();
}
private void RepositoryManager_OnRepositoryUpdated()
{
Logger.Trace("OnRepositoryUpdated");
UpdateGitStatus();
UpdateGitLog();
}
private void UpdateGitStatus()
{
repositoryManager?.Status()
.ThenInUI((b, status) => { CurrentStatus = status; })
.Start();
}
private void UpdateGitLog()
{
repositoryManager?.Log()
.ThenInUI((b, log) => { CurrentLog = log; })
.Start();
}
private void UpdateLocks()
=======
private void RepositoryManager_OnLocalBranchUpdated(string name)
>>>>>>>
private void CacheContainer_OnCacheUpdated(CacheType cacheType, DateTimeOffset offset)
{
var cacheUpdateEvent = new CacheUpdateEvent { UpdatedTimeString = offset.ToString() };
switch (cacheType)
{
case CacheType.BranchCache:
HandleBranchCacheUpdatedEvent(cacheUpdateEvent);
break;
case CacheType.GitLogCache:
HandleGitLogCacheUpdatedEvent(cacheUpdateEvent);
break;
case CacheType.GitStatusCache:
HandleGitStatusCacheUpdatedEvent(cacheUpdateEvent);
break;
case CacheType.GitLocksCache:
HandleGitLocksCacheUpdatedEvent(cacheUpdateEvent);
break;
case CacheType.GitUserCache:
break;
case CacheType.RepositoryInfoCache:
HandleRepositoryInfoCacheUpdatedEvent(cacheUpdateEvent);
break;
default:
throw new ArgumentOutOfRangeException(nameof(cacheType), cacheType, null);
}
}
private void HandleRepositoryInfoCacheUpdatedEvent(CacheUpdateEvent cacheUpdateEvent)
{
Logger.Trace("RepositoryInfoCache Updated {0}", cacheUpdateEvent.UpdatedTimeString);
CurrentBranchChanged?.Invoke(cacheUpdateEvent);
CurrentRemoteChanged?.Invoke(cacheUpdateEvent);
CurrentBranchAndRemoteChanged?.Invoke(cacheUpdateEvent);
}
private void HandleGitLocksCacheUpdatedEvent(CacheUpdateEvent cacheUpdateEvent)
{
Logger.Trace("GitLocksCache Updated {0}", cacheUpdateEvent.UpdatedTimeString);
LocksChanged?.Invoke(cacheUpdateEvent);
}
private void HandleGitStatusCacheUpdatedEvent(CacheUpdateEvent cacheUpdateEvent)
{
Logger.Trace("GitStatusCache Updated {0}", cacheUpdateEvent.UpdatedTimeString);
StatusChanged?.Invoke(cacheUpdateEvent);
}
private void HandleGitLogCacheUpdatedEvent(CacheUpdateEvent cacheUpdateEvent)
{
Logger.Trace("GitLogCache Updated {0}", cacheUpdateEvent.UpdatedTimeString);
LogChanged?.Invoke(cacheUpdateEvent);
}
private void HandleBranchCacheUpdatedEvent(CacheUpdateEvent cacheUpdateEvent)
{
Logger.Trace("BranchCache Updated {0}", cacheUpdateEvent.UpdatedTimeString);
LocalBranchListChanged?.Invoke(cacheUpdateEvent);
RemoteBranchListChanged?.Invoke(cacheUpdateEvent);
LocalAndRemoteBranchListChanged?.Invoke(cacheUpdateEvent);
}
private void RepositoryManager_OnRepositoryUpdated()
{
Logger.Trace("OnRepositoryUpdated");
UpdateGitStatus();
UpdateGitLog();
}
private void UpdateGitStatus()
{
repositoryManager?.Status()
.ThenInUI((b, status) => { CurrentStatus = status; })
.Start();
}
private void UpdateGitLog()
{
repositoryManager?.Log()
.ThenInUI((b, log) => { CurrentLog = log; })
.Start();
}
private void UpdateLocks()
<<<<<<<
new ActionTask(CancellationToken.None, () => {
cacheContainer.BranchCache.RemoveRemoteBranch(remote, name);
UpdateRemoteAndRemoteBranches();
}) { Affinity = TaskAffinity.UI }.Start();
=======
Dictionary<string, ConfigBranch> branchList;
if (remoteBranches.TryGetValue(remote, out branchList))
{
if (branchList.ContainsKey(name))
{
branchList.Remove(name);
Logger.Trace("OnRemoteBranchListChanged");
OnRemoteBranchListChanged?.Invoke();
}
else
{
Logger.Warning("Branch {0} is not found in Remote {1}", name, remote);
}
}
else
{
Logger.Warning("Remote {0} is not found", remote);
}
>>>>>>>
new ActionTask(CancellationToken.None, () => {
cacheContainer.BranchCache.RemoveRemoteBranch(remote, name);
UpdateRemoteAndRemoteBranches();
}) { Affinity = TaskAffinity.UI }.Start(); |
<<<<<<<
protected override void InitializeEnvironment()
=======
protected override string GetAssetsPath()
>>>>>>>
protected override string GetAssetsPath()
<<<<<<<
private Task SetupUserTracking()
{
var usagePath = System.Environment.GetFolderPath(System.Environment.SpecialFolder.LocalApplicationData)
.ToNPath().Combine(ApplicationInfo.ApplicationName, "github-unity-usage.json");
string userTrackingId;
if (!UserSettings.Exists("UserTrackingId"))
{
userTrackingId = Guid.NewGuid().ToString();
UserSettings.Set("UserTrackingId", userTrackingId);
}
else
{
userTrackingId = UserSettings.Get("UserTrackingId");
}
UsageTracker = new UsageTracker(usagePath, userTrackingId);
UsageTracker.Enabled = UserSettings.Get("UserTrackingEnabled", true);
if (ApplicationCache.Instance.FirstRun)
{
return UsageTracker.IncrementLaunchCount();
}
return CompletedTask.Default;
}
public override IEnvironment Environment
{
get
{
// if this is called while still null, it's because Unity wants
// to render something and we need to load icons, and that runs
// before EntryPoint. Do an early initialization
if (environment == null)
InitializeEnvironment();
return environment;
}
set { environment = value; }
}
=======
>>>>>>>
private Task SetupUserTracking()
{
var usagePath = System.Environment.GetFolderPath(System.Environment.SpecialFolder.LocalApplicationData)
.ToNPath().Combine(ApplicationInfo.ApplicationName, "github-unity-usage.json");
string userTrackingId;
if (!UserSettings.Exists("UserTrackingId"))
{
userTrackingId = Guid.NewGuid().ToString();
UserSettings.Set("UserTrackingId", userTrackingId);
}
else
{
userTrackingId = UserSettings.Get("UserTrackingId");
}
UsageTracker = new UsageTracker(usagePath, userTrackingId);
UsageTracker.Enabled = UserSettings.Get("UserTrackingEnabled", true);
if (ApplicationCache.Instance.FirstRun)
{
return UsageTracker.IncrementLaunchCount();
}
return CompletedTask.Default;
} |
<<<<<<<
=======
public ITask<List<GitLogEntry>> Log()
{
var task = GitClient.Log();
return HookupHandlers(task, false, false);
}
public ITask<GitStatus> Status()
{
var task = GitClient.Status();
return HookupHandlers(task, false);
}
>>>>>>>
<<<<<<<
=======
public ITask<List<GitLock>> ListLocks(bool local)
{
var task = GitClient.ListLocks(local);
HookupHandlers(task, false, false);
return task;
}
>>>>>>> |
<<<<<<<
private const float SpinnerAnimationDuration = 4f;
private const string FetchActionTitle = "Fetch Changes";
private const string FetchButtonText = "Fetch";
private const string FetchFailureDescription = "Could not fetch changes";
private const string PullButton = "Pull";
private const string PullButtonCount = "Pull (<b>{0}</b>)";
private const string PushButton = "Push";
private const string PushButtonCount = "Push (<b>{0}</b>)";
private const string PullConfirmTitle = "Pull Changes?";
private const string PullConfirmDescription = "Would you like to pull changes from remote '{0}'?";
private const string PullConfirmYes = "Pull";
private const string PullConfirmCancel = "Cancel";
private const string PushConfirmTitle = "Push Changes?";
private const string PushConfirmDescription = "Would you like to push changes to remote '{0}'?";
private const string PushConfirmYes = "Push";
private const string PushConfirmCancel = "Cancel";
private const string PublishButton = "Publish";
[NonSerialized] private bool currentBranchAndRemoteHasUpdate;
[NonSerialized] private bool currentTrackingStatusHasUpdate;
=======
>>>>>>>
private const string FetchActionTitle = "Fetch Changes";
private const string FetchButtonText = "Fetch";
private const string FetchFailureDescription = "Could not fetch changes";
private const string PullButton = "Pull";
private const string PullButtonCount = "Pull (<b>{0}</b>)";
private const string PushButton = "Push";
private const string PushButtonCount = "Push (<b>{0}</b>)";
private const string PullConfirmTitle = "Pull Changes?";
private const string PullConfirmDescription = "Would you like to pull changes from remote '{0}'?";
private const string PullConfirmYes = "Pull";
private const string PullConfirmCancel = "Cancel";
private const string PushConfirmTitle = "Push Changes?";
private const string PushConfirmDescription = "Would you like to push changes to remote '{0}'?";
private const string PushConfirmYes = "Push";
private const string PushConfirmCancel = "Cancel";
private const string PublishButton = "Publish";
[NonSerialized] private bool currentBranchAndRemoteHasUpdate;
[NonSerialized] private bool currentTrackingStatusHasUpdate; |
<<<<<<<
repositoryWatcher = new RepositoryWatcher(platform, repositoryPath, dotGitPath, dotGitIndex, dotGitHead, branchesPath, remotesPath, dotGitConfig);
repositoryWatcher.ConfigChanged += OnConfigChanged;
repositoryWatcher.HeadChanged += HeadChanged;
repositoryWatcher.IndexChanged += OnIndexChanged;
repositoryWatcher.LocalBranchCreated += OnLocalBranchCreated;
repositoryWatcher.LocalBranchDeleted += OnLocalBranchDeleted;
repositoryWatcher.RepositoryChanged += OnRepositoryUpdated;
repositoryWatcher.RemoteBranchCreated += OnRemoteBranchCreated;
repositoryWatcher.RemoteBranchDeleted += OnRemoteBranchDeleted;
processRunner = new RepositoryProcessRunner(platform.Environment, platform.ProcessManager,
platform.CredentialManager, platform.UIDispatcher,
cancellationToken);
=======
watcher = repositoryWatcher;
watcher.ConfigChanged += OnConfigChanged;
watcher.HeadChanged += HeadChanged;
watcher.IndexChanged += OnIndexChanged;
watcher.LocalBranchCreated += OnLocalBranchCreated;
watcher.LocalBranchDeleted += OnLocalBranchDeleted;
watcher.LocalBranchMoved += OnLocalBranchMoved;
watcher.RepositoryChanged += OnRepositoryUpdated;
watcher.RemoteBranchCreated += OnRemoteBranchCreated;
watcher.RemoteBranchChanged += OnRemoteBranchChanged;
watcher.RemoteBranchDeleted += OnRemoteBranchDeleted;
watcher.RemoteBranchRenamed += OnRemoteBranchRenamed;
>>>>>>>
watcher = repositoryWatcher;
watcher.ConfigChanged += OnConfigChanged;
watcher.HeadChanged += HeadChanged;
watcher.IndexChanged += OnIndexChanged;
watcher.LocalBranchCreated += OnLocalBranchCreated;
watcher.LocalBranchDeleted += OnLocalBranchDeleted;
watcher.RepositoryChanged += OnRepositoryUpdated;
watcher.RemoteBranchCreated += OnRemoteBranchCreated;
watcher.RemoteBranchDeleted += OnRemoteBranchDeleted; |
<<<<<<<
[SerializeField] public Rect Margin = new Rect();
[SerializeField] public Rect Padding = new Rect();
[SerializeField] public string title = string.Empty;
[SerializeField] public string pathSeparator = "/";
[SerializeField] public bool displayRootNode = true;
[SerializeField] public bool isCheckable = false;
=======
>>>>>>>
<<<<<<<
public override TNode SelectedNode
{
get
{
if (selectedNode != null && String.IsNullOrEmpty(selectedNode.Path))
selectedNode = null;
return selectedNode;
}
set
{
selectedNode = value;
if (value != null && selectionObject)
{
Selection.activeObject = selectionObject;
}
}
}
public override string Title
{
get { return title; }
set { title = value; }
}
public override bool DisplayRootNode
{
get { return displayRootNode; }
set { displayRootNode = value; }
}
public override bool IsCheckable
{
get { return isCheckable; }
set { isCheckable = value; }
}
public override string PathSeparator
{
get { return pathSeparator; }
set { pathSeparator = value; }
}
protected override List<TNode> Nodes
{
get { return nodes; }
}
=======
>>>>>>>
<<<<<<<
var isSelected = selectedNode == titleNode && treeHasFocus;
renderResult = titleNode.Render(rect, Styles.TreeIndentation, isSelected, FolderStyle, treeNodeStyle, activeTreeNodeStyle);
=======
renderResult = titleNode.Render(rect, Styles.TreeIndentation, SelectedNode == titleNode, FolderStyle, TreeNodeStyle, ActiveTreeNodeStyle);
>>>>>>>
renderResult = titleNode.Render(rect, Styles.TreeIndentation, SelectedNode == titleNode, FolderStyle, TreeNodeStyle, ActiveTreeNodeStyle);
<<<<<<<
var isSelected = selectedNode == node && treeHasFocus;
renderResult = node.Render(rect, Styles.TreeIndentation, isSelected, FolderStyle, treeNodeStyle, activeTreeNodeStyle);
=======
renderResult = node.Render(rect, Styles.TreeIndentation, SelectedNode == node, FolderStyle, TreeNodeStyle, ActiveTreeNodeStyle);
>>>>>>>
renderResult = node.Render(rect, Styles.TreeIndentation, SelectedNode == node, FolderStyle, TreeNodeStyle, ActiveTreeNodeStyle);
<<<<<<<
if (GUIUtility.keyboardControl == controlId && currentNode == selectedNode && Event.current.type == EventType.KeyDown)
=======
if (currentNode == SelectedNode && Event.current.type == EventType.KeyDown)
>>>>>>>
if (currentNode == SelectedNode && Event.current.type == EventType.KeyDown) |
<<<<<<<
IEnumerable<string> GetDirectories(string path);
=======
IEnumerable<string> GetDirectories(string path);
IEnumerable<string> GetDirectories(string path, string pattern, SearchOption searchOption);
>>>>>>>
IEnumerable<string> GetDirectories(string path);
IEnumerable<string> GetDirectories(string path, string pattern, SearchOption searchOption);
<<<<<<<
string GetRandomFileName();
void CreateDirectory(string path);
string ReadAllText(string path);
void DeleteAllFiles(string path);
=======
string ChangeExtension(string path, string extension);
string GetFileNameWithoutExtension(string fileName);
IEnumerable<string> GetFiles(string path, string pattern, SearchOption searchOption);
void WriteAllBytes(string path, byte[] bytes);
void CreateDirectory(string toString);
void FileCopy(string sourceFileName, string destFileName, bool overwrite);
void FileDelete(string path);
void DirectoryDelete(string path, bool recursive);
void FileMove(string sourceFileName, string s);
void DirectoryMove(string toString, string s);
string GetCurrentDirectory();
void WriteAllText(string path, string contents);
string ReadAllText(string path);
void WriteAllLines(string path, string[] contents);
string[] ReadAllLines(string path);
IEnumerable<string> GetDirectories(string path, string pattern);
char DirectorySeparatorChar { get; }
>>>>>>>
string GetRandomFileName();
void DeleteAllFiles(string path);
string ChangeExtension(string path, string extension);
string GetFileNameWithoutExtension(string fileName);
IEnumerable<string> GetFiles(string path, string pattern, SearchOption searchOption);
void WriteAllBytes(string path, byte[] bytes);
void CreateDirectory(string path);
void FileCopy(string sourceFileName, string destFileName, bool overwrite);
void FileDelete(string path);
void DirectoryDelete(string path, bool recursive);
void FileMove(string sourceFileName, string s);
void DirectoryMove(string toString, string s);
string GetCurrentDirectory();
void WriteAllText(string path, string contents);
string ReadAllText(string path);
void WriteAllLines(string path, string[] contents);
string[] ReadAllLines(string path);
IEnumerable<string> GetDirectories(string path, string pattern);
char DirectorySeparatorChar { get; } |
<<<<<<<
lockedFileRowSelectedStyle,
lockedFileRowStyle,
genericTableBoxStyle,
=======
historyDetailsTitleStyle,
historyDetailsMetaInfoStyle,
>>>>>>>
lockedFileRowSelectedStyle,
lockedFileRowStyle,
genericTableBoxStyle,
historyDetailsTitleStyle,
historyDetailsMetaInfoStyle,
<<<<<<<
public static GUIStyle LockedFileRowStyle
{
get
{
if (lockedFileRowStyle == null)
{
lockedFileRowStyle = new GUIStyle();
lockedFileRowStyle.name = "LockedFileRowStyle";
lockedFileRowStyle.padding = new RectOffset(2, 2, 1, 1);
}
return lockedFileRowStyle;
}
}
public static GUIStyle LockedFileRowSelectedStyle
{
get
{
if (lockedFileRowSelectedStyle == null)
{
GUIStyle hierarchyStyle = GUI.skin.FindStyle("PR Label");
lockedFileRowSelectedStyle = new GUIStyle(LockedFileRowStyle);
lockedFileRowSelectedStyle.name = "LockedFileRowSelectedStyle";
lockedFileRowSelectedStyle.normal.background = hierarchyStyle.onFocused.background;
lockedFileRowSelectedStyle.normal.textColor = hierarchyStyle.onFocused.textColor;
}
return lockedFileRowSelectedStyle;
}
}
public static GUIStyle GenericTableBoxStyle
{
get
{
if (genericTableBoxStyle == null)
{
genericTableBoxStyle = new GUIStyle(GUI.skin.box);
genericTableBoxStyle.name = "GenericTableBoxStyle";
}
return genericTableBoxStyle;
}
}
=======
public static GUIStyle HistoryDetailsTitleStyle
{
get
{
if (historyDetailsTitleStyle == null)
{
historyDetailsTitleStyle = new GUIStyle(EditorStyles.boldLabel);
historyDetailsTitleStyle.name = "HistoryDetailsTitleStyle";
historyDetailsTitleStyle.wordWrap = true;
}
return historyDetailsTitleStyle;
}
}
public static GUIStyle HistoryDetailsMetaInfoStyle
{
get
{
if (historyDetailsMetaInfoStyle == null)
{
historyDetailsMetaInfoStyle = new GUIStyle(EditorStyles.miniLabel);
historyDetailsMetaInfoStyle.name = "HistoryDetailsMetaInfoStyle";
historyDetailsMetaInfoStyle.normal.textColor = new Color(0f, 0f, 0f, 0.6f);
}
return historyDetailsMetaInfoStyle;
}
}
>>>>>>>
public static GUIStyle LockedFileRowStyle
{
get
{
if (lockedFileRowStyle == null)
{
lockedFileRowStyle = new GUIStyle();
lockedFileRowStyle.name = "LockedFileRowStyle";
lockedFileRowStyle.padding = new RectOffset(2, 2, 1, 1);
}
return lockedFileRowStyle;
}
}
public static GUIStyle LockedFileRowSelectedStyle
{
get
{
if (lockedFileRowSelectedStyle == null)
{
GUIStyle hierarchyStyle = GUI.skin.FindStyle("PR Label");
lockedFileRowSelectedStyle = new GUIStyle(LockedFileRowStyle);
lockedFileRowSelectedStyle.name = "LockedFileRowSelectedStyle";
lockedFileRowSelectedStyle.normal.background = hierarchyStyle.onFocused.background;
lockedFileRowSelectedStyle.normal.textColor = hierarchyStyle.onFocused.textColor;
}
return lockedFileRowSelectedStyle;
}
}
public static GUIStyle GenericTableBoxStyle
{
get
{
if (genericTableBoxStyle == null)
{
genericTableBoxStyle = new GUIStyle(GUI.skin.box);
genericTableBoxStyle.name = "GenericTableBoxStyle";
}
return genericTableBoxStyle;
}
}
public static GUIStyle HistoryDetailsTitleStyle
{
get
{
if (historyDetailsTitleStyle == null)
{
historyDetailsTitleStyle = new GUIStyle(EditorStyles.boldLabel);
historyDetailsTitleStyle.name = "HistoryDetailsTitleStyle";
historyDetailsTitleStyle.wordWrap = true;
}
return historyDetailsTitleStyle;
}
}
public static GUIStyle HistoryDetailsMetaInfoStyle
{
get
{
if (historyDetailsMetaInfoStyle == null)
{
historyDetailsMetaInfoStyle = new GUIStyle(EditorStyles.miniLabel);
historyDetailsMetaInfoStyle.name = "HistoryDetailsMetaInfoStyle";
historyDetailsMetaInfoStyle.normal.textColor = new Color(0f, 0f, 0f, 0.6f);
}
return historyDetailsMetaInfoStyle;
}
} |
<<<<<<<
const int chunkSize = 4096; // 4K is optimum
Copy(zipStream, streamWriter, chunkSize, zipEntry.Size, (totalRead, timeToFinish) =>
{
estimatedDuration = timeToFinish;
estimatedDurationProgress?.Report(estimatedDuration);
zipFileProgress?.Report((float)(totalBytes + totalRead) / zipEntry.Size);
return true;
}, 100);
cancellationToken.ThrowIfCancellationRequested();
=======
if (!Utils.Copy(zipStream, streamWriter, targetFile.Length, chunkSize,
progress: (totalRead, timeToFinish) => {
totalBytes += totalRead;
return onProgress(totalBytes, totalSize);
}))
return;
>>>>>>>
if (!Utils.Copy(zipStream, streamWriter, zipEntry.Size, chunkSize,
progress: (totalRead, timeToFinish) => {
totalBytes += totalRead;
return onProgress(totalBytes, totalSize);
}))
return; |
<<<<<<<
=======
repositoryManagerListener.Received().OnStatusUpdate(Args.GitStatus);
repositoryManagerListener.DidNotReceive().OnActiveBranchChanged(Arg.Any<ConfigBranch?>());
repositoryManagerListener.DidNotReceive().OnActiveRemoteChanged(Arg.Any<ConfigRemote?>());
repositoryManagerListener.DidNotReceive().OnLocalBranchListChanged();
repositoryManagerListener.DidNotReceive().OnRemoteBranchListChanged();
>>>>>>>
<<<<<<<
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
repositoryManagerListener.Received().OnStatusUpdated(Args.GitStatus);
=======
repositoryManagerListener.Received().OnStatusUpdate(Args.GitStatus);
repositoryManagerListener.DidNotReceive().OnActiveBranchChanged(Arg.Any<ConfigBranch?>());
repositoryManagerListener.DidNotReceive().OnActiveRemoteChanged(Arg.Any<ConfigRemote?>());
repositoryManagerListener.DidNotReceive().OnLocalBranchListChanged();
repositoryManagerListener.DidNotReceive().OnRemoteBranchListChanged();
repositoryManagerListener.ReceivedWithAnyArgs().OnIsBusyChanged(Args.Bool);
>>>>>>>
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
repositoryManagerListener.Received().OnStatusUpdated(Args.GitStatus);
<<<<<<<
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
repositoryManagerListener.DidNotReceive().OnStatusUpdated(Args.GitStatus);
=======
repositoryManagerListener.DidNotReceive().OnStatusUpdate(Args.GitStatus);
repositoryManagerListener.DidNotReceive().OnActiveBranchChanged(Arg.Any<ConfigBranch?>());
repositoryManagerListener.DidNotReceive().OnActiveRemoteChanged(Arg.Any<ConfigRemote?>());
repositoryManagerListener.Received(1).OnLocalBranchListChanged();
repositoryManagerListener.DidNotReceive().OnRemoteBranchListChanged();
repositoryManagerListener.ReceivedWithAnyArgs().OnIsBusyChanged(Args.Bool);
>>>>>>>
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
repositoryManagerListener.DidNotReceive().OnStatusUpdated(Args.GitStatus);
<<<<<<<
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
repositoryManagerListener.DidNotReceive().OnStatusUpdated(Args.GitStatus);
=======
repositoryManagerListener.DidNotReceive().OnStatusUpdate(Args.GitStatus);
repositoryManagerListener.DidNotReceive().OnActiveBranchChanged(Arg.Any<ConfigBranch?>());
repositoryManagerListener.DidNotReceive().OnActiveRemoteChanged(Arg.Any<ConfigRemote?>());
repositoryManagerListener.Received(1).OnLocalBranchListChanged();
repositoryManagerListener.DidNotReceive().OnRemoteBranchListChanged();
repositoryManagerListener.Received(2).OnIsBusyChanged(Args.Bool);
>>>>>>>
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
repositoryManagerListener.DidNotReceive().OnStatusUpdated(Args.GitStatus);
<<<<<<<
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
repositoryManagerListener.DidNotReceive().OnStatusUpdated(Args.GitStatus);
=======
repositoryManagerListener.DidNotReceive().OnStatusUpdate(Args.GitStatus);
repositoryManagerListener.Received().OnActiveBranchChanged(Arg.Any<ConfigBranch?>());
repositoryManagerListener.Received().OnActiveRemoteChanged(Arg.Any<ConfigRemote?>());
repositoryManagerListener.DidNotReceive().OnLocalBranchListChanged();
repositoryManagerListener.Received().OnRemoteBranchListChanged();
repositoryManagerListener.ReceivedWithAnyArgs().OnIsBusyChanged(Args.Bool);
>>>>>>>
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
repositoryManagerListener.DidNotReceive().OnStatusUpdated(Args.GitStatus);
<<<<<<<
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
repositoryManagerListener.DidNotReceive().OnStatusUpdated(Args.GitStatus);
=======
repositoryManagerListener.DidNotReceive().OnStatusUpdate(Args.GitStatus);
repositoryManagerListener.Received().OnActiveBranchChanged(Arg.Any<ConfigBranch?>());
repositoryManagerListener.Received().OnActiveRemoteChanged(Arg.Any<ConfigRemote?>());
repositoryManagerListener.DidNotReceive().OnLocalBranchListChanged();
repositoryManagerListener.DidNotReceive().OnRemoteBranchListChanged();
repositoryManagerListener.ReceivedWithAnyArgs().OnIsBusyChanged(Args.Bool);
>>>>>>>
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
repositoryManagerListener.DidNotReceive().OnStatusUpdated(Args.GitStatus);
<<<<<<<
repositoryManagerListener.DidNotReceive().OnStatusUpdated(Args.GitStatus);
=======
repositoryManagerListener.DidNotReceive().OnStatusUpdate(Args.GitStatus);
repositoryManagerListener.Received().OnActiveBranchChanged(Arg.Any<ConfigBranch?>());
repositoryManagerListener.Received().OnActiveRemoteChanged(Arg.Any<ConfigRemote?>());
repositoryManagerListener.Received().OnLocalBranchListChanged();
repositoryManagerListener.DidNotReceive().OnRemoteBranchListChanged();
>>>>>>>
repositoryManagerListener.DidNotReceive().OnStatusUpdated(Args.GitStatus);
<<<<<<<
repositoryManagerListener.DidNotReceive().OnStatusUpdated(Args.GitStatus);
=======
repositoryManagerListener.DidNotReceive().OnStatusUpdate(Args.GitStatus);
repositoryManagerListener.Received().OnActiveBranchChanged(Arg.Any<ConfigBranch?>());
repositoryManagerListener.Received().OnActiveRemoteChanged(Arg.Any<ConfigRemote?>());
repositoryManagerListener.DidNotReceive().OnLocalBranchListChanged();
repositoryManagerListener.DidNotReceive().OnRemoteBranchListChanged();
>>>>>>>
repositoryManagerListener.DidNotReceive().OnStatusUpdated(Args.GitStatus);
<<<<<<<
=======
repositoryManagerListener.Received().OnActiveBranchChanged(Arg.Any<ConfigBranch?>());
repositoryManagerListener.Received().OnActiveRemoteChanged(Arg.Any<ConfigRemote?>());
repositoryManagerListener.DidNotReceive().OnLocalBranchListChanged();
repositoryManagerListener.Received().OnRemoteBranchListChanged();
>>>>>>>
<<<<<<<
=======
repositoryManagerListener.Received().OnActiveBranchChanged(Arg.Any<ConfigBranch?>());
repositoryManagerListener.Received().OnActiveRemoteChanged(Arg.Any<ConfigRemote?>());
repositoryManagerListener.DidNotReceive().OnLocalBranchListChanged();
repositoryManagerListener.DidNotReceive().OnRemoteBranchListChanged();
>>>>>>>
<<<<<<<
=======
repositoryManagerListener.DidNotReceive().OnActiveBranchChanged(Arg.Any<ConfigBranch?>());
repositoryManagerListener.DidNotReceive().OnActiveRemoteChanged(Arg.Any<ConfigRemote?>());
repositoryManagerListener.DidNotReceive().OnLocalBranchListChanged();
repositoryManagerListener.DidNotReceive().OnRemoteBranchListChanged();
>>>>>>>
<<<<<<<
=======
repositoryManagerListener.DidNotReceive().OnActiveBranchChanged(Arg.Any<ConfigBranch?>());
repositoryManagerListener.DidNotReceive().OnActiveRemoteChanged(Arg.Any<ConfigRemote?>());
repositoryManagerListener.DidNotReceive().OnLocalBranchListChanged();
repositoryManagerListener.Received(2).OnRemoteBranchListChanged();
>>>>>>> |
<<<<<<<
private const string BadNotificationDelayError = "A delay of {0} is shorter than the default delay and thus would get pre-empted.";
private const string InitializeTitle = "Initialize";
private const string HistoryTitle = "History";
private const string ChangesTitle = "Changes";
private const string BranchesTitle = "Branches";
private const string LocksTitle = "Locks";
private const string SettingsTitle = "Settings";
private const string DefaultRepoUrl = "No remote configured";
private const string Window_RepoUrlTooltip = "Url of the {0} remote";
private const string Window_RepoNoUrlTooltip = "Add a remote in the Settings tab";
private const string Window_RepoBranchTooltip = "Active branch";
private const float SpinnerAnimationDuration = 4f;
=======
>>>>>>>
private const string LocksTitle = "Locks";
<<<<<<<
[SerializeField] private LocksView locksView = new LocksView();
[SerializeField] private string repoRemote;
[SerializeField] private string repoBranch;
[SerializeField] private string repoUrl;
[SerializeField] private GUIContent repoBranchContent;
[SerializeField] private GUIContent repoUrlContent;
=======
[SerializeField] private bool hasRemote;
[SerializeField] private string currentRemoteName;
[SerializeField] private string currentBranch;
[SerializeField] private string currentRemoteUrl;
[SerializeField] private int statusAhead;
[SerializeField] private int statusBehind;
[SerializeField] private bool hasItemsToCommit;
[SerializeField] private GUIContent currentBranchContent;
[SerializeField] private GUIContent currentRemoteUrlContent;
>>>>>>>
[SerializeField] private LocksView locksView = new LocksView();
[SerializeField] private bool hasRemote;
[SerializeField] private string currentRemoteName;
[SerializeField] private string currentBranch;
[SerializeField] private string currentRemoteUrl;
[SerializeField] private int statusAhead;
[SerializeField] private int statusBehind;
[SerializeField] private bool hasItemsToCommit;
[SerializeField] private GUIContent currentBranchContent;
[SerializeField] private GUIContent currentRemoteUrlContent;
<<<<<<<
changeTab = TabButton(SubTab.Changes, ChangesTitle, changeTab);
changeTab = TabButton(SubTab.History, HistoryTitle, changeTab);
changeTab = TabButton(SubTab.Branches, BranchesTitle, changeTab);
changeTab = TabButton(SubTab.Locks, LocksTitle, changeTab);
=======
changeTab = TabButton(SubTab.Changes, Localization.ChangesTitle, changeTab);
changeTab = TabButton(SubTab.History, Localization.HistoryTitle, changeTab);
changeTab = TabButton(SubTab.Branches, Localization.BranchesTitle, changeTab);
>>>>>>>
changeTab = TabButton(SubTab.Changes, Localization.ChangesTitle, changeTab);
changeTab = TabButton(SubTab.History, Localization.HistoryTitle, changeTab);
changeTab = TabButton(SubTab.Branches, Localization.BranchesTitle, changeTab);
changeTab = TabButton(SubTab.Locks, LocksTitle, changeTab); |
<<<<<<<
public void RemoteListTest()
{
var fileSystem = new FileSystem();
var environment = new DefaultEnvironment();
var gitEnvironment = environment.IsWindows
? (IGitEnvironment) new WindowsGitEnvironment(fileSystem, environment)
: new LinuxBasedGitEnvironment(fileSystem, environment);
var processManager = new ProcessManager(environment, gitEnvironment, fileSystem);
var gitRemotes = processManager.GetGitRemoteEntries(TestGitRepoPath);
gitRemotes.Should().BeEquivalentTo(new GitRemote()
{
Name = "origin",
URL = "https://github.com/EvilStanleyGoldman/IOTestsRepo.git",
Host = "github.com",
Function = GitRemoteFunction.Both
});
}
[Test]
=======
public void LogEntriesTest()
{
var fileSystem = new FileSystem();
var defaultEnvironment = new DefaultEnvironment();
var environment = Substitute.For<IEnvironment>();
environment.UnityProjectPath.Returns(TestGitRepoPath);
var gitEnvironment = defaultEnvironment.IsWindows
? (IGitEnvironment) new WindowsGitEnvironment(fileSystem, environment)
: new LinuxBasedGitEnvironment(fileSystem, environment);
var processManager = new ProcessManager(environment, gitEnvironment, fileSystem);
var logEntries =
processManager.GetGitLogEntries(TestGitRepoPath, environment, fileSystem, gitEnvironment, 2)
.ToArray();
logEntries.AssertEqual(new[]
{
new GitLogEntry
{
AuthorEmail = "[email protected]",
CommitEmail = "[email protected]",
AuthorName = "Author Person",
CommitName = "Author Person",
Changes = new List<GitStatusEntry>
{
new GitStatusEntry("Assets/TestDocument.txt",
TestGitRepoPath + "Assets/TestDocument.txt", null,
GitFileStatus.Renamed, "TestDocument.txt"),
},
CommitID = "018997938335742f8be694240a7c2b352ec0835f",
Description = "Moving project files where they should be kept",
Summary = "Moving project files where they should be kept",
Time = new DateTimeOffset(2017, 1, 27, 17, 19, 32, TimeSpan.FromHours(-5)),
CommitTime = new DateTimeOffset(2017, 1, 27, 17, 19, 32, TimeSpan.FromHours(-5)),
},
new GitLogEntry
{
AuthorEmail = "[email protected]",
CommitEmail = "[email protected]",
AuthorName = "Author Person",
CommitName = "Author Person",
Changes = new List<GitStatusEntry>
{
new GitStatusEntry("TestDocument.txt",
TestGitRepoPath + "TestDocument.txt", null,
GitFileStatus.Added),
},
CommitID = "03939ffb3eb8486dba0259b43db00842bbe6eca1",
Description = "Initial Commit",
Summary = "Initial Commit",
Time = new DateTimeOffset(2017, 1, 17, 11, 46, 16, TimeSpan.FromHours(-8)),
CommitTime = new DateTimeOffset(2017, 1, 17, 11, 46, 16, TimeSpan.FromHours(-8)),
},
});
}
[Test]
>>>>>>>
public void LogEntriesTest()
{
var fileSystem = new FileSystem();
var defaultEnvironment = new DefaultEnvironment();
var environment = Substitute.For<IEnvironment>();
environment.UnityProjectPath.Returns(TestGitRepoPath);
var gitEnvironment = defaultEnvironment.IsWindows
? (IGitEnvironment) new WindowsGitEnvironment(fileSystem, environment)
: new LinuxBasedGitEnvironment(fileSystem, environment);
var processManager = new ProcessManager(environment, gitEnvironment, fileSystem);
var logEntries =
processManager.GetGitLogEntries(TestGitRepoPath, environment, fileSystem, gitEnvironment, 2)
.ToArray();
logEntries.AssertEqual(new[]
{
new GitLogEntry
{
AuthorEmail = "[email protected]",
CommitEmail = "[email protected]",
AuthorName = "Author Person",
CommitName = "Author Person",
Changes = new List<GitStatusEntry>
{
new GitStatusEntry("Assets/TestDocument.txt",
TestGitRepoPath + "Assets/TestDocument.txt", null,
GitFileStatus.Renamed, "TestDocument.txt"),
},
CommitID = "018997938335742f8be694240a7c2b352ec0835f",
Description = "Moving project files where they should be kept",
Summary = "Moving project files where they should be kept",
Time = new DateTimeOffset(2017, 1, 27, 17, 19, 32, TimeSpan.FromHours(-5)),
CommitTime = new DateTimeOffset(2017, 1, 27, 17, 19, 32, TimeSpan.FromHours(-5)),
},
new GitLogEntry
{
AuthorEmail = "[email protected]",
CommitEmail = "[email protected]",
AuthorName = "Author Person",
CommitName = "Author Person",
Changes = new List<GitStatusEntry>
{
new GitStatusEntry("TestDocument.txt",
TestGitRepoPath + "TestDocument.txt", null,
GitFileStatus.Added),
},
CommitID = "03939ffb3eb8486dba0259b43db00842bbe6eca1",
Description = "Initial Commit",
Summary = "Initial Commit",
Time = new DateTimeOffset(2017, 1, 17, 11, 46, 16, TimeSpan.FromHours(-8)),
CommitTime = new DateTimeOffset(2017, 1, 17, 11, 46, 16, TimeSpan.FromHours(-8)),
},
});
}
[Test]
public void RemoteListTest()
{
var fileSystem = new FileSystem();
var environment = new DefaultEnvironment();
var gitEnvironment = environment.IsWindows
? (IGitEnvironment) new WindowsGitEnvironment(fileSystem, environment)
: new LinuxBasedGitEnvironment(fileSystem, environment);
var processManager = new ProcessManager(environment, gitEnvironment, fileSystem);
var gitRemotes = processManager.GetGitRemoteEntries(TestGitRepoPath);
gitRemotes.Should().BeEquivalentTo(new GitRemote()
{
Name = "origin",
URL = "https://github.com/EvilStanleyGoldman/IOTestsRepo.git",
Host = "github.com",
Function = GitRemoteFunction.Both
});
}
[Test] |
<<<<<<<
public static IEnumerable<GitRemote> GetGitRemoteEntries(this ProcessManager processManager, string workingDirectory)
{
var results = new List<GitRemote>();
var processor = new RemoteListOutputProcessor();
processor.OnRemote += data => results.Add(data);
var process = processManager.Configure("git", "remote -v", workingDirectory);
var outputManager = new ProcessOutputManager(process, processor);
process.Run();
process.WaitForExit();
return results;
}
=======
public static GitStatus GetGitStatus(this ProcessManager processManager, string workingDirectory, IEnvironment environment, IFileSystem fileSystem, IGitEnvironment gitEnvironment)
{
var result = new GitStatus();
var gitStatusEntryFactory = new GitStatusEntryFactory(environment, fileSystem, gitEnvironment);
var processor = new StatusOutputProcessor(gitStatusEntryFactory);
processor.OnStatus += data => result = data;
var process = processManager.Configure("git", "status -b -u --porcelain", workingDirectory);
var outputManager = new ProcessOutputManager(process, processor);
process.Run();
process.WaitForExit();
return result;
}
>>>>>>>
public static IEnumerable<GitRemote> GetGitRemoteEntries(this ProcessManager processManager, string workingDirectory)
{
var results = new List<GitRemote>();
var processor = new RemoteListOutputProcessor();
processor.OnRemote += data => results.Add(data);
var process = processManager.Configure("git", "remote -v", workingDirectory);
var outputManager = new ProcessOutputManager(process, processor);
process.Run();
process.WaitForExit();
return results;
}
public static GitStatus GetGitStatus(this ProcessManager processManager, string workingDirectory, IEnvironment environment, IFileSystem fileSystem, IGitEnvironment gitEnvironment)
{
var result = new GitStatus();
var gitStatusEntryFactory = new GitStatusEntryFactory(environment, fileSystem, gitEnvironment);
var processor = new StatusOutputProcessor(gitStatusEntryFactory);
processor.OnStatus += data => result = data;
var process = processManager.Configure("git", "status -b -u --porcelain", workingDirectory);
var outputManager = new ProcessOutputManager(process, processor);
process.Run();
process.WaitForExit();
return result;
} |
<<<<<<<
[SerializeField] private GitPathView gitPathView = new GitPathView();
public override void InitializeView(IView parent)
{
base.InitializeView(parent);
gitPathView.InitializeView(this);
}
=======
[SerializeField] private bool metricsEnabled;
[NonSerialized] private bool metricsHasChanged;
[SerializeField] private string gitExec;
[SerializeField] private string gitExecParent;
[SerializeField] private string gitExecExtension;
[SerializeField] private string newGitExec;
[NonSerialized] private bool gitExecHasChanged;
>>>>>>>
[SerializeField] private bool metricsEnabled;
[NonSerialized] private bool metricsHasChanged;
[SerializeField] private GitPathView gitPathView = new GitPathView();
public override void InitializeView(IView parent)
{
base.InitializeView(parent);
gitPathView.InitializeView(this);
}
<<<<<<<
=======
private void OnInstallPathGUI()
{
// Install path
GUILayout.Label(GitInstallTitle, EditorStyles.boldLabel);
EditorGUI.BeginDisabledGroup(isBusy);
{
// Install path field
GUILayout.BeginHorizontal();
{
newGitExec = EditorGUILayout.TextField(PathToGit, newGitExec);
if (GUILayout.Button(BrowseButton, EditorStyles.miniButton, GUILayout.Width(25)))
{
GUI.FocusControl(null);
var newValue = EditorUtility.OpenFilePanel(GitInstallBrowseTitle,
gitExecParent,
gitExecExtension);
if (!string.IsNullOrEmpty(newValue))
{
newGitExec = newValue;
}
}
}
GUILayout.EndHorizontal();
GUILayout.Space(EditorGUIUtility.standardVerticalSpacing);
GUILayout.BeginHorizontal();
{
var needsSaving = !string.IsNullOrEmpty(newGitExec)
&& newGitExec != gitExec
&& newGitExec.ToNPath().FileExists();
EditorGUI.BeginDisabledGroup(!needsSaving);
{
if (GUILayout.Button(GitPathSaveButton, GUILayout.ExpandWidth(false)))
{
Logger.Trace("Saving Git Path:{0}", newGitExec);
GUI.FocusControl(null);
Manager.SystemSettings.Set(Constants.GitInstallPathKey, newGitExec);
Environment.GitExecutablePath = newGitExec.ToNPath();
gitExecHasChanged = true;
}
}
EditorGUI.EndDisabledGroup();
//Find button - for attempting to locate a new install
if (GUILayout.Button(GitInstallFindButton, GUILayout.ExpandWidth(false)))
{
GUI.FocusControl(null);
isBusy = true;
new ProcessTask<NPath>(Manager.CancellationToken, new FirstLineIsPathOutputProcessor())
.Configure(Manager.ProcessManager, Environment.IsWindows ? "where" : "which", "git")
.FinallyInUI((success, ex, path) =>
{
if (success)
{
Logger.Trace("FindGit Path:{0}", path);
}
else
{
if (ex != null)
{
Logger.Error(ex, "FindGit Error Path:{0}", path);
}
else
{
Logger.Error("FindGit Failed Path:{0}", path);
}
}
if (success)
{
Manager.SystemSettings.Set(Constants.GitInstallPathKey, path);
Environment.GitExecutablePath = path;
gitExecHasChanged = true;
}
isBusy = false;
}).Start();
}
}
GUILayout.EndHorizontal();
}
EditorGUI.EndDisabledGroup();
}
>>>>>>> |
<<<<<<<
if (ProgressRenderer != null)
ProgressRenderer.DoProgressGUI();
GUILayout.EndVertical();
GUILayout.EndHorizontal();
=======
EditorGUI.BeginDisabledGroup(isBusy);
>>>>>>>
EditorGUI.BeginDisabledGroup(isBusy);
if (ProgressRenderer != null)
ProgressRenderer.DoProgressGUI();
<<<<<<<
DoCommitGUI();
=======
OnCommitDetailsAreaGUI();
EditorGUI.EndDisabledGroup();
>>>>>>>
DoCommitGUI();
EditorGUI.EndDisabledGroup(); |
<<<<<<<
/// <summary>
/// Add a graphql error
/// </summary>
/// <param name="message"></param>
public void AddError(string message)
{
GraphQLVaildation.Errors.Add(new GraphQLError(message));
}
/// <summary>
/// Check if any GraphQL vaildation error
/// </summary>
public bool IsVaild { get => GraphQLVaildation.Errors.Count == 0; }
=======
public IDirectiveProcessor GetDirective(string name)
{
if (directives.ContainsKey(name))
return directives[name];
throw new EntityGraphQLCompilerException($"Directive {name} not defined in schema");
}
public void AddDirective(string name, IDirectiveProcessor directive)
{
if (directives.ContainsKey(name))
throw new EntityGraphQLCompilerException($"Directive {name} already exists on schema");
directives.Add(name, directive);
}
>>>>>>>
/// <summary>
/// Add a graphql error
/// </summary>
/// <param name="message"></param>
public void AddError(string message)
{
GraphQLVaildation.Errors.Add(new GraphQLError(message));
}
/// <summary>
/// Check if any GraphQL vaildation error
/// </summary>
public bool IsVaild { get => GraphQLVaildation.Errors.Count == 0; }
public IDirectiveProcessor GetDirective(string name)
{
if (directives.ContainsKey(name))
return directives[name];
throw new EntityGraphQLCompilerException($"Directive {name} not defined in schema");
}
public void AddDirective(string name, IDirectiveProcessor directive)
{
if (directives.ContainsKey(name))
throw new EntityGraphQLCompilerException($"Directive {name} already exists on schema");
directives.Add(name, directive);
} |
<<<<<<<
public bool OnRequestGeolocationPermission(IWebBrowser browser, string requestingUrl, int requestId, IGeolocationCallback callback)
=======
public bool OnRequestGeolocationPermission(IWebBrowser browserControl, IBrowser browser, string requestingUrl, int requestId)
>>>>>>>
public bool OnRequestGeolocationPermission(IWebBrowser browserControl, IBrowser browser, string requestingUrl, int requestId, IGeolocationCallback callback) |
<<<<<<<
//settings.CefCommandLineArgs.Add("renderer-process-limit", "1");
//settings.CefCommandLineArgs.Add("renderer-startup-dialog", "renderer-startup-dialog");
=======
settings.LogSeverity = LogSeverity.Verbose;
>>>>>>>
//settings.CefCommandLineArgs.Add("renderer-process-limit", "1");
//settings.CefCommandLineArgs.Add("renderer-startup-dialog", "renderer-startup-dialog");
settings.LogSeverity = LogSeverity.Verbose; |
<<<<<<<
public void OnResourceLoadComplete(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IResponse response, UrlRequestStatus status, long receivedContentLength)
{
}
=======
public void OnContextCreated(IWebBrowser browserControl, IBrowser browser, IFrame frame)
{
const string script = "document.addEventListener('DOMContentLoaded', function(){ alert('DomLoaded'); });";
//frame.ExecuteJavaScriptAsync(script);
}
>>>>>>>
public void OnResourceLoadComplete(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IResponse response, UrlRequestStatus status, long receivedContentLength)
{
}
}
}
public void OnContextCreated(IWebBrowser browserControl, IBrowser browser, IFrame frame)
{
const string script = "document.addEventListener('DOMContentLoaded', function(){ alert('DomLoaded'); });";
//frame.ExecuteJavaScriptAsync(script);
} |
<<<<<<<
=======
private readonly BrowserCore browserCore;
>>>>>>>
<<<<<<<
var temp = managedCefBrowserAdapter;
if (temp == null)
=======
// If the control was not rendered yet when we tried to set up the source hook, it may have failed (since it couldn't
// lookup the HwndSource), so we need to retry it whenever visibility changes.
AddSourceHookIfNotAlreadyPresent();
}
private static void OnApplicationExit(object sender, ExitEventArgs e)
{
// TODO: This prevents AccessViolation on shutdown, but it would be better handled by the Cef class; the WebView control
// should not explicitly have to perform this.
if (Cef.IsInitialized)
>>>>>>>
// If the control was not rendered yet when we tried to set up the source hook, it may have failed (since it couldn't
// lookup the HwndSource), so we need to retry it whenever visibility changes.
AddSourceHookIfNotAlreadyPresent();
}
private static void OnApplicationExit(object sender, ExitEventArgs e)
{
// TODO: This prevents AccessViolation on shutdown, but it would be better handled by the Cef class; the WebView control
// should not explicitly have to perform this.
if (Cef.IsInitialized)
<<<<<<<
managedCefBrowserAdapter = null;
isOffscreenBrowserCreated = false;
temp.Close();
temp.Dispose();
=======
private void OnLoaded(object sender, RoutedEventArgs routedEventArgs)
{
AddSourceHookIfNotAlreadyPresent();
}
public void OnUnloaded(object sender, RoutedEventArgs routedEventArgs)
{
RemoveSourceHook();
>>>>>>>
private void OnLoaded(object sender, RoutedEventArgs routedEventArgs)
{
AddSourceHookIfNotAlreadyPresent();
}
public void OnUnloaded(object sender, RoutedEventArgs routedEventArgs)
{
RemoveSourceHook();
<<<<<<<
InitializeCefAdapter();
=======
>>>>>>>
<<<<<<<
RenderOptions.SetBitmapScalingMode( image, BitmapScalingMode.NearestNeighbor );
=======
AddSourceHookIfNotAlreadyPresent();
RenderOptions.SetBitmapScalingMode(image, BitmapScalingMode.NearestNeighbor);
>>>>>>>
AddSourceHookIfNotAlreadyPresent();
RenderOptions.SetBitmapScalingMode(image, BitmapScalingMode.NearestNeighbor);
<<<<<<<
private bool CreateOffscreenBrowser()
{
if ( Address == null || source == null )
{
return false;
}
if (isOffscreenBrowserCreated)
{
return true;
}
managedCefBrowserAdapter = new ManagedCefBrowserAdapter( this );
managedCefBrowserAdapter.CreateOffscreenBrowser( BrowserSettings ?? new BrowserSettings(), source.Handle, Address );
return true;
}
private bool AddSourceHook()
=======
private void AddSourceHookIfNotAlreadyPresent()
>>>>>>>
private void AddSourceHookIfNotAlreadyPresent()
<<<<<<<
protected override Size ArrangeOverride(Size arrangeBounds)
{
var size = base.ArrangeOverride(arrangeBounds);
var newWidth = size.Width;
var newHeight = size.Height;
if (newWidth > 0 && newHeight > 0 && isOffscreenBrowserCreated )
{
managedCefBrowserAdapter.WasResized();
}
return size;
}
public void InvokeRenderAsync( BitmapInfo bitmapInfo)
=======
public void InvokeRenderAsync(Action<BitmapInfo> callback, BitmapInfo bitmapInfo)
>>>>>>>
public void InvokeRenderAsync( BitmapInfo bitmapInfo)
<<<<<<<
DoInUi(() => TooltipText = tooltipText);
=======
if (!Dispatcher.CheckAccess())
{
Dispatcher.Invoke((Action)(() => SetTooltipText(tooltipText)));
return;
}
TooltipText = tooltipText;
}
private void OnBrowserCorePropertyChanged(Object sender, PropertyChangedEventArgs e)
{
if (e.PropertyName == "Address")
{
Address = browserCore.Address;
}
RaiseCommandsCanExecuteChanged();
>>>>>>>
DoInUi(() =>
{
TooltipText = tooltipText;
});
<<<<<<<
popup.Width = width;
popup.Height = height;
=======
Dispatcher.BeginInvoke((Action<int, int, int, int>)SetPopupSizeAndPositionImpl, width, height, x, y);
}
}
>>>>>>>
popup.Width = width;
popup.Height = height;
<<<<<<<
if ( isOffscreenBrowserCreated )
{
managedCefBrowserAdapter.SendFocusEvent(false);
}
=======
managedCefBrowserAdapter.SendFocusEvent(false);
>>>>>>>
managedCefBrowserAdapter.SendFocusEvent(false);
<<<<<<<
if (isOffscreenBrowserCreated)
{
managedCefBrowserAdapter.OnMouseButton( (int) point.X, (int) point.Y, mouseButtonType, mouseUp, e.ClickCount );
}
=======
managedCefBrowserAdapter.OnMouseButton((int)point.X, (int)point.Y, mouseButtonType, mouseUp, e.ClickCount);
>>>>>>>
managedCefBrowserAdapter.OnMouseButton((int)point.X, (int)point.Y, mouseButtonType, mouseUp, e.ClickCount);
<<<<<<<
if (isOffscreenBrowserCreated)
{
managedCefBrowserAdapter.ViewSource();
}
=======
managedCefBrowserAdapter.ViewSource();
}
public void Dispose()
{
>>>>>>>
managedCefBrowserAdapter.ViewSource(); |
<<<<<<<
public bool IsBrowserInitialized { get; private set; }
public IDialogHandler DialogHandler { get; set; }
=======
>>>>>>>
public IDialogHandler DialogHandler { get; set; } |
<<<<<<<
bool OnRequestGeolocationPermission(IWebBrowser browser, string requestingUrl, int requestId, IGeolocationCallback callback);
=======
bool OnRequestGeolocationPermission(IWebBrowser browserControl, IBrowser browser, string requestingUrl, int requestId);
>>>>>>>
bool OnRequestGeolocationPermission(IWebBrowser browserControl, IBrowser browser, string requestingUrl, int requestId, IGeolocationCallback callback); |
<<<<<<<
/// <summary>
/// Called on the CEF IO thread when a resource load has completed.
/// </summary>
/// <param name="browserControl">The ChromiumWebBrowser control</param>
/// <param name="browser">the browser object</param>
/// <param name="frame">The frame that is being redirected.</param>
/// <param name="request">the request object - cannot be modified in this callback</param>
/// <param name="response">the response object - cannot be modified in this callback</param>
/// <param name="status">indicates the load completion status</param>
/// <param name="receivedContentLength">is the number of response bytes actually read.</param>
void OnResourceLoadComplete(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IResponse response, UrlRequestStatus status, long receivedContentLength);
=======
/// <summary>
/// OnContextCreated is called in the Render process immediately after a CefV8Context is created.
/// An IPC message is immediately sent to notify the context has been created
/// (should be safe to execute javascript). If the page has no javascript then on context will be created
/// and as a result this method will not be called. Currently only called for the Main frame <see cref="IFrame.IsMain"/>
/// </summary>
/// <param name="browserControl">The ChromiumWebBrowser control</param>
/// <param name="browser">the browser object</param>
/// <param name="frame">The frame.</param>
void OnContextCreated(IWebBrowser browserControl, IBrowser browser, IFrame frame);
>>>>>>>
/// <summary>
/// Called on the CEF IO thread when a resource load has completed.
/// </summary>
/// <param name="browserControl">The ChromiumWebBrowser control</param>
/// <param name="browser">the browser object</param>
/// <param name="frame">The frame that is being redirected.</param>
/// <param name="request">the request object - cannot be modified in this callback</param>
/// <param name="response">the response object - cannot be modified in this callback</param>
/// <param name="status">indicates the load completion status</param>
/// <param name="receivedContentLength">is the number of response bytes actually read.</param>
void OnResourceLoadComplete(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IResponse response, UrlRequestStatus status, long receivedContentLength);
/// <summary>
/// OnContextCreated is called in the Render process immediately after a CefV8Context is created.
/// An IPC message is immediately sent to notify the context has been created
/// (should be safe to execute javascript). If the page has no javascript then on context will be created
/// and as a result this method will not be called. Currently only called for the Main frame <see cref="IFrame.IsMain"/>
/// </summary>
/// <param name="browserControl">The ChromiumWebBrowser control</param>
/// <param name="browser">the browser object</param>
/// <param name="frame">The frame.</param>
void OnContextCreated(IWebBrowser browserControl, IBrowser browser, IFrame frame); |
<<<<<<<
public int BytesPerPixel { get; set; }
public int NumberOfBytes { get; set; }
=======
public int BytesPerPixel { get; protected set; }
public bool DirtyRectSupport { get; protected set; }
>>>>>>>
public int BytesPerPixel { get; protected set; }
public bool DirtyRectSupport { get; protected set; }
public int NumberOfBytes { get; set; } |
<<<<<<<
bool IRequestHandler.GetAuthCredentials(IWebBrowser browser, IFrame frame, bool isProxy, string host, int port, string realm, string scheme, IAuthCallback callback)
=======
bool IRequestHandler.GetAuthCredentials(IWebBrowser browserControl, IBrowser browser, IFrame frame, bool isProxy, string host, int port, string realm, string scheme, ref string username, ref string password)
>>>>>>>
bool IRequestHandler.GetAuthCredentials(IWebBrowser browserControl, IBrowser browser, IFrame frame, bool isProxy, string host, int port, string realm, string scheme, IAuthCallback callback) |
<<<<<<<
public bool OnFileDialog(IWebBrowser browser, CefFileDialogMode mode, string title, string defaultFilePath, List<string> acceptFilters, int selectedAcceptFilter, IFileDialogCallback callback)
=======
public bool OnFileDialog(IWebBrowser browserControl, IBrowser browser, CefFileDialogMode mode, string title, string defaultFilePath, List<string> acceptFilters, out int selectedAcceptFilter, out List<string> result)
>>>>>>>
public bool OnFileDialog(IWebBrowser browserControl, IBrowser browser, CefFileDialogMode mode, string title, string defaultFilePath, List<string> acceptFilters, int selectedAcceptFilter, IFileDialogCallback callback) |
<<<<<<<
void IWebBrowserInternal.OnFrameLoadStart(string url)
=======
public void OnFrameLoadStart(string url, bool isMainFrame)
>>>>>>>
void IWebBrowserInternal.OnFrameLoadStart(string url, bool isMainFrame)
<<<<<<<
void IWebBrowserInternal.OnFrameLoadEnd(string url)
=======
public void OnFrameLoadEnd(string url, bool isMainFrame, int httpStatusCode)
>>>>>>>
void IWebBrowserInternal.OnFrameLoadEnd(string url, bool isMainFrame, int httpStatusCode) |
<<<<<<<
bool OnJSBeforeUnload(IWebBrowser browser, string message, bool isReload, IJsDialogCallback callback);
=======
bool OnJSBeforeUnload(IWebBrowser browserControl, IBrowser browser, string message, bool isReload, out bool allowUnload);
>>>>>>>
bool OnJSBeforeUnload(IWebBrowser browserControl, IBrowser browser, string message, bool isReload, IJsDialogCallback callback); |
<<<<<<<
using System.Reactive.Concurrency;
using System.Threading;
using System.Windows.Input;
=======
using System.Threading;
>>>>>>>
using System.Reactive.Concurrency;
using System.Threading;
<<<<<<<
using Microsoft.FSharp.Core;
=======
using Splat;
>>>>>>>
using Microsoft.FSharp.Core;
using Splat;
<<<<<<<
private ReactiveList<NugetResult> _nugetResults = new ReactiveList<NugetResult>();
public ReactiveList<NugetResult> NugetResults { get { return _nugetResults; } }
=======
private ObservableAsPropertyHelper<LoadingState> _addPackageState;
public LoadingState AddPackageState
{
get { return _addPackageState.Value; }
}
private ObservableAsPropertyHelper<IEnumerable<NugetResult>> _results;
public IEnumerable<NugetResult> NugetResults
{
get { return _results.Value; }
}
>>>>>>>
private ReactiveList<NugetResult> _nugetResults = new ReactiveList<NugetResult>();
public ReactiveList<NugetResult> NugetResults { get { return _nugetResults; } }
private ObservableAsPropertyHelper<LoadingState> _addPackageState;
public LoadingState AddPackageState
{
get { return _addPackageState.Value; }
}
<<<<<<<
_dependenciesFile = dependenciesFile;
=======
var logger = new DebugLogger() {Level = LogLevel.Debug};
Splat.Locator.CurrentMutable.RegisterConstant(logger, typeof(ILogger));
_findPackageCallback = findPackageCallback;
>>>>>>>
var logger = new DebugLogger() {Level = LogLevel.Debug};
Splat.Locator.CurrentMutable.RegisterConstant(logger, typeof(ILogger));
_dependenciesFile = dependenciesFile;
<<<<<<<
SearchNuget.IsExecuting
.Where(isExecuting => isExecuting)
.ObserveOn(RxApp.MainThreadScheduler)
.Subscribe(_ =>
{
NugetResults.Clear();
});
SearchNuget.Subscribe(NugetResults.Add);
=======
this.WhenAnyObservable(x => x._results.ThrownExceptions)
.Log(this, "Results observable property exception:", e => e.ToString())
.Subscribe();
_results = SearchNuget.ToProperty(this, x => x.NugetResults, out _results);
>>>>>>>
this.WhenAnyObservable(x => x._results.ThrownExceptions)
.Log(this, "Results observable property exception:", e => e.ToString())
.Subscribe();
_results = SearchNuget.ToProperty(this, x => x.NugetResults, out _results); |
<<<<<<<
private void RunCommand(object sender, EventArgs e, string helpTopic, Action<SolutionInfo> command)
=======
private void RunCommand(string helpTopic, Action command)
>>>>>>>
private void RunCommand(string helpTopic, Action<SolutionInfo> command)
<<<<<<<
RunCommand(sender, e, "paket-outdated.html", _ =>
=======
RunCommand("paket-outdated.html", () =>
>>>>>>>
RunCommand("paket-outdated.html", info =>
<<<<<<<
RunCommand(sender, e, "paket-restore.html", _ => // Do we need to unload?
=======
RunCommand("paket-restore.html", () => // Do we need to unload?
>>>>>>>
RunCommand("paket-restore.html", info => // Do we need to unload?
<<<<<<<
RunCommand(sender, e, "paket-simplify.html", _ => // Should work without unload
=======
RunCommand("paket-simplify.html", () => // Should work without unload
>>>>>>>
RunCommand("paket-simplify.html", info => // Should work without unload
<<<<<<<
RunCommand(sender, e, "paket-add.html", info =>
=======
RunCommandAndReloadAllProjects("paket-add.html", info =>
>>>>>>>
RunCommand("paket-add.html", info => |
<<<<<<<
using System;
using System.Collections.Generic;
using System.Linq.Expressions;
using System.Threading.Tasks;
namespace PnP.Core.Model
{
/// <summary>
/// Paged data retrieval can be done using the methods provided via this interface
/// </summary>
internal interface ISupportPaging
{
/// <summary>
/// Determines whether paging is possible
/// </summary>
bool CanPage
{
get;
}
=======
namespace PnP.Core.Model
{
/// <summary>
/// Paged data retrieval can be done using the methods provided via this interface
/// </summary>
public interface ISupportPaging
{
/// <summary>
/// Determines whether paging is possible
/// </summary>
bool CanPage
{
get;
}
>>>>>>>
namespace PnP.Core.Model
{
/// <summary>
/// Paged data retrieval can be done using the methods provided via this interface
/// </summary>
internal interface ISupportPaging
{
/// <summary>
/// Determines whether paging is possible
/// </summary>
bool CanPage
{
get;
} |
<<<<<<<
private const String VESSEL_IMMORTAL_TIMER_NAME = "IMMORTAL";
private const int MakeOtherPlayerVesselsImmortalMSInterval = 2000;
=======
private const int MakeOtherPlayerVesselsImmortalMsInterval = 2000;
>>>>>>>
private const String VESSEL_IMMORTAL_TIMER_NAME = "IMMORTAL";
private const int MakeOtherPlayerVesselsImmortalMsInterval = 2000;
<<<<<<<
=======
#endregion
#region Private methods
#region Methods
>>>>>>> |
<<<<<<<
=======
public int CheckVesselsToLoadMsInterval = 2500;
public float UpdateScreenMessageInterval = 1f;
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
public override void OnEnabled()
{
base.OnEnabled();
Client.Singleton.StartCoroutine(SendVesselDefinition());
Client.Singleton.StartCoroutine(SendAbandonedVesselsToServer());
Client.Singleton.StartCoroutine(UpdateBannedPartsMessage());
}
/// <summary>
/// Check vessels that must be loaded
/// </summary>
public override void Update()
{
base.Update();
if (Enabled && ProtoSystemBasicReady && Timer.ElapsedMilliseconds > CheckVesselsToLoadMsInterval)
{
//Reload vessels that exist
var vesselsToReLoad = AllPlayerVessels
.Where(v => !v.Value.Loaded && FlightGlobals.Vessels.Any(vl => vl.id == v.Key))
.ToArray();
foreach (var vesselProto in vesselsToReLoad)
{
VesselLoader.ReloadVessel(vesselProto.Value);
}
//Load vessels that don't exist and are in our subspace
var vesselsToLoad = AllPlayerVessels
.Where(v => !v.Value.Loaded && FlightGlobals.Vessels.All(vl => vl.id != v.Key) &&
(SettingsSystem.ServerSettings.ShowVesselsInThePast || !VesselCommon.VesselIsControlledAndInPastSubspace(v.Key)))
.ToArray();
foreach (var vesselProto in vesselsToLoad)
{
VesselLoader.LoadVessel(vesselProto.Value);
}
ResetTimer();
}
}
>>>>>>>
<<<<<<<
#region Coroutines
/// <summary>
/// Set all other vessels as packed so the movement is better
/// </summary>
private void PackControlledVessels()
{
try
{
if (ProtoSystemReady)
{
var controlledVessels = VesselCommon.GetControlledVessels();
foreach (var vessel in FlightGlobals.Vessels.Where(v => v.id != FlightGlobals.ActiveVessel.id))
{
if (controlledVessels.Contains(vessel))
{
if (!vessel.packed) PackVessel(vessel);
}
else
{
UnPackVessel(vessel);
}
}
}
}
catch (Exception e)
{
Debug.LogError($"[LMP]: Error in PackControlledVessels {e}");
}
}
=======
>>>>>>>
<<<<<<<
=======
if (!string.IsNullOrEmpty(BannedPartsStr) && ProtoSystemReady)
{
if (BannedPartsMessage != null)
BannedPartsMessage.duration = 0;
if (ModSystem.Singleton.ModControl == ModControlMode.ENABLED_STOP_INVALID_PART_SYNC)
BannedPartsMessage = ScreenMessages.PostScreenMessage(
"Active vessel contains the following banned parts, it will not be saved to the server:\n" + BannedPartsStr, 2f, ScreenMessageStyle.UPPER_CENTER);
if (ModSystem.Singleton.ModControl == ModControlMode.ENABLED_STOP_INVALID_PART_LAUNCH)
BannedPartsMessage = ScreenMessages.PostScreenMessage(
"Active vessel contains the following banned parts, you will be unable to launch on this server:\n" +
BannedPartsStr, 2f, ScreenMessageStyle.UPPER_CENTER);
}
>>>>>>>
<<<<<<<
/// <summary>
/// Check vessels that must be loaded
/// </summary>
private void CheckVesselsToLoad()
{
try
{
if (ProtoSystemBasicReady)
{
//Reload vessels that exist
var vesselsToReLoad = AllPlayerVessels
.Where(v => !v.Loaded && FlightGlobals.Vessels.Any(vl => vl.id == v.VesselId))
.ToArray();
foreach (var vesselProto in vesselsToReLoad)
{
VesselLoader.ReloadVessel(vesselProto);
VesselPositionSystem.Singleton.updateVesselPosition(vesselProto.VesselId);
}
//Load vessels that don't exist and are in our subspace
var vesselsToLoad = AllPlayerVessels
.Where(v => !v.Loaded && FlightGlobals.Vessels.All(vl => vl.id != v.VesselId) &&
(SettingsSystem.ServerSettings.ShowVesselsInThePast || !VesselCommon.VesselIsControlledAndInPastSubspace(v.VesselId)))
.ToArray();
foreach (var vesselProto in vesselsToLoad)
{
VesselLoader.LoadVessel(vesselProto);
VesselPositionSystem.Singleton.updateVesselPosition(vesselProto.VesselId);
}
}
}
catch (Exception e)
{
Debug.LogError($"[LMP]: Error in CheckVesselsToLoad {e}");
}
}
=======
>>>>>>>
/// <summary>
/// Check vessels that must be loaded
/// </summary>
private void CheckVesselsToLoad()
{
try
{
if (ProtoSystemBasicReady)
{
//Reload vessels that exist
var vesselsToReLoad = AllPlayerVessels
.Where(v => !v.Loaded && FlightGlobals.Vessels.Any(vl => vl.id == v.VesselId))
.ToArray();
foreach (var vesselProto in vesselsToReLoad)
{
VesselLoader.ReloadVessel(vesselProto);
VesselPositionSystem.Singleton.updateVesselPosition(vesselProto.VesselId);
}
//Load vessels that don't exist and are in our subspace
var vesselsToLoad = AllPlayerVessels
.Where(v => !v.Loaded && FlightGlobals.Vessels.All(vl => vl.id != v.VesselId) &&
(SettingsSystem.ServerSettings.ShowVesselsInThePast || !VesselCommon.VesselIsControlledAndInPastSubspace(v.VesselId)))
.ToArray();
foreach (var vesselProto in vesselsToLoad)
{
VesselLoader.LoadVessel(vesselProto);
VesselPositionSystem.Singleton.updateVesselPosition(vesselProto.VesselId);
}
}
}
catch (Exception e)
{
Debug.LogError($"[LMP]: Error in CheckVesselsToLoad {e}");
}
} |
<<<<<<<
using System;
using System.Collections.Generic;
using LunaClient.Base.Interface;
=======
using System.Diagnostics;
using LunaClient.Base.Interface;
using LunaClient.Utilities;
>>>>>>>
using System;
using System.Collections.Generic;
using LunaClient.Base.Interface;
using LunaClient.Utilities; |
<<<<<<<
#region Constructors
public VesselUpdateSystem() : base()
{
setupTimer(SEND_TIMER_NAME, _updateSendMSInterval);
}
#endregion
=======
>>>>>>>
#region Constructors
public VesselUpdateSystem() : base()
{
setupTimer(SEND_TIMER_NAME, _updateSendMSInterval);
}
#endregion
<<<<<<<
private static int _updateNearbySendMSInterval = 500;
private static int _updateSendMSInterval = 3000;
private static string SEND_TIMER_NAME = "SEND";
#endregion
#region Base overrides
public override void OnEnabled()
{
base.OnEnabled();
}
=======
private const int UpdateNearbySendMsInterval = 500;
private const int UpdateSendMsInterval = 3000;
>>>>>>>
private static int _updateNearbySendMSInterval = 500;
private static int _updateSendMSInterval = 3000;
private static string SEND_TIMER_NAME = "SEND";
#endregion
#region Base overrides
public override void OnEnabled()
{
base.OnEnabled();
} |
<<<<<<<
//Update the vessel's orbital information from the current position of the rigidbodies
vessel.orbitDriver.TrackRigidbody(vessel.mainBody, 0);
vessel.UpdatePosVel();
=======
>>>>>>>
//Update the vessel's orbital information from the current position of the rigidbodies
vessel.orbitDriver.TrackRigidbody(vessel.mainBody, 0);
vessel.UpdatePosVel(); |
<<<<<<<
if (_visualStateChanged == null) return;
//NOTE: don't use EventsHelper because it will use DynamicInvoke.
try
{
_visualStateChanged(this, e);
}
catch (Exception ex)
{
Platform.Log(LogLevel.Error, ex);
throw;
}
}
=======
FireVisualStateChanged(e);
}
private void FireVisualStateChanged(VisualStateChangedEventArgs e)
{
EventsHelper.Fire(_visualStateChanged, this, e);
var parentGraphic = ParentGraphic as Graphic;
if (parentGraphic != null)
parentGraphic.ForwardVisualStateChanged(e);
}
>>>>>>>
FireVisualStateChanged(e);
}
private void FireVisualStateChanged(VisualStateChangedEventArgs e)
{
if (_visualStateChanged != null)
{
//NOTE: don't use EventsHelper because it will use DynamicInvoke.
try
{
_visualStateChanged(this, e);
}
catch (Exception ex)
{
Platform.Log(LogLevel.Error, ex);
throw;
}
}
var parentGraphic = ParentGraphic as Graphic;
if (parentGraphic != null)
parentGraphic.ForwardVisualStateChanged(e);
} |
<<<<<<<
_recalculate = true;
EventsHelper.Fire(_lutChanged, this, new EventArgs());
=======
DisposeCachedLut();
>>>>>>>
DisposeCachedLut();
EventsHelper.Fire(_lutChanged, this, new EventArgs());
<<<<<<<
#region Properties
/// <summary>
/// The output LUT of the pipeline.
/// </summary>
private IComposedLut ComposedLut
{
get
{
if (_recalculate)
{
DisposeCachedLut();
_recalculate = false;
}
return _cachedLut ?? (_cachedLut = ComposedLutCache.GetLut(LutCollection));
}
}
private IComposableLut LastLut
{
get
{
LutCollection.Validate();
return LutCollection[LutCollection.Count - 1];
}
}
#endregion
#region IComposedLut Members
/// <summary>
/// Gets the composed lut data.
/// </summary>
/// <remarks>
/// This property should be considered readonly and is only
/// provided for fast (unsafe) iteration over the array.
/// </remarks>
public int[] Data
{
get { return ComposedLut.Data; }
}
#endregion
#region ILut Members
/// <summary>
/// Gets or sets the minimum input value.
/// </summary>
public int MinInputValue
{
get { return _minInputValue; }
set
{
if (_minInputValue != value)
{
_minInputValue = value;
OnLutChanged();
}
}
}
/// <summary>
/// Gets or sets the maximum input value.
/// </summary>
public int MaxInputValue
{
get { return _maxInputValue; }
set
{
if (_maxInputValue != value)
{
_maxInputValue = value;
OnLutChanged();
}
}
}
/// <summary>
/// Gets the minimum output value.
/// </summary>
public int MinOutputValue
{
get { return (int) Math.Round(LastLut.MinOutputValue); }
}
/// <summary>
/// Gets the maximum output value.
/// </summary>
public int MaxOutputValue
{
get { return (int) Math.Round(LastLut.MaxOutputValue); }
}
/// <summary>
/// Gets the output value of the lut at a given input index.
/// </summary>
public int this[int index]
{
get { return ComposedLut[index]; }
}
=======
>>>>>>> |
<<<<<<<
++Coordinators[viewer]._referenceCount;
return Coordinators[viewer];
=======
DicomImagePlane.InitializeCache();
++coordinator._referenceCount;
return coordinator;
>>>>>>>
++coordinator._referenceCount;
return coordinator;
<<<<<<<
--_referenceCount;
=======
DicomImagePlane.ReleaseCache();
if (_referenceCount > 0)
--_referenceCount;
>>>>>>>
if (_referenceCount > 0)
--_referenceCount; |
<<<<<<<
string encodedServerRelativeUrl = WebUtility.UrlEncode(serverRelativeUrl).Replace("+", "%20");
var apiCall = new ApiCall($"_api/Web/getFileByServerRelativePath(decodedUrl='{encodedServerRelativeUrl}')", ApiType.SPORest);
=======
string encodedServerRelativeUrl = WebUtility.UrlEncode(serverRelativeUrl.Replace("'", "''")).Replace("+", "%20");
var apiCall = new ApiCall($"_api/Web/getFileByServerRelativeUrl('{encodedServerRelativeUrl}')", ApiType.SPORest);
>>>>>>>
string encodedServerRelativeUrl = WebUtility.UrlEncode(serverRelativeUrl.Replace("'", "''")).Replace("+", "%20");
var apiCall = new ApiCall($"_api/Web/getFileByServerRelativePath(decodedUrl='{encodedServerRelativeUrl}')", ApiType.SPORest); |
<<<<<<<
=======
// A flag used to note when we call into a blocking command
// handler, but it calls its complete handler immediately -
// _before_ the Dialogue is told to pause. This out-of-order
// problem can lead to the Dialogue being stuck in a paused state.
// To solve this, this variable is set to false before any blocking
// command handler is called, and set to true when ContinueDialogue
// is called. If it's true after calling a blocking command
// handler, then the Dialogue is not told to pause.
private bool wasCompleteCalled = false;
>>>>>>>
// A flag used to note when we call into a blocking command
// handler, but it calls its complete handler immediately -
// _before_ the Dialogue is told to pause. This out-of-order
// problem can lead to the Dialogue being stuck in a paused state.
// To solve this, this variable is set to false before any blocking
// command handler is called, and set to true when ContinueDialogue
// is called. If it's true after calling a blocking command
// handler, then the Dialogue is not told to pause.
private bool wasCompleteCalled = false; |
<<<<<<<
Currencies = new string[] { "btc","ltc","doge", "burst" };
maxRoll = 99.999m;
=======
Currencies = new string[] { "btc","ltc","doge" };
maxRoll = 99.99m;
>>>>>>>
Currencies = new string[] { "btc","ltc","doge", "burst" };
maxRoll = 99.99m; |
<<<<<<<
private DateTime _lastAlign;
private readonly Dictionary<long, DateTime> _lastWeaponReload = new Dictionary<long, DateTime>();
=======
private DateTime _lastAlign;
>>>>>>>
private DateTime _lastAlign;
private readonly Dictionary<long, DateTime> _lastWeaponReload = new Dictionary<long, DateTime>();
<<<<<<<
else if (closest.Distance < 150000)
{
// Move to the target
if (Cache.Instance.Approaching == null || Cache.Instance.Approaching.Id != closest.Id)
{
Logging.Log("MissionController.Activate: Approaching target [" + closest.Name + "][" + closest.Id + "]");
closest.Approach();
}
}
else
=======
else if (closest.Distance < 150000)
>>>>>>>
else if (closest.Distance < 150000)
{
// Move to the target
if (Cache.Instance.Approaching == null || Cache.Instance.Approaching.Id != closest.Id)
{
Logging.Log("MissionController.MoveTo: Approaching target [" + closest.Name + "][" + closest.Id + "]");
closest.Approach();
}
}
else
<<<<<<<
=======
else
{
// We cant warp if we have drones out
if (Cache.Instance.ActiveDrones.Count() > 0)
return;
if (DateTime.Now.Subtract(_lastAlign ).TotalMinutes > 2)
{
// Probably never happens
closest.AlignTo();
_lastAlign = DateTime.Now;
}
}
>>>>>>>
<<<<<<<
if (Cache.Instance.OrbitDistance != Settings.Instance.OrbitDistance)
{
if (Cache.Instance.OrbitDistance == 0)
{
Cache.Instance.OrbitDistance = Settings.Instance.OrbitDistance;
Logging.Log("MissionController: Using default orbit distance: " + Cache.Instance.OrbitDistance + " (as the custom one was 0)");
}
else
Logging.Log("MissionController: Using custom orbit distance: " + Cache.Instance.OrbitDistance);
}
=======
if (Cache.Instance.OrbitDistance != Settings.Instance.OrbitDistance)
Logging.Log("MissionController: Using custom orbit distance: " + Cache.Instance.OrbitDistance);
>>>>>>>
if (Cache.Instance.OrbitDistance != Settings.Instance.OrbitDistance)
Logging.Log("MissionController: Using custom orbit distance: " + Cache.Instance.OrbitDistance); |
<<<<<<<
AutoStart = Settings.Instance.AutoStart;
Disable3D = Settings.Instance.Disable3D;
=======
>>>>>>>
<<<<<<<
close |= window.Html.Contains("This gate is locked!");
=======
// Lag :/
close |= window.Html.Contains("The Zbikoki's Hacker Card");
close |= window.Html.Contains(" units free.");
>>>>>>>
// Lag :/
close |= window.Html.Contains("The Zbikoki's Hacker Card");
close |= window.Html.Contains(" units free."); |
<<<<<<<
public bool waitDecline { get; set; }
=======
public bool Disable3D { get; set; }
>>>>>>>
public bool Disable3D { get; set; }
public bool waitDecline { get; set; }
<<<<<<<
waitDecline = false;
=======
Disable3D = false;
>>>>>>>
Disable3D = false;
waitDecline = false;
<<<<<<<
waitDecline = (bool?) xml.Element("waitDecline") ?? false;
=======
Disable3D = (bool?) xml.Element("disable3D") ?? false;
>>>>>>>
Disable3D = (bool?) xml.Element("disable3D") ?? false;
waitDecline = (bool?) xml.Element("waitDecline") ?? false; |