From patchwork Tue May 28 23:28:54 2013
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [1,of,4] merge: add a files method to the mergestate class
From: Bryan O'Sullivan <bos@serpentine.com>
X-Patchwork-Id: 1669
Message-Id: <0f4397fbda5b3cd7e4de.1369783734@australite.thefacebook.com>
To: mercurial-devel@selenic.com
Date: Tue, 28 May 2013 16:28:54 -0700

# HG changeset patch
# User Bryan O'Sullivan <bryano@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