import: wrap a transaction around the whole command Now 'rollback' after 'import' is less surprising: it rolls back all of the imported changesets, not just the last one. As an extra added benefit, you don't need 'rollback -f' after 'import --bypass', which was an undesired side effect of fixing issue2998 (59e8bc22506e).. Note that this is a different take on issue963, which complained that rollback after importing multiple patches returned the working dir parent to the starting point, not to the second-last patch applied. Since we now rollback the entire import, returning the working dir to the starting point is entirely logical. So this change also undoes a732eebf1958, the fix to issue963, and updates its tests accordingly. Bottom line: rollback after import was weird before issue963, understandable since the fix for issue963, and even better now. [ original upstream message ]

     1

#!/usr/bin/env python

     2

# $Id$

     3

     4

from distutils.core import setup

     5

import os, time

     6

     7

# specify version, Mercurial version otherwise

     8

version = ''

     9

    10

unknown_version = 'unknown'

    11

    12

def getversion():

    13

    global version, unknown_version

    14

    if not version and os.path.isdir('.hg'):

    15

        p = os.popen('hg --quiet identify 2> %s' % os.devnull)

    16

        ident = p.read()[:-1]

    17

        if not p.close() and ident:

    18

            if ident[-1] != '+':

    19

                version = ident

    20

            else:

    21

                version = ident[:-1]

    22

                version += time.strftime('+%Y%m%d')

    23

    return version or unknown_version

    24

    25

setup(name='hgkw',

    26

      version=getversion(),

    27

      description='Mercurial keyword extension (standalone)',

    28

      author='Christian Ebert',

    29

      author_email='blacktrash@gmx.net',

    30

      url='http://www.blacktrash.org/hg/hgkeyword/',

    31

      license='GNU GPL',

    32

      packages=['hgkw'])