view tests/test-status-color.out @ 10397:8cb81d75730c

mq: add parent node IDs to MQ patches on qrefresh/qnew

The goal of this patch is to add the IDs of the parents of applied MQ patches
into the patch file headers whenever qnew or qrefresh are run.

This will serve as a reminder of when the patches last applied cleanly and
will let us do more intelligent things in the future, such as:

    * Resolve conflicts found when qpushing to a new location by merging
      instead of simply showing rejects.

    * Display better diffs of versioned MQ patches because we can tell how the
      patched files have changed in the meantime.

Here are the new rules this patch introduces.  They are checked in this order:

    * If a patch currently has old, plain-style patch headers ("From:" and
      "Date:") do not change the style or add any new headers.

    * If the 'mq.plain' configuration setting is true, only plain-style
      headers will be used for all MQ patches.

    * qnew will initialize new patches with HG-style headers and fill in the
      "# Parent" header with the appropriate parent node.

    * qrefresh will refresh the "# Parent" header with the current parent of
      the current patch.

hg status in repo root:
? a/1/in_a_1
? a/in_a
? b/1/in_b_1
? b/2/in_b_2
? b/in_b
? in_root
hg status . in repo root:
? a/1/in_a_1
? a/in_a
? b/1/in_b_1
? b/2/in_b_2
? b/in_b
? in_root
hg status in a:
? a/1/in_a_1
? a/in_a
? b/1/in_b_1
? b/2/in_b_2
? b/in_b
? in_root
hg status . in a:
? 1/in_a_1
? in_a
hg status .. in a:
? 1/in_a_1
? in_a
? ../b/1/in_b_1
? ../b/2/in_b_2
? ../b/in_b
? ../in_root
hg status in b:
? a/1/in_a_1
? a/in_a
? b/1/in_b_1
? b/2/in_b_2
? b/in_b
? in_root
hg status . in b:
? 1/in_b_1
? 2/in_b_2
? in_b
hg status .. in b:
? ../a/1/in_a_1
? ../a/in_a
? 1/in_b_1
? 2/in_b_2
? in_b
? ../in_root
hg status in a/1:
? a/1/in_a_1
? a/in_a
? b/1/in_b_1
? b/2/in_b_2
? b/in_b
? in_root
hg status . in a/1:
? in_a_1
hg status .. in a/1:
? in_a_1
? ../in_a
hg status in b/1:
? a/1/in_a_1
? a/in_a
? b/1/in_b_1
? b/2/in_b_2
? b/in_b
? in_root
hg status . in b/1:
? in_b_1
hg status .. in b/1:
? in_b_1
? ../2/in_b_2
? ../in_b
hg status in b/2:
? a/1/in_a_1
? a/in_a
? b/1/in_b_1
? b/2/in_b_2
? b/in_b
? in_root
hg status . in b/2:
? in_b_2
hg status .. in b/2:
? ../1/in_b_1
? in_b_2
? ../in_b
adding .hgignore
adding deleted
adding modified
adding removed
hg status:
A added
R removed
! deleted
? unknown
hg status modified added removed deleted unknown never-existed ignored:
never-existed: No such file or directory
A added
R removed
! deleted
? unknown
hg status -C:
A added
A copied
  modified
R removed
! deleted
? unknown
hg status -A:
A added
A copied
  modified
R removed
! deleted
? unknown
I ignored
C .hgignore
C modified
hg status ignoreddir/file:
hg status -i ignoreddir/file:
I ignoreddir/file
adding .hgignore
adding deleted
adding modified
adding removed
% test unknown color
ignoring unknown color/effect 'periwinkle' (configured in color.status.modified)
M modified
A added
A copied
R removed
! deleted
? unknown
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
merging a
warning: conflicts during merge.
merging a failed!
merging b
warning: conflicts during merge.
merging b failed!
0 files updated, 0 files merged, 0 files removed, 2 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
hg resolve with one unresolved, one resolved:
U a
R b