[PATCH 2 of 5] commands.debugmergestate: print out branch merge info

Siddharth Agarwal sid0 at fb.com
Tue Nov 3 06:23:31 UTC 2015


# HG changeset patch
# User Siddharth Agarwal <sid0 at fb.com>
# Date 1446519494 28800
#      Mon Nov 02 18:58:14 2015 -0800
# Node ID 2756d2b5471bdf69b77e8b268afc9c24cd68f224
# Parent  10ea1863762987b74bc6431d72e8c1b160ff3499
commands.debugmergestate: print out branch merge info

We're going to serialize this information in upcoming patches.

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -2535,6 +2535,8 @@ def debugmergestate(ui, repo, *args):
                 ui.write(('local: %s\n') % record)
             elif rtype == 'O':
                 ui.write(('other: %s\n') % record)
+            elif rtype == 'b':
+                ui.write(('branch merge: %s\n') % bool(int(record)))
             elif rtype == 'm':
                 driver, mdstate = record.split('\0', 1)
                 ui.write(('merge driver: %s (state "%s")\n')



More information about the Mercurial-devel mailing list