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

merge: don't report progress for dr/rd actions...

merge: don't report progress for dr/rd actions It is easier to reason about certain algorithms in terms of a file->action mapping than the current action->list-of-files. Bid merge is already written this way (but with a list of actions per file), and largefiles' overridecalculateupdates() will also benefit. However, that requires us to have at most one action per file. That requirement is currently violated by 'dr' (divergent rename) and 'rd' (rename and delete) actions, which can exist for the same file as some other action. These actions are only used for displaying warnings to the user; they don't change anything in the working copy or the dirstate. In this way, they are similar to the 'k' (keep) action. However, they are even less action-like than 'k' is: 'k' at least describes what to do with the file ("do nothing"), while 'dr' and 'rd' or only annotations for files for which there may exist other, "real" actions. As a first step towards separating these acitons out, stop including them in the progress output, just like we already exclude the 'k' action.

Pierre-Yves David - - Load All Authors

File last commit:

r23277:581d3bc0 default


                r23524:a1a7c94d

default

Download file

             test-hup.t
        
                    47 lines
            
             | 923 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-hup.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: replace exit 80 with #require

              r22046
            
      #require serve fifo

        Matt Mackall
    
tests: unify test-hup

              r12413
            
      Test hangup signal in the middle of transaction

        $ hg init

        $ mkfifo p

        Matt Mackall
    
tests: make test-hup more race-proof...

              r16342
            
        $ hg serve --stdio < p 1>out 2>&1 &

        Matt Mackall
    
tests: unify test-hup

              r12413
            
        $ P=$!

        Matt Mackall
    
tests: remove sleep/startup/shutdown races from test-hup

              r16299
            
      Do test while holding fifo open

        $ (

        > echo lock

        > echo addchangegroup

        Pierre-Yves David
    
tests: prevent test-hup from hanging forever if the transaction does not start...

              r20896
            
        > start=`date +%s`

        > # 10 second seems much enough to let the server catch up

        > deadline=`expr $start + 10`

        > while [ ! -s .hg/store/journal ]; do

        >     sleep 0;

        >     if [ `date +%s` -gt $deadline ]; then

        >         echo "transaction did not start after 10 seconds" >&2;

        >         exit 1;

        >     fi

        > done

        Matt Mackall
    
tests: remove sleep/startup/shutdown races from test-hup

              r16299
            
        > kill -HUP $P

        > ) > p

        Matt Mackall
    
tests: make test-hup more race-proof...

              r16342
            
        Matt Mackall
    
tests: avoid zombie lockup with test-hup...

              r16344
            
        $ wait

        Matt Mackall
    
tests: make test-hup more race-proof...

              r16342
            
        $ cat out

        Matt Mackall
    
tests: unify test-hup

              r12413
            
        0

        0

        adding changesets

        transaction abort!

        rollback completed

        killed!

        Matt Mackall
    
tests: remove sleep/startup/shutdown races from test-hup

              r16299
            
        Pierre-Yves David
    
test-hup: use ls instead of echo...

              r23277
            
        $ ls -1d .hg/* .hg/store/*

        .hg/00changelog.i

        .hg/journal.bookmarks

        .hg/journal.branch

        .hg/journal.desc

        .hg/journal.dirstate

        .hg/requires

        .hg/store

        .hg/store/00changelog.i

        .hg/store/00changelog.i.a

        .hg/store/journal.phaseroots

	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

Matt Mackall tests: replace exit 80 with #require	r22046	#require serve fifo

Matt Mackall tests: unify test-hup	r12413	Test hangup signal in the middle of transaction

		$ hg init
		$ mkfifo p
Matt Mackall tests: make test-hup more race-proof...	r16342	$ hg serve --stdio < p 1>out 2>&1 &
Matt Mackall tests: unify test-hup	r12413	$ P=$!
Matt Mackall tests: remove sleep/startup/shutdown races from test-hup	r16299
		Do test while holding fifo open

		$ (
		> echo lock
		> echo addchangegroup
Pierre-Yves David tests: prevent test-hup from hanging forever if the transaction does not start...	r20896	> start=`date +%s`
		> # 10 second seems much enough to let the server catch up
		> deadline=`expr $start + 10`
		> while [ ! -s .hg/store/journal ]; do
		> sleep 0;
		> if [ `date +%s` -gt $deadline ]; then
		> echo "transaction did not start after 10 seconds" >&2;
		> exit 1;
		> fi
		> done
Matt Mackall tests: remove sleep/startup/shutdown races from test-hup	r16299	> kill -HUP $P
		> ) > p
Matt Mackall tests: make test-hup more race-proof...	r16342
Matt Mackall tests: avoid zombie lockup with test-hup...	r16344	$ wait
Matt Mackall tests: make test-hup more race-proof...	r16342	$ cat out
Matt Mackall tests: unify test-hup	r12413	0
		0
		adding changesets
		transaction abort!
		rollback completed
		killed!
Matt Mackall tests: remove sleep/startup/shutdown races from test-hup	r16299
Pierre-Yves David test-hup: use ls instead of echo...	r23277	$ ls -1d .hg/* .hg/store/*
		.hg/00changelog.i
		.hg/journal.bookmarks
		.hg/journal.branch
		.hg/journal.desc
		.hg/journal.dirstate
		.hg/requires
		.hg/store
		.hg/store/00changelog.i
		.hg/store/00changelog.i.a
		.hg/store/journal.phaseroots