Merge branch "master" into "experimental".
Audit Required9d59e9e5908e
Actions

Description

Merge branch "master" into "experimental".

Details

Group Auditors

Provenance

epriestley	Authored on Aug 25 2018, 12:44 AM
epriestley	Pushed on Aug 25 2018, 12:45 AM

Parents

rARCe1e93271e6e0: Make the ArcanistBundle algorithm do what "diff -u" does when hunks are…
rARCc1b1e69b8fbf: Merge branch "master" into "experimental".

Branches

Unknown

Tags

Unknown

Build Status

Buildable 20672
Build 28094: Run Core Tests

Event Timeline

epriestley committed rARC9d59e9e5908e: Merge branch "master" into "experimental". (authored by epriestley).Aug 25 2018, 12:44 AM

Herald added an auditor: Cowboy Commits. · View Herald TranscriptAug 25 2018, 12:45 AM

This commit now requires audit.Aug 25 2018, 12:45 AM

Harbormaster completed building B20672: rARC9d59e9e5908e: Merge branch "master" into "experimental"..Aug 25 2018, 12:45 AM

Merged Changes

e1e93271e6e0 Make the ArcanistBundle algorithm do what "diff -u" does when hunks are…
Author
epriestley
Revisions
D19603: Make the ArcanistBundle algorithm do what "diff -u" does when hunks are arguably mergeable
Browse Repository
Passed
No Audits
d9a4293ae734 Consolidate redundant "should should" from some linter help strings in Arcanist
Author
epriestley
Revisions
D19561: Consolidate redundant "should should" from some linter help strings in Arcanist
Browse Repository
Passed
No Audits
875d01836037 Fix `arc diff` when adding large new file with new git
Author
avivey
Revisions
D19513: Fix `arc diff` when adding large new file with new git
Browse Repository
Passed
No Audits
222800a86ed0 Parse Mercurial changeset evolution "instability" log field
Author
epriestley
Revisions
D19498: Parse Mercurial changeset evolution "instability" log field
Browse Repository
Passed
No Audits

Changes (12)

Path

Size

src/

lint/

linter/

xhpast/

rules/

ArcanistDeprecationXHPASTLinterRule.php

ArcanistUnsafeDynamicStringXHPASTLinterRule.php

parser/

ArcanistBundle.php

__tests__/

ArcanistBundleTestCase.php

bundle/

	merge-hunks.diff
	trailing-context.diff

merge-hunks.new

merge-hunks.old

	no-merge-hunks.diff
	disjoint-hunks.diff

no-merge-hunks.new

no-merge-hunks.old

repository/

api/

ArcanistGitAPI.php

parser/

ArcanistMercurialParser.php

rARC9d59e9e5908e

View Options

src/lint/linter/xhpast/rules/ArcanistDeprecationXHPASTLinterRule.php

View Options

src/lint/linter/xhpast/rules/ArcanistUnsafeDynamicStringXHPASTLinterRule.php

View Options

src/parser/ArcanistBundle.php

View Options

src/parser/tests/ArcanistBundleTestCase.php

View Options

src/parser/tests/bundle/merge-hunks.diff

View Options

src/parser/tests/bundle/merge-hunks.new

View Options

src/parser/tests/bundle/merge-hunks.old

View Options

src/parser/tests/bundle/no-merge-hunks.diff

View Options

src/parser/tests/bundle/no-merge-hunks.new

View Options

src/parser/tests/bundle/no-merge-hunks.old

View Options

src/repository/api/ArcanistGitAPI.php

View Options

src/repository/parser/ArcanistMercurialParser.php

Merge branch "master" into "experimental".Audit Required9d59e9e5908eActions

Description

Details

Event Timeline

Merged Changes

Changes (12)

rARC9d59e9e5908e

src/lint/linter/xhpast/rules/ArcanistDeprecationXHPASTLinterRule.php

src/lint/linter/xhpast/rules/ArcanistUnsafeDynamicStringXHPASTLinterRule.php

src/parser/ArcanistBundle.php

src/parser/__tests__/ArcanistBundleTestCase.php

src/parser/__tests__/bundle/merge-hunks.diff

src/parser/__tests__/bundle/merge-hunks.new

src/parser/__tests__/bundle/merge-hunks.old

src/parser/__tests__/bundle/no-merge-hunks.diff

src/parser/__tests__/bundle/no-merge-hunks.new

src/parser/__tests__/bundle/no-merge-hunks.old

src/repository/api/ArcanistGitAPI.php

src/repository/parser/ArcanistMercurialParser.php

Merge branch "master" into "experimental".
Audit Required9d59e9e5908e
Actions

src/parser/tests/ArcanistBundleTestCase.php

src/parser/tests/bundle/merge-hunks.diff

src/parser/tests/bundle/merge-hunks.new

src/parser/tests/bundle/merge-hunks.old

src/parser/tests/bundle/no-merge-hunks.diff

src/parser/tests/bundle/no-merge-hunks.new

src/parser/tests/bundle/no-merge-hunks.old