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

shelve: add a shelve extension to save/restore working changes...

shelve: add a shelve extension to save/restore working changes This extension saves shelved changes using a temporary draft commit, and bundles the temporary commit and its draft ancestors, then strips them. This strategy makes it possible to use Mercurial's bundle and merge machinery to resolve conflicts if necessary when unshelving, even when the destination commit or its ancestors have been amended, squashed, or evolved. (Once a change has been unshelved, its associated unbundled commits are either rolled back or stripped.) Storing the shelved change as a bundle also avoids the difficulty that hidden commits would cause, of making it impossible to amend the parent if it is a draft commits (a common scenario). Although this extension shares its name and some functionality with the third party hgshelve extension, it has little else in common. Notably, the hgshelve extension shelves changes as unified diffs, which makes conflict resolution a matter of finding .rej files and conflict markers, and cleaning up the mess by hand. We do not yet allow hunk-level choosing of changes to record. Compared to the hgshelve extension, this is a small regression in usability, but we hope to integrate that at a later point, once the record machinery becomes more reusable and robust.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r19854:49d4919d

default

Download file

             test-paths.t
        
                    65 lines
            
             | 1.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-paths.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Nicolas Dumazet
    
tests: unify test-paths

              r11785
            
        $ hg init a

        $ hg clone a b

        updating to branch default

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

        $ cd a

        $ echo '[paths]' >> .hg/hgrc

        $ echo 'dupe = ../b' >> .hg/hgrc

        Benoit Boissinot
    
ui.paths: expand paths directly in fixconfig (issue2373)...

              r12662
            
        $ echo 'expand = $SOMETHING/bar' >> .hg/hgrc

        Nicolas Dumazet
    
tests: unify test-paths

              r11785
            
        $ hg in dupe

        Mads Kiilerich
    
tests: make (glob) on windows accept \ instead of /...

              r15447
            
        comparing with $TESTTMP/b (glob)

        Nicolas Dumazet
    
tests: unify test-paths

              r11785
            
        no changes found

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [1]

        Nicolas Dumazet
    
tests: unify test-paths

              r11785
            
        $ cd ..

        $ hg -R a in dupe

        Mads Kiilerich
    
tests: make (glob) on windows accept \ instead of /...

              r15447
            
        comparing with $TESTTMP/b (glob)

        Nicolas Dumazet
    
tests: unify test-paths

              r11785
            
        no changes found

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [1]

        Benoit Boissinot
    
ui.paths: expand paths directly in fixconfig (issue2373)...

              r12662
            
        $ cd a

        $ hg paths

        Mads Kiilerich
    
tests: make (glob) on windows accept \ instead of /...

              r15447
            
        dupe = $TESTTMP/b (glob)

        expand = $TESTTMP/a/$SOMETHING/bar (glob)

        Benoit Boissinot
    
ui.paths: expand paths directly in fixconfig (issue2373)...

              r12662
            
        $ SOMETHING=foo hg paths

        Mads Kiilerich
    
tests: make (glob) on windows accept \ instead of /...

              r15447
            
        dupe = $TESTTMP/b (glob)

        expand = $TESTTMP/a/foo/bar (glob)

        Adrian Buehlmann
    
test-paths.t: enable for Windows using #if...

              r16843
            
      #if msys

        $ SOMETHING=//foo hg paths

        dupe = $TESTTMP/b (glob)

        expand = /foo/bar

      #else

        Benoit Boissinot
    
ui.paths: expand paths directly in fixconfig (issue2373)...

              r12662
            
        $ SOMETHING=/foo hg paths

        Mads Kiilerich
    
tests: make (glob) on windows accept \ instead of /...

              r15447
            
        dupe = $TESTTMP/b (glob)

        Benoit Boissinot
    
ui.paths: expand paths directly in fixconfig (issue2373)...

              r12662
            
        expand = /foo/bar

        Adrian Buehlmann
    
test-paths.t: enable for Windows using #if...

              r16843
            
      #endif

        Thomas Arendsen Hein
    
paths: Add support for -q/--quiet...

              r14331
            
        $ hg paths -q

        dupe

        expand

        $ hg paths dupe

        Mads Kiilerich
    
tests: make (glob) on windows accept \ instead of /...

              r15447
            
        $TESTTMP/b (glob)

        Thomas Arendsen Hein
    
