tests/test-evolve-progress.t
author Anton Shestakov <av6@dwimlabs.net>
Fri, 14 Jun 2019 18:17:03 +0800
branchstable
changeset 4692 a9cf0ba6e6c7
parent 4661 df41605bd26c
child 4668 194adaeb84e8
child 4670 d0d8c0e2f3fc
permissions -rw-r--r--
pick: register pickstate as an unfinished state This way pickstate file will indicate that unfinished pick command needs to be dealt with (--continue or --abort) before modifying the repo. Otherwise it would be e.g. possible to commit during an interrupted pick and that's not expected.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4596
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
     1
Test Evolve progress output
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
     2
===========================
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
     3
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
     4
  $ . "$TESTDIR/testlib/common.sh"
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
     5
  $ cat >> $HGRCPATH <<EOF
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
     6
  > [extensions]
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
     7
  > evolve=
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
     8
  > EOF
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
     9
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    10
  $ hg init progress
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    11
  $ cd progress
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    12
  $ echo a > a
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    13
  $ hg ci -Aqm first
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    14
  $ echo a2 > a
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    15
  $ hg ci -m second
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    16
  $ echo b > b
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    17
  $ hg ci -Aqm third
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    18
  $ echo b2 > b
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    19
  $ hg ci -m fourth
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    20
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    21
Test progress with --all
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    22
  $ hg co -q 'desc("first")'
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    23
  $ hg amend -m 'first v2'
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    24
  3 new orphan changesets
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    25
  $ hg evolve --config progress.debug=yes --debug
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    26
  evolve: 1/3 changesets (33.33%)
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    27
  move:[1] second
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    28
  atop:[4] first v2
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    29
  hg rebase -r 4f60c78b6d58 -d fd0a2402f834
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    30
  evolve: 1/3 changesets (33.33%)
4661
df41605bd26c test: adjust output to stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4608
diff changeset
    31
    searching for copies back to rev 0
4596
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    32
  resolving manifests
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    33
   branchmerge: True, force: True, partial: False
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    34
   ancestor: a87874c6ec31, local: fd0a2402f834+, remote: 4f60c78b6d58
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    35
   a: remote is newer -> g
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    36
  getting a
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    37
  updating: a 1/1 files (100.00%)
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    38
  committing files:
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    39
  a
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    40
  committing manifest
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    41
  committing changelog
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    42
  evolve: 2/3 changesets (66.67%)
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    43
  move:[2] third
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    44
  hg rebase -r 769574b07a96 -d 5f16d91ecde0
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    45
  evolve: 2/3 changesets (66.67%)
4661
df41605bd26c test: adjust output to stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4608
diff changeset
    46
    searching for copies back to rev 0
df41605bd26c test: adjust output to stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4608
diff changeset
    47
    unmatched files in other (from base):
df41605bd26c test: adjust output to stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4608
diff changeset
    48
     b
df41605bd26c test: adjust output to stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4608
diff changeset
    49
    unmatched files in other (from topological common ancestor):
4596
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    50
     b
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    51
  resolving manifests
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    52
   branchmerge: True, force: True, partial: False
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    53
   ancestor: 4f60c78b6d58, local: 5f16d91ecde0+, remote: 769574b07a96
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    54
   b: remote created -> g
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    55
  getting b
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    56
  updating: b 1/1 files (100.00%)
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    57
  committing files:
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    58
  b
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    59
  committing manifest
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    60
  committing changelog
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    61
  evolve: 3/3 changesets (100.00%)
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    62
  move:[3] fourth
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    63
  hg rebase -r 22782fddc0ab -d 53c0008d98a0
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    64
  evolve: 3/3 changesets (100.00%)
4661
df41605bd26c test: adjust output to stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4608
diff changeset
    65
    searching for copies back to rev 0
4596
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    66
  resolving manifests
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    67
   branchmerge: True, force: True, partial: False
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    68
   ancestor: 769574b07a96, local: 53c0008d98a0+, remote: 22782fddc0ab
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    69
   b: remote is newer -> g
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    70
  getting b
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    71
  updating: b 1/1 files (100.00%)
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    72
  committing files:
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    73
  b
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    74
  committing manifest
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    75
  committing changelog
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    76
  updating the branch cache
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    77
  obscache is out of date
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    78
  invalid branchheads cache (served): tip differs
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    79
  resolving manifests
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    80
   branchmerge: False, force: False, partial: False
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    81
   ancestor: 385376d04062, local: 385376d04062+, remote: fd0a2402f834
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    82
   b: other deleted -> r
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    83
  removing b
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    84
  updating: b 1/2 files (50.00%)
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    85
   a: remote is newer -> g
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    86
  getting a
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    87
  updating: a 2/2 files (100.00%)
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    88
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    89
Test progress with -r
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    90
  $ hg co -q 'desc("first")'
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    91
  $ hg amend -m 'first v3'
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    92
  3 new orphan changesets
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    93
  $ hg evolve -r 'desc("second")' --config progress.debug=yes --debug
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    94
  evolve: 1/1 changesets (100.00%)
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    95
  move:[5] second
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    96
  atop:[8] first v3
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    97
  hg rebase -r 5f16d91ecde0 -d 152c368c622b
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    98
  evolve: 1/1 changesets (100.00%)
4661
df41605bd26c test: adjust output to stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4608
diff changeset
    99
    searching for copies back to rev 4
