mercurial-scm/hg: comparison mercurial/cmdutil.py

equal deleted inserted replaced

-:d60678a567a9
+:328739ea70c3
 originalchunks = patch.parsepatch(originaldiff)
 # 1. filter patch, so we have intending-to apply subset of it
 try:
 chunks = filterfn(ui, originalchunks)
-except patch.PatchError, err:
+except patch.PatchError as err:
 raise util.Abort(_('error parsing patch: %s') % err)
 # We need to keep a backup of files that have been newly added and
 # modified during the recording process because there is a previous
 # version without the edit in the workdir
 backups = {}
 if tobackup:
 backupdir = repo.join('record-backups')
 try:
 os.mkdir(backupdir)
-except OSError, err:
+except OSError as err:
 if err.errno != errno.EEXIST:
 raise
 try:
 # backup continues
 for f in tobackup:
 if dopatch:
 try:
 ui.debug('applying patch\n')
 ui.debug(fp.getvalue())
 patch.internalpatch(ui, repo, fp, 1, eolmode=None)
-except patch.PatchError, err:
+except patch.PatchError as err:
 raise util.Abort(str(err))
 del fp
 # 4. We prepared working directory according to filtered
 #    patch. Now is the time to delegate the job to
 try:
 if logfile == '-':
 message = ui.fin.read()
 else:
 message = '\n'.join(util.readfile(logfile).splitlines())
-except IOError, inst:
+except IOError as inst:
 raise util.Abort(_("can't read commit message '%s': %s") %
 (logfile, inst.strerror))
 return message
 def mergeeditform(ctxorbool, baseformname):
 c = pat[i]
 c = expander[c]()
 newname.append(c)
 i += 1
 return ''.join(newname)
-except KeyError, inst:
+except KeyError as inst:
 raise util.Abort(_("invalid format spec '%%%s' in output filename") %
 inst.args[0])
 def makefileobj(repo, pat, node=None, desc=None, total=None,
 seqno=None, revwidth=None, mode='wb', modemap=None,
 os.rename(src, tmp)
 os.rename(tmp, target)
 else:
 util.copyfile(src, target)
 srcexists = True
-except IOError, inst:
+except IOError as inst:
 if inst.errno == errno.ENOENT:
 ui.warn(_('%s: deleted in working directory\n') % relsrc)
 srcexists = False
 else:
 ui.warn(_('%s: cannot copy - %s\n') %
 raise util.Abort(_('child process failed to start'))
 writepid(pid)
 finally:
 try:
 os.unlink(lockpath)
-except OSError, e:
+except OSError as e:
 if e.errno != errno.ENOENT:
 raise
 if parentfn:
 return parentfn(pid)
 else:
 partial = opts.get('partial', False)
 files = set()
 try:
 patch.patch(ui, repo, tmpname, strip=strip, prefix=prefix,
 files=files, eolmode=None, similarity=sim / 100.0)
-except patch.PatchError, e:
+except patch.PatchError as e:
 if not partial:
 raise util.Abort(str(e))
 if partial:
 rejects = True
 try:
 files = set()
 try:
 patch.patchrepo(ui, repo, p1, store, tmpname, strip, prefix,
 files, eolmode=None)
-except patch.PatchError, e:
+except patch.PatchError as e:
 raise util.Abort(str(e))
 if opts.get('exact'):
 editor = None
 else:
 editor = getcommiteditor(editform='import.bypass')
 if types['footer']:
 if not self.footer:
 self.footer = templater.stringify(self.t(types['footer'],
 **props))
-except KeyError, inst:
+except KeyError as inst:
 msg = _("%s: no key named '%s'")
 raise util.Abort(msg % (self.t.mapfile, inst.args[0]))
-except SyntaxError, inst:
+except SyntaxError as inst:
 raise util.Abort('%s: %s' % (self.t.mapfile, inst.args[0]))
 def gettemplate(ui, tmpl, style):
 """
 Find the template matching the given template spec or style.
 return changeset_printer(ui, repo, matchfn, opts, buffered)
 try:
 t = changeset_templater(ui, repo, matchfn, opts, tmpl, mapfile,
 buffered)
-except SyntaxError, inst:
+except SyntaxError as inst:
 raise util.Abort(inst.args[0])
 return t
 def showmarker(ui, marker):
 """utility function to display obsolescence marker in a readable way
 ui = repo.ui
 tmpl, mapfile = gettemplate(ui, tmpl, None)
 try:
 t = changeset_templater(ui, repo, None, {}, tmpl, mapfile, False)
-except SyntaxError, inst:
+except SyntaxError as inst:
 raise util.Abort(inst.args[0])
 for k, v in repo.ui.configitems('committemplate'):
 if k != 'changeset':
 t.t.cache[k] = v
 chunks = recordfilter(repo.ui, originalchunks)
 if reversehunks:
 chunks = patch.reversehunks(chunks)
-except patch.PatchError, err:
+except patch.PatchError as err:
 raise util.Abort(_('error parsing patch: %s') % err)
 newlyaddedandmodifiedfiles = newandmodified(chunks, originalchunks)
 # Apply changes
 fp = cStringIO.StringIO()
 dopatch = fp.tell()
 fp.seek(0)
 if dopatch:
 try:
 patch.internalpatch(repo.ui, repo, fp, 1, eolmode=None)
-except patch.PatchError, err:
+except patch.PatchError as err:
 raise util.Abort(str(err))
 del fp
 else:
 for f in actions['revert'][0]:
 wsize = checkout(f)

changeset 25660	328739ea70c3
parent 25657	dcc56e10c23b
child 25693	a6c1eac2fb1e