{"action":"created","comment":{"url":"https://api.github.com/repos/EvilBeaver/oscript-library/pulls/comments/71791818","id":71791818,"diff_hunk":"@@ -110,6 +110,110 @@\n \t\n КонецПроцедуры\n \n+// Выполнить объединение текущей конфигурации с файлом (с использованием файла настроек)\n+//\n+// Параметры:\n+//   ФайлКонфигурации - Строка - имя cf-файла с объединяемой конфигурацией.\n+//   ФайлНастроек - Строка - имя файла с настройками объединения конфигураций.\n+//   ПоставитьНаПоддержку - Булево, Неопределено - флаг необходимости установки конфигурации на поддержку.\n+//\t\tНеопределено: по умолчанию флаг не передается.\n+//\t\tИстина: конфигурация ставится на поддержку, если есть такая возможность.\n+//\t\tЛожь: конфигурация не ставится на поддержку, даже если есть такая вожзможность.\n+//   ВключитьВОбъединениеОбъектыПоНеразрешеннымСсылкам - Булево, Неопределено - флаг небходимости включения\n+//\t\tв объединение объектов, не включенных в список объединяемых и отсутствующих в основной конфигурации.\n+//\t\tНеопределено: по умолчанию флаг не передается.\n+//\t\tИстина: включать объекты с неразрешенными ссылками в список объединяемых.\n+//\t\tЛожь: очищать ссылки на объекты с неразрешенными ссылками.\n+//   Принудительно - Булево - флаг принудительного обновления.\n+//\t\tОбновление будет производиться в случае наличия:\n+//\t\t\tпредупреждений об удаляемых объектов, на которые есть ссылки в объектах, \n+//\t\t\t\tне участвующих в объединении (такие объекты будут исключены из объединения);\n+//\t\t\tпредупреждений о применении настроек.\n+//\t\tЕсли не указан, то объединение будет прервано в вышеуказанных случаях.\n+//\n+Процедура ОбъединитьКонфигурациюСФайлом(Знач ФайлКонфигурации, \n+\t\t\t\t\t\t\t\t Знач ФайлНастроек, \n+\t\t\t\t\t\t\t\t Знач ПоставитьНаПоддержку = Неопределено, \n+\t\t\t\t\t\t\t\t Знач ВключитьВОбъединениеОбъектыПоНеразрешеннымСсылкам = Неопределено, \n+\t\t\t\t\t\t\t\t Знач Принудительно = Ложь) Экспорт\n+\t\n+\tПараметры = СтандартныеПараметрыЗапускаКонфигуратора();\n+\tПараметры.Добавить(\"/MergeCfg \" + ОбернутьВКавычки(ФайлКонфигурации));\n+\tПараметры.Добавить(\"-Settings \" + ОбернутьВКавычки(ФайлНастроек));\n+\n+\tЕсли ПоставитьНаПоддержку = Истина Тогда\n+\t\tПараметры.Добавить(\"-EnableSupport\");\n+\tИначеЕсли ПоставитьНаПоддержку = Ложь Тогда\n+\t\tПараметры.Добавить(\"-DisableSupport\");\n+\tКонецЕсли;\n+\n+\tЕсли ВключитьВОбъединениеОбъектыПоНеразрешеннымСсылкам = Истина Тогда\n+\t\tПараметры.Добавить(\"-IncludeObjectsByUnresolvedRefs\");\n+\tИначеЕсли ВключитьВОбъединениеОбъектыПоНеразрешеннымСсылкам = Ложь Тогда\n+\t\tПараметры.Добавить(\"-ClearUnresolvedRefs\");\n+\tКонецЕсли;\n+\n+\tЕсли Принудительно Тогда\n+\t\tПараметры.Добавить(\"-force\");\n+\tКонецЕсли;\n+\n+\tВыполнитьКоманду(Параметры);\n+\n+КонецПроцедуры\n+\n+Процедура СравнитьКонфигурации(Знач ТипПервойКонфигурации,","path":"src/v8runner/src/v8runner.os","position":null,"original_position":55,"commit_id":"860671fd6958dbd474b933a3072369cc25e563d6","original_commit_id":"0f9d389a59ee6637fd1007ef8884b01fe95d498a","user":{"login":"artbear","id":2920817,"avatar_url":"https://avatars.githubusercontent.com/u/2920817?v=3","gravatar_id":"","url":"https://api.github.com/users/artbear","html_url":"https://github.com/artbear","followers_url":"https://api.github.com/users/artbear/followers","following_url":"https://api.github.com/users/artbear/following{/other_user}","gists_url":"https://api.github.com/users/artbear/gists{/gist_id}","starred_url":"https://api.github.com/users/artbear/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/artbear/subscriptions","organizations_url":"https://api.github.com/users/artbear/orgs","repos_url":"https://api.github.com/users/artbear/repos","events_url":"https://api.github.com/users/artbear/events{/privacy}","received_events_url":"https://api.github.com/users/artbear/received_events","type":"User","site_admin":false},"body":"Мне вариант @dmpas понравился.\r\nВ клиентском коде все очень понятно.","created_at":"2016-07-21T21:36:49Z","updated_at":"2016-07-21T21:36:49Z","html_url":"https://github.com/EvilBeaver/oscript-library/pull/132#discussion_r71791818","pull_request_url":"https://api.github.com/repos/EvilBeaver/oscript-library/pulls/132","_links":{"self":{"href":"https://api.github.com/repos/EvilBeaver/oscript-library/pulls/comments/71791818"},"html":{"href":"https://github.com/EvilBeaver/oscript-library/pull/132#discussion_r71791818"},"pull_request":{"href":"https://api.github.com/repos/EvilBeaver/oscript-library/pulls/132"}}},"pull_request":{"url":"https://api.github.com/repos/EvilBeaver/oscript-library/pulls/132","id":78106900,"html_url":"https://github.com/EvilBeaver/oscript-library/pull/132","diff_url":"https://github.com/EvilBeaver/oscript-library/pull/132.diff","patch_url":"https://github.com/EvilBeaver/oscript-library/pull/132.patch","issue_url":"https://api.github.com/repos/EvilBeaver/oscript-library/issues/132","number":132,"state":"open","locked":false,"title":"Добавлена команда MergeCfg и CompareCfg","user":{"login":"nixel2007","id":1132840,"avatar_url":"https://avatars.githubusercontent.com/u/1132840?v=3","gravatar_id":"","url":"https://api.github.com/users/nixel2007","html_url":"https://github.com/nixel2007","followers_url":"https://api.github.com/users/nixel2007/followers","following_url":"https://api.github.com/users/nixel2007/following{/other_user}","gists_url":"https://api.github.com/users/nixel2007/gists{/gist_id}","starred_url":"https://api.github.com/users/nixel2007/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/nixel2007/subscriptions","organizations_url":"https://api.github.com/users/nixel2007/orgs","repos_url":"https://api.github.com/users/nixel2007/repos","events_url":"https://api.github.com/users/nixel2007/events{/privacy}","received_events_url":"https://api.github.com/users/nixel2007/received_events","type":"User","site_admin":false},"body":"Документация: http://its.1c.ru/db/v838doc#bookmark:adm:TI000000527\r\n\r\nТак же попробую добавить соседнюю команду /CompareCfg ","created_at":"2016-07-20T08:27:09Z","updated_at":"2016-07-21T21:36:49Z","closed_at":null,"merged_at":null,"merge_commit_sha":"06934f3bdda61c7ee92801ccc50cd79389a898b7","assignee":{"login":"artbear","id":2920817,"avatar_url":"https://avatars.githubusercontent.com/u/2920817?v=3","gravatar_id":"","url":"https://api.github.com/users/artbear","html_url":"https://github.com/artbear","followers_url":"https://api.github.com/users/artbear/followers","following_url":"https://api.github.com/users/artbear/following{/other_user}","gists_url":"https://api.github.com/users/artbear/gists{/gist_id}","starred_url":"https://api.github.com/users/artbear/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/artbear/subscriptions","organizations_url":"https://api.github.com/users/artbear/orgs","repos_url":"https://api.github.com/users/artbear/repos","events_url":"https://api.github.com/users/artbear/events{/privacy}","received_events_url":"https://api.github.com/users/artbear/received_events","type":"User","site_admin":false},"assignees":[{"login":"artbear","id":2920817,"avatar_url":"https://avatars.githubusercontent.com/u/2920817?v=3","gravatar_id":"","url":"https://api.github.com/users/artbear","html_url":"https://github.com/artbear","followers_url":"https://api.github.com/users/artbear/followers","following_url":"https://api.github.com/users/artbear/following{/other_user}","gists_url":"https://api.github.com/users/artbear/gists{/gist_id}","starred_url":"https://api.github.com/users/artbear/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/artbear/subscriptions","organizations_url":"https://api.github.com/users/artbear/orgs","repos_url":"https://api.github.com/users/artbear/repos","events_url":"https://api.github.com/users/artbear/events{/privacy}","received_events_url":"https://api.github.com/users/artbear/received_events","type":"User","site_admin":false}],"milestone":null,"commits_url":"https://api.github.com/repos/EvilBeaver/oscript-library/pulls/132/commits","review_comments_url":"https://api.github.com/repos/EvilBeaver/oscript-library/pulls/132/comments","review_comment_url":"https://api.github.com/repos/EvilBeaver/oscript-library/pulls/comments{/number}","comments_url":"https://api.github.com/repos/EvilBeaver/oscript-library/issues/132/comments","statuses_url":"https://api.github.com/repos/EvilBeaver/oscript-library/statuses/860671fd6958dbd474b933a3072369cc25e563d6","head":{"label":"nixel2007:feature/MergeCfg","ref":"feature/MergeCfg","sha":"860671fd6958dbd474b933a3072369cc25e563d6","user":{"login":"nixel2007","id":1132840,"avatar_url":"https://avatars.githubusercontent.com/u/1132840?v=3","gravatar_id":"","url":"https://api.github.com/users/nixel2007","html_url":"https://github.com/nixel2007","followers_url":"https://api.github.com/users/nixel2007/followers","following_url":"https://api.github.com/users/nixel2007/following{/other_user}","gists_url":"https://api.github.com/users/nixel2007/gists{/gist_id}","starred_url":"https://api.github.com/users/nixel2007/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/nixel2007/subscriptions","organizations_url":"https://api.github.com/users/nixel2007/orgs","repos_url":"https://api.github.com/users/nixel2007/repos","events_url":"https://api.github.com/users/nixel2007/events{/privacy}","received_events_url":"https://api.github.com/users/nixel2007/received_events","type":"User","site_admin":false},"repo":{"id":50036575,"name":"oscript-library","full_name":"nixel2007/oscript-library","owner":{"login":"nixel2007","id":1132840,"avatar_url":"https://avatars.githubusercontent.com/u/1132840?v=3","gravatar_id":"","url":"https://api.github.com/users/nixel2007","html_url":"https://github.com/nixel2007","followers_url":"https://api.github.com/users/nixel2007/followers","following_url":"https://api.github.com/users/nixel2007/following{/other_user}","gists_url":"https://api.github.com/users/nixel2007/gists{/gist_id}","starred_url":"https://api.github.com/users/nixel2007/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/nixel2007/subscriptions","organizations_url":"https://api.github.com/users/nixel2007/orgs","repos_url":"https://api.github.com/users/nixel2007/repos","events_url":"https://api.github.com/users/nixel2007/events{/privacy}","received_events_url":"https://api.github.com/users/nixel2007/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/nixel2007/oscript-library","description":"Библиотека полезных скриптов для 1Script","fork":true,"url":"https://api.github.com/repos/nixel2007/oscript-library","forks_url":"https://api.github.com/repos/nixel2007/oscript-library/forks","keys_url":"https://api.github.com/repos/nixel2007/oscript-library/keys{/key_id}","collaborators_url":"https://api.github.com/repos/nixel2007/oscript-library/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/nixel2007/oscript-library/teams","hooks_url":"https://api.github.com/repos/nixel2007/oscript-library/hooks","issue_events_url":"https://api.github.com/repos/nixel2007/oscript-library/issues/events{/number}","events_url":"https://api.github.com/repos/nixel2007/oscript-library/events","assignees_url":"https://api.github.com/repos/nixel2007/oscript-library/assignees{/user}","branches_url":"https://api.github.com/repos/nixel2007/oscript-library/branches{/branch}","tags_url":"https://api.github.com/repos/nixel2007/oscript-library/tags","blobs_url":"https://api.github.com/repos/nixel2007/oscript-library/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/nixel2007/oscript-library/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/nixel2007/oscript-library/git/refs{/sha}","trees_url":"https://api.github.com/repos/nixel2007/oscript-library/git/trees{/sha}","statuses_url":"https://api.github.com/repos/nixel2007/oscript-library/statuses/{sha}","languages_url":"https://api.github.com/repos/nixel2007/oscript-library/languages","stargazers_url":"https://api.github.com/repos/nixel2007/oscript-library/stargazers","contributors_url":"https://api.github.com/repos/nixel2007/oscript-library/contributors","subscribers_url":"https://api.github.com/repos/nixel2007/oscript-library/subscribers","subscription_url":"https://api.github.com/repos/nixel2007/oscript-library/subscription","commits_url":"https://api.github.com/repos/nixel2007/oscript-library/commits{/sha}","git_commits_url":"https://api.github.com/repos/nixel2007/oscript-library/git/commits{/sha}","comments_url":"https://api.github.com/repos/nixel2007/oscript-library/comments{/number}","issue_comment_url":"https://api.github.com/repos/nixel2007/oscript-library/issues/comments{/number}","contents_url":"https://api.github.com/repos/nixel2007/oscript-library/contents/{+path}","compare_url":"https://api.github.com/repos/nixel2007/oscript-library/compare/{base}...{head}","merges_url":"https://api.github.com/repos/nixel2007/oscript-library/merges","archive_url":"https://api.github.com/repos/nixel2007/oscript-library/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/nixel2007/oscript-library/downloads","issues_url":"https://api.github.com/repos/nixel2007/oscript-library/issues{/number}","pulls_url":"https://api.github.com/repos/nixel2007/oscript-library/pulls{/number}","milestones_url":"https://api.github.com/repos/nixel2007/oscript-library/milestones{/number}","notifications_url":"https://api.github.com/repos/nixel2007/oscript-library/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/nixel2007/oscript-library/labels{/name}","releases_url":"https://api.github.com/repos/nixel2007/oscript-library/releases{/id}","deployments_url":"https://api.github.com/repos/nixel2007/oscript-library/deployments","created_at":"2016-01-20T14:48:38Z","updated_at":"2016-01-20T14:48:40Z","pushed_at":"2016-07-20T15:31:46Z","git_url":"git://github.com/nixel2007/oscript-library.git","ssh_url":"git@github.com:nixel2007/oscript-library.git","clone_url":"https://github.com/nixel2007/oscript-library.git","svn_url":"https://github.com/nixel2007/oscript-library","homepage":"http://oscript.io/docs/page/libraries","size":1442,"stargazers_count":0,"watchers_count":0,"language":"Shell","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"develop"}},"base":{"label":"EvilBeaver:develop","ref":"develop","sha":"c6b50b0ed8a859ae7b2703e7a362b44b5f7ae5ff","user":{"login":"EvilBeaver","id":2657561,"avatar_url":"https://avatars.githubusercontent.com/u/2657561?v=3","gravatar_id":"","url":"https://api.github.com/users/EvilBeaver","html_url":"https://github.com/EvilBeaver","followers_url":"https://api.github.com/users/EvilBeaver/followers","following_url":"https://api.github.com/users/EvilBeaver/following{/other_user}","gists_url":"https://api.github.com/users/EvilBeaver/gists{/gist_id}","starred_url":"https://api.github.com/users/EvilBeaver/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/EvilBeaver/subscriptions","organizations_url":"https://api.github.com/users/EvilBeaver/orgs","repos_url":"https://api.github.com/users/EvilBeaver/repos","events_url":"https://api.github.com/users/EvilBeaver/events{/privacy}","received_events_url":"https://api.github.com/users/EvilBeaver/received_events","type":"User","site_admin":false},"repo":{"id":32417757,"name":"oscript-library","full_name":"EvilBeaver/oscript-library","owner":{"login":"EvilBeaver","id":2657561,"avatar_url":"https://avatars.githubusercontent.com/u/2657561?v=3","gravatar_id":"","url":"https://api.github.com/users/EvilBeaver","html_url":"https://github.com/EvilBeaver","followers_url":"https://api.github.com/users/EvilBeaver/followers","following_url":"https://api.github.com/users/EvilBeaver/following{/other_user}","gists_url":"https://api.github.com/users/EvilBeaver/gists{/gist_id}","starred_url":"https://api.github.com/users/EvilBeaver/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/EvilBeaver/subscriptions","organizations_url":"https://api.github.com/users/EvilBeaver/orgs","repos_url":"https://api.github.com/users/EvilBeaver/repos","events_url":"https://api.github.com/users/EvilBeaver/events{/privacy}","received_events_url":"https://api.github.com/users/EvilBeaver/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/EvilBeaver/oscript-library","description":"Библиотека полезных скриптов для 1Script","fork":false,"url":"https://api.github.com/repos/EvilBeaver/oscript-library","forks_url":"https://api.github.com/repos/EvilBeaver/oscript-library/forks","keys_url":"https://api.github.com/repos/EvilBeaver/oscript-library/keys{/key_id}","collaborators_url":"https://api.github.com/repos/EvilBeaver/oscript-library/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/EvilBeaver/oscript-library/teams","hooks_url":"https://api.github.com/repos/EvilBeaver/oscript-library/hooks","issue_events_url":"https://api.github.com/repos/EvilBeaver/oscript-library/issues/events{/number}","events_url":"https://api.github.com/repos/EvilBeaver/oscript-library/events","assignees_url":"https://api.github.com/repos/EvilBeaver/oscript-library/assignees{/user}","branches_url":"https://api.github.com/repos/EvilBeaver/oscript-library/branches{/branch}","tags_url":"https://api.github.com/repos/EvilBeaver/oscript-library/tags","blobs_url":"https://api.github.com/repos/EvilBeaver/oscript-library/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/EvilBeaver/oscript-library/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/EvilBeaver/oscript-library/git/refs{/sha}","trees_url":"https://api.github.com/repos/EvilBeaver/oscript-library/git/trees{/sha}","statuses_url":"https://api.github.com/repos/EvilBeaver/oscript-library/statuses/{sha}","languages_url":"https://api.github.com/repos/EvilBeaver/oscript-library/languages","stargazers_url":"https://api.github.com/repos/EvilBeaver/oscript-library/stargazers","contributors_url":"https://api.github.com/repos/EvilBeaver/oscript-library/contributors","subscribers_url":"https://api.github.com/repos/EvilBeaver/oscript-library/subscribers","subscription_url":"https://api.github.com/repos/EvilBeaver/oscript-library/subscription","commits_url":"https://api.github.com/repos/EvilBeaver/oscript-library/commits{/sha}","git_commits_url":"https://api.github.com/repos/EvilBeaver/oscript-library/git/commits{/sha}","comments_url":"https://api.github.com/repos/EvilBeaver/oscript-library/comments{/number}","issue_comment_url":"https://api.github.com/repos/EvilBeaver/oscript-library/issues/comments{/number}","contents_url":"https://api.github.com/repos/EvilBeaver/oscript-library/contents/{+path}","compare_url":"https://api.github.com/repos/EvilBeaver/oscript-library/compare/{base}...{head}","merges_url":"https://api.github.com/repos/EvilBeaver/oscript-library/merges","archive_url":"https://api.github.com/repos/EvilBeaver/oscript-library/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/EvilBeaver/oscript-library/downloads","issues_url":"https://api.github.com/repos/EvilBeaver/oscript-library/issues{/number}","pulls_url":"https://api.github.com/repos/EvilBeaver/oscript-library/pulls{/number}","milestones_url":"https://api.github.com/repos/EvilBeaver/oscript-library/milestones{/number}","notifications_url":"https://api.github.com/repos/EvilBeaver/oscript-library/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/EvilBeaver/oscript-library/labels{/name}","releases_url":"https://api.github.com/repos/EvilBeaver/oscript-library/releases{/id}","deployments_url":"https://api.github.com/repos/EvilBeaver/oscript-library/deployments","created_at":"2015-03-17T20:15:18Z","updated_at":"2016-07-21T18:18:18Z","pushed_at":"2016-07-20T15:31:46Z","git_url":"git://github.com/EvilBeaver/oscript-library.git","ssh_url":"git@github.com:EvilBeaver/oscript-library.git","clone_url":"https://github.com/EvilBeaver/oscript-library.git","svn_url":"https://github.com/EvilBeaver/oscript-library","homepage":"http://oscript.io/docs/page/libraries","size":1872,"stargazers_count":65,"watchers_count":65,"language":"Shell","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":35,"mirror_url":null,"open_issues_count":31,"forks":35,"open_issues":31,"watchers":65,"default_branch":"develop"}},"_links":{"self":{"href":"https://api.github.com/repos/EvilBeaver/oscript-library/pulls/132"},"html":{"href":"https://github.com/EvilBeaver/oscript-library/pull/132"},"issue":{"href":"https://api.github.com/repos/EvilBeaver/oscript-library/issues/132"},"comments":{"href":"https://api.github.com/repos/EvilBeaver/oscript-library/issues/132/comments"},"review_comments":{"href":"https://api.github.com/repos/EvilBeaver/oscript-library/pulls/132/comments"},"review_comment":{"href":"https://api.github.com/repos/EvilBeaver/oscript-library/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/EvilBeaver/oscript-library/pulls/132/commits"},"statuses":{"href":"https://api.github.com/repos/EvilBeaver/oscript-library/statuses/860671fd6958dbd474b933a3072369cc25e563d6"}}}}
{"actor":{"display_login":"artbear"}}