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

login
register
mail settings
Submitter Siddharth Agarwal
Date Oct. 13, 2015, 10:10 p.m.
Message ID <2c299720780f920356e6.1444774218@dev6666.prn1.facebook.com>
Download mbox | patch
Permalink /patch/11037/
State Accepted
Headers show

Comments

Siddharth Agarwal - Oct. 13, 2015, 10:10 p.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1443674933 25200
#      Wed Sep 30 21:48:53 2015 -0700
# Node ID 2c299720780f920356e65f24a10bc06367d3369a
# Parent  83f9eea19ddb82b29d0a4f4fbd0673a74ada9f23
debugmergestate: add support for printing out driver-resolved files
Augie Fackler - Oct. 14, 2015, 2:19 p.m.
On Tue, Oct 13, 2015 at 03:10:18PM -0700, Siddharth Agarwal wrote:
> # HG changeset patch
> # User Siddharth Agarwal <sid0@fb.com>
> # Date 1443674933 25200
> #      Wed Sep 30 21:48:53 2015 -0700
> # Node ID 2c299720780f920356e65f24a10bc06367d3369a
> # Parent  83f9eea19ddb82b29d0a4f4fbd0673a74ada9f23
> debugmergestate: add support for printing out driver-resolved files

queued these, thanks!

>
> 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:
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> https://selenic.com/mailman/listinfo/mercurial-devel
Pierre-Yves David - Oct. 14, 2015, 2:20 p.m.
On 10/13/2015 03:10 PM, Siddharth Agarwal wrote:
> # HG changeset patch
> # User Siddharth Agarwal<sid0@fb.com>
> # Date 1443674933 25200
> #      Wed Sep 30 21:48:53 2015 -0700
> # Node ID 2c299720780f920356e65f24a10bc06367d3369a
> # Parent  83f9eea19ddb82b29d0a4f4fbd0673a74ada9f23
> debugmergestate: add support for printing out driver-resolved files

This series is pushed to the clowncopter. Many thanks

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: