# HG changeset patch # User Bryan O'Sullivan # Date 2016-01-12 22:28:43 # Node ID 338c9d227a9e8e38c4cc90fad8a88f32f342de40 # Parent 1b8c7d59be43b69055c0c1bdd6818f471c41969a commands: use a context manager for file I/O in debugdiscovery diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -2311,8 +2311,7 @@ def debugdiscovery(ui, repo, remoteurl=" serverlogs = opts.get('serverlog') if serverlogs: for filename in serverlogs: - logfile = open(filename, 'r') - try: + with open(filename, 'r') as logfile: line = logfile.readline() while line: parts = line.strip().split(';') @@ -2324,9 +2323,6 @@ def debugdiscovery(ui, repo, remoteurl=" elif op == 'unb': doit(parts[3].split(' '), parts[2].split(' ')) line = logfile.readline() - finally: - logfile.close() - else: remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches, opts.get('remote_head'))