Mercurial > hg-stable
changeset 26976:c48fee950ce4
debugmergestate: print out record type for files
We're going to add a separate record type for change/delete conflicts soon. We
need to make sure they get stored with the correct record type so that older
versions of Mercurial correctly abort when they see change/delete records.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Fri, 13 Nov 2015 23:01:36 -0800 |
| parents | 6618dfd3ea1c |
| children | bd19561b98d9 |
| files | mercurial/commands.py tests/test-backout.t |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Sun Nov 15 22:45:20 2015 -0800 +++ b/mercurial/commands.py Fri Nov 13 23:01:36 2015 -0800 @@ -2547,8 +2547,8 @@ flags = r[7] else: onode, flags = r[7:9] - ui.write(('file: %s (state "%s", hash %s)\n') - % (f, state, hash)) + ui.write(('file: %s (record type "%s", state "%s", hash %s)\n') + % (f, rtype, state, hash)) ui.write((' local path: %s (flags "%s")\n') % (lfile, flags)) ui.write((' ancestor path: %s (node %s)\n') % (afile, anode)) ui.write((' other path: %s (node %s)\n') % (ofile, onode))
--- a/tests/test-backout.t Sun Nov 15 22:45:20 2015 -0800 +++ b/tests/test-backout.t Fri Nov 13 23:01:36 2015 -0800 @@ -686,7 +686,7 @@ * version 2 records local: b71750c4b0fdf719734971e3ef90dbeab5919a2d other: a30dd8addae3ce71b8667868478542bc417439e6 - file: foo (state "u", hash 0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33) + file: foo (record type "F", state "u", hash 0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33) local path: foo (flags "") ancestor path: foo (node f89532f44c247a0e993d63e3a734dd781ab04708) other path: foo (node f50039b486d6fa1a90ae51778388cad161f425ee) @@ -694,7 +694,7 @@ $ hg debugmergestate * version 1 records local: b71750c4b0fdf719734971e3ef90dbeab5919a2d - file: foo (state "u", hash 0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33) + file: foo (record type "F", state "u", hash 0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33) local path: foo (flags "") ancestor path: foo (node f89532f44c247a0e993d63e3a734dd781ab04708) other path: foo (node not stored in v1 format)