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

largefiles: factor out procedures to update standins for pre-committing...

largefiles: factor out procedures to update standins for pre-committing This patch factors out procedures to update standins for pre-committing. This is one of preparations to avoid execution of such procedures according to invocation context. For example, resuming automated committing (e.g. "hg rebase --continue") should update standins at the 1st commit, because largefiles in the working directory may be modified manually. But on the other hand, it should avoid updating standins at subsequent committings for efficiency reason. For simplicity, this patch just moves procedures mechanically only with replacing below. - "self" => "repo" - "lfutil." => (none) - "orig" invocation => returning "match" Using "fstandin" instead "standin" as the name of local variable for the loop below is the only special care, because the latter shadows the same name function in "lfutil.py". [before] for standin in standins: lfile = lfutil.splitstandin(standin) if lfdirstate[lfile] != 'r': lfutil.updatestandin(self, standin) [after] for fstandin in standins: lfile = splitstandin(fstandin) if lfdirstate[lfile] != 'r': updatestandin(repo, fstandin)

Matt Mackall - - Load All Authors

File last commit:

r16094:0776a6ca default


                r23185:9870173e

default

Download file

             test-issue612.t
        
                    34 lines
            
             | 633 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue612.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: fix a bunch of pointless #s in unified tests

              r12328
            
      http://mercurial.selenic.com/bts/issue612

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        $ hg init

        $ mkdir src

        $ echo a > src/a.c

        $ hg ci -Ama

        adding src/a.c

        $ hg mv src source

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

              r15447
            
        moving src/a.c to source/a.c (glob)

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        $ hg ci -Ammove

        $ hg co -C 0

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

        $ echo new > src/a.c

        $ echo compiled > src/a.o

        $ hg ci -mupdate

        created new head

        $ hg status

        ? src/a.o

        $ hg merge

        merging src/a.c and source/a.c to source/a.c

        Matt Mackall
    
merge: don't use unknown()...

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

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        (branch merge, don't forget to commit)

        $ hg status

        M source/a.c

        R src/a.c

        Matt Mackall
    
merge: don't use unknown()...

              r16094
            
        ? src/a.o

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195

	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: fix a bunch of pointless #s in unified tests	r12328	http://mercurial.selenic.com/bts/issue612
Adrian Buehlmann tests: unify test-issue*	r12195
		$ hg init
		$ mkdir src
		$ echo a > src/a.c
		$ hg ci -Ama
		adding src/a.c

		$ hg mv src source
Mads Kiilerich tests: make (glob) on windows accept \ instead of /...	r15447	moving src/a.c to source/a.c (glob)
Adrian Buehlmann tests: unify test-issue*	r12195
		$ hg ci -Ammove

		$ hg co -C 0
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved

		$ echo new > src/a.c
		$ echo compiled > src/a.o
		$ hg ci -mupdate
		created new head

		$ hg status
		? src/a.o

		$ hg merge
		merging src/a.c and source/a.c to source/a.c
Matt Mackall merge: don't use unknown()...	r16094	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
Adrian Buehlmann tests: unify test-issue*	r12195	(branch merge, don't forget to commit)

		$ hg status
		M source/a.c
		R src/a.c
Matt Mackall merge: don't use unknown()...	r16094	? src/a.o
Adrian Buehlmann tests: unify test-issue*	r12195