##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

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 fe03f522dda9 for detail) and prevents from certainly reproducing the issue.
Matt Harbison - - Load All Authors

File last commit:

r24891:be491500 stable
r25878:800e090e stable
Show More
test-install.t
43 lines | 1.4 KiB | text/troff | Tads3Lexer
/ tests / test-install.t
History | Source | Raw |Copy content |Copy permalink
Pradeepkumar Gayam
tests: unify test-install
 r11917 hg debuginstall
$ hg debuginstall
Martin Geisler
debuginstall: lowercase status messages
 r16934 checking encoding (ascii)...
Matt Mackall
debuginstall: change showing to checking for consistency and future checking
 r20741 checking Python executable (*) (glob)
checking Python version (2.*) (glob)
Adrian Buehlmann
debuginstall: show directory for Python lib...
 r17392 checking Python lib (*lib*)... (glob)
Martin Geisler
debuginstall: lowercase status messages
 r16934 checking installed modules (*mercurial)... (glob)
checking templates (*mercurial?templates)... (glob)
checking commit editor...
checking username...
no problems detected
Pradeepkumar Gayam
tests: unify test-install
 r11917
hg debuginstall with no username
$ HGUSER= hg debuginstall
Martin Geisler
debuginstall: lowercase status messages
 r16934 checking encoding (ascii)...
Matt Mackall
debuginstall: change showing to checking for consistency and future checking
 r20741 checking Python executable (*) (glob)
checking Python version (2.*) (glob)
Adrian Buehlmann
debuginstall: show directory for Python lib...
 r17392 checking Python lib (*lib*)... (glob)
Martin Geisler
debuginstall: lowercase status messages
 r16934 checking installed modules (*mercurial)... (glob)
checking templates (*mercurial?templates)... (glob)
checking commit editor...
checking username...
Matt Mackall
ui: suggest config --edit when no username is set
 r20574 no username supplied
Martin Geisler
Merge with stable
 r12084 (specify a username in your configuration file)
Pradeepkumar Gayam
tests: unify test-install
 r11917 1 problems detected, please check your install!
Matt Mackall
tests: add exit codes to unified tests
 r12316 [1]
Matt Harbison
debuginstall: expand the editor path before searching for it (issue4380)...
 r24891
path variables are expanded (~ is the same as $TESTTMP)
$ mkdir tools
$ touch tools/testeditor.exe
#if execbit
$ chmod 755 tools/testeditor.exe
#endif
$ hg debuginstall --config ui.editor=~/tools/testeditor.exe
checking encoding (ascii)...
checking Python executable (*) (glob)
checking Python version (*) (glob)
checking Python lib (*lib*)... (glob)
checking installed modules (*mercurial)... (glob)
checking templates (*mercurial?templates)... (glob)
checking commit editor...
checking username...
no problems detected