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

login
register
mail settings
Submitter Bryan O'Sullivan
Date May 28, 2013, 11:28 p.m.
Message ID <0f4397fbda5b3cd7e4de.1369783734@australite.thefacebook.com>
Download mbox | patch
Permalink /patch/1669/
State Superseded
Commit 9bfa86746c9c1f6ab51deb8f174ffc482417d09f
Headers show

Comments

Bryan O'Sullivan - May 28, 2013, 11:28 p.m.
# 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.

Patch

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