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

context: override workingctx.hex() to avoid a crash...

context: override workingctx.hex() to avoid a crash Since node is None for workingctx, it can't use the base class implementation of 'hex(self.node())'. It doesn't appear that there are any current callers of this, but there will be when archive supports 'wdir()'. My first thought was to use "{p1node}+", but that would cause headaches elsewhere [1]. We should probably fix up localrepository.__getitem__ to accept this hash for consistency, as a followup. This works, if the full hash is specified: @@ -480,7 +480,7 @@ return dirstate.dirstate(self.vfs, self.ui, self.root, validate) def __getitem__(self, changeid): - if changeid is None: + if changeid is None or changeid == 'ff' * 20: return context.workingctx(self) if isinstance(changeid, slice): return [context.changectx(self, i) That differs from null, where it will accept any number of 0s, as long as it isn't ambiguous. [1] https://www.selenic.com/pipermail/mercurial-devel/2015-June/071166.html

Augie Fackler - - Load All Authors

File last commit:

r22947:c63a09b6 default


                r25590:183965a0

default

Download file

             test-diff-newlines.t
        
                    19 lines
            
             | 425 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-diff-newlines.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Adrian Buehlmann
    
tests: unify test-diff-newlines

              r12143
            
        $ hg init

        Augie Fackler
    
tests: use $PYTHON instead of hardcoding python...

              r22947
            
        $ $PYTHON -c 'file("a", "wb").write("confuse str.splitlines\nembedded\rnewline\n")'

        Adrian Buehlmann
    
tests: unify test-diff-newlines

              r12143
            
        $ hg ci -Ama -d '1 0'

        adding a

        $ echo clean diff >> a

        $ hg ci -mb -d '2 0'

        $ hg diff -r0 -r1

        diff -r 107ba6f817b5 -r 310ce7989cdc a

        --- a/a	Thu Jan 01 00:00:01 1970 +0000

        +++ b/a	Thu Jan 01 00:00:02 1970 +0000

        @@ -1,2 +1,3 @@

         confuse str.splitlines

        Mads Kiilerich
    
run-tests: allow test output lines to be terminated with \r in addition to \n...

              r17742
            
         embedded\r (no-eol) (esc)

        newline

        Adrian Buehlmann
    
tests: unify test-diff-newlines

              r12143
            
        +clean diff

	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-newlines	r12143	$ hg init

Augie Fackler tests: use $PYTHON instead of hardcoding python...	r22947	$ $PYTHON -c 'file("a", "wb").write("confuse str.splitlines\nembedded\rnewline\n")'
Adrian Buehlmann tests: unify test-diff-newlines	r12143	$ hg ci -Ama -d '1 0'
		adding a

		$ echo clean diff >> a
		$ hg ci -mb -d '2 0'

		$ hg diff -r0 -r1
		diff -r 107ba6f817b5 -r 310ce7989cdc a
		--- a/a Thu Jan 01 00:00:01 1970 +0000
		+++ b/a Thu Jan 01 00:00:02 1970 +0000
		@@ -1,2 +1,3 @@
		confuse str.splitlines
Mads Kiilerich run-tests: allow test output lines to be terminated with \r in addition to \n...	r17742	embedded\r (no-eol) (esc)
		newline
Adrian Buehlmann tests: unify test-diff-newlines	r12143	+clean diff