[PATCH 2 of 5] resolve: output of --list similar to output of hg status

[S. Heimberg]

# HG changeset patch
# User simohe at besonet.ch
# Date 1217703760 -7200
# Node ID bee35253991c6691bbd1ab1d3233e8a27f878e78
# Parent  629d5d5537351e81cd8010d039c8c47a35718c1f
resolve: output of --list similar to output of hg status

the output of resolve --list is relative to the current directory and uses
the os path separator

diff -r 629d5d553735 -r bee35253991c mercurial/commands.py
--- a/mercurial/commands.py	Sat Aug 02 18:27:40 2008 +0200
+++ b/mercurial/commands.py	Sat Aug 02 21:02:40 2008 +0200
@@ -2251,7 +2251,8 @@
     for f in ms:
         if m(f):
             if opts.get("list"):
-                ui.write("%s %s\n" % (ms[f].upper(), f))
+                cwd = (pats and repo.getcwd()) or ''
+                ui.write("%s %s\n" % (ms[f].upper(), repo.pathto(f, cwd)))
             elif opts.get("mark"):
                 ms.mark(f, "r")
             elif opts.get("unmark"):