Mercurial > hg
annotate tests/mockblackbox.py @ 34015:2d80e078724a
tag: use filtered repo when creating new tags (issue5539)
When pruning a changeset that added a tag and then adding another tag, the
"pruned" tag gets restored. This is because the tag creation step (tags._tag()
call in tags.tag()) is currently done on the unfiltered repo. This behavior
has been there from 7977d35df13b which backs out b08af8f0ac01 with no clear
reason but caution on unthought situations at that time. In this changeset, we
pass the filtered repo to tags._tag(), preventing "pruned" tags to reappear.
This somehow restores b08af8f0ac01, though now we arguably have a valid use
case for.
author | Denis Laxalde <denis@laxalde.org> |
---|---|
date | Tue, 29 Aug 2017 11:25:22 +0200 |
parents | 043948c84647 |
children | f49c3ee5b02f |
rev | line source |
---|---|
28943
417380aa5bbe
py3: use absolute_import in mockblackbox.py
Robert Stanca <robert.stanca7@gmail.com>
parents:
28028
diff
changeset
|
1 from __future__ import absolute_import |
417380aa5bbe
py3: use absolute_import in mockblackbox.py
Robert Stanca <robert.stanca7@gmail.com>
parents:
28028
diff
changeset
|
2 from mercurial import ( |
417380aa5bbe
py3: use absolute_import in mockblackbox.py
Robert Stanca <robert.stanca7@gmail.com>
parents:
28028
diff
changeset
|
3 util, |
417380aa5bbe
py3: use absolute_import in mockblackbox.py
Robert Stanca <robert.stanca7@gmail.com>
parents:
28028
diff
changeset
|
4 ) |
24705
0ead0a07ed9c
tests: move mock blackbox extension into own file
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
5 |
32412
043948c84647
devel: update blackbox to use default-date
Boris Feld <boris.feld@octobus.net>
parents:
28943
diff
changeset
|
6 # XXX: we should probably offer a devel option to do this in blackbox directly |
24705
0ead0a07ed9c
tests: move mock blackbox extension into own file
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
7 def getuser(): |
0ead0a07ed9c
tests: move mock blackbox extension into own file
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
8 return 'bob' |
28028
ac49ecb2a897
tests: mock getpid to reduce glob usage
timeless <timeless@mozdev.org>
parents:
24705
diff
changeset
|
9 def getpid(): |
ac49ecb2a897
tests: mock getpid to reduce glob usage
timeless <timeless@mozdev.org>
parents:
24705
diff
changeset
|
10 return 5000 |
24705
0ead0a07ed9c
tests: move mock blackbox extension into own file
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
11 |
0ead0a07ed9c
tests: move mock blackbox extension into own file
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
12 # mock the date and user apis so the output is always the same |
0ead0a07ed9c
tests: move mock blackbox extension into own file
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
13 def uisetup(ui): |
0ead0a07ed9c
tests: move mock blackbox extension into own file
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
14 util.getuser = getuser |
28028
ac49ecb2a897
tests: mock getpid to reduce glob usage
timeless <timeless@mozdev.org>
parents:
24705
diff
changeset
|
15 util.getpid = getpid |