tests/test-evolve-effectflags.t
author Pierre-Yves David <pierre-yves.david@octobus.net>
Sun, 23 Jul 2017 16:39:21 +0200
changeset 2767 ab80ef8d0cfa
parent 2522 a1cc2a0b9f6f
child 2832 07b9fcf8b6d3
permissions -rw-r--r--
test: extract most fold testing into a test-fold module
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2446
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     1
Test the 'effect-flags' feature
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     2
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     3
Global setup
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     4
============
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     5
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     6
  $ . $TESTDIR/testlib/common.sh
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     7
  $ cat >> $HGRCPATH <<EOF
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     8
  > [ui]
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     9
  > interactive = true
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    10
  > [phases]
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    11
  > publish=False
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    12
  > [extensions]
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    13
  > evolve =
2449
0b05142117d2 effectflag: detect parent change
Boris Feld <boris.feld@octobus.net>
parents: 2448
diff changeset
    14
  > rebase =
2446
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    15
  > [experimental]
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    16
  > evolution.effect-flags = 1
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    17
  > EOF
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    18
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    19
  $ hg init $TESTTMP/effect-flags
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    20
  $ cd $TESTTMP/effect-flags
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    21
  $ mkcommit ROOT
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    22
2447
631ccf45f0bb effect-flag: rework existing test to prepare for mor tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2446
diff changeset
    23
amend touching the description only
631ccf45f0bb effect-flag: rework existing test to prepare for mor tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2446
diff changeset
    24
-----------------------------------
2446
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    25
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    26
  $ mkcommit A0
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    27
  $ hg amend -m "A1"
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    28
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    29
check result
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    30
2447
631ccf45f0bb effect-flag: rework existing test to prepare for mor tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2446
diff changeset
    31
  $ hg debugobsolete --rev .
2446
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    32
  471f378eab4c5e25f6c77f785b27c936efb22874 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 0 (*) {'ef1': '1', 'user': 'test'} (glob)
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    33
  $ hg obslog .
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    34
  @  fdf9bde5129a (2) A1
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    35
  |
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    36
  x  471f378eab4c (1) A0
2453
ad08aedf25ac obshistory: display informations from the obs marker effect flag
Boris Feld <boris.feld@octobus.net>
parents: 2452
diff changeset
    37
       rewritten(description) by test (*) as fdf9bde5129a (glob)
2446
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    38
  
2448
66f05d5f4769 effectflag: detect meta changes
Boris Feld <boris.feld@octobus.net>
parents: 2447
diff changeset
    39
2492
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    40
amend touching the user only
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    41
----------------------------
2448
66f05d5f4769 effectflag: detect meta changes
Boris Feld <boris.feld@octobus.net>
parents: 2447
diff changeset
    42
66f05d5f4769 effectflag: detect meta changes
Boris Feld <boris.feld@octobus.net>
parents: 2447
diff changeset
    43
  $ mkcommit B0
66f05d5f4769 effectflag: detect meta changes
Boris Feld <boris.feld@octobus.net>
parents: 2447
diff changeset
    44
  $ hg amend -u "bob <bob@bob.com>"
66f05d5f4769 effectflag: detect meta changes
Boris Feld <boris.feld@octobus.net>
parents: 2447
diff changeset
    45
66f05d5f4769 effectflag: detect meta changes
Boris Feld <boris.feld@octobus.net>
parents: 2447
diff changeset
    46
check result
66f05d5f4769 effectflag: detect meta changes
Boris Feld <boris.feld@octobus.net>
parents: 2447
diff changeset
    47
66f05d5f4769 effectflag: detect meta changes
Boris Feld <boris.feld@octobus.net>
parents: 2447
diff changeset
    48
  $ hg debugobsolete --rev .
2518
86f97e7c5aa5 test: fix test-evolve-effectflags dates
Boris Feld <boris.feld@octobus.net>
parents: 2492
diff changeset
    49
  ef4a313b1e0ade55718395d80e6b88c5ccd875eb 5485c92d34330dac9d7a63dc07e1e3373835b964 0 (*) {'ef1': '16', 'user': 'test'} (glob)
2448
66f05d5f4769 effectflag: detect meta changes
Boris Feld <boris.feld@octobus.net>
parents: 2447
diff changeset
    50
  $ hg obslog .
