filemerge: when not keeping premerge, don't write markers to context When premerge is enabled (as it is for non-binary inputs by default) and the markers are not kept, we currently still write it to the output context and then restore the previous content right after. With the refactoring in the previous patch, we can easily avoid that step and instead write the output in the opposite case (i.e. when it's successful or when the markers are supposed to be kept). Differential Revision: https://phab.mercurial-scm.org/D12149

     1

from __future__ import absolute_import

     2

     3

import os

     4

import time

     5

     6

     7

class mocktime(object):

     8

    def __init__(self, increment):

     9

        self.time = 0

    10

        self.increment = [float(s) for s in increment.split()]

    11

        self.pos = 0

    12

    13

    def __call__(self):

    14

        self.time += self.increment[self.pos % len(self.increment)]

    15

        self.pos += 1

    16

        return self.time

    17

    18

    19

def uisetup(ui):

    20

    time.time = mocktime(os.environ.get('MOCKTIME', '0.1'))