Submitter | Siddharth Agarwal |
---|---|
Date | Nov. 21, 2015, 1:04 a.m. |
Message ID | <d3f3222f45eef7acf903.1448067841@dev666.prn1.facebook.com> |
Download | mbox | patch |
Permalink | /patch/11562/ |
State | Accepted |
Commit | a88a10a933b2f2c647c91d7c13114777226bcbea |
Delegated to: | Martin von Zweigbergk |
Headers | show |
Comments
Patch
diff --git a/mercurial/merge.py b/mercurial/merge.py --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -509,6 +509,14 @@ class mergestate(object): return len([True for f, entry in self._state.iteritems() if entry[0] == 'u']) + def actions(self): + """return lists of actions to perform on the dirstate""" + actions = {'r': [], 'a': [], 'g': []} + for f, (r, action) in self._results.iteritems(): + if action is not None: + actions[action].append((f, None, "merge result")) + return actions + def _checkunknownfile(repo, wctx, mctx, f, f2=None): if f2 is None: f2 = f