##// END OF EJS Templates
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

File last commit:

r39743:5abc47d4 default
r42317:0e41f40b default
Show More
test-contrib.t
175 lines | 3.8 KiB | text/troff | Tads3Lexer
Augie Fackler
Move test-dumprevlog to test-contrib in anticipation of more contrib tests
r14031 Set vars:
Thomas Arendsen Hein
tests: make tests work if directory contains special characters...
r16350 $ CONTRIBDIR="$TESTDIR/../contrib"
Augie Fackler
Move test-dumprevlog to test-contrib in anticipation of more contrib tests
r14031
Augie Fackler
test-simplemerge-cmd.t: move all tests into test-contrib.t
r14032 Test simplemerge command:
$ cp "$CONTRIBDIR/simplemerge" .
$ echo base > base
$ echo local > local
$ cat base >> local
$ cp local orig
$ cat base > other
$ echo other >> other
changing local directly
Matt Harbison
tests: quote PYTHON usage...
r39743 $ "$PYTHON" simplemerge local base other && echo "merge succeeded"
Augie Fackler
test-simplemerge-cmd.t: move all tests into test-contrib.t
r14032 merge succeeded
$ cat local
local
base
other
$ cp orig local
printing to stdout
Matt Harbison
tests: quote PYTHON usage...
r39743 $ "$PYTHON" simplemerge -p local base other
Augie Fackler
test-simplemerge-cmd.t: move all tests into test-contrib.t
r14032 local
base
other
local:
$ cat local
local
base
conflicts
$ cp base conflict-local
$ cp other conflict-other
$ echo not other >> conflict-local
$ echo end >> conflict-local
$ echo end >> conflict-other
Pierre-Yves David
simplemerge: burn "minimal" feature to the ground...
r22023
Matt Harbison
tests: quote PYTHON usage...
r39743 $ "$PYTHON" simplemerge -p conflict-local base conflict-other
Augie Fackler
test-simplemerge-cmd.t: move all tests into test-contrib.t
r14032 base
<<<<<<< conflict-local
not other
=======
other
Ryan McElroy
merge: minimize conflicts when common base is not shown (issue4447)...
r28072 >>>>>>> conflict-other
Augie Fackler
test-simplemerge-cmd.t: move all tests into test-contrib.t
r14032 end
[1]
1 label
Matt Harbison
tests: quote PYTHON usage...
r39743 $ "$PYTHON" simplemerge -p -L foo conflict-local base conflict-other
Augie Fackler
test-simplemerge-cmd.t: move all tests into test-contrib.t
r14032 base
<<<<<<< foo
not other
=======
other
Ryan McElroy
merge: minimize conflicts when common base is not shown (issue4447)...
r28072 >>>>>>> conflict-other
Pierre-Yves David
simplemerge: burn "minimal" feature to the ground...
r22023 end
Augie Fackler
test-simplemerge-cmd.t: move all tests into test-contrib.t
r14032 [1]
2 labels
Matt Harbison
tests: quote PYTHON usage...
r39743 $ "$PYTHON" simplemerge -p -L foo -L bar conflict-local base conflict-other
Augie Fackler
test-simplemerge-cmd.t: move all tests into test-contrib.t
r14032 base
<<<<<<< foo
not other
=======
other
Ryan McElroy
merge: minimize conflicts when common base is not shown (issue4447)...
r28072 >>>>>>> bar
Pierre-Yves David
simplemerge: burn "minimal" feature to the ground...
r22023 end
Augie Fackler
test-simplemerge-cmd.t: move all tests into test-contrib.t
r14032 [1]
Pierre-Yves David
simplemerge: support three labels when merging...
r22024 3 labels
Matt Harbison
tests: quote PYTHON usage...
r39743 $ "$PYTHON" simplemerge -p -L foo -L bar -L base conflict-local base conflict-other
Pierre-Yves David
simplemerge: support three labels when merging...
r22024 base
<<<<<<< foo
not other
end
||||||| base
=======
other
end
>>>>>>> bar
[1]
Augie Fackler
test-simplemerge-cmd.t: move all tests into test-contrib.t
r14032 too many labels
Matt Harbison
tests: quote PYTHON usage...
r39743 $ "$PYTHON" simplemerge -p -L foo -L bar -L baz -L buz conflict-local base conflict-other
Pierre-Yves David
simplemerge: support three labels when merging...
r22024 abort: can only specify three labels.
Augie Fackler
test-simplemerge-cmd.t: move all tests into test-contrib.t
r14032 [255]
binary file
Matt Harbison
tests: quote PYTHON usage...
r39743 $ "$PYTHON" -c "f = open('binary-local', 'w'); f.write('\x00'); f.close()"
Augie Fackler
test-simplemerge-cmd.t: move all tests into test-contrib.t
r14032 $ cat orig >> binary-local
Matt Harbison
tests: quote PYTHON usage...
r39743 $ "$PYTHON" simplemerge -p binary-local base other
Sune Foldager
fix test broken in merge from stable
r14330 warning: binary-local looks like a binary file.
[1]
Augie Fackler
test-simplemerge-cmd.t: move all tests into test-contrib.t
r14032
binary file --text
Matt Harbison
tests: quote PYTHON usage...
r39743 $ "$PYTHON" simplemerge -a -p binary-local base other 2>&1
Augie Fackler
test-simplemerge-cmd.t: move all tests into test-contrib.t
r14032 warning: binary-local looks like a binary file.
\x00local (esc)
base
other
help
Matt Harbison
tests: quote PYTHON usage...
r39743 $ "$PYTHON" simplemerge --help
Augie Fackler
test-simplemerge-cmd.t: move all tests into test-contrib.t
r14032 simplemerge [OPTS] LOCAL BASE OTHER
Simple three-way file merge utility with a minimal feature set.
Apply to LOCAL the changes necessary to go from BASE to OTHER.
By default, LOCAL is overwritten with the results of this operation.
options:
-L --label labels to use on conflict markers
-a --text treat all files as text
-p --print print results instead of overwriting LOCAL
Pierre-Yves David
simplemerge: burn "minimal" feature to the ground...
r22023 --no-minimal no effect (DEPRECATED)
Augie Fackler
test-simplemerge-cmd.t: move all tests into test-contrib.t
r14032 -h --help display help and exit
-q --quiet suppress output
wrong number of arguments
Matt Harbison
tests: quote PYTHON usage...
r39743 $ "$PYTHON" simplemerge
Augie Fackler
test-simplemerge-cmd.t: move all tests into test-contrib.t
r14032 simplemerge: wrong number of arguments
simplemerge [OPTS] LOCAL BASE OTHER
Simple three-way file merge utility with a minimal feature set.
Apply to LOCAL the changes necessary to go from BASE to OTHER.
By default, LOCAL is overwritten with the results of this operation.
options:
-L --label labels to use on conflict markers
-a --text treat all files as text
-p --print print results instead of overwriting LOCAL
Pierre-Yves David
simplemerge: burn "minimal" feature to the ground...
r22023 --no-minimal no effect (DEPRECATED)
Augie Fackler
test-simplemerge-cmd.t: move all tests into test-contrib.t
r14032 -h --help display help and exit
-q --quiet suppress output
[1]
bad option
Matt Harbison
tests: quote PYTHON usage...
r39743 $ "$PYTHON" simplemerge --foo -p local base other
Augie Fackler
test-simplemerge-cmd.t: move all tests into test-contrib.t
r14032 simplemerge: option --foo not recognized
simplemerge [OPTS] LOCAL BASE OTHER
Simple three-way file merge utility with a minimal feature set.
Apply to LOCAL the changes necessary to go from BASE to OTHER.
By default, LOCAL is overwritten with the results of this operation.
options:
-L --label labels to use on conflict markers
-a --text treat all files as text
-p --print print results instead of overwriting LOCAL
Pierre-Yves David
simplemerge: burn "minimal" feature to the ground...
r22023 --no-minimal no effect (DEPRECATED)
Augie Fackler
test-simplemerge-cmd.t: move all tests into test-contrib.t
r14032 -h --help display help and exit
-q --quiet suppress output
[1]