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-6

     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 6: single changesets, pruned then superseeded (on a new changeset)

    13

    14

.. old-state:

    15

..

    16

.. * 1 changeset branch

    17

..

    18

.. new-state:

    19

..

    20

.. * old branch is rewritten onto another one,

    21

.. * the new version is then pruned.

    22

..

    23

.. expected-result:

    24

..

    25

.. * push allowed

    26

..

    27

.. graph-summary:

    28

..

    29

..   A ø⇠⊗ A'

    30

..     | |

    31

..     | ◔ B

    32

..     |/

    33

..     ●

    34

    35

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

    36

    37

Test setup

    38

----------

    39

    40

  $ mkdir B6

    41

  $ cd B6

    42

  $ setuprepos

    43

  creating basic server and client repo

    44

  updating to branch default

    45

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

    46

  $ cd client

    47

  $ hg up 0

    48

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

    49

  $ mkcommit B0

    50

  created new head

    51

  $ mkcommit A1

    52

  $ hg up 'desc(B0)'

    53

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

    54

  $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"`

    55

  obsoleted 1 changesets

    56

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

    57

  obsoleted 1 changesets

    58

  $ hg log -G --hidden

    59

  x  ba93660aff8d (draft): A1

    60

  |

    61

  @  74ff5441d343 (draft): B0

    62

  |

    63

  | x  8aaa48160adc (draft): A0

    64

  |/

    65

  o  1e4be0697311 (public): root

    66

    67

    68

Actual testing

    69

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

    70

    71

  $ hg push

    72

  pushing to $TESTTMP/B6/server (glob)

    73

  searching for changes

    74

  adding changesets

    75

  adding manifests

    76

  adding file changes

    77

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

    78

  2 new obsolescence markers

    79

  obsoleted 1 changesets

    80

    81

  $ cd ../..