tests/test-subrepo-deep-nested-change.t
author Arseniy Alekseyev <aalekseyev@janestreet.com>
Fri, 26 Apr 2024 19:10:35 +0100
changeset 51626 865efc020c33
parent 51181 dcaa2df1f688
permissions -rw-r--r--
dirstate: remove the python-side whitelist of allowed matchers This whitelist is too permissive because it allows matchers that contain disallowed ones deep inside, for example through `intersectionmatcher`. It is also too restrictive because it doesn't pass through some of the matchers we support, such as `patternmatcher`. It's also unnecessary because unsupported matchers raise `FallbackError` and we fall back anyway. Making this change makes more of the tests use rust code path, and therefore subtly change behavior. For example, rust status in largefiles repos seems to have strange behavior.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
28033
0707bbec682d tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26421
diff changeset
     1
  $ cat >> $HGRCPATH <<EOF
28052
b59ef0c21405 tests: use portable diff script via extdiff extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28036
diff changeset
     2
  > [extdiff]
b59ef0c21405 tests: use portable diff script via extdiff extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28036
diff changeset
     3
  > # for portability:
b59ef0c21405 tests: use portable diff script via extdiff extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28036
diff changeset
     4
  > pdiff = sh "$RUNTESTDIR/pdiff"
28606
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
     5
  > [progress]
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
     6
  > disable=False
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
     7
  > assume-tty = 1
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
     8
  > delay = 0
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
     9
  > # set changedelay really large so we don't see nested topics
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
    10
  > changedelay = 30000
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
    11
  > format = topic bar number
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
    12
  > refresh = 0
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
    13
  > width = 60
28033
0707bbec682d tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26421
diff changeset
    14
  > EOF
0707bbec682d tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26421
diff changeset
    15
11913
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
    16
Preparing the subrepository 'sub2'
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
    17
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
    18
  $ hg init sub2
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
    19
  $ echo sub2 > sub2/sub2
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
    20
  $ hg add -R sub2
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
    21
  adding sub2/sub2
11913
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
    22
  $ hg commit -R sub2 -m "sub2 import"
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
    23
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
    24
Preparing the 'sub1' repo which depends on the subrepo 'sub2'
11110
22f5ad0b5857 subrepo: dirtiness checks should iterate over subrepos
Edouard Gomez <ed.gomez@free.fr>
parents:
diff changeset
    25
11913
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
    26
  $ hg init sub1
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
    27
  $ echo sub1 > sub1/sub1
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
    28
  $ echo "sub2 = ../sub2" > sub1/.hgsub
12107
497c78760b37 tests: use regular expression instead of sed in test-subrepo-deep-nested-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11913
diff changeset
    29
  $ hg clone sub2 sub1/sub2
28606
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
    30
  \r (no-eol) (esc)
51181
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    31
  linking [=====>                                       ] 1/7\r (no-eol) (esc) (no-rust !)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    32
  linking [===========>                                 ] 2/7\r (no-eol) (esc) (no-rust !)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    33
  linking [==================>                          ] 3/7\r (no-eol) (esc) (no-rust !)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    34
  linking [========================>                    ] 4/7\r (no-eol) (esc) (no-rust !)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    35
  linking [===============================>             ] 5/7\r (no-eol) (esc) (no-rust !)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    36
  linking [=====================================>       ] 6/7\r (no-eol) (esc) (no-rust !)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    37
  linking [============================================>] 7/7\r (no-eol) (esc) (no-rust !)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    38
  linking [====>                                        ] 1/9\r (no-eol) (esc) (rust !)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    39
  linking [=========>                                   ] 2/9\r (no-eol) (esc) (rust !)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    40
  linking [==============>                              ] 3/9\r (no-eol) (esc) (rust !)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    41
  linking [===================>                         ] 4/9\r (no-eol) (esc) (rust !)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    42
  linking [========================>                    ] 5/9\r (no-eol) (esc) (rust !)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    43
  linking [=============================>               ] 6/9\r (no-eol) (esc) (rust !)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    44
  linking [==================================>          ] 7/9\r (no-eol) (esc) (rust !)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    45
  linking [=======================================>     ] 8/9\r (no-eol) (esc) (rust !)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    46
  linking [============================================>] 9/9\r (no-eol) (esc) (rust !)
28606
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
    47
                                                              \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
    48
  \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
    49
  updating [===========================================>] 1/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
    50
                                                              \r (no-eol) (esc)
11913
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
    51
  updating to branch default
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
    52
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
    53
  $ hg add -R sub1
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
    54
  adding sub1/.hgsub
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
    55
  adding sub1/sub1
11913
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
    56
  $ hg commit -R sub1 -m "sub1 import"
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
    57
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
    58
Preparing the 'main' repo which depends on the subrepo 'sub1'
11110
22f5ad0b5857 subrepo: dirtiness checks should iterate over subrepos
Edouard Gomez <ed.gomez@free.fr>
parents:
diff changeset
    59
11913
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
    60
  $ hg init main
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
    61
  $ echo main > main/main
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
    62
  $ echo "sub1 = ../sub1" > main/.hgsub
51181
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    63
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    64
#if rust
12107
497c78760b37 tests: use regular expression instead of sed in test-subrepo-deep-nested-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11913
diff changeset
    65
  $ hg clone sub1 main/sub1
28606
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
    66
  \r (no-eol) (esc)
51181
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    67
  linking [==>                                        ]  1/11\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    68
  linking [======>                                    ]  2/11\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    69
  linking [==========>                                ]  3/11\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    70
  linking [==============>                            ]  4/11\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    71
  linking [==================>                        ]  5/11\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    72
  linking [======================>                    ]  6/11\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    73
  linking [==========================>                ]  7/11\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    74
  linking [==============================>            ]  8/11\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    75
  linking [==================================>        ]  9/11\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    76
  linking [======================================>    ] 10/11\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    77
  linking [==========================================>] 11/11\r (no-eol) (esc)
28606
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
    78
                                                              \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
    79
  \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
    80
  updating [===========================================>] 3/3\r (no-eol) (esc)
34351
0e4bed5c5c38 ui: check for progress singleton when clearing progress bar (issue5684)
Mark Thomas <mbthomas@fb.com>
parents: 33545
diff changeset
    81
                                                              \r (no-eol) (esc)
0e4bed5c5c38 ui: check for progress singleton when clearing progress bar (issue5684)
Mark Thomas <mbthomas@fb.com>
parents: 33545
diff changeset
    82
  \r (no-eol) (esc)
51181
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    83
  linking [====>                                        ] 1/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    84
  linking [=========>                                   ] 2/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    85
  linking [==============>                              ] 3/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    86
  linking [===================>                         ] 4/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    87
  linking [========================>                    ] 5/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    88
  linking [=============================>               ] 6/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    89
  linking [==================================>          ] 7/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    90
  linking [=======================================>     ] 8/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    91
  linking [============================================>] 9/9\r (no-eol) (esc)
28606
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
    92
  updating [===========================================>] 1/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
    93
                                                              \r (no-eol) (esc)
11913
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
    94
  updating to branch default
14281
ccb7240acf32 subrepo: create subrepos using clone instead of pull
Martin Geisler <mg@aragost.com>
parents: 12640
diff changeset
    95
  cloning subrepo sub2 from $TESTTMP/sub2
11913
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
    96
  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
51181
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    97
#else
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    98
  $ hg clone sub1 main/sub1
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
    99
  \r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   100
  linking [====>                                        ] 1/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   101
  linking [=========>                                   ] 2/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   102
  linking [==============>                              ] 3/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   103
  linking [===================>                         ] 4/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   104
  linking [========================>                    ] 5/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   105
  linking [=============================>               ] 6/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   106
  linking [==================================>          ] 7/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   107
  linking [=======================================>     ] 8/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   108
  linking [============================================>] 9/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   109
                                                              \r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   110
  \r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   111
  updating [===========================================>] 3/3\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   112
                                                              \r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   113
  \r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   114
  linking [=====>                                       ] 1/7\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   115
  linking [===========>                                 ] 2/7\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   116
  linking [==================>                          ] 3/7\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   117
  linking [========================>                    ] 4/7\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   118
  linking [===============================>             ] 5/7\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   119
  linking [=====================================>       ] 6/7\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   120
  linking [============================================>] 7/7\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   121
  updating [===========================================>] 1/1\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   122
                                                              \r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   123
  updating to branch default
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   124
  cloning subrepo sub2 from $TESTTMP/sub2
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   125
  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   126
#endif
11913
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   127
  $ hg add -R main
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   128
  adding main/.hgsub
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   129
  adding main/main
11913
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   130
  $ hg commit -R main -m "main import"
11110
22f5ad0b5857 subrepo: dirtiness checks should iterate over subrepos
Edouard Gomez <ed.gomez@free.fr>
parents:
diff changeset
   131
32005
2406dbba49bd serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents: 31064
diff changeset
   132
#if serve
2406dbba49bd serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents: 31064
diff changeset
   133
2406dbba49bd serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents: 31064
diff changeset
   134
Unfortunately, subrepos not at their nominal location cannot be cloned.  But
2406dbba49bd serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents: 31064
diff changeset
   135
they are still served from their location within the local repository.  The only
2406dbba49bd serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents: 31064
diff changeset
   136
reason why 'main' can be cloned via the filesystem is because 'sub1' and 'sub2'
2406dbba49bd serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents: 31064
diff changeset
   137
are also available as siblings of 'main'.
2406dbba49bd serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents: 31064
diff changeset
   138
2406dbba49bd serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents: 31064
diff changeset
   139
  $ hg serve -R main --debug -S -p $HGPORT -d --pid-file=hg1.pid -E error.log -A access.log
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   140
  adding  = $TESTTMP/main
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   141
  adding sub1 = $TESTTMP/main/sub1
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   142
  adding sub1/sub2 = $TESTTMP/main/sub1/sub2
32005
2406dbba49bd serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents: 31064
diff changeset
   143
  listening at http://*:$HGPORT/ (bound to *:$HGPORT) (glob) (?)
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   144
  adding  = $TESTTMP/main (?)
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   145
  adding sub1 = $TESTTMP/main/sub1 (?)
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   146
  adding sub1/sub2 = $TESTTMP/main/sub1/sub2 (?)
32005
2406dbba49bd serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents: 31064
diff changeset
   147
  $ cat hg1.pid >> $DAEMON_PIDS
2406dbba49bd serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents: 31064
diff changeset
   148
2406dbba49bd serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents: 31064
diff changeset
   149
  $ hg clone http://localhost:$HGPORT httpclone --config progress.disable=True
2406dbba49bd serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents: 31064
diff changeset
   150
  requesting all changes
2406dbba49bd serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents: 31064
diff changeset
   151
  adding changesets
2406dbba49bd serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents: 31064
diff changeset
   152
  adding manifests
2406dbba49bd serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents: 31064
diff changeset
   153
  adding file changes
2406dbba49bd serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents: 31064
diff changeset
   154
  added 1 changesets with 3 changes to 3 files
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 34351
diff changeset
   155
  new changesets 7f491f53a367
32005
2406dbba49bd serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents: 31064
diff changeset
   156
  updating to branch default
40655
69d4c8c5c25e subrepo: print the status line before creating the peer for better diagnostics
Matt Harbison <matt_harbison@yahoo.com>
parents: 39854
diff changeset
   157
  cloning subrepo sub1 from http://localhost:$HGPORT/../sub1
32005
2406dbba49bd serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents: 31064
diff changeset
   158
  abort: HTTP Error 404: Not Found
45839
ebee234d952a errors: set detailed exit code to 100 for some remote errors
Martin von Zweigbergk <martinvonz@google.com>
parents: 44530
diff changeset
   159
  [100]
32005
2406dbba49bd serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents: 31064
diff changeset
   160
