Mercurial > public > mercurial-scm > hg
diff hgext/convert/hg.py @ 10282:08a0f04b56bd
many, many trivial check-code fixups
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 25 Jan 2010 00:05:27 -0600 |
| parents | 25e572394f5c |
| children | 02d6149a480b |
line wrap: on
line diff
--- a/hgext/convert/hg.py Mon Jan 25 00:05:22 2010 -0600 +++ b/hgext/convert/hg.py Mon Jan 25 00:05:27 2010 -0600 @@ -74,7 +74,7 @@ def getheads(self): h = self.repo.changelog.heads() - return [ hex(x) for x in h ] + return [hex(x) for x in h] def setbranch(self, branch, pbranches): if not self.clonebranches: @@ -147,8 +147,10 @@ m1node = self.repo.changelog.read(bin(parents[0]))[0] parent = parents[0] - if len(parents) < 2: parents.append(nullid) - if len(parents) < 2: parents.append(nullid) + if len(parents) < 2: + parents.append(nullid) + if len(parents) < 2: + parents.append(nullid) p2 = parents.pop(0) text = commit.desc @@ -161,8 +163,8 @@ while parents: p1 = p2 p2 = parents.pop(0) - ctx = context.memctx(self.repo, (p1, p2), text, files.keys(), getfilectx, - commit.author, commit.date, extra) + ctx = context.memctx(self.repo, (p1, p2), text, files.keys(), + getfilectx, commit.author, commit.date, extra) self.repo.commitctx(ctx) text = "(octopus merge fixup)\n" p2 = hex(self.repo.changelog.tip())