# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 1219610434 -7200
# Node ID b4749456d3064112f7867b7f9c0737836f843709
# Parent  03916abdfb64b75038781b7a33ce2ca77a68a36a# Parent  17bdcd59b9ad427e8ab83f6d47e73b1c13d6b6ff
Merge with Gilles Moris

diff -r 17bdcd59b9ad -r b4749456d306 mercurial/commands.py
--- a/mercurial/commands.py	Fri Aug 22 08:26:18 2008 +0200
+++ b/mercurial/commands.py	Sun Aug 24 22:40:34 2008 +0200
@@ -587,16 +587,20 @@
         return
     cl = repo.changelog
     rev = cl.rev(node)
-    ui.note(_('committed changeset %s\n') % short(node))
     parents = cl.parentrevs(rev)
     if rev - 1 in parents:
         # one of the parents was the old tip
-        return
-    if (parents == (nullrev, nullrev) or
-        len(cl.heads(cl.node(parents[0]))) > 1 and
-        (parents[1] == nullrev or len(cl.heads(cl.node(parents[1]))) > 1)):
+        pass
+    elif (parents == (nullrev, nullrev) or
+          len(cl.heads(cl.node(parents[0]))) > 1 and
+          (parents[1] == nullrev or len(cl.heads(cl.node(parents[1]))) > 1)):
         ui.status(_('created new head\n'))
 
+    if ui.debugflag:
+        ui.write(_('committed changeset %d:%s\n') % (rev,hex(node)))
+    elif ui.verbose:
+        ui.write(_('committed changeset %d:%s\n') % (rev,short(node)))
+
 def copy(ui, repo, *pats, **opts):
     """mark files as copied for the next commit
 
diff -r 17bdcd59b9ad -r b4749456d306 tests/test-addremove.out
--- a/tests/test-addremove.out	Fri Aug 22 08:26:18 2008 +0200
+++ b/tests/test-addremove.out	Sun Aug 24 22:40:34 2008 +0200
@@ -2,12 +2,12 @@
 adding foo
 dir/bar
 foo
-committed changeset d44511117907
+committed changeset 0:d44511117907
 adding dir/bar_2
 adding foo_2
 dir/bar_2
 foo_2
-committed changeset a85812e0561a
+committed changeset 1:a85812e0561a
 adding a
 adding c
 removing a
diff -r 17bdcd59b9ad -r b4749456d306 tests/test-casefolding.out
--- a/tests/test-casefolding.out	Fri Aug 22 08:26:18 2008 +0200
+++ b/tests/test-casefolding.out	Sun Aug 24 22:40:34 2008 +0200
@@ -5,7 +5,7 @@
 % test case collision on rename (issue 750)
 adding a
 a
-committed changeset 07f494440405
+committed changeset 0:07f4944404050f47db2e5c5071e0e84e7a27bba9
 A: not overwriting - file exists
 % test case collision between revisions (issue 912)
 adding a
diff -r 17bdcd59b9ad -r b4749456d306 tests/test-commit
diff -r 17bdcd59b9ad -r b4749456d306 tests/test-commit.out
--- a/tests/test-commit.out	Fri Aug 22 08:26:18 2008 +0200
+++ b/tests/test-commit.out	Sun Aug 24 22:40:34 2008 +0200
@@ -11,19 +11,19 @@
 abort: file bar not found!
 adding dir/file
 dir/file
-committed changeset d2a76177cb42
+committed changeset 2:d2a76177cb42
 adding dir.file
 abort: no match under directory dir!
 abort: no match under directory .!
 abort: no match under directory ../dir2!
 dir/file
-committed changeset 1cd62a2d8db5
+committed changeset 3:1cd62a2d8db5
 does-not-exist: No such file or directory
 abort: file does-not-exist not found!
 abort: file baz not tracked!
 abort: file quux not tracked!
 dir/file
-committed changeset 49176991390e
+committed changeset 4:49176991390e
 % partial subdir commit test
 adding bar/bar
 adding foo/foo
diff -r 17bdcd59b9ad -r b4749456d306 tests/test-copy.out
--- a/tests/test-copy.out	Fri Aug 22 08:26:18 2008 +0200
+++ b/tests/test-copy.out	Sun Aug 24 22:40:34 2008 +0200
@@ -1,7 +1,7 @@
 A b
 b
  b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
-committed changeset 386a3cc01532
+committed changeset 1:386a3cc01532710ca78aed9a54fa2f459c04f29c
 we should see two history entries
 changeset:   1:386a3cc01532
 tag:         tip
diff -r 17bdcd59b9ad -r b4749456d306 tests/test-hook.out
--- a/tests/test-hook.out	Fri Aug 22 08:26:18 2008 +0200
+++ b/tests/test-hook.out	Sun Aug 24 22:40:34 2008 +0200
@@ -150,5 +150,5 @@
 foo
 calling hook commit.auto: <function autohook>
 Automatically installed hook
-committed changeset 52998019f625
+committed changeset 1:52998019f6252a2b893452765fcb0a47351a5708
 hooks.commit.auto=<function autohook>
diff -r 17bdcd59b9ad -r b4749456d306 tests/test-issue1175.out
--- a/tests/test-issue1175.out	Fri Aug 22 08:26:18 2008 +0200
+++ b/tests/test-issue1175.out	Sun Aug 24 22:40:34 2008 +0200
@@ -8,7 +8,7 @@
 b
  b: searching for copy revision for a
  b: copy a:b80de5d138758541c5f05265ad144ab9fa86d1db
-committed changeset 755e75751bf6
+committed changeset 5:755e75751bf67eb4378bca61987df035d90a7a06
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
diff -r 17bdcd59b9ad -r b4749456d306 tests/test-keyword.out
--- a/tests/test-keyword.out	Fri Aug 22 08:26:18 2008 +0200
+++ b/tests/test-keyword.out	Sun Aug 24 22:40:34 2008 +0200
@@ -117,7 +117,7 @@
 b
 overwriting a expanding keywords
 running hook commit.test: cp a hooktest
-committed changeset ef63ca68695b
+committed changeset 1:ef63ca68695bc9495032c6fda1350c71e6d256e9
 % status
 ? hooktest
 % identify
@@ -224,7 +224,7 @@
 c
  c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292
 overwriting c expanding keywords
-committed changeset e22d299ac0c2
+committed changeset 2:e22d299ac0c2bd8897b3df5114374b9e4d4ca62f
 % cat a c
 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
 do not process $Id:
@@ -282,7 +282,7 @@
 % commit
 a
 overwriting a expanding keywords
-committed changeset bb948857c743
+committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83
 % status
 % verify
 checking changesets
@@ -309,7 +309,7 @@
 1: xxx $
 2: $Xinfo$
 % remove
-committed changeset d14c71265376
+committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012
 % status
 % rollback
 rolling back last transaction
@@ -341,7 +341,7 @@
 % commit rejecttest
 a
 overwriting a expanding keywords
-committed changeset 85e279d709ff
+committed changeset 2:85e279d709ffc28c9fdd1b868570985fc3d87082
 % export
 % import
 applying ../rejecttest.diff
@@ -365,7 +365,7 @@
 x/a
  x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e
 overwriting x/a expanding keywords
-committed changeset cfa68229c116
+committed changeset 3:cfa68229c1167443337266ebac453c73b1d5d16e
 % cat a
 expand $Id: x/a cfa68229c116 Thu, 01 Jan 1970 00:00:03 +0000 user $
 do not process $Id: