repo stringlengths 8 50 | commit stringlengths 40 40 | path stringlengths 5 171 | lang stringclasses 5
values | license stringclasses 13
values | message stringlengths 21 1.33k | old_code stringlengths 15 2.4k | new_code stringlengths 140 2.61k | n_added int64 0 81 | n_removed int64 0 58 | n_hunks int64 1 8 | change_kind stringclasses 3
values | udiff stringlengths 88 3.33k | udiff-h stringlengths 85 3.32k | udiff-l stringlengths 95 3.57k | search-replace stringlengths 89 3.36k |
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
utPLSQL/utPLSQL-cli | 3513f49df275866ecf71be8defd581707cf67dc0 | src/test/java/org/utplsql/cli/DataSourceProviderIT.java | java | apache-2.0 | Test to parse/set NLS_LANG correctly
| package org.utplsql.cli;
import org.junit.jupiter.api.Test;
import org.utplsql.cli.datasource.TestedDataSourceProvider;
import javax.sql.DataSource;
import java.io.IOException;
import java.sql.SQLException;
import static org.junit.jupiter.api.Assertions.assertNotNull;
public class DataSourceProviderIT {
@Test
... | package org.utplsql.cli;
import org.junit.jupiter.api.Test;
import org.utplsql.cli.datasource.TestedDataSourceProvider;
import javax.sql.DataSource;
import java.io.IOException;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import static org.ju... | 44 | 0 | 2 | add_only | --- a/src/test/java/org/utplsql/cli/DataSourceProviderIT.java
+++ b/src/test/java/org/utplsql/cli/DataSourceProviderIT.java
@@ -7,4 +7,8 @@
import java.io.IOException;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
import java.sql.SQLException;
+import static org.junit.... | --- a/src/test/java/org/utplsql/cli/DataSourceProviderIT.java
+++ b/src/test/java/org/utplsql/cli/DataSourceProviderIT.java
@@ ... @@
import java.io.IOException;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
import java.sql.SQLException;
+import static org.junit.jupite... | --- a/src/test/java/org/utplsql/cli/DataSourceProviderIT.java
+++ b/src/test/java/org/utplsql/cli/DataSourceProviderIT.java
@@ -7,4 +7,8 @@
CON import java.io.IOException;
ADD import java.sql.Connection;
ADD import java.sql.PreparedStatement;
ADD import java.sql.ResultSet;
CON import java.sql.SQLException;
CON
ADD imp... | <<<<<<< SEARCH
import javax.sql.DataSource;
import java.io.IOException;
import java.sql.SQLException;
import static org.junit.jupiter.api.Assertions.assertNotNull;
=======
import javax.sql.DataSource;
import java.io.IOException;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet... |
Helioviewer-Project/JHelioviewer-SWHV | 5f61f167662112aa040e554d5004f3aaee4c3c99 | src/plugins/swhv-swek/sources/HEKSource/src/org/helioviewer/jhv/plugins/swek/sources/hek/HEKSourceProperties.java | java | mpl-2.0 | Load the properties from via the correct Class otherwise it is not in the class loader
git-svn-id: 4e353c0944fe8da334633afc35765ef362dec675@2010 b4e469a2-07ce-4b26-9273-4d7d95a670c7
| package org.helioviewer.jhv.plugins.swek.sources.hek;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
import org.helioviewer.jhv.plugins.swek.SWEKPlugin;
/**
* Gives access to the HEK source properties
*
* @author Bram Bourgoignie (Bram.Bourgoignie@oma.be)
*
*/
public clas... | package org.helioviewer.jhv.plugins.swek.sources.hek;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
/**
* Gives access to the HEK source properties
*
* @author Bram Bourgoignie (Bram.Bourgoignie@oma.be)
*
*/
public class HEKSourceProperties {
private static HEKSourceP... | 4 | 6 | 4 | mixed | --- a/src/plugins/swhv-swek/sources/HEKSource/src/org/helioviewer/jhv/plugins/swek/sources/hek/HEKSourceProperties.java
+++ b/src/plugins/swhv-swek/sources/HEKSource/src/org/helioviewer/jhv/plugins/swek/sources/hek/HEKSourceProperties.java
@@ -5,4 +5,2 @@
import java.util.Properties;
-
-import org.helioviewer.jhv.plug... | --- a/src/plugins/swhv-swek/sources/HEKSource/src/org/helioviewer/jhv/plugins/swek/sources/hek/HEKSourceProperties.java
+++ b/src/plugins/swhv-swek/sources/HEKSource/src/org/helioviewer/jhv/plugins/swek/sources/hek/HEKSourceProperties.java
@@ ... @@
import java.util.Properties;
-
-import org.helioviewer.jhv.plugins.sw... | --- a/src/plugins/swhv-swek/sources/HEKSource/src/org/helioviewer/jhv/plugins/swek/sources/hek/HEKSourceProperties.java
+++ b/src/plugins/swhv-swek/sources/HEKSource/src/org/helioviewer/jhv/plugins/swek/sources/hek/HEKSourceProperties.java
@@ -5,4 +5,2 @@
CON import java.util.Properties;
DEL
DEL import org.helioviewer... | <<<<<<< SEARCH
import java.io.InputStream;
import java.util.Properties;
import org.helioviewer.jhv.plugins.swek.SWEKPlugin;
/**
=======
import java.io.InputStream;
import java.util.Properties;
/**
>>>>>>> REPLACE
<<<<<<< SEARCH
*/
private HEKSourceProperties() {
this.hekSourceProperties = new Pro... |
fusionbox/django-verified-email-change | 27851b9f2371853f1386d0033d0b9b2d0ef74b75 | setup.py | python | bsd-2-clause | Include templates in package distribution
| import sys
from setuptools import setup
# To use a consistent encoding
from codecs import open
from os import path
here = path.abspath(path.dirname(__file__))
# Get the long description from the relevant file
with open(path.join(here, 'README.rst'), encoding='utf-8') as f:
long_description = f.read()
from setup... | import sys
from setuptools import setup
# To use a consistent encoding
from codecs import open
from os import path
here = path.abspath(path.dirname(__file__))
# Get the long description from the relevant file
with open(path.join(here, 'README.rst'), encoding='utf-8') as f:
long_description = f.read()
from setup... | 4 | 1 | 2 | mixed | --- a/setup.py
+++ b/setup.py
@@ -36,3 +36,3 @@
name='django-verified-email',
- version='0.1.1.dev0',
+ version='0.1.1',
description='Verified email changes for django',
@@ -53,2 +53,5 @@
],
+ package_data={
+ '': ['templates/**/*.html'],
+ },
) | --- a/setup.py
+++ b/setup.py
@@ ... @@
name='django-verified-email',
- version='0.1.1.dev0',
+ version='0.1.1',
description='Verified email changes for django',
@@ ... @@
],
+ package_data={
+ '': ['templates/**/*.html'],
+ },
)
| --- a/setup.py
+++ b/setup.py
@@ -36,3 +36,3 @@
CON name='django-verified-email',
DEL version='0.1.1.dev0',
ADD version='0.1.1',
CON description='Verified email changes for django',
@@ -53,2 +53,5 @@
CON ],
ADD package_data={
ADD '': ['templates/**/*.html'],
ADD },
CON )
| <<<<<<< SEARCH
setup(
name='django-verified-email',
version='0.1.1.dev0',
description='Verified email changes for django',
long_description=long_description,
=======
setup(
name='django-verified-email',
version='0.1.1',
description='Verified email changes for django',
long_description=l... |
musalbas/Nuclibook | 4fd7840a1b3b7387c918de8f1369e14c62190dc7 | src/main/java/nuclibook/routes/ExportRoute.java | java | agpl-3.0 | Add export log + permissions
| package nuclibook.routes;
import nuclibook.constants.P;
import nuclibook.entity_utils.ExportUtils;
import nuclibook.entity_utils.PatientUtils;
import nuclibook.entity_utils.SecurityUtils;
import nuclibook.models.Patient;
import nuclibook.server.HtmlRenderer;
import spark.Request;
import spark.Response;
import java.ut... | package nuclibook.routes;
import nuclibook.constants.P;
import nuclibook.entity_utils.ActionLogger;
import nuclibook.entity_utils.ExportUtils;
import nuclibook.entity_utils.PatientUtils;
import nuclibook.entity_utils.SecurityUtils;
import nuclibook.models.Patient;
import nuclibook.server.HtmlRenderer;
import spark.Req... | 5 | 1 | 3 | mixed | --- a/src/main/java/nuclibook/routes/ExportRoute.java
+++ b/src/main/java/nuclibook/routes/ExportRoute.java
@@ -3,2 +3,3 @@
import nuclibook.constants.P;
+import nuclibook.entity_utils.ActionLogger;
import nuclibook.entity_utils.ExportUtils;
@@ -33,3 +34,3 @@
if (table.equals("patients")) {
- if (... | --- a/src/main/java/nuclibook/routes/ExportRoute.java
+++ b/src/main/java/nuclibook/routes/ExportRoute.java
@@ ... @@
import nuclibook.constants.P;
+import nuclibook.entity_utils.ActionLogger;
import nuclibook.entity_utils.ExportUtils;
@@ ... @@
if (table.equals("patients")) {
- if (SecurityUtils.... | --- a/src/main/java/nuclibook/routes/ExportRoute.java
+++ b/src/main/java/nuclibook/routes/ExportRoute.java
@@ -3,2 +3,3 @@
CON import nuclibook.constants.P;
ADD import nuclibook.entity_utils.ActionLogger;
CON import nuclibook.entity_utils.ExportUtils;
@@ -33,3 +34,3 @@
CON if (table.equals("patients")) {
DEL ... | <<<<<<< SEARCH
import nuclibook.constants.P;
import nuclibook.entity_utils.ExportUtils;
import nuclibook.entity_utils.PatientUtils;
=======
import nuclibook.constants.P;
import nuclibook.entity_utils.ActionLogger;
import nuclibook.entity_utils.ExportUtils;
import nuclibook.entity_utils.PatientUtils;
>>>>>>> REPLACE... |
Frojd/wagtail-geo-widget | 471bb3847b78f36f79af6cbae288a8876357cb3c | runtests.py | python | mit | Add missing config that caused test to fail
| #!/usr/bin/env python
import sys
from django.conf import settings
from django.core.management import execute_from_command_line
if not settings.configured:
params = dict(
LOGGING = {
'version': 1,
'disable_existing_loggers': False,
'handlers': {
'consol... | #!/usr/bin/env python
import sys
from django.conf import settings
from django.core.management import execute_from_command_line
if not settings.configured:
params = dict(
LOGGING = {
'version': 1,
'disable_existing_loggers': False,
'handlers': {
'consol... | 2 | 0 | 2 | add_only | --- a/runtests.py
+++ b/runtests.py
@@ -36,2 +36,3 @@
'wagtail.core',
+ "wagtail.admin",
'wagtail.sites',
@@ -45,2 +46,3 @@
ROOT_URLCONF='tests.urls',
+ SECRET_KEY="secret key",
) | --- a/runtests.py
+++ b/runtests.py
@@ ... @@
'wagtail.core',
+ "wagtail.admin",
'wagtail.sites',
@@ ... @@
ROOT_URLCONF='tests.urls',
+ SECRET_KEY="secret key",
)
| --- a/runtests.py
+++ b/runtests.py
@@ -36,2 +36,3 @@
CON 'wagtail.core',
ADD "wagtail.admin",
CON 'wagtail.sites',
@@ -45,2 +46,3 @@
CON ROOT_URLCONF='tests.urls',
ADD SECRET_KEY="secret key",
CON )
| <<<<<<< SEARCH
'django.contrib.sites',
'wagtail.core',
'wagtail.sites',
'wagtail.users',
=======
'django.contrib.sites',
'wagtail.core',
"wagtail.admin",
'wagtail.sites',
'wagtail.users',
>>>>>>> REPLACE
<<<<<... |
MXProgrammingClub/Chem-Helper | b3b5fa598c1b5a9acd7b1e2e02da1ef6ff8a44a1 | src/Functions/ElementPanel.java | java | bsd-3-clause | Revert "Revert "Made the periodic table different""
This reverts commit cd0982549189edad00fd944b8c31dfdd4bc79030.
| package Functions;
import javax.swing.*;
import javax.swing.border.*;
import Elements.Element;
import java.awt.*;
public class ElementPanel extends JPanel
{
private Element element;
public ElementPanel(Element element)
{
this.element = element;
if(element != null)
{
String name = element.getSymbol();
... | package Functions;
import javax.swing.*;
import javax.swing.border.*;
import Elements.Element;
import java.awt.*;
public class ElementPanel extends JPanel
{
private Element element;
public ElementPanel(Element element)
{
this.element = element;
if(element != null)
{
String name = element.getSymbol();
... | 17 | 1 | 1 | mixed | --- a/src/Functions/ElementPanel.java
+++ b/src/Functions/ElementPanel.java
@@ -35,4 +35,20 @@
- add(new JLabel(name));
+ this.setLayout(new GridBagLayout());
+ GridBagConstraints c = new GridBagConstraints();
+ c.ipady = -5;
+ c.gridy = 0;
+ add(new JLabel("" + element.getNum()), c);
+
+ c.gridy = 1... | --- a/src/Functions/ElementPanel.java
+++ b/src/Functions/ElementPanel.java
@@ ... @@
- add(new JLabel(name));
+ this.setLayout(new GridBagLayout());
+ GridBagConstraints c = new GridBagConstraints();
+ c.ipady = -5;
+ c.gridy = 0;
+ add(new JLabel("" + element.getNum()), c);
+
+ c.gridy = 1;
+ add... | --- a/src/Functions/ElementPanel.java
+++ b/src/Functions/ElementPanel.java
@@ -35,4 +35,20 @@
CON
DEL add(new JLabel(name));
ADD this.setLayout(new GridBagLayout());
ADD GridBagConstraints c = new GridBagConstraints();
ADD c.ipady = -5;
ADD c.gridy = 0;
ADD add(new JLabel("" + element.getNum()), ... | <<<<<<< SEARCH
}
add(new JLabel(name));
setBorder(new CompoundBorder(new LineBorder(Color.BLACK, 1), new EmptyBorder(6, 6, 6, 6)));
}
}
=======
}
this.setLayout(new GridBagLayout());
GridBagConstraints c = new GridBagConstraints();
c.ipady = -5;
c.gridy = 0;
add(new JLabel("" + el... |
jenzz/RxAppState | 8661a20ed8730484f3a195d8d80e5487e511fa0c | sample/src/main/java/com/jenzz/appstate/sample/SampleApplication.java | java | mit | Add logging for app state changes
| package com.jenzz.appstate.sample;
import android.app.Application;
import android.widget.Toast;
import com.jenzz.appstate.AppState;
import com.jenzz.appstate.AppStateListener;
import com.jenzz.appstate.RxAppState;
import rx.functions.Action1;
import static android.widget.Toast.LENGTH_LONG;
import static com.jenzz.app... | package com.jenzz.appstate.sample;
import android.app.Application;
import android.util.Log;
import android.widget.Toast;
import com.jenzz.appstate.AppState;
import com.jenzz.appstate.AppStateListener;
import com.jenzz.appstate.RxAppState;
import rx.functions.Action1;
import static android.widget.Toast.LENGTH_LONG;
... | 12 | 2 | 5 | mixed | --- a/sample/src/main/java/com/jenzz/appstate/sample/SampleApplication.java
+++ b/sample/src/main/java/com/jenzz/appstate/sample/SampleApplication.java
@@ -3,3 +3,5 @@
import android.app.Application;
+import android.util.Log;
import android.widget.Toast;
+
import com.jenzz.appstate.AppState;
@@ -7,2 +9,3 @@
import ... | --- a/sample/src/main/java/com/jenzz/appstate/sample/SampleApplication.java
+++ b/sample/src/main/java/com/jenzz/appstate/sample/SampleApplication.java
@@ ... @@
import android.app.Application;
+import android.util.Log;
import android.widget.Toast;
+
import com.jenzz.appstate.AppState;
@@ ... @@
import com.jenzz.ap... | --- a/sample/src/main/java/com/jenzz/appstate/sample/SampleApplication.java
+++ b/sample/src/main/java/com/jenzz/appstate/sample/SampleApplication.java
@@ -3,3 +3,5 @@
CON import android.app.Application;
ADD import android.util.Log;
CON import android.widget.Toast;
ADD
CON import com.jenzz.appstate.AppState;
@@ -7,2 +... | <<<<<<< SEARCH
import android.app.Application;
import android.widget.Toast;
import com.jenzz.appstate.AppState;
import com.jenzz.appstate.AppStateListener;
import com.jenzz.appstate.RxAppState;
import rx.functions.Action1;
=======
import android.app.Application;
import android.util.Log;
import android.widget.Toast;... |
bpsinc-native/src_third_party_trace-viewer | 3c861924204637aee67ea9e9d6e19145b7098935 | src/tracing/trace_model/timed_event.js | javascript | bsd-3-clause | Fix TimedEvent sets GUID twice
TBR=nduca@chromium.org
BUG=
Review URL: https://codereview.appspot.com/12746044
git-svn-id: 3a56fcae908c7e16d23cb53443ea4795ac387cf2@896 0e6d7f2b-9903-5b78-7403-59d27f066143
| // Copyright (c) 2013 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
'use strict';
base.require('base.guid');
base.require('tracing.trace_model.event');
/**
* @fileoverview Provides the TimedEvent class.
*/
base.exp... | // Copyright (c) 2013 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
'use strict';
base.require('base.guid');
base.require('tracing.trace_model.event');
/**
* @fileoverview Provides the TimedEvent class.
*/
base.exp... | 0 | 1 | 1 | del_only | --- a/src/tracing/trace_model/timed_event.js
+++ b/src/tracing/trace_model/timed_event.js
@@ -21,3 +21,2 @@
tracing.trace_model.Event.call(this);
- this.guid_ = base.GUID.allocate();
this.start = start; | --- a/src/tracing/trace_model/timed_event.js
+++ b/src/tracing/trace_model/timed_event.js
@@ ... @@
tracing.trace_model.Event.call(this);
- this.guid_ = base.GUID.allocate();
this.start = start;
| --- a/src/tracing/trace_model/timed_event.js
+++ b/src/tracing/trace_model/timed_event.js
@@ -21,3 +21,2 @@
CON tracing.trace_model.Event.call(this);
DEL this.guid_ = base.GUID.allocate();
CON this.start = start;
| <<<<<<< SEARCH
function TimedEvent(start) {
tracing.trace_model.Event.call(this);
this.guid_ = base.GUID.allocate();
this.start = start;
this.duration = 0;
=======
function TimedEvent(start) {
tracing.trace_model.Event.call(this);
this.start = start;
this.duration = 0;
>>>>>>> REPLACE
|
marius-m/wt4 | 84fffd969b52ac6af3484a53ab2f5f2a11d42160 | remote/src/main/java/lt/markmerkk/tickets/JiraProjectStatusesEmitter.kt | kotlin | apache-2.0 | Fix filter for ticket status
| package lt.markmerkk.tickets
import lt.markmerkk.Tags
import lt.markmerkk.entities.TicketStatus
import net.rcarz.jiraclient.JiraClient
import net.rcarz.jiraclient.JiraException
import net.rcarz.jiraclient.Project
import net.rcarz.jiraclient.Status
import org.slf4j.LoggerFactory
import rx.Emitter
import rx.functions.Ac... | package lt.markmerkk.tickets
import lt.markmerkk.Tags
import lt.markmerkk.entities.TicketStatus
import net.rcarz.jiraclient.JiraClient
import net.rcarz.jiraclient.JiraException
import net.rcarz.jiraclient.Project
import net.rcarz.jiraclient.Status
import org.slf4j.LoggerFactory
import rx.Emitter
import rx.functions.Ac... | 6 | 2 | 1 | mixed | --- a/remote/src/main/java/lt/markmerkk/tickets/JiraProjectStatusesEmitter.kt
+++ b/remote/src/main/java/lt/markmerkk/tickets/JiraProjectStatusesEmitter.kt
@@ -18,6 +18,10 @@
try {
- val projectStatuses = jiraClient.projects
+ val projects = jiraClient.projects
+ logger.info("F... | --- a/remote/src/main/java/lt/markmerkk/tickets/JiraProjectStatusesEmitter.kt
+++ b/remote/src/main/java/lt/markmerkk/tickets/JiraProjectStatusesEmitter.kt
@@ ... @@
try {
- val projectStatuses = jiraClient.projects
+ val projects = jiraClient.projects
+ logger.info("Found ${pr... | --- a/remote/src/main/java/lt/markmerkk/tickets/JiraProjectStatusesEmitter.kt
+++ b/remote/src/main/java/lt/markmerkk/tickets/JiraProjectStatusesEmitter.kt
@@ -18,6 +18,10 @@
CON try {
DEL val projectStatuses = jiraClient.projects
ADD val projects = jiraClient.projects
ADD lo... | <<<<<<< SEARCH
override fun call(emitter: Emitter<List<Status>>) {
try {
val projectStatuses = jiraClient.projects
.flatMap { jiraClient.getProjectStatuses(it.key) }
logger.info("Found ${projectStatuses.size} project statuses.")
emitter.onNext(projectS... |
ligee/kotlin-jupyter | d331ae2c5e13ce2dc2ae85e480f5be801b05cc96 | jupyter-lib/lib-ext/src/main/kotlin/org/jetbrains/kotlinx/jupyter/ext/graph/wrappers/ClassLoaderNode.kt | kotlin | apache-2.0 | Add configuration for classloader rendering
| package org.jetbrains.kotlinx.jupyter.ext.graph.wrappers
import org.jetbrains.kotlinx.jupyter.api.graphs.GraphNode
import org.jetbrains.kotlinx.jupyter.api.graphs.NodeWrapper
import org.jetbrains.kotlinx.jupyter.api.graphs.labels.TextLabel
import java.net.URLClassLoader
import kotlin.reflect.KClass
class ClassLoaderN... | package org.jetbrains.kotlinx.jupyter.ext.graph.wrappers
import org.jetbrains.kotlinx.jupyter.api.graphs.GraphNode
import org.jetbrains.kotlinx.jupyter.api.graphs.NodeWrapper
import org.jetbrains.kotlinx.jupyter.api.graphs.labels.TextLabel
import java.net.URLClassLoader
import kotlin.reflect.KClass
class ClassLoaderR... | 34 | 10 | 2 | mixed | --- a/jupyter-lib/lib-ext/src/main/kotlin/org/jetbrains/kotlinx/jupyter/ext/graph/wrappers/ClassLoaderNode.kt
+++ b/jupyter-lib/lib-ext/src/main/kotlin/org/jetbrains/kotlinx/jupyter/ext/graph/wrappers/ClassLoaderNode.kt
@@ -8,13 +8,31 @@
-class ClassLoaderNode(node: ClassLoader) : NodeWrapper<ClassLoader>(node) {
+cl... | --- a/jupyter-lib/lib-ext/src/main/kotlin/org/jetbrains/kotlinx/jupyter/ext/graph/wrappers/ClassLoaderNode.kt
+++ b/jupyter-lib/lib-ext/src/main/kotlin/org/jetbrains/kotlinx/jupyter/ext/graph/wrappers/ClassLoaderNode.kt
@@ ... @@
-class ClassLoaderNode(node: ClassLoader) : NodeWrapper<ClassLoader>(node) {
+class Clas... | --- a/jupyter-lib/lib-ext/src/main/kotlin/org/jetbrains/kotlinx/jupyter/ext/graph/wrappers/ClassLoaderNode.kt
+++ b/jupyter-lib/lib-ext/src/main/kotlin/org/jetbrains/kotlinx/jupyter/ext/graph/wrappers/ClassLoaderNode.kt
@@ -8,13 +8,31 @@
CON
DEL class ClassLoaderNode(node: ClassLoader) : NodeWrapper<ClassLoader>(node)... | <<<<<<< SEARCH
import kotlin.reflect.KClass
class ClassLoaderNode(node: ClassLoader) : NodeWrapper<ClassLoader>(node) {
override val inNodes by lazy {
node.parent?.let { listOf(ClassLoaderNode(it)) } ?: emptyList()
}
override val label = TextLabel(
when (node) {
is URLClassLoade... |
360youlun/cmsplugin-bootstrap-carousel | c0b9c9712e464f304bee7c63bfd6b197a1c5fb0f | cmsplugin_bootstrap_carousel/cms_plugins.py | python | bsd-3-clause | Change extra from 3 to 0.
| # coding: utf-8
import re
from cms.plugin_base import CMSPluginBase
from cms.plugin_pool import plugin_pool
from cmsplugin_bootstrap_carousel.models import *
from django.utils.translation import ugettext as _
from django.contrib import admin
from django.forms import ModelForm, ValidationError
class CarouselForm(ModelF... | # coding: utf-8
import re
from cms.plugin_base import CMSPluginBase
from cms.plugin_pool import plugin_pool
from cmsplugin_bootstrap_carousel.models import *
from django.utils.translation import ugettext as _
from django.contrib import admin
from django.forms import ModelForm, ValidationError
class CarouselForm(ModelF... | 1 | 0 | 1 | add_only | --- a/cmsplugin_bootstrap_carousel/cms_plugins.py
+++ b/cmsplugin_bootstrap_carousel/cms_plugins.py
@@ -22,2 +22,3 @@
model = CarouselItem
+ extra = 0
| --- a/cmsplugin_bootstrap_carousel/cms_plugins.py
+++ b/cmsplugin_bootstrap_carousel/cms_plugins.py
@@ ... @@
model = CarouselItem
+ extra = 0
| --- a/cmsplugin_bootstrap_carousel/cms_plugins.py
+++ b/cmsplugin_bootstrap_carousel/cms_plugins.py
@@ -22,2 +22,3 @@
CON model = CarouselItem
ADD extra = 0
CON
| <<<<<<< SEARCH
class CarouselItemInline(admin.StackedInline):
model = CarouselItem
=======
class CarouselItemInline(admin.StackedInline):
model = CarouselItem
extra = 0
>>>>>>> REPLACE
|
ktorio/ktor | 041000d575f4659cbac18f594f55d0b6125ac430 | ktor-servlet/src/org/jetbrains/ktor/servlet/ServletApplicationRequest.kt | kotlin | apache-2.0 | Fix missing query values in requestLine for Servlet host.
| package org.jetbrains.ktor.servlet
import org.jetbrains.ktor.application.*
import org.jetbrains.ktor.http.*
import org.jetbrains.ktor.interception.*
import java.io.*
import java.nio.charset.*
import java.util.*
import javax.servlet.*
import javax.servlet.http.*
public class ServletApplicationRequest(private val servl... | package org.jetbrains.ktor.servlet
import org.jetbrains.ktor.application.*
import org.jetbrains.ktor.http.*
import org.jetbrains.ktor.interception.*
import java.io.*
import java.nio.charset.*
import java.util.*
import javax.servlet.*
import javax.servlet.http.*
public class ServletApplicationRequest(private val servl... | 5 | 1 | 1 | mixed | --- a/ktor-servlet/src/org/jetbrains/ktor/servlet/ServletApplicationRequest.kt
+++ b/ktor-servlet/src/org/jetbrains/ktor/servlet/ServletApplicationRequest.kt
@@ -13,3 +13,7 @@
override val requestLine: HttpRequestLine by lazy {
- HttpRequestLine(HttpMethod.parse(servletRequest.method), servletRequest.reques... | --- a/ktor-servlet/src/org/jetbrains/ktor/servlet/ServletApplicationRequest.kt
+++ b/ktor-servlet/src/org/jetbrains/ktor/servlet/ServletApplicationRequest.kt
@@ ... @@
override val requestLine: HttpRequestLine by lazy {
- HttpRequestLine(HttpMethod.parse(servletRequest.method), servletRequest.requestURI, se... | --- a/ktor-servlet/src/org/jetbrains/ktor/servlet/ServletApplicationRequest.kt
+++ b/ktor-servlet/src/org/jetbrains/ktor/servlet/ServletApplicationRequest.kt
@@ -13,3 +13,7 @@
CON override val requestLine: HttpRequestLine by lazy {
DEL HttpRequestLine(HttpMethod.parse(servletRequest.method), servletRequest.... | <<<<<<< SEARCH
public class ServletApplicationRequest(private val servletRequest: HttpServletRequest) : ApplicationRequest {
override val requestLine: HttpRequestLine by lazy {
HttpRequestLine(HttpMethod.parse(servletRequest.method), servletRequest.requestURI, servletRequest.protocol)
}
=======
public... |
alexcrichton/futures-rs | 92710890d9aa6db1be0ff5f679c14397f678e6f3 | futures/tests/async_await/pinned.rs | rust | apache-2.0 | Add test of awaiting StableFuture from an async_move function
| use futures::stable::block_on_stable;
use futures::prelude::*;
#[async]
fn foo() -> Result<i32, i32> {
Ok(1)
}
#[async]
fn bar(x: &i32) -> Result<i32, i32> {
Ok(*x)
}
#[async]
fn baz(x: i32) -> Result<i32, i32> {
await!(bar(&x))
}
#[async_stream(item = u64)]
fn _stream1() -> Result<(), i32> {
fn int... | use futures::stable::{block_on_stable, StableFuture};
use futures::prelude::*;
#[async]
fn foo() -> Result<i32, i32> {
Ok(1)
}
#[async]
fn bar(x: &i32) -> Result<i32, i32> {
Ok(*x)
}
#[async]
fn baz(x: i32) -> Result<i32, i32> {
await!(bar(&x))
}
#[async_move]
fn qux(x: i32) -> Result<i32, i32> {
aw... | 7 | 1 | 3 | mixed | --- a/futures/tests/async_await/pinned.rs
+++ b/futures/tests/async_await/pinned.rs
@@ -1,2 +1,2 @@
-use futures::stable::block_on_stable;
+use futures::stable::{block_on_stable, StableFuture};
use futures::prelude::*;
@@ -16,2 +16,7 @@
await!(bar(&x))
+}
+
+#[async_move]
+fn qux(x: i32) -> Result<i32, i32> {
+ ... | --- a/futures/tests/async_await/pinned.rs
+++ b/futures/tests/async_await/pinned.rs
@@ ... @@
-use futures::stable::block_on_stable;
+use futures::stable::{block_on_stable, StableFuture};
use futures::prelude::*;
@@ ... @@
await!(bar(&x))
+}
+
+#[async_move]
+fn qux(x: i32) -> Result<i32, i32> {
+ await!(baz(x... | --- a/futures/tests/async_await/pinned.rs
+++ b/futures/tests/async_await/pinned.rs
@@ -1,2 +1,2 @@
DEL use futures::stable::block_on_stable;
ADD use futures::stable::{block_on_stable, StableFuture};
CON use futures::prelude::*;
@@ -16,2 +16,7 @@
CON await!(bar(&x))
ADD }
ADD
ADD #[async_move]
ADD fn qux(x: i32) -... | <<<<<<< SEARCH
use futures::stable::block_on_stable;
use futures::prelude::*;
=======
use futures::stable::{block_on_stable, StableFuture};
use futures::prelude::*;
>>>>>>> REPLACE
<<<<<<< SEARCH
fn baz(x: i32) -> Result<i32, i32> {
await!(bar(&x))
}
=======
fn baz(x: i32) -> Result<i32, i32> {
await!(ba... |
wealthfront/magellan | 0ac28633ae32e10c245d75573ea7937033585625 | magellan-library/src/main/java/com/wealthfront/magellan/transitions/DefaultTransition.kt | kotlin | apache-2.0 | Update default transition to match the material guidelines
| package com.wealthfront.magellan.transitions
import android.animation.Animator
import android.animation.AnimatorListenerAdapter
import android.animation.AnimatorSet
import android.animation.ObjectAnimator
import android.util.Property
import android.view.View
import com.wealthfront.magellan.Direction
public class Defa... | package com.wealthfront.magellan.transitions
import android.animation.Animator
import android.animation.AnimatorListenerAdapter
import android.animation.AnimatorSet
import android.animation.ObjectAnimator
import android.util.Property
import android.view.View
import androidx.interpolator.view.animation.FastOutSlowInInt... | 8 | 0 | 2 | add_only | --- a/magellan-library/src/main/java/com/wealthfront/magellan/transitions/DefaultTransition.kt
+++ b/magellan-library/src/main/java/com/wealthfront/magellan/transitions/DefaultTransition.kt
@@ -8,4 +8,11 @@
import android.view.View
+import androidx.interpolator.view.animation.FastOutSlowInInterpolator
import com.weal... | --- a/magellan-library/src/main/java/com/wealthfront/magellan/transitions/DefaultTransition.kt
+++ b/magellan-library/src/main/java/com/wealthfront/magellan/transitions/DefaultTransition.kt
@@ ... @@
import android.view.View
+import androidx.interpolator.view.animation.FastOutSlowInInterpolator
import com.wealthfront... | --- a/magellan-library/src/main/java/com/wealthfront/magellan/transitions/DefaultTransition.kt
+++ b/magellan-library/src/main/java/com/wealthfront/magellan/transitions/DefaultTransition.kt
@@ -8,4 +8,11 @@
CON import android.view.View
ADD import androidx.interpolator.view.animation.FastOutSlowInInterpolator
CON import... | <<<<<<< SEARCH
import android.util.Property
import android.view.View
import com.wealthfront.magellan.Direction
public class DefaultTransition : MagellanTransition {
=======
import android.util.Property
import android.view.View
import androidx.interpolator.view.animation.FastOutSlowInInterpolator
import com.wealthfro... |
MichaelRocks/lightsaber | 9e96c81d0ba3e87a06226a4f52023cc8a9569030 | processor/src/main/kotlin/io/michaelrocks/lightsaber/processor/io/FileExtensions.kt | kotlin | apache-2.0 | Return empty sink and source for a non-existent input file
| /*
* Copyright 2015 Michael Rozumyanskiy
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or a... | /*
* Copyright 2015 Michael Rozumyanskiy
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or a... | 4 | 1 | 4 | mixed | --- a/processor/src/main/kotlin/io/michaelrocks/lightsaber/processor/io/FileExtensions.kt
+++ b/processor/src/main/kotlin/io/michaelrocks/lightsaber/processor/io/FileExtensions.kt
@@ -20,3 +20,3 @@
-private enum class FileType { DIRECTORY, JAR }
+private enum class FileType { EMPTY, DIRECTORY, JAR }
@@ -24,2 +24,3 ... | --- a/processor/src/main/kotlin/io/michaelrocks/lightsaber/processor/io/FileExtensions.kt
+++ b/processor/src/main/kotlin/io/michaelrocks/lightsaber/processor/io/FileExtensions.kt
@@ ... @@
-private enum class FileType { DIRECTORY, JAR }
+private enum class FileType { EMPTY, DIRECTORY, JAR }
@@ ... @@
get() = wh... | --- a/processor/src/main/kotlin/io/michaelrocks/lightsaber/processor/io/FileExtensions.kt
+++ b/processor/src/main/kotlin/io/michaelrocks/lightsaber/processor/io/FileExtensions.kt
@@ -20,3 +20,3 @@
CON
DEL private enum class FileType { DIRECTORY, JAR }
ADD private enum class FileType { EMPTY, DIRECTORY, JAR }
CON
@@ ... | <<<<<<< SEARCH
import java.io.File
private enum class FileType { DIRECTORY, JAR }
private val File.fileType: FileType
get() = when {
isDirectory -> FileType.DIRECTORY
extension.endsWith("jar", ignoreCase = true) -> FileType.JAR
=======
import java.io.File
private enum class FileType { EMPTY, DIRECTORY, JA... |
rongcloud/server-sdk-nodejs | ae84233dc88ad24762a6842b2e5b192c8a6d55e9 | lib/apis.js | javascript | mit | Update the message API definitions.
| module.exports = {};
function define( key, value ) {
module.exports[key] = value;
}
define( 'user', {
'getToken' : '/user/getToken',
'refresh' : '/user/refresh',
'checkOnline' : '/user/checkOnline',
'block' : '/user/block',
'unblock' : '/user/unblock',
'queryBlocked' : '/use... | module.exports = {};
function define( key, value ) {
module.exports[key] = value;
}
define( 'user', {
'getToken' : '/user/getToken',
'refresh' : '/user/refresh',
'checkOnline' : '/user/checkOnline',
'block' : '/user/block',
'unblock' : '/user/unblock',
'queryBlocked' : '/use... | 15 | 1 | 1 | mixed | --- a/lib/apis.js
+++ b/lib/apis.js
@@ -21,4 +21,18 @@
define( 'message', {
+ 'private' : {
+ 'publish' : '/message/publish',
+ 'publish_template' : '/message/private/publish_template'
+ },
+ 'system' : {
+ 'publish' : '/message/system/publish'
+ },
+ 'group' : {
+ 'publish' : '/message/group... | --- a/lib/apis.js
+++ b/lib/apis.js
@@ ... @@
define( 'message', {
+ 'private' : {
+ 'publish' : '/message/publish',
+ 'publish_template' : '/message/private/publish_template'
+ },
+ 'system' : {
+ 'publish' : '/message/system/publish'
+ },
+ 'group' : {
+ 'publish' : '/message/group/publish'... | --- a/lib/apis.js
+++ b/lib/apis.js
@@ -21,4 +21,18 @@
CON define( 'message', {
ADD 'private' : {
ADD 'publish' : '/message/publish',
ADD 'publish_template' : '/message/private/publish_template'
ADD },
ADD 'system' : {
ADD 'publish' : '/message/system/publish'
ADD },
ADD 'group' : {
ADD ... | <<<<<<< SEARCH
define( 'message', {
'publish' : '/message/publish',
'broadcast' : '/message/broadcast'
} );
=======
define( 'message', {
'private' : {
'publish' : '/message/publish',
'publish_template' : '/message/private/publish_template'
},
'system' : {
'publish' : '/message/syste... |
KotlinNLP/SimpleDNN | 48f23ec383a8a7a26ad7d12abd136d0d00813d89 | src/main/kotlin/com/kotlinnlp/simplednn/core/layers/LayerConfiguration.kt | kotlin | mpl-2.0 | Add 'sizes' property, in case of Merge layers
| /* Copyright 2016-present The KotlinNLP Authors. All Rights Reserved.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, you can obtain one at http://mozilla.org/MPL/2.0/.
* ------------------------------------------... | /* Copyright 2016-present The KotlinNLP Authors. All Rights Reserved.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, you can obtain one at http://mozilla.org/MPL/2.0/.
* ------------------------------------------... | 12 | 2 | 3 | mixed | --- a/src/main/kotlin/com/kotlinnlp/simplednn/core/layers/LayerConfiguration.kt
+++ b/src/main/kotlin/com/kotlinnlp/simplednn/core/layers/LayerConfiguration.kt
@@ -13,2 +13,11 @@
/**
+ * The configuration of a Layer.
+ *
+ * @param size size of the unique array of this layer (meaningless if this is the input of a Merg... | --- a/src/main/kotlin/com/kotlinnlp/simplednn/core/layers/LayerConfiguration.kt
+++ b/src/main/kotlin/com/kotlinnlp/simplednn/core/layers/LayerConfiguration.kt
@@ ... @@
/**
+ * The configuration of a Layer.
+ *
+ * @param size size of the unique array of this layer (meaningless if this is the input of a Merge layer)
... | --- a/src/main/kotlin/com/kotlinnlp/simplednn/core/layers/LayerConfiguration.kt
+++ b/src/main/kotlin/com/kotlinnlp/simplednn/core/layers/LayerConfiguration.kt
@@ -13,2 +13,11 @@
CON /**
ADD * The configuration of a Layer.
ADD *
ADD * @param size size of the unique array of this layer (meaningless if this is the inp... | <<<<<<< SEARCH
/**
* @property meProp whether to use the 'meProp' errors propagation algorithm (params errors are sparse)
*/
data class LayerConfiguration(
val size: Int,
val inputType: LayerType.Input = LayerType.Input.Dense,
val connectionType: LayerType.Connection? = null,
=======
/**
* The configuration... |
developit/preact | 65f0b13685faa7c8cf70b55f68fd96c6ef15d2cd | test/browser/helpers.js | javascript | mit | Fix bug in rerender test helper
| import { Component } from '../../src';
/**
* Setup the test environment
* @returns {HTMLDivElement}
*/
export function setupScratch() {
const scratch = document.createElement('div');
(document.body || document.documentElement).appendChild(scratch);
return scratch;
}
/**
* Setup a rerender function that will dr... | import { Component } from '../../src';
/**
* Setup the test environment
* @returns {HTMLDivElement}
*/
export function setupScratch() {
const scratch = document.createElement('div');
(document.body || document.documentElement).appendChild(scratch);
return scratch;
}
/**
* Setup a rerender function that will dr... | 9 | 3 | 2 | mixed | --- a/test/browser/helpers.js
+++ b/test/browser/helpers.js
@@ -17,6 +17,6 @@
export function setupRerender() {
- let drainQueue;
Component.__test__previousDebounce = Component.debounce;
- Component.debounce = cb => drainQueue = cb;
- return () => drainQueue && drainQueue();
+ Component.debounce = cb => Component.__... | --- a/test/browser/helpers.js
+++ b/test/browser/helpers.js
@@ ... @@
export function setupRerender() {
- let drainQueue;
Component.__test__previousDebounce = Component.debounce;
- Component.debounce = cb => drainQueue = cb;
- return () => drainQueue && drainQueue();
+ Component.debounce = cb => Component.__test__dr... | --- a/test/browser/helpers.js
+++ b/test/browser/helpers.js
@@ -17,6 +17,6 @@
CON export function setupRerender() {
DEL let drainQueue;
CON Component.__test__previousDebounce = Component.debounce;
DEL Component.debounce = cb => drainQueue = cb;
DEL return () => drainQueue && drainQueue();
ADD Component.debounce = ... | <<<<<<< SEARCH
*/
export function setupRerender() {
let drainQueue;
Component.__test__previousDebounce = Component.debounce;
Component.debounce = cb => drainQueue = cb;
return () => drainQueue && drainQueue();
}
=======
*/
export function setupRerender() {
Component.__test__previousDebounce = Component.debounc... |
whtsky/WeRoBot | 06d210cdc811f0051a489f335cc94a604e99a35d | werobot/session/mongodbstorage.py | python | mit | Use new pymongo API in MongoDBStorage
| # -*- coding: utf-8 -*-
from werobot.session import SessionStorage
from werobot.utils import json_loads, json_dumps
class MongoDBStorage(SessionStorage):
"""
MongoDBStorage 会把你的 Session 数据储存在一个 MongoDB Collection 中 ::
import pymongo
import werobot
from werobot.session.mongodbstorage ... | # -*- coding: utf-8 -*-
from werobot.session import SessionStorage
from werobot.utils import json_loads, json_dumps
class MongoDBStorage(SessionStorage):
"""
MongoDBStorage 会把你的 Session 数据储存在一个 MongoDB Collection 中 ::
import pymongo
import werobot
from werobot.session.mongodbstorage ... | 9 | 15 | 2 | mixed | --- a/werobot/session/mongodbstorage.py
+++ b/werobot/session/mongodbstorage.py
@@ -25,5 +25,2 @@
def __init__(self, collection):
- import pymongo
- assert isinstance(collection,
- pymongo.collection.Collection)
self.collection = collection
@@ -42,16 +39,13 @@
d... | --- a/werobot/session/mongodbstorage.py
+++ b/werobot/session/mongodbstorage.py
@@ ... @@
def __init__(self, collection):
- import pymongo
- assert isinstance(collection,
- pymongo.collection.Collection)
self.collection = collection
@@ ... @@
def set(self, id, v... | --- a/werobot/session/mongodbstorage.py
+++ b/werobot/session/mongodbstorage.py
@@ -25,5 +25,2 @@
CON def __init__(self, collection):
DEL import pymongo
DEL assert isinstance(collection,
DEL pymongo.collection.Collection)
CON self.collection = collection
@@ -42,16 +... | <<<<<<< SEARCH
"""
def __init__(self, collection):
import pymongo
assert isinstance(collection,
pymongo.collection.Collection)
self.collection = collection
collection.create_index("wechat_id")
=======
"""
def __init__(self, collection):
... |
i5o/sugar-toolkit-gtk3 | df1397dcf6fe849b87db139e8ea3087a5f73649a | tests/graphics/toolbuttons.py | python | lgpl-2.1 | Update toolbar buttons testcase with API change for the icon name
Follow up of fe11a3aa23c0e7fbc3c0c498e147b0a20348cc12 .
Signed-off-by: Manuel Quiñones <6f5069c5b6be23302a13accec56587944be09079@laptop.org>
| from gi.repository import Gtk
from sugar3.graphics.toolbarbox import ToolbarBox
from sugar3.graphics.colorbutton import ColorToolButton
from sugar3.graphics.radiotoolbutton import RadioToolButton
from sugar3.graphics.toggletoolbutton import ToggleToolButton
import common
test = common.Test()
test.show()
vbox = Gtk... | from gi.repository import Gtk
from sugar3.graphics.toolbarbox import ToolbarBox
from sugar3.graphics.colorbutton import ColorToolButton
from sugar3.graphics.radiotoolbutton import RadioToolButton
from sugar3.graphics.toggletoolbutton import ToggleToolButton
import common
test = common.Test()
test.show()
vbox = Gtk... | 2 | 2 | 2 | mixed | --- a/tests/graphics/toolbuttons.py
+++ b/tests/graphics/toolbuttons.py
@@ -21,3 +21,3 @@
-radial_button = RadioToolButton(named_icon='view-radial')
+radial_button = RadioToolButton(icon_name='view-radial')
toolbar_box.toolbar.insert(radial_button, -1)
@@ -25,3 +25,3 @@
-list_button = RadioToolButton(named_icon='v... | --- a/tests/graphics/toolbuttons.py
+++ b/tests/graphics/toolbuttons.py
@@ ... @@
-radial_button = RadioToolButton(named_icon='view-radial')
+radial_button = RadioToolButton(icon_name='view-radial')
toolbar_box.toolbar.insert(radial_button, -1)
@@ ... @@
-list_button = RadioToolButton(named_icon='view-list')
+list... | --- a/tests/graphics/toolbuttons.py
+++ b/tests/graphics/toolbuttons.py
@@ -21,3 +21,3 @@
CON
DEL radial_button = RadioToolButton(named_icon='view-radial')
ADD radial_button = RadioToolButton(icon_name='view-radial')
CON toolbar_box.toolbar.insert(radial_button, -1)
@@ -25,3 +25,3 @@
CON
DEL list_button = RadioToolBu... | <<<<<<< SEARCH
toolbar_box.show()
radial_button = RadioToolButton(named_icon='view-radial')
toolbar_box.toolbar.insert(radial_button, -1)
radial_button.show()
list_button = RadioToolButton(named_icon='view-list')
list_button.props.group = radial_button
toolbar_box.toolbar.insert(list_button, -1)
=======
toolbar_box.... |
varomorf/gallu | ef755bc3ff15a5df4852b18e8833bf9dd37c3332 | sw.js | javascript | apache-2.0 | Add more objects to cache in the service worker.
| /**
* Created by Alvaro on 18/03/2017.
*/
// use a cacheName for cache versioning
var CACHE_NAME = 'static-v1';
var urlsToCache = [
'./',
'./js/main.js'
];
// during the install phase you usually want to cache static assets
self.addEventListener('install', function(event) {
// once the SW is installed, go ahe... | /**
* Created by Alvaro on 18/03/2017.
*/
// use a cacheName for cache versioning
var CACHE_NAME = 'static-v0.0.1';
var urlsToCache = [
'./',
'./js/main.js',
'./js/build/ObjectivesList.js',
'./js/vendor/react.min.js',
'./js/vendor/react-com.min.js'
];
// during the install phase you usually want to cache ... | 5 | 2 | 1 | mixed | --- a/sw.js
+++ b/sw.js
@@ -5,6 +5,9 @@
// use a cacheName for cache versioning
-var CACHE_NAME = 'static-v1';
+var CACHE_NAME = 'static-v0.0.1';
var urlsToCache = [
'./',
- './js/main.js'
+ './js/main.js',
+ './js/build/ObjectivesList.js',
+ './js/vendor/react.min.js',
+ './js/vendor/react-com.min.js'
]; | --- a/sw.js
+++ b/sw.js
@@ ... @@
// use a cacheName for cache versioning
-var CACHE_NAME = 'static-v1';
+var CACHE_NAME = 'static-v0.0.1';
var urlsToCache = [
'./',
- './js/main.js'
+ './js/main.js',
+ './js/build/ObjectivesList.js',
+ './js/vendor/react.min.js',
+ './js/vendor/react-com.min.js'
];
| --- a/sw.js
+++ b/sw.js
@@ -5,6 +5,9 @@
CON // use a cacheName for cache versioning
DEL var CACHE_NAME = 'static-v1';
ADD var CACHE_NAME = 'static-v0.0.1';
CON var urlsToCache = [
CON './',
DEL './js/main.js'
ADD './js/main.js',
ADD './js/build/ObjectivesList.js',
ADD './js/vendor/react.min.js',
ADD './js/v... | <<<<<<< SEARCH
// use a cacheName for cache versioning
var CACHE_NAME = 'static-v1';
var urlsToCache = [
'./',
'./js/main.js'
];
=======
// use a cacheName for cache versioning
var CACHE_NAME = 'static-v0.0.1';
var urlsToCache = [
'./',
'./js/main.js',
'./js/build/ObjectivesList.js',
'./js/vendor/react.... |
Sgeo/hlist-old | d381842d3217707c44129361715e78bbd94c3f8b | src/lib.rs | rust | bsd-3-clause | Add code from Gist. Slight modifications to naming, visibility, and use of $crate
| #[test]
fn it_works() {
}
| pub struct HNil;
pub struct HCons<H, T> {
pub head: H,
pub tail: T
}
pub trait Contains<A> {
fn get(&self) -> &A;
fn get_mut(&mut self) -> &mut A;
}
macro_rules! hlist_type_internal {
($hlist_name:ident, $hlist_current:ty, $th:ty, $($tr:ty,)*) => {
hlist_type_internal!($hlist_name, HCons<... | 81 | 0 | 1 | add_only | --- a/src/lib.rs
+++ b/src/lib.rs
@@ -1 +1,82 @@
+pub struct HNil;
+
+pub struct HCons<H, T> {
+ pub head: H,
+ pub tail: T
+}
+
+pub trait Contains<A> {
+ fn get(&self) -> &A;
+ fn get_mut(&mut self) -> &mut A;
+}
+
+macro_rules! hlist_type_internal {
+ ($hlist_name:ident, $hlist_current:ty, $th:ty, $(... | --- a/src/lib.rs
+++ b/src/lib.rs
@@ ... @@
+pub struct HNil;
+
+pub struct HCons<H, T> {
+ pub head: H,
+ pub tail: T
+}
+
+pub trait Contains<A> {
+ fn get(&self) -> &A;
+ fn get_mut(&mut self) -> &mut A;
+}
+
+macro_rules! hlist_type_internal {
+ ($hlist_name:ident, $hlist_current:ty, $th:ty, $($tr:t... | --- a/src/lib.rs
+++ b/src/lib.rs
@@ -1 +1,82 @@
ADD pub struct HNil;
ADD
ADD pub struct HCons<H, T> {
ADD pub head: H,
ADD pub tail: T
ADD }
ADD
ADD pub trait Contains<A> {
ADD fn get(&self) -> &A;
ADD fn get_mut(&mut self) -> &mut A;
ADD }
ADD
ADD macro_rules! hlist_type_internal {
ADD ($hlist... | <<<<<<< SEARCH
#[test]
fn it_works() {
=======
pub struct HNil;
pub struct HCons<H, T> {
pub head: H,
pub tail: T
}
pub trait Contains<A> {
fn get(&self) -> &A;
fn get_mut(&mut self) -> &mut A;
}
macro_rules! hlist_type_internal {
($hlist_name:ident, $hlist_current:ty, $th:ty, $($tr:ty,)*) => {... |
tzkhan/roman-rust | 05318f2ba1db86d06ec26f652cbcd696be4a9983 | src/main.rs | rust | mit | Fix current implementation to allow subtractive notation.
| /*
** A simple program that allows basic arithmetic operations using roman numerals and conversions to decimal numbers.
*/
fn main() {
let roman_number = "CLIII";
let decimal_number = to_decimal(&roman_number);
println!("The roman number {} is equal to {} in decimal numbers", roman_number, decimal_number);
let ... | /*
** A simple program that allows basic arithmetic operations using roman numerals and conversions to decimal numbers.
*/
fn main() {
let roman_number = "CLIII";
let decimal_number = to_decimal(&roman_number);
println!("The roman number {} is equal to {} in decimal numbers", roman_number, decimal_number);
let ... | 11 | 1 | 1 | mixed | --- a/src/main.rs
+++ b/src/main.rs
@@ -20,5 +20,15 @@
let mut num = 0;
+ let mut prev = 0;
for c in roman_number.chars() {
- num += roman_char_to_decimal(c);
+
+ let digit = roman_char_to_decimal(c);
+
+ num += digit;
+
+ if prev != 0 && digit > prev {
+ num -= 2 * prev;
+ }
+
+ prev = digit;
} | --- a/src/main.rs
+++ b/src/main.rs
@@ ... @@
let mut num = 0;
+ let mut prev = 0;
for c in roman_number.chars() {
- num += roman_char_to_decimal(c);
+
+ let digit = roman_char_to_decimal(c);
+
+ num += digit;
+
+ if prev != 0 && digit > prev {
+ num -= 2 * prev;
+ }
+
+ prev = digit;
}
| --- a/src/main.rs
+++ b/src/main.rs
@@ -20,5 +20,15 @@
CON let mut num = 0;
ADD let mut prev = 0;
CON
CON for c in roman_number.chars() {
DEL num += roman_char_to_decimal(c);
ADD
ADD let digit = roman_char_to_decimal(c);
ADD
ADD num += digit;
ADD
ADD if prev != 0 && digit > prev {
ADD num -= 2 * prev;... | <<<<<<< SEARCH
let mut num = 0;
for c in roman_number.chars() {
num += roman_char_to_decimal(c);
}
=======
let mut num = 0;
let mut prev = 0;
for c in roman_number.chars() {
let digit = roman_char_to_decimal(c);
num += digit;
if prev != 0 && digit > prev {
num -= 2 * prev;
}
prev = digit;... |
chrylis/spring-boot | 99b3af9216edca416add57a2d90024faef83fe53 | spring-boot-samples/spring-boot-sample-data-couchbase/src/test/java/sample/data/couchbase/SampleCouchbaseApplicationTests.java | java | apache-2.0 | Use a random server port in the Couchbase sample’s tests | package sample.data.couchbase;
import java.net.ConnectException;
import org.junit.Rule;
import org.junit.Test;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.test.OutputCapture;
import org.springframework.core.NestedCheckedException;
import static org.assertj.core.... | package sample.data.couchbase;
import java.net.ConnectException;
import org.junit.Rule;
import org.junit.Test;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.test.OutputCapture;
import org.springframework.core.NestedCheckedException;
import static org.assertj.core.... | 1 | 1 | 1 | mixed | --- a/spring-boot-samples/spring-boot-sample-data-couchbase/src/test/java/sample/data/couchbase/SampleCouchbaseApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-data-couchbase/src/test/java/sample/data/couchbase/SampleCouchbaseApplicationTests.java
@@ -22,3 +22,3 @@
new SpringApplicationBuilder(Sam... | --- a/spring-boot-samples/spring-boot-sample-data-couchbase/src/test/java/sample/data/couchbase/SampleCouchbaseApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-data-couchbase/src/test/java/sample/data/couchbase/SampleCouchbaseApplicationTests.java
@@ ... @@
new SpringApplicationBuilder(SampleCouch... | --- a/spring-boot-samples/spring-boot-sample-data-couchbase/src/test/java/sample/data/couchbase/SampleCouchbaseApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-data-couchbase/src/test/java/sample/data/couchbase/SampleCouchbaseApplicationTests.java
@@ -22,3 +22,3 @@
CON new SpringApplicationBuilder(... | <<<<<<< SEARCH
try {
new SpringApplicationBuilder(SampleCouchbaseApplication.class)
.run();
}
catch (RuntimeException ex) {
=======
try {
new SpringApplicationBuilder(SampleCouchbaseApplication.class)
.run("--server.port=0");
}
catch (RuntimeException ex) {
>>>>>>> REPLACE
|
despawnerer/langid-rs | 354f4961704c23eb5ac711254e20fa3a7a4fd38a | src/classifier.rs | rust | apache-2.0 | Use the standard min_by_key method
…instead of custom, shitty implementation
| use std::collections::HashMap;
use model::Model;
pub struct Classifier {
models: HashMap<String, Model>
}
impl Classifier {
pub fn new() -> Classifier {
Classifier { models: HashMap::new() }
}
pub fn train(&mut self, text: &str, name: &str) {
let model = Model::build_from_text(text... | use std::collections::HashMap;
use model::Model;
pub struct Classifier {
models: HashMap<String, Model>
}
impl Classifier {
pub fn new() -> Classifier {
Classifier { models: HashMap::new() }
}
pub fn train(&mut self, text: &str, name: &str) {
let model = Model::build_from_text(text... | 4 | 21 | 2 | mixed | --- a/src/classifier.rs
+++ b/src/classifier.rs
@@ -22,6 +22,6 @@
let model = Model::build_from_text(text);
- let (name, matched_model) = find_min_by_key(
- self.models.iter(),
- |&(name, other_model)| model.compare(other_model)
- ).unwrap();
+ let (name, matched_mode... | --- a/src/classifier.rs
+++ b/src/classifier.rs
@@ ... @@
let model = Model::build_from_text(text);
- let (name, matched_model) = find_min_by_key(
- self.models.iter(),
- |&(name, other_model)| model.compare(other_model)
- ).unwrap();
+ let (name, matched_model) = sel... | --- a/src/classifier.rs
+++ b/src/classifier.rs
@@ -22,6 +22,6 @@
CON let model = Model::build_from_text(text);
DEL let (name, matched_model) = find_min_by_key(
DEL self.models.iter(),
DEL |&(name, other_model)| model.compare(other_model)
DEL ).unwrap();
ADD let (... | <<<<<<< SEARCH
pub fn classify(&self, text: &str) -> &String {
let model = Model::build_from_text(text);
let (name, matched_model) = find_min_by_key(
self.models.iter(),
|&(name, other_model)| model.compare(other_model)
).unwrap();
name
}
}
fn find_min_b... |
MichaelRocks/lightsaber | 8c71b48ad297ba307a29f203e0167b366ff68f56 | processor/src/main/kotlin/io/michaelrocks/lightsaber/processor/graph/CycleSearcher.kt | kotlin | apache-2.0 | Revert to a working cycle search algorithm
| /*
* Copyright 2016 Michael Rozumyanskiy
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or a... | /*
* Copyright 2016 Michael Rozumyanskiy
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or a... | 26 | 13 | 1 | mixed | --- a/processor/src/main/kotlin/io/michaelrocks/lightsaber/processor/graph/CycleSearcher.kt
+++ b/processor/src/main/kotlin/io/michaelrocks/lightsaber/processor/graph/CycleSearcher.kt
@@ -21,21 +21,34 @@
fun <T> DirectedGraph<T>.findCycles(): Collection<Collection<T>> {
- val gray = HashSet<T>()
+ val colors = HashM... | --- a/processor/src/main/kotlin/io/michaelrocks/lightsaber/processor/graph/CycleSearcher.kt
+++ b/processor/src/main/kotlin/io/michaelrocks/lightsaber/processor/graph/CycleSearcher.kt
@@ ... @@
fun <T> DirectedGraph<T>.findCycles(): Collection<Collection<T>> {
- val gray = HashSet<T>()
+ val colors = HashMap<T, Vert... | --- a/processor/src/main/kotlin/io/michaelrocks/lightsaber/processor/graph/CycleSearcher.kt
+++ b/processor/src/main/kotlin/io/michaelrocks/lightsaber/processor/graph/CycleSearcher.kt
@@ -21,21 +21,34 @@
CON fun <T> DirectedGraph<T>.findCycles(): Collection<Collection<T>> {
DEL val gray = HashSet<T>()
ADD val color... | <<<<<<< SEARCH
fun <T> DirectedGraph<T>.findCycles(): Collection<Collection<T>> {
val gray = HashSet<T>()
val cycles = HashSet<Collection<T>>()
val cycle = ArrayList<T>()
traverseDepthFirst(
beforeAdjacent = { vertex ->
cycle.add(vertex)
if (!gray.add(vertex)) {
cycles.add(cyc... |
CartoDB/geocoder-api | fc1e05658eb7e1fb2722467b5da5df622145eece | server/lib/python/cartodb_services/setup.py | python | bsd-3-clause | Bump version of python library to 0.14.0
| """
CartoDB Services Python Library
See:
https://github.com/CartoDB/geocoder-api
"""
from setuptools import setup, find_packages
setup(
name='cartodb_services',
version='0.13.0',
description='CartoDB Services API Python Library',
url='https://github.com/CartoDB/dataservices-api',
author='Data... | """
CartoDB Services Python Library
See:
https://github.com/CartoDB/geocoder-api
"""
from setuptools import setup, find_packages
setup(
name='cartodb_services',
version='0.14.0',
description='CartoDB Services API Python Library',
url='https://github.com/CartoDB/dataservices-api',
author='Data... | 1 | 1 | 1 | mixed | --- a/server/lib/python/cartodb_services/setup.py
+++ b/server/lib/python/cartodb_services/setup.py
@@ -12,3 +12,3 @@
- version='0.13.0',
+ version='0.14.0',
| --- a/server/lib/python/cartodb_services/setup.py
+++ b/server/lib/python/cartodb_services/setup.py
@@ ... @@
- version='0.13.0',
+ version='0.14.0',
| --- a/server/lib/python/cartodb_services/setup.py
+++ b/server/lib/python/cartodb_services/setup.py
@@ -12,3 +12,3 @@
CON
DEL version='0.13.0',
ADD version='0.14.0',
CON
| <<<<<<< SEARCH
name='cartodb_services',
version='0.13.0',
description='CartoDB Services API Python Library',
=======
name='cartodb_services',
version='0.14.0',
description='CartoDB Services API Python Library',
>>>>>>> REPLACE
|
wada811/RxViewModel | b3f8d4c47fb9b61d0c1788ecc0828d69c3c45706 | library/src/main/kotlin/com/wada811/rxviewmodel/commands/RxCommand.kt | kotlin | apache-2.0 | :+1: Make RxComamnd canExecute true as default
| package com.wada811.rxviewmodel.commands
import android.databinding.ObservableBoolean
import io.reactivex.Flowable
import io.reactivex.Observable
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.disposables.Disposable
import io.reactivex.processors.FlowableProcessor
import io.reactivex.processor... | package com.wada811.rxviewmodel.commands
import android.databinding.ObservableBoolean
import io.reactivex.Flowable
import io.reactivex.Observable
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.disposables.Disposable
import io.reactivex.processors.FlowableProcessor
import io.reactivex.processor... | 5 | 5 | 4 | mixed | --- a/library/src/main/kotlin/com/wada811/rxviewmodel/commands/RxCommand.kt
+++ b/library/src/main/kotlin/com/wada811/rxviewmodel/commands/RxCommand.kt
@@ -10,3 +10,3 @@
-class RxCommand<T>(canExecuteSource: Observable<Boolean>? = null) : Disposable {
+class RxCommand<T>(canExecuteSource: Observable<Boolean> = Observ... | --- a/library/src/main/kotlin/com/wada811/rxviewmodel/commands/RxCommand.kt
+++ b/library/src/main/kotlin/com/wada811/rxviewmodel/commands/RxCommand.kt
@@ ... @@
-class RxCommand<T>(canExecuteSource: Observable<Boolean>? = null) : Disposable {
+class RxCommand<T>(canExecuteSource: Observable<Boolean> = Observable.jus... | --- a/library/src/main/kotlin/com/wada811/rxviewmodel/commands/RxCommand.kt
+++ b/library/src/main/kotlin/com/wada811/rxviewmodel/commands/RxCommand.kt
@@ -10,3 +10,3 @@
CON
DEL class RxCommand<T>(canExecuteSource: Observable<Boolean>? = null) : Disposable {
ADD class RxCommand<T>(canExecuteSource: Observable<Boolean>... | <<<<<<< SEARCH
import io.reactivex.processors.PublishProcessor
class RxCommand<T>(canExecuteSource: Observable<Boolean>? = null) : Disposable {
private val trigger: FlowableProcessor<T> = PublishProcessor.create<T>().toSerialized()
var canExecute: ObservableBoolean
get
private set
private v... |
gpbonillas/rust_for_rubyists | 2fb97140c2d346e0404a4f95a1593d85d62d0739 | code/11/io.rs | rust | agpl-3.0 | Update code sample for chapter 11.
| use std::io;
use std::rand;
fn generate_secret_number() -> int {
(rand::random::<int>() % 100).abs() + 1
}
fn process_guess(secret:int, guess: int) -> bool {
println!("You guessed: {:d}", guess);
if guess > secret {
println("Your guess was too high!");
false
} else if guess < s... | use std::io;
use std::rand;
fn generate_secret_number() -> int {
(rand::random::<int>() % 100).abs() + 1
}
fn process_guess(secret: int, guess: int) -> bool {
println!("You guessed: {:d}", guess);
if guess > secret {
println!("Your guess was too high!");
false
} else if guess < secret... | 33 | 33 | 1 | mixed | --- a/code/11/io.rs
+++ b/code/11/io.rs
@@ -3,43 +3,43 @@
-fn generate_secret_number() -> int {
+fn generate_secret_number() -> int {
(rand::random::<int>() % 100).abs() + 1
-}
+}
-fn process_guess(secret:int, guess: int) -> bool {
- println!("You guessed: {:d}", guess);
+fn process_guess(secret: int, g... | --- a/code/11/io.rs
+++ b/code/11/io.rs
@@ ... @@
-fn generate_secret_number() -> int {
+fn generate_secret_number() -> int {
(rand::random::<int>() % 100).abs() + 1
-}
+}
-fn process_guess(secret:int, guess: int) -> bool {
- println!("You guessed: {:d}", guess);
+fn process_guess(secret: int, guess: in... | --- a/code/11/io.rs
+++ b/code/11/io.rs
@@ -3,43 +3,43 @@
CON
DEL fn generate_secret_number() -> int {
ADD fn generate_secret_number() -> int {
CON (rand::random::<int>() % 100).abs() + 1
DEL }
ADD }
CON
DEL fn process_guess(secret:int, guess: int) -> bool {
DEL println!("You guessed: {:d}", guess);
ADD f... | <<<<<<< SEARCH
use std::rand;
fn generate_secret_number() -> int {
(rand::random::<int>() % 100).abs() + 1
}
fn process_guess(secret:int, guess: int) -> bool {
println!("You guessed: {:d}", guess);
if guess > secret {
println("Your guess was too high!");
false
} else if guess <... |
ChrisLMerrill/muse | a2054df4eb41712cec3194905f608396ff6473de | core/src/main/java/org/musetest/core/resource/generic/GenericResourceConfiguration.java | java | apache-2.0 | Add convenience method for getting boolean sub-source values.
| package org.musetest.core.resource.generic;
import org.musetest.core.resource.*;
import org.musetest.core.values.*;
import java.util.*;
/**
* A MuseResource that uses a general set of configuration parameters. It is intended for resources which
* have a few basic configurations for the user to supply. When used in... | package org.musetest.core.resource.generic;
import com.fasterxml.jackson.annotation.*;
import org.musetest.core.*;
import org.musetest.core.resource.*;
import org.musetest.core.values.*;
import java.util.*;
/**
* A MuseResource that uses a general set of configuration parameters. It is intended for resources which
... | 21 | 0 | 2 | add_only | --- a/core/src/main/java/org/musetest/core/resource/generic/GenericResourceConfiguration.java
+++ b/core/src/main/java/org/musetest/core/resource/generic/GenericResourceConfiguration.java
@@ -2,2 +2,4 @@
+import com.fasterxml.jackson.annotation.*;
+import org.musetest.core.*;
import org.musetest.core.resource.*;
@@ ... | --- a/core/src/main/java/org/musetest/core/resource/generic/GenericResourceConfiguration.java
+++ b/core/src/main/java/org/musetest/core/resource/generic/GenericResourceConfiguration.java
@@ ... @@
+import com.fasterxml.jackson.annotation.*;
+import org.musetest.core.*;
import org.musetest.core.resource.*;
@@ ... @@... | --- a/core/src/main/java/org/musetest/core/resource/generic/GenericResourceConfiguration.java
+++ b/core/src/main/java/org/musetest/core/resource/generic/GenericResourceConfiguration.java
@@ -2,2 +2,4 @@
CON
ADD import com.fasterxml.jackson.annotation.*;
ADD import org.musetest.core.*;
CON import org.musetest.core.res... | <<<<<<< SEARCH
package org.musetest.core.resource.generic;
import org.musetest.core.resource.*;
import org.musetest.core.values.*;
=======
package org.musetest.core.resource.generic;
import com.fasterxml.jackson.annotation.*;
import org.musetest.core.*;
import org.musetest.core.resource.*;
import org.musetest.core.v... |
Woodhouse-Inc/vocatus-datorum | 5b4eb5a2448763c7ef7c857994af5e40142be723 | public/pages/users/new.js | javascript | mit | Fix registering (and add really bad error feedback)
| define([
'jquery',
'knockout',
'knockout.validation',
'app',
'models/user',
'models/user_session'
], function (
$,
ko,
validation,
app,
User,
UserSession
) {
var registerPage = ko.validatedObservable({
email: ko.observable(),
register: function () {
... | define([
'jquery',
'knockout',
'knockout.validation',
'app',
'models/user',
'models/user_session'
], function (
$,
ko,
validation,
app,
User,
UserSession
) {
var registerPage = ko.validatedObservable({
email: ko.observable(),
register: function () {
... | 16 | 12 | 1 | mixed | --- a/public/pages/users/new.js
+++ b/public/pages/users/new.js
@@ -27,14 +27,18 @@
}).done(function (data) {
- var user = User.create(data);
- $.ajax({
- type: 'POST',
- url: user.user_sessions.uri(),
- data: JSON.strin... | --- a/public/pages/users/new.js
+++ b/public/pages/users/new.js
@@ ... @@
}).done(function (data) {
- var user = User.create(data);
- $.ajax({
- type: 'POST',
- url: user.user_sessions.uri(),
- data: JSON.stringify({}),
... | --- a/public/pages/users/new.js
+++ b/public/pages/users/new.js
@@ -27,14 +27,18 @@
CON }).done(function (data) {
DEL var user = User.create(data);
DEL $.ajax({
DEL type: 'POST',
DEL url: user.user_sessions.uri(),
DEL ... | <<<<<<< SEARCH
processData: false
}).done(function (data) {
var user = User.create(data);
$.ajax({
type: 'POST',
url: user.user_sessions.uri(),
data: JSON.stringify({}),
contentTyp... |
creationix/topcube | f0cb550486f44b2a06e0acf91f83fe1fd9b15b58 | topcube.js | javascript | mit | Define valid keys per platform and filter out invalid options.
| var spawn = require('child_process').spawn;
var path = require('path');
module.exports = function (options) {
options = options || {};
options.url = options.url || 'http://nodejs.org';
options.name = options.name || 'nodejs';
var client;
switch (process.platform) {
case 'win32':
client... | var spawn = require('child_process').spawn;
var path = require('path');
module.exports = function (options) {
options = options || {};
options.url = options.url || 'http://nodejs.org';
options.name = options.name || 'nodejs';
var client;
var keys = [];
switch (process.platform) {
case 'win... | 8 | 1 | 4 | mixed | --- a/topcube.js
+++ b/topcube.js
@@ -9,2 +9,3 @@
var client;
+ var keys = [];
switch (process.platform) {
@@ -12,2 +13,3 @@
client = path.resolve(__dirname + '/cefclient/cefclient');
+ keys = ['url', 'name', 'width', 'height', 'minwidth', 'minheight', 'ico'];
break;
@@ -15,2 +17,3... | --- a/topcube.js
+++ b/topcube.js
@@ ... @@
var client;
+ var keys = [];
switch (process.platform) {
@@ ... @@
client = path.resolve(__dirname + '/cefclient/cefclient');
+ keys = ['url', 'name', 'width', 'height', 'minwidth', 'minheight', 'ico'];
break;
@@ ... @@
client = ... | --- a/topcube.js
+++ b/topcube.js
@@ -9,2 +9,3 @@
CON var client;
ADD var keys = [];
CON switch (process.platform) {
@@ -12,2 +13,3 @@
CON client = path.resolve(__dirname + '/cefclient/cefclient');
ADD keys = ['url', 'name', 'width', 'height', 'minwidth', 'minheight', 'ico'];
CON bre... | <<<<<<< SEARCH
var client;
switch (process.platform) {
case 'win32':
client = path.resolve(__dirname + '/cefclient/cefclient');
break;
case 'linux':
client = path.resolve(__dirname + '/build/default/topcube');
break;
default:
=======
var client;
var keys = ... |
squanchy-dev/squanchy-android | fb3486feeece1887c5654fa6d27d6104975f3790 | app/src/main/java/net/squanchy/service/firebase/model/schedule/FirestoreSchedule.kt | kotlin | apache-2.0 | Add @IgnoreExtraProperties to FirestoreEvent and FirestoreDay
They have extra fields we don't really care about in the app and the
warnings we get in the log because of it are annoying.
| package net.squanchy.service.firebase.model.schedule
import java.util.Date
class FirestoreSchedulePage {
lateinit var day: FirestoreDay
var events: List<FirestoreEvent> = emptyList()
}
class FirestoreDay {
lateinit var id: String
lateinit var date: Date
}
class FirestoreEvent {
lateinit var id: ... | package net.squanchy.service.firebase.model.schedule
import com.google.firebase.firestore.IgnoreExtraProperties
import java.util.Date
class FirestoreSchedulePage {
lateinit var day: FirestoreDay
var events: List<FirestoreEvent> = emptyList()
}
@IgnoreExtraProperties
class FirestoreDay {
lateinit var id: ... | 3 | 0 | 3 | add_only | --- a/app/src/main/java/net/squanchy/service/firebase/model/schedule/FirestoreSchedule.kt
+++ b/app/src/main/java/net/squanchy/service/firebase/model/schedule/FirestoreSchedule.kt
@@ -2,2 +2,3 @@
+import com.google.firebase.firestore.IgnoreExtraProperties
import java.util.Date
@@ -9,2 +10,3 @@
+@IgnoreExtraPropert... | --- a/app/src/main/java/net/squanchy/service/firebase/model/schedule/FirestoreSchedule.kt
+++ b/app/src/main/java/net/squanchy/service/firebase/model/schedule/FirestoreSchedule.kt
@@ ... @@
+import com.google.firebase.firestore.IgnoreExtraProperties
import java.util.Date
@@ ... @@
+@IgnoreExtraProperties
class Fi... | --- a/app/src/main/java/net/squanchy/service/firebase/model/schedule/FirestoreSchedule.kt
+++ b/app/src/main/java/net/squanchy/service/firebase/model/schedule/FirestoreSchedule.kt
@@ -2,2 +2,3 @@
CON
ADD import com.google.firebase.firestore.IgnoreExtraProperties
CON import java.util.Date
@@ -9,2 +10,3 @@
CON
ADD @Ign... | <<<<<<< SEARCH
package net.squanchy.service.firebase.model.schedule
import java.util.Date
=======
package net.squanchy.service.firebase.model.schedule
import com.google.firebase.firestore.IgnoreExtraProperties
import java.util.Date
>>>>>>> REPLACE
<<<<<<< SEARCH
}
class FirestoreDay {
lateinit var id: Strin... |
kyleshockey/headcount | 0aae8d3591294f8e14c48f77907ca2c90a82ebec | routes/users.js | javascript | mit | Add two function for account panel
add the ability to get/set user data in database
| var express = require('express');
var router = express.Router();
var User = require('./../app/models/user');
/* GET users listing. */
router.get('/', function(req, res, next) {
res.send('respond with a resource');
});
router.post('/checkUser', function(req, res, done) {
console.log(req.body,'req..body');
var c... | var express = require('express');
var router = express.Router();
var User = require('./../app/models/user');
/* GET users listing. */
//router.get('/', function(req, res, next) {
// res.send('respond with a resource');
//});
router.post('/accountinfo', function(req, res, done) {
var currentUser = req.body.usernam... | 28 | 2 | 1 | mixed | --- a/routes/users.js
+++ b/routes/users.js
@@ -5,6 +5,32 @@
/* GET users listing. */
-router.get('/', function(req, res, next) {
- res.send('respond with a resource');
+//router.get('/', function(req, res, next) {
+// res.send('respond with a resource');
+//});
+
+router.post('/accountinfo', function(req, res, done... | --- a/routes/users.js
+++ b/routes/users.js
@@ ... @@
/* GET users listing. */
-router.get('/', function(req, res, next) {
- res.send('respond with a resource');
+//router.get('/', function(req, res, next) {
+// res.send('respond with a resource');
+//});
+
+router.post('/accountinfo', function(req, res, done) {
+ ... | --- a/routes/users.js
+++ b/routes/users.js
@@ -5,6 +5,32 @@
CON /* GET users listing. */
DEL router.get('/', function(req, res, next) {
DEL res.send('respond with a resource');
ADD //router.get('/', function(req, res, next) {
ADD // res.send('respond with a resource');
ADD //});
ADD
ADD router.post('/accountinfo',... | <<<<<<< SEARCH
/* GET users listing. */
router.get('/', function(req, res, next) {
res.send('respond with a resource');
});
router.post('/checkUser', function(req, res, done) {
console.log(req.body,'req..body');
=======
/* GET users listing. */
//router.get('/', function(req, res, next) {
// res.send('respond ... |
mapzen/joerd | 356dd5294280db3334f86354202f0d68881254b9 | joerd/check.py | python | mit | Return verifier function, not None. Also reset the temporary file to the beginning before verifying it.
| import zipfile
import tarfile
import shutil
import tempfile
from osgeo import gdal
def is_zip(tmp):
"""
Returns True if the NamedTemporaryFile given as the argument appears to be
a well-formed Zip file.
"""
try:
zip_file = zipfile.ZipFile(tmp.name, 'r')
test_result = zip_file.test... | import zipfile
import tarfile
import shutil
import tempfile
from osgeo import gdal
def is_zip(tmp):
"""
Returns True if the NamedTemporaryFile given as the argument appears to be
a well-formed Zip file.
"""
try:
zip_file = zipfile.ZipFile(tmp.name, 'r')
test_result = zip_file.test... | 3 | 0 | 2 | add_only | --- a/joerd/check.py
+++ b/joerd/check.py
@@ -36,2 +36,3 @@
shutil.copyfileobj(tar.extractfile(member_name), tmp_member)
+ tmp_member.seek(0)
return is_gdal(tmp_member)
@@ -40,2 +41,4 @@
return False
+
+ return func
| --- a/joerd/check.py
+++ b/joerd/check.py
@@ ... @@
shutil.copyfileobj(tar.extractfile(member_name), tmp_member)
+ tmp_member.seek(0)
return is_gdal(tmp_member)
@@ ... @@
return False
+
+ return func
| --- a/joerd/check.py
+++ b/joerd/check.py
@@ -36,2 +36,3 @@
CON shutil.copyfileobj(tar.extractfile(member_name), tmp_member)
ADD tmp_member.seek(0)
CON return is_gdal(tmp_member)
@@ -40,2 +41,4 @@
CON return False
ADD
ADD return func
CON
| <<<<<<< SEARCH
with tempfile.NamedTemporaryFile() as tmp_member:
shutil.copyfileobj(tar.extractfile(member_name), tmp_member)
return is_gdal(tmp_member)
except (tarfile.TarError, IOError, OSError) as e:
return False
=======
with tempfile.Na... |
auerj/flask-oauthlib | a31db91800630520c5b516493bddef76ba8b7edd | flask_oauthlib/utils.py | python | bsd-3-clause | Delete useless header transform in extract_params.
| # coding: utf-8
import logging
import base64
from flask import request, Response
from oauthlib.common import to_unicode, bytes_type
log = logging.getLogger('flask_oauthlib')
def extract_params():
"""Extract request params."""
uri = request.url
http_method = request.method
headers = dict(request.head... | # coding: utf-8
import logging
import base64
from flask import request, Response
from oauthlib.common import to_unicode, bytes_type
log = logging.getLogger('flask_oauthlib')
def extract_params():
"""Extract request params."""
uri = request.url
http_method = request.method
headers = dict(request.head... | 0 | 2 | 1 | del_only | --- a/flask_oauthlib/utils.py
+++ b/flask_oauthlib/utils.py
@@ -19,4 +19,2 @@
del headers['wsgi.errors']
- if 'Http-Authorization' in headers:
- headers['Authorization'] = headers['Http-Authorization']
| --- a/flask_oauthlib/utils.py
+++ b/flask_oauthlib/utils.py
@@ ... @@
del headers['wsgi.errors']
- if 'Http-Authorization' in headers:
- headers['Authorization'] = headers['Http-Authorization']
| --- a/flask_oauthlib/utils.py
+++ b/flask_oauthlib/utils.py
@@ -19,4 +19,2 @@
CON del headers['wsgi.errors']
DEL if 'Http-Authorization' in headers:
DEL headers['Authorization'] = headers['Http-Authorization']
CON
| <<<<<<< SEARCH
if 'wsgi.errors' in headers:
del headers['wsgi.errors']
if 'Http-Authorization' in headers:
headers['Authorization'] = headers['Http-Authorization']
body = request.form.to_dict()
=======
if 'wsgi.errors' in headers:
del headers['wsgi.errors']
body = request.... |
WorldBrain/WebMemex | 57b02448f53d4cb7b4f5063d29255dedd46013a5 | src/overview/onboarding/actions.js | javascript | mit | Set up autostart of onboarding imports when ready
- when UI connman receives INIT cmd, it immediately sends off the START cmd to the bg connman (in imports this happens when you press "Start" btn)
| import { createAction } from 'redux-act'
import { CMDS } from 'src/options/imports/constants'
import { IMPORT_CONN_NAME } from './constants'
export const setVisible = createAction('onboarding/setVisible')
export const init = () => dispatch =>
new ImportsConnHandler(IMPORT_CONN_NAME, dispatch)
/**
* Background ... | import { createAction } from 'redux-act'
import { IMPORT_TYPE as TYPE, CMDS } from 'src/options/imports/constants'
import { IMPORT_CONN_NAME } from './constants'
export const setVisible = createAction('onboarding/setVisible')
export const init = () => dispatch =>
new ImportsConnHandler(IMPORT_CONN_NAME, dispatch... | 11 | 1 | 3 | mixed | --- a/src/overview/onboarding/actions.js
+++ b/src/overview/onboarding/actions.js
@@ -2,3 +2,3 @@
-import { CMDS } from 'src/options/imports/constants'
+import { IMPORT_TYPE as TYPE, CMDS } from 'src/options/imports/constants'
import { IMPORT_CONN_NAME } from './constants'
@@ -17,2 +17,8 @@
class ImportsConnHandler... | --- a/src/overview/onboarding/actions.js
+++ b/src/overview/onboarding/actions.js
@@ ... @@
-import { CMDS } from 'src/options/imports/constants'
+import { IMPORT_TYPE as TYPE, CMDS } from 'src/options/imports/constants'
import { IMPORT_CONN_NAME } from './constants'
@@ ... @@
class ImportsConnHandler {
+ static... | --- a/src/overview/onboarding/actions.js
+++ b/src/overview/onboarding/actions.js
@@ -2,3 +2,3 @@
CON
DEL import { CMDS } from 'src/options/imports/constants'
ADD import { IMPORT_TYPE as TYPE, CMDS } from 'src/options/imports/constants'
CON import { IMPORT_CONN_NAME } from './constants'
@@ -17,2 +17,8 @@
CON class Imp... | <<<<<<< SEARCH
import { createAction } from 'redux-act'
import { CMDS } from 'src/options/imports/constants'
import { IMPORT_CONN_NAME } from './constants'
=======
import { createAction } from 'redux-act'
import { IMPORT_TYPE as TYPE, CMDS } from 'src/options/imports/constants'
import { IMPORT_CONN_NAME } from './c... |
m4tx/arroch | 70ed18a5c117e52cf957c74ce5edd5376721c62d | app/crawlers/facebook/FacebookSession.java | java | agpl-3.0 | Fix Facebook crawler crashing app when no cookies file provided
| package crawlers.facebook;
import org.apache.commons.io.IOUtils;
import java.io.*;
import org.jsoup.Connection;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import play.Logger;
class FacebookSession {
private static final String COOKIES_FILENAME = "/facebook_cookies";
private String cookies;
... | package crawlers.facebook;
import org.apache.commons.io.IOUtils;
import java.io.*;
import org.jsoup.Connection;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import play.Logger;
class FacebookSession {
private static final String COOKIES_FILENAME = "/facebook_cookies";
private String cookies;
... | 5 | 0 | 1 | add_only | --- a/app/crawlers/facebook/FacebookSession.java
+++ b/app/crawlers/facebook/FacebookSession.java
@@ -19,2 +19,7 @@
+ if (secretsStream == null) {
+ Logger.warn("Cannot find Facebook cookies file " + COOKIES_FILENAME);
+ return;
+ }
+
try { | --- a/app/crawlers/facebook/FacebookSession.java
+++ b/app/crawlers/facebook/FacebookSession.java
@@ ... @@
+ if (secretsStream == null) {
+ Logger.warn("Cannot find Facebook cookies file " + COOKIES_FILENAME);
+ return;
+ }
+
try {
| --- a/app/crawlers/facebook/FacebookSession.java
+++ b/app/crawlers/facebook/FacebookSession.java
@@ -19,2 +19,7 @@
CON
ADD if (secretsStream == null) {
ADD Logger.warn("Cannot find Facebook cookies file " + COOKIES_FILENAME);
ADD return;
ADD }
ADD
CON try {
| <<<<<<< SEARCH
InputStream secretsStream = getClass().getResourceAsStream(COOKIES_FILENAME);
try {
cookies = IOUtils.toString(secretsStream, "utf8").trim();
=======
InputStream secretsStream = getClass().getResourceAsStream(COOKIES_FILENAME);
if (secretsStream == null) {
... |
Doist/TodoistPojos | 2eb0df5afe75f8dad0c6d85dc9096c28c09023df | src/main/java/com/todoist/pojo/Project.kt | kotlin | mit | Increase max section count in projects
| package com.todoist.pojo
open class Project @JvmOverloads constructor(
id: Long,
name: String,
open var color: Int = Colors.DEFAULT_COLOR_ID,
open var parentId: Long?,
open var childOrder: Int,
open var isCollapsed: Boolean = false,
open var isInbox: Boolean = fa... | package com.todoist.pojo
open class Project @JvmOverloads constructor(
id: Long,
name: String,
open var color: Int = Colors.DEFAULT_COLOR_ID,
open var parentId: Long?,
open var childOrder: Int,
open var isCollapsed: Boolean = false,
open var isInbox: Boolean = fa... | 1 | 1 | 1 | mixed | --- a/src/main/java/com/todoist/pojo/Project.kt
+++ b/src/main/java/com/todoist/pojo/Project.kt
@@ -29,3 +29,3 @@
const val MAX_COUNT_BUSINESS = 500
- const val MAX_SECTION_COUNT = 10
+ const val MAX_SECTION_COUNT = 20
const val MAX_ITEM_COUNT_FREE = 150 | --- a/src/main/java/com/todoist/pojo/Project.kt
+++ b/src/main/java/com/todoist/pojo/Project.kt
@@ ... @@
const val MAX_COUNT_BUSINESS = 500
- const val MAX_SECTION_COUNT = 10
+ const val MAX_SECTION_COUNT = 20
const val MAX_ITEM_COUNT_FREE = 150
| --- a/src/main/java/com/todoist/pojo/Project.kt
+++ b/src/main/java/com/todoist/pojo/Project.kt
@@ -29,3 +29,3 @@
CON const val MAX_COUNT_BUSINESS = 500
DEL const val MAX_SECTION_COUNT = 10
ADD const val MAX_SECTION_COUNT = 20
CON const val MAX_ITEM_COUNT_FREE = 150
| <<<<<<< SEARCH
const val MAX_COUNT_PREMIUM = 300
const val MAX_COUNT_BUSINESS = 500
const val MAX_SECTION_COUNT = 10
const val MAX_ITEM_COUNT_FREE = 150
const val MAX_ITEM_COUNT_PREMIUM = 300
=======
const val MAX_COUNT_PREMIUM = 300
const val MAX_COUNT_BUSINESS ... |
BenoitZugmeyer/sans-sel | cd75e29c01f3905abf95bc244fb002194d85a19f | src/createRenderer.js | javascript | isc | Revert "support for preact 7"
This reverts commit 3d72ee045e2d89ba591f02d08c292afcdd393989.
| import splat from "./splat";
import formatDeclarations from "./formatDeclarations";
export default function createRenderer(backend) {
let globalSpec = 0;
const specs = Object.create(null);
return function render(rules) {
let currentSpec = -1;
const classNames = splat(rules).map((rule) => ... | import splat from "./splat";
import formatDeclarations from "./formatDeclarations";
export default function createRenderer(backend) {
let globalSpec = 0;
const specs = Object.create(null);
return function render(rules) {
let currentSpec = -1;
const className = splat(rules).map((rule) => {... | 7 | 11 | 2 | mixed | --- a/src/createRenderer.js
+++ b/src/createRenderer.js
@@ -10,3 +10,3 @@
- const classNames = splat(rules).map((rule) => {
+ const className = splat(rules).map((rule) => {
let ruleSpec = -1;
@@ -33,14 +33,10 @@
return `${rule.class}__${ruleSpec}`;
- });
+ }).join... | --- a/src/createRenderer.js
+++ b/src/createRenderer.js
@@ ... @@
- const classNames = splat(rules).map((rule) => {
+ const className = splat(rules).map((rule) => {
let ruleSpec = -1;
@@ ... @@
return `${rule.class}__${ruleSpec}`;
- });
+ }).join(" ");
- ... | --- a/src/createRenderer.js
+++ b/src/createRenderer.js
@@ -10,3 +10,3 @@
CON
DEL const classNames = splat(rules).map((rule) => {
ADD const className = splat(rules).map((rule) => {
CON let ruleSpec = -1;
@@ -33,14 +33,10 @@
CON return `${rule.class}__${ruleSpec}`;
DEL })... | <<<<<<< SEARCH
let currentSpec = -1;
const classNames = splat(rules).map((rule) => {
let ruleSpec = -1;
const ruleSpecs = specs[rule.id] || (specs[rule.id] = []);
=======
let currentSpec = -1;
const className = splat(rules).map((rule) => {
let ruleS... |
quarkusio/quarkus | 2f88c9be03a0e16f0a09749a1bf61be24bb062fc | extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/devconsole/HibernateSearchDevConsoleRecorder.java | java | apache-2.0 | Make error message a bit more neutral
| package io.quarkus.hibernate.search.orm.elasticsearch.runtime.devconsole;
import java.time.Duration;
import java.util.stream.Collectors;
import org.hibernate.search.mapper.orm.entity.SearchIndexedEntity;
import org.hibernate.search.mapper.orm.mapping.SearchMapping;
import io.quarkus.devconsole.runtime.spi.DevConsole... | package io.quarkus.hibernate.search.orm.elasticsearch.runtime.devconsole;
import java.time.Duration;
import java.util.stream.Collectors;
import org.hibernate.search.mapper.orm.entity.SearchIndexedEntity;
import org.hibernate.search.mapper.orm.mapping.SearchMapping;
import io.quarkus.devconsole.runtime.spi.DevConsole... | 1 | 1 | 1 | mixed | --- a/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/devconsole/HibernateSearchDevConsoleRecorder.java
+++ b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/devconsole/Hib... | --- a/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/devconsole/HibernateSearchDevConsoleRecorder.java
+++ b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/devconsole/Hib... | --- a/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/devconsole/HibernateSearchDevConsoleRecorder.java
+++ b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/devconsole/Hib... | <<<<<<< SEARCH
SearchMapping mapping = HibernateSearchSupplier.searchMapping();
if (mapping == null) {
flashMessage(event, "There aren't any indexed entity types!", FlashScopeUtil.FlashMessageStatus.ERROR);
return;
}
=======
... |
dcshock/forklift | 2d783b2e6013851b199eb2fffdd2daf81caacf8c | connectors/kafka/src/test/java/forklift/integration/server/SchemaRegistryService.java | java | mit | Set the embedded schema registry's compatibility mode to full
| package forklift.integration.server;
import io.confluent.kafka.schemaregistry.rest.SchemaRegistryConfig;
import io.confluent.kafka.schemaregistry.rest.SchemaRegistryRestApplication;
import org.eclipse.jetty.server.Server;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Properties;
/**
* Emb... | package forklift.integration.server;
import io.confluent.kafka.schemaregistry.rest.SchemaRegistryConfig;
import io.confluent.kafka.schemaregistry.rest.SchemaRegistryRestApplication;
import org.eclipse.jetty.server.Server;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Properties;
/**
* Emb... | 1 | 2 | 1 | mixed | --- a/connectors/kafka/src/test/java/forklift/integration/server/SchemaRegistryService.java
+++ b/connectors/kafka/src/test/java/forklift/integration/server/SchemaRegistryService.java
@@ -37,4 +37,3 @@
properties.setProperty("host.name", "localhost");
- //properties.setProperty("kafkastore.topic", "_sch... | --- a/connectors/kafka/src/test/java/forklift/integration/server/SchemaRegistryService.java
+++ b/connectors/kafka/src/test/java/forklift/integration/server/SchemaRegistryService.java
@@ ... @@
properties.setProperty("host.name", "localhost");
- //properties.setProperty("kafkastore.topic", "_schemas");
... | --- a/connectors/kafka/src/test/java/forklift/integration/server/SchemaRegistryService.java
+++ b/connectors/kafka/src/test/java/forklift/integration/server/SchemaRegistryService.java
@@ -37,4 +37,3 @@
CON properties.setProperty("host.name", "localhost");
DEL //properties.setProperty("kafkastore.topic",... | <<<<<<< SEARCH
properties.setProperty("kafkastore.connection.url", "localhost:" + localZookeeperPort);
properties.setProperty("host.name", "localhost");
//properties.setProperty("kafkastore.topic", "_schemas");
//properties.setProperty("debug", "false");
try {
SchemaR... |
olson-sean-k/bismuth | c2568468363b4e040ae2633ce102dc2eb7722c11 | src/framework.rs | rust | mit | Add basic loop to `Harness`.
| use event::Reactor;
use render::{Context, GlutinContext, MetaContext};
pub struct Harness<A, C>
where A: Application,
C: MetaContext
{
application: A,
context: Context<C>,
}
impl<A> Harness<A, GlutinContext>
where A: Application
{
pub fn with_glutin_context(application: A) -> Self {
... | use glutin::Window;
use event::{Event, PollEvents, Reactor};
use render::{Context, GlutinContext, MetaContext};
pub struct Harness<A, C>
where A: Application<C>,
C: MetaContext
{
application: A,
context: Context<C>,
}
impl<A> Harness<A, GlutinContext>
where A: Application<GlutinContext>
{
... | 36 | 7 | 4 | mixed | --- a/src/framework.rs
+++ b/src/framework.rs
@@ -1,2 +1,4 @@
-use event::Reactor;
+use glutin::Window;
+
+use event::{Event, PollEvents, Reactor};
use render::{Context, GlutinContext, MetaContext};
@@ -4,3 +6,3 @@
pub struct Harness<A, C>
- where A: Application,
+ where A: Application<C>,
C: MetaCon... | --- a/src/framework.rs
+++ b/src/framework.rs
@@ ... @@
-use event::Reactor;
+use glutin::Window;
+
+use event::{Event, PollEvents, Reactor};
use render::{Context, GlutinContext, MetaContext};
@@ ... @@
pub struct Harness<A, C>
- where A: Application,
+ where A: Application<C>,
C: MetaContext
@@ ... ... | --- a/src/framework.rs
+++ b/src/framework.rs
@@ -1,2 +1,4 @@
DEL use event::Reactor;
ADD use glutin::Window;
ADD
ADD use event::{Event, PollEvents, Reactor};
CON use render::{Context, GlutinContext, MetaContext};
@@ -4,3 +6,3 @@
CON pub struct Harness<A, C>
DEL where A: Application,
ADD where A: Application<C... | <<<<<<< SEARCH
use event::Reactor;
use render::{Context, GlutinContext, MetaContext};
pub struct Harness<A, C>
where A: Application,
C: MetaContext
{
=======
use glutin::Window;
use event::{Event, PollEvents, Reactor};
use render::{Context, GlutinContext, MetaContext};
pub struct Harness<A, C>
whe... |
jgoclawski/django-facebook-auth | 12cf7d220408971509b57cb3a60f2d87b4a37477 | facebook_auth/models.py | python | mit | Revert "Add support for server side authentication."
This reverts commit 10ae930f6f14c2840d0b87cbec17054b4cc318d2.
Change-Id: Ied52c31f6f28ad635a6e5dae2171df22dc91e42c
Reviewed-on: http://review.pozytywnie.pl:8080/5153
Reviewed-by: Tomasz Wysocki <f17c2dc043305c950a029074ababd304e0373387@gmail.com>
Tested-by: Tomasz ... | from uuid import uuid1
from django.conf import settings
from django.contrib.auth import models as auth_models
from django.db import models
import facepy
import simplejson
from facebook_auth import utils
class FacebookUser(auth_models.User):
user_id = models.BigIntegerField(unique=True)
access_token = models.... | from django.contrib.auth import models as auth_models
from django.db import models
import facepy
import simplejson
from facebook_auth import utils
class FacebookUser(auth_models.User):
user_id = models.BigIntegerField(unique=True)
access_token = models.TextField(blank=True, null=True)
app_friends = models... | 0 | 11 | 2 | del_only | --- a/facebook_auth/models.py
+++ b/facebook_auth/models.py
@@ -1,4 +1 @@
-from uuid import uuid1
-
-from django.conf import settings
from django.contrib.auth import models as auth_models
@@ -35,9 +32 @@
self.app_friends.add(*FacebookUser.objects.filter(user_id__in=friends_ids))
-
-
-def get_auth_address(requ... | --- a/facebook_auth/models.py
+++ b/facebook_auth/models.py
@@ ... @@
-from uuid import uuid1
-
-from django.conf import settings
from django.contrib.auth import models as auth_models
@@ ... @@
self.app_friends.add(*FacebookUser.objects.filter(user_id__in=friends_ids))
-
-
-def get_auth_address(request, redir... | --- a/facebook_auth/models.py
+++ b/facebook_auth/models.py
@@ -1,4 +1 @@
DEL from uuid import uuid1
DEL
DEL from django.conf import settings
CON from django.contrib.auth import models as auth_models
@@ -35,9 +32 @@
CON self.app_friends.add(*FacebookUser.objects.filter(user_id__in=friends_ids))
DEL
DEL
DEL d... | <<<<<<< SEARCH
from uuid import uuid1
from django.conf import settings
from django.contrib.auth import models as auth_models
from django.db import models
=======
from django.contrib.auth import models as auth_models
from django.db import models
>>>>>>> REPLACE
<<<<<<< SEARCH
self.app_friends.clear()
... |
dollars0427/S3Backuper | 7be89b53acb6f633d75e1d11949b68b8cea1b2c2 | index.js | javascript | apache-2.0 | Remove file type check part
| //Import modules
var AWS = require('aws-sdk');
var util = require('util');
var fs = require('fs');
//Create S3 client
var s3 = new AWS.S3();
//Create event handler for S3
exports.handler = function(event, context) {
console.log("Reading options from event:\n", util.inspect(event, {depth: 5}));
for (i = ... | //Import modules
var AWS = require('aws-sdk');
var util = require('util');
var fs = require('fs');
//Create S3 client
var s3 = new AWS.S3();
//Create event handler for S3
exports.handler = function(event, context) {
console.log("Reading options from event:\n", util.inspect(event, {depth: 5}));
for (i = ... | 3 | 20 | 3 | mixed | --- a/index.js
+++ b/index.js
@@ -20,20 +20,3 @@
- //Check the image type.
- var typeMatch = srcKey.match(/\.([^.]*)$/);
-
- if (!typeMatch) {
- console.error('unable to infer image type for key ' + srcKey);
- return;
- }
-
- var imageType = typeMatch[1];
-
- ... | --- a/index.js
+++ b/index.js
@@ ... @@
- //Check the image type.
- var typeMatch = srcKey.match(/\.([^.]*)$/);
-
- if (!typeMatch) {
- console.error('unable to infer image type for key ' + srcKey);
- return;
- }
-
- var imageType = typeMatch[1];
-
- if(... | --- a/index.js
+++ b/index.js
@@ -20,20 +20,3 @@
CON
DEL //Check the image type.
DEL var typeMatch = srcKey.match(/\.([^.]*)$/);
DEL
DEL if (!typeMatch) {
DEL console.error('unable to infer image type for key ' + srcKey);
DEL return;
DEL }
DEL
DEL var i... | <<<<<<< SEARCH
console.log("The file which you updated is " + srcKey);
//Check the image type.
var typeMatch = srcKey.match(/\.([^.]*)$/);
if (!typeMatch) {
console.error('unable to infer image type for key ' + srcKey);
return;
}
var imageType =... |
spark/photon-tinker-android | c0b285fb8e1617eda7cc4550ce7b90ca0ef2d289 | meshui/src/main/java/io/particle/mesh/ui/setup/ScanCommissionerCodeFragment.kt | kotlin | apache-2.0 | Remove unnecessary code for formatting these strings now that they're static
| package io.particle.mesh.ui.setup
import androidx.fragment.app.FragmentActivity
import com.squareup.phrase.Phrase
import io.particle.android.sdk.cloud.ParticleCloudSDK
import io.particle.mesh.setup.BarcodeData.CompleteBarcodeData
import io.particle.mesh.setup.flow.FlowRunnerUiListener
import io.particle.mesh.ui.R
impo... | package io.particle.mesh.ui.setup
import androidx.fragment.app.FragmentActivity
import com.squareup.phrase.Phrase
import io.particle.android.sdk.cloud.ParticleCloudSDK
import io.particle.mesh.setup.BarcodeData.CompleteBarcodeData
import io.particle.mesh.setup.flow.FlowRunnerUiListener
import io.particle.mesh.ui.R
impo... | 0 | 9 | 1 | del_only | --- a/meshui/src/main/java/io/particle/mesh/ui/setup/ScanCommissionerCodeFragment.kt
+++ b/meshui/src/main/java/io/particle/mesh/ui/setup/ScanCommissionerCodeFragment.kt
@@ -22,11 +22,2 @@
val productName = getUserFacingTypeName()
-
- textView.text = Phrase.from(view, R.string.p_scancommissionercode_tip... | --- a/meshui/src/main/java/io/particle/mesh/ui/setup/ScanCommissionerCodeFragment.kt
+++ b/meshui/src/main/java/io/particle/mesh/ui/setup/ScanCommissionerCodeFragment.kt
@@ ... @@
val productName = getUserFacingTypeName()
-
- textView.text = Phrase.from(view, R.string.p_scancommissionercode_tip_content)... | --- a/meshui/src/main/java/io/particle/mesh/ui/setup/ScanCommissionerCodeFragment.kt
+++ b/meshui/src/main/java/io/particle/mesh/ui/setup/ScanCommissionerCodeFragment.kt
@@ -22,11 +22,2 @@
CON val productName = getUserFacingTypeName()
DEL
DEL textView.text = Phrase.from(view, R.string.p_scancommissione... | <<<<<<< SEARCH
super.onFragmentReady(activity, flowUiListener)
val productName = getUserFacingTypeName()
textView.text = Phrase.from(view, R.string.p_scancommissionercode_tip_content)
.put("product_type", productName)
.format()
setup_header_text.text = Phrase.fr... |
fanderzon/rocket-api | 161a3d86073077f789143dbe9398372ac445e984 | src/models.rs | rust | mit | Remove unused variable and import warnings
| use super::schema::notes;
use rocket::{Request, Data, Outcome};
use rocket::data::{self, FromData};
use rocket::http::Status;
use rocket::Outcome::*;
use serde_json;
use rocket_contrib::JSON;
#[derive(Queryable)]
#[derive(Serialize,Deserialize)]
pub struct Note {
pub id: i32,
pub title: String,
pub body: S... | use super::schema::notes;
use rocket::{Request, Data};
use rocket::data::{self, FromData};
use rocket::http::Status;
use rocket::Outcome::*;
use serde_json;
use rocket_contrib::JSON;
#[derive(Queryable)]
#[derive(Serialize,Deserialize)]
pub struct Note {
pub id: i32,
pub title: String,
pub body: String,
... | 2 | 1 | 2 | mixed | --- a/src/models.rs
+++ b/src/models.rs
@@ -1,3 +1,3 @@
use super::schema::notes;
-use rocket::{Request, Data, Outcome};
+use rocket::{Request, Data};
use rocket::data::{self, FromData};
@@ -28,2 +28,3 @@
+ #[allow(unused_variables)]
fn from_data(req: &Request, data: Data) -> data::Outcome<Self, String> { | --- a/src/models.rs
+++ b/src/models.rs
@@ ... @@
use super::schema::notes;
-use rocket::{Request, Data, Outcome};
+use rocket::{Request, Data};
use rocket::data::{self, FromData};
@@ ... @@
+ #[allow(unused_variables)]
fn from_data(req: &Request, data: Data) -> data::Outcome<Self, String> {
| --- a/src/models.rs
+++ b/src/models.rs
@@ -1,3 +1,3 @@
CON use super::schema::notes;
DEL use rocket::{Request, Data, Outcome};
ADD use rocket::{Request, Data};
CON use rocket::data::{self, FromData};
@@ -28,2 +28,3 @@
CON
ADD #[allow(unused_variables)]
CON fn from_data(req: &Request, data: Data) -> data::Outc... | <<<<<<< SEARCH
use super::schema::notes;
use rocket::{Request, Data, Outcome};
use rocket::data::{self, FromData};
use rocket::http::Status;
=======
use super::schema::notes;
use rocket::{Request, Data};
use rocket::data::{self, FromData};
use rocket::http::Status;
>>>>>>> REPLACE
<<<<<<< SEARCH
type Error = Str... |
gyn/exercism | 8d0fbd17c7e924c32c1b75f4634ba1f9165dfcf0 | rust/atbash-cipher/src/lib.rs | rust | bsd-2-clause | Use const instead of magic number
It looks better
| #![feature(ascii_ctype)]
use std::ascii::AsciiExt;
pub fn encode(message: &str) -> String {
let mut index = 0;
message
.chars()
.filter_map(|c| match c {
_ if c.is_ascii_digit() => Some(c),
_ if c.is_ascii_uppercase() => {
let v = b'z' - c.to_ascii_lowerc... | #![feature(ascii_ctype)]
use std::ascii::AsciiExt;
const LA: u8 = b'a';
const LZ: u8 = b'z';
pub fn encode(message: &str) -> String {
let mut index = 0;
message
.chars()
.filter_map(|c| match c {
_ if c.is_ascii_digit() => Some(c),
_ if c.is_ascii_uppercase() => {
... | 6 | 3 | 4 | mixed | --- a/rust/atbash-cipher/src/lib.rs
+++ b/rust/atbash-cipher/src/lib.rs
@@ -2,2 +2,5 @@
use std::ascii::AsciiExt;
+
+const LA: u8 = b'a';
+const LZ: u8 = b'z';
@@ -10,3 +13,3 @@
_ if c.is_ascii_uppercase() => {
- let v = b'z' - c.to_ascii_lowercase() as u8 + b'a';
+ let v =... | --- a/rust/atbash-cipher/src/lib.rs
+++ b/rust/atbash-cipher/src/lib.rs
@@ ... @@
use std::ascii::AsciiExt;
+
+const LA: u8 = b'a';
+const LZ: u8 = b'z';
@@ ... @@
_ if c.is_ascii_uppercase() => {
- let v = b'z' - c.to_ascii_lowercase() as u8 + b'a';
+ let v = LZ - c.to_asc... | --- a/rust/atbash-cipher/src/lib.rs
+++ b/rust/atbash-cipher/src/lib.rs
@@ -2,2 +2,5 @@
CON use std::ascii::AsciiExt;
ADD
ADD const LA: u8 = b'a';
ADD const LZ: u8 = b'z';
CON
@@ -10,3 +13,3 @@
CON _ if c.is_ascii_uppercase() => {
DEL let v = b'z' - c.to_ascii_lowercase() as u8 + b'a';
ADD... | <<<<<<< SEARCH
#![feature(ascii_ctype)]
use std::ascii::AsciiExt;
pub fn encode(message: &str) -> String {
=======
#![feature(ascii_ctype)]
use std::ascii::AsciiExt;
const LA: u8 = b'a';
const LZ: u8 = b'z';
pub fn encode(message: &str) -> String {
>>>>>>> REPLACE
<<<<<<< SEARCH
_ if c.is_ascii_digit(... |
gladly-team/tab | 6fa108dce112d4e96912441be5bb47c81e0e841a | web/src/js/components/Dashboard/DashboardPopover.js | javascript | mpl-2.0 | Add note about a test to implement later
| import React from 'react'
import PropTypes from 'prop-types'
import Popover from '@material-ui/core/Popover'
import { withTheme } from '@material-ui/core/styles'
const DashboardPopover = props => {
const { anchorEl, children, onClose, open, theme, ...otherProps } = props
return (
<Popover
open={open}
... | import React from 'react'
import PropTypes from 'prop-types'
import Popover from '@material-ui/core/Popover'
import { withTheme } from '@material-ui/core/styles'
const DashboardPopover = props => {
const { anchorEl, children, onClose, open, theme, ...otherProps } = props
return (
<Popover
open={open}
... | 6 | 1 | 1 | mixed | --- a/web/src/js/components/Dashboard/DashboardPopover.js
+++ b/web/src/js/components/Dashboard/DashboardPopover.js
@@ -20,3 +20,8 @@
height: 3,
- // TODO: add tests that we're using this MUI theme color
+ // We should test that we're using this MUI theme color
+ // (e.g., see them... | --- a/web/src/js/components/Dashboard/DashboardPopover.js
+++ b/web/src/js/components/Dashboard/DashboardPopover.js
@@ ... @@
height: 3,
- // TODO: add tests that we're using this MUI theme color
+ // We should test that we're using this MUI theme color
+ // (e.g., see them tests i... | --- a/web/src/js/components/Dashboard/DashboardPopover.js
+++ b/web/src/js/components/Dashboard/DashboardPopover.js
@@ -20,3 +20,8 @@
CON height: 3,
DEL // TODO: add tests that we're using this MUI theme color
ADD // We should test that we're using this MUI theme color
ADD // (e.... | <<<<<<< SEARCH
width: '100%',
height: 3,
// TODO: add tests that we're using this MUI theme color
backgroundColor: theme.palette.primary.main,
}}
=======
width: '100%',
height: 3,
// We should test that we're using this MUI theme color
... |
cemrich/zapp | 53bc98950c2e5f6d4b5a464b73386707034d2a3b | app/src/main/java/de/christinecoenen/code/zapp/models/shows/PersistedMediathekShow.kt | kotlin | mit | Fix NaN error in downloads tab
| package de.christinecoenen.code.zapp.models.shows
import androidx.room.Embedded
import androidx.room.Entity
import androidx.room.Index
import androidx.room.PrimaryKey
import org.joda.time.DateTime
@Entity(indices = [Index(value = ["apiId"], unique = true)])
data class PersistedMediathekShow(
@PrimaryKey(autoGenerat... | package de.christinecoenen.code.zapp.models.shows
import androidx.room.Embedded
import androidx.room.Entity
import androidx.room.Index
import androidx.room.PrimaryKey
import org.joda.time.DateTime
@Entity(indices = [Index(value = ["apiId"], unique = true)])
data class PersistedMediathekShow(
@PrimaryKey(autoGenerat... | 1 | 1 | 1 | mixed | --- a/app/src/main/java/de/christinecoenen/code/zapp/models/shows/PersistedMediathekShow.kt
+++ b/app/src/main/java/de/christinecoenen/code/zapp/models/shows/PersistedMediathekShow.kt
@@ -38,3 +38,3 @@
val playBackPercent
- get() = playbackPosition.toFloat() / videoDuration
+ get() = (playbackPosition.toFloat() / v... | --- a/app/src/main/java/de/christinecoenen/code/zapp/models/shows/PersistedMediathekShow.kt
+++ b/app/src/main/java/de/christinecoenen/code/zapp/models/shows/PersistedMediathekShow.kt
@@ ... @@
val playBackPercent
- get() = playbackPosition.toFloat() / videoDuration
+ get() = (playbackPosition.toFloat() / videoDura... | --- a/app/src/main/java/de/christinecoenen/code/zapp/models/shows/PersistedMediathekShow.kt
+++ b/app/src/main/java/de/christinecoenen/code/zapp/models/shows/PersistedMediathekShow.kt
@@ -38,3 +38,3 @@
CON val playBackPercent
DEL get() = playbackPosition.toFloat() / videoDuration
ADD get() = (playbackPosition.toFl... | <<<<<<< SEARCH
val playBackPercent
get() = playbackPosition.toFloat() / videoDuration
}
=======
val playBackPercent
get() = (playbackPosition.toFloat() / videoDuration).let { if (it.isNaN()) 0f else it }
}
>>>>>>> REPLACE
|
razh/experiments-three.js | 5b66645a14d1cab6c74a8480c44983a3ed745ce4 | ecs/js/withEntity.js | javascript | mit | ecs: Use `instanceof` checks when retrieving components.
| /* exported withEntity */
function withEntity(Class) {
return class WithEntity extends Class {
constructor(...args) {
super(...args);
this.components = [];
}
addComponent(...components) {
components.forEach(component => {
if (this.hasComponent(component)) {
return;
... | /* exported withEntity */
function withEntity(Class) {
return class WithEntity extends Class {
constructor(...args) {
super(...args);
this.components = [];
}
addComponent(...components) {
components.forEach(component => {
if (this.hasComponent(component)) {
return;
... | 4 | 4 | 1 | mixed | --- a/ecs/js/withEntity.js
+++ b/ecs/js/withEntity.js
@@ -27,8 +27,8 @@
- getComponent(type) {
- return this.components.find(component => component.type === type);
+ getComponent(Type) {
+ return this.components.find(component => component instanceof Type);
}
- getComponents(type) {
- r... | --- a/ecs/js/withEntity.js
+++ b/ecs/js/withEntity.js
@@ ... @@
- getComponent(type) {
- return this.components.find(component => component.type === type);
+ getComponent(Type) {
+ return this.components.find(component => component instanceof Type);
}
- getComponents(type) {
- return th... | --- a/ecs/js/withEntity.js
+++ b/ecs/js/withEntity.js
@@ -27,8 +27,8 @@
CON
DEL getComponent(type) {
DEL return this.components.find(component => component.type === type);
ADD getComponent(Type) {
ADD return this.components.find(component => component instanceof Type);
CON }
CON
DEL getCom... | <<<<<<< SEARCH
}
getComponent(type) {
return this.components.find(component => component.type === type);
}
getComponents(type) {
return this.components.filter(component => component.type === type);
}
=======
}
getComponent(Type) {
return this.components.find(component ... |
lorenzogil/yith-library-server | badddd6aa9533a01e07477174dc7422ee4941014 | wsgi.py | python | agpl-3.0 | Read the conf file using absolute paths
| # Yith Library Server is a password storage server.
# Copyright (C) 2015 Lorenzo Gil Sanchez <lorenzo.gil.sanchez@gmail.com>
#
# This file is part of Yith Library Server.
#
# Yith Library Server is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as publ... | # Yith Library Server is a password storage server.
# Copyright (C) 2015 Lorenzo Gil Sanchez <lorenzo.gil.sanchez@gmail.com>
#
# This file is part of Yith Library Server.
#
# Yith Library Server is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as publ... | 18 | 2 | 2 | mixed | --- a/wsgi.py
+++ b/wsgi.py
@@ -18,2 +18,5 @@
+import os
+import os.path
+
from newrelic import agent
@@ -22,6 +25,19 @@
from paste.deploy import loadapp
+from pyramid.paster import setup_logging
from raven.middleware import Sentry
+from waitress import serve
-application = loadapp('config:production.ini',
- ... | --- a/wsgi.py
+++ b/wsgi.py
@@ ... @@
+import os
+import os.path
+
from newrelic import agent
@@ ... @@
from paste.deploy import loadapp
+from pyramid.paster import setup_logging
from raven.middleware import Sentry
+from waitress import serve
-application = loadapp('config:production.ini',
- ... | --- a/wsgi.py
+++ b/wsgi.py
@@ -18,2 +18,5 @@
CON
ADD import os
ADD import os.path
ADD
CON from newrelic import agent
@@ -22,6 +25,19 @@
CON from paste.deploy import loadapp
ADD from pyramid.paster import setup_logging
CON from raven.middleware import Sentry
ADD from waitress import serve
CON
DEL application = loada... | <<<<<<< SEARCH
# along with Yith Library Server. If not, see <http://www.gnu.org/licenses/>.
from newrelic import agent
agent.initialize()
from paste.deploy import loadapp
from raven.middleware import Sentry
application = loadapp('config:production.ini',
relative_to='yithlibraryserver/config-t... |
notapresent/rtrss | cdbcc903c72ba7bf8acb45d69248e62fdc10efcd | rtrss/util.py | python | apache-2.0 | Add log message at start of user import
| import csv
import logging
import os
import datetime
from rtrss import config
from rtrss.models import User
from rtrss.database import session_scope
_logger = logging.getLogger(__name__)
def save_debug_file(filename, contents):
ts_prefix = datetime.datetime.now().strftime('%d-%m-%Y_%H_%M_%S')
filename = "{}_... | import csv
import logging
import os
import datetime
from rtrss import config
from rtrss.models import User
from rtrss.database import session_scope
_logger = logging.getLogger(__name__)
def save_debug_file(filename, contents):
ts_prefix = datetime.datetime.now().strftime('%d-%m-%Y_%H_%M_%S')
filename = "{}... | 3 | 0 | 2 | add_only | --- a/rtrss/util.py
+++ b/rtrss/util.py
@@ -4,2 +4,3 @@
import datetime
+
from rtrss import config
@@ -25,2 +26,4 @@
+ _logger.info("Importing {} accounts from {}".format(filename, len(lines)))
+
added = 0 | --- a/rtrss/util.py
+++ b/rtrss/util.py
@@ ... @@
import datetime
+
from rtrss import config
@@ ... @@
+ _logger.info("Importing {} accounts from {}".format(filename, len(lines)))
+
added = 0
| --- a/rtrss/util.py
+++ b/rtrss/util.py
@@ -4,2 +4,3 @@
CON import datetime
ADD
CON from rtrss import config
@@ -25,2 +26,4 @@
CON
ADD _logger.info("Importing {} accounts from {}".format(filename, len(lines)))
ADD
CON added = 0
| <<<<<<< SEARCH
import os
import datetime
from rtrss import config
from rtrss.models import User
=======
import os
import datetime
from rtrss import config
from rtrss.models import User
>>>>>>> REPLACE
<<<<<<< SEARCH
lines = [line for line in reader]
added = 0
with session_scope() as db:
=======
... |
ks888/LambStatus | 3faa9d7a6078ecd496de66187768310c98fa4b44 | packages/frontend/src/components/RadioButton/RadioButton.js | javascript | apache-2.0 | Set default value for radio buttons
| import React, { PropTypes } from 'react'
import ReactDOM from 'react-dom'
import classnames from 'classnames'
import classes from './RadioButton.scss'
class RadioButton extends React.Component {
componentDidMount () {
let jsElem = ReactDOM.findDOMNode(this.refs.radiobutton)
componentHandler.upgradeElement(js... | import React, { PropTypes } from 'react'
import ReactDOM from 'react-dom'
import classnames from 'classnames'
import classes from './RadioButton.scss'
class RadioButton extends React.Component {
componentDidMount () {
let inputNode = ReactDOM.findDOMNode(this.refs.radiobutton_input)
if (this.props.checked) {... | 8 | 6 | 2 | mixed | --- a/packages/frontend/src/components/RadioButton/RadioButton.js
+++ b/packages/frontend/src/components/RadioButton/RadioButton.js
@@ -7,4 +7,8 @@
componentDidMount () {
- let jsElem = ReactDOM.findDOMNode(this.refs.radiobutton)
- componentHandler.upgradeElement(jsElem)
+ let inputNode = ReactDOM.findDOMNo... | --- a/packages/frontend/src/components/RadioButton/RadioButton.js
+++ b/packages/frontend/src/components/RadioButton/RadioButton.js
@@ ... @@
componentDidMount () {
- let jsElem = ReactDOM.findDOMNode(this.refs.radiobutton)
- componentHandler.upgradeElement(jsElem)
+ let inputNode = ReactDOM.findDOMNode(thi... | --- a/packages/frontend/src/components/RadioButton/RadioButton.js
+++ b/packages/frontend/src/components/RadioButton/RadioButton.js
@@ -7,4 +7,8 @@
CON componentDidMount () {
DEL let jsElem = ReactDOM.findDOMNode(this.refs.radiobutton)
DEL componentHandler.upgradeElement(jsElem)
ADD let inputNode = ReactD... | <<<<<<< SEARCH
class RadioButton extends React.Component {
componentDidMount () {
let jsElem = ReactDOM.findDOMNode(this.refs.radiobutton)
componentHandler.upgradeElement(jsElem)
}
=======
class RadioButton extends React.Component {
componentDidMount () {
let inputNode = ReactDOM.findDOMNode(this.re... |
ember-intl/ember-intl | 6c5b2d5c673d5aad106177b732e9445880514117 | tests/acceptance/smoke-test.js | javascript | mit | Fix smoke tests for browsers without innerText support | import Ember from 'ember';
import startApp from '../helpers/start-app';
var application;
function contains(selector, string) {
var element = find(selector)[0];
if (!element) {
return ok(false, 'can\'t find element: ' + selector);
}
return equal(element.innerText.replace(/^\s+|\s+$/g, ''), string);
}
mod... | import Ember from 'ember';
import startApp from '../helpers/start-app';
var application;
function contains(selector, string) {
var element = find(selector)[0];
if (!element) {
return ok(false, 'can\'t find element: ' + selector);
}
var text = element.textContent || element.innerText;
return equal(text.... | 2 | 1 | 1 | mixed | --- a/tests/acceptance/smoke-test.js
+++ b/tests/acceptance/smoke-test.js
@@ -11,3 +11,4 @@
- return equal(element.innerText.replace(/^\s+|\s+$/g, ''), string);
+ var text = element.textContent || element.innerText;
+ return equal(text.replace(/^\s+|\s+$/g, ''), string);
} | --- a/tests/acceptance/smoke-test.js
+++ b/tests/acceptance/smoke-test.js
@@ ... @@
- return equal(element.innerText.replace(/^\s+|\s+$/g, ''), string);
+ var text = element.textContent || element.innerText;
+ return equal(text.replace(/^\s+|\s+$/g, ''), string);
}
| --- a/tests/acceptance/smoke-test.js
+++ b/tests/acceptance/smoke-test.js
@@ -11,3 +11,4 @@
CON
DEL return equal(element.innerText.replace(/^\s+|\s+$/g, ''), string);
ADD var text = element.textContent || element.innerText;
ADD return equal(text.replace(/^\s+|\s+$/g, ''), string);
CON }
| <<<<<<< SEARCH
}
return equal(element.innerText.replace(/^\s+|\s+$/g, ''), string);
}
=======
}
var text = element.textContent || element.innerText;
return equal(text.replace(/^\s+|\s+$/g, ''), string);
}
>>>>>>> REPLACE
|
martinpfannemueller/moped | 3336165043655f235012890d934ac103a14ba105 | angular/src/app/widgets/widgets.js | javascript | mit | Set page title via route property.
| angular.module('moped.widgets', [
'moped.util'
])
.directive('mopedTrack', function(util) {
return {
restrict: 'EA',
scope: {
trackNo: '=',
track: '='
},
replace: true,
link: function(scope, element, attrs) {
scope.artistsAsString = function() {
return util.getTrackArti... | angular.module('moped.widgets', [
'moped.util'
])
.directive('mopedTrack', function(util) {
return {
restrict: 'EA',
scope: {
trackNo: '=',
track: '='
},
replace: true,
templateUrl: 'widgets/track.tpl.html',
link: function(scope, element, attrs) {
scope.artistsAsString = fu... | 10 | 7 | 5 | mixed | --- a/angular/src/app/widgets/widgets.js
+++ b/angular/src/app/widgets/widgets.js
@@ -11,2 +11,3 @@
replace: true,
+ templateUrl: 'widgets/track.tpl.html',
link: function(scope, element, attrs) {
@@ -22,3 +23,3 @@
};
- scope.$on('mopidy:event:trackPlaybackStarted', function(event, data) {
+ ... | --- a/angular/src/app/widgets/widgets.js
+++ b/angular/src/app/widgets/widgets.js
@@ ... @@
replace: true,
+ templateUrl: 'widgets/track.tpl.html',
link: function(scope, element, attrs) {
@@ ... @@
};
- scope.$on('mopidy:event:trackPlaybackStarted', function(event, data) {
+ var cleanUpTra... | --- a/angular/src/app/widgets/widgets.js
+++ b/angular/src/app/widgets/widgets.js
@@ -11,2 +11,3 @@
CON replace: true,
ADD templateUrl: 'widgets/track.tpl.html',
CON link: function(scope, element, attrs) {
@@ -22,3 +23,3 @@
CON };
DEL scope.$on('mopidy:event:trackPlaybackStarted', function(event... | <<<<<<< SEARCH
},
replace: true,
link: function(scope, element, attrs) {
scope.artistsAsString = function() {
=======
},
replace: true,
templateUrl: 'widgets/track.tpl.html',
link: function(scope, element, attrs) {
scope.artistsAsString = function() {
>>>>>>> REPLACE
<<<<<<< S... |
vinoApp/vino | 969e3abd6099fb4fa749c3d081fe3a6c2c35c273 | vino-srv/src/main/java/com/vino/backend/model/Entity.java | java | apache-2.0 | Change key attribute to private after Jongo version changes
| /*
* Copyright 2013 - Elian ORIOU
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.
*
* Unless required by applicable law or agreed to ... | /*
* Copyright 2013 - Elian ORIOU
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.
*
* Unless required by applicable law or agreed to ... | 1 | 6 | 1 | mixed | --- a/vino-srv/src/main/java/com/vino/backend/model/Entity.java
+++ b/vino-srv/src/main/java/com/vino/backend/model/Entity.java
@@ -31,10 +31,5 @@
- // It seems to be an issue on Jongo... This field will be temporarly public...
@ObjectId
@Id
- public String key;
-
- public Entity() {
-
- }
+ ... | --- a/vino-srv/src/main/java/com/vino/backend/model/Entity.java
+++ b/vino-srv/src/main/java/com/vino/backend/model/Entity.java
@@ ... @@
- // It seems to be an issue on Jongo... This field will be temporarly public...
@ObjectId
@Id
- public String key;
-
- public Entity() {
-
- }
+ private S... | --- a/vino-srv/src/main/java/com/vino/backend/model/Entity.java
+++ b/vino-srv/src/main/java/com/vino/backend/model/Entity.java
@@ -31,10 +31,5 @@
CON
DEL // It seems to be an issue on Jongo... This field will be temporarly public...
CON @ObjectId
CON @Id
DEL public String key;
DEL
DEL public Enti... | <<<<<<< SEARCH
public abstract class Entity {
// It seems to be an issue on Jongo... This field will be temporarly public...
@ObjectId
@Id
public String key;
public Entity() {
}
public Entity setKey(String key) {
=======
public abstract class Entity {
@ObjectId
@Id
private ... |
CS2103JAN2017-W15-B4/main | 32f5090deea042b9ca1acd81570bead7d305e146 | src/main/java/seedu/geekeep/ui/TaskCard.java | java | mit | Update display of task card
| package seedu.geekeep.ui;
import javafx.fxml.FXML;
import javafx.scene.control.Label;
import javafx.scene.layout.FlowPane;
import javafx.scene.layout.HBox;
import javafx.scene.layout.Region;
import seedu.geekeep.model.task.ReadOnlyTask;
public class TaskCard extends UiPart<Region> {
private static final String F... | package seedu.geekeep.ui;
import javafx.fxml.FXML;
import javafx.scene.control.Label;
import javafx.scene.layout.FlowPane;
import javafx.scene.layout.HBox;
import javafx.scene.layout.Region;
import seedu.geekeep.model.task.ReadOnlyTask;
public class TaskCard extends UiPart<Region> {
private static final String F... | 16 | 4 | 1 | mixed | --- a/src/main/java/seedu/geekeep/ui/TaskCard.java
+++ b/src/main/java/seedu/geekeep/ui/TaskCard.java
@@ -31,6 +31,18 @@
name.setText(person.getTitle().fullTitle);
- id.setText(displayedIndex + ". ");
- phone.setText(person.getEndDateTime().value);
- address.setText(person.getLocation().va... | --- a/src/main/java/seedu/geekeep/ui/TaskCard.java
+++ b/src/main/java/seedu/geekeep/ui/TaskCard.java
@@ ... @@
name.setText(person.getTitle().fullTitle);
- id.setText(displayedIndex + ". ");
- phone.setText(person.getEndDateTime().value);
- address.setText(person.getLocation().value);
- ... | --- a/src/main/java/seedu/geekeep/ui/TaskCard.java
+++ b/src/main/java/seedu/geekeep/ui/TaskCard.java
@@ -31,6 +31,18 @@
CON name.setText(person.getTitle().fullTitle);
DEL id.setText(displayedIndex + ". ");
DEL phone.setText(person.getEndDateTime().value);
DEL address.setText(person.getL... | <<<<<<< SEARCH
super(FXML);
name.setText(person.getTitle().fullTitle);
id.setText(displayedIndex + ". ");
phone.setText(person.getEndDateTime().value);
address.setText(person.getLocation().value);
email.setText(person.getStartDateTime().value);
initTags(person);
... |
storybooks/react-storybook | 683f93130798348321d1cc6036a6c9a0d0139e32 | lib/ui/src/components/preview/iframe.js | javascript | mit | REMOVE the animation, as it's very awkward
| import window from 'global';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
// this component renders an iframe, which gets updates via post-messages
export class IFrame extends Component {
iframe = null;
componentDidMount() {
const { id } = this.props;
this.iframe = window.... | import window from 'global';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
// this component renders an iframe, which gets updates via post-messages
export class IFrame extends Component {
iframe = null;
componentDidMount() {
const { id } = this.props;
this.iframe = window.... | 0 | 1 | 1 | del_only | --- a/lib/ui/src/components/preview/iframe.js
+++ b/lib/ui/src/components/preview/iframe.js
@@ -25,3 +25,2 @@
transform: `scale(${1 / scale})`,
- transition: 'transform .2s ease-out, height .2s ease-out, width .2s ease-out',
transformOrigin: 'top left', | --- a/lib/ui/src/components/preview/iframe.js
+++ b/lib/ui/src/components/preview/iframe.js
@@ ... @@
transform: `scale(${1 / scale})`,
- transition: 'transform .2s ease-out, height .2s ease-out, width .2s ease-out',
transformOrigin: 'top left',
| --- a/lib/ui/src/components/preview/iframe.js
+++ b/lib/ui/src/components/preview/iframe.js
@@ -25,3 +25,2 @@
CON transform: `scale(${1 / scale})`,
DEL transition: 'transform .2s ease-out, height .2s ease-out, width .2s ease-out',
CON transformOrigin: 'top left',
| <<<<<<< SEARCH
height: `${scale * 100}%`,
transform: `scale(${1 / scale})`,
transition: 'transform .2s ease-out, height .2s ease-out, width .2s ease-out',
transformOrigin: 'top left',
});
=======
height: `${scale * 100}%`,
transform: `scale(${1 / scale})`,
... |
remigourdon/sound-editors | 8b61ddc9446ba33e612a689d2930bf256cf021a6 | framework/Sound.java | java | mit | Add constants for sound synthesis.
| package framework;
import java.util.ArrayList;
import framework.editors.SoundEditor;
/**
* Represents a sound entity.
*
* A sound is represented basically by a frequency and a duration.
* It can then be modified by adding different modifiers.
* It is the core of the model in our MVC design pattern implementation... | package framework;
import java.util.ArrayList;
import framework.editors.SoundEditor;
/**
* Represents a sound entity.
*
* A sound is represented basically by a frequency and a duration.
* It can then be modified by adding different modifiers.
* It is the core of the model in our MVC design pattern implementation... | 4 | 0 | 1 | add_only | --- a/framework/Sound.java
+++ b/framework/Sound.java
@@ -48,2 +48,6 @@
private ArrayList<Modifier> modifiers;
+
+ // Constants
+ private final int SAMPLE_RATE = 44100; // CD quality audio
+ private final int MAX_16_BITS = Short.MAX_VALUE;
} | --- a/framework/Sound.java
+++ b/framework/Sound.java
@@ ... @@
private ArrayList<Modifier> modifiers;
+
+ // Constants
+ private final int SAMPLE_RATE = 44100; // CD quality audio
+ private final int MAX_16_BITS = Short.MAX_VALUE;
}
| --- a/framework/Sound.java
+++ b/framework/Sound.java
@@ -48,2 +48,6 @@
CON private ArrayList<Modifier> modifiers;
ADD
ADD // Constants
ADD private final int SAMPLE_RATE = 44100; // CD quality audio
ADD private final int MAX_16_BITS = Short.MAX_VALUE;
CON }
| <<<<<<< SEARCH
private byte[] data;
private ArrayList<Modifier> modifiers;
}
=======
private byte[] data;
private ArrayList<Modifier> modifiers;
// Constants
private final int SAMPLE_RATE = 44100; // CD quality audio
private final int MAX_16_BITS = Short.MAX... |
endoli/disassemble.rs | 1404ec5611511fda5dcb39a791275e6e22f8fa93 | src/address.rs | rust | apache-2.0 | Define equality, hashing, ordering for Address.
| // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
/// The location of... | // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
/// The location of... | 15 | 1 | 2 | mixed | --- a/src/address.rs
+++ b/src/address.rs
@@ -20,3 +20,3 @@
/// [`Instruction`]: trait.Instruction.html
-#[derive(Clone,Copy,Debug)]
+#[derive(Clone,Copy,Debug,Eq,Hash,Ord,PartialEq,PartialOrd)]
pub struct Address {
@@ -31 +31,15 @@
}
+
+#[cfg(test)]
+mod tests {
+ use super::Address;
+
+ #[test]
+ fn addre... | --- a/src/address.rs
+++ b/src/address.rs
@@ ... @@
/// [`Instruction`]: trait.Instruction.html
-#[derive(Clone,Copy,Debug)]
+#[derive(Clone,Copy,Debug,Eq,Hash,Ord,PartialEq,PartialOrd)]
pub struct Address {
@@ ... @@
}
+
+#[cfg(test)]
+mod tests {
+ use super::Address;
+
+ #[test]
+ fn address_comparison()... | --- a/src/address.rs
+++ b/src/address.rs
@@ -20,3 +20,3 @@
CON /// [`Instruction`]: trait.Instruction.html
DEL #[derive(Clone,Copy,Debug)]
ADD #[derive(Clone,Copy,Debug,Eq,Hash,Ord,PartialEq,PartialOrd)]
CON pub struct Address {
@@ -31 +31,15 @@
CON }
ADD
ADD #[cfg(test)]
ADD mod tests {
ADD use super::Address;
A... | <<<<<<< SEARCH
/// [`Function`]: struct.Function.html
/// [`Instruction`]: trait.Instruction.html
#[derive(Clone,Copy,Debug)]
pub struct Address {
address: usize,
=======
/// [`Function`]: struct.Function.html
/// [`Instruction`]: trait.Instruction.html
#[derive(Clone,Copy,Debug,Eq,Hash,Ord,PartialEq,PartialOrd)]
... |
stephenh/aws-ivy | 0761923adc5ea39628b121b6f19a819b5d9ba426 | org.springframework.build.aws.ivy/src/main/java/org/springframework/aws/ivy/S3Resolver.java | java | apache-2.0 | Add Message.debug with access key.
| /*
* Copyright 2010 SpringSource
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to... | /*
* Copyright 2010 SpringSource
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to... | 2 | 0 | 2 | add_only | --- a/org.springframework.build.aws.ivy/src/main/java/org/springframework/aws/ivy/S3Resolver.java
+++ b/org.springframework.build.aws.ivy/src/main/java/org/springframework/aws/ivy/S3Resolver.java
@@ -22,2 +22,3 @@
import org.apache.ivy.plugins.resolver.RepositoryResolver;
+import org.apache.ivy.util.Message;
@@ -35,... | --- a/org.springframework.build.aws.ivy/src/main/java/org/springframework/aws/ivy/S3Resolver.java
+++ b/org.springframework.build.aws.ivy/src/main/java/org/springframework/aws/ivy/S3Resolver.java
@@ ... @@
import org.apache.ivy.plugins.resolver.RepositoryResolver;
+import org.apache.ivy.util.Message;
@@ ... @@
pub... | --- a/org.springframework.build.aws.ivy/src/main/java/org/springframework/aws/ivy/S3Resolver.java
+++ b/org.springframework.build.aws.ivy/src/main/java/org/springframework/aws/ivy/S3Resolver.java
@@ -22,2 +22,3 @@
CON import org.apache.ivy.plugins.resolver.RepositoryResolver;
ADD import org.apache.ivy.util.Message;
CON... | <<<<<<< SEARCH
import org.apache.ivy.plugins.resolver.RepositoryResolver;
/**
=======
import org.apache.ivy.plugins.resolver.RepositoryResolver;
import org.apache.ivy.util.Message;
/**
>>>>>>> REPLACE
<<<<<<< SEARCH
public void setAccessKey(String accessKey) {
((S3Repository)getRepository()).setAccessKey(ac... |
rajdavies/fabric8 | 96f095ed19b465ccf71930e7becb2de0686e3c4b | fabric-zookeeper-commands/src/main/java/org/fusesource/fabric/zookeeper/commands/List.java | java | apache-2.0 | Improve list command to show values, to use / by default, etc
| /**
* Copyright (C) 2011, FuseSource Corp. All rights reserved.
* http://fusesource.com
*
* The software in this package is published under the terms of the
* CDDL license a copy of which has been included with this distribution
* in the license.txt file.
*/
package org.fusesource.fabric.zookeeper.commands;
im... | /**
* Copyright (C) 2011, FuseSource Corp. All rights reserved.
* http://fusesource.com
*
* The software in this package is published under the terms of the
* CDDL license a copy of which has been included with this distribution
* in the license.txt file.
*/
package org.fusesource.fabric.zookeeper.commands;
im... | 26 | 9 | 2 | mixed | --- a/fabric-zookeeper-commands/src/main/java/org/fusesource/fabric/zookeeper/commands/List.java
+++ b/fabric-zookeeper-commands/src/main/java/org/fusesource/fabric/zookeeper/commands/List.java
@@ -17,7 +17,10 @@
+ @Argument(description = "Path of the node to list")
+ String path = "/";
+
@Option(name = "-... | --- a/fabric-zookeeper-commands/src/main/java/org/fusesource/fabric/zookeeper/commands/List.java
+++ b/fabric-zookeeper-commands/src/main/java/org/fusesource/fabric/zookeeper/commands/List.java
@@ ... @@
+ @Argument(description = "Path of the node to list")
+ String path = "/";
+
@Option(name = "-r", alias... | --- a/fabric-zookeeper-commands/src/main/java/org/fusesource/fabric/zookeeper/commands/List.java
+++ b/fabric-zookeeper-commands/src/main/java/org/fusesource/fabric/zookeeper/commands/List.java
@@ -17,7 +17,10 @@
CON
ADD @Argument(description = "Path of the node to list")
ADD String path = "/";
ADD
CON @O... | <<<<<<< SEARCH
public class List extends ZooKeeperCommandSupport {
@Option(name = "-r", aliases = {"--recursive"}, description = "Display children recursively")
boolean recursive;
@Argument(description = "Path of the node to list", required = true)
String path;
@Override
=======
public class Lis... |
fastmonkeys/respa-ui | f49dc85d4cf584574aabc5e2c78a0b36567afd4e | conf/webpack.tests.js | javascript | mit | Remove unnecessary stuff from webpack test confs
| /* eslint-disable no-var */
var path = require('path');
var merge = require('webpack-merge');
var HtmlWebpackPlugin = require('html-webpack-plugin');
var common = require('./webpack.common');
module.exports = merge(common, {
module: {
preLoaders: [],
loaders: [
{
test: /\.js$/,
includ... | /* eslint-disable no-var */
var path = require('path');
var merge = require('webpack-merge');
var HtmlWebpackPlugin = require('html-webpack-plugin');
var common = require('./webpack.common');
module.exports = merge(common, {
module: {
preLoaders: [],
loaders: [
{
test: /\.js$/,
includ... | 0 | 11 | 1 | del_only | --- a/conf/webpack.tests.js
+++ b/conf/webpack.tests.js
@@ -20,13 +20,2 @@
},
- {
- test: /\.css$/,
- loader: 'style!css!postcss-loader',
- },
- {
- test: /\.scss$/,
- loader: 'style!css!postcss-loader!sass',
- },
- ],
- noParse: [
- /\/sinon.js/,
]... | --- a/conf/webpack.tests.js
+++ b/conf/webpack.tests.js
@@ ... @@
},
- {
- test: /\.css$/,
- loader: 'style!css!postcss-loader',
- },
- {
- test: /\.scss$/,
- loader: 'style!css!postcss-loader!sass',
- },
- ],
- noParse: [
- /\/sinon.js/,
],
| --- a/conf/webpack.tests.js
+++ b/conf/webpack.tests.js
@@ -20,13 +20,2 @@
CON },
DEL {
DEL test: /\.css$/,
DEL loader: 'style!css!postcss-loader',
DEL },
DEL {
DEL test: /\.scss$/,
DEL loader: 'style!css!postcss-loader!sass',
DEL },
DEL ],
DEL noPar... | <<<<<<< SEARCH
loaders: ['babel'],
},
{
test: /\.css$/,
loader: 'style!css!postcss-loader',
},
{
test: /\.scss$/,
loader: 'style!css!postcss-loader!sass',
},
],
noParse: [
/\/sinon.js/,
],
},
=======
loaders: ['babel'],
... |
UweTrottmann/SeriesGuide | 95512f9bfe0607bd331fb6b57f2b88ab6109e377 | app/src/main/java/com/battlelancer/seriesguide/ui/shows/FabRecyclerViewScrollDetector.kt | kotlin | apache-2.0 | Fix floating add show button not hiding on scroll.
| package com.battlelancer.seriesguide.ui.shows
import androidx.recyclerview.widget.RecyclerView
import com.battlelancer.seriesguide.R
import com.google.android.material.floatingactionbutton.FloatingActionButton
/**
* Hides the floating action button when scrolling down, shows it when scrolling up. If the view can
* ... | package com.battlelancer.seriesguide.ui.shows
import androidx.recyclerview.widget.RecyclerView
import com.battlelancer.seriesguide.R
import com.google.android.material.floatingactionbutton.FloatingActionButton
import kotlin.math.abs
/**
* Hides the floating action button when scrolling down, shows it when scrolling ... | 2 | 6 | 3 | mixed | --- a/app/src/main/java/com/battlelancer/seriesguide/ui/shows/FabRecyclerViewScrollDetector.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/ui/shows/FabRecyclerViewScrollDetector.kt
@@ -5,2 +5,3 @@
import com.google.android.material.floatingactionbutton.FloatingActionButton
+import kotlin.math.abs
@@ -19,7 +... | --- a/app/src/main/java/com/battlelancer/seriesguide/ui/shows/FabRecyclerViewScrollDetector.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/ui/shows/FabRecyclerViewScrollDetector.kt
@@ ... @@
import com.google.android.material.floatingactionbutton.FloatingActionButton
+import kotlin.math.abs
@@ ... @@
o... | --- a/app/src/main/java/com/battlelancer/seriesguide/ui/shows/FabRecyclerViewScrollDetector.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/ui/shows/FabRecyclerViewScrollDetector.kt
@@ -5,2 +5,3 @@
CON import com.google.android.material.floatingactionbutton.FloatingActionButton
ADD import kotlin.math.abs
CON
@... | <<<<<<< SEARCH
import com.battlelancer.seriesguide.R
import com.google.android.material.floatingactionbutton.FloatingActionButton
/**
=======
import com.battlelancer.seriesguide.R
import com.google.android.material.floatingactionbutton.FloatingActionButton
import kotlin.math.abs
/**
>>>>>>> REPLACE
<<<<<<< SEARCH
... |
aidancully/rust | 3d192ace34bcb13d3c033735cd7415260040c252 | library/std/src/sys/unsupported/rwlock.rs | rust | apache-2.0 | Remove unsafety from unsupported/rwlosck.rs by using a Cell.
Replacing the UnsafeCell by a Cell makes it all safe.
| use crate::cell::UnsafeCell;
pub struct RWLock {
mode: UnsafeCell<isize>,
}
unsafe impl Send for RWLock {}
unsafe impl Sync for RWLock {} // no threads on this platform
impl RWLock {
pub const fn new() -> RWLock {
RWLock { mode: UnsafeCell::new(0) }
}
#[inline]
pub unsafe fn read(&self) ... | #![deny(unsafe_op_in_unsafe_fn)]
use crate::cell::Cell;
pub struct RWLock {
mode: Cell<isize>,
}
unsafe impl Send for RWLock {}
unsafe impl Sync for RWLock {} // no threads on this platform
impl RWLock {
pub const fn new() -> RWLock {
RWLock { mode: Cell::new(0) }
}
#[inline]
pub unsafe... | 16 | 18 | 8 | mixed | --- a/library/std/src/sys/unsupported/rwlock.rs
+++ b/library/std/src/sys/unsupported/rwlock.rs
@@ -1,5 +1,7 @@
-use crate::cell::UnsafeCell;
+#![deny(unsafe_op_in_unsafe_fn)]
+
+use crate::cell::Cell;
pub struct RWLock {
- mode: UnsafeCell<isize>,
+ mode: Cell<isize>,
}
@@ -11,3 +13,3 @@
pub const fn ne... | --- a/library/std/src/sys/unsupported/rwlock.rs
+++ b/library/std/src/sys/unsupported/rwlock.rs
@@ ... @@
-use crate::cell::UnsafeCell;
+#![deny(unsafe_op_in_unsafe_fn)]
+
+use crate::cell::Cell;
pub struct RWLock {
- mode: UnsafeCell<isize>,
+ mode: Cell<isize>,
}
@@ ... @@
pub const fn new() -> RWLock ... | --- a/library/std/src/sys/unsupported/rwlock.rs
+++ b/library/std/src/sys/unsupported/rwlock.rs
@@ -1,5 +1,7 @@
DEL use crate::cell::UnsafeCell;
ADD #![deny(unsafe_op_in_unsafe_fn)]
ADD
ADD use crate::cell::Cell;
CON
CON pub struct RWLock {
DEL mode: UnsafeCell<isize>,
ADD mode: Cell<isize>,
CON }
@@ -11,3 +1... | <<<<<<< SEARCH
use crate::cell::UnsafeCell;
pub struct RWLock {
mode: UnsafeCell<isize>,
}
=======
#![deny(unsafe_op_in_unsafe_fn)]
use crate::cell::Cell;
pub struct RWLock {
mode: Cell<isize>,
}
>>>>>>> REPLACE
<<<<<<< SEARCH
impl RWLock {
pub const fn new() -> RWLock {
RWLock { mode: Unsaf... |
gadomski/sbd-rs | 5e1c23c6393a00cbf9b4346df06f4557c704ea22 | src/main.rs | rust | apache-2.0 | Print out all entries in a storage
| //! Command line utility for querying and working with Iridium SBD messages.
extern crate docopt;
extern crate rustc_serialize;
extern crate sbd;
use docopt::Docopt;
use sbd::filesystem::Storage;
const USAGE: &'static str = "
Iridium Short Burst Data (SBD) message utility.
Usage:
sbd list <directory>
sbd (... | //! Command line utility for querying and working with Iridium SBD messages.
extern crate docopt;
extern crate rustc_serialize;
extern crate sbd;
use docopt::Docopt;
use sbd::filesystem::Storage;
const USAGE: &'static str = "
Iridium Short Burst Data (SBD) message utility.
Usage:
sbd list <directory>
sbd (... | 3 | 1 | 1 | mixed | --- a/src/main.rs
+++ b/src/main.rs
@@ -36,3 +36,5 @@
if args.cmd_list {
- Storage::new(args.arg_directory);
+ for entry in &Storage::new(args.arg_directory) {
+ println!("{}", entry.path_buf.to_str().unwrap());
+ }
} | --- a/src/main.rs
+++ b/src/main.rs
@@ ... @@
if args.cmd_list {
- Storage::new(args.arg_directory);
+ for entry in &Storage::new(args.arg_directory) {
+ println!("{}", entry.path_buf.to_str().unwrap());
+ }
}
| --- a/src/main.rs
+++ b/src/main.rs
@@ -36,3 +36,5 @@
CON if args.cmd_list {
DEL Storage::new(args.arg_directory);
ADD for entry in &Storage::new(args.arg_directory) {
ADD println!("{}", entry.path_buf.to_str().unwrap());
ADD }
CON }
| <<<<<<< SEARCH
.unwrap_or_else(|e| e.exit());
if args.cmd_list {
Storage::new(args.arg_directory);
}
}
=======
.unwrap_or_else(|e| e.exit());
if args.cmd_list {
for entry in &Storage::new(args.arg_directory) {
println!("{}", entry.path_buf.to_str().unwrap());
... |
Fizzadar/pyinfra | f9293d838a21f495ea9b56cbe0f6f75533360aed | pyinfra/api/config.py | python | mit | Remove support for deprecated `Config.TIMEOUT`.
| import six
from pyinfra import logger
class Config(object):
'''
The default/base configuration options for a pyinfra deploy.
'''
state = None
# % of hosts which have to fail for all operations to stop
FAIL_PERCENT = None
# Seconds to timeout SSH connections
CONNECT_TIMEOUT = 10
... | import six
class Config(object):
'''
The default/base configuration options for a pyinfra deploy.
'''
state = None
# % of hosts which have to fail for all operations to stop
FAIL_PERCENT = None
# Seconds to timeout SSH connections
CONNECT_TIMEOUT = 10
# Temporary directory (on ... | 0 | 10 | 2 | del_only | --- a/pyinfra/api/config.py
+++ b/pyinfra/api/config.py
@@ -1,4 +1,2 @@
import six
-
-from pyinfra import logger
@@ -51,10 +49,2 @@
- # Replace TIMEOUT -> CONNECT_TIMEOUT
- if 'TIMEOUT' in kwargs:
- logger.warning((
- 'Config.TIMEOUT is deprecated, '
- 'please... | --- a/pyinfra/api/config.py
+++ b/pyinfra/api/config.py
@@ ... @@
import six
-
-from pyinfra import logger
@@ ... @@
- # Replace TIMEOUT -> CONNECT_TIMEOUT
- if 'TIMEOUT' in kwargs:
- logger.warning((
- 'Config.TIMEOUT is deprecated, '
- 'please use Config.CON... | --- a/pyinfra/api/config.py
+++ b/pyinfra/api/config.py
@@ -1,4 +1,2 @@
CON import six
DEL
DEL from pyinfra import logger
CON
@@ -51,10 +49,2 @@
CON
DEL # Replace TIMEOUT -> CONNECT_TIMEOUT
DEL if 'TIMEOUT' in kwargs:
DEL logger.warning((
DEL 'Config.TIMEOUT is deprecated,... | <<<<<<< SEARCH
import six
from pyinfra import logger
=======
import six
>>>>>>> REPLACE
<<<<<<< SEARCH
self.ENV = env
# Replace TIMEOUT -> CONNECT_TIMEOUT
if 'TIMEOUT' in kwargs:
logger.warning((
'Config.TIMEOUT is deprecated, '
'please use Co... |
am0d/rust-projects | f1a68c9432950243a5e7f94883181fa0d3841a5f | first/prime-sieve.rs | rust | mit | Implement most of the fixes from @tikue
| extern mod extra;
use std::task::spawn;
use std::comm::{stream,Chan,Port};
use std::cell::Cell;
fn generate(ch: &Chan<int>) {
let mut i = 2;
loop {
ch.send(i);
i = i + 1;
}
}
fn filter(in_ch: &Port<int>, out_ch: &Chan<int>, prime: int) {
loop {
let i = in_ch.recv();
if ... | extern mod extra;
use std::task::spawn_with;
use extra::comm::{SyncPort, SyncChan, rendezvous};
use std::iter::count;
fn generate(ch: SyncChan<int>) {
for i in count(2, 1) {
if !ch.try_send(i) {
break;
}
}
}
fn filter(in_ch: SyncPort<int>, out_ch: SyncChan<int>, prime: int) {
l... | 15 | 16 | 5 | mixed | --- a/first/prime-sieve.rs
+++ b/first/prime-sieve.rs
@@ -1,11 +1,11 @@
extern mod extra;
-use std::task::spawn;
-use std::comm::{stream,Chan,Port};
-use std::cell::Cell;
+use std::task::spawn_with;
+use extra::comm::{SyncPort, SyncChan, rendezvous};
+use std::iter::count;
-fn generate(ch: &Chan<int>) {
- let mut... | --- a/first/prime-sieve.rs
+++ b/first/prime-sieve.rs
@@ ... @@
extern mod extra;
-use std::task::spawn;
-use std::comm::{stream,Chan,Port};
-use std::cell::Cell;
+use std::task::spawn_with;
+use extra::comm::{SyncPort, SyncChan, rendezvous};
+use std::iter::count;
-fn generate(ch: &Chan<int>) {
- let mut i = 2;
... | --- a/first/prime-sieve.rs
+++ b/first/prime-sieve.rs
@@ -1,11 +1,11 @@
CON extern mod extra;
DEL use std::task::spawn;
DEL use std::comm::{stream,Chan,Port};
DEL use std::cell::Cell;
ADD use std::task::spawn_with;
ADD use extra::comm::{SyncPort, SyncChan, rendezvous};
ADD use std::iter::count;
CON
DEL fn generate(ch:... | <<<<<<< SEARCH
extern mod extra;
use std::task::spawn;
use std::comm::{stream,Chan,Port};
use std::cell::Cell;
fn generate(ch: &Chan<int>) {
let mut i = 2;
loop {
ch.send(i);
i = i + 1;
}
}
fn filter(in_ch: &Port<int>, out_ch: &Chan<int>, prime: int) {
loop {
let i = in_ch.recv... |
malucs-developer/Android-Simulator | 789367476ffcc9a4b458c3e555a89fdc69d214f1 | app/src/main/java/com/example/android/androidsimulator/AddContactsActivity.java | java | mit | Add contacts to internal storage
| package com.example.android.androidsimulator;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
public class AddContactsActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentVi... | package com.example.android.androidsimulator;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import android.widget.T... | 57 | 0 | 2 | add_only | --- a/app/src/main/java/com/example/android/androidsimulator/AddContactsActivity.java
+++ b/app/src/main/java/com/example/android/androidsimulator/AddContactsActivity.java
@@ -2,6 +2,19 @@
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
import android.support.v7.app.AppCompat... | --- a/app/src/main/java/com/example/android/androidsimulator/AddContactsActivity.java
+++ b/app/src/main/java/com/example/android/androidsimulator/AddContactsActivity.java
@@ ... @@
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
import android.support.v7.app.AppCompatActivit... | --- a/app/src/main/java/com/example/android/androidsimulator/AddContactsActivity.java
+++ b/app/src/main/java/com/example/android/androidsimulator/AddContactsActivity.java
@@ -2,6 +2,19 @@
CON
ADD import android.content.SharedPreferences;
ADD import android.preference.PreferenceManager;
CON import android.support.v7.a... | <<<<<<< SEARCH
package com.example.android.androidsimulator;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
public class AddContactsActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
... |
matthiasbeyer/task-hookrs | 202f4a7ed9873250489e349995585ce7182b9780 | src/date.rs | rust | mpl-2.0 | Add converter from for Date
| use std::error::Error;
use serde::Serialize;
use serde::Serializer;
use serde::Deserialize;
use serde::Deserializer;
use serde::de::Visitor;
use serde::de::Error as SerdeError;
use chrono::naive::datetime::NaiveDateTime;
#[derive(Clone, Debug, Hash)]
pub struct Date(NaiveDateTime);
pub static TASKWARRIOR_DATETIME_TE... | use std::error::Error;
use serde::Serialize;
use serde::Serializer;
use serde::Deserialize;
use serde::Deserializer;
use serde::de::Visitor;
use serde::de::Error as SerdeError;
use chrono::naive::datetime::NaiveDateTime;
#[derive(Clone, Debug, Hash, Eq, PartialEq)]
pub struct Date(NaiveDateTime);
impl From<NaiveDate... | 9 | 1 | 1 | mixed | --- a/src/date.rs
+++ b/src/date.rs
@@ -10,4 +10,12 @@
-#[derive(Clone, Debug, Hash)]
+#[derive(Clone, Debug, Hash, Eq, PartialEq)]
pub struct Date(NaiveDateTime);
+
+impl From<NaiveDateTime> for Date {
+
+ fn from(ndt: NaiveDateTime) -> Date {
+ Date(ndt)
+ }
+
+}
| --- a/src/date.rs
+++ b/src/date.rs
@@ ... @@
-#[derive(Clone, Debug, Hash)]
+#[derive(Clone, Debug, Hash, Eq, PartialEq)]
pub struct Date(NaiveDateTime);
+
+impl From<NaiveDateTime> for Date {
+
+ fn from(ndt: NaiveDateTime) -> Date {
+ Date(ndt)
+ }
+
+}
| --- a/src/date.rs
+++ b/src/date.rs
@@ -10,4 +10,12 @@
CON
DEL #[derive(Clone, Debug, Hash)]
ADD #[derive(Clone, Debug, Hash, Eq, PartialEq)]
CON pub struct Date(NaiveDateTime);
ADD
ADD impl From<NaiveDateTime> for Date {
ADD
ADD fn from(ndt: NaiveDateTime) -> Date {
ADD Date(ndt)
ADD }
ADD
ADD }
CO... | <<<<<<< SEARCH
use chrono::naive::datetime::NaiveDateTime;
#[derive(Clone, Debug, Hash)]
pub struct Date(NaiveDateTime);
pub static TASKWARRIOR_DATETIME_TEMPLATE : &'static str = "%Y%m%dT%H%M%SZ";
=======
use chrono::naive::datetime::NaiveDateTime;
#[derive(Clone, Debug, Hash, Eq, PartialEq)]
pub struct Date(NaiveD... |
willsalz/actors | eee492805644405375994967c8304fd4a7e665b2 | src/main.rs | rust | mit | Add actor + actor ref
| extern crate rand;
use std::sync::mpsc::{Sender, Receiver};
use std::sync::mpsc;
use std::{thread, time};
use rand::Rng;
static NTHREADS: i32 = 64;
fn main() {
// Channels have two endpoints: the `Sender<T>` and the `Receiver<T>`,
// where `T` is the type of the message to be transferred
// (type annotat... | extern crate rand;
use std::sync::mpsc::{Sender, Receiver};
use std::sync::mpsc;
use std::{thread, time};
use rand::Rng;
#[derive(Debug)]
struct Actor {
inbox: Receiver<i32>
}
#[derive(Debug)]
struct ActorRef {
outbox: Sender<i32>
}
impl Actor {
fn new() -> (ActorRef, Actor) {
let (tx, rx): (Sen... | 18 | 36 | 1 | mixed | --- a/src/main.rs
+++ b/src/main.rs
@@ -7,40 +7,22 @@
-static NTHREADS: i32 = 64;
+#[derive(Debug)]
+struct Actor {
+ inbox: Receiver<i32>
+}
+
+#[derive(Debug)]
+struct ActorRef {
+ outbox: Sender<i32>
+}
+
+impl Actor {
+ fn new() -> (ActorRef, Actor) {
+ let (tx, rx): (Sender<i32>, Receiver<i32>) =... | --- a/src/main.rs
+++ b/src/main.rs
@@ ... @@
-static NTHREADS: i32 = 64;
+#[derive(Debug)]
+struct Actor {
+ inbox: Receiver<i32>
+}
+
+#[derive(Debug)]
+struct ActorRef {
+ outbox: Sender<i32>
+}
+
+impl Actor {
+ fn new() -> (ActorRef, Actor) {
+ let (tx, rx): (Sender<i32>, Receiver<i32>) = mpsc::c... | --- a/src/main.rs
+++ b/src/main.rs
@@ -7,40 +7,22 @@
CON
DEL static NTHREADS: i32 = 64;
ADD #[derive(Debug)]
ADD struct Actor {
ADD inbox: Receiver<i32>
ADD }
ADD
ADD #[derive(Debug)]
ADD struct ActorRef {
ADD outbox: Sender<i32>
ADD }
ADD
ADD impl Actor {
ADD fn new() -> (ActorRef, Actor) {
ADD ... | <<<<<<< SEARCH
use rand::Rng;
static NTHREADS: i32 = 64;
fn main() {
// Channels have two endpoints: the `Sender<T>` and the `Receiver<T>`,
// where `T` is the type of the message to be transferred
// (type annotation is superfluous)
let (tx, rx): (Sender<i32>, Receiver<i32>) = mpsc::channel();
f... |
Earlz/rustymvc | 5d6fbf05936a0fd1d58800ab1d9b9d73b4b69a8c | proto/protomvc.rs | rust | bsd-3-clause | Add route structure and handlers
| use std::os::getenv;
struct Request {
path: ~str,
querystring: ~str
}
fn main() {
print("content-type: text/plain\r\n\r\n");
println("hello from rust!");
let req=Request{ path: getenv("PATH_INFO").unwrap_or(~""), querystring: getenv("QUERY_STRING").unwrap_or(~"")};
println!("path: {:s}", req.... | use std::os::getenv;
struct Request {
path: ~str,
querystring: ~str
}
impl Request {
fn populate() -> Request {
Request{
path: getenv("PATH_INFO").unwrap_or(~""),
querystring: getenv("QUERY_STRING").unwrap_or(~"")
}
}
}
struct Route {
path: ~str,
handl... | 32 | 1 | 1 | mixed | --- a/proto/protomvc.rs
+++ b/proto/protomvc.rs
@@ -8,6 +8,37 @@
+impl Request {
+ fn populate() -> Request {
+ Request{
+ path: getenv("PATH_INFO").unwrap_or(~""),
+ querystring: getenv("QUERY_STRING").unwrap_or(~"")
+ }
+ }
+}
+
+struct Route {
+ path: ~str,
+ handler... | --- a/proto/protomvc.rs
+++ b/proto/protomvc.rs
@@ ... @@
+impl Request {
+ fn populate() -> Request {
+ Request{
+ path: getenv("PATH_INFO").unwrap_or(~""),
+ querystring: getenv("QUERY_STRING").unwrap_or(~"")
+ }
+ }
+}
+
+struct Route {
+ path: ~str,
+ handler: ~fn(&... | --- a/proto/protomvc.rs
+++ b/proto/protomvc.rs
@@ -8,6 +8,37 @@
CON
ADD impl Request {
ADD fn populate() -> Request {
ADD Request{
ADD path: getenv("PATH_INFO").unwrap_or(~""),
ADD querystring: getenv("QUERY_STRING").unwrap_or(~"")
ADD }
ADD }
ADD }
ADD
ADD struct Rout... | <<<<<<< SEARCH
fn main() {
print("content-type: text/plain\r\n\r\n");
println("hello from rust!");
let req=Request{ path: getenv("PATH_INFO").unwrap_or(~""), querystring: getenv("QUERY_STRING").unwrap_or(~"")};
println!("path: {:s}", req.path);
println!("querystring: {:s}", req.querystring);
====... |
dgrmunch/xmunch-atomspace | 564dc77f0c23510504637c0c2ca35620bc5afb73 | src/main/java/com/xmunch/atomspace/aux/VisualizationParams.java | java | mit | Increase number of visualization params
| package com.xmunch.atomspace.aux;
public enum VisualizationParams {
SIZE {
@Override
public String get() {
return "size";
}
},
COLOR {
@Override
public String get() {
return "color";
}
},
FONT_COLOR {
@Override
public String get() {
return "fontcolor";
}
},
SHAPE {
@Override
publ... | package com.xmunch.atomspace.aux;
public enum VisualizationParams {
SIZE {
@Override
public String get() {
return "size";
}
},
COLOR {
@Override
public String get() {
return "color";
}
},
FONT_COLOR {
@Override
public String get() {
return "fontcolor";
}
},
SHAPE {
@Override
publ... | 12 | 0 | 2 | add_only | --- a/src/main/java/com/xmunch/atomspace/aux/VisualizationParams.java
+++ b/src/main/java/com/xmunch/atomspace/aux/VisualizationParams.java
@@ -40,2 +40,8 @@
},
+ ARROW_POSITION {
+ @Override
+ public String get() {
+ return "arrow_position";
+ }
+ },
STROKE {
@@ -44,2 +50,8 @@
return "stroke";
+ }
+ },
+... | --- a/src/main/java/com/xmunch/atomspace/aux/VisualizationParams.java
+++ b/src/main/java/com/xmunch/atomspace/aux/VisualizationParams.java
@@ ... @@
},
+ ARROW_POSITION {
+ @Override
+ public String get() {
+ return "arrow_position";
+ }
+ },
STROKE {
@@ ... @@
return "stroke";
+ }
+ },
+ STRENGTH {
+ @... | --- a/src/main/java/com/xmunch/atomspace/aux/VisualizationParams.java
+++ b/src/main/java/com/xmunch/atomspace/aux/VisualizationParams.java
@@ -40,2 +40,8 @@
CON },
ADD ARROW_POSITION {
ADD @Override
ADD public String get() {
ADD return "arrow_position";
ADD }
ADD },
CON STROKE {
@@ -44,2 +50,8 @@
CON r... | <<<<<<< SEARCH
}
},
STROKE {
@Override
public String get() {
return "stroke";
}
},
=======
}
},
ARROW_POSITION {
@Override
public String get() {
return "arrow_position";
}
},
STROKE {
@Override
public String get() {
return "stroke";
}
},
STRENGTH {
@Override
public String ge... |
sourrust/flac | 4bf025c7ddc2a6bcc164c05ca0672ce55bd73e5c | src/subframe/decoder.rs | rust | bsd-3-clause | Add `fixed_restore_signal` to root decode function
| use subframe;
use subframe::{Subframe, MAX_FIXED_ORDER};
pub fn fixed_restore_signal(order: usize,
residual: &[i32],
output: &mut [i32]) {
debug_assert!(order <= MAX_FIXED_ORDER);
let polynomial = [ &[][..]
, &[1][..]
, ... | use subframe;
use subframe::{Subframe, MAX_FIXED_ORDER};
pub fn fixed_restore_signal(order: usize,
residual: &[i32],
output: &mut [i32]) {
debug_assert!(order <= MAX_FIXED_ORDER);
let polynomial = [ &[][..]
, &[1][..]
, ... | 12 | 4 | 1 | mixed | --- a/src/subframe/decoder.rs
+++ b/src/subframe/decoder.rs
@@ -31,6 +31,14 @@
match subframe.data {
- subframe::Data::Constant(_) => unimplemented!(),
- subframe::Data::Verbatim(_) => unimplemented!(),
- subframe::Data::Fixed(_) => unimplemented!(),
- subframe::Data::LPC(_) => unimplemented!(),
... | --- a/src/subframe/decoder.rs
+++ b/src/subframe/decoder.rs
@@ ... @@
match subframe.data {
- subframe::Data::Constant(_) => unimplemented!(),
- subframe::Data::Verbatim(_) => unimplemented!(),
- subframe::Data::Fixed(_) => unimplemented!(),
- subframe::Data::LPC(_) => unimplemented!(),
+ subf... | --- a/src/subframe/decoder.rs
+++ b/src/subframe/decoder.rs
@@ -31,6 +31,14 @@
CON match subframe.data {
DEL subframe::Data::Constant(_) => unimplemented!(),
DEL subframe::Data::Verbatim(_) => unimplemented!(),
DEL subframe::Data::Fixed(_) => unimplemented!(),
DEL subframe::Data::LPC(_) => uni... | <<<<<<< SEARCH
pub fn decode(subframe: &Subframe, output: &mut [i32]) {
match subframe.data {
subframe::Data::Constant(_) => unimplemented!(),
subframe::Data::Verbatim(_) => unimplemented!(),
subframe::Data::Fixed(_) => unimplemented!(),
subframe::Data::LPC(_) => unimplemented!(),
}
======... |
noemus/kotlin-eclipse | d6bf92fdddf5ffb48b5915d58eeeddf554c07073 | kotlin-eclipse-core/src/org/jetbrains/kotlin/core/model/scriptTemplateProviderEP.kt | kotlin | apache-2.0 | Add error handling for script template provider extension point
| package org.jetbrains.kotlin.core.model
import org.eclipse.core.runtime.IConfigurationElement
import org.eclipse.core.runtime.Platform
import org.jetbrains.kotlin.script.KotlinScriptDefinitionFromTemplate
import org.jetbrains.kotlin.script.ScriptTemplateProvider
import org.jetbrains.kotlin.script.makeScriptDefsFromTem... | package org.jetbrains.kotlin.core.model
import org.eclipse.core.runtime.CoreException
import org.eclipse.core.runtime.IConfigurationElement
import org.eclipse.core.runtime.Platform
import org.jetbrains.kotlin.core.log.KotlinLogger
import org.jetbrains.kotlin.script.KotlinScriptDefinitionFromTemplate
import org.jetbrai... | 14 | 4 | 3 | mixed | --- a/kotlin-eclipse-core/src/org/jetbrains/kotlin/core/model/scriptTemplateProviderEP.kt
+++ b/kotlin-eclipse-core/src/org/jetbrains/kotlin/core/model/scriptTemplateProviderEP.kt
@@ -2,4 +2,6 @@
+import org.eclipse.core.runtime.CoreException
import org.eclipse.core.runtime.IConfigurationElement
import org.eclipse.... | --- a/kotlin-eclipse-core/src/org/jetbrains/kotlin/core/model/scriptTemplateProviderEP.kt
+++ b/kotlin-eclipse-core/src/org/jetbrains/kotlin/core/model/scriptTemplateProviderEP.kt
@@ ... @@
+import org.eclipse.core.runtime.CoreException
import org.eclipse.core.runtime.IConfigurationElement
import org.eclipse.core.r... | --- a/kotlin-eclipse-core/src/org/jetbrains/kotlin/core/model/scriptTemplateProviderEP.kt
+++ b/kotlin-eclipse-core/src/org/jetbrains/kotlin/core/model/scriptTemplateProviderEP.kt
@@ -2,4 +2,6 @@
CON
ADD import org.eclipse.core.runtime.CoreException
CON import org.eclipse.core.runtime.IConfigurationElement
CON import ... | <<<<<<< SEARCH
package org.jetbrains.kotlin.core.model
import org.eclipse.core.runtime.IConfigurationElement
import org.eclipse.core.runtime.Platform
import org.jetbrains.kotlin.script.KotlinScriptDefinitionFromTemplate
import org.jetbrains.kotlin.script.ScriptTemplateProvider
=======
package org.jetbrains.kotlin.cor... |
celinaberg/BitFit | 286b8565c2a6c27300374c56ca604b0d3ea1cbda | .eslintrc.js | javascript | mit | Fix lint rules for non module files
| const OFF = 0;
const ERROR = 2;
module.exports = {
root: true,
parser: "babel-eslint",
plugins: [
"node",
"import",
"react",
"flowtype",
"prettier",
],
extends: [
"eslint:recommended",
"plugin:import/recommended",
"plugin:react/recommended",
"prettier",
"prettier/flowt... | const OFF = 0;
const ERROR = 2;
module.exports = {
root: true,
parser: "babel-eslint",
plugins: [
"node",
"import",
"react",
"flowtype",
"prettier",
],
extends: [
"eslint:recommended",
"plugin:import/recommended",
"plugin:react/recommended",
"prettier",
"prettier/flowt... | 8 | 1 | 1 | mixed | --- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -43,3 +43,10 @@
}
- }
+ },
+ {
+ files: ["webpack.config.js", "ecosystem.config.js"],
+ rules: {
+ "import/unambiguous": OFF,
+ "import/no-commonjs": OFF
+ }
+ },
] | --- a/.eslintrc.js
+++ b/.eslintrc.js
@@ ... @@
}
- }
+ },
+ {
+ files: ["webpack.config.js", "ecosystem.config.js"],
+ rules: {
+ "import/unambiguous": OFF,
+ "import/no-commonjs": OFF
+ }
+ },
]
| --- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -43,3 +43,10 @@
CON }
DEL }
ADD },
ADD {
ADD files: ["webpack.config.js", "ecosystem.config.js"],
ADD rules: {
ADD "import/unambiguous": OFF,
ADD "import/no-commonjs": OFF
ADD }
ADD },
CON ]
| <<<<<<< SEARCH
jest: true
}
}
]
}
=======
jest: true
}
},
{
files: ["webpack.config.js", "ecosystem.config.js"],
rules: {
"import/unambiguous": OFF,
"import/no-commonjs": OFF
}
},
]
}
>>>>>>> REPLACE
|
k9mail/k-9 | 9b8617d33fb95a33bab0e9468e796b12a9982158 | k9mail/src/main/java/com/fsck/k9/message/html/HtmlSanitizer.java | java | apache-2.0 | Add attributes for 'font' tag to the whitelist
| package com.fsck.k9.message.html;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.safety.Cleaner;
import org.jsoup.safety.Whitelist;
public class HtmlSanitizer {
private final HeadCleaner headCleaner;
private final Cleaner cleaner;
HtmlSanitizer() {
Whitelist whitelist... | package com.fsck.k9.message.html;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.safety.Cleaner;
import org.jsoup.safety.Whitelist;
public class HtmlSanitizer {
private final HeadCleaner headCleaner;
private final Cleaner cleaner;
HtmlSanitizer() {
Whitelist whitelist... | 1 | 0 | 1 | add_only | --- a/k9mail/src/main/java/com/fsck/k9/message/html/HtmlSanitizer.java
+++ b/k9mail/src/main/java/com/fsck/k9/message/html/HtmlSanitizer.java
@@ -16,2 +16,3 @@
.addTags("font", "hr", "ins", "del")
+ .addAttributes("font", "color", "face", "size")
.addAttributes("table", ... | --- a/k9mail/src/main/java/com/fsck/k9/message/html/HtmlSanitizer.java
+++ b/k9mail/src/main/java/com/fsck/k9/message/html/HtmlSanitizer.java
@@ ... @@
.addTags("font", "hr", "ins", "del")
+ .addAttributes("font", "color", "face", "size")
.addAttributes("table", "align",... | --- a/k9mail/src/main/java/com/fsck/k9/message/html/HtmlSanitizer.java
+++ b/k9mail/src/main/java/com/fsck/k9/message/html/HtmlSanitizer.java
@@ -16,2 +16,3 @@
CON .addTags("font", "hr", "ins", "del")
ADD .addAttributes("font", "color", "face", "size")
CON .addAttributes(... | <<<<<<< SEARCH
Whitelist whitelist = Whitelist.relaxed()
.addTags("font", "hr", "ins", "del")
.addAttributes("table", "align", "background", "bgcolor", "border", "cellpadding", "cellspacing",
"width")
=======
Whitelist whitelist = Whitelist.relaxe... |
mlibrary/image-conversion-and-validation | 5d67def658f0b1bd206fdefe100d32269f1eb34e | falcom/api/uri/api_querier.py | python | bsd-3-clause | Replace local variables with class variables
| # Copyright (c) 2017 The Regents of the University of Michigan.
# All Rights Reserved. Licensed according to the terms of the Revised
# BSD License. See LICENSE.txt for details.
from time import sleep
class APIQuerier:
def __init__ (self, uri, url_opener, sleep_time=300, max_tries=0):
self.uri = uri
... | # Copyright (c) 2017 The Regents of the University of Michigan.
# All Rights Reserved. Licensed according to the terms of the Revised
# BSD License. See LICENSE.txt for details.
from time import sleep
class APIQuerier:
def __init__ (self, uri, url_opener, sleep_time=300, max_tries=0):
self.uri = uri
... | 8 | 8 | 2 | mixed | --- a/falcom/api/uri/api_querier.py
+++ b/falcom/api/uri/api_querier.py
@@ -15,8 +15,8 @@
class SpecialNull: pass
- result = SpecialNull
- i = 1
+ self.result = SpecialNull
+ self.attempt_number = 1
- while result is SpecialNull:
+ while self.result is SpecialNull:
... | --- a/falcom/api/uri/api_querier.py
+++ b/falcom/api/uri/api_querier.py
@@ ... @@
class SpecialNull: pass
- result = SpecialNull
- i = 1
+ self.result = SpecialNull
+ self.attempt_number = 1
- while result is SpecialNull:
+ while self.result is SpecialNull:
... | --- a/falcom/api/uri/api_querier.py
+++ b/falcom/api/uri/api_querier.py
@@ -15,8 +15,8 @@
CON class SpecialNull: pass
DEL result = SpecialNull
DEL i = 1
ADD self.result = SpecialNull
ADD self.attempt_number = 1
CON
DEL while result is SpecialNull:
ADD while self.... | <<<<<<< SEARCH
def get (self, **kwargs):
class SpecialNull: pass
result = SpecialNull
i = 1
while result is SpecialNull:
try:
result = self.__open_uri(kwargs)
except ConnectionError:
sleep(self.sleep_time)
if ... |
voidxnull/libertysoil-site | 3089f24e2b3d0fff4867a0a7ce06409df7428f47 | src/api/db.js | javascript | agpl-3.0 | Implement following via many-to-many relation
| import Knex from 'knex';
import Bookshelf from 'bookshelf';
export default function initBookshelf(config) {
let knex = Knex(config);
let bookshelf = Bookshelf(knex);
bookshelf.plugin('registry');
bookshelf.plugin('visibility');
let User, Post, Following;
User = bookshelf.Model.extend({
tableName: 'u... | import Knex from 'knex';
import Bookshelf from 'bookshelf';
export default function initBookshelf(config) {
let knex = Knex(config);
let bookshelf = Bookshelf(knex);
bookshelf.plugin('registry');
bookshelf.plugin('visibility');
let User, Post;
User = bookshelf.Model.extend({
tableName: 'users',
... | 3 | 15 | 3 | mixed | --- a/src/api/db.js
+++ b/src/api/db.js
@@ -10,3 +10,3 @@
- let User, Post, Following;
+ let User, Post;
@@ -18,17 +18,6 @@
following: function() {
- return this.hasMany(Following, 'user_id');
+ return this.belongsToMany(User, 'user_id', 'followers', 'user_id');
},
followers: function() {... | --- a/src/api/db.js
+++ b/src/api/db.js
@@ ... @@
- let User, Post, Following;
+ let User, Post;
@@ ... @@
following: function() {
- return this.hasMany(Following, 'user_id');
+ return this.belongsToMany(User, 'user_id', 'followers', 'user_id');
},
followers: function() {
- return th... | --- a/src/api/db.js
+++ b/src/api/db.js
@@ -10,3 +10,3 @@
CON
DEL let User, Post, Following;
ADD let User, Post;
CON
@@ -18,17 +18,6 @@
CON following: function() {
DEL return this.hasMany(Following, 'user_id');
ADD return this.belongsToMany(User, 'user_id', 'followers', 'user_id');
CON },
CON ... | <<<<<<< SEARCH
bookshelf.plugin('visibility');
let User, Post, Following;
User = bookshelf.Model.extend({
=======
bookshelf.plugin('visibility');
let User, Post;
User = bookshelf.Model.extend({
>>>>>>> REPLACE
<<<<<<< SEARCH
},
following: function() {
return this.hasMany(Following, 'use... |
ThomasColliers/age-of-rust | db23f7db4d058e5afe150bfcef771dcc20a7149c | src/world/terrain.rs | rust | mit | Add height to the struct
| use rand::{thread_rng, Rng};
#[derive(Debug, Copy, Clone)]
pub enum TerrainType {
Water,
Grass,
TallGrass,
Sand,
Snow,
Tundra
}
#[derive(Debug)]
pub struct Tile {
typ:TerrainType,
}
pub struct Terrain {
data:Vec<Tile>,
}
impl Terrain {
pub fn new(size:usize) -> Terrain {
// create the terrain data
let ... | use rand::{thread_rng, Rng};
#[derive(Debug, Copy, Clone)]
pub enum TerrainType {
Water,
Grass,
TallGrass,
Sand,
Snow,
Tundra
}
#[derive(Debug)]
pub struct Tile {
typ:TerrainType,
height:u16,
}
pub struct Terrain {
data:Vec<Tile>,
}
impl Terrain {
pub fn new(size:usize) -> Terrain {
// create the terrai... | 2 | 1 | 2 | mixed | --- a/src/world/terrain.rs
+++ b/src/world/terrain.rs
@@ -15,2 +15,3 @@
typ:TerrainType,
+ height:u16,
}
@@ -39,3 +40,3 @@
for n in 0..(size*size) {
- terrain.data.push(Tile { typ:*rng.choose(&choices).unwrap() });
+ terrain.data.push(Tile { typ:*rng.choose(&choices).unwrap(), height:0 });
} | --- a/src/world/terrain.rs
+++ b/src/world/terrain.rs
@@ ... @@
typ:TerrainType,
+ height:u16,
}
@@ ... @@
for n in 0..(size*size) {
- terrain.data.push(Tile { typ:*rng.choose(&choices).unwrap() });
+ terrain.data.push(Tile { typ:*rng.choose(&choices).unwrap(), height:0 });
}
| --- a/src/world/terrain.rs
+++ b/src/world/terrain.rs
@@ -15,2 +15,3 @@
CON typ:TerrainType,
ADD height:u16,
CON }
@@ -39,3 +40,3 @@
CON for n in 0..(size*size) {
DEL terrain.data.push(Tile { typ:*rng.choose(&choices).unwrap() });
ADD terrain.data.push(Tile { typ:*rng.choose(&choices).unwrap(), height:0 });
C... | <<<<<<< SEARCH
pub struct Tile {
typ:TerrainType,
}
=======
pub struct Tile {
typ:TerrainType,
height:u16,
}
>>>>>>> REPLACE
<<<<<<< SEARCH
let mut rng = thread_rng();
for n in 0..(size*size) {
terrain.data.push(Tile { typ:*rng.choose(&choices).unwrap() });
}
=======
let mut rng = thread_rng();
f... |
mbr/flask-appconfig | 7119930b662a20d9e9bbca230f8a6485efcb7c44 | flask_appconfig/middleware.py | python | mit | Add __getattr__ passthrough on ReverseProxied.
| # from: http://flask.pocoo.org/snippets/35/
# written by Peter Hansen
class ReverseProxied(object):
'''Wrap the application in this middleware and configure the
front-end server to add these headers, to let you quietly bind
this to a URL other than / and to an HTTP scheme that is
different than what i... | # from: http://flask.pocoo.org/snippets/35/
# written by Peter Hansen
class ReverseProxied(object):
'''Wrap the application in this middleware and configure the
front-end server to add these headers, to let you quietly bind
this to a URL other than / and to an HTTP scheme that is
different than what i... | 4 | 0 | 1 | add_only | --- a/flask_appconfig/middleware.py
+++ b/flask_appconfig/middleware.py
@@ -37 +37,5 @@
return self.app(environ, start_response)
+
+ # pass through other attributes, like .run() when using werkzeug
+ def __getattr__(self, key):
+ return getattr(self.app, key) | --- a/flask_appconfig/middleware.py
+++ b/flask_appconfig/middleware.py
@@ ... @@
return self.app(environ, start_response)
+
+ # pass through other attributes, like .run() when using werkzeug
+ def __getattr__(self, key):
+ return getattr(self.app, key)
| --- a/flask_appconfig/middleware.py
+++ b/flask_appconfig/middleware.py
@@ -37 +37,5 @@
CON return self.app(environ, start_response)
ADD
ADD # pass through other attributes, like .run() when using werkzeug
ADD def __getattr__(self, key):
ADD return getattr(self.app, key)
| <<<<<<< SEARCH
environ['wsgi.url_scheme'] = scheme
return self.app(environ, start_response)
=======
environ['wsgi.url_scheme'] = scheme
return self.app(environ, start_response)
# pass through other attributes, like .run() when using werkzeug
def __getattr__(self, key):
... |
ipython/ipython | 3a0cf1f6114d6c80909f90fe122b026908200b0a | IPython/nbconvert/exporters/markdown.py | python | bsd-3-clause | Revert "Removed Javascript from Markdown by adding display priority to def config."
This reverts commit 58e05f9625c60f8deba9ddf1c74dba73e8ea7dd1.
| """Markdown Exporter class"""
#-----------------------------------------------------------------------------
# Copyright (c) 2013, the IPython Development Team.
#
# Distributed under the terms of the Modified BSD License.
#
# The full license is in the file COPYING.txt, distributed with this software.
#---------------... | """Markdown Exporter class"""
#-----------------------------------------------------------------------------
# Copyright (c) 2013, the IPython Development Team.
#
# Distributed under the terms of the Modified BSD License.
#
# The full license is in the file COPYING.txt, distributed with this software.
#---------------... | 1 | 7 | 1 | mixed | --- a/IPython/nbconvert/exporters/markdown.py
+++ b/IPython/nbconvert/exporters/markdown.py
@@ -40,9 +40,3 @@
def default_config(self):
- c = Config({
- 'NbConvertBase': {
- 'display_data_priority': ['html', 'application/pdf', 'svg', 'latex', 'png', 'jpg', 'jpeg' , 'text']
- ... | --- a/IPython/nbconvert/exporters/markdown.py
+++ b/IPython/nbconvert/exporters/markdown.py
@@ ... @@
def default_config(self):
- c = Config({
- 'NbConvertBase': {
- 'display_data_priority': ['html', 'application/pdf', 'svg', 'latex', 'png', 'jpg', 'jpeg' , 'text']
- },
... | --- a/IPython/nbconvert/exporters/markdown.py
+++ b/IPython/nbconvert/exporters/markdown.py
@@ -40,9 +40,3 @@
CON def default_config(self):
DEL c = Config({
DEL 'NbConvertBase': {
DEL 'display_data_priority': ['html', 'application/pdf', 'svg', 'latex', 'png', 'jpg', 'jpeg' , 'tex... | <<<<<<< SEARCH
@property
def default_config(self):
c = Config({
'NbConvertBase': {
'display_data_priority': ['html', 'application/pdf', 'svg', 'latex', 'png', 'jpg', 'jpeg' , 'text']
},
'ExtractOutputPreprocessor': {
'enabled':True}
... |
jtydhr88/blade.tools | 6e51608c8f206f95dd54c71625cbcbb7beac78f2 | blade.cli/src/blade/cli/CreateOptions.java | java | apache-2.0 | Add valid values for projectType option of create command
| package blade.cli;
import blade.cli.cmds.Build;
import blade.cli.cmds.IDE;
import blade.cli.cmds.Type;
import java.io.File;
import org.osgi.framework.Version;
import aQute.lib.getopt.Arguments;
import aQute.lib.getopt.Description;
import aQute.lib.getopt.Options;
@Arguments(arg = {"name", "[service]"})
@Descriptio... | package blade.cli;
import blade.cli.cmds.Build;
import blade.cli.cmds.IDE;
import blade.cli.cmds.Type;
import java.io.File;
import org.osgi.framework.Version;
import aQute.lib.getopt.Arguments;
import aQute.lib.getopt.Description;
import aQute.lib.getopt.Options;
@Arguments(arg = {"name", "[service]"})
@Descriptio... | 2 | 1 | 1 | mixed | --- a/blade.cli/src/blade/cli/CreateOptions.java
+++ b/blade.cli/src/blade/cli/CreateOptions.java
@@ -34,3 +34,4 @@
- @Description("The type of Liferay module to create. ")
+ @Description("The type of Liferay module to create. "
+ + "Valid values are service, jspportlet, or portlet.")
public Type project... | --- a/blade.cli/src/blade/cli/CreateOptions.java
+++ b/blade.cli/src/blade/cli/CreateOptions.java
@@ ... @@
- @Description("The type of Liferay module to create. ")
+ @Description("The type of Liferay module to create. "
+ + "Valid values are service, jspportlet, or portlet.")
public Type projectType();
| --- a/blade.cli/src/blade/cli/CreateOptions.java
+++ b/blade.cli/src/blade/cli/CreateOptions.java
@@ -34,3 +34,4 @@
CON
DEL @Description("The type of Liferay module to create. ")
ADD @Description("The type of Liferay module to create. "
ADD + "Valid values are service, jspportlet, or portlet.")
CON publ... | <<<<<<< SEARCH
public IDE ide();
@Description("The type of Liferay module to create. ")
public Type projectType();
=======
public IDE ide();
@Description("The type of Liferay module to create. "
+ "Valid values are service, jspportlet, or portlet.")
public Type projectType();
>>>>>>> REPLACE
<<... |
aidancully/rust | 4a832d32f232a68acdabfd29e526d2a4b6366a1c | src/test/ui/command/command-create-pidfd.rs | rust | apache-2.0 | Check whether clone3 syscall exists in pidfd test
| // run-pass
// only-linux - pidfds are a linux-specific concept
#![feature(linux_pidfd)]
use std::os::linux::process::{CommandExt, ChildExt};
use std::process::Command;
fn main() {
// We don't assert the precise value, since the standard library
// might have opened other file descriptors before our code runs... | // run-pass
// only-linux - pidfds are a linux-specific concept
#![feature(linux_pidfd)]
#![feature(rustc_private)]
extern crate libc;
use std::io::Error;
use std::os::linux::process::{ChildExt, CommandExt};
use std::process::Command;
fn has_clone3() -> bool {
let res = unsafe { libc::syscall(libc::SYS_clone3, ... | 19 | 1 | 1 | mixed | --- a/src/test/ui/command/command-create-pidfd.rs
+++ b/src/test/ui/command/command-create-pidfd.rs
@@ -4,6 +4,24 @@
#![feature(linux_pidfd)]
-use std::os::linux::process::{CommandExt, ChildExt};
+#![feature(rustc_private)]
+
+extern crate libc;
+
+use std::io::Error;
+use std::os::linux::process::{ChildExt, CommandEx... | --- a/src/test/ui/command/command-create-pidfd.rs
+++ b/src/test/ui/command/command-create-pidfd.rs
@@ ... @@
#![feature(linux_pidfd)]
-use std::os::linux::process::{CommandExt, ChildExt};
+#![feature(rustc_private)]
+
+extern crate libc;
+
+use std::io::Error;
+use std::os::linux::process::{ChildExt, CommandExt};
us... | --- a/src/test/ui/command/command-create-pidfd.rs
+++ b/src/test/ui/command/command-create-pidfd.rs
@@ -4,6 +4,24 @@
CON #![feature(linux_pidfd)]
DEL use std::os::linux::process::{CommandExt, ChildExt};
ADD #![feature(rustc_private)]
ADD
ADD extern crate libc;
ADD
ADD use std::io::Error;
ADD use std::os::linux::proce... | <<<<<<< SEARCH
#![feature(linux_pidfd)]
use std::os::linux::process::{CommandExt, ChildExt};
use std::process::Command;
fn main() {
// We don't assert the precise value, since the standard library
// might have opened other file descriptors before our code runs.
=======
#![feature(linux_pidfd)]
#![feature(r... |
elBukkit/MagicPlugin | 871974c1be09b831cab6fd206f89b7a5e6bdab03 | MagicAPI/src/main/java/com/elmakers/mine/bukkit/api/event/CastEvent.java | java | mit | Add back in previous constructor to make revapi happy, but no one should really be creating these anyway
| package com.elmakers.mine.bukkit.api.event;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import com.elmakers.mine.bukkit.api.action.CastContext;
import com.elmakers.mine.bukkit.api.magic.Mage;
import com.elmakers.mine.bukkit.api.spell.Spell;
import com.elmakers.mine.bukkit.api.spell.SpellResult... | package com.elmakers.mine.bukkit.api.event;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import com.elmakers.mine.bukkit.api.action.CastContext;
import com.elmakers.mine.bukkit.api.magic.Mage;
import com.elmakers.mine.bukkit.api.spell.Spell;
import com.elmakers.mine.bukkit.api.spell.SpellResult... | 4 | 0 | 1 | add_only | --- a/MagicAPI/src/main/java/com/elmakers/mine/bukkit/api/event/CastEvent.java
+++ b/MagicAPI/src/main/java/com/elmakers/mine/bukkit/api/event/CastEvent.java
@@ -18,2 +18,6 @@
private static final HandlerList handlers = new HandlerList();
+
+ public CastEvent(Mage mage, Spell spell, SpellResult result) {
+ ... | --- a/MagicAPI/src/main/java/com/elmakers/mine/bukkit/api/event/CastEvent.java
+++ b/MagicAPI/src/main/java/com/elmakers/mine/bukkit/api/event/CastEvent.java
@@ ... @@
private static final HandlerList handlers = new HandlerList();
+
+ public CastEvent(Mage mage, Spell spell, SpellResult result) {
+ throw... | --- a/MagicAPI/src/main/java/com/elmakers/mine/bukkit/api/event/CastEvent.java
+++ b/MagicAPI/src/main/java/com/elmakers/mine/bukkit/api/event/CastEvent.java
@@ -18,2 +18,6 @@
CON private static final HandlerList handlers = new HandlerList();
ADD
ADD public CastEvent(Mage mage, Spell spell, SpellResult result)... | <<<<<<< SEARCH
private static final HandlerList handlers = new HandlerList();
public CastEvent(CastContext context) {
=======
private static final HandlerList handlers = new HandlerList();
public CastEvent(Mage mage, Spell spell, SpellResult result) {
throw new IllegalArgumentException("Ple... |
bogdansolga/nokia-spring-boot-training | d42930c9ffcffdc47b7d33aa5cefae989111f850 | d04/d04s01/d04s01e03-task-executors/src/main/java/com/nokia/springboot/training/d04/s01/service/ProductService.java | java | apache-2.0 | [improve] Use a logger instead of System.out, display the class name
| package com.nokia.springboot.training.d04.s01.service;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.concurrent.ListenableFuture;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionExceptio... | package com.nokia.springboot.training.d04.s01.service;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.concurrent.ListenableFuture;
import java.util.concurrent.Complet... | 8 | 4 | 6 | mixed | --- a/d04/d04s01/d04s01e03-task-executors/src/main/java/com/nokia/springboot/training/d04/s01/service/ProductService.java
+++ b/d04/d04s01/d04s01e03-task-executors/src/main/java/com/nokia/springboot/training/d04/s01/service/ProductService.java
@@ -2,2 +2,4 @@
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;... | --- a/d04/d04s01/d04s01e03-task-executors/src/main/java/com/nokia/springboot/training/d04/s01/service/ProductService.java
+++ b/d04/d04s01/d04s01e03-task-executors/src/main/java/com/nokia/springboot/training/d04/s01/service/ProductService.java
@@ ... @@
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
impo... | --- a/d04/d04s01/d04s01e03-task-executors/src/main/java/com/nokia/springboot/training/d04/s01/service/ProductService.java
+++ b/d04/d04s01/d04s01e03-task-executors/src/main/java/com/nokia/springboot/training/d04/s01/service/ProductService.java
@@ -2,2 +2,4 @@
CON
ADD import org.slf4j.Logger;
ADD import org.slf4j.Logge... | <<<<<<< SEARCH
package com.nokia.springboot.training.d04.s01.service;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
=======
package com.nokia.springboot.training.d04.s01.service;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.spring... |
newswim/meteor-react-layout | 89213bcb2c8890a63c51c050f5437e63a1c18fa4 | lib/react_layout.js | javascript | mit | Implement dom ready functionality without jquery
| ReactLayout = {};
ReactLayout._getRootNode = function() {
var rootNode = $('#react-root').get(0);
if(rootNode) {
return rootNode;
} else {
$('body').append('<div id="react-root"></div>');
return $('#react-root').get(0);
}
};
ReactLayout.render = function(layoutClass, regions) {
if(Meteor.isClie... | ReactLayout = {};
ReactLayout._domLoaded = false;
ReactLayout._getRootNode = function() {
var rootNode = $('#react-root').get(0);
if(rootNode) {
return rootNode;
} else {
$('body').append('<div id="react-root"></div>');
return $('#react-root').get(0);
}
};
ReactLayout.render = function(layoutClas... | 17 | 3 | 3 | mixed | --- a/lib/react_layout.js
+++ b/lib/react_layout.js
@@ -1,2 +1,3 @@
ReactLayout = {};
+ReactLayout._domLoaded = false;
@@ -35,3 +36,5 @@
var el = React.createElement(layoutClass, regions);
- var renderdComp = React.render(el, rootNode);
+ this._ready(function() {
+ React.render(el, rootNode);
+ });
};
@@ -... | --- a/lib/react_layout.js
+++ b/lib/react_layout.js
@@ ... @@
ReactLayout = {};
+ReactLayout._domLoaded = false;
@@ ... @@
var el = React.createElement(layoutClass, regions);
- var renderdComp = React.render(el, rootNode);
+ this._ready(function() {
+ React.render(el, rootNode);
+ });
};
@@ ... @@
ReactLa... | --- a/lib/react_layout.js
+++ b/lib/react_layout.js
@@ -1,2 +1,3 @@
CON ReactLayout = {};
ADD ReactLayout._domLoaded = false;
CON
@@ -35,3 +36,5 @@
CON var el = React.createElement(layoutClass, regions);
DEL var renderdComp = React.render(el, rootNode);
ADD this._ready(function() {
ADD React.render(el, rootN... | <<<<<<< SEARCH
ReactLayout = {};
ReactLayout._getRootNode = function() {
=======
ReactLayout = {};
ReactLayout._domLoaded = false;
ReactLayout._getRootNode = function() {
>>>>>>> REPLACE
<<<<<<< SEARCH
var rootNode = ReactLayout._getRootNode();
var el = React.createElement(layoutClass, regions);
var renderdC... |
blindpirate/gradle | 23ba670709f5d5ac16558442e80e72ce776de6d6 | .teamcity/Gradle_Promotion/buildTypes/BasePromotionBuildType.kt | kotlin | apache-2.0 | Add ge.gradle.org credentials to promotion jobs
| /*
* Copyright 2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applica... | /*
* Copyright 2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applica... | 5 | 0 | 2 | add_only | --- a/.teamcity/Gradle_Promotion/buildTypes/BasePromotionBuildType.kt
+++ b/.teamcity/Gradle_Promotion/buildTypes/BasePromotionBuildType.kt
@@ -22,2 +22,3 @@
import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
+import jetbrains.buildServer.configs.kotlin.v2019_2.ParameterDisplay
import jetbrains.buildSer... | --- a/.teamcity/Gradle_Promotion/buildTypes/BasePromotionBuildType.kt
+++ b/.teamcity/Gradle_Promotion/buildTypes/BasePromotionBuildType.kt
@@ ... @@
import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
+import jetbrains.buildServer.configs.kotlin.v2019_2.ParameterDisplay
import jetbrains.buildServer.conf... | --- a/.teamcity/Gradle_Promotion/buildTypes/BasePromotionBuildType.kt
+++ b/.teamcity/Gradle_Promotion/buildTypes/BasePromotionBuildType.kt
@@ -22,2 +22,3 @@
CON import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
ADD import jetbrains.buildServer.configs.kotlin.v2019_2.ParameterDisplay
CON import jetbrains... | <<<<<<< SEARCH
import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
import jetbrains.buildServer.configs.kotlin.v2019_2.vcs.GitVcsRoot
=======
import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
import jetbrains.buildServer.configs.ko... |
CruGlobal/conf-registration-web | 62fb49bf724f7b23403c075109c263f2c8249f24 | app/scripts/services/ConfCache.js | javascript | mit | Create should return conference instead of $http response
| 'use strict';
angular.module('confRegistrationWebApp')
.service('ConfCache', function ConfCache($cacheFactory, $rootScope, $http, $q) {
var cache = $cacheFactory('conf');
var path = function (id) {
return 'conferences/' + (id || '');
};
var checkCache = function (path, callback) {
var c... | 'use strict';
angular.module('confRegistrationWebApp')
.service('ConfCache', function ConfCache($cacheFactory, $rootScope, $http, $q) {
var cache = $cacheFactory('conf');
var path = function (id) {
return 'conferences/' + (id || '');
};
var checkCache = function (path, callback) {
var c... | 2 | 1 | 1 | mixed | --- a/app/scripts/services/ConfCache.js
+++ b/app/scripts/services/ConfCache.js
@@ -40,3 +40,4 @@
};
- return $http.post(path(), data).success(function (conference) {
+ return $http.post(path(), data).then(function (response) {
+ var conference = response.data;
cache.put(path(conference... | --- a/app/scripts/services/ConfCache.js
+++ b/app/scripts/services/ConfCache.js
@@ ... @@
};
- return $http.post(path(), data).success(function (conference) {
+ return $http.post(path(), data).then(function (response) {
+ var conference = response.data;
cache.put(path(conference.id), co... | --- a/app/scripts/services/ConfCache.js
+++ b/app/scripts/services/ConfCache.js
@@ -40,3 +40,4 @@
CON };
DEL return $http.post(path(), data).success(function (conference) {
ADD return $http.post(path(), data).then(function (response) {
ADD var conference = response.data;
CON cache.put(... | <<<<<<< SEARCH
name: name
};
return $http.post(path(), data).success(function (conference) {
cache.put(path(conference.id), conference);
return conference;
=======
name: name
};
return $http.post(path(), data).then(function (response) {
var conference = r... |
kvakil/venus | 371ba0c58cfb981c4afab9f94d54cd0289c18443 | src/main/kotlin/venus/assembler/PseudoDispatcher.kt | kotlin | mit | Add all pseudoinstructions to dispatcher
| package venus.assembler
import venus.assembler.pseudos.* // ktlint-disable no-wildcard-imports
/** Describes each instruction for writing */
enum class PseudoDispatcher(val pw: PseudoWriter) {
j(J),
jal(JAL),
jalr(JALR),
jr(JR),
la(LA),
lb(Load),
lbu(Load),
lh(Load),
lhu(Load),
... | package venus.assembler
import venus.assembler.pseudos.* // ktlint-disable no-wildcard-imports
/** Describes each instruction for writing */
enum class PseudoDispatcher(val pw: PseudoWriter) {
beqz(BEQZ),
bgez(BGEZ),
bgt(BGT),
bgtu(BGTU),
bgtz(BGTZ),
ble(BLE),
bleu(BLEU),
blez(BLEZ),
... | 20 | 2 | 2 | mixed | --- a/src/main/kotlin/venus/assembler/PseudoDispatcher.kt
+++ b/src/main/kotlin/venus/assembler/PseudoDispatcher.kt
@@ -6,5 +6,16 @@
enum class PseudoDispatcher(val pw: PseudoWriter) {
- j(J),
+ beqz(BEQZ),
+ bgez(BGEZ),
+ bgt(BGT),
+ bgtu(BGTU),
+ bgtz(BGTZ),
+ ble(BLE),
+ bleu(BLEU),
+ ble... | --- a/src/main/kotlin/venus/assembler/PseudoDispatcher.kt
+++ b/src/main/kotlin/venus/assembler/PseudoDispatcher.kt
@@ ... @@
enum class PseudoDispatcher(val pw: PseudoWriter) {
- j(J),
+ beqz(BEQZ),
+ bgez(BGEZ),
+ bgt(BGT),
+ bgtu(BGTU),
+ bgtz(BGTZ),
+ ble(BLE),
+ bleu(BLEU),
+ blez(BLEZ)... | --- a/src/main/kotlin/venus/assembler/PseudoDispatcher.kt
+++ b/src/main/kotlin/venus/assembler/PseudoDispatcher.kt
@@ -6,5 +6,16 @@
CON enum class PseudoDispatcher(val pw: PseudoWriter) {
DEL j(J),
ADD beqz(BEQZ),
ADD bgez(BGEZ),
ADD bgt(BGT),
ADD bgtu(BGTU),
ADD bgtz(BGTZ),
ADD ble(BLE),
A... | <<<<<<< SEARCH
/** Describes each instruction for writing */
enum class PseudoDispatcher(val pw: PseudoWriter) {
j(J),
jal(JAL),
jalr(JALR),
jr(JR),
la(LA),
=======
/** Describes each instruction for writing */
enum class PseudoDispatcher(val pw: PseudoWriter) {
beqz(BEQZ),
bgez(BGEZ),
... |
google/dagger | 0218653f9bda2217ae9dfbc6593e3a4c1fb4a31b | java/dagger/hilt/android/plugin/src/main/kotlin/dagger/hilt/android/plugin/util/SimpleAGPVersion.kt | kotlin | apache-2.0 | Use reflection for obtaining the AGP version since the Version class was moved between 3.5 and 3.6
Fixes: https://github.com/google/dagger/issues/2547
RELNOTES=Fix an issue in the Hilt Gradle Plugin where determining AGP version failed if the AGP version being used was older than 3.6.
PiperOrigin-RevId: 369441551
| package dagger.hilt.android.plugin.util
import com.android.Version
/**
* Simple Android Gradle Plugin version class since there is no public API one. b/175816217
*/
internal data class SimpleAGPVersion(
val major: Int,
val minor: Int,
) : Comparable<SimpleAGPVersion> {
override fun compareTo(other: SimpleAGP... | package dagger.hilt.android.plugin.util
/**
* Simple Android Gradle Plugin version class since there is no public API one. b/175816217
*/
internal data class SimpleAGPVersion(
val major: Int,
val minor: Int,
) : Comparable<SimpleAGPVersion> {
override fun compareTo(other: SimpleAGPVersion): Int {
return c... | 18 | 3 | 3 | mixed | --- a/java/dagger/hilt/android/plugin/src/main/kotlin/dagger/hilt/android/plugin/util/SimpleAGPVersion.kt
+++ b/java/dagger/hilt/android/plugin/src/main/kotlin/dagger/hilt/android/plugin/util/SimpleAGPVersion.kt
@@ -1,4 +1,2 @@
package dagger.hilt.android.plugin.util
-
-import com.android.Version
@@ -22,3 +20,14 @@
... | --- a/java/dagger/hilt/android/plugin/src/main/kotlin/dagger/hilt/android/plugin/util/SimpleAGPVersion.kt
+++ b/java/dagger/hilt/android/plugin/src/main/kotlin/dagger/hilt/android/plugin/util/SimpleAGPVersion.kt
@@ ... @@
package dagger.hilt.android.plugin.util
-
-import com.android.Version
@@ ... @@
- val ANDR... | --- a/java/dagger/hilt/android/plugin/src/main/kotlin/dagger/hilt/android/plugin/util/SimpleAGPVersion.kt
+++ b/java/dagger/hilt/android/plugin/src/main/kotlin/dagger/hilt/android/plugin/util/SimpleAGPVersion.kt
@@ -1,4 +1,2 @@
CON package dagger.hilt.android.plugin.util
DEL
DEL import com.android.Version
CON
@@ -22,... | <<<<<<< SEARCH
package dagger.hilt.android.plugin.util
import com.android.Version
/**
=======
package dagger.hilt.android.plugin.util
/**
>>>>>>> REPLACE
<<<<<<< SEARCH
companion object {
val ANDROID_GRADLE_PLUGIN_VERSION by lazy { parse(Version.ANDROID_GRADLE_PLUGIN_VERSION) }
fun parse(version: Stri... |
alygin/intellij-rust | 4b4af3b52fe15ab93fdc06a8b10ce2001ca20e9c | src/main/kotlin/org/rust/lang/core/psi/ext/RsMod.kt | kotlin | mit | Add an excuse comment :(
| /*
* Use of this source code is governed by the MIT license that can be
* found in the LICENSE file.
*/
package org.rust.lang.core.psi.ext
import com.intellij.psi.PsiDirectory
import java.util.*
interface RsMod : RsQualifiedNamedElement, RsItemsOwner {
/**
* Returns a parent module (`super::` in paths).... | /*
* Use of this source code is governed by the MIT license that can be
* found in the LICENSE file.
*/
package org.rust.lang.core.psi.ext
import com.intellij.psi.PsiDirectory
import java.util.*
interface RsMod : RsQualifiedNamedElement, RsItemsOwner {
/**
* Returns a parent module (`super::` in paths).... | 6 | 0 | 1 | add_only | --- a/src/main/kotlin/org/rust/lang/core/psi/ext/RsMod.kt
+++ b/src/main/kotlin/org/rust/lang/core/psi/ext/RsMod.kt
@@ -21,2 +21,8 @@
+ /**
+ * XXX: this might be different then [com.intellij.psi.PsiNamedElement.getName].
+ *
+ * This contortion is required because [org.rust.lang.core.psi.RsFile] is
+ ... | --- a/src/main/kotlin/org/rust/lang/core/psi/ext/RsMod.kt
+++ b/src/main/kotlin/org/rust/lang/core/psi/ext/RsMod.kt
@@ ... @@
+ /**
+ * XXX: this might be different then [com.intellij.psi.PsiNamedElement.getName].
+ *
+ * This contortion is required because [org.rust.lang.core.psi.RsFile] is
+ * [R... | --- a/src/main/kotlin/org/rust/lang/core/psi/ext/RsMod.kt
+++ b/src/main/kotlin/org/rust/lang/core/psi/ext/RsMod.kt
@@ -21,2 +21,8 @@
CON
ADD /**
ADD * XXX: this might be different then [com.intellij.psi.PsiNamedElement.getName].
ADD *
ADD * This contortion is required because [org.rust.lang.core.ps... | <<<<<<< SEARCH
val `super`: RsMod?
val modName: String?
=======
val `super`: RsMod?
/**
* XXX: this might be different then [com.intellij.psi.PsiNamedElement.getName].
*
* This contortion is required because [org.rust.lang.core.psi.RsFile] is
* [RsMod], but we shouldn't override ... |
tiangolo/typer | 72466cb328fb56bfe28f5c3a1f8fca082db24319 | typer/__init__.py | python | mit | :fire: Clean exports from typer, remove unneeded Click components, add needed ones
Clean exports from typer, remove unneeded Click components | """Typer, build great CLIs. Easy to code. Based on Python type hints."""
__version__ = "0.0.4"
from click.exceptions import ( # noqa
Abort,
BadArgumentUsage,
BadOptionUsage,
BadParameter,
ClickException,
FileError,
MissingParameter,
NoSuchOption,
UsageError,
)
from click.termui im... | """Typer, build great CLIs. Easy to code. Based on Python type hints."""
__version__ = "0.0.4"
from click.exceptions import Abort, Exit # noqa
from click.termui import ( # noqa
clear,
confirm,
echo_via_pager,
edit,
get_terminal_size,
getchar,
launch,
pause,
progressbar,
promp... | 1 | 12 | 2 | mixed | --- a/typer/__init__.py
+++ b/typer/__init__.py
@@ -4,13 +4,3 @@
-from click.exceptions import ( # noqa
- Abort,
- BadArgumentUsage,
- BadOptionUsage,
- BadParameter,
- ClickException,
- FileError,
- MissingParameter,
- NoSuchOption,
- UsageError,
-)
+from click.exceptions import Abort, Ex... | --- a/typer/__init__.py
+++ b/typer/__init__.py
@@ ... @@
-from click.exceptions import ( # noqa
- Abort,
- BadArgumentUsage,
- BadOptionUsage,
- BadParameter,
- ClickException,
- FileError,
- MissingParameter,
- NoSuchOption,
- UsageError,
-)
+from click.exceptions import Abort, Exit # n... | --- a/typer/__init__.py
+++ b/typer/__init__.py
@@ -4,13 +4,3 @@
CON
DEL from click.exceptions import ( # noqa
DEL Abort,
DEL BadArgumentUsage,
DEL BadOptionUsage,
DEL BadParameter,
DEL ClickException,
DEL FileError,
DEL MissingParameter,
DEL NoSuchOption,
DEL UsageError,
DEL )
ADD... | <<<<<<< SEARCH
__version__ = "0.0.4"
from click.exceptions import ( # noqa
Abort,
BadArgumentUsage,
BadOptionUsage,
BadParameter,
ClickException,
FileError,
MissingParameter,
NoSuchOption,
UsageError,
)
from click.termui import ( # noqa
clear,
=======
__version__ = "0.0.4"
f... |
SUNET/SATOSA | 67b50cde0fa1885dce936b95d58d82fc64316c85 | src/satosa/micro_services/processors/scope_extractor_processor.py | python | apache-2.0 | Allow processor to handle the fact that the attribute might have no values, or that they are not scoped
| from ..attribute_processor import AttributeProcessorError
from .base_processor import BaseProcessor
CONFIG_KEY_MAPPEDATTRIBUTE = 'mapped_attribute'
CONFIG_DEFAULT_MAPPEDATTRIBUTE = ''
class ScopeExtractorProcessor(BaseProcessor):
"""
Extracts the scope from a scoped attribute and maps that to
another a... | from ..attribute_processor import AttributeProcessorError, AttributeProcessorWarning
from .base_processor import BaseProcessor
CONFIG_KEY_MAPPEDATTRIBUTE = 'mapped_attribute'
CONFIG_DEFAULT_MAPPEDATTRIBUTE = ''
class ScopeExtractorProcessor(BaseProcessor):
"""
Extracts the scope from a scoped attribute and ... | 10 | 5 | 4 | mixed | --- a/src/satosa/micro_services/processors/scope_extractor_processor.py
+++ b/src/satosa/micro_services/processors/scope_extractor_processor.py
@@ -1,2 +1,2 @@
-from ..attribute_processor import AttributeProcessorError
+from ..attribute_processor import AttributeProcessorError, AttributeProcessorWarning
from .base_pro... | --- a/src/satosa/micro_services/processors/scope_extractor_processor.py
+++ b/src/satosa/micro_services/processors/scope_extractor_processor.py
@@ ... @@
-from ..attribute_processor import AttributeProcessorError
+from ..attribute_processor import AttributeProcessorError, AttributeProcessorWarning
from .base_processor... | --- a/src/satosa/micro_services/processors/scope_extractor_processor.py
+++ b/src/satosa/micro_services/processors/scope_extractor_processor.py
@@ -1,2 +1,2 @@
DEL from ..attribute_processor import AttributeProcessorError
ADD from ..attribute_processor import AttributeProcessorError, AttributeProcessorWarning
CON from ... | <<<<<<< SEARCH
from ..attribute_processor import AttributeProcessorError
from .base_processor import BaseProcessor
=======
from ..attribute_processor import AttributeProcessorError, AttributeProcessorWarning
from .base_processor import BaseProcessor
>>>>>>> REPLACE
<<<<<<< SEARCH
class ScopeExtractorProcessor(Base... |
VeskoI/Algorithms | d5fc249f555f4ccb7956a0b6eedb8c770435e7dc | src/main/java/com/github/pedrovgs/problem76/InsertionSort.java | java | apache-2.0 | Add solution to problem 76
| /*
* Copyright (C) 2014 Pedro Vicente Gómez Sánchez.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable ... | /*
* Copyright (C) 2014 Pedro Vicente Gómez Sánchez.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable ... | 21 | 0 | 1 | add_only | --- a/src/main/java/com/github/pedrovgs/problem76/InsertionSort.java
+++ b/src/main/java/com/github/pedrovgs/problem76/InsertionSort.java
@@ -27,2 +27,23 @@
+ /**
+ * Insertion sort is a simple sorting algorithm that is relatively efficient for small lists and
+ * mostly sorted lists, and often is used as part o... | --- a/src/main/java/com/github/pedrovgs/problem76/InsertionSort.java
+++ b/src/main/java/com/github/pedrovgs/problem76/InsertionSort.java
@@ ... @@
+ /**
+ * Insertion sort is a simple sorting algorithm that is relatively efficient for small lists and
+ * mostly sorted lists, and often is used as part of more so... | --- a/src/main/java/com/github/pedrovgs/problem76/InsertionSort.java
+++ b/src/main/java/com/github/pedrovgs/problem76/InsertionSort.java
@@ -27,2 +27,23 @@
CON
ADD /**
ADD * Insertion sort is a simple sorting algorithm that is relatively efficient for small lists and
ADD * mostly sorted lists, and often is us... | <<<<<<< SEARCH
public class InsertionSort extends SortingAlgorithm {
}
=======
public class InsertionSort extends SortingAlgorithm {
/**
* Insertion sort is a simple sorting algorithm that is relatively efficient for small lists and
* mostly sorted lists, and often is used as part of more sophisticated algor... |
ryym/babel-rewire-wrapper | 5a972d8686184b3a86308689a7cbe2b07edc4823 | test/integration/rewire-wrapper-test.js | javascript | mit | test: Add integration tests of rewiring
| import assert from 'power-assert';
import rewire from '../../lib/babel-rewire-wrapper';
import greeter from './module/greeter';
/**
* Do actual rewiring to test modules.
*/
describe('Integration: babel-rewire wrapper', () => {
function assertGreet(expectedGreet) {
assert.equal(greeter.greet(), expectedGreet);
... | import assert from 'power-assert';
import rewire from '../../lib/babel-rewire-wrapper';
import greeter from './module/greeter';
/**
* Do actual rewiring.
*/
describe('Integration: babel-rewire wrapper', () => {
function assertGreet(expectedGreet) {
assert.equal(greeter.greet(), expectedGreet);
}
it('has b... | 38 | 9 | 3 | mixed | --- a/test/integration/rewire-wrapper-test.js
+++ b/test/integration/rewire-wrapper-test.js
@@ -5,3 +5,3 @@
/**
- * Do actual rewiring to test modules.
+ * Do actual rewiring.
*/
@@ -22,8 +22,17 @@
- it('injects mocks to registered modules');
- it('resets dependencies of registered modules');
+ context('run wit... | --- a/test/integration/rewire-wrapper-test.js
+++ b/test/integration/rewire-wrapper-test.js
@@ ... @@
/**
- * Do actual rewiring to test modules.
+ * Do actual rewiring.
*/
@@ ... @@
- it('injects mocks to registered modules');
- it('resets dependencies of registered modules');
+ context('run with sync function... | --- a/test/integration/rewire-wrapper-test.js
+++ b/test/integration/rewire-wrapper-test.js
@@ -5,3 +5,3 @@
CON /**
DEL * Do actual rewiring to test modules.
ADD * Do actual rewiring.
CON */
@@ -22,8 +22,17 @@
CON
DEL it('injects mocks to registered modules');
DEL it('resets dependencies of registered modules')... | <<<<<<< SEARCH
/**
* Do actual rewiring to test modules.
*/
describe('Integration: babel-rewire wrapper', () => {
=======
/**
* Do actual rewiring.
*/
describe('Integration: babel-rewire wrapper', () => {
>>>>>>> REPLACE
<<<<<<< SEARCH
});
it('injects mocks to registered modules');
it('resets dependenci... |
google/site-kit-wp | a1f58d8ff2302be9a8b360ddc50f8fd6bc7134b5 | assets/js/components/wp-dashboard/ActivateAnalyticsCTA.stories.js | javascript | apache-2.0 | Add wrapper to ActivateAnalyticsCTA story.
| /**
* WP Dashboard ActivateAnalyticsCTA Component Stories.
*
* Site Kit by Google, Copyright 2022 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apach... | /**
* WP Dashboard ActivateAnalyticsCTA Component Stories.
*
* Site Kit by Google, Copyright 2022 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apach... | 7 | 1 | 1 | mixed | --- a/assets/js/components/wp-dashboard/ActivateAnalyticsCTA.stories.js
+++ b/assets/js/components/wp-dashboard/ActivateAnalyticsCTA.stories.js
@@ -27,3 +27,9 @@
<WithRegistrySetup func={ setupRegistry }>
- <ActivateAnalyticsCTA />
+ <div id="google_dashboard_widget" style={ { maxWidth: '600px' } }>
+ <div classN... | --- a/assets/js/components/wp-dashboard/ActivateAnalyticsCTA.stories.js
+++ b/assets/js/components/wp-dashboard/ActivateAnalyticsCTA.stories.js
@@ ... @@
<WithRegistrySetup func={ setupRegistry }>
- <ActivateAnalyticsCTA />
+ <div id="google_dashboard_widget" style={ { maxWidth: '600px' } }>
+ <div className="goo... | --- a/assets/js/components/wp-dashboard/ActivateAnalyticsCTA.stories.js
+++ b/assets/js/components/wp-dashboard/ActivateAnalyticsCTA.stories.js
@@ -27,3 +27,9 @@
CON <WithRegistrySetup func={ setupRegistry }>
DEL <ActivateAnalyticsCTA />
ADD <div id="google_dashboard_widget" style={ { maxWidth: '600px' } }>
ADD ... | <<<<<<< SEARCH
const Template = ( { setupRegistry } ) => (
<WithRegistrySetup func={ setupRegistry }>
<ActivateAnalyticsCTA />
</WithRegistrySetup>
);
=======
const Template = ( { setupRegistry } ) => (
<WithRegistrySetup func={ setupRegistry }>
<div id="google_dashboard_widget" style={ { maxWidth: '600px' } }>... |
vmlaker/wabbit | 019d33092226d1ff8fe36897c03d25ddd48e34b1 | serve.py | python | mit | Use SQLAlchemy extension in Flask app.
| """
Flask server app.
"""
import datetime as dt
import sys
import flask
import sqlalchemy as sa
import coils
import tables
import mapping
app = flask.Flask(__name__)
# Load configuration file.
CONFIG = sys.argv[1] if len(sys.argv)>=2 else 'wabbit.cfg'
config = coils.Config(CONFIG)
@app.route('/')
def index():
"... | """
Flask server app.
"""
import datetime as dt
import sys
import flask
from flask.ext.sqlalchemy import SQLAlchemy
import coils
import mapping
# Load configuration file.
CONFIG = sys.argv[1] if len(sys.argv)>=2 else 'wabbit.cfg'
config = coils.Config(CONFIG)
# Initialize Flask and SQLAlchemy.
app = flask.Flask(__na... | 9 | 12 | 3 | mixed | --- a/serve.py
+++ b/serve.py
@@ -7,8 +7,5 @@
import flask
-import sqlalchemy as sa
+from flask.ext.sqlalchemy import SQLAlchemy
import coils
-import tables
import mapping
-
-app = flask.Flask(__name__)
@@ -17,2 +14,9 @@
config = coils.Config(CONFIG)
+
+# Initialize Flask and SQLAlchemy.
+app = flask.Flask(__name... | --- a/serve.py
+++ b/serve.py
@@ ... @@
import flask
-import sqlalchemy as sa
+from flask.ext.sqlalchemy import SQLAlchemy
import coils
-import tables
import mapping
-
-app = flask.Flask(__name__)
@@ ... @@
config = coils.Config(CONFIG)
+
+# Initialize Flask and SQLAlchemy.
+app = flask.Flask(__name__)
+app.confi... | --- a/serve.py
+++ b/serve.py
@@ -7,8 +7,5 @@
CON import flask
DEL import sqlalchemy as sa
ADD from flask.ext.sqlalchemy import SQLAlchemy
CON import coils
DEL import tables
CON import mapping
DEL
DEL app = flask.Flask(__name__)
CON
@@ -17,2 +14,9 @@
CON config = coils.Config(CONFIG)
ADD
ADD # Initialize Flask and S... | <<<<<<< SEARCH
import sys
import flask
import sqlalchemy as sa
import coils
import tables
import mapping
app = flask.Flask(__name__)
# Load configuration file.
CONFIG = sys.argv[1] if len(sys.argv)>=2 else 'wabbit.cfg'
config = coils.Config(CONFIG)
@app.route('/')
=======
import sys
import flask
from flask.ext.sqla... |
rossta/serviceworker-rails | 0cb33bf9562811f5cb68c53b0198c180233f953d | lib/generators/serviceworker/templates/serviceworker.js | javascript | mit | Add commented snippets for service worker
| function onInstall() {
console.log('[Serviceworker]', "Installing!");
}
function onActivate() {
console.log('[Serviceworker]', "Activating!");
}
function onFetch() {
}
self.addEventListener('install', onInstall);
self.addEventListener('activate', onActivate);
self.addEventListener('fetch', onFetch);
| // function onInstall(event) {
// console.log('[Serviceworker]', "Installing!", event);
// event.waitUntil(
// caches.open('cached-assets-v1').then(function prefill(cache) {
// return cache.addAll([
// '<%#= asset_path "application.js" %>',
// '<%#= asset_path "application.css" %>',
// ... | 44 | 14 | 1 | mixed | --- a/lib/generators/serviceworker/templates/serviceworker.js
+++ b/lib/generators/serviceworker/templates/serviceworker.js
@@ -1,14 +1,44 @@
-function onInstall() {
- console.log('[Serviceworker]', "Installing!");
-}
-
-function onActivate() {
- console.log('[Serviceworker]', "Activating!");
-}
-
-function onFetch()... | --- a/lib/generators/serviceworker/templates/serviceworker.js
+++ b/lib/generators/serviceworker/templates/serviceworker.js
@@ ... @@
-function onInstall() {
- console.log('[Serviceworker]', "Installing!");
-}
-
-function onActivate() {
- console.log('[Serviceworker]', "Activating!");
-}
-
-function onFetch() {
-}
-
... | --- a/lib/generators/serviceworker/templates/serviceworker.js
+++ b/lib/generators/serviceworker/templates/serviceworker.js
@@ -1,14 +1,44 @@
DEL function onInstall() {
DEL console.log('[Serviceworker]', "Installing!");
DEL }
DEL
DEL function onActivate() {
DEL console.log('[Serviceworker]', "Activating!");
DEL }
... | <<<<<<< SEARCH
function onInstall() {
console.log('[Serviceworker]', "Installing!");
}
function onActivate() {
console.log('[Serviceworker]', "Activating!");
}
function onFetch() {
}
self.addEventListener('install', onInstall);
self.addEventListener('activate', onActivate);
self.addEventListener('fetch', onFetch... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.