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

login
register
mail settings
Submitter phabricator
Date Oct. 12, 2017, 3:09 p.m.
Message ID <differential-rev-PHID-DREV-u5lbmuxiyxb5gy7mab32-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/24785/
State Superseded
Headers show

Comments

phabricator - Oct. 12, 2017, 3:09 p.m.
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D1029

AFFECTED FILES
  mercurial/mpatch.c

CHANGE DETAILS




To: durin42, #hg-reviewers
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;