Mercurial > hg

comparison hgext/fetch.py @ 29121:dc406c7e41d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: make hgext/fetch.py use absolute_import
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 06 May 2016 21:44:41 +0530
parents 9dcc9ed26d33
children d5883fd055c6
comparison
equal deleted inserted replaced
29120:a39341452647 29121:dc406c7e41d6
5 # This software may be used and distributed according to the terms of the 5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version. 6 # GNU General Public License version 2 or any later version.
7 7
8 '''pull, update and merge in one command (DEPRECATED)''' 8 '''pull, update and merge in one command (DEPRECATED)'''
9 9
10 from __future__ import absolute_import
11
10 from mercurial.i18n import _ 12 from mercurial.i18n import _
11 from mercurial.node import short 13 from mercurial.node import (
12 from mercurial import commands, cmdutil, hg, util, error 14 short,
13 from mercurial.lock import release 15 )
14 from mercurial import exchange 16 from mercurial import (
17 cmdutil,
18 commands,
19 error,
20 exchange,
21 hg,
22 lock,
23 util,
24 )
15 25
26 release = lock.release
16 cmdtable = {} 27 cmdtable = {}
17 command = cmdutil.command(cmdtable) 28 command = cmdutil.command(cmdtable)
18 # Note for extension authors: ONLY specify testedwith = 'internal' for 29 # Note for extension authors: ONLY specify testedwith = 'internal' for
19 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should 30 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
20 # be specifying the version(s) of Mercurial they are tested with, or 31 # be specifying the version(s) of Mercurial they are tested with, or