upstream/mercurial-mirror Files · tests/test-changelog-exec.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.

Matt Mackall - - Load All Authors

File last commit:

r22502:e6e7ef68 default


                r23524:a1a7c94d

default

Download file

             test-changelog-exec.t
        
                    57 lines
            
             | 1.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-changelog-exec.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: replace exit 80 with #require

              r22046
            
      #require execbit

        Martin Geisler
    
tests: unify test-changelog-exec

              r11875
            
      b51a8138292a introduced a regression where we would mention in the

      changelog executable files added by the second parent of a merge. Test

      that that doesn't happen anymore

        $ hg init repo

        $ cd repo

        $ echo foo > foo

        $ hg ci -qAm 'add foo'

        $ echo bar > bar

        $ chmod +x bar

        $ hg ci -qAm 'add bar'

      manifest of p2:

        $ hg manifest

        bar

        foo

        $ hg up -qC 0

        $ echo >> foo

        $ hg ci -m 'change foo'

        created new head

      manifest of p1:

        $ hg manifest

        foo

        $ hg merge

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

        (branch merge, don't forget to commit)

        Matt Mackall
    
commit: catch changed exec bit on files from p1 (issue4382)

              r22492
            
        $ chmod +x foo

        Martin Geisler
    
tests: unify test-changelog-exec

              r11875
            
        $ hg ci -m 'merge'

        Matt Mackall
    
commit: catch changed exec bit on files from p1 (issue4382)

              r22492
            
      this should not mention bar but should mention foo:

        Martin Geisler
    
tests: unify test-changelog-exec

              r11875
            
        $ hg tip -v

        Matt Mackall
    
commit: catch changed exec bit on files from p1 (issue4382)

              r22492
            
        changeset:   3:c53d17ff3380

        Martin Geisler
    
tests: unify test-changelog-exec

              r11875
            
        tag:         tip

        parent:      2:ed1b79f46b9a

        parent:      1:d394a8db219b

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        Matt Mackall
    
commit: catch changed exec bit on files from p1 (issue4382)

              r22492
            
        files:       foo

        Martin Geisler
    
tests: unify test-changelog-exec

              r11875
            
        description:

        merge

        Sune Foldager
    
tests: fix deprecated use of hg debugdata/debugindex...

              r14182
            
        $ hg debugindex bar

        Bryan O'Sullivan
    
tests: reduce spurious failures when run with generaldelta...

              r17132
            
           rev    offset  length  ..... linkrev nodeid       p1           p2 (re)

             0         0       5  .....       1 b004912a8510 000000000000 000000000000 (re)

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

              r16913
            
        $ 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

Matt Mackall tests: replace exit 80 with #require	r22046	#require execbit

Martin Geisler tests: unify test-changelog-exec	r11875	b51a8138292a introduced a regression where we would mention in the
		changelog executable files added by the second parent of a merge. Test
		that that doesn't happen anymore

		$ hg init repo
		$ cd repo
		$ echo foo > foo
		$ hg ci -qAm 'add foo'

		$ echo bar > bar
		$ chmod +x bar
		$ hg ci -qAm 'add bar'

		manifest of p2:

		$ hg manifest
		bar
		foo

		$ hg up -qC 0
		$ echo >> foo
		$ hg ci -m 'change foo'
		created new head

		manifest of p1:

		$ hg manifest
		foo

		$ hg merge
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
Matt Mackall commit: catch changed exec bit on files from p1 (issue4382)	r22492	$ chmod +x foo
Martin Geisler tests: unify test-changelog-exec	r11875	$ hg ci -m 'merge'

Matt Mackall commit: catch changed exec bit on files from p1 (issue4382)	r22492	this should not mention bar but should mention foo:
Martin Geisler tests: unify test-changelog-exec	r11875
		$ hg tip -v
Matt Mackall commit: catch changed exec bit on files from p1 (issue4382)	r22492	changeset: 3:c53d17ff3380
Martin Geisler tests: unify test-changelog-exec	r11875	tag: tip
		parent: 2:ed1b79f46b9a
		parent: 1:d394a8db219b
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
Matt Mackall commit: catch changed exec bit on files from p1 (issue4382)	r22492	files: foo
Martin Geisler tests: unify test-changelog-exec	r11875	description:
		merge



Sune Foldager tests: fix deprecated use of hg debugdata/debugindex...	r14182	$ hg debugindex bar
Bryan O'Sullivan tests: reduce spurious failures when run with generaldelta...	r17132	rev offset length ..... linkrev nodeid p1 p2 (re)
		0 0 5 ..... 1 b004912a8510 000000000000 000000000000 (re)
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913
		$ cd ..