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 C-3

     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 C: case were the branch is only partially obsoleted

    12

TestCase 3: 2 changeset branch, only the head is pruned

    13

    14

.. old-state:

    15

..

    16

.. * 2 changeset branch

    17

..

    18

.. new-state:

    19

..

    20

.. * old head is pruned

    21

.. * 1 new unrelated branch

    22

..

    23

.. expected-result:

    24

..

    25

.. * push denied

    26

..

    27

.. graph-summary:

    28

..

    29

..   B ⊗

    30

..     |

    31

..   A ◔ ◔ C

    32

..     |/

    33

..     ●

    34

    35

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

    36

    37

Test setup

    38

----------

    39

    40

  $ mkdir C3

    41

  $ cd C3

    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 server

    47

  $ mkcommit B0

    48

  $ cd ../client

    49

  $ hg pull

    50

  pulling from $TESTTMP/C3/server (glob)

    51

  searching for changes

    52

  adding changesets

    53

  adding manifests

    54

  adding file changes

    55

  added 1 changesets with 1 changes to 1 files

    56

  new changesets d73caddc5533 (1 drafts)

    57

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

    58

  $ hg up 0

    59

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

    60

  $ mkcommit C0

    61

  created new head

    62

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

    63

  obsoleted 1 changesets

    64

  $ hg log -G --hidden

    65

  @  0f88766e02d6 (draft): C0

    66

  |

    67

  | x  d73caddc5533 (draft): B0

    68

  | |

    69

  | o  8aaa48160adc (draft): A0

    70

  |/

    71

  o  1e4be0697311 (public): root

    72

    73

    74

Actual testing

    75

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

    76

    77

  $ hg push

    78

  pushing to $TESTTMP/C3/server (glob)

    79

  searching for changes

    80

  abort: push creates new remote head 0f88766e02d6!

    81

  (merge or see 'hg help push' for details about pushing new heads)

    82

  [255]

    83

    84

  $ cd ../..