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

copies: add config option for writing copy metadata to file and/or changset...

copies: add config option for writing copy metadata to file and/or changset This introduces a config option that lets you choose to write copy metadata to the changeset extras instead of to filelog. There's also an option to write it to both places. I imagine that may possibly be useful when transitioning an existing repo. The copy metadata is stored as two fields in extras: one for copies since p1 and one for copies since p2. I may need to add more information later in order to make copy tracing faster. Specifically, I'm thinking out recording which files were added or removed so that copies._chaincopies() doesn't have to look at the manifest for that. But that would just be an optimization and that can be added once we know if it's necessary. I have also considered saving space by using replacing the destination file path by an index into the "files" list, but that can also be changed later (but before the feature is ready to release). Differential Revision: https://phab.mercurial-scm.org/D6183

Denis Laxalde - - Load All Authors

File last commit:

r34662:eb586ed5 default


                r42317:0e41f40b

default

Download file

             test-issue1502.t
        
                    43 lines
            
             | 1.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue1502.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      https://bz.mercurial-scm.org/1502

      Initialize repository

        $ hg init foo

        $ touch foo/a && hg -R foo commit -A -m "added a"

        adding a

        $ hg clone foo foo1

        updating to branch default

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

        $ echo "bar" > foo1/a && hg -R foo1 commit -m "edit a in foo1"

        $ echo "hi" > foo/a && hg -R foo commit -m "edited a foo"

        $ hg -R foo1 pull

        pulling from $TESTTMP/foo

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files (+1 heads)

        new changesets 273d008d6e8e

        (run 'hg heads' to see heads, 'hg merge' to merge)

        $ hg -R foo1 book branchy

        $ hg -R foo1 book

         * branchy                   1:e3e522925eff

      Pull. Bookmark should not jump to new head.

        $ echo "there" >> foo/a && hg -R foo commit -m "edited a again"

        $ hg -R foo1 pull

        pulling from $TESTTMP/foo

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        new changesets 84a798d48b17

        (run 'hg update' to get a working copy)

        $ hg -R foo1 book

         * branchy                   1:e3e522925eff

	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

				https://bz.mercurial-scm.org/1502

				Initialize repository

				$ hg init foo
				$ touch foo/a && hg -R foo commit -A -m "added a"
				adding a

				$ hg clone foo foo1
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ echo "bar" > foo1/a && hg -R foo1 commit -m "edit a in foo1"
				$ echo "hi" > foo/a && hg -R foo commit -m "edited a foo"
				$ hg -R foo1 pull
				pulling from $TESTTMP/foo
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files (+1 heads)
				new changesets 273d008d6e8e
				(run 'hg heads' to see heads, 'hg merge' to merge)

				$ hg -R foo1 book branchy
				$ hg -R foo1 book
				* branchy 1:e3e522925eff

				Pull. Bookmark should not jump to new head.

				$ echo "there" >> foo/a && hg -R foo commit -m "edited a again"
				$ hg -R foo1 pull
				pulling from $TESTTMP/foo
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				new changesets 84a798d48b17
				(run 'hg update' to get a working copy)

				$ hg -R foo1 book
				* branchy 1:e3e522925eff