view tests/test-status-color.out @ 11775:a8614c5a5e9a

subrepos: support remapping of .hgsub source paths

Given a .hgsub file containing

  lib/libfoo = http://server/libfoo

the 'lib/libfoo' subrepo will be cloned from 'http://server/libfoo'.

This changeset introduces a remapping mechanism whereby the source
paths (the right-hand sides) in the .hgsub file can be remapped. This
subpaths section

  [subpaths]
  http://server = /local

will result in the 'lib/libfoo' subrepo being cloned from
'/local/libfoo' instead of from 'http://server/libfoo'.

The patterns (left-hand sides) are really regular expressions and the
replacement strings (right-hand sides) can refer to matched groups
using normal backreferences. This can be used for more complicated
replacements such as

  [subpaths]
  http://server/(.*)-hg/ = http://hg.server/\1/

which replaces 'http://server/foo-hg/' with 'http://hg.server/foo/'.

All patterns are applied in the order by which they are listed in the
config files.

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