upstream/mercurial-mirror Files · tests/test-revisions.t

lookup: add option to disambiguate prefix within revset...

lookup: add option to disambiguate prefix within revset When resolving a nodeid prefix that is not unique within the repo and the user has configured a revset that they want to disambiguate within, we now try to look up within that revset before we fail. If there is a unique match within the revset, we use that. This is of course most effective at allowing a short prefix if the revset contains few nodes. For most of our internal users at Google, "not public()" is sufficiently small that a hex digit or two is enough. The implementation is currently pretty slow, but good enough for small revsets (which is the expected use case). The scan in the revset is linear. We may want to use a prefix tree if we want to allow users to use a larger revset. Credit for the idea goes to Kyle Lippincott. Differential Revision: https://phab.mercurial-scm.org/D4037

Martin von Zweigbergk - - Load All Authors

File last commit:

r38878:503f9364 default


                r38878:503f9364

default

Download file

             test-revisions.t
        
                    37 lines
            
             | 592 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-revisions.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init repo

        $ cd repo

        $ echo 0 > a

        $ hg ci -qAm 0

        $ for i in 5 8 14 43; do

        >   hg up -q 0

        >   echo $i > a

        >   hg ci -qm $i

        > done

        $ cat <<EOF >> .hg/hgrc

        > [alias]

        > l = log -T '{rev}:{shortest(node,1)}\n'

        > EOF

        $ hg l

        4:7ba5d

        3:7ba57

        2:72

        1:9

        0:b

        $ cat <<EOF >> .hg/hgrc

        > [experimental]

        > revisions.disambiguatewithin=:3

        > EOF

      9 was unambiguous and still is

        $ hg l -r 9

        1:9

      7 was ambiguous and still is

        $ hg l -r 7

        abort: 00changelog.i@7: ambiguous identifier!

        [255]

      7b is no longer ambiguous

        $ hg l -r 7b

        3:7ba57

        $ cd ..

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				$ hg init repo
				$ cd repo

				$ echo 0 > a
				$ hg ci -qAm 0
				$ for i in 5 8 14 43; do
				> hg up -q 0
				> echo $i > a
				> hg ci -qm $i
				> done
				$ cat <<EOF >> .hg/hgrc
				> [alias]
				> l = log -T '{rev}:{shortest(node,1)}\n'
				> EOF

				$ hg l
				4:7ba5d
				3:7ba57
				2:72
				1:9
				0:b
				$ cat <<EOF >> .hg/hgrc
				> [experimental]
				> revisions.disambiguatewithin=:3
				> EOF
				9 was unambiguous and still is
				$ hg l -r 9
				1:9
				7 was ambiguous and still is
				$ hg l -r 7
				abort: 00changelog.i@7: ambiguous identifier!
				[255]
				7b is no longer ambiguous
				$ hg l -r 7b
				3:7ba57

				$ cd ..