Subject | Hash | Author | Date (UTC) |
---|---|---|---|
combine: Avoid reading files twice, to support data coming from pipes. Closes: #667960 Thanks, Carsten Hey | bbfa7f9a5d262d13c825005f89410f464148fd1d | Joey Hess | 2012-04-09 20:18:21 |
updated debian copyright format url | b70bf8f3b34e03acfe4ed906929e1a3f2b42dd4b | Joey Hess | 2012-02-25 14:53:16 |
Typo. Closes: #649158 | 9991e280ec2364b4605c5b7371829af39c662043 | Joey Hess | 2011-11-18 17:37:25 |
releasing version 0.45 | 929dee9e4544801af94a68a4e4631484fff4a3f3 | Joey Hess | 2011-06-19 20:20:19 |
ts: Support %.s for seconds sinch epoch with subsecond resolution. Closes: #619764 | bb190ff90f192cb50c086abec11459ab09c205f1 | Joey Hess | 2011-04-01 18:36:03 |
releasing version 0.44 | c27365c4f2a7e42841aef3f53b9316b4aaab730a | Joey Hess | 2011-03-10 21:38:58 |
pee: Propigate exit status of commands run. | 6827d8ff8e7c4e2003c6065d1769c780b4f96973 | Joey Hess | 2011-02-19 21:35:32 |
dep5 update | da4a447c4fda5972cd486c3d6e342476429b2733 | Joey Hess | 2011-02-19 21:35:08 |
typo: sed s/agganges/arranges/ | d85a95af34ba2cca2436f18e87a4a49154e170a5 | Barak A. Pearlmutter | 2011-01-24 14:02:44 |
DEP-5 | ec60338bdec33b47872932c9a1c05f352baea1a4 | Joey Hess | 2011-01-13 21:24:02 |
releasing version 0.43 | 3bd91ea4f68fcc0bdc3d4cab3cb51095a87ab1f4 | Joey Hess | 2010-10-31 00:59:44 |
chronic: New command, runs a command quietly, unless it fails. | 11eb9b1ae7b81f3bbf52047a7a8ec995b7808970 | Joey Hess | 2010-10-29 19:49:33 |
releasing version 0.42 | dc7df101d71be5c504529a47c541aa8bfc82edca | Joey Hess | 2010-10-07 00:06:06 |
update | 1895d25c9bca0b78b86592f568710d8f45735f08 | Joey Hess | 2010-09-13 20:38:28 |
minor | 6d1ac81ec62f257ea17b9548ad539b64c743124a | Joey Hess | 2010-09-13 20:36:55 |
put back optimisation when outputting to stdout | 32b1e7134b8f07cd3e16d4e3dc7414cbf1305e07 | Joey Hess | 2010-09-13 20:33:56 |
sponge: Ensure that output file permissions are always preserved if it already exists. | 1ac3e2c08bae4bd8e5e771dab94564d79638d414 | Joey Hess | 2010-09-13 20:08:01 |
indentation change | 067b7a5419db8e78eeeee9ad62f798cb33be1e05 | Joey Hess | 2010-09-13 19:57:49 |
sponge: Guarantee that output file is always updated atomically, by renaming a temp file into place. Closes: #592144 | 60b82b59a729d2a4322c3305d7207ce027831e23 | Joey Hess | 2010-09-13 19:55:34 |
Typo. Closes: #596032 | e32af5bdb524059c98c6e158baa78db308609be0 | Joey Hess | 2010-09-08 06:09:43 |
File | Lines added | Lines deleted |
---|---|---|
combine | 26 | 3 |
debian/changelog | 2 | 0 |
File combine changed (mode: 100755) (index a695935..13fc2e4) | |||
... | ... | sub compare_or { | |
104 | 104 | ||
105 | 105 | sub compare_xor { | sub compare_xor { |
106 | 106 | my ($file1, $file2) = @_; | my ($file1, $file2) = @_; |
107 | |||
108 | compare_not($file1, $file2); | ||
109 | compare_not($file2, $file1); | ||
107 | |||
108 | my ($lines2, $seen2) = ([], {}); | ||
109 | filemap $file2, | ||
110 | sub { | ||
111 | push @$lines2, $_; | ||
112 | $seen2->{$_} = 1; | ||
113 | }; | ||
114 | |||
115 | filemap $file1, | ||
116 | sub { | ||
117 | # Print all lines in file1 that are not in file2, | ||
118 | # and mark lines that are in both files by setting | ||
119 | # their value in %seen2 to 0. | ||
120 | if (exists $seen2->{$_}) { | ||
121 | $seen2->{$_} = 0; | ||
122 | } | ||
123 | else { | ||
124 | print "$_\n"; | ||
125 | } | ||
126 | }; | ||
127 | |||
128 | foreach (@$lines2) { | ||
129 | # Print all lines that are in file2 but not in file1. | ||
130 | # The value of these lines in seen2 is set to 1. | ||
131 | print "$_\n" if $seen2->{$_}; | ||
132 | } | ||
110 | 133 | } | } |
111 | 134 | ||
112 | 135 | sub compare_not { | sub compare_not { |
File debian/changelog changed (mode: 100644) (index 13822c1..cd406ff) | |||
1 | 1 | moreutils (0.46) UNRELEASED; urgency=low | moreutils (0.46) UNRELEASED; urgency=low |
2 | 2 | ||
3 | 3 | * Typo. Closes: #649158 | * Typo. Closes: #649158 |
4 | * combine: Avoid reading files twice, to support data coming from | ||
5 | pipes. Closes: #667960 Thanks, Carsten Hey | ||
4 | 6 | ||
5 | 7 | -- Joey Hess <joeyh@debian.org> Fri, 18 Nov 2011 13:37:10 -0400 | -- Joey Hess <joeyh@debian.org> Fri, 18 Nov 2011 13:37:10 -0400 |
6 | 8 |