[PATCH 1 of 4] merge: add a files method to the mergestate class

[Bryan O'Sullivan]

# HG changeset patch
# User Bryan O'Sullivan <bryano at fb.com>
# Date 1369782549 25200
#      Tue May 28 16:09:09 2013 -0700
# Node ID 0f4397fbda5b3cd7e4de5c4ea070c80224ad3893
# Parent  5c52d78fef0b81e56f911a6ad625718e0e0fd645
merge: add a files method to the mergestate class

This will be used in the upcoming shelve extension.

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -61,6 +61,8 @@ class mergestate(object):
         l.sort()
         for f in l:
             yield f
+    def files(self):
+        return self._state.keys()
     def mark(self, dfile, state):
         self._state[dfile][0] = state
         self._dirty = True