pick: remove transaction on the whole command (issue6037) At its core, pick is a pretty straightforward and well-behaving command, it uses functions already in core hg, it checks that wdir is clean and that changeset to pick is not public, it checks if there happen to be merge conflicts and can be --continue'd later, etc. It is very similar to graft in core (it also uses mergemod.graft function), but it obsoletes the original changeset. However, graft does not experience this incorrect behavior from issue 6037. What happens in the test case for this issue when we pick a revision that touches both "a" and "b": mergemod.graft() takes the original changeset and tries to apply it to the wdir, which results in "b" being marked as newly added and ready to be committed, "a" updated with the new content and being marked as modified, but "a" also has conflicts. Pick correctly notices this and saves its state before asking for user intervention. So far so good. However, when the command raises InterventionRequired to print a user-facing message and exit while being wrapped in repo.transaction() context manager, the latter partially undoes what mergemod.graft() did: it unmarks "b" as added. And when user continues pick, "b" is therefore not tracked and is not included in the resulting commit. The transaction is not useful here, because it doesn't touch wdir (it's still dirty), it doesn't remove pickstate (and other commands will refuse to work until pick --abort or --continue), it just makes "b" untracked. The solution is to use repo.transaction() only to wrap code that writes data to hg store in the final stages of the command after all checks have passed and is not expected to fail on trivial cases like merge conflicts. For example, committing the picked changeset. But since pick uses repo.commit() for that, and because that function already uses a transaction, wrapping it in another transaction doesn't make sense.

     1

====================================

     2

Testing head checking code: Case B-4

     3

====================================

     4

     5

Mercurial checks for the introduction of new heads on push. Evolution comes

     6

into play to detect if existing branches on the server are being replaced by

     7

some of the new one we push.

     8

     9

This case is part of a series of tests checking this behavior.

    10

    11

Category B: simple case involving pruned changesets

    12

TestCase 4: multi-changeset branch, all are pruned

    13

    14

.. old-state:

    15

..

    16

.. * 2 changeset branch

    17

..

    18

.. new-state:

    19

..

    20

.. * old branch is pruned

    21

..

    22

.. expected-result:

    23

..

    24

.. * push allowed

    25

..

    26

.. graph-summary:

    27

..

    28

..   B ⊗

    29

..     |

    30

..   A ⊗

    31

..     |

    32

..     | ◔ C

    33

..     |/

    34

..     ●

    35

    36

  $ . $TESTDIR/testlib/push-checkheads-util.sh

    37

    38

Test setup

    39

----------

    40

    41

  $ mkdir B4

    42

  $ cd B4

    43

  $ setuprepos

    44

  creating basic server and client repo

    45

  updating to branch default

    46

  2 files updated, 0 files merged, 0 files removed, 0 files unresolved

    47

  $ cd server

    48

  $ mkcommit B0

    49

  $ cd ../client

    50

  $ hg pull

    51

  pulling from $TESTTMP/B4/server (glob)

    52

  searching for changes

    53

  adding changesets

    54

  adding manifests

    55

  adding file changes

    56

  added 1 changesets with 1 changes to 1 files

    57

  new changesets d73caddc5533 (1 drafts)

    58

  (run 'hg update' to get a working copy)

    59

  $ hg up 0

    60

  0 files updated, 0 files merged, 1 files removed, 0 files unresolved

    61

  $ mkcommit C0

    62

  created new head

    63

  $ hg debugobsolete --record-parents `getid "desc(A0)"`

    64

  obsoleted 1 changesets

    65

  1 new orphan changesets

    66

  $ hg debugobsolete --record-parents `getid "desc(B0)"`

    67

  obsoleted 1 changesets

    68

  $ hg log -G --hidden

    69

  @  0f88766e02d6 (draft): C0

    70

  |

    71

  | x  d73caddc5533 (draft): B0

    72

  | |

    73

  | x  8aaa48160adc (draft): A0

    74

  |/

    75

  o  1e4be0697311 (public): root

    76

    77

    78

Actual testing

    79

--------------

    80

    81

  $ hg push

    82

  pushing to $TESTTMP/B4/server (glob)

    83

  searching for changes

    84

  adding changesets

    85

  adding manifests

    86

  adding file changes

    87

  added 1 changesets with 1 changes to 1 files (+1 heads)

    88

  2 new obsolescence markers

    89

  obsoleted 2 changesets

    90

    91

  $ cd ../..