Patchwork D1029: mpatch: reflow two oddly formatted else blocks with clang-format

login
register
mail settings
Submitter phabricator
Date Oct. 13, 2017, 2:05 p.m.
Message ID <06d4e58492c3c29c95d26f3fee374787@localhost.localdomain>
Download mbox | patch
Permalink /patch/24822/
State Not Applicable
Headers show

Comments

phabricator - Oct. 13, 2017, 2:05 p.m.
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

Patch

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;