2406dbba49bd serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents: 31064
diff changeset
   161
  $ cat access.log
37556
b77aa48ba690 httppeer: only advertise partial-pull if capabilities are known
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37498
diff changeset
   162
  * "GET /?cmd=capabilities HTTP/1.1" 200 - (glob)
32005
2406dbba49bd serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents: 31064
diff changeset
   163
  * "GET /?cmd=batch HTTP/1.1" 200 - * (glob)
2406dbba49bd serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents: 31064
diff changeset
   164
  * "GET /?cmd=getbundle HTTP/1.1" 200 - * (glob)
37556
b77aa48ba690 httppeer: only advertise partial-pull if capabilities are known
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37498
diff changeset
   165
  * "GET /../sub1?cmd=capabilities HTTP/1.1" 404 - (glob)
36943
c8768bc46d24 tests: add a cat of `error.log` in subrepo test
Augie Fackler <augie@google.com>
parents: 35393
diff changeset
   166
  $ cat error.log
32005
2406dbba49bd serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents: 31064
diff changeset
   167
2406dbba49bd serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents: 31064
diff changeset
   168
  $ killdaemons.py
2406dbba49bd serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents: 31064
diff changeset
   169
  $ rm hg1.pid error.log access.log
2406dbba49bd serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents: 31064
diff changeset
   170
#endif
2406dbba49bd serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents: 31064
diff changeset
   171
11913
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   172
Cleaning both repositories, just as a clone -U
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   173
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   174
  $ hg up -C -R sub2 null
28606
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   175
  \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   176
  updating [===========================================>] 1/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   177
                                                              \r (no-eol) (esc)
11913
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   178
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   179
  $ hg up -C -R sub1 null
