##// END OF EJS Templates
rebase: choose default destination the same way as 'hg merge' (BC)...
rebase: choose default destination the same way as 'hg merge' (BC) This changeset finally make 'hg rebase' choose its default destination using the same logic as 'hg merge'. The previous default was "tipmost changeset on the current branch", the new default is "the other head if there is only one". This change has multiple consequences: - Multiple tests which were not rebasing anything (rebasing from tipmost head) are now rebasing on the other "lower" branch. This is the expected new behavior. - A test is now explicitly aborting when there is too many heads on the branch. This is the expected behavior. - We gained a better detection of the "nothing to rebase" case while performing 'hg pull --rebase' so the message have been updated. Making clearer than an update was performed and why. This is beneficial side-effect. - Rebasing from an active bookmark will behave the same as 'hg merge' from a bookmark.

File last commit:

r27283:b38adef6 default
r28189:fac3a24b default
Show More
fakedirstatewritetime.py
68 lines | 2.3 KiB | text/x-python | PythonLexer
/ tests / fakedirstatewritetime.py
FUJIWARA Katsunori
tests: add extension to emulate invoking dirstate.write at the specific time...
r25752 # extension to emulate invoking 'dirstate.write()' at the time
# specified by '[fakedirstatewritetime] fakenow', only when
# 'dirstate.write()' is invoked via functions below:
#
# - 'workingctx._checklookup()' (= 'repo.status()')
# - 'committablectx.markcommitted()'
Gregory Szorc
tests/fakedirstatewritetime.py: use absolute_import
r27283 from __future__ import absolute_import
from mercurial import (
context,
dirstate,
extensions,
parsers,
util,
)
FUJIWARA Katsunori
tests: add extension to emulate invoking dirstate.write at the specific time...
r25752
def pack_dirstate(fakenow, orig, dmap, copymap, pl, now):
# execute what original parsers.pack_dirstate should do actually
# for consistency
actualnow = int(now)
for f, e in dmap.iteritems():
if e[0] == 'n' and e[3] == actualnow:
e = parsers.dirstatetuple(e[0], e[1], e[2], -1)
dmap[f] = e
return orig(dmap, copymap, pl, fakenow)
def fakewrite(ui, func):
# fake "now" of 'pack_dirstate' only if it is invoked while 'func'
fakenow = ui.config('fakedirstatewritetime', 'fakenow')
if not fakenow:
# Execute original one, if fakenow isn't configured. This is
# useful to prevent subrepos from executing replaced one,
# because replacing 'parsers.pack_dirstate' is also effective
# in subrepos.
return func()
# parsing 'fakenow' in YYYYmmddHHMM format makes comparison between
# 'fakenow' value and 'touch -t YYYYmmddHHMM' argument easy
FUJIWARA Katsunori
parsers: make pack_dirstate take now in integer for consistency...
r26630 fakenow = util.parsedate(fakenow, ['%Y%m%d%H%M'])[0]
FUJIWARA Katsunori
tests: add extension to emulate invoking dirstate.write at the specific time...
r25752
orig_pack_dirstate = parsers.pack_dirstate
FUJIWARA Katsunori
dirstate: make writing in-memory changes aware of transaction activity...
r26634 orig_dirstate_getfsnow = dirstate._getfsnow
FUJIWARA Katsunori
tests: add extension to emulate invoking dirstate.write at the specific time...
r25752 wrapper = lambda *args: pack_dirstate(fakenow, orig_pack_dirstate, *args)
parsers.pack_dirstate = wrapper
FUJIWARA Katsunori
dirstate: make writing in-memory changes aware of transaction activity...
r26634 dirstate._getfsnow = lambda *args: fakenow
FUJIWARA Katsunori
tests: add extension to emulate invoking dirstate.write at the specific time...
r25752 try:
return func()
finally:
parsers.pack_dirstate = orig_pack_dirstate
FUJIWARA Katsunori
dirstate: make writing in-memory changes aware of transaction activity...
r26634 dirstate._getfsnow = orig_dirstate_getfsnow
FUJIWARA Katsunori
tests: add extension to emulate invoking dirstate.write at the specific time...
r25752
def _checklookup(orig, workingctx, files):
ui = workingctx.repo().ui
return fakewrite(ui, lambda : orig(workingctx, files))
def markcommitted(orig, committablectx, node):
ui = committablectx.repo().ui
return fakewrite(ui, lambda : orig(committablectx, node))
def extsetup(ui):
extensions.wrapfunction(context.workingctx, '_checklookup',
_checklookup)
extensions.wrapfunction(context.committablectx, 'markcommitted',
markcommitted)