66f05d5f4769 effectflag: detect meta changes
Boris Feld <boris.feld@octobus.net>
parents: 2447
diff changeset
    51
  @  5485c92d3433 (4) B0
66f05d5f4769 effectflag: detect meta changes
Boris Feld <boris.feld@octobus.net>
parents: 2447
diff changeset
    52
  |
66f05d5f4769 effectflag: detect meta changes
Boris Feld <boris.feld@octobus.net>
parents: 2447
diff changeset
    53
  x  ef4a313b1e0a (3) B0
2518
86f97e7c5aa5 test: fix test-evolve-effectflags dates
Boris Feld <boris.feld@octobus.net>
parents: 2492
diff changeset
    54
       rewritten(user) by test (*) as 5485c92d3433 (glob)
2492
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    55
  
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    56
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    57
amend touching the date only
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    58
----------------------------
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    59
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    60
  $ mkcommit B1
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    61
  $ hg amend -d "42 0"
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    62
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    63
check result
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    64
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    65
  $ hg debugobsolete --rev .
2518
86f97e7c5aa5 test: fix test-evolve-effectflags dates
Boris Feld <boris.feld@octobus.net>
parents: 2492
diff changeset
    66
  2ef0680ff45038ac28c9f1ff3644341f54487280 4dd84345082e9e5291c2e6b3f335bbf8bf389378 0 (*) {'ef1': '32', 'user': 'test'} (glob)
2492
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    67
  $ hg obslog .
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    68
  @  4dd84345082e (6) B1
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    69
  |
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    70
  x  2ef0680ff450 (5) B1
2518
86f97e7c5aa5 test: fix test-evolve-effectflags dates
Boris Feld <boris.feld@octobus.net>
parents: 2492
diff changeset
    71
       rewritten(date) by test (*) as 4dd84345082e (glob)
2448
66f05d5f4769 effectflag: detect meta changes
Boris Feld <boris.feld@octobus.net>
parents: 2447
diff changeset
    72
  
2453
ad08aedf25ac obshistory: display informations from the obs marker effect flag
Boris Feld <boris.feld@octobus.net>
parents: 2452
diff changeset
    73
2492
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    74
amend touching the branch only
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    75
----------------------------
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    76
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    77
  $ mkcommit B2
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    78
  $ hg branch my-branch
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    79
  marked working directory as branch my-branch
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    80
  (branches are permanent and global, did you want a bookmark?)
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    81
  $ hg amend
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    82
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    83
check result
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    84
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    85
  $ hg debugobsolete --rev .
2518
86f97e7c5aa5 test: fix test-evolve-effectflags dates
Boris Feld <boris.feld@octobus.net>
parents: 2492
diff changeset
    86
  4d1430a201c1ffbd8465dec75edd4a691a2d97ec 0 {bd3db8264ceebf1966319f5df3be7aac6acd1a8e} (*) {'ef1': '0', 'user': 'test'} (glob)
86f97e7c5aa5 test: fix test-evolve-effectflags dates
Boris Feld <boris.feld@octobus.net>
parents: 2492
diff changeset
    87
  bd3db8264ceebf1966319f5df3be7aac6acd1a8e 14a01456e0574f0e0a0b15b2345486a6364a8d79 0 (*) {'ef1': '64', 'user': 'test'} (glob)
2492
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    88
  $ hg obslog .
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    89
  @  14a01456e057 (9) B2
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    90
  |
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    91
  x  bd3db8264cee (7) B2
2518
86f97e7c5aa5 test: fix test-evolve-effectflags dates
Boris Feld <boris.feld@octobus.net>
parents: 2492
diff changeset
    92
       rewritten(branch) by test (*) as 14a01456e057 (glob)
2492
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    93
  
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    94
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    95
  $ hg up default
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    96
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
    97
2449
0b05142117d2 effectflag: detect parent change
Boris Feld <boris.feld@octobus.net>
parents: 2448
diff changeset
    98
rebase (parents change)
0b05142117d2 effectflag: detect parent change
Boris Feld <boris.feld@octobus.net>
parents: 2448
diff changeset
    99
-----------------------
0b05142117d2 effectflag: detect parent change
Boris Feld <boris.feld@octobus.net>
parents: 2448
diff changeset
   100
