Removed extra newline in hg log when not using the --patch option, fixed tests.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Removed extra newline in hg log when not using the --patch option, fixed tests.
manifest hash:
4d83d4af68581affe4cd2dacf840ec78bf18311e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC1jJdW7P1GVgWeRoRAkoIAJ4kI8WFisp8fJTMsUCddLwK0O1mHQCgj+fx
XDIXrDpUULYSSck3eD4QHY4=
=jKKB
-----END PGP SIGNATURE-----
--- a/mercurial/commands.py Thu Jul 14 08:57:54 2005 +0100
+++ b/mercurial/commands.py Thu Jul 14 10:37:33 2005 +0100
@@ -712,8 +712,7 @@
changenode = repo.changelog.node(i)
prev, other = repo.changelog.parents(changenode)
dodiff(sys.stdout, ui, repo, files, prev, changenode)
- ui.write("\n")
- ui.write("\n")
+ ui.write("\n\n")
def manifest(ui, repo, rev = []):
"""output the latest or given revision of the project manifest"""
--- a/tests/test-basic.out Thu Jul 14 08:57:54 2005 +0100
+++ b/tests/test-basic.out Thu Jul 14 10:37:33 2005 +0100
@@ -11,7 +11,6 @@
date: Thu Jan 1 00:00:00 1970
summary: test
-
+ hg manifest
b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a
+ hg cat a
--- a/tests/test-copy.out Thu Jul 14 08:57:54 2005 +0100
+++ b/tests/test-copy.out Thu Jul 14 10:37:33 2005 +0100
@@ -19,20 +19,17 @@
date: Thu Jan 1 00:00:00 1970
summary: 2
-
changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
user: test
date: Thu Jan 1 00:00:00 1970
summary: 1
-
+ hg log a
changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
user: test
date: Thu Jan 1 00:00:00 1970
summary: 1
-
+ hexdump -C .hg/data/b.d
00000000 75 01 0a 63 6f 70 79 72 65 76 3a 20 62 37 38 39 |u..copyrev: b789|
00000010 66 64 64 39 36 64 63 32 66 33 62 64 32 32 39 63 |fdd96dc2f3bd229c|
--- a/tests/test-flags.out Thu Jul 14 08:57:54 2005 +0100
+++ b/tests/test-flags.out Thu Jul 14 10:37:33 2005 +0100
@@ -52,19 +52,16 @@
date: Thu Jan 1 00:00:00 1970
summary: chmod +x a
-
changeset: 1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5
user: test
date: Thu Jan 1 00:00:00 1970
summary: a updated
-
changeset: 0:22a449e20da501ca558394c083ca470e9c81b9f7
user: test
date: Thu Jan 1 00:00:00 1970
summary: added a b
-
+ hg -v co -m
resolving manifests
merging a
--- a/tests/test-tag.out Thu Jul 14 08:57:54 2005 +0100
+++ b/tests/test-tag.out Thu Jul 14 10:37:33 2005 +0100
@@ -9,7 +9,6 @@
date: Thu Jan 1 00:00:00 1970
summary: test
-
+ hg tag -u test -d '0 0' bleah
+ hg history
changeset: 1:863197ef03781c4fc00276d83eb66c4cb9cd91df
@@ -18,14 +17,12 @@
date: Thu Jan 1 00:00:00 1970
summary: Added tag bleah for changeset acb14030fe0a21b60322c440ad2d20cf7685a376
-
changeset: 0:acb14030fe0a21b60322c440ad2d20cf7685a376
tag: bleah
user: test
date: Thu Jan 1 00:00:00 1970
summary: test
-
+ echo foo
+ hg tag -u test -d '0 0' bleah2
abort: working copy of .hgtags is changed!
--- a/tests/test-up-local-change.out Thu Jul 14 08:57:54 2005 +0100
+++ b/tests/test-up-local-change.out Thu Jul 14 10:37:33 2005 +0100
@@ -57,7 +57,6 @@
2
-
changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
user: test
@@ -67,7 +66,6 @@
1
-
+ hg diff
+ sed 's/\(\(---\|+++\).*\)\t.*/\1/'
diff -r 1e71731e6fbb a