Patchwork [5,of,5,mergedriver] debugmergestate: add support for printing out driver-resolved files

login
register
mail settings
Submitter Siddharth Agarwal
Date Oct. 13, 2015, 4:50 a.m.
Message ID <cd4b8aab545727fc3ac8.1444711806@dev6666.prn1.facebook.com>
Download mbox | patch
Permalink /patch/11003/
State Superseded
Commit cffc4f7c6c36a9fd382832b1faa72416bdc90bef
Headers show

Comments

Siddharth Agarwal - Oct. 13, 2015, 4:50 a.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1443674933 25200
#      Wed Sep 30 21:48:53 2015 -0700
# Node ID cd4b8aab545727fc3ac84d14537d1534386be163
# Parent  79631637d3cf07d843a0350a387d904fc176bac7
debugmergestate: add support for printing out driver-resolved files

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -2506,8 +2506,9 @@  def debugmergestate(ui, repo, *args):
                 ui.write(('other: %s\n') % record)
             elif rtype == 'm':
                 driver, mdstate = record.split('\0', 1)
-                ui.write(('merge driver: %s (state "%s")\n') % (driver, mdstate))
-            elif rtype == 'F':
+                ui.write(('merge driver: %s (state "%s")\n')
+                         % (driver, mdstate))
+            elif rtype in 'FD':
                 r = record.split('\0')
                 f, state, hash, lfile, afile, anode, ofile = r[0:7]
                 if version == 1: