Re: [pgAdmin4] [PATCH] History Tab rewrite in React

From: Dave Page <dpage(at)pgadmin(dot)org>
To: George Gelashvili <ggelashvili(at)pivotal(dot)io>
Cc: Sarah McAlear <smcalear(at)pivotal(dot)io>, Surinder Kumar <surinder(dot)kumar(at)enterprisedb(dot)com>, Matthew Kleiman <mkleiman(at)pivotal(dot)io>, Joao Pedro De Almeida Pereira <jdealmeidapereira(at)pivotal(dot)io>, Murtuza Zabuawala <murtuza(dot)zabuawala(at)enterprisedb(dot)com>, pgadmin-hackers <pgadmin-hackers(at)postgresql(dot)org>
Subject: Re: [pgAdmin4] [PATCH] History Tab rewrite in React
Date: 2017-06-08 13:15:41
Message-ID: CA+OCxoy3gVbGiPL3hi250Ya0qMOURYOERH5XxYrnrt2Co2v-xw@mail.gmail.com
Views: Raw Message | Whole Thread | Download mbox | Resend email
Thread:
Lists: pgadmin-hackers

Hi George

On Wed, Jun 7, 2017 at 10:21 PM, George Gelashvili
<ggelashvili(at)pivotal(dot)io> wrote:
> Hi Dave,
>
> I split the linting out into an intermediate commit, and rebased on top of
> master.

Unfortunately, it still doesn't apply:

error: patch failed: web/regression/javascript/test-main.js:1
error: removal patch leaves file contents
error: web/regression/javascript/test-main.js: patch does not apply
Checking patch web/regression/requirements.txt...
Checking patch web/webpack.config.js...
Checking patch web/webpack.test.config.js...
Checking patch web/yarn.lock...
error: web/yarn.lock: already exists in working directory
Applied patch .gitignore cleanly.
Applied patch Make.bat cleanly.
Applied patch README cleanly.
Applied patch pkg/mac/build.sh cleanly.
Applied patch pkg/pip/build.sh cleanly.
Applied patch pkg/src/build.sh cleanly.
Applied patch web/.eslintrc.js cleanly.
Applied patch web/karma.conf.js cleanly.
Applied patch web/package.json cleanly.
Applied patch web/pgAdmin4.py cleanly.
Applied patch web/pgadmin/static/jsx/components.jsx cleanly.
Applied patch web/pgadmin/tools/javascript/__init__.py cleanly.
Applied patch web/pgadmin/tools/javascript/javascript_bundler.py cleanly.
Applied patch web/pgadmin/tools/javascript/tests/__init__.py cleanly.
Applied patch web/pgadmin/tools/javascript/tests/test_javascript_bundler.py
cleanly.
Applied patch web/regression/README cleanly.
Applied patch web/regression/javascript/jasmine_capture_warnings_beforeall.js
cleanly.
Applied patch web/regression/requirements.txt cleanly.
Applied patch web/webpack.config.js cleanly.
Applied patch web/webpack.test.config.js cleanly.

The second (lint update) patch is even worse, with significant number
change that just don't want to apply.

Clearly yarn.lock needs to be removed from there repo.

Once I can apply a version of this, how should I be running the linter
and the unit tests?

--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company

In response to

Responses

Browse pgadmin-hackers by date

  From Date Subject
Next Message Sarah McAlear 2017-06-08 13:18:54 Re: [pgAdmin4][PATCH] Improvements to Query Results Grid User Experience
Previous Message Harshal Dhumal 2017-06-08 13:10:28 Re: Re: Server side cursor limitations for on demand loading of data in query tool [RM2137] [pgAdmin4]