##// END OF EJS Templates
discovery: add extinct changesets to outgoing.excluded...
discovery: add extinct changesets to outgoing.excluded Before this change, push would incorrectly fast-path the bundle generation when extinct changesets are involved, because they are not added to outgoing.excluded. The reason to do so are related to outgoing.excluded being assumed to contain only secret changesets by scmutil.nochangesfound(), when displaying warnings like: changes found (ignored 9 secret changesets) Still, outgoing.excluded seems like a good API to report the extinct changesets instead of dedicated code and nothing in the docstring indicates it to be bound to secret changesets. This patch adds extinct changesets to outgoing.excluded and fixes scmutil.nochangesfound() to filter the excluded node list. Original version and test by Pierre-Yves.David@ens-lyon.org

File last commit:

r17132:b87acfda default
r17248:6ffb35b2 stable
Show More
test-copy.t
216 lines | 5.0 KiB | text/troff | Tads3Lexer
Adrian Buehlmann
tests: roll test-copy2.t into test-copy.t
r16856
$ mkdir part1
$ cd part1
Nicolas Dumazet
tests: unify test-copy
r11805 $ hg init
$ echo a > a
$ hg add a
Martin Geisler
tests: remove unneeded -d flags...
r12156 $ hg commit -m "1"
Nicolas Dumazet
tests: unify test-copy
r11805 $ hg status
$ hg copy a b
Adrian Buehlmann
add: introduce a warning message for non-portable filenames (issue2756) (BC)...
r13962 $ hg --config ui.portablefilenames=abort copy a con.xml
abort: filename contains 'con', which is reserved on Windows: 'con.xml'
[255]
Nicolas Dumazet
tests: unify test-copy
r11805 $ hg status
A b
$ hg sum
Martin Geisler
tests: remove unneeded -d flags...
r12156 parent: 0:c19d34741b0a tip
Nicolas Dumazet
tests: unify test-copy
r11805 1
branch: default
commit: 1 copied
update: (current)
Martin Geisler
tests: remove unneeded -d flags...
r12156 $ hg --debug commit -m "2"
Nicolas Dumazet
tests: unify test-copy
r11805 b
b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
Martin Geisler
tests: remove unneeded -d flags...
r12156 committed changeset 1:93580a2c28a50a56f63526fb305067e6fbf739c4
Nicolas Dumazet
tests: unify test-copy
r11805
we should see two history entries
$ hg history -v
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 1:93580a2c28a5
Nicolas Dumazet
tests: unify test-copy
r11805 tag: tip
user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-copy
r11805 files: b
description:
2
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 0:c19d34741b0a
Nicolas Dumazet
tests: unify test-copy
r11805 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-copy
r11805 files: a
description:
1
we should see one log entry for a
$ hg log a
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 0:c19d34741b0a
Nicolas Dumazet
tests: unify test-copy
r11805 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-copy
r11805 summary: 1
this should show a revision linked to changeset 0
Sune Foldager
tests: fix deprecated use of hg debugdata/debugindex...
r14182 $ hg debugindex a
Bryan O'Sullivan
tests: reduce spurious failures when run with generaldelta...
r17132 rev offset length ..... linkrev nodeid p1 p2 (re)
0 0 3 ..... 0 b789fdd96dc2 000000000000 000000000000 (re)
Nicolas Dumazet
tests: unify test-copy
r11805
we should see one log entry for b
$ hg log b
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 1:93580a2c28a5
Nicolas Dumazet
tests: unify test-copy
r11805 tag: tip
user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-copy
r11805 summary: 2
this should show a revision linked to changeset 1
Sune Foldager
tests: fix deprecated use of hg debugdata/debugindex...
r14182 $ hg debugindex b
Bryan O'Sullivan
tests: reduce spurious failures when run with generaldelta...
r17132 rev offset length ..... linkrev nodeid p1 p2 (re)
0 0 65 ..... 1 37d9b5d994ea 000000000000 000000000000 (re)
Nicolas Dumazet
tests: unify test-copy
r11805
this should show the rename information in the metadata
Sune Foldager
tests: fix deprecated use of hg debugdata/debugindex...
r14182 $ hg debugdata b 0 | head -3 | tail -2
Nicolas Dumazet
tests: unify test-copy
r11805 copy: a
copyrev: b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
Thomas Arendsen Hein
tests: make tests work if directory contains special characters...
r16350 $ "$TESTDIR/md5sum.py" .hg/store/data/b.i
Nicolas Dumazet
tests: unify test-copy
r11805 4999f120a3b88713bbefddd195cf5133 .hg/store/data/b.i
$ hg cat b > bsum
Thomas Arendsen Hein
tests: make tests work if directory contains special characters...
r16350 $ "$TESTDIR/md5sum.py" bsum
Nicolas Dumazet
tests: unify test-copy
r11805 60b725f10c9c85c70d97880dfe8191b3 bsum
$ hg cat a > asum
Thomas Arendsen Hein
tests: make tests work if directory contains special characters...
r16350 $ "$TESTDIR/md5sum.py" asum
Nicolas Dumazet
tests: unify test-copy
r11805 60b725f10c9c85c70d97880dfe8191b3 asum
$ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
2 files, 2 changesets, 2 total revisions
Adrian Buehlmann
tests: roll test-copy2.t into test-copy.t
r16856
$ cd ..
$ mkdir part2
$ cd part2
$ hg init
$ echo foo > foo
should fail - foo is not managed
$ hg mv foo bar
foo: not copying - file is not managed
abort: no files to copy
[255]
$ hg st -A
? foo
$ hg add foo
dry-run; print a warning that this is not a real copy; foo is added
$ hg mv --dry-run foo bar
foo has not been committed yet, so no copy data will be stored for bar.
$ hg st -A
A foo
should print a warning that this is not a real copy; bar is added
$ hg mv foo bar
foo has not been committed yet, so no copy data will be stored for bar.
$ hg st -A
A bar
should print a warning that this is not a real copy; foo is added
$ hg cp bar foo
bar has not been committed yet, so no copy data will be stored for foo.
$ hg rm -f bar
$ rm bar
$ hg st -A
A foo
$ hg commit -m1
moving a missing file
$ rm foo
$ hg mv foo foo3
foo: deleted in working copy
foo3 does not exist!
$ hg up -qC .
copy --after to a nonexistant target filename
$ hg cp -A foo dummy
foo: not recording copy - dummy does not exist
dry-run; should show that foo is clean
$ hg copy --dry-run foo bar
$ hg st -A
C foo
should show copy
$ hg copy foo bar
$ hg st -C
A bar
foo
shouldn't show copy
$ hg commit -m2
$ hg st -C
should match
$ hg debugindex foo
Bryan O'Sullivan
tests: reduce spurious failures when run with generaldelta...
r17132 rev offset length ..... linkrev nodeid p1 p2 (re)
0 0 5 ..... 0 2ed2a3912a0b 000000000000 000000000000 (re)
Adrian Buehlmann
tests: roll test-copy2.t into test-copy.t
r16856 $ hg debugrename bar
bar renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd
$ echo bleah > foo
$ echo quux > bar
$ hg commit -m3
should not be renamed
$ hg debugrename bar
bar not renamed
$ hg copy -f foo bar
should show copy
$ hg st -C
M bar
foo
$ hg commit -m3
should show no parents for tip
$ hg debugindex bar
Bryan O'Sullivan
tests: reduce spurious failures when run with generaldelta...
r17132 rev offset length ..... linkrev nodeid p1 p2 (re)
0 0 69 ..... 1 7711d36246cc 000000000000 000000000000 (re)
1 69 6 ..... 2 bdf70a2b8d03 7711d36246cc 000000000000 (re)
2 75 81 ..... 3 b2558327ea8d 000000000000 000000000000 (re)
Adrian Buehlmann
tests: roll test-copy2.t into test-copy.t
r16856 should match
$ hg debugindex foo
Bryan O'Sullivan
tests: reduce spurious failures when run with generaldelta...
r17132 rev offset length ..... linkrev nodeid p1 p2 (re)
0 0 5 ..... 0 2ed2a3912a0b 000000000000 000000000000 (re)
1 5 7 ..... 2 dd12c926cf16 2ed2a3912a0b 000000000000 (re)
Adrian Buehlmann
tests: roll test-copy2.t into test-copy.t
r16856 $ hg debugrename bar
bar renamed from foo:dd12c926cf165e3eb4cf87b084955cb617221c17
should show no copies
$ hg st -C
copy --after on an added file
$ cp bar baz
$ hg add baz
$ hg cp -A bar baz
$ hg st -C
A baz
bar
foo was clean:
$ hg st -AC foo
C foo
but it's considered modified after a copy --after --force
$ hg copy -Af bar foo
$ hg st -AC foo
M foo
bar
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913
$ cd ..