0b05142117d2 effectflag: detect parent change
Boris Feld <boris.feld@octobus.net>
parents: 2448
diff changeset
   101
  $ mkcommit C0
0b05142117d2 effectflag: detect parent change
Boris Feld <boris.feld@octobus.net>
parents: 2448
diff changeset
   102
  $ mkcommit D0
0b05142117d2 effectflag: detect parent change
Boris Feld <boris.feld@octobus.net>
parents: 2448
diff changeset
   103
  $ hg rebase -r . -d 'desc(B0)'
2492
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
   104
  rebasing 11:c85eff83a034 "D0" (tip)
2449
0b05142117d2 effectflag: detect parent change
Boris Feld <boris.feld@octobus.net>
parents: 2448
diff changeset
   105
0b05142117d2 effectflag: detect parent change
Boris Feld <boris.feld@octobus.net>
parents: 2448
diff changeset
   106
check result
0b05142117d2 effectflag: detect parent change
Boris Feld <boris.feld@octobus.net>
parents: 2448
diff changeset
   107
0b05142117d2 effectflag: detect parent change
Boris Feld <boris.feld@octobus.net>
parents: 2448
diff changeset
   108
  $ hg debugobsolete --rev .
2518
86f97e7c5aa5 test: fix test-evolve-effectflags dates
Boris Feld <boris.feld@octobus.net>
parents: 2492
diff changeset
   109
  c85eff83a0340efd9da52b806a94c350222f3371 da86aa2f19a30d6686b15cae15c7b6c908ec9699 0 (*) {'ef1': '4', 'user': 'test'} (glob)
2449
0b05142117d2 effectflag: detect parent change
Boris Feld <boris.feld@octobus.net>
parents: 2448
diff changeset
   110
  $ hg obslog .
2492
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
   111
  @  da86aa2f19a3 (12) D0
2449
0b05142117d2 effectflag: detect parent change
Boris Feld <boris.feld@octobus.net>
parents: 2448
diff changeset
   112
  |
2492
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
   113
  x  c85eff83a034 (11) D0
2518
86f97e7c5aa5 test: fix test-evolve-effectflags dates
Boris Feld <boris.feld@octobus.net>
parents: 2492
diff changeset
   114
       rewritten(parent) by test (*) as da86aa2f19a3 (glob)
2449
0b05142117d2 effectflag: detect parent change
Boris Feld <boris.feld@octobus.net>
parents: 2448
diff changeset
   115
  
2450
98613938d098 effectflag: basic diff change detection
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2449
diff changeset
   116
98613938d098 effectflag: basic diff change detection
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2449
diff changeset
   117
amend touching the diff
98613938d098 effectflag: basic diff change detection
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2449
diff changeset
   118
-----------------------
98613938d098 effectflag: basic diff change detection
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2449
diff changeset
   119
98613938d098 effectflag: basic diff change detection
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2449
diff changeset
   120
  $ mkcommit E0
98613938d098 effectflag: basic diff change detection
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2449
diff changeset
   121
  $ echo 42 >> E0
98613938d098 effectflag: basic diff change detection
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2449
diff changeset
   122
  $ hg amend
98613938d098 effectflag: basic diff change detection
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2449
diff changeset
   123
98613938d098 effectflag: basic diff change detection
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2449
diff changeset
   124
check result
98613938d098 effectflag: basic diff change detection
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2449
diff changeset
   125
98613938d098 effectflag: basic diff change detection
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2449
diff changeset
   126
  $ hg debugobsolete --rev .
2518
86f97e7c5aa5 test: fix test-evolve-effectflags dates
Boris Feld <boris.feld@octobus.net>
parents: 2492
diff changeset
   127
  d6f4d8b8d3c8cde990f13915bced7f92ce1cc54f 0 {ebfe0333e0d96f68a917afd97c0a0af87f1c3b5f} (*) {'ef1': '0', 'user': 'test'} (glob)
86f97e7c5aa5 test: fix test-evolve-effectflags dates
Boris Feld <boris.feld@octobus.net>
parents: 2492
diff changeset
   128
  ebfe0333e0d96f68a917afd97c0a0af87f1c3b5f 75781fdbdbf58a987516b00c980bccda1e9ae588 0 (*) {'ef1': '8', 'user': 'test'} (glob)
