[PATCH 1 of 6] avoid naive plural tricks
Martin Geisler
mg at daimi.au.dk
Sat Aug 23 08:37:20 CDT 2008
# HG changeset patch
# User Martin Geisler <mg at daimi.au.dk>
# Date 1219498335 -7200
# Node ID afff2e12e1932bc99b6ed0e7d35f8a608363d401
# Parent f0bd1797e98f9b93973d4cd3833d2bf38a1fc6b7
avoid naive plural tricks
diff -r f0bd1797e98f -r afff2e12e193 mercurial/patch.py
--- a/mercurial/patch.py Sat Aug 23 15:03:18 2008 +0200
+++ b/mercurial/patch.py Sat Aug 23 15:32:15 2008 +0200
@@ -376,15 +376,11 @@
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 -r f0bd1797e98f -r afff2e12e193 tests/test-mq-missingfiles.out
--- a/tests/test-mq-missingfiles.out Sat Aug 23 15:03:18 2008 +0200
+++ b/tests/test-mq-missingfiles.out Sat Aug 23 15:32:15 2008 +0200
@@ -30,7 +30,7 @@
% 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 -r f0bd1797e98f -r afff2e12e193 tests/test-mq.out
--- a/tests/test-mq.out Sat Aug 23 15:03:18 2008 +0200
+++ b/tests/test-mq.out Sat Aug 23 15:32:15 2008 +0200
@@ -287,7 +287,7 @@
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 -r f0bd1797e98f -r afff2e12e193 tests/test-transplant.out
--- a/tests/test-transplant.out Sat Aug 23 15:03:18 2008 +0200
+++ b/tests/test-transplant.out Sat Aug 23 15:32:15 2008 +0200
@@ -110,14 +110,14 @@
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
More information about the Mercurial-devel
mailing list