Make WordPress Core

Opened 9 years ago

Closed 9 years ago

Last modified 9 years ago

#36394 closed defect (bug) (fixed)

git-or-svn module assumes only one can be true

Reported by: iseulde's profile iseulde Owned by: iseulde's profile iseulde
Milestone: 4.6 Priority: normal
Severity: normal Version: 4.5
Component: Build/Test Tools Keywords: has-patch
Focuses: Cc:

Description

If both are true, it runs twice, running all the test twice at the same time and causes failures. We could allow the callback to be only run once, but better to fix upstream.

Attachments (5)

36394.patch (3.6 KB) - added by iseulde 9 years ago.
36394.2.patch (3.6 KB) - added by iseulde 9 years ago.
36394.3.patch (3.7 KB) - added by iseulde 9 years ago.
36394.4.patch (4.1 KB) - added by iseulde 9 years ago.
36394.5.patch (3.9 KB) - added by iseulde 9 years ago.

Download all attachments as: .zip

Change History (18)

@iseulde
9 years ago

#1 @iseulde
9 years ago

  • Keywords has-patch added

Can solve it like this + cleaning up a bit.

@iseulde
9 years ago

#2 @netweb
9 years ago

Rather than creating another ticket adding support for full repo SVN checkouts whilst we're at it would be great. I've got checkouts (used for alternate version testing etc) of WordPress (and bbPress and BuddyPress) using https://develop.svn.wordpress.org/ rather than https://develop.svn.wordpress.org/trunk, as such the .svn folder is up the directory tree one folder alongside the branches, tags, and trunk folders.

netweb@MacBook ~/dev/develop.svn.wordpress.org
$ ls
total 0
drwxr-xr-x   6 netweb staff  204 Apr  2 13:56 .
drwxr-xr-x  44 netweb staff 1.5K Mar 31 17:51 ..
drwxr-xr-x   8 netweb staff  272 Nov 20 16:06 .svn
drwxr-xr-x  28 netweb staff  952 Dec 15 19:39 branches
drwxr-xr-x 154 netweb staff 5.2K Apr  2 13:59 tags
drwxr-xr-x  18 netweb staff  612 Mar 26 00:34 trunk

netweb@MacBook ~/dev/develop.svn.wordpress.org
$ svn info
Path: .
Working Copy Root Path: /Users/netweb/dev/develop.svn.wordpress.org
URL: https://develop.svn.wordpress.org
Relative URL: ^/
Repository Root: https://develop.svn.wordpress.org
Repository UUID: 602fd350-edb4-49c9-b593-d223f7449a82
Revision: 37154
Node Kind: directory
Schedule: normal
Last Changed Author: azaozz
Last Changed Rev: 37154
Last Changed Date: 2016-04-02 08:12:18 +1100 (Sat, 02 Apr 2016)

@iseulde
9 years ago

#3 @iseulde
9 years ago

Adjusted the task for you, @netweb.

@iseulde
9 years ago

#4 @iseulde
9 years ago

@jorbin @netweb Could you review this please?

#5 @iseulde
9 years ago

  • Owner set to iseulde
  • Status changed from new to accepted

#6 @jorbin
9 years ago

  • Milestone changed from 4.5 to Future Release

I don't think this is worth changing for 4.5. Having both git and svn in a checkout seems like an edgecase to me, and not one that . The case of having a full svn checkout is uncommon, but also something that's not specifically supported by any of the other VC agnostic tools..

Was this reported upstream to git-or-svn?

As far as the patch itself, we can't use let, arrow functions or many other es6 functions with node 0.12 or 0.10 so I can't even test to see if it works as expected.

@iseulde
9 years ago

#7 @iseulde
9 years ago

Removed ES2015 syntax and made it compatible with node >= 0.10.

#8 @ericlewis
9 years ago

This seems like a good change. The module code for detecting git or svn is rather straight forward, so I'm not sure we benefit a lot from having it in another module.

#9 @chriscct7
9 years ago

  • Version trunk deleted

#10 @ocean90
9 years ago

  • Version set to trunk

#11 @iseulde
9 years ago

  • Resolution set to fixed
  • Status changed from accepted to closed

In 37185:

Build/Test Tools: Better git/svn detection

Prevent tasks from running twice in parallel
if both .svn and .git directories are present.

Add --ignore-externals to svn status
and replace git diff --name-only with git status --short.

Merge some duplicate code.

Fixes #36394.
See #35557.
See [36906].

#12 @iseulde
9 years ago

  • Milestone changed from Future Release to 4.6

#13 @netweb
9 years ago

  • Version changed from trunk to 4.5
Note: See TracTickets for help on using tickets.