Use "--whitespace nowarn" in `arc patch` to respect trailing whitespace
ClosedPublic
Actions

Authored by epriestley on Dec 18 2015, 12:18 AM.

Details

Reviewers

joshuaspence
chad

Maniphest Tasks

T10008: `arc patch` removes trailing whitespace

Commits

rARC8762e3f36715: Use "--whitespace nowarn" in `arc patch` to respect trailing whitespace

Summary

Fixes T10008. Git tries to fix some issues by default (apparently? empirically; not consistent with documentation, I think?), but patches from arc patch are "always" accurate (disregarding other bugs we might have -- basically, they haven't been emailed or copy/pasted or anything like that) so we can just tell it to apply the patch exactly as-is.

Test Plan

Diff Detail

Repository

rARC Arcanist

Branch

patch1

Lint

Lint Passed

Unit

Tests Passed

Build Status

Buildable 9639
Build 11540: Run Core Tests
Build 11539: arc lint + arc unit

Event Timeline

icat is this little "invisible cat" (show whitespace, etc) script:

icat

#!/usr/bin/env php
<?php

if ($argc > 1) {
  $args = array_slice($argv, 1);
} else {
  $args = array('php://stdin');
}

foreach ($args as $arg) {
  $data = file_get_contents($arg);
  for ($ii = 0; $ii < strlen($data); $ii++) {
    $s = $data[$ii];
    $n = isset($data[$ii + 1]) ? $data[$ii + 1] : null;
    $c = ord($s);
    if ($c >= 33 && $c <= 127) {
      echo $s;
    } else if ($s == "\r") {
      echo special(' \\r ');
      if ($n !== "\n") {
        echo "\n";
      }
    } else if ($s == "\n") {
      echo special(' \\n ')."\n";
    } else if ($s == "\t") {
      echo special(' \\t ');
    } else if ($s == ' ') {
      echo under(' ');
    } else {
      echo special('\\x'.sprintf('%02x', $c));
    }
  }
  echo "\n";
}

function special($x) {
  return chr(27).'[7m'.$x.chr(27).'[m';
}

function under($x) {
  return chr(27).'[31m'.chr(27).'[4m'.$x.chr(27).'[m'.chr(27).'[39m';
}