28606
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   180
  \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   181
  updating [===========================================>] 1/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   182
                                                              \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   183
  \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   184
  updating [===========================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   185
                                                              \r (no-eol) (esc)
11913
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   186
  0 files updated, 0 files merged, 3 files removed, 0 files unresolved
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   187
  $ hg up -C -R main null
28606
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   188
  \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   189
  updating [===========================================>] 1/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   190
                                                              \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   191
  \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   192
  updating [===========================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   193
                                                              \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   194
  \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   195
  updating [===========================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   196
                                                              \r (no-eol) (esc)
11913
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   197
  0 files updated, 0 files merged, 3 files removed, 0 files unresolved
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   198
  $ rm -rf main/sub1
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   199
  $ rm -rf sub1/sub2
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   200
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   201
Clone main
11110
22f5ad0b5857 subrepo: dirtiness checks should iterate over subrepos
Edouard Gomez <ed.gomez@free.fr>
parents:
diff changeset
   202
51181
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   203
#if rust
24029
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it
Matt Harbison <matt_harbison@yahoo.com>
parents: 23923
diff changeset
   204
  $ hg --config extensions.largefiles= clone main cloned
28606
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   205
  \r (no-eol) (esc)
51181
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   206
  linking [====>                                        ] 1/9\r (no-eol) (esc) (no-rust !)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   207
  linking [=========>                                   ] 2/9\r (no-eol) (esc) (no-rust !)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   208
  linking [==============>                              ] 3/9\r (no-eol) (esc) (no-rust !)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   209
  linking [===================>                         ] 4/9\r (no-eol) (esc) (no-rust !)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   210
  linking [========================>                    ] 5/9\r (no-eol) (esc) (no-rust !)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   211
  linking [=============================>               ] 6/9\r (no-eol) (esc) (no-rust !)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   212
  linking [==================================>          ] 7/9\r (no-eol) (esc) (no-rust !)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   213
  linking [=======================================>     ] 8/9\r (no-eol) (esc) (no-rust !)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   214
  linking [============================================>] 9/9\r (no-eol) (esc) (no-rust !)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   215
  linking [==>                                        ]  1/11\r (no-eol) (esc) (rust !)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   216
  linking [======>                                    ]  2/11\r (no-eol) (esc) (rust !)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   217
  linking [==========>                                ]  3/11\r (no-eol) (esc) (rust !)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   218
  linking [==============>                            ]  4/11\r (no-eol) (esc) (rust !)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   219
  linking [==================>                        ]  5/11\r (no-eol) (esc) (rust !)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   220
  linking [======================>                    ]  6/11\r (no-eol) (esc) (rust !)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   221
  linking [==========================>                ]  7/11\r (no-eol) (esc) (rust !)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   222
  linking [==============================>            ]  8/11\r (no-eol) (esc) (rust !)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   223
  linking [==================================>        ]  9/11\r (no-eol) (esc) (rust !)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   224
  linking [======================================>    ] 10/11\r (no-eol) (esc) (rust !)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   225
  linking [==========================================>] 11/11\r (no-eol) (esc) (rust !)
28606
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   226
                                                              \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   227
  \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   228
  updating [===========================================>] 3/3\r (no-eol) (esc)
34351
0e4bed5c5c38 ui: check for progress singleton when clearing progress bar (issue5684)
Mark Thomas <mbthomas@fb.com>
parents: 33545
diff changeset
   229
                                                              \r (no-eol) (esc)
0e4bed5c5c38 ui: check for progress singleton when clearing progress bar (issue5684)
Mark Thomas <mbthomas@fb.com>
parents: 33545
diff changeset
   230
  \r (no-eol) (esc)
51181
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   231
  linking [==>                                        ]  1/11\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   232
  linking [======>                                    ]  2/11\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   233
  linking [==========>                                ]  3/11\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   234
  linking [==============>                            ]  4/11\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   235
  linking [==================>                        ]  5/11\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   236
  linking [======================>                    ]  6/11\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   237
  linking [==========================>                ]  7/11\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   238
  linking [==============================>            ]  8/11\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   239
  linking [==================================>        ]  9/11\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   240
  linking [======================================>    ] 10/11\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   241
  linking [==========================================>] 11/11\r (no-eol) (esc)
28606
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   242
  updating [===========================================>] 3/3\r (no-eol) (esc)
34351
0e4bed5c5c38 ui: check for progress singleton when clearing progress bar (issue5684)
Mark Thomas <mbthomas@fb.com>
parents: 33545
diff changeset
   243
                                                              \r (no-eol) (esc)
0e4bed5c5c38 ui: check for progress singleton when clearing progress bar (issue5684)
Mark Thomas <mbthomas@fb.com>
parents: 33545
diff changeset
   244
  \r (no-eol) (esc)
51181
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   245
  linking [====>                                        ] 1/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   246
  linking [=========>                                   ] 2/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   247
  linking [==============>                              ] 3/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   248
  linking [===================>                         ] 4/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   249
  linking [========================>                    ] 5/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   250
  linking [=============================>               ] 6/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   251
  linking [==================================>          ] 7/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   252
  linking [=======================================>     ] 8/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   253
  linking [============================================>] 9/9\r (no-eol) (esc)
28606
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   254
  updating [===========================================>] 1/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   255
                                                              \r (no-eol) (esc)
11913
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   256
  updating to branch default
14281
ccb7240acf32 subrepo: create subrepos using clone instead of pull
Martin Geisler <mg@aragost.com>
parents: 12640
diff changeset
   257
  cloning subrepo sub1 from $TESTTMP/sub1
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   258
  cloning subrepo sub1/sub2 from $TESTTMP/sub2
11913
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   259
  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
51181
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   260
#else
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   261
  $ hg --config extensions.largefiles= clone main cloned
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   262
  \r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   263
  linking [====>                                        ] 1/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   264
  linking [=========>                                   ] 2/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   265
  linking [==============>                              ] 3/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   266
  linking [===================>                         ] 4/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   267
  linking [========================>                    ] 5/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   268
  linking [=============================>               ] 6/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   269
  linking [==================================>          ] 7/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   270
  linking [=======================================>     ] 8/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   271
  linking [============================================>] 9/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   272
                                                              \r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   273
  \r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   274
  updating [===========================================>] 3/3\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   275
                                                              \r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   276
  \r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   277
  linking [====>                                        ] 1/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   278
  linking [=========>                                   ] 2/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   279
  linking [==============>                              ] 3/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   280
  linking [===================>                         ] 4/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   281
  linking [========================>                    ] 5/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   282
  linking [=============================>               ] 6/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   283
  linking [==================================>          ] 7/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   284
  linking [=======================================>     ] 8/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   285
  linking [============================================>] 9/9\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   286
  updating [===========================================>] 3/3\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   287
                                                              \r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   288
  \r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   289
  linking [=====>                                       ] 1/7\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   290
  linking [===========>                                 ] 2/7\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   291
  linking [==================>                          ] 3/7\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   292
  linking [========================>                    ] 4/7\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   293
  linking [===============================>             ] 5/7\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   294
  linking [=====================================>       ] 6/7\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   295
  linking [============================================>] 7/7\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   296
  updating [===========================================>] 1/1\r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   297
                                                              \r (no-eol) (esc)
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   298
  updating to branch default
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   299
  cloning subrepo sub1 from $TESTTMP/sub1
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   300
  cloning subrepo sub1/sub2 from $TESTTMP/sub2
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   301
  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
dcaa2df1f688 changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50725
diff changeset
   302
#endif
11110
22f5ad0b5857 subrepo: dirtiness checks should iterate over subrepos
Edouard Gomez <ed.gomez@free.fr>
parents:
diff changeset
   303
24029
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it
Matt Harbison <matt_harbison@yahoo.com>
parents: 23923
diff changeset
   304
Largefiles is NOT enabled in the clone if the source repo doesn't require it
48657
68b7faeb6ef3 tests: use debugrequires instead of grepping the file directly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48510
diff changeset
   305
  $ hg debugrequires -R cloned | grep largefiles
39854
823a580448d7 largefiles: automatically load largefiles extension when required (BC)
Gregory Szorc <gregory.szorc@gmail.com>
parents: 38348
diff changeset
   306
  [1]
24029
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it
Matt Harbison <matt_harbison@yahoo.com>
parents: 23923
diff changeset
   307
11913
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   308
Checking cloned repo ids
11110
22f5ad0b5857 subrepo: dirtiness checks should iterate over subrepos
Edouard Gomez <ed.gomez@free.fr>
parents:
diff changeset
   309
11913
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   310
  $ printf "cloned " ; hg id -R cloned
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   311
  cloned 7f491f53a367 tip
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   312
  $ printf "cloned/sub1 " ; hg id -R cloned/sub1
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   313
  cloned/sub1 fc3b4ce2696f tip
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   314
  $ printf "cloned/sub1/sub2 " ; hg id -R cloned/sub1/sub2
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   315
  cloned/sub1/sub2 c57a0840e3ba tip
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   316
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   317
debugsub output for main and sub1
11110
22f5ad0b5857 subrepo: dirtiness checks should iterate over subrepos
Edouard Gomez <ed.gomez@free.fr>
parents:
diff changeset
   318
11913
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   319
  $ hg debugsub -R cloned
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   320
  path sub1
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   321
   source   ../sub1
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   322
   revision fc3b4ce2696f7741438c79207583768f2ce6b0dd
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   323
  $ hg debugsub -R cloned/sub1
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   324
  path sub2
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   325
   source   ../sub2
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   326
   revision c57a0840e3badd667ef3c3ef65471609acb2ba3c
11110
22f5ad0b5857 subrepo: dirtiness checks should iterate over subrepos
Edouard Gomez <ed.gomez@free.fr>
parents:
diff changeset
   327
11913
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   328
Modifying deeply nested 'sub2'
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   329
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   330
  $ echo modified > cloned/sub1/sub2/sub2
15321
e174353e8cda subrepos: abort commit by default if a subrepo is dirty (BC)
Martin Geisler <mg@lazybytes.net>
parents: 14281
diff changeset
   331
  $ hg commit --subrepos -m "deep nested modif should trigger a commit" -R cloned
11913
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   332
  committing subrepository sub1
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   333
  committing subrepository sub1/sub2
11913
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   334
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   335
Checking modified node ids
11110
22f5ad0b5857 subrepo: dirtiness checks should iterate over subrepos
Edouard Gomez <ed.gomez@free.fr>
parents:
diff changeset
   336
11913
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   337
  $ printf "cloned " ; hg id -R cloned
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   338
  cloned ffe6649062fe tip
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   339
  $ printf "cloned/sub1 " ; hg id -R cloned/sub1
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   340
  cloned/sub1 2ecb03bf44a9 tip
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   341
  $ printf "cloned/sub1/sub2 " ; hg id -R cloned/sub1/sub2
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   342
  cloned/sub1/sub2 53dd3430bcaf tip
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   343
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   344
debugsub output for main and sub1
11110
22f5ad0b5857 subrepo: dirtiness checks should iterate over subrepos
Edouard Gomez <ed.gomez@free.fr>
parents:
diff changeset
   345
11913
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   346
  $ hg debugsub -R cloned
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   347
  path sub1
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   348
   source   ../sub1
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   349
   revision 2ecb03bf44a94e749e8669481dd9069526ce7cb9
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   350
  $ hg debugsub -R cloned/sub1
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   351
  path sub2
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   352
   source   ../sub2
628cdd158ec0 tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents: 11110
diff changeset
   353
   revision 53dd3430bcaf5ab4a7c48262bcad6d441f510487
17105
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16073
diff changeset
   354
17108
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   355
Check that deep archiving works
17346
2944a6d35158 check-code: fix check for trailing whitespace on empty lines
Mads Kiilerich <mads@kiilerich.com>
parents: 17113
diff changeset
   356
17108
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   357
  $ cd cloned
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   358
  $ echo 'test' > sub1/sub2/test.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   359
  $ hg --config extensions.largefiles=! add sub1/sub2/test.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   360
  $ mkdir sub1/sub2/folder
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   361
  $ echo 'subfolder' > sub1/sub2/folder/test.txt
23537
f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23327
diff changeset
   362
  $ hg ci -ASm "add test.txt"
23686
164915e8ef7b narrowmatcher: propagate the rel() method
Matt Harbison <matt_harbison@yahoo.com>
parents: 23540
diff changeset
   363
  adding sub1/sub2/folder/test.txt
17108
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   364
  committing subrepository sub1
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   365
  committing subrepository sub1/sub2
23325
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag
Matt Harbison <matt_harbison@yahoo.com>
parents: 17346
diff changeset
   366
33363
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents: 32005
diff changeset
   367
  $ rm -r main
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents: 32005
diff changeset
   368
  $ hg archive -S -qr 'wdir()' ../wdir
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents: 32005
diff changeset
   369
  $ cat ../wdir/.hg_archival.txt
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents: 32005
diff changeset
   370
  repo: 7f491f53a367861f47ee64a80eb997d1f341b77a
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents: 32005
diff changeset
   371
  node: 9bb10eebee29dc0f1201dcf5977b811a540255fd+
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents: 32005
diff changeset
   372
  branch: default
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents: 32005
diff changeset
   373
  latesttag: null
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents: 32005
diff changeset
   374
  latesttagdistance: 4
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents: 32005
diff changeset
   375
  changessincelatesttag: 4
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents: 32005
diff changeset
   376
  $ hg update -Cq .
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents: 32005
diff changeset
   377
33364
bf2daeddd42b subrepo: consider the parent repo dirty when a file is missing
Matt Harbison <matt_harbison@yahoo.com>
parents: 33363
diff changeset
   378
A deleted subrepo file is flagged as dirty, like the top level repo
33363
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents: 32005
diff changeset
   379
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents: 32005
diff changeset
   380
  $ rm -r ../wdir sub1/sub2/folder/test.txt
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents: 32005
diff changeset
   381
  $ hg archive -S -qr 'wdir()' ../wdir
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents: 32005
diff changeset
   382
  $ cat ../wdir/.hg_archival.txt
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents: 32005
diff changeset
   383
  repo: 7f491f53a367861f47ee64a80eb997d1f341b77a
33364
bf2daeddd42b subrepo: consider the parent repo dirty when a file is missing
Matt Harbison <matt_harbison@yahoo.com>
parents: 33363
diff changeset
   384
  node: 9bb10eebee29dc0f1201dcf5977b811a540255fd+
33363
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents: 32005
diff changeset
   385
  branch: default
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents: 32005
diff changeset
   386
  latesttag: null
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents: 32005
diff changeset
   387
  latesttagdistance: 4
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents: 32005
diff changeset
   388
  changessincelatesttag: 4
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents: 32005
diff changeset
   389
  $ hg update -Cq .
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents: 32005
diff changeset
   390
  $ rm -r ../wdir
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents: 32005
diff changeset
   391
33545
8074e2d006c0 archive: add an experimental config to control the metadata file template
Matt Harbison <matt_harbison@yahoo.com>
parents: 33364
diff changeset
   392
  $ hg archive -S -qr 'wdir()' ../wdir \
8074e2d006c0 archive: add an experimental config to control the metadata file template
Matt Harbison <matt_harbison@yahoo.com>
parents: 33364
diff changeset
   393
  >            --config 'experimental.archivemetatemplate=archived {node|short}\n'
8074e2d006c0 archive: add an experimental config to control the metadata file template
Matt Harbison <matt_harbison@yahoo.com>
parents: 33364
diff changeset
   394
  $ cat ../wdir/.hg_archival.txt
8074e2d006c0 archive: add an experimental config to control the metadata file template
Matt Harbison <matt_harbison@yahoo.com>
parents: 33364
diff changeset
   395
  archived ffffffffffff
8074e2d006c0 archive: add an experimental config to control the metadata file template
Matt Harbison <matt_harbison@yahoo.com>
parents: 33364
diff changeset
   396
  $ rm -r ../wdir
8074e2d006c0 archive: add an experimental config to control the metadata file template
Matt Harbison <matt_harbison@yahoo.com>
parents: 33364
diff changeset
   397
23325
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag
Matt Harbison <matt_harbison@yahoo.com>
parents: 17346
diff changeset
   398
.. but first take a detour through some deep removal testing
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag
Matt Harbison <matt_harbison@yahoo.com>
parents: 17346
diff changeset
   399
23327
bd296bb4b5c8 remove: avoid a bogus warning about no tracked files when removing '.'
Matt Harbison <matt_harbison@yahoo.com>
parents: 23326
diff changeset
   400
  $ hg remove -S -I 're:.*.txt' .
28608
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   401
  \r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   402
  searching [==========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   403
  searching [==========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   404
                                                              \r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   405
  \r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   406
  deleting [=====================>                      ] 1/2\r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   407
                                                              \r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   408
  \r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   409
  deleting [===========================================>] 2/2\r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   410
                                                              \r (no-eol) (esc)
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   411
  removing sub1/sub2/folder/test.txt
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   412
  removing sub1/sub2/test.txt
23325
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag
Matt Harbison <matt_harbison@yahoo.com>
parents: 17346
diff changeset
   413
  $ hg status -S
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag
Matt Harbison <matt_harbison@yahoo.com>
parents: 17346
diff changeset
   414
  R sub1/sub2/folder/test.txt
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag
Matt Harbison <matt_harbison@yahoo.com>
parents: 17346
diff changeset
   415
  R sub1/sub2/test.txt
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag
Matt Harbison <matt_harbison@yahoo.com>
parents: 17346
diff changeset
   416
  $ hg update -Cq
23326
f6b8d23492e5 remove: support remove with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 23325
diff changeset
   417
  $ hg remove -I 're:.*.txt' sub1
28608
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   418
  \r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   419
  searching [==========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   420
                                                              \r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   421
  \r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   422
  deleting [===========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   423
                                                              \r (no-eol) (esc)
23326
f6b8d23492e5 remove: support remove with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 23325
diff changeset
   424
  $ hg status -S
f6b8d23492e5 remove: support remove with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 23325
diff changeset
   425
  $ hg remove sub1/sub2/folder/test.txt
28608
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   426
  \r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   427
  searching [==========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   428
  searching [==========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   429
                                                              \r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   430
  \r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   431
  deleting [===========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   432
                                                              \r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   433
  \r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   434
  deleting [===========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   435
                                                              \r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   436
  \r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   437
  deleting [===========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   438
                                                              \r (no-eol) (esc)
23326
f6b8d23492e5 remove: support remove with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 23325
diff changeset
   439
  $ hg remove sub1/.hgsubstate
28608
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   440
  \r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   441
  searching [==========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   442
                                                              \r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   443
  \r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   444
  deleting [===========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   445
                                                              \r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   446
  \r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   447
  deleting [===========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   448
                                                              \r (no-eol) (esc)
24645
b39afa36006a subrepo: precisely identify the missing subrepo spec file
Matt Harbison <matt_harbison@yahoo.com>
parents: 24446
diff changeset
   449
  $ mv sub1/.hgsub sub1/x.hgsub
23326
f6b8d23492e5 remove: support remove with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 23325
diff changeset
   450
  $ hg status -S
25865
a48a7c2d1fea test-subrepo: fix globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 25863
diff changeset
   451
  warning: subrepo spec file 'sub1/.hgsub' not found
23326
f6b8d23492e5 remove: support remove with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 23325
diff changeset
   452
  R sub1/.hgsubstate
f6b8d23492e5 remove: support remove with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 23325
diff changeset
   453
  R sub1/sub2/folder/test.txt
24645
b39afa36006a subrepo: precisely identify the missing subrepo spec file
Matt Harbison <matt_harbison@yahoo.com>
parents: 24446
diff changeset
   454
  ! sub1/.hgsub
b39afa36006a subrepo: precisely identify the missing subrepo spec file
Matt Harbison <matt_harbison@yahoo.com>
parents: 24446
diff changeset
   455
  ? sub1/x.hgsub
44530
4d1634e59f13 rust-status: use bare hg status fastpath from Python
Raphaël Gomès <rgomes@octobus.net>
parents: 40655
diff changeset
   456
  $ hg status -R sub1
4d1634e59f13 rust-status: use bare hg status fastpath from Python
Raphaël Gomès <rgomes@octobus.net>
parents: 40655
diff changeset
   457
  warning: subrepo spec file 'sub1/.hgsub' not found
4d1634e59f13 rust-status: use bare hg status fastpath from Python
Raphaël Gomès <rgomes@octobus.net>
parents: 40655
diff changeset
   458
  R .hgsubstate
4d1634e59f13 rust-status: use bare hg status fastpath from Python
Raphaël Gomès <rgomes@octobus.net>
parents: 40655
diff changeset
   459
  ! .hgsub
4d1634e59f13 rust-status: use bare hg status fastpath from Python
Raphaël Gomès <rgomes@octobus.net>
parents: 40655
diff changeset
   460
  ? x.hgsub
24645
b39afa36006a subrepo: precisely identify the missing subrepo spec file
Matt Harbison <matt_harbison@yahoo.com>
parents: 24446
diff changeset
   461
  $ mv sub1/x.hgsub sub1/.hgsub
23326
f6b8d23492e5 remove: support remove with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 23325
diff changeset
   462
  $ hg update -Cq
23538
ccfb56450f21 addremove: add support for the -S flag
Matt Harbison <matt_harbison@yahoo.com>
parents: 23537
diff changeset
   463
  $ touch sub1/foo
ccfb56450f21 addremove: add support for the -S flag
Matt Harbison <matt_harbison@yahoo.com>
parents: 23537
diff changeset
   464
  $ hg forget sub1/sub2/folder/test.txt
ccfb56450f21 addremove: add support for the -S flag
Matt Harbison <matt_harbison@yahoo.com>
parents: 23537
diff changeset
   465
  $ rm sub1/sub2/test.txt
ccfb56450f21 addremove: add support for the -S flag
Matt Harbison <matt_harbison@yahoo.com>
parents: 23537
diff changeset
   466
ccfb56450f21 addremove: add support for the -S flag
Matt Harbison <matt_harbison@yahoo.com>
parents: 23537
diff changeset
   467
Test relative path printing + subrepos
ccfb56450f21 addremove: add support for the -S flag
Matt Harbison <matt_harbison@yahoo.com>
parents: 23537
diff changeset
   468
  $ mkdir -p foo/bar
ccfb56450f21 addremove: add support for the -S flag
Matt Harbison <matt_harbison@yahoo.com>
parents: 23537
diff changeset
   469
  $ cd foo
ccfb56450f21 addremove: add support for the -S flag
Matt Harbison <matt_harbison@yahoo.com>
parents: 23537
diff changeset
   470
  $ touch bar/abc
ccfb56450f21 addremove: add support for the -S flag
Matt Harbison <matt_harbison@yahoo.com>
parents: 23537
diff changeset
   471
  $ hg addremove -S ..
28606
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   472
  \r (no-eol) (esc)
38348
cd196be26cb7 similar: use progress helper
Martin von Zweigbergk <martinvonz@google.com>
parents: 37556
diff changeset
   473
  searching for exact renames [========================>] 1/1\r (no-eol) (esc)
28606
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   474
                                                              \r (no-eol) (esc)
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   475
  adding ../sub1/sub2/folder/test.txt
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   476
  removing ../sub1/sub2/test.txt
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   477
  adding ../sub1/foo
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   478
  adding bar/abc
23538
ccfb56450f21 addremove: add support for the -S flag
Matt Harbison <matt_harbison@yahoo.com>
parents: 23537
diff changeset
   479
  $ cd ..
ccfb56450f21 addremove: add support for the -S flag
Matt Harbison <matt_harbison@yahoo.com>
parents: 23537
diff changeset
   480
  $ hg status -S
ccfb56450f21 addremove: add support for the -S flag
Matt Harbison <matt_harbison@yahoo.com>
parents: 23537
diff changeset
   481
  A foo/bar/abc
ccfb56450f21 addremove: add support for the -S flag
Matt Harbison <matt_harbison@yahoo.com>
parents: 23537
diff changeset
   482
  A sub1/foo
ccfb56450f21 addremove: add support for the -S flag
Matt Harbison <matt_harbison@yahoo.com>
parents: 23537
diff changeset
   483
  R sub1/sub2/test.txt
25601
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   484
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   485
Archive wdir() with subrepos
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   486
  $ hg rm main
28608
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   487
  \r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   488
  deleting [===========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
   489
                                                              \r (no-eol) (esc)
25601
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   490
  $ hg archive -S -r 'wdir()' ../wdir
28606
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   491
  \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   492
  archiving [                                           ] 0/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   493
  archiving [=============>                             ] 1/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   494
  archiving [===========================>               ] 2/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   495
  archiving [==========================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   496
                                                              \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   497
  \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   498
  archiving (sub1) [                                    ] 0/4\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   499
  archiving (sub1) [========>                           ] 1/4\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   500
  archiving (sub1) [=================>                  ] 2/4\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   501
  archiving (sub1) [==========================>         ] 3/4\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   502
  archiving (sub1) [===================================>] 4/4\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   503
                                                              \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   504
  \r (no-eol) (esc)
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   505
  archiving (sub1/sub2) [                               ] 0/2\r (no-eol) (esc)
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   506
  archiving (sub1/sub2) [==============>                ] 1/2\r (no-eol) (esc)
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   507
  archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (esc)
28606
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   508
                                                              \r (no-eol) (esc)
50725
7e5be4a7cda7 tests: use grep -E instead of obsolescent egrep
Mads Kiilerich <mads@kiilerich.com>
parents: 48657
diff changeset
   509
  $ diff -r . ../wdir | grep -E -v '\.hg$|^Common subdirectories:'
25601
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   510
  Only in ../wdir: .hg_archival.txt
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   511
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   512
  $ find ../wdir -type f | sort
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   513
  ../wdir/.hg_archival.txt
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   514
  ../wdir/.hgsub
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   515
  ../wdir/.hgsubstate
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   516
  ../wdir/foo/bar/abc
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   517
  ../wdir/sub1/.hgsub
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   518
  ../wdir/sub1/.hgsubstate
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   519
  ../wdir/sub1/foo
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   520
  ../wdir/sub1/sub1
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   521
  ../wdir/sub1/sub2/folder/test.txt
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   522
  ../wdir/sub1/sub2/sub2
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   523
25615
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir()
Matt Harbison <matt_harbison@yahoo.com>
parents: 25601
diff changeset
   524
  $ cat ../wdir/.hg_archival.txt
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir()
Matt Harbison <matt_harbison@yahoo.com>
parents: 25601
diff changeset
   525
  repo: 7f491f53a367861f47ee64a80eb997d1f341b77a
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir()
Matt Harbison <matt_harbison@yahoo.com>
parents: 25601
diff changeset
   526
  node: 9bb10eebee29dc0f1201dcf5977b811a540255fd+
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir()
Matt Harbison <matt_harbison@yahoo.com>
parents: 25601
diff changeset
   527
  branch: default
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir()
Matt Harbison <matt_harbison@yahoo.com>
parents: 25601
diff changeset
   528
  latesttag: null
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir()
Matt Harbison <matt_harbison@yahoo.com>
parents: 25601
diff changeset
   529
  latesttagdistance: 4
25690
98064baab877 archive: fix changesincelatesttag with wdir()
Matt Mackall <mpm@selenic.com>
parents: 25615
diff changeset
   530
  changessincelatesttag: 4
25615
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir()
Matt Harbison <matt_harbison@yahoo.com>
parents: 25601
diff changeset
   531
25601
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   532
Attempting to archive 'wdir()' with a missing file is handled gracefully
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   533
  $ rm sub1/sub1
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   534
  $ rm -r ../wdir
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   535
  $ hg archive -v -S -r 'wdir()' ../wdir
28606
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   536
  \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   537
  archiving [                                           ] 0/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   538
  archiving [=============>                             ] 1/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   539
  archiving [===========================>               ] 2/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   540
  archiving [==========================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   541
                                                              \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   542
  \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   543
  archiving (sub1) [                                    ] 0/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   544
  archiving (sub1) [===========>                        ] 1/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   545
  archiving (sub1) [=======================>            ] 2/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   546
  archiving (sub1) [===================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   547
                                                              \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   548
  \r (no-eol) (esc)
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   549
  archiving (sub1/sub2) [                               ] 0/2\r (no-eol) (esc)
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   550
  archiving (sub1/sub2) [==============>                ] 1/2\r (no-eol) (esc)
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   551
  archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (esc)
28606
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   552
                                                              \r (no-eol) (esc)
25601
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   553
  $ find ../wdir -type f | sort
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   554
  ../wdir/.hg_archival.txt
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   555
  ../wdir/.hgsub
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   556
  ../wdir/.hgsubstate
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   557
  ../wdir/foo/bar/abc
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   558
  ../wdir/sub1/.hgsub
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   559
  ../wdir/sub1/.hgsubstate
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   560
  ../wdir/sub1/foo
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   561
  ../wdir/sub1/sub2/folder/test.txt
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   562
  ../wdir/sub1/sub2/sub2
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   563
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   564
Continue relative path printing + subrepos
23538
ccfb56450f21 addremove: add support for the -S flag
Matt Harbison <matt_harbison@yahoo.com>
parents: 23537
diff changeset
   565
  $ hg update -Cq
25615
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir()
Matt Harbison <matt_harbison@yahoo.com>
parents: 25601
diff changeset
   566
  $ rm -r ../wdir
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir()
Matt Harbison <matt_harbison@yahoo.com>
parents: 25601
diff changeset
   567
  $ hg archive -S -r 'wdir()' ../wdir
28606
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   568
  \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   569
  archiving [                                           ] 0/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   570
  archiving [=============>                             ] 1/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   571
  archiving [===========================>               ] 2/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   572
  archiving [==========================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   573
                                                              \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   574
  \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   575
  archiving (sub1) [                                    ] 0/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   576
  archiving (sub1) [===========>                        ] 1/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   577
  archiving (sub1) [=======================>            ] 2/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   578
  archiving (sub1) [===================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   579
                                                              \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   580
  \r (no-eol) (esc)
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   581
  archiving (sub1/sub2) [                               ] 0/3\r (no-eol) (esc)
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   582
  archiving (sub1/sub2) [=========>                     ] 1/3\r (no-eol) (esc)
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   583
  archiving (sub1/sub2) [===================>           ] 2/3\r (no-eol) (esc)
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   584
  archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (esc)
28606
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   585
                                                              \r (no-eol) (esc)
25615
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir()
Matt Harbison <matt_harbison@yahoo.com>
parents: 25601
diff changeset
   586
  $ cat ../wdir/.hg_archival.txt
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir()
Matt Harbison <matt_harbison@yahoo.com>
parents: 25601
diff changeset
   587
  repo: 7f491f53a367861f47ee64a80eb997d1f341b77a
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir()
Matt Harbison <matt_harbison@yahoo.com>
parents: 25601
diff changeset
   588
  node: 9bb10eebee29dc0f1201dcf5977b811a540255fd
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir()
Matt Harbison <matt_harbison@yahoo.com>
parents: 25601
diff changeset
   589
  branch: default
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir()
Matt Harbison <matt_harbison@yahoo.com>
parents: 25601
diff changeset
   590
  latesttag: null
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir()
Matt Harbison <matt_harbison@yahoo.com>
parents: 25601
diff changeset
   591
  latesttagdistance: 4
25690
98064baab877 archive: fix changesincelatesttag with wdir()
Matt Mackall <mpm@selenic.com>
parents: 25615
diff changeset
   592
  changessincelatesttag: 4
25615
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir()
Matt Harbison <matt_harbison@yahoo.com>
parents: 25601
diff changeset
   593
23539
cb42050f2dad addremove: support addremove with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 23538
diff changeset
   594
  $ touch sub1/sub2/folder/bar
cb42050f2dad addremove: support addremove with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 23538
diff changeset
   595
  $ hg addremove sub1/sub2
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   596
  adding sub1/sub2/folder/bar
23539
cb42050f2dad addremove: support addremove with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 23538
diff changeset
   597
  $ hg status -S
cb42050f2dad addremove: support addremove with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 23538
diff changeset
   598
  A sub1/sub2/folder/bar
cb42050f2dad addremove: support addremove with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 23538
diff changeset
   599
  ? foo/bar/abc
cb42050f2dad addremove: support addremove with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 23538
diff changeset
   600
  ? sub1/foo
cb42050f2dad addremove: support addremove with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 23538
diff changeset
   601
  $ hg update -Cq
23540
f274d27f1994 addremove: automatically process a subrepository's subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 23539
diff changeset
   602
  $ hg addremove sub1
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   603
  adding sub1/sub2/folder/bar
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   604
  adding sub1/foo
23540
f274d27f1994 addremove: automatically process a subrepository's subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 23539
diff changeset
   605
  $ hg update -Cq
23537
f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23327
diff changeset
   606
  $ rm sub1/sub2/folder/test.txt
f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23327
diff changeset
   607
  $ rm sub1/sub2/test.txt
f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23327
diff changeset
   608
  $ hg ci -ASm "remove test.txt"
23686
164915e8ef7b narrowmatcher: propagate the rel() method
Matt Harbison <matt_harbison@yahoo.com>
parents: 23540
diff changeset
   609
  adding sub1/sub2/folder/bar
164915e8ef7b narrowmatcher: propagate the rel() method
Matt Harbison <matt_harbison@yahoo.com>
parents: 23540
diff changeset
   610
  removing sub1/sub2/folder/test.txt
164915e8ef7b narrowmatcher: propagate the rel() method
Matt Harbison <matt_harbison@yahoo.com>
parents: 23540
diff changeset
   611
  removing sub1/sub2/test.txt
164915e8ef7b narrowmatcher: propagate the rel() method
Matt Harbison <matt_harbison@yahoo.com>
parents: 23540
diff changeset
   612
  adding sub1/foo
23538
ccfb56450f21 addremove: add support for the -S flag
Matt Harbison <matt_harbison@yahoo.com>
parents: 23537
diff changeset
   613
  adding foo/bar/abc
23537
f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23327
diff changeset
   614
  committing subrepository sub1
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   615
  committing subrepository sub1/sub2
24413
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command
Matt Harbison <matt_harbison@yahoo.com>
parents: 24230
diff changeset
   616
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command
Matt Harbison <matt_harbison@yahoo.com>
parents: 24230
diff changeset
   617
  $ hg forget sub1/sub2/sub2
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command
Matt Harbison <matt_harbison@yahoo.com>
parents: 24230
diff changeset
   618
  $ echo x > sub1/sub2/x.txt
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command
Matt Harbison <matt_harbison@yahoo.com>
parents: 24230
diff changeset
   619
  $ hg add sub1/sub2/x.txt
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command
Matt Harbison <matt_harbison@yahoo.com>
parents: 24230
diff changeset
   620
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command
Matt Harbison <matt_harbison@yahoo.com>
parents: 24230
diff changeset
   621
Files sees uncommitted adds and removes in subrepos
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command
Matt Harbison <matt_harbison@yahoo.com>
parents: 24230
diff changeset
   622
  $ hg files -S
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command
Matt Harbison <matt_harbison@yahoo.com>
parents: 24230
diff changeset
   623
  .hgsub
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command
Matt Harbison <matt_harbison@yahoo.com>
parents: 24230
diff changeset
   624
  .hgsubstate
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   625
  foo/bar/abc
24413
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command
Matt Harbison <matt_harbison@yahoo.com>
parents: 24230
diff changeset
   626
  main
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   627
  sub1/.hgsub
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   628
  sub1/.hgsubstate
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   629
  sub1/foo
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   630
  sub1/sub1
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   631
  sub1/sub2/folder/bar
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   632
  sub1/sub2/x.txt
24413
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command
Matt Harbison <matt_harbison@yahoo.com>
parents: 24230
diff changeset
   633
25122
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument
Matt Harbison <matt_harbison@yahoo.com>
parents: 24953
diff changeset
   634
  $ hg files -S "set:eol('dos') or eol('unix') or size('<= 0')"
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument
Matt Harbison <matt_harbison@yahoo.com>
parents: 24953
diff changeset
   635
  .hgsub
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument
Matt Harbison <matt_harbison@yahoo.com>
parents: 24953
diff changeset
   636
  .hgsubstate
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   637
  foo/bar/abc
25122
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument
Matt Harbison <matt_harbison@yahoo.com>
parents: 24953
diff changeset
   638
  main
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   639
  sub1/.hgsub
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   640
  sub1/.hgsubstate
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   641
  sub1/foo
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   642
  sub1/sub1
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   643
  sub1/sub2/folder/bar
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   644
  sub1/sub2/x.txt
25122
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument
Matt Harbison <matt_harbison@yahoo.com>
parents: 24953
diff changeset
   645
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument
Matt Harbison <matt_harbison@yahoo.com>
parents: 24953
diff changeset
   646
  $ hg files -r '.^' -S "set:eol('dos') or eol('unix')"
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument
Matt Harbison <matt_harbison@yahoo.com>
parents: 24953
diff changeset
   647
  .hgsub
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument
Matt Harbison <matt_harbison@yahoo.com>
parents: 24953
diff changeset
   648
  .hgsubstate
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument
Matt Harbison <matt_harbison@yahoo.com>
parents: 24953
diff changeset
   649
  main
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   650
  sub1/.hgsub
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   651
  sub1/.hgsubstate
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   652
  sub1/sub1
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   653
  sub1/sub2/folder/test.txt
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   654
  sub1/sub2/sub2
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   655
  sub1/sub2/test.txt
25122
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument
Matt Harbison <matt_harbison@yahoo.com>
parents: 24953
diff changeset
   656
25228
63a57a2727b6 files: recurse into subrepos automatically with an explicit path
Matt Harbison <matt_harbison@yahoo.com>
parents: 25195
diff changeset
   657
  $ hg files sub1
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   658
  sub1/.hgsub
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   659
  sub1/.hgsubstate
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   660
  sub1/foo
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   661
  sub1/sub1
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   662
  sub1/sub2/folder/bar
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   663
  sub1/sub2/x.txt
25228
63a57a2727b6 files: recurse into subrepos automatically with an explicit path
Matt Harbison <matt_harbison@yahoo.com>
parents: 25195
diff changeset
   664
63a57a2727b6 files: recurse into subrepos automatically with an explicit path
Matt Harbison <matt_harbison@yahoo.com>
parents: 25195
diff changeset
   665
  $ hg files sub1/sub2
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   666
  sub1/sub2/folder/bar
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   667
  sub1/sub2/x.txt
25228
63a57a2727b6 files: recurse into subrepos automatically with an explicit path
Matt Harbison <matt_harbison@yahoo.com>
parents: 25195
diff changeset
   668
28387
97175d9bf7cf files: don't recurse into subrepos without a path or -S (issue5127)
Matt Harbison <matt_harbison@yahoo.com>
parents: 26421
diff changeset
   669
  $ hg files
97175d9bf7cf files: don't recurse into subrepos without a path or -S (issue5127)
Matt Harbison <matt_harbison@yahoo.com>
parents: 26421
diff changeset
   670
  .hgsub
97175d9bf7cf files: don't recurse into subrepos without a path or -S (issue5127)
Matt Harbison <matt_harbison@yahoo.com>
parents: 26421
diff changeset
   671
  .hgsubstate
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   672
  foo/bar/abc
28387
97175d9bf7cf files: don't recurse into subrepos without a path or -S (issue5127)
Matt Harbison <matt_harbison@yahoo.com>
parents: 26421
diff changeset
   673
  main
97175d9bf7cf files: don't recurse into subrepos without a path or -S (issue5127)
Matt Harbison <matt_harbison@yahoo.com>
parents: 26421
diff changeset
   674
25193
ccb1623266eb context: don't complain about a matcher's subrepo paths in changectx.walk()
Matt Harbison <matt_harbison@yahoo.com>
parents: 24924
diff changeset
   675
  $ hg files -S -r '.^' sub1/sub2/folder
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   676
  sub1/sub2/folder/test.txt
25193
ccb1623266eb context: don't complain about a matcher's subrepo paths in changectx.walk()
Matt Harbison <matt_harbison@yahoo.com>
parents: 24924
diff changeset
   677
ccb1623266eb context: don't complain about a matcher's subrepo paths in changectx.walk()
Matt Harbison <matt_harbison@yahoo.com>
parents: 24924
diff changeset
   678
  $ hg files -S -r '.^' sub1/sub2/missing
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   679
  sub1/sub2/missing: no such file in rev 78026e779ea6
25193
ccb1623266eb context: don't complain about a matcher's subrepo paths in changectx.walk()
Matt Harbison <matt_harbison@yahoo.com>
parents: 24924
diff changeset
   680
  [1]
ccb1623266eb context: don't complain about a matcher's subrepo paths in changectx.walk()
Matt Harbison <matt_harbison@yahoo.com>
parents: 24924
diff changeset
   681
25228
63a57a2727b6 files: recurse into subrepos automatically with an explicit path
Matt Harbison <matt_harbison@yahoo.com>
parents: 25195
diff changeset
   682
  $ hg files -r '.^' sub1/
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   683
  sub1/.hgsub
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   684
  sub1/.hgsubstate
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   685
  sub1/sub1
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   686
  sub1/sub2/folder/test.txt
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   687
  sub1/sub2/sub2
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   688
  sub1/sub2/test.txt
25194
ef4538ba67ef match: explicitly naming a subrepo implies always() for the submatcher
Matt Harbison <matt_harbison@yahoo.com>
parents: 25193
diff changeset
   689
25228
63a57a2727b6 files: recurse into subrepos automatically with an explicit path
Matt Harbison <matt_harbison@yahoo.com>
parents: 25195
diff changeset
   690
  $ hg files -r '.^' sub1/sub2
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   691
  sub1/sub2/folder/test.txt
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   692
  sub1/sub2/sub2
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   693
  sub1/sub2/test.txt
25194
ef4538ba67ef match: explicitly naming a subrepo implies always() for the submatcher
Matt Harbison <matt_harbison@yahoo.com>
parents: 25193
diff changeset
   694
23537
f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23327
diff changeset
   695
  $ hg rollback -q
f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23327
diff changeset
   696
  $ hg up -Cq
23325
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag
Matt Harbison <matt_harbison@yahoo.com>
parents: 17346
diff changeset
   697
17108
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   698
  $ hg --config extensions.largefiles=! archive -S ../archive_all
28606
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   699
  \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   700
  archiving [                                           ] 0/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   701
  archiving [=============>                             ] 1/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   702
  archiving [===========================>               ] 2/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   703
  archiving [==========================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   704
                                                              \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   705
  \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   706
  archiving (sub1) [                                    ] 0/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   707
  archiving (sub1) [===========>                        ] 1/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   708
  archiving (sub1) [=======================>            ] 2/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   709
  archiving (sub1) [===================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   710
                                                              \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   711
  \r (no-eol) (esc)
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   712
  archiving (sub1/sub2) [                               ] 0/3\r (no-eol) (esc)
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   713
  archiving (sub1/sub2) [=========>                     ] 1/3\r (no-eol) (esc)
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   714
  archiving (sub1/sub2) [===================>           ] 2/3\r (no-eol) (esc)
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   715
  archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (esc)
28606
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   716
                                                              \r (no-eol) (esc)
17108
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   717
  $ find ../archive_all | sort
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   718
  ../archive_all
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   719
  ../archive_all/.hg_archival.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   720
  ../archive_all/.hgsub
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   721
  ../archive_all/.hgsubstate
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   722
  ../archive_all/main
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   723
  ../archive_all/sub1
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   724
  ../archive_all/sub1/.hgsub
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   725
  ../archive_all/sub1/.hgsubstate
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   726
  ../archive_all/sub1/sub1
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   727
  ../archive_all/sub1/sub2
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   728
  ../archive_all/sub1/sub2/folder
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   729
  ../archive_all/sub1/sub2/folder/test.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   730
  ../archive_all/sub1/sub2/sub2
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   731
  ../archive_all/sub1/sub2/test.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   732
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   733
Check that archive -X works in deep subrepos
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   734
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   735
  $ hg --config extensions.largefiles=! archive -S -X '**test*' ../archive_exclude
28606
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   736
  \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   737
  archiving [                                           ] 0/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   738
  archiving [=============>                             ] 1/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   739
  archiving [===========================>               ] 2/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   740
  archiving [==========================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   741
                                                              \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   742
  \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   743
  archiving (sub1) [                                    ] 0/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   744
  archiving (sub1) [===========>                        ] 1/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   745
  archiving (sub1) [=======================>            ] 2/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   746
  archiving (sub1) [===================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   747
                                                              \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   748
  \r (no-eol) (esc)
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   749
  archiving (sub1/sub2) [                               ] 0/1\r (no-eol) (esc)
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   750
  archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (esc)
28606
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   751
                                                              \r (no-eol) (esc)
17108
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   752
  $ find ../archive_exclude | sort
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   753
  ../archive_exclude
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   754
  ../archive_exclude/.hg_archival.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   755
  ../archive_exclude/.hgsub
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   756
  ../archive_exclude/.hgsubstate
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   757
  ../archive_exclude/main
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   758
  ../archive_exclude/sub1
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   759
  ../archive_exclude/sub1/.hgsub
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   760
  ../archive_exclude/sub1/.hgsubstate
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   761
  ../archive_exclude/sub1/sub1
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   762
  ../archive_exclude/sub1/sub2
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   763
  ../archive_exclude/sub1/sub2/sub2
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   764
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   765
  $ hg --config extensions.largefiles=! archive -S -I '**test*' ../archive_include
28606
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   766
  \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   767
  archiving (sub1) [ <=>                                  ] 0\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   768
                                                              \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   769
  \r (no-eol) (esc)
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   770
  archiving (sub1/sub2) [                               ] 0/2\r (no-eol) (esc)
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   771
  archiving (sub1/sub2) [==============>                ] 1/2\r (no-eol) (esc)
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   772
  archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (esc)
28606
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
   773
                                                              \r (no-eol) (esc)
17108
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   774
  $ find ../archive_include | sort
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   775
  ../archive_include
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   776
  ../archive_include/sub1
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   777
  ../archive_include/sub1/sub2
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   778
  ../archive_include/sub1/sub2/folder
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   779
  ../archive_include/sub1/sub2/folder/test.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   780
  ../archive_include/sub1/sub2/test.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   781
17105
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16073
diff changeset
   782
Check that deep archive works with largefiles (which overrides hgsubrepo impl)
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16073
diff changeset
   783
This also tests the repo.ui regression in 43fb170a23bd, and that lf subrepo
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16073
diff changeset
   784
subrepos are archived properly.
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16073
diff changeset
   785
Note that add --large through a subrepo currently adds the file as a normal file
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16073
diff changeset
   786
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16073
diff changeset
   787
  $ echo "large" > sub1/sub2/large.bin
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16073
diff changeset
   788
  $ hg --config extensions.largefiles= add --large -R sub1/sub2 sub1/sub2/large.bin
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16073
diff changeset
   789
  $ echo "large" > large.bin
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16073
diff changeset
   790
  $ hg --config extensions.largefiles= add --large large.bin
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16073
diff changeset
   791
  $ hg --config extensions.largefiles= ci -S -m "add large files"
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16073
diff changeset
   792
  committing subrepository sub1
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   793
  committing subrepository sub1/sub2
17105
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16073
diff changeset
   794
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16073
diff changeset
   795
  $ hg --config extensions.largefiles= archive -S ../archive_lf
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16073
diff changeset
   796
  $ find ../archive_lf | sort
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16073
diff changeset
   797
  ../archive_lf
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16073
diff changeset
   798
  ../archive_lf/.hg_archival.txt
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16073
diff changeset
   799
  ../archive_lf/.hgsub
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16073
diff changeset
   800
  ../archive_lf/.hgsubstate
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16073
diff changeset
   801
  ../archive_lf/large.bin
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16073
diff changeset
   802
  ../archive_lf/main
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16073
diff changeset
   803
  ../archive_lf/sub1
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16073
diff changeset
   804
  ../archive_lf/sub1/.hgsub
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16073
diff changeset
   805
  ../archive_lf/sub1/.hgsubstate
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16073
diff changeset
   806
  ../archive_lf/sub1/sub1
17106
4d0e81dca75f largefiles: fix the directory structure when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 17105
diff changeset
   807
  ../archive_lf/sub1/sub2
17108
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   808
  ../archive_lf/sub1/sub2/folder
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   809
  ../archive_lf/sub1/sub2/folder/test.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   810
  ../archive_lf/sub1/sub2/large.bin
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   811
  ../archive_lf/sub1/sub2/sub2
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   812
  ../archive_lf/sub1/sub2/test.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   813
  $ rm -rf ../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   814
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   815
Exclude large files from main and sub-sub repo
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   816
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   817
  $ hg --config extensions.largefiles= archive -S -X '**.bin' ../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   818
  $ find ../archive_lf | sort
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   819
  ../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   820
  ../archive_lf/.hg_archival.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   821
  ../archive_lf/.hgsub
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   822
  ../archive_lf/.hgsubstate
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   823
  ../archive_lf/main
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   824
  ../archive_lf/sub1
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   825
  ../archive_lf/sub1/.hgsub
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   826
  ../archive_lf/sub1/.hgsubstate
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   827
  ../archive_lf/sub1/sub1
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   828
  ../archive_lf/sub1/sub2
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   829
  ../archive_lf/sub1/sub2/folder
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   830
  ../archive_lf/sub1/sub2/folder/test.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   831
  ../archive_lf/sub1/sub2/sub2
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   832
  ../archive_lf/sub1/sub2/test.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   833
  $ rm -rf ../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   834
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   835
Exclude normal files from main and sub-sub repo
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   836
24953
5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24924
diff changeset
   837
  $ hg --config extensions.largefiles= archive -S -X '**.txt' -p '.' ../archive_lf.tgz
24924
41cd8171e58f archive: always use portable path component separators with subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 24645
diff changeset
   838
  $ tar -tzf ../archive_lf.tgz | sort
24953
5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24924
diff changeset
   839
  .hgsub
5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24924
diff changeset
   840
  .hgsubstate
5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24924
diff changeset
   841
  large.bin
5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24924
diff changeset
   842
  main
5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24924
diff changeset
   843
  sub1/.hgsub
5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24924
diff changeset
   844
  sub1/.hgsubstate
5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24924
diff changeset
   845
  sub1/sub1
5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24924
diff changeset
   846
  sub1/sub2/large.bin
5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24924
diff changeset
   847
  sub1/sub2/sub2
17108
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   848
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   849
Include normal files from within a largefiles subrepo
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   850
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   851
  $ hg --config extensions.largefiles= archive -S -I '**.txt' ../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   852
  $ find ../archive_lf | sort
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   853
  ../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   854
  ../archive_lf/.hg_archival.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   855
  ../archive_lf/sub1
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   856
  ../archive_lf/sub1/sub2
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   857
  ../archive_lf/sub1/sub2/folder
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   858
  ../archive_lf/sub1/sub2/folder/test.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   859
  ../archive_lf/sub1/sub2/test.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   860
  $ rm -rf ../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   861
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   862
Include large files from within a largefiles subrepo
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   863
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   864
  $ hg --config extensions.largefiles= archive -S -I '**.bin' ../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   865
  $ find ../archive_lf | sort
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   866
  ../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   867
  ../archive_lf/large.bin
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   868
  ../archive_lf/sub1
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   869
  ../archive_lf/sub1/sub2
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   870
  ../archive_lf/sub1/sub2/large.bin
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   871
  $ rm -rf ../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   872
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   873
Find an exact largefile match in a largefiles subrepo
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   874
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   875
  $ hg --config extensions.largefiles= archive -S -I 'sub1/sub2/large.bin' ../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   876
  $ find ../archive_lf | sort
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   877
  ../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   878
  ../archive_lf/sub1
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   879
  ../archive_lf/sub1/sub2
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   880
  ../archive_lf/sub1/sub2/large.bin
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   881
  $ rm -rf ../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   882
24029
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it
Matt Harbison <matt_harbison@yahoo.com>
parents: 23923
diff changeset
   883
The local repo enables largefiles if a largefiles repo is cloned
39854
823a580448d7 largefiles: automatically load largefiles extension when required (BC)
Gregory Szorc <gregory.szorc@gmail.com>
parents: 38348
diff changeset
   884
24029
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it
Matt Harbison <matt_harbison@yahoo.com>
parents: 23923
diff changeset
   885
  $ hg showconfig extensions
39854
823a580448d7 largefiles: automatically load largefiles extension when required (BC)
Gregory Szorc <gregory.szorc@gmail.com>
parents: 38348
diff changeset
   886
  extensions.largefiles=
823a580448d7 largefiles: automatically load largefiles extension when required (BC)
Gregory Szorc <gregory.szorc@gmail.com>
parents: 38348
diff changeset
   887
24029
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it
Matt Harbison <matt_harbison@yahoo.com>
parents: 23923
diff changeset
   888
  $ hg --config extensions.largefiles= clone -qU . ../lfclone
48657
68b7faeb6ef3 tests: use debugrequires instead of grepping the file directly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48510
diff changeset
   889
  $ hg debugrequires -R ../lfclone | grep largefiles
39854
823a580448d7 largefiles: automatically load largefiles extension when required (BC)
Gregory Szorc <gregory.szorc@gmail.com>
parents: 38348
diff changeset
   890
  largefiles
24029
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it
Matt Harbison <matt_harbison@yahoo.com>
parents: 23923
diff changeset
   891
17108
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   892
Find an exact match to a standin (should archive nothing)
1894dac619de subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents: 17106
diff changeset
   893
  $ hg --config extensions.largefiles= archive -S -I 'sub/sub2/.hglf/large.bin' ../archive_lf
17113
d7493da233c8 tests: remove GNU quoting in test-subrepo-deep-nested-change.t
Mads Kiilerich <mads@kiilerich.com>
parents: 17112
diff changeset
   894
  $ find ../archive_lf 2> /dev/null | sort
17105
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16073
diff changeset
   895
23837
2b79d124a12f largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents: 23686
diff changeset
   896
  $ cat >> $HGRCPATH <<EOF
2b79d124a12f largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents: 23686
diff changeset
   897
  > [extensions]
2b79d124a12f largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents: 23686
diff changeset
   898
  > largefiles=
23886
5ce8dcd05dc4 largefiles: enable subrepo support for add
Matt Harbison <matt_harbison@yahoo.com>
parents: 23837
diff changeset
   899
  > [largefiles]
5ce8dcd05dc4 largefiles: enable subrepo support for add
Matt Harbison <matt_harbison@yahoo.com>
parents: 23837
diff changeset
   900
  > patterns=glob:**.dat
23837
2b79d124a12f largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents: 23686
diff changeset
   901
  > EOF
2b79d124a12f largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents: 23686
diff changeset
   902
2b79d124a12f largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents: 23686
diff changeset
   903
Test forget through a deep subrepo with the largefiles extension, both a
2b79d124a12f largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents: 23686
diff changeset
   904
largefile and a normal file.  Then a largefile that hasn't been committed yet.
2b79d124a12f largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents: 23686
diff changeset
   905
  $ touch sub1/sub2/untracked.txt
23886
5ce8dcd05dc4 largefiles: enable subrepo support for add
Matt Harbison <matt_harbison@yahoo.com>
parents: 23837
diff changeset
   906
  $ touch sub1/sub2/large.dat
23837
2b79d124a12f largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents: 23686
diff changeset
   907
  $ hg forget sub1/sub2/large.bin sub1/sub2/test.txt sub1/sub2/untracked.txt
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   908
  not removing sub1/sub2/untracked.txt: file is already untracked
23837
2b79d124a12f largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents: 23686
diff changeset
   909
  [1]
23886
5ce8dcd05dc4 largefiles: enable subrepo support for add
Matt Harbison <matt_harbison@yahoo.com>
parents: 23837
diff changeset
   910
  $ hg add --large --dry-run -v sub1/sub2/untracked.txt
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   911
  adding sub1/sub2/untracked.txt as a largefile
23886
5ce8dcd05dc4 largefiles: enable subrepo support for add
Matt Harbison <matt_harbison@yahoo.com>
parents: 23837
diff changeset
   912
  $ hg add --large -v sub1/sub2/untracked.txt
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   913
  adding sub1/sub2/untracked.txt as a largefile
23886
5ce8dcd05dc4 largefiles: enable subrepo support for add
Matt Harbison <matt_harbison@yahoo.com>
parents: 23837
diff changeset
   914
  $ hg add --normal -v sub1/sub2/large.dat
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   915
  adding sub1/sub2/large.dat
23837
2b79d124a12f largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents: 23686
diff changeset
   916
  $ hg forget -v sub1/sub2/untracked.txt
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   917
  removing sub1/sub2/untracked.txt
23837
2b79d124a12f largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents: 23686
diff changeset
   918
  $ hg status -S
23886
5ce8dcd05dc4 largefiles: enable subrepo support for add
Matt Harbison <matt_harbison@yahoo.com>
parents: 23837
diff changeset
   919
  A sub1/sub2/large.dat
23837
2b79d124a12f largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents: 23686
diff changeset
   920
  R sub1/sub2/large.bin
2b79d124a12f largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents: 23686
diff changeset
   921
  R sub1/sub2/test.txt
2b79d124a12f largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents: 23686
diff changeset
   922
  ? foo/bar/abc
2b79d124a12f largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents: 23686
diff changeset
   923
  ? sub1/sub2/untracked.txt
24413
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command
Matt Harbison <matt_harbison@yahoo.com>
parents: 24230
diff changeset
   924
  ? sub1/sub2/x.txt
23923
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23886
diff changeset
   925
  $ hg add sub1/sub2
25601
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   926
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   927
  $ hg archive -S -r 'wdir()' ../wdir2
50725
7e5be4a7cda7 tests: use grep -E instead of obsolescent egrep
Mads Kiilerich <mads@kiilerich.com>
parents: 48657
diff changeset
   928
  $ diff -r . ../wdir2 | grep -E -v '\.hg$|^Common subdirectories:'
25601
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   929
  Only in ../wdir2: .hg_archival.txt
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   930
  Only in .: .hglf
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   931
  Only in .: foo
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   932
  Only in ./sub1/sub2: large.bin
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   933
  Only in ./sub1/sub2: test.txt
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   934
  Only in ./sub1/sub2: untracked.txt
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   935
  Only in ./sub1/sub2: x.txt
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   936
  $ find ../wdir2 -type f | sort
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   937
  ../wdir2/.hg_archival.txt
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   938
  ../wdir2/.hgsub
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   939
  ../wdir2/.hgsubstate
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   940
  ../wdir2/large.bin
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   941
  ../wdir2/main
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   942
  ../wdir2/sub1/.hgsub
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   943
  ../wdir2/sub1/.hgsubstate
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   944
  ../wdir2/sub1/sub1
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   945
  ../wdir2/sub1/sub2/folder/test.txt
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   946
  ../wdir2/sub1/sub2/large.dat
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   947
  ../wdir2/sub1/sub2/sub2
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   948
  $ hg status -S -mac -n | sort
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   949
  .hgsub
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   950
  .hgsubstate
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   951
  large.bin
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   952
  main
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   953
  sub1/.hgsub
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   954
  sub1/.hgsubstate
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   955
  sub1/sub1
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   956
  sub1/sub2/folder/test.txt
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   957
  sub1/sub2/large.dat
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   958
  sub1/sub2/sub2
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   959
23923
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23886
diff changeset
   960
  $ hg ci -Sqm 'forget testing'
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23886
diff changeset
   961
25601
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   962
Test 'wdir()' modified file archiving with largefiles
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   963
  $ echo 'mod' > main
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   964
  $ echo 'mod' > large.bin
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   965
  $ echo 'mod' > sub1/sub2/large.dat
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   966
  $ hg archive -S -r 'wdir()' ../wdir3
50725
7e5be4a7cda7 tests: use grep -E instead of obsolescent egrep
Mads Kiilerich <mads@kiilerich.com>
parents: 48657
diff changeset
   967
  $ diff -r . ../wdir3 | grep -E -v '\.hg$|^Common subdirectories'
25601
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   968
  Only in ../wdir3: .hg_archival.txt
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   969
  Only in .: .hglf
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   970
  Only in .: foo
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   971
  Only in ./sub1/sub2: large.bin
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   972
  Only in ./sub1/sub2: test.txt
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   973
  Only in ./sub1/sub2: untracked.txt
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   974
  Only in ./sub1/sub2: x.txt
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   975
  $ find ../wdir3 -type f | sort
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   976
  ../wdir3/.hg_archival.txt
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   977
  ../wdir3/.hgsub
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   978
  ../wdir3/.hgsubstate
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   979
  ../wdir3/large.bin
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   980
  ../wdir3/main
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   981
  ../wdir3/sub1/.hgsub
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   982
  ../wdir3/sub1/.hgsubstate
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   983
  ../wdir3/sub1/sub1
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   984
  ../wdir3/sub1/sub2/folder/test.txt
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   985
  ../wdir3/sub1/sub2/large.dat
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   986
  ../wdir3/sub1/sub2/sub2
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   987
  $ hg up -Cq
3ec8351fa6ed archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents: 25228
diff changeset
   988
23923
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23886
diff changeset
   989
Test issue4330: commit a directory where only normal files have changed
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23886
diff changeset
   990
  $ touch foo/bar/large.dat
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23886
diff changeset
   991
  $ hg add --large foo/bar/large.dat
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23886
diff changeset
   992
  $ hg ci -m 'add foo/bar/large.dat'
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23886
diff changeset
   993
  $ touch a.txt
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23886
diff changeset
   994
  $ touch a.dat
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23886
diff changeset
   995
  $ hg add -v foo/bar/abc a.txt a.dat
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23886
diff changeset
   996
  adding a.dat as a largefile
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23886
diff changeset
   997
  adding a.txt
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   998
  adding foo/bar/abc
23923
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23886
diff changeset
   999
  $ hg ci -m 'dir commit with only normal file deltas' foo/bar
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23886
diff changeset
  1000
  $ hg status
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23886
diff changeset
  1001
  A a.dat
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23886
diff changeset
  1002
  A a.txt
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23886
diff changeset
  1003
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23886
diff changeset
  1004
Test a directory commit with a changed largefile and a changed normal file
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23886
diff changeset
  1005
  $ echo changed > foo/bar/large.dat
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23886
diff changeset
  1006
  $ echo changed > foo/bar/abc
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23886
diff changeset
  1007
  $ hg ci -m 'dir commit with normal and lf file deltas' foo
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23886
diff changeset
  1008
  $ hg status
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23886
diff changeset
  1009
  A a.dat
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23886
diff changeset
  1010
  A a.txt
23837
2b79d124a12f largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents: 23686
diff changeset
  1011
24230
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents: 24029
diff changeset
  1012
  $ hg ci -m "add a.*"
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents: 24029
diff changeset
  1013
  $ hg mv a.dat b.dat
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents: 24029
diff changeset
  1014
  $ hg mv foo/bar/abc foo/bar/def
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents: 24029
diff changeset
  1015
  $ hg status -C
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents: 24029
diff changeset
  1016
  A b.dat
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents: 24029
diff changeset
  1017
    a.dat
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents: 24029
diff changeset
  1018
  A foo/bar/def
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents: 24029
diff changeset
  1019
    foo/bar/abc
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents: 24029
diff changeset
  1020
  R a.dat
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents: 24029
diff changeset
  1021
  R foo/bar/abc
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents: 24029
diff changeset
  1022
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents: 24029
diff changeset
  1023
  $ hg ci -m "move large and normal"
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents: 24029
diff changeset
  1024
  $ hg status -C --rev '.^' --rev .
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents: 24029
diff changeset
  1025
  A b.dat
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents: 24029
diff changeset
  1026
    a.dat
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents: 24029
diff changeset
  1027
  A foo/bar/def
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents: 24029
diff changeset
  1028
    foo/bar/abc
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents: 24029
diff changeset
  1029
  R a.dat
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents: 24029
diff changeset
  1030
  R foo/bar/abc
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents: 24029
diff changeset
  1031
24446
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1032
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1033
  $ echo foo > main
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1034
  $ hg ci -m "mod parent only"
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1035
  $ hg init sub3
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1036
  $ echo "sub3 = sub3" >> .hgsub
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1037
  $ echo xyz > sub3/a.txt
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1038
  $ hg add sub3/a.txt
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1039
  $ hg ci -Sm "add sub3"
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1040
  committing subrepository sub3
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1041
  $ cat .hgsub | grep -v sub3 > .hgsub1
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1042
  $ mv .hgsub1 .hgsub
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1043
  $ hg ci -m "remove sub3"
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1044
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1045
  $ hg log -r "subrepo()" --style compact
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1046
  0   7f491f53a367   1970-01-01 00:00 +0000   test
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1047
    main import
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1048
  
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1049
  1   ffe6649062fe   1970-01-01 00:00 +0000   test
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1050
    deep nested modif should trigger a commit
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1051
  
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1052
  2   9bb10eebee29   1970-01-01 00:00 +0000   test
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1053
    add test.txt
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1054
  
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1055
  3   7c64f035294f   1970-01-01 00:00 +0000   test
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1056
    add large files
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1057
  
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1058
  4   f734a59e2e35   1970-01-01 00:00 +0000   test
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1059
    forget testing
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1060
  
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1061
  11   9685a22af5db   1970-01-01 00:00 +0000   test
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1062
    add sub3
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1063
  
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1064
  12[tip]   2e0485b475b9   1970-01-01 00:00 +0000   test
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1065
    remove sub3
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1066
  
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1067
  $ hg log -r "subrepo('sub3')" --style compact
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1068
  11   9685a22af5db   1970-01-01 00:00 +0000   test
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1069
    add sub3
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1070
  
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1071
  12[tip]   2e0485b475b9   1970-01-01 00:00 +0000   test
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1072
    remove sub3
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1073
  
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1074
  $ hg log -r "subrepo('bogus')" --style compact
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1075
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1076
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1077
Test .hgsubstate in the R state
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1078
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1079
  $ hg rm .hgsub .hgsubstate
28608
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
  1080
  \r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
  1081
  deleting [=====================>                      ] 1/2\r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
  1082
  deleting [===========================================>] 2/2\r (no-eol) (esc)
62e73d42bd14 remove: add progress support
timeless <timeless@mozdev.org>
parents: 28606
diff changeset
  1083
                                                              \r (no-eol) (esc)
24446
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1084
  $ hg ci -m 'trash subrepo tracking'
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1085
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1086
  $ hg log -r "subrepo('re:sub\d+')" --style compact
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1087
  0   7f491f53a367   1970-01-01 00:00 +0000   test
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1088
    main import
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1089
  
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1090
  1   ffe6649062fe   1970-01-01 00:00 +0000   test
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1091
    deep nested modif should trigger a commit
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1092
  
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1093
  2   9bb10eebee29   1970-01-01 00:00 +0000   test
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1094
    add test.txt
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1095
  
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1096
  3   7c64f035294f   1970-01-01 00:00 +0000   test
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1097
    add large files
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1098
  
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1099
  4   f734a59e2e35   1970-01-01 00:00 +0000   test
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1100
    forget testing
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1101
  
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1102
  11   9685a22af5db   1970-01-01 00:00 +0000   test
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1103
    add sub3
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1104
  
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1105
  12   2e0485b475b9   1970-01-01 00:00 +0000   test
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1106
    remove sub3
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1107
  
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1108
  13[tip]   a68b2c361653   1970-01-01 00:00 +0000   test
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1109
    trash subrepo tracking
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1110
  
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1111
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1112
Restore the trashed subrepo tracking
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1113
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1114
  $ hg rollback -q
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1115
  $ hg update -Cq .
582cfcc843c7 revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents: 24413
diff changeset
  1116
25813
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1117
Interaction with extdiff, largefiles and subrepos
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1118
28052
b59ef0c21405 tests: use portable diff script via extdiff extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28036
diff changeset
  1119
  $ hg --config extensions.extdiff= pdiff -S
25813
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1120
28052
b59ef0c21405 tests: use portable diff script via extdiff extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28036
diff changeset
  1121
  $ hg --config extensions.extdiff= pdiff -r '.^' -S
28606
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1122
  \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1123
  archiving [                                           ] 0/2\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1124
  archiving [====================>                      ] 1/2\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1125
  archiving [==========================================>] 2/2\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1126
                                                              \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1127
  \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1128
  archiving (sub1) [ <=>                                  ] 0\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1129
                                                              \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1130
  \r (no-eol) (esc)
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
  1131
  archiving (sub1/sub2) [ <=>                             ] 0\r (no-eol) (esc)
28606
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1132
                                                              \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1133
  \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1134
  archiving (sub3) [ <=>                                  ] 0\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1135
                                                              \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1136
  \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1137
  archiving [                                           ] 0/2\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1138
  archiving [====================>                      ] 1/2\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1139
  archiving [==========================================>] 2/2\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1140
                                                              \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1141
  \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1142
  archiving (sub1) [ <=>                                  ] 0\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1143
                                                              \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1144
  \r (no-eol) (esc)
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
  1145
  archiving (sub1/sub2) [ <=>                             ] 0\r (no-eol) (esc)
28606
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1146
                                                              \r (no-eol) (esc)
28033
0707bbec682d tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26421
diff changeset
  1147
  diff -Nru cloned.*/.hgsub cloned/.hgsub (glob)
28034
e7ff258f71df tests: make timezone in diff output glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28033
diff changeset
  1148
  --- cloned.*/.hgsub	* (glob)
e7ff258f71df tests: make timezone in diff output glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28033
diff changeset
  1149
  +++ cloned/.hgsub	* (glob)
28035
c65da6892ae5 tests: make chunk header of external diff glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28034
diff changeset
  1150
  @@ -1,2 +1* @@ (glob)
25813
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1151
   sub1 = ../sub1
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1152
  -sub3 = sub3
28033
0707bbec682d tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26421
diff changeset
  1153
  diff -Nru cloned.*/.hgsubstate cloned/.hgsubstate (glob)
28034
e7ff258f71df tests: make timezone in diff output glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28033
diff changeset
  1154
  --- cloned.*/.hgsubstate	* (glob)
e7ff258f71df tests: make timezone in diff output glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28033
diff changeset
  1155
  +++ cloned/.hgsubstate	* (glob)
28035
c65da6892ae5 tests: make chunk header of external diff glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28034
diff changeset
  1156
  @@ -1,2 +1* @@ (glob)
25813
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1157
   7a36fa02b66e61f27f3d4a822809f159479b8ab2 sub1
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1158
  -b1a26de6f2a045a9f079323693614ee322f1ff7e sub3
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1159
  [1]
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1160
28052
b59ef0c21405 tests: use portable diff script via extdiff extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28036
diff changeset
  1161
  $ hg --config extensions.extdiff= pdiff -r 0 -r '.^' -S
28606
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1162
  \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1163
  archiving [                                           ] 0/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1164
  archiving [=============>                             ] 1/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1165
  archiving [===========================>               ] 2/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1166
  archiving [==========================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1167
                                                              \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1168
  \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1169
  archiving (sub1) [                                    ] 0/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1170
  archiving (sub1) [===================================>] 1/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1171
                                                              \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1172
  \r (no-eol) (esc)
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
  1173
  archiving (sub1/sub2) [                               ] 0/1\r (no-eol) (esc)
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
  1174
  archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (esc)
28606
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1175
                                                              \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1176
  \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1177
  archiving [                                           ] 0/8\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1178
  archiving [====>                                      ] 1/8\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1179
  archiving [=========>                                 ] 2/8\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1180
  archiving [===============>                           ] 3/8\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1181
  archiving [====================>                      ] 4/8\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1182
  archiving [=========================>                 ] 5/8\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1183
  archiving [===============================>           ] 6/8\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1184
  archiving [====================================>      ] 7/8\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1185
  archiving [==========================================>] 8/8\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1186
                                                              \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1187
  \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1188
  archiving (sub1) [                                    ] 0/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1189
  archiving (sub1) [===================================>] 1/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1190
                                                              \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1191
  \r (no-eol) (esc)
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
  1192
  archiving (sub1/sub2) [                               ] 0/3\r (no-eol) (esc)
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
  1193
  archiving (sub1/sub2) [=========>                     ] 1/3\r (no-eol) (esc)
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
  1194
  archiving (sub1/sub2) [===================>           ] 2/3\r (no-eol) (esc)
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
  1195
  archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (esc)
28606
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1196
                                                              \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1197
  \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1198
  archiving (sub3) [                                    ] 0/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1199
  archiving (sub3) [===================================>] 1/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1200
                                                              \r (no-eol) (esc)
28033
0707bbec682d tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26421
diff changeset
  1201
  diff -Nru cloned.*/.hglf/b.dat cloned.*/.hglf/b.dat (glob)
25813
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1202
  --- cloned.*/.hglf/b.dat	* (glob)
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1203
  +++ cloned.*/.hglf/b.dat	* (glob)
28036
b5069c2b6f62 tests: make chunk header of external diff glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28035
diff changeset
  1204
  @@ -*,0 +1* @@ (glob)
25813
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1205
  +da39a3ee5e6b4b0d3255bfef95601890afd80709
28033
0707bbec682d tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26421
diff changeset
  1206
  diff -Nru cloned.*/.hglf/foo/bar/large.dat cloned.*/.hglf/foo/bar/large.dat (glob)
25813
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1207
  --- cloned.*/.hglf/foo/bar/large.dat	* (glob)
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1208
  +++ cloned.*/.hglf/foo/bar/large.dat	* (glob)
28036
b5069c2b6f62 tests: make chunk header of external diff glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28035
diff changeset
  1209
  @@ -*,0 +1* @@ (glob)
25813
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1210
  +2f6933b5ee0f5fdd823d9717d8729f3c2523811b
28033
0707bbec682d tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26421
diff changeset
  1211
  diff -Nru cloned.*/.hglf/large.bin cloned.*/.hglf/large.bin (glob)
25813
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1212
  --- cloned.*/.hglf/large.bin	* (glob)
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1213
  +++ cloned.*/.hglf/large.bin	* (glob)
28036
b5069c2b6f62 tests: make chunk header of external diff glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28035
diff changeset
  1214
  @@ -*,0 +1* @@ (glob)
25813
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1215
  +7f7097b041ccf68cc5561e9600da4655d21c6d18
28033
0707bbec682d tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26421
diff changeset
  1216
  diff -Nru cloned.*/.hgsub cloned.*/.hgsub (glob)
25813
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1217
  --- cloned.*/.hgsub	* (glob)
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1218
  +++ cloned.*/.hgsub	* (glob)
28035
c65da6892ae5 tests: make chunk header of external diff glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28034
diff changeset
  1219
  @@ -1* +1,2 @@ (glob)
25813
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1220
   sub1 = ../sub1
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1221
  +sub3 = sub3
28033
0707bbec682d tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26421
diff changeset
  1222
  diff -Nru cloned.*/.hgsubstate cloned.*/.hgsubstate (glob)
25813
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1223
  --- cloned.*/.hgsubstate	* (glob)
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1224
  +++ cloned.*/.hgsubstate	* (glob)
28035
c65da6892ae5 tests: make chunk header of external diff glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28034
diff changeset
  1225
  @@ -1* +1,2 @@ (glob)
25813
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1226
  -fc3b4ce2696f7741438c79207583768f2ce6b0dd sub1
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1227
  +7a36fa02b66e61f27f3d4a822809f159479b8ab2 sub1
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1228
  +b1a26de6f2a045a9f079323693614ee322f1ff7e sub3
28033
0707bbec682d tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26421
diff changeset
  1229
  diff -Nru cloned.*/foo/bar/def cloned.*/foo/bar/def (glob)
25813
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1230
  --- cloned.*/foo/bar/def	* (glob)
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1231
  +++ cloned.*/foo/bar/def	* (glob)
28036
b5069c2b6f62 tests: make chunk header of external diff glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28035
diff changeset
  1232
  @@ -*,0 +1* @@ (glob)
25813
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1233
  +changed
28033
0707bbec682d tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26421
diff changeset
  1234
  diff -Nru cloned.*/main cloned.*/main (glob)
25813
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1235
  --- cloned.*/main	* (glob)
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1236
  +++ cloned.*/main	* (glob)
28035
c65da6892ae5 tests: make chunk header of external diff glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28034
diff changeset
  1237
  @@ -1* +1* @@ (glob)
25813
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1238
  -main
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1239
  +foo
28033
0707bbec682d tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26421
diff changeset
  1240
  diff -Nru cloned.*/sub1/.hgsubstate cloned.*/sub1/.hgsubstate (glob)
25813
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1241
  --- cloned.*/sub1/.hgsubstate	* (glob)
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1242
  +++ cloned.*/sub1/.hgsubstate	* (glob)
28035
c65da6892ae5 tests: make chunk header of external diff glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28034
diff changeset
  1243
  @@ -1* +1* @@ (glob)
25813
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1244
  -c57a0840e3badd667ef3c3ef65471609acb2ba3c sub2
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1245
  +c77908c81ccea3794a896c79e98b0e004aee2e9e sub2
28033
0707bbec682d tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26421
diff changeset
  1246
  diff -Nru cloned.*/sub1/sub2/folder/test.txt cloned.*/sub1/sub2/folder/test.txt (glob)
25813
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1247
  --- cloned.*/sub1/sub2/folder/test.txt	* (glob)
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1248
  +++ cloned.*/sub1/sub2/folder/test.txt	* (glob)
28036
b5069c2b6f62 tests: make chunk header of external diff glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28035
diff changeset
  1249
  @@ -*,0 +1* @@ (glob)
25813
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1250
  +subfolder
28033
0707bbec682d tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26421
diff changeset
  1251
  diff -Nru cloned.*/sub1/sub2/sub2 cloned.*/sub1/sub2/sub2 (glob)
25813
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1252
  --- cloned.*/sub1/sub2/sub2	* (glob)
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1253
  +++ cloned.*/sub1/sub2/sub2	* (glob)
28035
c65da6892ae5 tests: make chunk header of external diff glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28034
diff changeset
  1254
  @@ -1* +1* @@ (glob)
25813
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1255
  -sub2
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1256
  +modified
28033
0707bbec682d tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26421
diff changeset
  1257
  diff -Nru cloned.*/sub3/a.txt cloned.*/sub3/a.txt (glob)
25813
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1258
  --- cloned.*/sub3/a.txt	* (glob)
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1259
  +++ cloned.*/sub3/a.txt	* (glob)
28036
b5069c2b6f62 tests: make chunk header of external diff glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28035
diff changeset
  1260
  @@ -*,0 +1* @@ (glob)
25813
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1261
  +xyz
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1262
  [1]
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1263
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1264
  $ echo mod > sub1/sub2/sub2
28052
b59ef0c21405 tests: use portable diff script via extdiff extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28036
diff changeset
  1265
  $ hg --config extensions.extdiff= pdiff -S
28606
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1266
  \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1267
  archiving (sub1) [ <=>                                  ] 0\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1268
                                                              \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1269
  \r (no-eol) (esc)
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
  1270
  archiving (sub1/sub2) [                               ] 0/1\r (no-eol) (esc)
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
  1271
  archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (esc)
28606
8cc51c5a9365 tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents: 28449
diff changeset
  1272
                                                              \r (no-eol) (esc)
25813
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1273
  --- */cloned.*/sub1/sub2/sub2	* (glob)
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1274
  +++ */cloned/sub1/sub2/sub2	* (glob)
28035
c65da6892ae5 tests: make chunk header of external diff glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28034
diff changeset
  1275
  @@ -1* +1* @@ (glob)
25813
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1276
  -modified
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1277
  +mod
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1278
  [1]
18bae5eb58c5 extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 25690
diff changeset
  1279
17105
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16073
diff changeset
  1280
  $ cd ..