show: use consistent (and possibly shorter) node lengths `hg show` makes heavy use of shortest() to limit the length of the node hash. For the "stack" and "work" views, you are often looking at multiple lines of similar output for "lines" of work. It is visually appeasing for things to vertically align. A naive use of {shortest(node, N)} could result in variable length nodes and for the first character of the description to vary by a column or two. We implement a function to determine the longest shortest prefix for a set of revisions. The new function is used to determine the printed node length for all `hg show` views. .. feature:: show: use consistent node length in views Our previous shortest node length of 5 was arbitrarily chosen. shortest() already does the work of ensuring that a partial node isn't ambiguous with an integer revision, which is our primary risk of a collision for very short nodes. It should be safe to go with the shortest node possible. Existing code is also optimized to handle nodes as short as 4. So, we decrease the minimum hash length from 5 to 4. We also add a test demonstrating that prefix collisions increase the node length. .. feature:: show: decrease minimum displayed hash length from 5 to 4 Differential Revision: https://phab.mercurial-scm.org/D558

     1

#require execbit

     2

     3

  $ rm -rf a

     4

  $ hg init a

     5

  $ cd a

     6

     7

  $ echo foo > foo

     8

  $ hg ci -qAm0

     9

  $ echo toremove > toremove

    10

  $ echo todelete > todelete

    11

  $ chmod +x foo toremove todelete

    12

  $ hg ci -qAm1

    13

    14

Test that local removed/deleted, remote removed works with flags

    15

  $ hg rm toremove

    16

  $ rm todelete

    17

  $ hg co -q 0

    18

    19

  $ echo dirty > foo

    20

  $ hg up -c

    21

  abort: uncommitted changes

    22

  [255]

    23

  $ hg up -q

    24

  $ cat foo

    25

  dirty

    26

  $ hg st -A

    27

  M foo

    28

  C todelete

    29

  C toremove

    30

    31

Validate update of standalone execute bit change:

    32

    33

  $ hg up -C 0

    34

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

    35

  $ chmod -x foo

    36

  $ hg ci -m removeexec

    37

  nothing changed

    38

  [1]

    39

  $ hg up -C 0

    40

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

    41

  $ hg up

    42

  3 files updated, 0 files merged, 0 files removed, 0 files unresolved

    43

  $ hg st

    44

    45

  $ cd ..