Mercurial > hg

changeset 19285:feaf5749d7a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: add a files method to the mergestate class This will be used in the upcoming shelve extension.
author Bryan O'Sullivan <bryano@fb.com>
date Mon, 03 Jun 2013 17:20:37 -0700
parents 8300adf9ca33
children 78501209488a
files mercurial/merge.py
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Sun Jun 02 18:09:06 2013 -0500
+++ b/mercurial/merge.py	Mon Jun 03 17:20:37 2013 -0700
@@ -61,6 +61,8 @@
         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