Show More
@@ -269,7 +269,7 b' def cleanupcmd(ui, repo):' | |||||
269 | wlock = None |
|
269 | wlock = None | |
270 | try: |
|
270 | try: | |
271 | wlock = repo.wlock() |
|
271 | wlock = repo.wlock() | |
272 | for (name, _) in repo.vfs.readdir('shelved'): |
|
272 | for (name, _type) in repo.vfs.readdir('shelved'): | |
273 | suffix = name.rsplit('.', 1)[-1] |
|
273 | suffix = name.rsplit('.', 1)[-1] | |
274 | if suffix in ('hg', 'files', 'patch'): |
|
274 | if suffix in ('hg', 'files', 'patch'): | |
275 | shelvedfile(repo, name).unlink() |
|
275 | shelvedfile(repo, name).unlink() | |
@@ -303,7 +303,7 b' def listshelves(repo):' | |||||
303 | raise |
|
303 | raise | |
304 | return [] |
|
304 | return [] | |
305 | info = [] |
|
305 | info = [] | |
306 | for (name, _) in names: |
|
306 | for (name, _type) in names: | |
307 | pfx, sfx = name.rsplit('.', 1) |
|
307 | pfx, sfx = name.rsplit('.', 1) | |
308 | if not pfx or sfx != 'patch': |
|
308 | if not pfx or sfx != 'patch': | |
309 | continue |
|
309 | continue |
@@ -1069,7 +1069,7 b' def help(web, req, tmpl):' | |||||
1069 | topicname = req.form.get('node', [None])[0] |
|
1069 | topicname = req.form.get('node', [None])[0] | |
1070 | if not topicname: |
|
1070 | if not topicname: | |
1071 | def topics(**map): |
|
1071 | def topics(**map): | |
1072 | for entries, summary, _ in helpmod.helptable: |
|
1072 | for entries, summary, _doc in helpmod.helptable: | |
1073 | yield {'topic': entries[0], 'summary': summary} |
|
1073 | yield {'topic': entries[0], 'summary': summary} | |
1074 |
|
1074 | |||
1075 | early, other = [], [] |
|
1075 | early, other = [], [] |
@@ -115,10 +115,10 b' class transaction(object):' | |||||
115 |
|
115 | |||
116 | offsets = [] |
|
116 | offsets = [] | |
117 | backups = [] |
|
117 | backups = [] | |
118 | for f, o, _ in q[0]: |
|
118 | for f, o, _data in q[0]: | |
119 | offsets.append((f, o)) |
|
119 | offsets.append((f, o)) | |
120 |
|
120 | |||
121 | for f, b, _ in q[1]: |
|
121 | for f, b, _data in q[1]: | |
122 | backups.append((f, b)) |
|
122 | backups.append((f, b)) | |
123 |
|
123 | |||
124 | d = ''.join(['%s\0%d\n' % (f, o) for f, o in offsets]) |
|
124 | d = ''.join(['%s\0%d\n' % (f, o) for f, o in offsets]) | |
@@ -265,7 +265,7 b' class transaction(object):' | |||||
265 | self.opener.unlink(self.journal) |
|
265 | self.opener.unlink(self.journal) | |
266 | if self.opener.isfile(self.backupjournal): |
|
266 | if self.opener.isfile(self.backupjournal): | |
267 | self.opener.unlink(self.backupjournal) |
|
267 | self.opener.unlink(self.backupjournal) | |
268 | for f, b, _ in self.backupentries: |
|
268 | for f, b, _ignore in self.backupentries: | |
269 | self.opener.unlink(b) |
|
269 | self.opener.unlink(b) | |
270 | self.backupentries = [] |
|
270 | self.backupentries = [] | |
271 | self.journal = None |
|
271 | self.journal = None |
@@ -105,7 +105,7 b' def _posixworker(ui, func, staticargs, a' | |||||
105 | if err.errno != errno.ESRCH: |
|
105 | if err.errno != errno.ESRCH: | |
106 | raise |
|
106 | raise | |
107 | def waitforworkers(): |
|
107 | def waitforworkers(): | |
108 | for _ in pids: |
|
108 | for _pid in pids: | |
109 | st = _exitstatus(os.wait()[1]) |
|
109 | st = _exitstatus(os.wait()[1]) | |
110 | if st and not problem[0]: |
|
110 | if st and not problem[0]: | |
111 | problem[0] = st |
|
111 | problem[0] = st |
General Comments 0
You need to be logged in to leave comments.
Login now