upstream/mercurial-mirror Files · tests/test-changelog-exec.t

revset: add new topographical sort...

revset: add new topographical sort Sort revisions in reverse revision order but grouped by topographical branches. Visualised as a graph, instead of: o 4 | | o 3 | | | o 2 | | o | 1 |/ o 0 revisions on a 'main' branch are emitted before 'side' branches: o 4 | o 1 | | o 3 | | | o 2 |/ o 0 where what constitutes a 'main' branch is configurable, so the sort could also result in: o 3 | o 2 | | o 4 | | | o 1 |/ o 0 This sort was already available as an experimental option in the graphmod module, from which it is now removed. This sort is best used with hg log -G: $ hg log -G "sort(all(), topo)"

Matt Mackall - - Load All Authors

File last commit:

r22502:e6e7ef68 default


                r29348:2188f170

default

Download file

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

      #require execbit

      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)

        $ chmod +x foo

        $ hg ci -m 'merge'

      this should not mention bar but should mention foo:

        $ hg tip -v

        changeset:   3:c53d17ff3380

        tag:         tip

        parent:      2:ed1b79f46b9a

        parent:      1:d394a8db219b

        user:        test

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

        files:       foo

        description:

        merge

        $ hg debugindex bar

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

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

        $ 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

				#require execbit

				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)
				$ chmod +x foo
				$ hg ci -m 'merge'

				this should not mention bar but should mention foo:

				$ hg tip -v
				changeset: 3:c53d17ff3380
				tag: tip
				parent: 2:ed1b79f46b9a
				parent: 1:d394a8db219b
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				files: foo
				description:
				merge



				$ hg debugindex bar
				rev offset length ..... linkrev nodeid p1 p2 (re)
				0 0 5 ..... 1 b004912a8510 000000000000 000000000000 (re)

				$ cd ..