diff --git a/mercurial/patch.py b/mercurial/patch.py --- a/mercurial/patch.py +++ b/mercurial/patch.py @@ -376,15 +376,11 @@ class patchfile: if not self.rej: return - if self.hunks != 1: - hunkstr = "s" - else: - hunkstr = "" fname = self.fname + ".rej" self.ui.warn( - _("%d out of %d hunk%s FAILED -- saving rejects to file %s\n") % - (len(self.rej), self.hunks, hunkstr, fname)) + _("%d out of %d hunks FAILED -- saving rejects to file %s\n") % + (len(self.rej), self.hunks, fname)) try: os.unlink(fname) except: pass diff --git a/tests/test-mq-missingfiles.out b/tests/test-mq-missingfiles.out --- a/tests/test-mq-missingfiles.out +++ b/tests/test-mq-missingfiles.out @@ -30,7 +30,7 @@ Patch queue now empty % push git patch with missing target applying changeb unable to find 'b' for patching -1 out of 1 hunk FAILED -- saving rejects to file b.rej +1 out of 1 hunks FAILED -- saving rejects to file b.rej patch failed, unable to continue (try -v) b: No such file or directory b not tracked! diff --git a/tests/test-mq.out b/tests/test-mq.out --- a/tests/test-mq.out +++ b/tests/test-mq.out @@ -287,7 +287,7 @@ Patch queue now empty applying foo applying bar file foo already exists -1 out of 1 hunk FAILED -- saving rejects to file foo.rej +1 out of 1 hunks FAILED -- saving rejects to file foo.rej patch failed, unable to continue (try -v) patch failed, rejects left in working dir Errors during apply, please fix and refresh bar diff --git a/tests/test-transplant.out b/tests/test-transplant.out --- a/tests/test-transplant.out +++ b/tests/test-transplant.out @@ -110,14 +110,14 @@ created new head applying a1e30dd1b8e7 patching file foo Hunk #1 FAILED at 0 -1 out of 1 hunk FAILED -- saving rejects to file foo.rej +1 out of 1 hunks FAILED -- saving rejects to file foo.rej patch failed to apply abort: Fix up the merge and run hg transplant --continue 1 files updated, 0 files merged, 1 files removed, 0 files unresolved applying a1e30dd1b8e7 patching file foo Hunk #1 FAILED at 0 -1 out of 1 hunk FAILED -- saving rejects to file foo.rej +1 out of 1 hunks FAILED -- saving rejects to file foo.rej patch failed to apply abort: Fix up the merge and run hg transplant --continue a1e30dd1b8e7 transplanted as f1563cf27039