2450
98613938d098 effectflag: basic diff change detection
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2449
diff changeset
   129
  $ hg obslog .
2492
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
   130
  @  75781fdbdbf5 (15) E0
2450
98613938d098 effectflag: basic diff change detection
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2449
diff changeset
   131
  |
2492
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
   132
  x  ebfe0333e0d9 (13) E0
2518
86f97e7c5aa5 test: fix test-evolve-effectflags dates
Boris Feld <boris.feld@octobus.net>
parents: 2492
diff changeset
   133
       rewritten(content) by test (*) as 75781fdbdbf5 (glob)
2450
98613938d098 effectflag: basic diff change detection
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2449
diff changeset
   134
  
2451
5dc7294327ed effectflag: add test combining multiple flag
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2450
diff changeset
   135
5dc7294327ed effectflag: add test combining multiple flag
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2450
diff changeset
   136
amend with multiple effect (desc and meta)
5dc7294327ed effectflag: add test combining multiple flag
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2450
diff changeset
   137
-------------------------------------------
5dc7294327ed effectflag: add test combining multiple flag
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2450
diff changeset
   138
5dc7294327ed effectflag: add test combining multiple flag
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2450
diff changeset
   139
  $ mkcommit F0
2492
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
   140
  $ hg branch my-other-branch
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
   141
  marked working directory as branch my-other-branch
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
   142
  $ hg amend -m F1 -u "bob <bob@bob.com>" -d "42 0"
2451
5dc7294327ed effectflag: add test combining multiple flag
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2450
diff changeset
   143
5dc7294327ed effectflag: add test combining multiple flag
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2450
diff changeset
   144
check result
5dc7294327ed effectflag: add test combining multiple flag
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2450
diff changeset
   145
5dc7294327ed effectflag: add test combining multiple flag
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2450
diff changeset
   146
  $ hg debugobsolete --rev .
2518
86f97e7c5aa5 test: fix test-evolve-effectflags dates
Boris Feld <boris.feld@octobus.net>
parents: 2492
diff changeset
   147
  3b12912003b4e7aa6df6cded86255006c3c29d27 0 {fad47e5bd78e6aa4db1b5a0a1751bc12563655ff} (*) {'ef1': '0', 'user': 'test'} (glob)
86f97e7c5aa5 test: fix test-evolve-effectflags dates
Boris Feld <boris.feld@octobus.net>
parents: 2492
diff changeset
   148
  fad47e5bd78e6aa4db1b5a0a1751bc12563655ff a94e0fd5f1c81d969381a76eb0d37ce499a44fae 0 (*) {'ef1': '113', 'user': 'test'} (glob)
2451
5dc7294327ed effectflag: add test combining multiple flag
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2450
diff changeset
   149
  $ hg obslog .
2492
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
   150
  @  a94e0fd5f1c8 (18) F1
2451
5dc7294327ed effectflag: add test combining multiple flag
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2450
diff changeset
   151
  |
2492
c9f1118b33d6 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents: 2453
diff changeset
   152
  x  fad47e5bd78e (16) F0
2518
86f97e7c5aa5 test: fix test-evolve-effectflags dates
Boris Feld <boris.feld@octobus.net>
parents: 2492
diff changeset
   153
       rewritten(description, user, date, branch) by test (*) as a94e0fd5f1c8 (glob)
2451
5dc7294327ed effectflag: add test combining multiple flag
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2450
diff changeset
   154
  
2519
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   155
rebase not touching the diff
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   156
----------------------------
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   157
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   158
  $ cat << EOF > H0
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   159
  > 0
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   160
  > 1
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   161
  > 2
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   162
  > 3
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   163
  > 4
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   164
  > 5
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   165
  > 6
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   166
  > 7
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   167
  > 8
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   168
  > 9
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   169
  > 10
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   170
  > EOF
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   171
  $ hg add H0
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   172
  $ hg commit -m 'H0'
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   173
  $ echo "H1" >> H0
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   174
  $ hg commit -m "H1"
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   175
  $ hg up -r "desc(H0)"
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   176
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   177
  $ cat << EOF > H0
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   178
  > H2
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   179
  > 0
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   180
  > 1
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   181
  > 2
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   182
  > 3
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   183
  > 4
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   184
  > 5
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   185
  > 6
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   186
  > 7
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   187
  > 8
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   188
  > 9
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   189
  > 10
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   190
  > EOF
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   191
  $ hg commit -m "H2"
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   192
  created new head
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   193
  $ hg rebase -s "desc(H1)" -d "desc(H2)" -t :merge3
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   194
  rebasing 20:b57fed8d8322 "H1"
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   195
  merging H0
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   196
  $ hg obslog tip
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   197
  o  e509e2eb3df5 (22) H1
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   198
  |
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   199
  x  b57fed8d8322 (20) H1
