equal
deleted
inserted
replaced
374 # header is inserted so that you can run the reject through patch again |
374 # header is inserted so that you can run the reject through patch again |
375 # without having to type the filename. |
375 # without having to type the filename. |
376 |
376 |
377 if not self.rej: |
377 if not self.rej: |
378 return |
378 return |
379 if self.hunks != 1: |
|
380 hunkstr = "s" |
|
381 else: |
|
382 hunkstr = "" |
|
383 |
379 |
384 fname = self.fname + ".rej" |
380 fname = self.fname + ".rej" |
385 self.ui.warn( |
381 self.ui.warn( |
386 _("%d out of %d hunk%s FAILED -- saving rejects to file %s\n") % |
382 _("%d out of %d hunks FAILED -- saving rejects to file %s\n") % |
387 (len(self.rej), self.hunks, hunkstr, fname)) |
383 (len(self.rej), self.hunks, fname)) |
388 try: os.unlink(fname) |
384 try: os.unlink(fname) |
389 except: |
385 except: |
390 pass |
386 pass |
391 fp = file(fname, 'wb') |
387 fp = file(fname, 'wb') |
392 base = os.path.basename(self.fname) |
388 base = os.path.basename(self.fname) |