upstream/mercurial-mirror Files · tests/test-record.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.

Matt Mackall - - Load All Authors

File last commit:

r25304:9bc11716 default


                r25878:800e090e

stable

Download file

             test-record.t
        
                    87 lines
            
             | 2.5 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-record.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Set up a repo

        $ cat <<EOF >> $HGRCPATH

        > [ui]

        > interactive = true

        > [extensions]

        > record =

        > EOF

        $ hg init a

        $ cd a

      Record help

        $ hg record -h

        hg record [OPTION]... [FILE]...

        interactively select changes to commit

            If a list of files is omitted, all changes reported by "hg status" will be

            candidates for recording.

            See "hg help dates" for a list of formats valid for -d/--date.

            You will be prompted for whether to record changes to each modified file,

            and for files with multiple changes, for each change to use. For each

            query, the following responses are possible:

              y - record this change

              n - skip this change

              e - edit this change manually

              s - skip remaining changes to this file

              f - record remaining changes to this file

              d - done, skip remaining changes and files

              a - record all changes to all remaining files

              q - quit, recording no changes

              ? - display help

            This command is not available when committing a merge.

        options ([+] can be repeated):

         -A --addremove           mark new/missing files as added/removed before

                                  committing

            --close-branch        mark a branch head as closed

            --amend               amend the parent of the working directory

         -s --secret              use the secret phase for committing

         -e --edit                invoke editor on commit messages

         -I --include PATTERN [+] include names matching the given patterns

         -X --exclude PATTERN [+] exclude names matching the given patterns

         -m --message TEXT        use text as commit message

         -l --logfile FILE        read commit message from file

         -d --date DATE           record the specified date as commit date

         -u --user USER           record the specified user as committer

         -S --subrepos            recurse into subrepositories

         -w --ignore-all-space    ignore white space when comparing lines

         -b --ignore-space-change ignore changes in the amount of white space

         -B --ignore-blank-lines  ignore changes whose lines are all blank

        (some details hidden, use --verbose to show complete help)

      Select no files

        $ touch empty-rw

        $ hg add empty-rw

        $ hg record empty-rw<<EOF

        > n

        > EOF

        diff --git a/empty-rw b/empty-rw

        new file mode 100644

        examine changes to 'empty-rw'? [Ynesfdaq?] n

        no changes to record

        $ hg tip -p

        changeset:   -1:000000000000

        tag:         tip

        user:        

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

	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

				Set up a repo

				$ cat <<EOF >> $HGRCPATH
				> [ui]
				> interactive = true
				> [extensions]
				> record =
				> EOF

				$ hg init a
				$ cd a

				Record help

				$ hg record -h
				hg record [OPTION]... [FILE]...

				interactively select changes to commit

				If a list of files is omitted, all changes reported by "hg status" will be
				candidates for recording.

				See "hg help dates" for a list of formats valid for -d/--date.

				You will be prompted for whether to record changes to each modified file,
				and for files with multiple changes, for each change to use. For each
				query, the following responses are possible:

				y - record this change
				n - skip this change
				e - edit this change manually

				s - skip remaining changes to this file
				f - record remaining changes to this file

				d - done, skip remaining changes and files
				a - record all changes to all remaining files
				q - quit, recording no changes

				? - display help

				This command is not available when committing a merge.

				options ([+] can be repeated):

				-A --addremove mark new/missing files as added/removed before
				committing
				--close-branch mark a branch head as closed
				--amend amend the parent of the working directory
				-s --secret use the secret phase for committing
				-e --edit invoke editor on commit messages
				-I --include PATTERN [+] include names matching the given patterns
				-X --exclude PATTERN [+] exclude names matching the given patterns
				-m --message TEXT use text as commit message
				-l --logfile FILE read commit message from file
				-d --date DATE record the specified date as commit date
				-u --user USER record the specified user as committer
				-S --subrepos recurse into subrepositories
				-w --ignore-all-space ignore white space when comparing lines
				-b --ignore-space-change ignore changes in the amount of white space
				-B --ignore-blank-lines ignore changes whose lines are all blank

				(some details hidden, use --verbose to show complete help)

				Select no files

				$ touch empty-rw
				$ hg add empty-rw

				$ hg record empty-rw<<EOF
				> n
				> EOF
				diff --git a/empty-rw b/empty-rw
				new file mode 100644
				examine changes to 'empty-rw'? [Ynesfdaq?] n

				no changes to record

				$ hg tip -p
				changeset: -1:000000000000
				tag: tip
				user:
				date: Thu Jan 01 00:00:00 1970 +0000