# HG changeset patch
# User Alexis S. L. Carvalho <alexis@cecm.usp.br>
# Date 2006-10-13 18:34:35
# Node ID 2065789f6a3ed64ff98f07efa370e02a86d6ce4f
# Parent  55476ce8e59c6e680dc8ac3e7a3ce54467e96fb7

use short hashes with diff -v

diff --git a/mercurial/patch.py b/mercurial/patch.py
--- a/mercurial/patch.py
+++ b/mercurial/patch.py
@@ -526,7 +526,7 @@ def diff(repo, node1=None, node2=None, f
     if repo.ui.quiet:
         r = None
     else:
-        hexfunc = repo.ui.verbose and hex or short
+        hexfunc = repo.ui.debugflag and hex or short
         r = [hexfunc(node) for node in [node1, node2] if node]
 
     if opts.git:
diff --git a/tests/test-diff-hashes b/tests/test-diff-hashes
new file mode 100755
--- /dev/null
+++ b/tests/test-diff-hashes
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+hg init a
+cd a
+echo bar > foo
+hg add foo
+hg ci -m 'add foo' -d '1000000 0'
+
+echo foobar > foo
+hg ci -m 'change foo' -d '1000001 0'
+
+echo 'quiet:'
+hg --quiet diff -r 0 -r 1
+echo
+
+echo 'normal:'
+hg diff -r 0 -r 1
+echo
+
+echo 'verbose:'
+hg --verbose diff -r 0 -r 1
+echo
+
+echo 'debug:'
+hg --debug diff -r 0 -r 1
+echo
diff --git a/tests/test-diff-hashes.out b/tests/test-diff-hashes.out
new file mode 100644
--- /dev/null
+++ b/tests/test-diff-hashes.out
@@ -0,0 +1,31 @@
+quiet:
+--- a/foo	Mon Jan 12 13:46:40 1970 +0000
++++ b/foo	Mon Jan 12 13:46:41 1970 +0000
+@@ -1,1 +1,1 @@ bar
+-bar
++foobar
+
+normal:
+diff -r 74de3f1392e2 -r b8b5f023a6ad foo
+--- a/foo	Mon Jan 12 13:46:40 1970 +0000
++++ b/foo	Mon Jan 12 13:46:41 1970 +0000
+@@ -1,1 +1,1 @@ bar
+-bar
++foobar
+
+verbose:
+diff -r 74de3f1392e2 -r b8b5f023a6ad foo
+--- a/foo	Mon Jan 12 13:46:40 1970 +0000
++++ b/foo	Mon Jan 12 13:46:41 1970 +0000
+@@ -1,1 +1,1 @@ bar
+-bar
++foobar
+
+debug:
+diff -r 74de3f1392e2d67856fb155963441f2610494e1a -r b8b5f023a6ad77fc378bd95cf3fa00cd1414d107 foo
+--- a/foo	Mon Jan 12 13:46:40 1970 +0000
++++ b/foo	Mon Jan 12 13:46:41 1970 +0000
+@@ -1,1 +1,1 @@ bar
+-bar
++foobar
+