2520
5fb5d096348c effectflag: better diff detection
Boris Feld <boris.feld@octobus.net>
parents: 2519
diff changeset
   200
       rewritten(parent) by test (*) as e509e2eb3df5 (glob)
2519
4b2e9674c0b7 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents: 2518
diff changeset
   201
  
2522
a1cc2a0b9f6f effetflag: detect other meta (extra) changes
Boris Feld <boris.feld@octobus.net>
parents: 2520
diff changeset
   202
amend closing the branch should be detected as meta change
a1cc2a0b9f6f effetflag: detect other meta (extra) changes
Boris Feld <boris.feld@octobus.net>
parents: 2520
diff changeset
   203
----------------------------------------------------------
a1cc2a0b9f6f effetflag: detect other meta (extra) changes
Boris Feld <boris.feld@octobus.net>
parents: 2520
diff changeset
   204
a1cc2a0b9f6f effetflag: detect other meta (extra) changes
Boris Feld <boris.feld@octobus.net>
parents: 2520
diff changeset
   205
  $ hg branch closedbranch
a1cc2a0b9f6f effetflag: detect other meta (extra) changes
Boris Feld <boris.feld@octobus.net>
parents: 2520
diff changeset
   206
  marked working directory as branch closedbranch
a1cc2a0b9f6f effetflag: detect other meta (extra) changes
Boris Feld <boris.feld@octobus.net>
parents: 2520
diff changeset
   207
  $ mkcommit G0
a1cc2a0b9f6f effetflag: detect other meta (extra) changes
Boris Feld <boris.feld@octobus.net>
parents: 2520
diff changeset
   208
  $ mkcommit I0
a1cc2a0b9f6f effetflag: detect other meta (extra) changes
Boris Feld <boris.feld@octobus.net>
parents: 2520
diff changeset
   209
  $ hg commit --amend --close-branch
a1cc2a0b9f6f effetflag: detect other meta (extra) changes
Boris Feld <boris.feld@octobus.net>
parents: 2520
diff changeset
   210
a1cc2a0b9f6f effetflag: detect other meta (extra) changes
Boris Feld <boris.feld@octobus.net>
parents: 2520
diff changeset
   211
check result
a1cc2a0b9f6f effetflag: detect other meta (extra) changes
Boris Feld <boris.feld@octobus.net>
parents: 2520
diff changeset
   212
a1cc2a0b9f6f effetflag: detect other meta (extra) changes
Boris Feld <boris.feld@octobus.net>
parents: 2520
diff changeset
   213
  $ hg obslog .
a1cc2a0b9f6f effetflag: detect other meta (extra) changes
Boris Feld <boris.feld@octobus.net>
parents: 2520
diff changeset
   214
  @  12c6238b5e37 (26) I0
a1cc2a0b9f6f effetflag: detect other meta (extra) changes
Boris Feld <boris.feld@octobus.net>
parents: 2520
diff changeset
   215
  |
a1cc2a0b9f6f effetflag: detect other meta (extra) changes
Boris Feld <boris.feld@octobus.net>
parents: 2520
diff changeset
   216
  x  2f599e54c1c6 (24) I0
a1cc2a0b9f6f effetflag: detect other meta (extra) changes
Boris Feld <boris.feld@octobus.net>
parents: 2520
diff changeset
   217
       rewritten(meta) by test (*) as 12c6238b5e37 (glob)
a1cc2a0b9f6f effetflag: detect other meta (extra) changes
Boris Feld <boris.feld@octobus.net>
parents: 2520
diff changeset
   218