mercurial/patch.py
changeset 45892 ac362d5a7893
parent 45154 10f48720ef95
child 45957 89a2afe31e82
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