[PATCH 1 of 4 mergedriver] debugmergestate: explain why we create mergestate objects directly
Siddharth Agarwal
sid0 at fb.com
Wed Nov 18 06:41:36 UTC 2015
# HG changeset patch
# User Siddharth Agarwal <sid0 at fb.com>
# Date 1447798950 28800
# Tue Nov 17 14:22:30 2015 -0800
# Node ID 2869fd1811666940c049c171ee074c0020e776eb
# Parent 9be8f04c78c211b27b05370e469c883d2f5a8568
# Available At http://42.netv6.net/sid0-wip/hg/
# hg pull http://42.netv6.net/sid0-wip/hg/ -r 2869fd181166
debugmergestate: explain why we create mergestate objects directly
This shouldn't generally be done, but in this case it's fine because
debugmergestate needs to be privy to mergestate internals anyway.
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -2556,6 +2556,8 @@ def debugmergestate(ui, repo, *args):
ui.write(('unrecognized entry: %s\t%s\n')
% (rtype, record.replace('\0', '\t')))
+ # avoid parsing the merge state -- we shouldn't be doing this, but this is
+ # OK since this command is pretty low-level
ms = mergemod.mergestate(repo)
# sort so that reasonable information is on top
More information about the Mercurial-devel
mailing list