4596
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   100
  resolving manifests
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   101
   branchmerge: True, force: True, partial: False
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   102
   ancestor: fd0a2402f834, local: 152c368c622b+, remote: 5f16d91ecde0
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   103
   a: remote is newer -> g
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   104
  getting a
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   105
  updating: a 1/1 files (100.00%)
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   106
  committing files:
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   107
  a
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   108
  committing manifest
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   109
  committing changelog
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   110
  updating the branch cache
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   111
  obscache is out of date
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   112
  resolving manifests
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   113
   branchmerge: False, force: False, partial: False
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   114
   ancestor: df5d742141b0, local: df5d742141b0+, remote: 152c368c622b
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   115
   a: remote is newer -> g
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   116
  getting a
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   117
  updating: a 1/1 files (100.00%)
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   118
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   119
Test progress with --continue
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   120
  $ hg co -q 'desc("first")'
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   121
  $ echo conflict > a
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   122
  $ hg amend -m 'first v4'
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   123
  1 new orphan changesets
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   124
  $ hg evolve --all --config progress.debug=yes --debug
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   125
  evolve: 1/3 changesets (33.33%)
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   126
  move:[9] second
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   127
  atop:[10] first v4
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   128
  hg rebase -r df5d742141b0 -d f8d7d38c0a88
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   129
  evolve: 1/3 changesets (33.33%)
4661
df41605bd26c test: adjust output to stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4608
diff changeset
   130
    searching for copies back to rev 8
4596
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   131
  resolving manifests
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   132
   branchmerge: True, force: True, partial: False
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   133
   ancestor: 152c368c622b, local: f8d7d38c0a88+, remote: df5d742141b0
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   134
   preserving a for resolve of a
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   135
   a: versions differ -> m (premerge)
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   136
  updating: a 1/1 files (100.00%)
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   137
  picked tool ':merge' for a (binary False symlink False changedelete False)
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   138
  merging a
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   139
  my a@f8d7d38c0a88+ other a@df5d742141b0 ancestor a@152c368c622b
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   140
   a: versions differ -> m (merge)
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   141
  updating: a 2/2 files (100.00%)
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   142
  picked tool ':merge' for a (binary False symlink False changedelete False)
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   143
  my a@f8d7d38c0a88+ other a@df5d742141b0 ancestor a@152c368c622b
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   144
  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   145
  fix conflicts and see `hg help evolve.interrupted`
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   146
  [1]
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   147
  $ echo resolved > a
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   148
  $ hg resolve -m a
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   149
  (no more unresolved files)
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   150
  continue: hg evolve --continue
4600
ef899ea7456d evolve: stop passing no-op "progresscb" into continueevolve()
Martin von Zweigbergk <martinvonz@google.com>
parents: 4599
diff changeset
   151
  $ hg evolve --continue --config progress.debug=yes --debug
4596
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   152
  evolving 9:df5d742141b0 "second"
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   153
  committing files:
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   154
  a
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   155
  committing manifest
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   156
  committing changelog
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   157
  updating the branch cache
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   158
  obscache is out of date
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   159
  move:[6] third
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   160
  atop:[11] second
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   161
  hg rebase -r 53c0008d98a0 -d 60a86497fbfe
4603
8cc329d705f9 evolve: add progress support for --continue
Martin von Zweigbergk <martinvonz@google.com>
parents: 4600
diff changeset
   162
  evolve: 2/3 changesets (66.67%)
4661
df41605bd26c test: adjust output to stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4608
diff changeset
   163
    searching for copies back to rev 4
df41605bd26c test: adjust output to stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4608
diff changeset
   164
    unmatched files in other (from base):
df41605bd26c test: adjust output to stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4608
diff changeset
   165
     b
df41605bd26c test: adjust output to stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4608
diff changeset
   166
    unmatched files in other (from topological common ancestor):
4596
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   167
     b
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   168
  resolving manifests
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   169
   branchmerge: True, force: True, partial: False
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   170
   ancestor: 5f16d91ecde0, local: 60a86497fbfe+, remote: 53c0008d98a0
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   171
   b: remote created -> g
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   172
  getting b
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   173
  updating: b 1/1 files (100.00%)
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   174
  committing files:
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   175
  b
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   176
  committing manifest
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   177
  committing changelog
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   178
  move:[7] fourth
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   179
  hg rebase -r 385376d04062 -d b2de95304e32
4603
8cc329d705f9 evolve: add progress support for --continue
Martin von Zweigbergk <martinvonz@google.com>
parents: 4600
diff changeset
   180
  evolve: 3/3 changesets (100.00%)
4661
df41605bd26c test: adjust output to stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4608
diff changeset
   181
    searching for copies back to rev 4
4596
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   182
  resolving manifests
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   183
   branchmerge: True, force: True, partial: False
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   184
   ancestor: 53c0008d98a0, local: b2de95304e32+, remote: 385376d04062
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   185
   b: remote is newer -> g
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   186
  getting b
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   187
  updating: b 1/1 files (100.00%)
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   188
  committing files:
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   189
  b
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   190
  committing manifest
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   191
  committing changelog
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   192
  updating the branch cache
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   193
  obscache is out of date
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   194
  invalid branchheads cache (served): tip differs
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   195
  resolving manifests
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   196
   branchmerge: False, force: False, partial: False
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   197
   ancestor: c6e6fdb1d046, local: c6e6fdb1d046+, remote: f8d7d38c0a88
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   198
   b: other deleted -> r
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   199
  removing b
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   200
  updating: b 1/2 files (50.00%)
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   201
   a: remote is newer -> g
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   202
  getting a
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   203
  updating: a 2/2 files (100.00%)
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   204
  working directory is now at f8d7d38c0a88
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   205
78d60913ea9f tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   206
  $ cd ..