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

localrepo: make journal.dirstate contain in-memory changes before transaction...

localrepo: make journal.dirstate contain in-memory changes before transaction Before this patch, in-memory dirstate changes aren't written out at opening transaction, even though 'journal.dirstate' is created directly from '.hg/dirstate'. Therefore, subsequent 'hg rollback' uses incomplete 'undo.dirstate' to restore dirstate, if dirstate is changed and isn't written out before opening transaction. In cases below, the condition "dirstate is changed and isn't written out before opening transaction" isn't satisfied and this problem doesn't appear: - "wlock scope" and "transaction scope" are almost equivalent e.g. 'commit --amend', 'import' and so on - dirstate changes are written out before opening transaction e.g. 'rebase' (via 'dirstateguard') and 'commit -A' (by separated wlock scopes) On the other hand, 'backout' may satisfy the condition above. To make 'journal.dirstate' contain in-memory changes before opening transaction, this patch explicitly invokes 'dirstate.write()' in 'localrepository.transaction()'. 'dirstate.write()' is placed before not "writing journal files out" but "invoking pretxnopen hooks" for visibility of dirstate changes to external hook processes. BTW, in the test script, 'touch -t 200001010000' and 'hg status' are invoked to make file 'c' surely clean in dirstate, because "clean but unsure" files indirectly cause 'dirstate.write()' at 'repo.status()' in 'repo.commit()' (see for detail) and prevents from certainly reproducing the issue.

Pierre-Yves David - - Load All Authors

File last commit:

r25290:8f88f768 default


                r25878:800e090e

stable

Download file

             test-basic.t
        
                    68 lines
            
             | 1.4 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-basic.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: unify test-basic

              r11742
            
      Create a repository:

        Matt Mackall
    
config: make repo optional again

              r20608
            
        $ hg config

        defaults.backout=-d "0 0"

        defaults.commit=-d "0 0"

        defaults.shelve=--date "0 0"

        defaults.tag=-d "0 0"

        Pierre-Yves David
    
devel: rename 'all' to 'all-warnings' (BC)...

              r25290
            
        devel.all-warnings=true

        Matt Harbison
    
run-tests: set a default largefiles usercache in the default hgrc file...

              r23388
            
        largefiles.usercache=$TESTTMP/.cache/largefiles (glob)

        Matt Mackall
    
config: make repo optional again

              r20608
            
        ui.slash=True

        ui.interactive=False

        FUJIWARA Katsunori
    
filemerge: use 'basic' as the default of '[ui] mergemarkers' for safety...

              r21918
            
        ui.mergemarkers=detailed

        Yuya Nishihara
    
ui: separate option to show prompt echo, enabled only in tests (issue4417)...

              r23053
            
        ui.promptecho=True

        Martin Geisler
    
tests: remove redundant mkdir...

              r13956
            
        $ hg init t

        Matt Mackall
    
tests: unify test-basic

              r11742
            
        $ cd t

      Make a changeset:

        $ echo a > a

        $ hg add a

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg commit -m test

        Matt Mackall
    
tests: unify test-basic

              r11742
            
      This command is ancient:

        $ hg history

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        changeset:   0:acb14030fe0a

        Matt Mackall
    
tests: unify test-basic

              r11742
            
        tag:         tip

        user:        test

        Martin Geisler
    
tests: remove unneeded -d flags...

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

        Matt Mackall
    
tests: unify test-basic

              r11742
            
        summary:     test

        Mark Drago
    
commands.update() now works properly with a revision of 0...

              r13568
            
      Verify that updating to revision 0 via commands.update() works properly

        $ cat <<EOF > update_to_rev0.py

        > from mercurial import ui, hg, commands

        > myui = ui.ui()

        > repo = hg.repository(myui, path='.')

        > commands.update(myui, repo, rev=0)

        > EOF

        $ hg up null

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

        $ python ./update_to_rev0.py

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

        $ hg identify -n

        0

        Mads Kiilerich
    
check-code: fix check for trailing whitespace on empty lines...

              r17346
            
        Mark Drago
    
commands.update() now works properly with a revision of 0...

              r13568
            
        Matt Mackall
    
tests: unify test-basic

              r11742
            
      Poke around at hashes:

        $ hg manifest --debug

        b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644   a

        $ hg cat a

        a

      Verify should succeed:

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 1 changesets, 1 total revisions

      At the end...

        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: unify test-basic	r11742	Create a repository:

Matt Mackall config: make repo optional again	r20608	$ hg config
		defaults.backout=-d "0 0"
		defaults.commit=-d "0 0"
		defaults.shelve=--date "0 0"
		defaults.tag=-d "0 0"
Pierre-Yves David devel: rename 'all' to 'all-warnings' (BC)...	r25290	devel.all-warnings=true
Matt Harbison run-tests: set a default largefiles usercache in the default hgrc file...	r23388	largefiles.usercache=$TESTTMP/.cache/largefiles (glob)
Matt Mackall config: make repo optional again	r20608	ui.slash=True
		ui.interactive=False
FUJIWARA Katsunori filemerge: use 'basic' as the default of '[ui] mergemarkers' for safety...	r21918	ui.mergemarkers=detailed
Yuya Nishihara ui: separate option to show prompt echo, enabled only in tests (issue4417)...	r23053	ui.promptecho=True
Martin Geisler tests: remove redundant mkdir...	r13956	$ hg init t
Matt Mackall tests: unify test-basic	r11742	$ cd t

		Make a changeset:

		$ echo a > a
		$ hg add a
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m test
Matt Mackall tests: unify test-basic	r11742
		This command is ancient:

		$ hg history
Martin Geisler tests: remove unneeded -d flags...	r12156	changeset: 0:acb14030fe0a
Matt Mackall tests: unify test-basic	r11742	tag: tip
		user: test
Martin Geisler tests: remove unneeded -d flags...	r12156	date: Thu Jan 01 00:00:00 1970 +0000
Matt Mackall tests: unify test-basic	r11742	summary: test


Mark Drago commands.update() now works properly with a revision of 0...	r13568	Verify that updating to revision 0 via commands.update() works properly

		$ cat <<EOF > update_to_rev0.py
		> from mercurial import ui, hg, commands
		> myui = ui.ui()
		> repo = hg.repository(myui, path='.')
		> commands.update(myui, repo, rev=0)
		> EOF
		$ hg up null
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ python ./update_to_rev0.py
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ hg identify -n
		0
Mads Kiilerich check-code: fix check for trailing whitespace on empty lines...	r17346
Mark Drago commands.update() now works properly with a revision of 0...	r13568
Matt Mackall tests: unify test-basic	r11742	Poke around at hashes:

		$ hg manifest --debug
		b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a

		$ hg cat a
		a

		Verify should succeed:

		$ hg verify
		checking changesets
		checking manifests
		crosschecking files in changesets and manifests
		checking files
		1 files, 1 changesets, 1 total revisions

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