Paths

Table of Contentst

Modernize `ArcanistMergeConflictLinter`.
ClosedPublic
Actions

Authored by joshuaspence on May 10 2014, 7:41 AM.

Tags

None

Referenced Files

	F15414220: D9039.id21464.diff
	Wed, Mar 19, 11:30 PM

	F15411398: D9039.id21471.diff
	Wed, Mar 19, 9:16 AM

	F15411397: D9039.id21464.diff
	Wed, Mar 19, 9:16 AM

	F15398938: D9039.id.diff
	Mon, Mar 17, 1:56 AM

	F15397990: D9039.diff
	Sun, Mar 16, 11:08 PM

	F15393381: D9039.id21471.diff
	Sat, Mar 15, 8:49 PM

	F15393380: D9039.id21464.diff
	Sat, Mar 15, 8:49 PM

	F15387713: D9039.id21464.diff
	Sat, Mar 15, 2:48 AM

View All Files

Subscribers

epriestley

Korvin

Details

Reviewers

epriestley

Group Reviewers

Blessed Reviewers

Commits

rARCedd85a0e9db4: Modernize `ArcanistMergeConflictLinter`.

Summary

The only real change here is adding a getLinterConfigurationName method so that this linter can be used with an .arclint file. Everything else is just some minor tidying.

Test Plan

N/A

Diff Detail

Repository

rARC Arcanist

Branch

merge-conflict

Lint

Lint Passed

Unit

Tests Passed

Build Status

Buildable 342
Build 342: [Placeholder Plan] Wait for 30 Seconds

Event Timeline

joshuaspence updated this revision to Diff 21464.May 10 2014, 7:41 AM

joshuaspence retitled this revision from to Modernize `ArcanistMergeConflictLinter`..

joshuaspence updated this object.

joshuaspence edited the test plan for this revision. (Show Details)

joshuaspence added a reviewer: epriestley.

Herald added a reviewer: Blessed Reviewers. · View Herald TranscriptMay 10 2014, 7:41 AM

Herald added subscribers: Korvin, epriestley. · View Herald Transcript

Harbormaster completed remote builds in B342: Diff 21464.May 10 2014, 7:42 AM

epriestley accepted this revision.May 10 2014, 8:55 AM

epriestley edited edge metadata.

This revision is now accepted and ready to land.May 10 2014, 8:55 AM

Closed by commit rARCedd85a0e9db4 (authored by @joshuaspence, committed by @epriestley).

Revision Contents
Changeset List

Path

Size

src/

lint/

linter/

ArcanistMergeConflictLinter.php

18 lines

Diff 21464

View Options

src/lint/linter/ArcanistMergeConflictLinter.php

Modernize `ArcanistMergeConflictLinter`.ClosedPublicActions