Commit0f5320e

committed

Fix flake8 issue.

It's new in the latest version of flake - thanks travis for letting me know.

1 parent5ac93b1 commit0f5320eCopy full SHA for 0f5320e

File tree

-4

lines changed

-4

lines changed

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -578,11 +578,13 @@ def update(self, recursive=False, init=True, to_latest_revision=False, progress=`
`578`	`578`	`base_commit=mrepo.merge_base(mrepo.head.commit,hexsha)`
`579`	`579`	`iflen(base_commit)==0orbase_commit[0].hexsha==hexsha:`
`580`	`580`	`ifforce:`
`581`		`-log.debug("Will force checkout or reset on local branch that is possibly in the future of"`
`582`		`-+"the commit it will be checked out to, effectively 'forgetting' new commits")`
	`581`	`+msg="Will force checkout or reset on local branch that is possibly in the future of"`
	`582`	`+msg+="the commit it will be checked out to, effectively 'forgetting' new commits"`
	`583`	`+log.debug(msg)`
`583`	`584`	`else:`
`584`		`-log.info("Skipping %s on branch '%s' of submodule repo '%s' as it contains "`
`585`		`-+"un-pushed commits",is_detachedand"checkout"or"reset",mrepo.head,mrepo)`
	`585`	`+msg="Skipping %s on branch '%s' of submodule repo '%s' as it contains un-pushed commits"`
	`586`	`+msg%= (is_detachedand"checkout"or"reset",mrepo.head,mrepo)`
	`587`	`+log.info(msg)`
`586`	`588`	`may_reset=False`
`587`	`589`	`# end handle force`
`588`	`590`	`# end handle if we are in the future`

Comments

(0)