From patchwork Fri Oct 13 14:05:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: D1029: mpatch: reflow two oddly formatted else blocks with clang-format From: phabricator X-Patchwork-Id: 24822 Message-Id: <06d4e58492c3c29c95d26f3fee374787@localhost.localdomain> To: mercurial-devel@mercurial-scm.org Date: Fri, 13 Oct 2017 14:05:47 +0000 This revision was automatically updated to reflect the committed changes. Closed by commit rHG2e08b69bcd29: mpatch: reflow two oddly formatted else blocks with clang-format (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1029?vs=2629&id=2672 REVISION DETAIL https://phab.mercurial-scm.org/D1029 AFFECTED FILES mercurial/mpatch.c CHANGE DETAILS To: durin42, #hg-reviewers, pulkit Cc: mercurial-devel diff --git a/mercurial/mpatch.c b/mercurial/mpatch.c --- a/mercurial/mpatch.c +++ b/mercurial/mpatch.c @@ -78,8 +78,7 @@ /* save this hunk */ offset += s->start + s->len - s->end; *d++ = *s++; - } - else { + } else { /* break up this hunk */ c = cut - offset; if (s->end < c) @@ -122,8 +121,7 @@ if (postend <= cut) { offset += s->start + s->len - s->end; s++; - } - else { + } else { c = cut - offset; if (s->end < c) c = s->end;