phases: use revision number in new_heads All graph operations will be done using revision numbers, so passing nodes only means they will eventually get converted to revision numbers internally. As part of an effort to align the code on using revision number we make the `phases.newheads` function operated on revision number, taking them as input and using them in returns, instead of the node-id it used to consume and produce. This is part of multiple changesets effort to translate more part of the logic, but is done step by step to facilitate the identification of issue that might arise in mercurial core and extensions. To make the change simpler to handle for third party extensions, we also rename the function, using a more modern form. This will help detecting the different between the node-id version and the rev-num version. I also take this as an opportunity to add some comment about possible performance improvement for the future. They don't matter too much now, but they are worse exploring in a while.

     1

https://bz.mercurial-scm.org/619

     2

     3

  $ hg init repo

     4

  $ cd repo

     5

  $ echo a > a

     6

  $ hg ci -Ama

     7

  adding a

     8

     9

  $ echo b > b

    10

  $ hg branch b

    11

  marked working directory as branch b

    12

  (branches are permanent and global, did you want a bookmark?)

    13

  $ hg ci -Amb

    14

  adding b

    15

    16

  $ hg co -C 0

    17

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

    18

    19

Fast-forward:

    20

    21

  $ hg merge b

    22

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

    23

  (branch merge, don't forget to commit)

    24

  $ hg ci -Ammerge

    25

    26

Bogus fast-forward should fail:

    27

    28

  $ hg merge b

    29

  abort: merging with a working directory ancestor has no effect

    30

  [255]

    31

    32

Even with strange revset (issue4465)

    33

    34

  $ hg merge ::.

    35

  abort: merging with a working directory ancestor has no effect

    36

  [255]

    37