Mercurial > hg
annotate tests/test-diff-issue2761.t @ 44091:3df0bd706c40
graftcopies: use _filter() for filtering out invalid copies
`graftcopies()` (formerly called `duplicatecopies()`) checked that the
copy destination existed in the working copy, but it didn't check that
copy source existed in the parent of the working copy. In
`test-graft.t` we can see that as warnings about not finding ancestors
of the copied files, and also empty commits getting created.
This patch uses the existing `_filter()` function for filtering out
invalid copies. In addition to the aforementioned types, that also
includes copies where source and destination is the same.
Differential Revision: https://phab.mercurial-scm.org/D7859
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 27 Dec 2019 15:14:19 -0800 |
parents | 73e3e368bd42 |
children | 55c6ebd11cb9 |
rev | line source |
---|---|
13929
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
1 Test issue2761 |
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
2 |
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
3 $ hg init |
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
4 |
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
5 $ touch to-be-deleted |
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
6 $ hg add |
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
7 adding to-be-deleted |
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
8 $ hg ci -m first |
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
9 $ echo a > to-be-deleted |
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
10 $ hg ci -m second |
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
11 $ rm to-be-deleted |
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
12 $ hg diff -r 0 |
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
13 |
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
14 Same issue, different code path |
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
15 |
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
16 $ hg up -C |
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
17 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17486 | 18 $ touch does-not-exist-in-1 |
13929
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
19 $ hg add |
17486 | 20 adding does-not-exist-in-1 |
13929
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
21 $ hg ci -m third |
17486 | 22 $ rm does-not-exist-in-1 |
13929
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
23 $ hg diff -r 1 |