Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/patch.py @ 45892:ac362d5a7893

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
errors: introduce CanceledError and use it in a few places This very similar to earlier patches (e.g. for `InputError`) and part of https://www.mercurial-scm.org/wiki/ErrorCategoriesPlan. Differential Revision: https://phab.mercurial-scm.org/D9339
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 22 Oct 2020 14:14:59 -0700
parents 10f48720ef95
children 89a2afe31e82
comparison
equal deleted inserted replaced
45891:568c05d8f3d2 45892:ac362d5a7893
1270 elif r == 5: # done, skip remaining 1270 elif r == 5: # done, skip remaining
1271 ret = skipall = False 1271 ret = skipall = False
1272 elif r == 6: # all 1272 elif r == 6: # all
1273 ret = skipall = True 1273 ret = skipall = True
1274 elif r == 7: # quit 1274 elif r == 7: # quit
1275 raise error.Abort(_(b'user quit')) 1275 raise error.CanceledError(_(b'user quit'))
1276 return ret, skipfile, skipall, newpatches 1276 return ret, skipfile, skipall, newpatches
1277 1277
1278 seen = set() 1278 seen = set()
1279 applied = {} # 'filename' -> [] of chunks 1279 applied = {} # 'filename' -> [] of chunks
1280 skipfile, skipall = None, None 1280 skipfile, skipall = None, None