paths: Add support for -q/--quiet...

              r14331
            
        $ hg paths -q dupe

        $ hg paths unknown

        not found!

        [1]

        $ hg paths -q unknown

        [1]

        Adrian Buehlmann
    
test-paths.t: 'file:' disables [paths] entries for clone dest

              r13797
            
        $ cd ..

      'file:' disables [paths] entries for clone destination

        $ cat >> $HGRCPATH <<EOF

        > [paths]

        > gpath1 = http://hg.example.com

        > EOF

        $ hg clone a gpath1

        abort: cannot create new http repository

        [255]

        $ hg clone a file:gpath1

        updating to branch default

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

        $ cd gpath1

        $ hg -q id

        000000000000

        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

Nicolas Dumazet tests: unify test-paths	r11785	$ hg init a
		$ hg clone a b
		updating to branch default
		0 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cd a
		$ echo '[paths]' >> .hg/hgrc
		$ echo 'dupe = ../b' >> .hg/hgrc
Benoit Boissinot ui.paths: expand paths directly in fixconfig (issue2373)...	r12662	$ echo 'expand = $SOMETHING/bar' >> .hg/hgrc
Nicolas Dumazet tests: unify test-paths	r11785	$ hg in dupe
Mads Kiilerich tests: make (glob) on windows accept \ instead of /...	r15447	comparing with $TESTTMP/b (glob)
Nicolas Dumazet tests: unify test-paths	r11785	no changes found
Matt Mackall tests: add exit codes to unified tests	r12316	[1]
Nicolas Dumazet tests: unify test-paths	r11785	$ cd ..
		$ hg -R a in dupe
Mads Kiilerich tests: make (glob) on windows accept \ instead of /...	r15447	comparing with $TESTTMP/b (glob)
Nicolas Dumazet tests: unify test-paths	r11785	no changes found
Matt Mackall tests: add exit codes to unified tests	r12316	[1]
Benoit Boissinot ui.paths: expand paths directly in fixconfig (issue2373)...	r12662	$ cd a
		$ hg paths
Mads Kiilerich tests: make (glob) on windows accept \ instead of /...	r15447	dupe = $TESTTMP/b (glob)
		expand = $TESTTMP/a/$SOMETHING/bar (glob)
Benoit Boissinot ui.paths: expand paths directly in fixconfig (issue2373)...	r12662	$ SOMETHING=foo hg paths
Mads Kiilerich tests: make (glob) on windows accept \ instead of /...	r15447	dupe = $TESTTMP/b (glob)
		expand = $TESTTMP/a/foo/bar (glob)
Adrian Buehlmann test-paths.t: enable for Windows using #if...	r16843	#if msys
		$ SOMETHING=//foo hg paths
		dupe = $TESTTMP/b (glob)
		expand = /foo/bar
		#else
Benoit Boissinot ui.paths: expand paths directly in fixconfig (issue2373)...	r12662	$ SOMETHING=/foo hg paths
Mads Kiilerich tests: make (glob) on windows accept \ instead of /...	r15447	dupe = $TESTTMP/b (glob)
Benoit Boissinot ui.paths: expand paths directly in fixconfig (issue2373)...	r12662	expand = /foo/bar
Adrian Buehlmann test-paths.t: enable for Windows using #if...	r16843	#endif
Thomas Arendsen Hein paths: Add support for -q/--quiet...	r14331	$ hg paths -q
		dupe
		expand
		$ hg paths dupe
Mads Kiilerich tests: make (glob) on windows accept \ instead of /...	r15447	$TESTTMP/b (glob)
Thomas Arendsen Hein paths: Add support for -q/--quiet...	r14331	$ hg paths -q dupe
		$ hg paths unknown
		not found!
		[1]
		$ hg paths -q unknown
		[1]
Adrian Buehlmann test-paths.t: 'file:' disables [paths] entries for clone dest	r13797	$ cd ..

		'file:' disables [paths] entries for clone destination

		$ cat >> $HGRCPATH <<EOF
		> [paths]
		> gpath1 = http://hg.example.com
		> EOF

		$ hg clone a gpath1
		abort: cannot create new http repository
		[255]

		$ hg clone a file:gpath1
		updating to branch default
		0 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cd gpath1
		$ hg -q id
		000000000000

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