mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
merge with crew
This commit is contained in:
commit
56d9a3258b
17
hgext/mq.py
17
hgext/mq.py
@ -2331,6 +2331,23 @@ def reposetup(ui, repo):
|
||||
repo.__class__ = mqrepo
|
||||
repo.mq = queue(ui, repo.join(""))
|
||||
|
||||
def uisetup(ui):
|
||||
# override import to disallow importing over patch
|
||||
importalias, importcmd = cmdutil.findcmd(ui, 'import', commands.table)
|
||||
for alias, cmd in commands.table.iteritems():
|
||||
if cmd is importcmd:
|
||||
importkey = alias
|
||||
break
|
||||
orig_import = importcmd[0]
|
||||
def mqimport(ui, repo, patch1, *patches, **opts):
|
||||
if hasattr(repo, 'abort_if_wdir_patched'):
|
||||
repo.abort_if_wdir_patched(_('cannot import over an applied patch'),
|
||||
opts.get('force'))
|
||||
orig_import(ui, repo, patch1, *patches, **opts)
|
||||
importcmd = list(importcmd)
|
||||
importcmd[0] = mqimport
|
||||
commands.table[importkey] = tuple(importcmd)
|
||||
|
||||
seriesopts = [('s', 'summary', None, _('print first line of patch header'))]
|
||||
|
||||
cmdtable = {
|
||||
|
@ -199,6 +199,14 @@ hg commit
|
||||
echo % push should fail
|
||||
hg push ../../k
|
||||
|
||||
echo % import should fail
|
||||
hg st .
|
||||
echo foo >> ../a
|
||||
hg diff > ../../import.diff
|
||||
hg revert --no-backup ../a
|
||||
hg import ../../import.diff
|
||||
hg st
|
||||
|
||||
echo % qunapplied
|
||||
hg qunapplied
|
||||
|
||||
|
@ -169,6 +169,8 @@ abort: cannot commit over an applied mq patch
|
||||
% push should fail
|
||||
pushing to ../../k
|
||||
abort: source has mq patches applied
|
||||
% import should fail
|
||||
abort: cannot import over an applied patch
|
||||
% qunapplied
|
||||
test2.patch
|
||||
% qpush/qpop with index
|
||||
|
Loading…
Reference in New Issue
Block a user