upstream/mercurial-mirror Files · tests/test-diff-subdir.t

revisions: allow "x123" to refer to nodeid prefix "123"...

revisions: allow "x123" to refer to nodeid prefix "123" When resolving "123" to a revision, we try to interpret it as revnum before we try to interpret it as a nodeid hex prefix. This can lead to the shortest valid prefix being longer than necessary. This patch lets us write such nodeids in a shorter form by prefixing them with "x" instead of adding more hex digits until they're longer than the longest decimal revnum. On my hg repo with almost 69k revisions, turning this feature on saves on average 0.4% on the average nodeid length. That clearly doesn't justify this patch. However, it becomes more usefule when combined with the earlier patches in this series that let you disambiguate nodeid prefixes within a configured revset. Note that we attempt to resolve symbols as nodeid prefixes after we've exhausted all other posibilities, so this is a backwards compatible change (only queries that would previously fail may now succeed). I've still hidden this feature behind an experiemntal config option so we can roll it back if needed. Differential Revision: https://phab.mercurial-scm.org/D4041

Sean Farley - - Load All Authors

File last commit:

r24455:16961d43 default


                r38891:7848f284

default

Download file

             test-diff-subdir.t
        
                    67 lines
            
             | 943 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-diff-subdir.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Adrian Buehlmann
    
tests: unify test-diff-subdir

              r12140
            
        $ hg init

        $ mkdir alpha

        $ touch alpha/one

        $ mkdir beta

        $ touch beta/two

        $ hg add alpha/one beta/two

        $ hg ci -m "start"

        $ echo 1 > alpha/one

        $ echo 2 > beta/two

      everything

        $ hg diff --nodates

        diff -r 7d5ef1aea329 alpha/one

        --- a/alpha/one

        +++ b/alpha/one

        @@ -0,0 +1,1 @@

        +1

        diff -r 7d5ef1aea329 beta/two

        --- a/beta/two

        +++ b/beta/two

        @@ -0,0 +1,1 @@

        +2

      beta only

        $ hg diff --nodates beta

        diff -r 7d5ef1aea329 beta/two

        --- a/beta/two

        +++ b/beta/two

        @@ -0,0 +1,1 @@

        +2

      inside beta

        $ cd beta

        $ hg diff --nodates .

        diff -r 7d5ef1aea329 beta/two

        --- a/beta/two

        +++ b/beta/two

        @@ -0,0 +1,1 @@

        +2

        Siddharth Agarwal
    
commands.diff: add support for diffs relative to a subdirectory...

              r24432
            
      relative to beta

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

              r16913
            
        $ cd ..

        Sean Farley
    
diff: rename --relative option to --root...

              r24455
            
        $ hg diff --nodates --root beta

        Siddharth Agarwal
    
commands.diff: add support for diffs relative to a subdirectory...

              r24432
            
        diff -r 7d5ef1aea329 two

        --- a/two

        +++ b/two

        @@ -0,0 +1,1 @@

        +2

      inside beta

        $ cd beta

        Sean Farley
    
diff: rename --relative option to --root...

              r24455
            
        $ hg diff --nodates --root .

        Siddharth Agarwal
    
commands.diff: add support for diffs relative to a subdirectory...

              r24432
            
        diff -r 7d5ef1aea329 two

        --- a/two

        +++ b/two

        @@ -0,0 +1,1 @@

        +2

        $ 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

Adrian Buehlmann tests: unify test-diff-subdir	r12140	$ hg init

		$ mkdir alpha
		$ touch alpha/one
		$ mkdir beta
		$ touch beta/two

		$ hg add alpha/one beta/two
		$ hg ci -m "start"

		$ echo 1 > alpha/one
		$ echo 2 > beta/two

		everything

		$ hg diff --nodates
		diff -r 7d5ef1aea329 alpha/one
		--- a/alpha/one
		+++ b/alpha/one
		@@ -0,0 +1,1 @@
		+1
		diff -r 7d5ef1aea329 beta/two
		--- a/beta/two
		+++ b/beta/two
		@@ -0,0 +1,1 @@
		+2

		beta only

		$ hg diff --nodates beta
		diff -r 7d5ef1aea329 beta/two
		--- a/beta/two
		+++ b/beta/two
		@@ -0,0 +1,1 @@
		+2

		inside beta

		$ cd beta
		$ hg diff --nodates .
		diff -r 7d5ef1aea329 beta/two
		--- a/beta/two
		+++ b/beta/two
		@@ -0,0 +1,1 @@
		+2

Siddharth Agarwal commands.diff: add support for diffs relative to a subdirectory...	r24432	relative to beta

Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913	$ cd ..
Sean Farley diff: rename --relative option to --root...	r24455	$ hg diff --nodates --root beta
Siddharth Agarwal commands.diff: add support for diffs relative to a subdirectory...	r24432	diff -r 7d5ef1aea329 two
		--- a/two
		+++ b/two
		@@ -0,0 +1,1 @@
		+2

		inside beta

		$ cd beta
Sean Farley diff: rename --relative option to --root...	r24455	$ hg diff --nodates --root .
Siddharth Agarwal commands.diff: add support for diffs relative to a subdirectory...	r24432	diff -r 7d5ef1aea329 two
		--- a/two
		+++ b/two
		@@ -0,0 +1,1 @@
		+2

		$ cd ..