mercurial-scm/hg: hgext/mq.py annotate

annotate hgext/mq.py @ 9335:6eaadd777bc4

mq: add function to check if a header exists in a patch

author	Yann E. MORIN <yann.morin.1998@anciens.enib.fr>
date	Wed, 12 Aug 2009 10:46:16 +0200
parents	08f59f7916f9
children	dd6f605b15c0

rev	line source
6187 531f3e78c6f2 mq: Cleanup: update outdated file header. Marti Raudsepp <marti@juffo.org> parents: 6164 diff changeset	1 # mq.py - patch queues for mercurial
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2 #
2859 345bac2bc4ec update copyrights. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2856 diff changeset	3 # Copyright 2005, 2006 Chris Mason <mason@suse.com>
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	4 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 8209 diff changeset	5 # This software may be used and distributed according to the terms of the
46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 8209 diff changeset	6 # GNU General Public License version 2, incorporated herein by reference.
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	7
8932 f87884329419 extensions: fix up description lines some more Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8929 diff changeset	8 '''manage a stack of patches
2554 8264c2034970 help: add help to mq extension Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2531 diff changeset	9
8264c2034970 help: add help to mq extension Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2531 diff changeset	10 This extension lets you work with a stack of patches in a Mercurial
7983 7b813bdbd5d0 Change double spaces to single spaces in help texts. Martin Geisler <mg@daimi.au.dk> parents: 7874 diff changeset	11 repository. It manages two stacks of patches - all known patches, and
2554 8264c2034970 help: add help to mq extension Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2531 diff changeset	12 applied patches (subset of known patches).
8264c2034970 help: add help to mq extension Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2531 diff changeset	13
8264c2034970 help: add help to mq extension Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2531 diff changeset	14 Known patches are represented as patch files in the .hg/patches
7983 7b813bdbd5d0 Change double spaces to single spaces in help texts. Martin Geisler <mg@daimi.au.dk> parents: 7874 diff changeset	15 directory. Applied patches are both patch files and changesets.
2554 8264c2034970 help: add help to mq extension Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2531 diff changeset	16
9157 9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9111 diff changeset	17 Common tasks (use "hg help command" for more details)::
2554 8264c2034970 help: add help to mq extension Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2531 diff changeset	18
9157 9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9111 diff changeset	19 prepare repository to work with patches qinit
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9111 diff changeset	20 create new patch qnew
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9111 diff changeset	21 import existing patch qimport
2554 8264c2034970 help: add help to mq extension Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2531 diff changeset	22
9157 9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9111 diff changeset	23 print patch series qseries
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9111 diff changeset	24 print applied patches qapplied
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9111 diff changeset	25 print name of top applied patch qtop
2554 8264c2034970 help: add help to mq extension Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2531 diff changeset	26
9157 9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9111 diff changeset	27 add known patch to applied stack qpush
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9111 diff changeset	28 remove patch from applied stack qpop
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9111 diff changeset	29 refresh contents of top applied patch qrefresh
2554 8264c2034970 help: add help to mq extension Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2531 diff changeset	30 '''
8264c2034970 help: add help to mq extension Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2531 diff changeset	31
3891 6b4127c7d52a Simplify i18n imports Matt Mackall <mpm@selenic.com> parents: 3877 diff changeset	32 from mercurial.i18n import _
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	33 from mercurial.node import bin, hex, short, nullid, nullrev
8112 6ee71f78497c switch lock releasing in the extensions from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8076 diff changeset	34 from mercurial.lock import release
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	35 from mercurial import commands, cmdutil, hg, patch, util
7637 1d54e2f6c0b7 error: move repo errors Matt Mackall <mpm@selenic.com> parents: 7627 diff changeset	36 from mercurial import repair, extensions, url, error
7271 8046f0a070a6 use our urlopener (proxy handling, etc) instead of urllib Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7216 diff changeset	37 import os, sys, re, errno
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	38
5645 1f044b04fa0a mq: drop obsolete reference to 'qversion' Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 5534 diff changeset	39 commands.norepo += " qclone"
2720 c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	40
4037 bbdba01cce28 Enforce unixish style for all generated patch names. Patrick Mezard <pmezard@gmail.com> parents: 4016 diff changeset	41 # Patch names looks like unix-file names.
bbdba01cce28 Enforce unixish style for all generated patch names. Patrick Mezard <pmezard@gmail.com> parents: 4016 diff changeset	42 # They must be joinable with queue directory and result in the patch path.
bbdba01cce28 Enforce unixish style for all generated patch names. Patrick Mezard <pmezard@gmail.com> parents: 4016 diff changeset	43 normname = util.normpath
bbdba01cce28 Enforce unixish style for all generated patch names. Patrick Mezard <pmezard@gmail.com> parents: 4016 diff changeset	44
8778 c5f36402daad use new style classes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8761 diff changeset	45 class statusentry(object):
2780 ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	46 def __init__(self, rev, name=None):
ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	47 if not name:
3091 7fa3d38a99b6 mq: handle patch names containing ":" Brendan Cully <brendan@kublai.com> parents: 3088 diff changeset	48 fields = rev.split(':', 1)
2816 52516e48e3f3 Update qsave to use StatusEntry; don't throw exception on bad status lines. Brendan Cully <brendan@kublai.com> parents: 2804 diff changeset	49 if len(fields) == 2:
52516e48e3f3 Update qsave to use StatusEntry; don't throw exception on bad status lines. Brendan Cully <brendan@kublai.com> parents: 2804 diff changeset	50 self.rev, self.name = fields
52516e48e3f3 Update qsave to use StatusEntry; don't throw exception on bad status lines. Brendan Cully <brendan@kublai.com> parents: 2804 diff changeset	51 else:
52516e48e3f3 Update qsave to use StatusEntry; don't throw exception on bad status lines. Brendan Cully <brendan@kublai.com> parents: 2804 diff changeset	52 self.rev, self.name = None, None
2780 ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	53 else:
ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	54 self.rev, self.name = rev, name
ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	55
ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	56 def __str__(self):
ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	57 return self.rev + ':' + self.name
ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	58
7399 e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	59 class patchheader(object):
8653 aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	60 def __init__(self, pf):
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	61 def eatdiff(lines):
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	62 while lines:
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	63 l = lines[-1]
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	64 if (l.startswith("diff -") or
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	65 l.startswith("Index:") or
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	66 l.startswith("===========")):
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	67 del lines[-1]
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	68 else:
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	69 break
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	70 def eatempty(lines):
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	71 while lines:
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	72 l = lines[-1]
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	73 if re.match('\s*$', l):
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	74 del lines[-1]
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	75 else:
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	76 break
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	77
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	78 message = []
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	79 comments = []
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	80 user = None
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	81 date = None
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	82 format = None
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	83 subject = None
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	84 diffstart = 0
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	85
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	86 for line in file(pf):
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	87 line = line.rstrip()
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	88 if line.startswith('diff --git'):
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	89 diffstart = 2
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	90 break
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	91 if diffstart:
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	92 if line.startswith('+++ '):
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	93 diffstart = 2
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	94 break
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	95 if line.startswith("--- "):
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	96 diffstart = 1
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	97 continue
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	98 elif format == "hgpatch":
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	99 # parse values when importing the result of an hg export
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	100 if line.startswith("# User "):
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	101 user = line[7:]
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	102 elif line.startswith("# Date "):
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	103 date = line[7:]
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	104 elif not line.startswith("# ") and line:
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	105 message.append(line)
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	106 format = None
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	107 elif line == '# HG changeset patch':
9287 53fdf18fd63b mq: Parse commit message after we find start of changeset patch David Soria Parra <dsp@php.net> parents: 8948 diff changeset	108 message = []
8653 aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	109 format = "hgpatch"
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	110 elif (format != "tagdone" and (line.startswith("Subject: ") or
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	111 line.startswith("subject: "))):
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	112 subject = line[9:]
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	113 format = "tag"
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	114 elif (format != "tagdone" and (line.startswith("From: ") or
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	115 line.startswith("from: "))):
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	116 user = line[6:]
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	117 format = "tag"
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	118 elif format == "tag" and line == "":
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	119 # when looking for tags (subject: from: etc) they
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	120 # end once you find a blank line in the source
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	121 format = "tagdone"
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	122 elif message or line:
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	123 message.append(line)
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	124 comments.append(line)
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	125
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	126 eatdiff(message)
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	127 eatdiff(comments)
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	128 eatempty(message)
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	129 eatempty(comments)
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	130
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	131 # make sure message isn't empty
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	132 if format and format.startswith("tag") and subject:
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	133 message.insert(0, "")
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	134 message.insert(0, subject)
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	135
7399 e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	136 self.message = message
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	137 self.comments = comments
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	138 self.user = user
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	139 self.date = date
8653 aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	140 self.haspatch = diffstart > 1
7399 e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	141
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	142 def setuser(self, user):
8654 f6cc3638f468 mq: rename setheader to updateheader and fix comment C?dric Duval <cedricduval@free.fr> parents: 8653 diff changeset	143 if not self.updateheader(['From: ', '# User '], user):
7399 e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	144 try:
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	145 patchheaderat = self.comments.index('# HG changeset patch')
9334 08f59f7916f9 mq: fix coding style in qrefresh Yann E. MORIN <yann.morin.1998@anciens.enib.fr> parents: 9327 diff changeset	146 self.comments.insert(patchheaderat + 1, '# User ' + user)
7399 e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	147 except ValueError:
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	148 self.comments = ['From: ' + user, ''] + self.comments
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	149 self.user = user
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	150
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	151 def setdate(self, date):
8654 f6cc3638f468 mq: rename setheader to updateheader and fix comment C?dric Duval <cedricduval@free.fr> parents: 8653 diff changeset	152 if self.updateheader(['# Date '], date):
7399 e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	153 self.date = date
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	154
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	155 def setmessage(self, message):
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	156 if self.comments:
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	157 self._delmsg()
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	158 self.message = [message]
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	159 self.comments += self.message
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	160
8654 f6cc3638f468 mq: rename setheader to updateheader and fix comment C?dric Duval <cedricduval@free.fr> parents: 8653 diff changeset	161 def updateheader(self, prefixes, new):
7399 e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	162 '''Update all references to a field in the patch header.
8654 f6cc3638f468 mq: rename setheader to updateheader and fix comment C?dric Duval <cedricduval@free.fr> parents: 8653 diff changeset	163 Return whether the field is present.'''
7399 e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	164 res = False
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	165 for prefix in prefixes:
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	166 for i in xrange(len(self.comments)):
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	167 if self.comments[i].startswith(prefix):
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	168 self.comments[i] = prefix + new
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	169 res = True
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	170 break
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	171 return res
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	172
9335 6eaadd777bc4 mq: add function to check if a header exists in a patch Yann E. MORIN <yann.morin.1998@anciens.enib.fr> parents: 9334 diff changeset	173 def _hasheader(self, prefixes):
6eaadd777bc4 mq: add function to check if a header exists in a patch Yann E. MORIN <yann.morin.1998@anciens.enib.fr> parents: 9334 diff changeset	174 '''Check if a header starts with any of the given prefixes.'''
6eaadd777bc4 mq: add function to check if a header exists in a patch Yann E. MORIN <yann.morin.1998@anciens.enib.fr> parents: 9334 diff changeset	175 for prefix in prefixes:
6eaadd777bc4 mq: add function to check if a header exists in a patch Yann E. MORIN <yann.morin.1998@anciens.enib.fr> parents: 9334 diff changeset	176 for comment in self.comments:
6eaadd777bc4 mq: add function to check if a header exists in a patch Yann E. MORIN <yann.morin.1998@anciens.enib.fr> parents: 9334 diff changeset	177 if comment.startswith(prefix):
6eaadd777bc4 mq: add function to check if a header exists in a patch Yann E. MORIN <yann.morin.1998@anciens.enib.fr> parents: 9334 diff changeset	178 return True
6eaadd777bc4 mq: add function to check if a header exists in a patch Yann E. MORIN <yann.morin.1998@anciens.enib.fr> parents: 9334 diff changeset	179 return False
6eaadd777bc4 mq: add function to check if a header exists in a patch Yann E. MORIN <yann.morin.1998@anciens.enib.fr> parents: 9334 diff changeset	180
7399 e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	181 def __str__(self):
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	182 if not self.comments:
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	183 return ''
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	184 return '\n'.join(self.comments) + '\n\n'
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	185
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	186 def _delmsg(self):
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	187 '''Remove existing message, keeping the rest of the comments fields.
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	188 If comments contains 'subject: ', message will prepend
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	189 the field and a blank line.'''
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	190 if self.message:
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	191 subj = 'subject: ' + self.message[0].lower()
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	192 for i in xrange(len(self.comments)):
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	193 if subj == self.comments[i].lower():
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	194 del self.comments[i]
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	195 self.message = self.message[2:]
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	196 break
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	197 ci = 0
8632 9e055cfdd620 replace "i in range(len(xs))" with "i, x in enumerate(xs)" Martin Geisler <mg@lazybytes.net> parents: 8624 diff changeset	198 for mi in self.message:
9e055cfdd620 replace "i in range(len(xs))" with "i, x in enumerate(xs)" Martin Geisler <mg@lazybytes.net> parents: 8624 diff changeset	199 while mi != self.comments[ci]:
7399 e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	200 ci += 1
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	201 del self.comments[ci]
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	202
8778 c5f36402daad use new style classes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8761 diff changeset	203 class queue(object):
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	204 def __init__(self, ui, path, patchdir=None):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	205 self.basepath = path
2819 766ecdc83e43 mq: add join method Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2818 diff changeset	206 self.path = patchdir or os.path.join(path, "patches")
1852 fdf9cbf56ec7 Fix mq's usage of opener, which don't allow absolute paths now. Thomas Arendsen Hein <thomas@intevation.de> parents: 1839 diff changeset	207 self.opener = util.opener(self.path)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	208 self.ui = ui
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	209 self.applied_dirty = 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	210 self.series_dirty = 0
1852 fdf9cbf56ec7 Fix mq's usage of opener, which don't allow absolute paths now. Thomas Arendsen Hein <thomas@intevation.de> parents: 1839 diff changeset	211 self.series_path = "series"
fdf9cbf56ec7 Fix mq's usage of opener, which don't allow absolute paths now. Thomas Arendsen Hein <thomas@intevation.de> parents: 1839 diff changeset	212 self.status_path = "status"
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	213 self.guards_path = "guards"
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	214 self.active_guards = None
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	215 self.guards_dirty = False
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	216 self._diffopts = None
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	217
8524 21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	218 @util.propertycache
21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	219 def applied(self):
2819 766ecdc83e43 mq: add join method Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2818 diff changeset	220 if os.path.exists(self.join(self.status_path)):
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	221 lines = self.opener(self.status_path).read().splitlines()
8524 21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	222 return [statusentry(l) for l in lines]
21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	223 return []
21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	224
21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	225 @util.propertycache
21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	226 def full_series(self):
21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	227 if os.path.exists(self.join(self.series_path)):
21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	228 return self.opener(self.series_path).read().splitlines()
21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	229 return []
21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	230
21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	231 @util.propertycache
21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	232 def series(self):
21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	233 self.parse_series()
21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	234 return self.series
21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	235
21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	236 @util.propertycache
21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	237 def series_guards(self):
21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	238 self.parse_series()
21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	239 return self.series_guards
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	240
8525 b169ba60eebe mq: new method invalidate Simon Heimberg <simohe@besonet.ch> parents: 8524 diff changeset	241 def invalidate(self):
b169ba60eebe mq: new method invalidate Simon Heimberg <simohe@besonet.ch> parents: 8524 diff changeset	242 for a in 'applied full_series series series_guards'.split():
b169ba60eebe mq: new method invalidate Simon Heimberg <simohe@besonet.ch> parents: 8524 diff changeset	243 if a in self.__dict__:
b169ba60eebe mq: new method invalidate Simon Heimberg <simohe@besonet.ch> parents: 8524 diff changeset	244 delattr(self, a)
b169ba60eebe mq: new method invalidate Simon Heimberg <simohe@besonet.ch> parents: 8524 diff changeset	245 self.applied_dirty = 0
b169ba60eebe mq: new method invalidate Simon Heimberg <simohe@besonet.ch> parents: 8524 diff changeset	246 self.series_dirty = 0
b169ba60eebe mq: new method invalidate Simon Heimberg <simohe@besonet.ch> parents: 8524 diff changeset	247 self.guards_dirty = False
b169ba60eebe mq: new method invalidate Simon Heimberg <simohe@besonet.ch> parents: 8524 diff changeset	248 self.active_guards = None
b169ba60eebe mq: new method invalidate Simon Heimberg <simohe@besonet.ch> parents: 8524 diff changeset	249
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	250 def diffopts(self):
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	251 if self._diffopts is None:
2888 3848488244fc Move ui.diffopts to patch.diffopts where it belongs Matt Mackall <mpm@selenic.com> parents: 2883 diff changeset	252 self._diffopts = patch.diffopts(self.ui)
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	253 return self._diffopts
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	254
2819 766ecdc83e43 mq: add join method Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2818 diff changeset	255 def join(self, *p):
766ecdc83e43 mq: add join method Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2818 diff changeset	256 return os.path.join(self.path, *p)
766ecdc83e43 mq: add join method Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2818 diff changeset	257
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	258 def find_series(self, patch):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	259 pre = re.compile("(\s*)([^#]+)")
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	260 index = 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	261 for l in self.full_series:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	262 m = pre.match(l)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	263 if m:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	264 s = m.group(2)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	265 s = s.rstrip()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	266 if s == patch:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	267 return index
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	268 index += 1
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	269 return None
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	270
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	271 guard_re = re.compile(r'\s?#([-+][^-+# \t\r\n\f][^# \t\r\n\f]*)')
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	272
2767 60683ab1ed33 mq: rename read_series as parse_series, make simpler and faster Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2766 diff changeset	273 def parse_series(self):
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	274 self.series = []
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	275 self.series_guards = []
2767 60683ab1ed33 mq: rename read_series as parse_series, make simpler and faster Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2766 diff changeset	276 for l in self.full_series:
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	277 h = l.find('#')
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	278 if h == -1:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	279 patch = l
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	280 comment = ''
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	281 elif h == 0:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	282 continue
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	283 else:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	284 patch = l[:h]
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	285 comment = l[h:]
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	286 patch = patch.strip()
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	287 if patch:
3184 87b7ae306d54 mq: bail out if a patch appears more than once in the series file. Brendan Cully <brendan@kublai.com> parents: 3183 diff changeset	288 if patch in self.series:
87b7ae306d54 mq: bail out if a patch appears more than once in the series file. Brendan Cully <brendan@kublai.com> parents: 3183 diff changeset	289 raise util.Abort(_('%s appears more than once in %s') %
87b7ae306d54 mq: bail out if a patch appears more than once in the series file. Brendan Cully <brendan@kublai.com> parents: 3183 diff changeset	290 (patch, self.join(self.series_path)))
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	291 self.series.append(patch)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	292 self.series_guards.append(self.guard_re.findall(comment))
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	293
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	294 def check_guard(self, guard):
6607 75b506f0e571 mq: make qselect fail properly on an empty guard Patrick Mezard <pmezard@gmail.com> parents: 6606 diff changeset	295 if not guard:
75b506f0e571 mq: make qselect fail properly on an empty guard Patrick Mezard <pmezard@gmail.com> parents: 6606 diff changeset	296 return _('guard cannot be an empty string')
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	297 bad_chars = '# \t\r\n\f'
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	298 first = guard[0]
8288 9de088320e9a mq: simpler check of first character of guard name Simon Heimberg <simohe@besonet.ch> parents: 8225 diff changeset	299 if first in '-+':
9de088320e9a mq: simpler check of first character of guard name Simon Heimberg <simohe@besonet.ch> parents: 8225 diff changeset	300 return (_('guard %r starts with invalid character: %r') %
9de088320e9a mq: simpler check of first character of guard name Simon Heimberg <simohe@besonet.ch> parents: 8225 diff changeset	301 (guard, first))
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	302 for c in bad_chars:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	303 if c in guard:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	304 return _('invalid character in guard %r: %r') % (guard, c)
3223 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 3186 diff changeset	305
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	306 def set_active(self, guards):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	307 for guard in guards:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	308 bad = self.check_guard(guard)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	309 if bad:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	310 raise util.Abort(bad)
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8188 diff changeset	311 guards = sorted(set(guards))
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	312 self.ui.debug(_('active guards: %s\n') % ' '.join(guards))
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	313 self.active_guards = guards
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	314 self.guards_dirty = True
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	315
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	316 def active(self):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	317 if self.active_guards is None:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	318 self.active_guards = []
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	319 try:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	320 guards = self.opener(self.guards_path).read().split()
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	321 except IOError, err:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	322 if err.errno != errno.ENOENT: raise
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	323 guards = []
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	324 for i, guard in enumerate(guards):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	325 bad = self.check_guard(guard)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	326 if bad:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	327 self.ui.warn('%s:%d: %s\n' %
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	328 (self.join(self.guards_path), i + 1, bad))
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	329 else:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	330 self.active_guards.append(guard)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	331 return self.active_guards
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	332
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	333 def set_guards(self, idx, guards):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	334 for g in guards:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	335 if len(g) < 2:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	336 raise util.Abort(_('guard %r too short') % g)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	337 if g[0] not in '-+':
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	338 raise util.Abort(_('guard %r starts with invalid char') % g)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	339 bad = self.check_guard(g[1:])
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	340 if bad:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	341 raise util.Abort(bad)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	342 drop = self.guard_re.sub('', self.full_series[idx])
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	343 self.full_series[idx] = drop + ''.join([' #' + g for g in guards])
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	344 self.parse_series()
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	345 self.series_dirty = True
3223 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 3186 diff changeset	346
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	347 def pushable(self, idx):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	348 if isinstance(idx, str):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	349 idx = self.series.index(idx)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	350 patchguards = self.series_guards[idx]
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	351 if not patchguards:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	352 return True, None
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	353 guards = self.active()
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	354 exactneg = [g for g in patchguards if g[0] == '-' and g[1:] in guards]
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	355 if exactneg:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	356 return False, exactneg[0]
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	357 pos = [g for g in patchguards if g[0] == '+']
2850 851b07ec450c mq: apply patch is any posative guard matches Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2848 diff changeset	358 exactpos = [g for g in pos if g[1:] in guards]
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	359 if pos:
2850 851b07ec450c mq: apply patch is any posative guard matches Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2848 diff changeset	360 if exactpos:
851b07ec450c mq: apply patch is any posative guard matches Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2848 diff changeset	361 return True, exactpos[0]
851b07ec450c mq: apply patch is any posative guard matches Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2848 diff changeset	362 return False, pos
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	363 return True, ''
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	364
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	365 def explain_pushable(self, idx, all_patches=False):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	366 write = all_patches and self.ui.write or self.ui.warn
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	367 if all_patches or self.ui.verbose:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	368 if isinstance(idx, str):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	369 idx = self.series.index(idx)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	370 pushable, why = self.pushable(idx)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	371 if all_patches and pushable:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	372 if why is None:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	373 write(_('allowing %s - no guards in effect\n') %
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	374 self.series[idx])
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	375 else:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	376 if not why:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	377 write(_('allowing %s - no matching negative guards\n') %
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	378 self.series[idx])
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	379 else:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	380 write(_('allowing %s - guarded by %r\n') %
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	381 (self.series[idx], why))
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	382 if not pushable:
2829 05316bb57d01 mq: make guards more strict, add tests Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2828 diff changeset	383 if why:
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	384 write(_('skipping %s - guarded by %r\n') %
3870 22d18051f9e5 mq: fix explain_pushable for negative guards Brendan Cully <brendan@kublai.com> parents: 3857 diff changeset	385 (self.series[idx], why))
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	386 else:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	387 write(_('skipping %s - no matching guards\n') %
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	388 self.series[idx])
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	389
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	390 def save_dirty(self):
2772 4720e79486d3 mq: simplify save_dirty Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2771 diff changeset	391 def write_list(items, path):
4720e79486d3 mq: simplify save_dirty Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2771 diff changeset	392 fp = self.opener(path, 'w')
4720e79486d3 mq: simplify save_dirty Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2771 diff changeset	393 for i in items:
5878 d39af2eabb8c transform a bunch of print statements to appropriate ui calls Matt Mackall <mpm@selenic.com> parents: 5788 diff changeset	394 fp.write("%s\n" % i)
2772 4720e79486d3 mq: simplify save_dirty Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2771 diff changeset	395 fp.close()
2781 ae726521717c merge with brendan. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2780 2779 diff changeset	396 if self.applied_dirty: write_list(map(str, self.applied), self.status_path)
2772 4720e79486d3 mq: simplify save_dirty Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2771 diff changeset	397 if self.series_dirty: write_list(self.full_series, self.series_path)
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	398 if self.guards_dirty: write_list(self.active_guards, self.guards_path)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	399
4207 b7e66db28571 Remove undo log after mq operations that rollback would break Brendan Cully <brendan@kublai.com> parents: 4206 diff changeset	400 def removeundo(self, repo):
b7e66db28571 Remove undo log after mq operations that rollback would break Brendan Cully <brendan@kublai.com> parents: 4206 diff changeset	401 undo = repo.sjoin('undo')
b7e66db28571 Remove undo log after mq operations that rollback would break Brendan Cully <brendan@kublai.com> parents: 4206 diff changeset	402 if not os.path.exists(undo):
b7e66db28571 Remove undo log after mq operations that rollback would break Brendan Cully <brendan@kublai.com> parents: 4206 diff changeset	403 return
b7e66db28571 Remove undo log after mq operations that rollback would break Brendan Cully <brendan@kublai.com> parents: 4206 diff changeset	404 try:
b7e66db28571 Remove undo log after mq operations that rollback would break Brendan Cully <brendan@kublai.com> parents: 4206 diff changeset	405 os.unlink(undo)
b7e66db28571 Remove undo log after mq operations that rollback would break Brendan Cully <brendan@kublai.com> parents: 4206 diff changeset	406 except OSError, inst:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	407 self.ui.warn(_('error removing undo: %s\n') % str(inst))
4207 b7e66db28571 Remove undo log after mq operations that rollback would break Brendan Cully <brendan@kublai.com> parents: 4206 diff changeset	408
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	409 def printdiff(self, repo, node1, node2=None, files=None,
2937 9dc568f5e03d Fix test-mq-qdiff; add -I and -X options to qdiff Brendan Cully <brendan@kublai.com> parents: 2936 diff changeset	410 fp=None, changes=None, opts={}):
6582 5acbdd3941c4 walk: remove remaining users of cmdutils.matchpats Matt Mackall <mpm@selenic.com> parents: 6562 diff changeset	411 m = cmdutil.match(repo, files, opts)
7308 b6f5490effbf patch: turn patch.diff() into a generator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7307 diff changeset	412 chunks = patch.diff(repo, node1, node2, m, changes, self.diffopts())
b6f5490effbf patch: turn patch.diff() into a generator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7307 diff changeset	413 write = fp is None and repo.ui.write or fp.write
b6f5490effbf patch: turn patch.diff() into a generator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7307 diff changeset	414 for chunk in chunks:
b6f5490effbf patch: turn patch.diff() into a generator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7307 diff changeset	415 write(chunk)
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	416
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	417 def mergeone(self, repo, mergeq, head, patch, rev):
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	418 # first try just applying the patch
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	419 (err, n) = self.apply(repo, [ patch ], update_status=False,
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	420 strict=True, merge=rev)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	421
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	422 if err == 0:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	423 return (err, n)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	424
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	425 if n is None:
2712 8e5cd8d11b51 mq: move many error messages to util.Abort Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2711 diff changeset	426 raise util.Abort(_("apply failed for patch %s") % patch)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	427
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	428 self.ui.warn(_("patch didn't work out, merging %s\n") % patch)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	429
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	430 # apply failed, strip away that rev and merge.
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	431 hg.clean(repo, head)
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	432 self.strip(repo, n, update=False, backup='strip')
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	433
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6668 diff changeset	434 ctx = repo[rev]
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	435 ret = hg.merge(repo, rev)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	436 if ret:
2712 8e5cd8d11b51 mq: move many error messages to util.Abort Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2711 diff changeset	437 raise util.Abort(_("update returned %d") % ret)
8706 25e9c71b89de commit: drop the now-unused files parameter Matt Mackall <mpm@selenic.com> parents: 8700 diff changeset	438 n = repo.commit(ctx.description(), ctx.user(), force=True)
8527 f9a80054dd3c use 'x is None' instead of 'x == None' Martin Geisler <mg@lazybytes.net> parents: 8525 diff changeset	439 if n is None:
2712 8e5cd8d11b51 mq: move many error messages to util.Abort Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2711 diff changeset	440 raise util.Abort(_("repo commit failed"))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	441 try:
8653 aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	442 ph = patchheader(mergeq.join(patch))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	443 except:
2712 8e5cd8d11b51 mq: move many error messages to util.Abort Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2711 diff changeset	444 raise util.Abort(_("unable to read %s") % patch)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	445
1852 fdf9cbf56ec7 Fix mq's usage of opener, which don't allow absolute paths now. Thomas Arendsen Hein <thomas@intevation.de> parents: 1839 diff changeset	446 patchf = self.opener(patch, "w")
7399 e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	447 comments = str(ph)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	448 if comments:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	449 patchf.write(comments)
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	450 self.printdiff(repo, head, n, fp=patchf)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	451 patchf.close()
4207 b7e66db28571 Remove undo log after mq operations that rollback would break Brendan Cully <brendan@kublai.com> parents: 4206 diff changeset	452 self.removeundo(repo)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	453 return (0, n)
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	454
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	455 def qparents(self, repo, rev=None):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	456 if rev is None:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	457 (p1, p2) = repo.dirstate.parents()
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	458 if p2 == nullid:
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	459 return p1
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	460 if len(self.applied) == 0:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	461 return None
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	462 return bin(self.applied[-1].rev)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	463 pp = repo.changelog.parents(rev)
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	464 if pp[1] != nullid:
2780 ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	465 arevs = [ x.rev for x in self.applied ]
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	466 p0 = hex(pp[0])
ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	467 p1 = hex(pp[1])
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	468 if p0 in arevs:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	469 return pp[0]
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	470 if p1 in arevs:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	471 return pp[1]
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	472 return pp[0]
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	473
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	474 def mergepatch(self, repo, mergeq, series):
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	475 if len(self.applied) == 0:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	476 # each of the patches merged in will have two parents. This
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	477 # can confuse the qrefresh, qdiff, and strip code because it
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	478 # needs to know which parent is actually in the patch queue.
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	479 # so, we insert a merge marker with only one parent. This way
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	480 # the first patch in the queue is never a merge patch
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	481 #
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	482 pname = ".hg.patches.merge.marker"
8706 25e9c71b89de commit: drop the now-unused files parameter Matt Mackall <mpm@selenic.com> parents: 8700 diff changeset	483 n = repo.commit('[mq]: merge marker', force=True)
4207 b7e66db28571 Remove undo log after mq operations that rollback would break Brendan Cully <brendan@kublai.com> parents: 4206 diff changeset	484 self.removeundo(repo)
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	485 self.applied.append(statusentry(hex(n), pname))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	486 self.applied_dirty = 1
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	487
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	488 head = self.qparents(repo)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	489
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	490 for patch in series:
2696 be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	491 patch = mergeq.lookup(patch, strict=True)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	492 if not patch:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	493 self.ui.warn(_("patch %s does not exist\n") % patch)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	494 return (1, None)
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	495 pushable, reason = self.pushable(patch)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	496 if not pushable:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	497 self.explain_pushable(patch, all_patches=True)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	498 continue
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	499 info = mergeq.isapplied(patch)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	500 if not info:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	501 self.ui.warn(_("patch %s is not applied\n") % patch)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	502 return (1, None)
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	503 rev = bin(info[1])
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	504 (err, head) = self.mergeone(repo, mergeq, head, patch, rev)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	505 if head:
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	506 self.applied.append(statusentry(hex(head), patch))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	507 self.applied_dirty = 1
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	508 if err:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	509 return (err, head)
4437 a210b40d0860 Make mergepatch save queue now that qpush isn't. Brendan Cully <brendan@kublai.com> parents: 4432 diff changeset	510 self.save_dirty()
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	511 return (0, head)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	512
2748 752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	513 def patch(self, repo, patchfile):
752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	514 '''Apply patchfile to the working directory.
8761 0289f384e1e5 Generally replace "file name" with "filename" in help and comments. timeless <timeless@gmail.com> parents: 8760 diff changeset	515 patchfile: name of patch file'''
3465 2d35a8d2b32d patch: return list of modified files even when an exception is raised Brendan Cully <brendan@kublai.com> parents: 3375 diff changeset	516 files = {}
2748 752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	517 try:
3465 2d35a8d2b32d patch: return list of modified files even when an exception is raised Brendan Cully <brendan@kublai.com> parents: 3375 diff changeset	518 fuzz = patch.patch(patchfile, self.ui, strip=1, cwd=repo.root,
8811 8b35b08724eb Make mq, record and transplant honor patch.eol Patrick Mezard <pmezard@gmail.com> parents: 8795 diff changeset	519 files=files, eolmode=None)
2919 b70740aefa4d Unify mq and hg patch invocation. Brendan Cully <brendan@kublai.com> parents: 2905 diff changeset	520 except Exception, inst:
b70740aefa4d Unify mq and hg patch invocation. Brendan Cully <brendan@kublai.com> parents: 2905 diff changeset	521 self.ui.note(str(inst) + '\n')
b70740aefa4d Unify mq and hg patch invocation. Brendan Cully <brendan@kublai.com> parents: 2905 diff changeset	522 if not self.ui.verbose:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	523 self.ui.warn(_("patch failed, unable to continue (try -v)\n"))
3465 2d35a8d2b32d patch: return list of modified files even when an exception is raised Brendan Cully <brendan@kublai.com> parents: 3375 diff changeset	524 return (False, files, False)
2748 752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	525
2934 2f190e998eb3 Teach mq about git patches Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	526 return (True, files, fuzz)
2796 4c39568007f9 mq: codingstyle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2795 diff changeset	527
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	528 def apply(self, repo, series, list=False, update_status=True,
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	529 strict=False, patchdir=None, merge=None, all_files={}):
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	530 wlock = lock = tr = None
4418 0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4406 diff changeset	531 try:
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	532 wlock = repo.wlock()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	533 lock = repo.lock()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	534 tr = repo.transaction()
4418 0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4406 diff changeset	535 try:
4970 30d4d8985dd8 transactions: avoid late tear-down (issue641) Matt Mackall <mpm@selenic.com> parents: 4917 diff changeset	536 ret = self._apply(repo, series, list, update_status,
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	537 strict, patchdir, merge, all_files=all_files)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	538 tr.close()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	539 self.save_dirty()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	540 return ret
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	541 except:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	542 try:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	543 tr.abort()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	544 finally:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	545 repo.invalidate()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	546 repo.dirstate.invalidate()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	547 raise
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	548 finally:
8112 6ee71f78497c switch lock releasing in the extensions from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8076 diff changeset	549 del tr
6ee71f78497c switch lock releasing in the extensions from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8076 diff changeset	550 release(lock, wlock)
5527 0b3f910dfd17 mq: really remove undo after a qpush (and after a strip) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5432 diff changeset	551 self.removeundo(repo)
4418 0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4406 diff changeset	552
4970 30d4d8985dd8 transactions: avoid late tear-down (issue641) Matt Mackall <mpm@selenic.com> parents: 4917 diff changeset	553 def _apply(self, repo, series, list=False, update_status=True,
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	554 strict=False, patchdir=None, merge=None, all_files={}):
8875 801cacf46e62 mq: fix error message for qpush inexistent-patch (issue1702) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8833 diff changeset	555 '''returns (error, hash)
801cacf46e62 mq: fix error message for qpush inexistent-patch (issue1702) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8833 diff changeset	556 error = 1 for unable to read, 2 for patch failed, 3 for patch fuzz'''
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	557 # TODO unify with commands.py
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	558 if not patchdir:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	559 patchdir = self.path
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	560 err = 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	561 n = None
2934 2f190e998eb3 Teach mq about git patches Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	562 for patchname in series:
2f190e998eb3 Teach mq about git patches Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	563 pushable, reason = self.pushable(patchname)
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	564 if not pushable:
2934 2f190e998eb3 Teach mq about git patches Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	565 self.explain_pushable(patchname, all_patches=True)
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	566 continue
9111 ac3f1e6696eb mq: use ui.status when pushing and popping patches Martin Geisler <mg@lazybytes.net> parents: 9110 diff changeset	567 self.ui.status(_("applying %s\n") % patchname)
2934 2f190e998eb3 Teach mq about git patches Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	568 pf = os.path.join(patchdir, patchname)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	569
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	570 try:
8653 aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	571 ph = patchheader(self.join(patchname))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	572 except:
8875 801cacf46e62 mq: fix error message for qpush inexistent-patch (issue1702) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8833 diff changeset	573 self.ui.warn(_("unable to read %s\n") % patchname)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	574 err = 1
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	575 break
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	576
7399 e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	577 message = ph.message
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	578 if not message:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	579 message = _("imported patch %s\n") % patchname
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	580 else:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	581 if list:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	582 message.append(_("\nimported patch %s") % patchname)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	583 message = '\n'.join(message)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	584
7782 140429276b63 mq: handle empty patches more gracefully (issue1501) Matt Mackall <mpm@selenic.com> parents: 7772 diff changeset	585 if ph.haspatch:
140429276b63 mq: handle empty patches more gracefully (issue1501) Matt Mackall <mpm@selenic.com> parents: 7772 diff changeset	586 (patcherr, files, fuzz) = self.patch(repo, pf)
140429276b63 mq: handle empty patches more gracefully (issue1501) Matt Mackall <mpm@selenic.com> parents: 7772 diff changeset	587 all_files.update(files)
140429276b63 mq: handle empty patches more gracefully (issue1501) Matt Mackall <mpm@selenic.com> parents: 7772 diff changeset	588 patcherr = not patcherr
140429276b63 mq: handle empty patches more gracefully (issue1501) Matt Mackall <mpm@selenic.com> parents: 7772 diff changeset	589 else:
140429276b63 mq: handle empty patches more gracefully (issue1501) Matt Mackall <mpm@selenic.com> parents: 7772 diff changeset	590 self.ui.warn(_("patch %s is empty\n") % patchname)
140429276b63 mq: handle empty patches more gracefully (issue1501) Matt Mackall <mpm@selenic.com> parents: 7772 diff changeset	591 patcherr, files, fuzz = 0, [], 0
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	592
2934 2f190e998eb3 Teach mq about git patches Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	593 if merge and files:
4332 4e5e1638b165 mq: don't abort when merging a patch that removes files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4242 diff changeset	594 # Mark as removed/merged and update dirstate parent info
4e5e1638b165 mq: don't abort when merging a patch that removes files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4242 diff changeset	595 removed = []
4e5e1638b165 mq: don't abort when merging a patch that removes files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4242 diff changeset	596 merged = []
4e5e1638b165 mq: don't abort when merging a patch that removes files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4242 diff changeset	597 for f in files:
4905 fc61495ea9cf dirstate: make wjoin function private Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	598 if os.path.exists(repo.wjoin(f)):
4332 4e5e1638b165 mq: don't abort when merging a patch that removes files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4242 diff changeset	599 merged.append(f)
4e5e1638b165 mq: don't abort when merging a patch that removes files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4242 diff changeset	600 else:
4e5e1638b165 mq: don't abort when merging a patch that removes files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4242 diff changeset	601 removed.append(f)
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4890 diff changeset	602 for f in removed:
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4890 diff changeset	603 repo.dirstate.remove(f)
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4890 diff changeset	604 for f in merged:
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4890 diff changeset	605 repo.dirstate.merge(f)
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	606 p1, p2 = repo.dirstate.parents()
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	607 repo.dirstate.setparents(p1, merge)
6603 41eb20cc1c02 match: remove files arg from repo.status and friends Matt Mackall <mpm@selenic.com> parents: 6602 diff changeset	608
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	609 files = patch.updatedir(self.ui, repo, files)
6603 41eb20cc1c02 match: remove files arg from repo.status and friends Matt Mackall <mpm@selenic.com> parents: 6602 diff changeset	610 match = cmdutil.matchfiles(repo, files or [])
8706 25e9c71b89de commit: drop the now-unused files parameter Matt Mackall <mpm@selenic.com> parents: 8700 diff changeset	611 n = repo.commit(message, ph.user, ph.date, match=match, force=True)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	612
8527 f9a80054dd3c use 'x is None' instead of 'x == None' Martin Geisler <mg@lazybytes.net> parents: 8525 diff changeset	613 if n is None:
2712 8e5cd8d11b51 mq: move many error messages to util.Abort Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2711 diff changeset	614 raise util.Abort(_("repo commit failed"))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	615
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	616 if update_status:
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	617 self.applied.append(statusentry(hex(n), patchname))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	618
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	619 if patcherr:
7782 140429276b63 mq: handle empty patches more gracefully (issue1501) Matt Mackall <mpm@selenic.com> parents: 7772 diff changeset	620 self.ui.warn(_("patch failed, rejects left in working dir\n"))
8875 801cacf46e62 mq: fix error message for qpush inexistent-patch (issue1702) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8833 diff changeset	621 err = 2
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	622 break
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	623
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	624 if fuzz and strict:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	625 self.ui.warn(_("fuzz found when applying patch, stopping\n"))
8875 801cacf46e62 mq: fix error message for qpush inexistent-patch (issue1702) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8833 diff changeset	626 err = 3
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	627 break
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	628 return (err, n)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	629
8833 14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	630 def _cleanup(self, patches, numrevs, keep=False):
14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	631 if not keep:
14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	632 r = self.qrepo()
14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	633 if r:
14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	634 r.remove(patches, True)
14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	635 else:
14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	636 for p in patches:
14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	637 os.unlink(self.join(p))
14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	638
14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	639 if numrevs:
14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	640 del self.applied[:numrevs]
14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	641 self.applied_dirty = 1
14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	642
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8188 diff changeset	643 for i in sorted([self.find_series(p) for p in patches], reverse=True):
6645 37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	644 del self.full_series[i]
37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	645 self.parse_series()
37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	646 self.series_dirty = 1
37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	647
8833 14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	648 def _revpatches(self, repo, revs):
6762 f67d1468ac50 util: add sort helper Matt Mackall <mpm@selenic.com> parents: 6760 diff changeset	649 firstrev = repo[self.applied[0].rev].rev()
6645 37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	650 patches = []
8833 14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	651 for i, rev in enumerate(revs):
8832 6e6f5b80e056 mq: warn about finalizing patches without cset message Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8811 diff changeset	652
6645 37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	653 if rev < firstrev:
37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	654 raise util.Abort(_('revision %d is not managed') % rev)
8832 6e6f5b80e056 mq: warn about finalizing patches without cset message Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8811 diff changeset	655
6e6f5b80e056 mq: warn about finalizing patches without cset message Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8811 diff changeset	656 ctx = repo[rev]
8833 14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	657 base = bin(self.applied[i].rev)
8832 6e6f5b80e056 mq: warn about finalizing patches without cset message Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8811 diff changeset	658 if ctx.node() != base:
6e6f5b80e056 mq: warn about finalizing patches without cset message Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8811 diff changeset	659 msg = _('cannot delete revision %d above applied patches')
6e6f5b80e056 mq: warn about finalizing patches without cset message Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8811 diff changeset	660 raise util.Abort(msg % rev)
6e6f5b80e056 mq: warn about finalizing patches without cset message Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8811 diff changeset	661
8833 14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	662 patch = self.applied[i].name
8832 6e6f5b80e056 mq: warn about finalizing patches without cset message Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8811 diff changeset	663 for fmt in ('[mq]: %s', 'imported patch %s'):
6e6f5b80e056 mq: warn about finalizing patches without cset message Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8811 diff changeset	664 if ctx.description() == fmt % patch:
6e6f5b80e056 mq: warn about finalizing patches without cset message Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8811 diff changeset	665 msg = _('patch %s finalized without changeset message\n')
6e6f5b80e056 mq: warn about finalizing patches without cset message Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8811 diff changeset	666 repo.ui.status(msg % patch)
6e6f5b80e056 mq: warn about finalizing patches without cset message Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8811 diff changeset	667 break
6e6f5b80e056 mq: warn about finalizing patches without cset message Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8811 diff changeset	668
8833 14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	669 patches.append(patch)
14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	670 return patches
6645 37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	671
8833 14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	672 def finish(self, repo, revs):
14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	673 patches = self._revpatches(repo, sorted(revs))
14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	674 self._cleanup(patches, len(patches))
6645 37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	675
3088 dc784839516d mq: add qdelete --forget option Brendan Cully <brendan@kublai.com> parents: 3087 diff changeset	676 def delete(self, repo, patches, opts):
4736 04b2c1e27c26 mq: require patch argument or revision for qdelete Brendan Cully <brendan@kublai.com> parents: 4730 diff changeset	677 if not patches and not opts.get('rev'):
4737 2ececafa5859 mq: more qdelete help text tweaks Brendan Cully <brendan@kublai.com> parents: 4736 diff changeset	678 raise util.Abort(_('qdelete requires at least one revision or '
2ececafa5859 mq: more qdelete help text tweaks Brendan Cully <brendan@kublai.com> parents: 4736 diff changeset	679 'patch name'))
4736 04b2c1e27c26 mq: require patch argument or revision for qdelete Brendan Cully <brendan@kublai.com> parents: 4730 diff changeset	680
2905 790fd342b6c7 Allow qdel to delete multiple patches. Brendan Cully <brendan@kublai.com> parents: 2904 diff changeset	681 realpatches = []
790fd342b6c7 Allow qdel to delete multiple patches. Brendan Cully <brendan@kublai.com> parents: 2904 diff changeset	682 for patch in patches:
790fd342b6c7 Allow qdel to delete multiple patches. Brendan Cully <brendan@kublai.com> parents: 2904 diff changeset	683 patch = self.lookup(patch, strict=True)
790fd342b6c7 Allow qdel to delete multiple patches. Brendan Cully <brendan@kublai.com> parents: 2904 diff changeset	684 info = self.isapplied(patch)
3373 9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	685 if info:
2905 790fd342b6c7 Allow qdel to delete multiple patches. Brendan Cully <brendan@kublai.com> parents: 2904 diff changeset	686 raise util.Abort(_("cannot delete applied patch %s") % patch)
790fd342b6c7 Allow qdel to delete multiple patches. Brendan Cully <brendan@kublai.com> parents: 2904 diff changeset	687 if patch not in self.series:
790fd342b6c7 Allow qdel to delete multiple patches. Brendan Cully <brendan@kublai.com> parents: 2904 diff changeset	688 raise util.Abort(_("patch %s not in series file") % patch)
3373 9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	689 realpatches.append(patch)
9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	690
8833 14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	691 numrevs = 0
3373 9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	692 if opts.get('rev'):
9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	693 if not self.applied:
9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	694 raise util.Abort(_('no patches applied'))
3707 67f44b825784 Removed unused ui parameter from revpair/revrange and fix its users. Thomas Arendsen Hein <thomas@intevation.de> parents: 3700 diff changeset	695 revs = cmdutil.revrange(repo, opts['rev'])
3373 9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	696 if len(revs) > 1 and revs[0] > revs[1]:
9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	697 revs.reverse()
8833 14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	698 revpatches = self._revpatches(repo, revs)
14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	699 realpatches += revpatches
14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	700 numrevs = len(revpatches)
2905 790fd342b6c7 Allow qdel to delete multiple patches. Brendan Cully <brendan@kublai.com> parents: 2904 diff changeset	701
8833 14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	702 self._cleanup(realpatches, numrevs, opts.get('keep'))
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	703
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	704 def check_toppatch(self, repo):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	705 if len(self.applied) > 0:
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	706 top = bin(self.applied[-1].rev)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	707 pp = repo.dirstate.parents()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	708 if top not in pp:
5432 bfbd9b954315 mq: clarify queue top message Matt Mackall <mpm@selenic.com> parents: 5336 diff changeset	709 raise util.Abort(_("working directory revision is not qtip"))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	710 return top
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	711 return None
2875 3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2874 diff changeset	712 def check_localchanges(self, repo, force=False, refresh=True):
3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2874 diff changeset	713 m, a, r, d = repo.status()[:4]
3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2874 diff changeset	714 if m or a or r or d:
3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2874 diff changeset	715 if not force:
3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2874 diff changeset	716 if refresh:
3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2874 diff changeset	717 raise util.Abort(_("local changes found, refresh first"))
3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2874 diff changeset	718 else:
3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2874 diff changeset	719 raise util.Abort(_("local changes found"))
3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2874 diff changeset	720 return m, a, r, d
4713 c29ee52e0b68 mq: support qnew -I/-X and file name lists Brendan Cully <brendan@kublai.com> parents: 4712 diff changeset	721
5981 ca2af0c81c9a mq: don't allow patches with some reserved names Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5980 diff changeset	722 _reserved = ('series', 'status', 'guards')
ca2af0c81c9a mq: don't allow patches with some reserved names Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5980 diff changeset	723 def check_reserved_name(self, name):
ca2af0c81c9a mq: don't allow patches with some reserved names Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5980 diff changeset	724 if (name in self._reserved or name.startswith('.hg')
ca2af0c81c9a mq: don't allow patches with some reserved names Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5980 diff changeset	725 or name.startswith('.mq')):
ca2af0c81c9a mq: don't allow patches with some reserved names Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5980 diff changeset	726 raise util.Abort(_('"%s" cannot be used as the name of a patch')
ca2af0c81c9a mq: don't allow patches with some reserved names Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5980 diff changeset	727 % name)
ca2af0c81c9a mq: don't allow patches with some reserved names Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5980 diff changeset	728
7162 ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	729 def new(self, repo, patchfn, pats, *opts):
7157 fd3cba5e73ae mq: do not invoke editor until just before patch creation. Closes issue1346. Brendan Cully <brendan@kublai.com> parents: 7142 diff changeset	730 """options:
fd3cba5e73ae mq: do not invoke editor until just before patch creation. Closes issue1346. Brendan Cully <brendan@kublai.com> parents: 7142 diff changeset	731 msg: a string or a no-argument function returning a string
fd3cba5e73ae mq: do not invoke editor until just before patch creation. Closes issue1346. Brendan Cully <brendan@kublai.com> parents: 7142 diff changeset	732 """
4713 c29ee52e0b68 mq: support qnew -I/-X and file name lists Brendan Cully <brendan@kublai.com> parents: 4712 diff changeset	733 msg = opts.get('msg')
c29ee52e0b68 mq: support qnew -I/-X and file name lists Brendan Cully <brendan@kublai.com> parents: 4712 diff changeset	734 force = opts.get('force')
5673 dd3ce7515f4d mq: add --currentuser and --user options to qnew and qrefresh peter.arrenbrecht@gmail.com parents: 5645 diff changeset	735 user = opts.get('user')
5788 4107e823dc2c mq: add --currentdate and --date options to qnew and qrefresh Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 5673 diff changeset	736 date = opts.get('date')
6139 989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6120 diff changeset	737 if date:
989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6120 diff changeset	738 date = util.parsedate(date)
7162 ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	739 self.check_reserved_name(patchfn)
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	740 if os.path.exists(self.join(patchfn)):
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	741 raise util.Abort(_('patch "%s" already exists') % patchfn)
4713 c29ee52e0b68 mq: support qnew -I/-X and file name lists Brendan Cully <brendan@kublai.com> parents: 4712 diff changeset	742 if opts.get('include') or opts.get('exclude') or pats:
6582 5acbdd3941c4 walk: remove remaining users of cmdutils.matchpats Matt Mackall <mpm@selenic.com> parents: 6562 diff changeset	743 match = cmdutil.match(repo, pats, opts)
7161 b420ef2c812b mq: abort qnew -f if any file in an explicit list cannot be read Brendan Cully <brendan@kublai.com> parents: 7160 diff changeset	744 # detect missing files in pats
b420ef2c812b mq: abort qnew -f if any file in an explicit list cannot be read Brendan Cully <brendan@kublai.com> parents: 7160 diff changeset	745 def badfn(f, msg):
b420ef2c812b mq: abort qnew -f if any file in an explicit list cannot be read Brendan Cully <brendan@kublai.com> parents: 7160 diff changeset	746 raise util.Abort('%s: %s' % (f, msg))
b420ef2c812b mq: abort qnew -f if any file in an explicit list cannot be read Brendan Cully <brendan@kublai.com> parents: 7160 diff changeset	747 match.bad = badfn
6603 41eb20cc1c02 match: remove files arg from repo.status and friends Matt Mackall <mpm@selenic.com> parents: 6602 diff changeset	748 m, a, r, d = repo.status(match=match)[:4]
4713 c29ee52e0b68 mq: support qnew -I/-X and file name lists Brendan Cully <brendan@kublai.com> parents: 4712 diff changeset	749 else:
c29ee52e0b68 mq: support qnew -I/-X and file name lists Brendan Cully <brendan@kublai.com> parents: 4712 diff changeset	750 m, a, r, d = self.check_localchanges(repo, force)
7297 bd6deb7525f4 mq: use cmdutil.matchfiles instead of match for qnew -f. Brendan Cully <brendan@kublai.com> parents: 7280 diff changeset	751 match = cmdutil.matchfiles(repo, m + a + r)
2875 3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2874 diff changeset	752 commitfiles = m + a + r
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	753 self.check_toppatch(repo)
7162 ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	754 insert = self.full_series_end()
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	755 wlock = repo.wlock()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	756 try:
7162 ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	757 # if patch file write fails, abort early
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	758 p = self.opener(patchfn, "w")
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	759 try:
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	760 if date:
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	761 p.write("# HG changeset patch\n")
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	762 if user:
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	763 p.write("# User " + user + "\n")
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	764 p.write("# Date %d %d\n\n" % date)
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	765 elif user:
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	766 p.write("From: " + user + "\n\n")
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	767
8366 0bf0045000b5 some modernization cleanups, forward compatibility Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8362 diff changeset	768 if hasattr(msg, '__call__'):
7162 ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	769 msg = msg()
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	770 commitmsg = msg and msg or ("[mq]: %s" % patchfn)
8706 25e9c71b89de commit: drop the now-unused files parameter Matt Mackall <mpm@selenic.com> parents: 8700 diff changeset	771 n = repo.commit(commitmsg, user, date, match=match, force=True)
8527 f9a80054dd3c use 'x is None' instead of 'x == None' Martin Geisler <mg@lazybytes.net> parents: 8525 diff changeset	772 if n is None:
7162 ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	773 raise util.Abort(_("repo commit failed"))
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	774 try:
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	775 self.full_series[insert:insert] = [patchfn]
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	776 self.applied.append(statusentry(hex(n), patchfn))
7162 ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	777 self.parse_series()
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	778 self.series_dirty = 1
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	779 self.applied_dirty = 1
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	780 if msg:
7614 f9fcb189c8e2 mq: make qnew patch format consistent with qrefresh (issue1457) Bernhard Leiner <bleiner@gmail.com> parents: 7568 diff changeset	781 msg = msg + "\n\n"
7162 ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	782 p.write(msg)
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	783 if commitfiles:
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	784 diffopts = self.diffopts()
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	785 if opts.get('git'): diffopts.git = True
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	786 parent = self.qparents(repo, n)
7308 b6f5490effbf patch: turn patch.diff() into a generator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7307 diff changeset	787 chunks = patch.diff(repo, node1=parent, node2=n,
b6f5490effbf patch: turn patch.diff() into a generator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7307 diff changeset	788 match=match, opts=diffopts)
b6f5490effbf patch: turn patch.diff() into a generator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7307 diff changeset	789 for chunk in chunks:
b6f5490effbf patch: turn patch.diff() into a generator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7307 diff changeset	790 p.write(chunk)
7162 ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	791 p.close()
8112 6ee71f78497c switch lock releasing in the extensions from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8076 diff changeset	792 wlock.release()
7162 ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	793 wlock = None
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	794 r = self.qrepo()
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	795 if r: r.add([patchfn])
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	796 except:
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	797 repo.rollback()
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	798 raise
7280 810ca383da9c remove unused variables Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7271 diff changeset	799 except Exception:
7162 ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	800 patchpath = self.join(patchfn)
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	801 try:
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	802 os.unlink(patchpath)
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	803 except:
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	804 self.ui.warn(_('error unlinking %s\n') % patchpath)
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	805 raise
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	806 self.removeundo(repo)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	807 finally:
8112 6ee71f78497c switch lock releasing in the extensions from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8076 diff changeset	808 release(wlock)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	809
6472 8c4cd80afd3e mq: add --force option to strip Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6382 diff changeset	810 def strip(self, repo, rev, update=True, backup="all", force=None):
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	811 wlock = lock = None
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	812 try:
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	813 wlock = repo.wlock()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	814 lock = repo.lock()
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	815
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	816 if update:
6472 8c4cd80afd3e mq: add --force option to strip Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6382 diff changeset	817 self.check_localchanges(repo, force=force, refresh=False)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	818 urev = self.qparents(repo, rev)
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	819 hg.clean(repo, urev)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	820 repo.dirstate.write()
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	821
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	822 self.removeundo(repo)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	823 repair.strip(self.ui, repo, rev, backup)
5527 0b3f910dfd17 mq: really remove undo after a qpush (and after a strip) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5432 diff changeset	824 # strip may have unbundled a set of backed up revisions after
0b3f910dfd17 mq: really remove undo after a qpush (and after a strip) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5432 diff changeset	825 # the actual strip
0b3f910dfd17 mq: really remove undo after a qpush (and after a strip) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5432 diff changeset	826 self.removeundo(repo)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	827 finally:
8112 6ee71f78497c switch lock releasing in the extensions from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8076 diff changeset	828 release(lock, wlock)
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	829
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	830 def isapplied(self, patch):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	831 """returns (index, rev, patch)"""
8632 9e055cfdd620 replace "i in range(len(xs))" with "i, x in enumerate(xs)" Martin Geisler <mg@lazybytes.net> parents: 8624 diff changeset	832 for i, a in enumerate(self.applied):
2780 ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	833 if a.name == patch:
ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	834 return (i, a.rev, a.name)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	835 return None
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	836
3223 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 3186 diff changeset	837 # if the exact patch name does not exist, we try a few
2696 be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	838 # variations. If strict is passed, we try only #1
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	839 #
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	840 # 1) a number to indicate an offset in the series file
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	841 # 2) a unique substring of the patch name was given
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	842 # 3) patchname[-+]num to indicate an offset in the series file
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	843 def lookup(self, patch, strict=False):
2844 582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	844 patch = patch and str(patch)
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	845
2696 be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	846 def partial_name(s):
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	847 if s in self.series:
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	848 return s
2765 0327bd1c831c mq: print matches if patch name not unique Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2757 diff changeset	849 matches = [x for x in self.series if s in x]
0327bd1c831c mq: print matches if patch name not unique Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2757 diff changeset	850 if len(matches) > 1:
0327bd1c831c mq: print matches if patch name not unique Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2757 diff changeset	851 self.ui.warn(_('patch name "%s" is ambiguous:\n') % s)
0327bd1c831c mq: print matches if patch name not unique Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2757 diff changeset	852 for m in matches:
0327bd1c831c mq: print matches if patch name not unique Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2757 diff changeset	853 self.ui.warn(' %s\n' % m)
0327bd1c831c mq: print matches if patch name not unique Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2757 diff changeset	854 return None
0327bd1c831c mq: print matches if patch name not unique Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2757 diff changeset	855 if matches:
0327bd1c831c mq: print matches if patch name not unique Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2757 diff changeset	856 return matches[0]
2696 be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	857 if len(self.series) > 0 and len(self.applied) > 0:
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	858 if s == 'qtip':
3874 e88d03c2a3d9 mq: fix qheader without args when guards are applied after qtop Brendan Cully <brendan@kublai.com> parents: 3871 diff changeset	859 return self.series[self.series_end(True)-1]
2696 be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	860 if s == 'qbase':
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	861 return self.series[0]
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	862 return None
7568 12df451ce205 mq: don't warn about ambiguous patch name when using patch index (issue1439) Jason Orendorff <jorendorff@mozilla.com> parents: 7566 diff changeset	863
8527 f9a80054dd3c use 'x is None' instead of 'x == None' Martin Geisler <mg@lazybytes.net> parents: 8525 diff changeset	864 if patch is None:
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	865 return None
7568 12df451ce205 mq: don't warn about ambiguous patch name when using patch index (issue1439) Jason Orendorff <jorendorff@mozilla.com> parents: 7566 diff changeset	866 if patch in self.series:
12df451ce205 mq: don't warn about ambiguous patch name when using patch index (issue1439) Jason Orendorff <jorendorff@mozilla.com> parents: 7566 diff changeset	867 return patch
2696 be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	868
2819 766ecdc83e43 mq: add join method Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2818 diff changeset	869 if not os.path.isfile(self.join(patch)):
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	870 try:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	871 sno = int(patch)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	872 except(ValueError, OverflowError):
2696 be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	873 pass
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	874 else:
7568 12df451ce205 mq: don't warn about ambiguous patch name when using patch index (issue1439) Jason Orendorff <jorendorff@mozilla.com> parents: 7566 diff changeset	875 if -len(self.series) <= sno < len(self.series):
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	876 return self.series[sno]
7568 12df451ce205 mq: don't warn about ambiguous patch name when using patch index (issue1439) Jason Orendorff <jorendorff@mozilla.com> parents: 7566 diff changeset	877
2696 be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	878 if not strict:
7568 12df451ce205 mq: don't warn about ambiguous patch name when using patch index (issue1439) Jason Orendorff <jorendorff@mozilla.com> parents: 7566 diff changeset	879 res = partial_name(patch)
2696 be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	880 if res:
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	881 return res
3082 bed7cb835d8d Fixed python2.3 incompatibility (rsplit) in qpush/qpop with index. Thomas Arendsen Hein <thomas@intevation.de> parents: 3076 diff changeset	882 minus = patch.rfind('-')
bed7cb835d8d Fixed python2.3 incompatibility (rsplit) in qpush/qpop with index. Thomas Arendsen Hein <thomas@intevation.de> parents: 3076 diff changeset	883 if minus >= 0:
bed7cb835d8d Fixed python2.3 incompatibility (rsplit) in qpush/qpop with index. Thomas Arendsen Hein <thomas@intevation.de> parents: 3076 diff changeset	884 res = partial_name(patch[:minus])
2696 be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	885 if res:
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	886 i = self.series.index(res)
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	887 try:
3082 bed7cb835d8d Fixed python2.3 incompatibility (rsplit) in qpush/qpop with index. Thomas Arendsen Hein <thomas@intevation.de> parents: 3076 diff changeset	888 off = int(patch[minus+1:] or 1)
2696 be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	889 except(ValueError, OverflowError):
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	890 pass
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	891 else:
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	892 if i - off >= 0:
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	893 return self.series[i - off]
3082 bed7cb835d8d Fixed python2.3 incompatibility (rsplit) in qpush/qpop with index. Thomas Arendsen Hein <thomas@intevation.de> parents: 3076 diff changeset	894 plus = patch.rfind('+')
bed7cb835d8d Fixed python2.3 incompatibility (rsplit) in qpush/qpop with index. Thomas Arendsen Hein <thomas@intevation.de> parents: 3076 diff changeset	895 if plus >= 0:
bed7cb835d8d Fixed python2.3 incompatibility (rsplit) in qpush/qpop with index. Thomas Arendsen Hein <thomas@intevation.de> parents: 3076 diff changeset	896 res = partial_name(patch[:plus])
2696 be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	897 if res:
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	898 i = self.series.index(res)
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	899 try:
3082 bed7cb835d8d Fixed python2.3 incompatibility (rsplit) in qpush/qpop with index. Thomas Arendsen Hein <thomas@intevation.de> parents: 3076 diff changeset	900 off = int(patch[plus+1:] or 1)
2696 be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	901 except(ValueError, OverflowError):
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	902 pass
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	903 else:
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	904 if i + off < len(self.series):
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	905 return self.series[i + off]
2712 8e5cd8d11b51 mq: move many error messages to util.Abort Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2711 diff changeset	906 raise util.Abort(_("patch %s not in series") % patch)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	907
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	908 def push(self, repo, patch=None, force=False, list=False,
7398 2cd1308cb588 mq: gracefully abort qpush/qgoto to guarded patch (issue1186) Brendan Cully <brendan@kublai.com> parents: 7308 diff changeset	909 mergeq=None, all=False):
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	910 wlock = repo.wlock()
8795 51c29aec0b75 mq: eliminate warning on qpush with empty series Adrian Buehlmann <adrian@cadifra.com> parents: 8778 diff changeset	911 try:
51c29aec0b75 mq: eliminate warning on qpush with empty series Adrian Buehlmann <adrian@cadifra.com> parents: 8778 diff changeset	912 if repo.dirstate.parents()[0] not in repo.heads():
51c29aec0b75 mq: eliminate warning on qpush with empty series Adrian Buehlmann <adrian@cadifra.com> parents: 8778 diff changeset	913 self.ui.status(_("(working directory not at a head)\n"))
6340 949e607ac544 mq: warn when applying a patch to somewhere other than tip Matt Mackall <mpm@selenic.com> parents: 6217 diff changeset	914
8795 51c29aec0b75 mq: eliminate warning on qpush with empty series Adrian Buehlmann <adrian@cadifra.com> parents: 8778 diff changeset	915 if not self.series:
51c29aec0b75 mq: eliminate warning on qpush with empty series Adrian Buehlmann <adrian@cadifra.com> parents: 8778 diff changeset	916 self.ui.warn(_('no patches in series\n'))
51c29aec0b75 mq: eliminate warning on qpush with empty series Adrian Buehlmann <adrian@cadifra.com> parents: 8778 diff changeset	917 return 0
7398 2cd1308cb588 mq: gracefully abort qpush/qgoto to guarded patch (issue1186) Brendan Cully <brendan@kublai.com> parents: 7308 diff changeset	918
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	919 patch = self.lookup(patch)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	920 # Suppose our series file is: A B C and the current 'top'
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	921 # patch is B. qpush C should be performed (moving forward)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	922 # qpush B is a NOP (no change) qpush A is an error (can't
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	923 # go backwards with qpush)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	924 if patch:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	925 info = self.isapplied(patch)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	926 if info:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	927 if info[0] < len(self.applied) - 1:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	928 raise util.Abort(
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	929 _("cannot push to a previous patch: %s") % patch)
7398 2cd1308cb588 mq: gracefully abort qpush/qgoto to guarded patch (issue1186) Brendan Cully <brendan@kublai.com> parents: 7308 diff changeset	930 self.ui.warn(
2cd1308cb588 mq: gracefully abort qpush/qgoto to guarded patch (issue1186) Brendan Cully <brendan@kublai.com> parents: 7308 diff changeset	931 _('qpush: %s is already at the top\n') % patch)
2cd1308cb588 mq: gracefully abort qpush/qgoto to guarded patch (issue1186) Brendan Cully <brendan@kublai.com> parents: 7308 diff changeset	932 return
2cd1308cb588 mq: gracefully abort qpush/qgoto to guarded patch (issue1186) Brendan Cully <brendan@kublai.com> parents: 7308 diff changeset	933 pushable, reason = self.pushable(patch)
2cd1308cb588 mq: gracefully abort qpush/qgoto to guarded patch (issue1186) Brendan Cully <brendan@kublai.com> parents: 7308 diff changeset	934 if not pushable:
2cd1308cb588 mq: gracefully abort qpush/qgoto to guarded patch (issue1186) Brendan Cully <brendan@kublai.com> parents: 7308 diff changeset	935 if reason:
2cd1308cb588 mq: gracefully abort qpush/qgoto to guarded patch (issue1186) Brendan Cully <brendan@kublai.com> parents: 7308 diff changeset	936 reason = _('guarded by %r') % reason
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	937 else:
7398 2cd1308cb588 mq: gracefully abort qpush/qgoto to guarded patch (issue1186) Brendan Cully <brendan@kublai.com> parents: 7308 diff changeset	938 reason = _('no matching guards')
2cd1308cb588 mq: gracefully abort qpush/qgoto to guarded patch (issue1186) Brendan Cully <brendan@kublai.com> parents: 7308 diff changeset	939 self.ui.warn(_("cannot push '%s' - %s\n") % (patch, reason))
2cd1308cb588 mq: gracefully abort qpush/qgoto to guarded patch (issue1186) Brendan Cully <brendan@kublai.com> parents: 7308 diff changeset	940 return 1
2cd1308cb588 mq: gracefully abort qpush/qgoto to guarded patch (issue1186) Brendan Cully <brendan@kublai.com> parents: 7308 diff changeset	941 elif all:
2cd1308cb588 mq: gracefully abort qpush/qgoto to guarded patch (issue1186) Brendan Cully <brendan@kublai.com> parents: 7308 diff changeset	942 patch = self.series[-1]
2cd1308cb588 mq: gracefully abort qpush/qgoto to guarded patch (issue1186) Brendan Cully <brendan@kublai.com> parents: 7308 diff changeset	943 if self.isapplied(patch):
2cd1308cb588 mq: gracefully abort qpush/qgoto to guarded patch (issue1186) Brendan Cully <brendan@kublai.com> parents: 7308 diff changeset	944 self.ui.warn(_('all patches are currently applied\n'))
2cd1308cb588 mq: gracefully abort qpush/qgoto to guarded patch (issue1186) Brendan Cully <brendan@kublai.com> parents: 7308 diff changeset	945 return 0
4100 c30c922f907a Modify qpush/qpop idempotent operations to return success Ben Thomas <bthomas@virtualiron.com> parents: 4099 diff changeset	946
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	947 # Following the above example, starting at 'top' of B:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	948 # qpush should be performed (pushes C), but a subsequent
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	949 # qpush without an argument is an error (nothing to
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	950 # apply). This allows a loop of "...while hg qpush..." to
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	951 # work as it detects an error when done
7398 2cd1308cb588 mq: gracefully abort qpush/qgoto to guarded patch (issue1186) Brendan Cully <brendan@kublai.com> parents: 7308 diff changeset	952 start = self.series_end()
2cd1308cb588 mq: gracefully abort qpush/qgoto to guarded patch (issue1186) Brendan Cully <brendan@kublai.com> parents: 7308 diff changeset	953 if start == len(self.series):
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	954 self.ui.warn(_('patch series already fully applied\n'))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	955 return 1
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	956 if not force:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	957 self.check_localchanges(repo)
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	958
7398 2cd1308cb588 mq: gracefully abort qpush/qgoto to guarded patch (issue1186) Brendan Cully <brendan@kublai.com> parents: 7308 diff changeset	959 self.applied_dirty = 1
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	960 if start > 0:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	961 self.check_toppatch(repo)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	962 if not patch:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	963 patch = self.series[start]
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	964 end = start + 1
4418 0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4406 diff changeset	965 else:
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	966 end = self.series.index(patch, start) + 1
8875 801cacf46e62 mq: fix error message for qpush inexistent-patch (issue1702) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8833 diff changeset	967
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	968 s = self.series[start:end]
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	969 all_files = {}
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	970 try:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	971 if mergeq:
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	972 ret = self.mergepatch(repo, mergeq, s)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	973 else:
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	974 ret = self.apply(repo, s, list, all_files=all_files)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	975 except:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	976 self.ui.warn(_('cleaning up working directory...'))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	977 node = repo.dirstate.parents()[0]
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	978 hg.revert(repo, node, None)
6760 4faaa0535ea7 status: clean up all users for unknown files Matt Mackall <mpm@selenic.com> parents: 6750 diff changeset	979 unknown = repo.status(unknown=True)[4]
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	980 # only remove unknown files that we know we touched or
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	981 # created while patching
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	982 for f in unknown:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	983 if f in all_files:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	984 util.unlink(repo.wjoin(f))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	985 self.ui.warn(_('done\n'))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	986 raise
8875 801cacf46e62 mq: fix error message for qpush inexistent-patch (issue1702) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8833 diff changeset	987
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	988 top = self.applied[-1].name
8875 801cacf46e62 mq: fix error message for qpush inexistent-patch (issue1702) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8833 diff changeset	989 if ret[0] and ret[0] > 1:
801cacf46e62 mq: fix error message for qpush inexistent-patch (issue1702) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8833 diff changeset	990 msg = _("errors during apply, please fix and refresh %s\n")
801cacf46e62 mq: fix error message for qpush inexistent-patch (issue1702) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8833 diff changeset	991 self.ui.write(msg % top)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	992 else:
7627 fb32ae9c76e7 mq: lowercase output Martin Geisler <mg@daimi.au.dk> parents: 7621 diff changeset	993 self.ui.write(_("now at: %s\n") % top)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	994 return ret[0]
8875 801cacf46e62 mq: fix error message for qpush inexistent-patch (issue1702) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8833 diff changeset	995
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	996 finally:
8112 6ee71f78497c switch lock releasing in the extensions from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8076 diff changeset	997 wlock.release()
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	998
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	999 def pop(self, repo, patch=None, force=False, update=True, all=False):
5157 f6c520fd70cf mq: teach qpop about symlinks Bryan O'Sullivan <bos@serpentine.com> parents: 5148 diff changeset	1000 def getfile(f, rev, flags):
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1001 t = repo.file(f).read(rev)
5157 f6c520fd70cf mq: teach qpop about symlinks Bryan O'Sullivan <bos@serpentine.com> parents: 5148 diff changeset	1002 repo.wwrite(f, t, flags)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1003
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	1004 wlock = repo.wlock()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1005 try:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1006 if patch:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1007 # index, rev, patch
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1008 info = self.isapplied(patch)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1009 if not info:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1010 patch = self.lookup(patch)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1011 info = self.isapplied(patch)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1012 if not info:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1013 raise util.Abort(_("patch %s is not applied") % patch)
4100 c30c922f907a Modify qpush/qpop idempotent operations to return success Ben Thomas <bthomas@virtualiron.com> parents: 4099 diff changeset	1014
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1015 if len(self.applied) == 0:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1016 # Allow qpop -a to work repeatedly,
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1017 # but not qpop without an argument
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1018 self.ui.warn(_("no patches applied\n"))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1019 return not all
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1020
7620 fbfd92d51540 mq: refactor the pop code to be more readable and allow more changes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7619 diff changeset	1021 if all:
fbfd92d51540 mq: refactor the pop code to be more readable and allow more changes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7619 diff changeset	1022 start = 0
fbfd92d51540 mq: refactor the pop code to be more readable and allow more changes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7619 diff changeset	1023 elif patch:
fbfd92d51540 mq: refactor the pop code to be more readable and allow more changes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7619 diff changeset	1024 start = info[0] + 1
fbfd92d51540 mq: refactor the pop code to be more readable and allow more changes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7619 diff changeset	1025 else:
fbfd92d51540 mq: refactor the pop code to be more readable and allow more changes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7619 diff changeset	1026 start = len(self.applied) - 1
fbfd92d51540 mq: refactor the pop code to be more readable and allow more changes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7619 diff changeset	1027
fbfd92d51540 mq: refactor the pop code to be more readable and allow more changes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7619 diff changeset	1028 if start >= len(self.applied):
fbfd92d51540 mq: refactor the pop code to be more readable and allow more changes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7619 diff changeset	1029 self.ui.warn(_("qpop: %s is already at the top\n") % patch)
fbfd92d51540 mq: refactor the pop code to be more readable and allow more changes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7619 diff changeset	1030 return
fbfd92d51540 mq: refactor the pop code to be more readable and allow more changes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7619 diff changeset	1031
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1032 if not update:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1033 parents = repo.dirstate.parents()
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	1034 rr = [ bin(x.rev) for x in self.applied ]
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1035 for p in parents:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1036 if p in rr:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	1037 self.ui.warn(_("qpop: forcing dirstate update\n"))
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1038 update = True
7621 6d891df43a5f mq: allow qpop if popped revisions are not working dir parents Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7620 diff changeset	1039 else:
6d891df43a5f mq: allow qpop if popped revisions are not working dir parents Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7620 diff changeset	1040 parents = [p.hex() for p in repo[None].parents()]
6d891df43a5f mq: allow qpop if popped revisions are not working dir parents Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7620 diff changeset	1041 needupdate = False
6d891df43a5f mq: allow qpop if popped revisions are not working dir parents Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7620 diff changeset	1042 for entry in self.applied[start:]:
6d891df43a5f mq: allow qpop if popped revisions are not working dir parents Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7620 diff changeset	1043 if entry.rev in parents:
6d891df43a5f mq: allow qpop if popped revisions are not working dir parents Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7620 diff changeset	1044 needupdate = True
6d891df43a5f mq: allow qpop if popped revisions are not working dir parents Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7620 diff changeset	1045 break
6d891df43a5f mq: allow qpop if popped revisions are not working dir parents Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7620 diff changeset	1046 update = needupdate
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1047
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1048 if not force and update:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1049 self.check_localchanges(repo)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1050
7620 fbfd92d51540 mq: refactor the pop code to be more readable and allow more changes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7619 diff changeset	1051 self.applied_dirty = 1
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1052 end = len(self.applied)
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	1053 rev = bin(self.applied[start].rev)
5980 dcda0c90125c mq: pop/refresh: avoid losing revisions not managed by mq Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5979 diff changeset	1054 if update:
dcda0c90125c mq: pop/refresh: avoid losing revisions not managed by mq Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5979 diff changeset	1055 top = self.check_toppatch(repo)
dcda0c90125c mq: pop/refresh: avoid losing revisions not managed by mq Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5979 diff changeset	1056
7621 6d891df43a5f mq: allow qpop if popped revisions are not working dir parents Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7620 diff changeset	1057 try:
6d891df43a5f mq: allow qpop if popped revisions are not working dir parents Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7620 diff changeset	1058 heads = repo.changelog.heads(rev)
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	1059 except error.LookupError:
7621 6d891df43a5f mq: allow qpop if popped revisions are not working dir parents Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7620 diff changeset	1060 node = short(rev)
6d891df43a5f mq: allow qpop if popped revisions are not working dir parents Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7620 diff changeset	1061 raise util.Abort(_('trying to pop unknown node %s') % node)
6d891df43a5f mq: allow qpop if popped revisions are not working dir parents Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7620 diff changeset	1062
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	1063 if heads != [bin(self.applied[-1].rev)]:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	1064 raise util.Abort(_("popping would remove a revision not "
46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	1065 "managed by this patch queue"))
5980 dcda0c90125c mq: pop/refresh: avoid losing revisions not managed by mq Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5979 diff changeset	1066
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1067 # we know there are no local changes, so we can make a simplified
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1068 # form of hg.update.
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1069 if update:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1070 qp = self.qparents(repo, rev)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1071 changes = repo.changelog.read(qp)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1072 mmap = repo.manifest.read(changes[0])
6760 4faaa0535ea7 status: clean up all users for unknown files Matt Mackall <mpm@selenic.com> parents: 6750 diff changeset	1073 m, a, r, d = repo.status(qp, top)[:4]
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1074 if d:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	1075 raise util.Abort(_("deletions found between repo revs"))
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1076 for f in m:
5157 f6c520fd70cf mq: teach qpop about symlinks Bryan O'Sullivan <bos@serpentine.com> parents: 5148 diff changeset	1077 getfile(f, mmap[f], mmap.flags(f))
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1078 for f in r:
5157 f6c520fd70cf mq: teach qpop about symlinks Bryan O'Sullivan <bos@serpentine.com> parents: 5148 diff changeset	1079 getfile(f, mmap[f], mmap.flags(f))
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1080 for f in m + r:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1081 repo.dirstate.normal(f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1082 for f in a:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1083 try:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1084 os.unlink(repo.wjoin(f))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1085 except OSError, e:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1086 if e.errno != errno.ENOENT:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1087 raise
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1088 try: os.removedirs(os.path.dirname(repo.wjoin(f)))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1089 except: pass
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1090 repo.dirstate.forget(f)
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	1091 repo.dirstate.setparents(qp, nullid)
9110 561ff8d9e4f0 mq: qpop now tells which patches are popped Mads Kiilerich <mads@kiilerich.com> parents: 9067 diff changeset	1092 for patch in reversed(self.applied[start:end]):
9111 ac3f1e6696eb mq: use ui.status when pushing and popping patches Martin Geisler <mg@lazybytes.net> parents: 9110 diff changeset	1093 self.ui.status(_("popping %s\n") % patch.name)
5987 f2201aee3dc8 qpop/qrefresh: update self.applied before calling strip Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5981 diff changeset	1094 del self.applied[start:end]
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	1095 self.strip(repo, rev, update=False, backup='strip')
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1096 if len(self.applied):
7627 fb32ae9c76e7 mq: lowercase output Martin Geisler <mg@daimi.au.dk> parents: 7621 diff changeset	1097 self.ui.write(_("now at: %s\n") % self.applied[-1].name)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1098 else:
7627 fb32ae9c76e7 mq: lowercase output Martin Geisler <mg@daimi.au.dk> parents: 7621 diff changeset	1099 self.ui.write(_("patch queue now empty\n"))
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1100 finally:
8112 6ee71f78497c switch lock releasing in the extensions from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8076 diff changeset	1101 wlock.release()
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1102
2937 9dc568f5e03d Fix test-mq-qdiff; add -I and -X options to qdiff Brendan Cully <brendan@kublai.com> parents: 2936 diff changeset	1103 def diff(self, repo, pats, opts):
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1104 top = self.check_toppatch(repo)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1105 if not top:
7627 fb32ae9c76e7 mq: lowercase output Martin Geisler <mg@daimi.au.dk> parents: 7621 diff changeset	1106 self.ui.write(_("no patches applied\n"))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1107 return
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1108 qp = self.qparents(repo, top)
6668 034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 6650 diff changeset	1109 self._diffopts = patch.diffopts(self.ui, opts)
2937 9dc568f5e03d Fix test-mq-qdiff; add -I and -X options to qdiff Brendan Cully <brendan@kublai.com> parents: 2936 diff changeset	1110 self.printdiff(repo, qp, files=pats, opts=opts)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1111
2938 5b7a118f5b6c allow qrefresh to take a list of files; closes #96. Brendan Cully <brendan@kublai.com> parents: 2937 diff changeset	1112 def refresh(self, repo, pats=None, **opts):
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1113 if len(self.applied) == 0:
7627 fb32ae9c76e7 mq: lowercase output Martin Geisler <mg@daimi.au.dk> parents: 7621 diff changeset	1114 self.ui.write(_("no patches applied\n"))
3004 ac74046f8f58 qrefresh: exit with status 1 if no patches applied. Bryan O'Sullivan <bos@serpentine.com> parents: 2984 diff changeset	1115 return 1
7399 e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	1116 msg = opts.get('msg', '').rstrip()
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	1117 newuser = opts.get('user')
6139 989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6120 diff changeset	1118 newdate = opts.get('date')
989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6120 diff changeset	1119 if newdate:
989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6120 diff changeset	1120 newdate = '%d %d' % util.parsedate(newdate)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1121 wlock = repo.wlock()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1122 try:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1123 self.check_toppatch(repo)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1124 (top, patchfn) = (self.applied[-1].rev, self.applied[-1].name)
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	1125 top = bin(top)
5980 dcda0c90125c mq: pop/refresh: avoid losing revisions not managed by mq Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5979 diff changeset	1126 if repo.changelog.heads(top) != [top]:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	1127 raise util.Abort(_("cannot refresh a revision with children"))
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1128 cparents = repo.changelog.parents(top)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1129 patchparent = self.qparents(repo, top)
8653 aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	1130 ph = patchheader(self.join(patchfn))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1131
7400 409a9b442308 mq: use atomictempfiles during patch refresh Brendan Cully <brendan@kublai.com> parents: 7399 diff changeset	1132 patchf = self.opener(patchfn, 'r')
4930 fc502517d68d mq: autodetect an existing git patch during qrefresh (issue 491) Bryan O'Sullivan <bos@serpentine.com> parents: 4737 diff changeset	1133
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1134 # if the patch was a git patch, refresh it as a git patch
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1135 for line in patchf:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1136 if line.startswith('diff --git'):
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1137 self.diffopts().git = True
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1138 break
4930 fc502517d68d mq: autodetect an existing git patch during qrefresh (issue 491) Bryan O'Sullivan <bos@serpentine.com> parents: 4737 diff changeset	1139
7399 e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	1140 if msg:
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	1141 ph.setmessage(msg)
5673 dd3ce7515f4d mq: add --currentuser and --user options to qnew and qrefresh peter.arrenbrecht@gmail.com parents: 5645 diff changeset	1142 if newuser:
7399 e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	1143 ph.setuser(newuser)
5788 4107e823dc2c mq: add --currentdate and --date options to qnew and qrefresh Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 5673 diff changeset	1144 if newdate:
7399 e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	1145 ph.setdate(newdate)
5180 5bbbd1f1d586 mq: truncate patch just before rewriting header Brendan Cully <brendan@kublai.com> parents: 4930 diff changeset	1146
7400 409a9b442308 mq: use atomictempfiles during patch refresh Brendan Cully <brendan@kublai.com> parents: 7399 diff changeset	1147 # only commit new patch when write is complete
409a9b442308 mq: use atomictempfiles during patch refresh Brendan Cully <brendan@kublai.com> parents: 7399 diff changeset	1148 patchf = self.opener(patchfn, 'w', atomictemp=True)
409a9b442308 mq: use atomictempfiles during patch refresh Brendan Cully <brendan@kublai.com> parents: 7399 diff changeset	1149
5183 f8aa16533ddf Merge with crew-stable Brendan Cully <brendan@kublai.com> parents: 5157 5180 diff changeset	1150 patchf.seek(0)
f8aa16533ddf Merge with crew-stable Brendan Cully <brendan@kublai.com> parents: 5157 5180 diff changeset	1151 patchf.truncate()
5180 5bbbd1f1d586 mq: truncate patch just before rewriting header Brendan Cully <brendan@kublai.com> parents: 4930 diff changeset	1152
7399 e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	1153 comments = str(ph)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1154 if comments:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1155 patchf.write(comments)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1156
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1157 if opts.get('git'):
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1158 self.diffopts().git = True
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1159 tip = repo.changelog.tip()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1160 if top == tip:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1161 # if the top of our patch queue is also the tip, there is an
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1162 # optimization here. We update the dirstate in place and strip
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1163 # off the tip commit. Then just commit the current directory
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1164 # tree. We can also send repo.commit the list of files
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1165 # changed to speed up the diff
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1166 #
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1167 # in short mode, we only diff the files included in the
7177 09ed32b79656 mq: Fix --qrefresh --short to work with --exclude and --include Mads Kiilerich <mads@kiilerich.com> parents: 7162 diff changeset	1168 # patch already plus specified files
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1169 #
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1170 # this should really read:
6760 4faaa0535ea7 status: clean up all users for unknown files Matt Mackall <mpm@selenic.com> parents: 6750 diff changeset	1171 # mm, dd, aa, aa2 = repo.status(tip, patchparent)[:4]
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1172 # but we do it backwards to take advantage of manifest/chlog
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1173 # caching against the next repo.status call
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1174 #
6760 4faaa0535ea7 status: clean up all users for unknown files Matt Mackall <mpm@selenic.com> parents: 6750 diff changeset	1175 mm, aa, dd, aa2 = repo.status(patchparent, tip)[:4]
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1176 changes = repo.changelog.read(tip)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1177 man = repo.manifest.read(changes[0])
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1178 aaa = aa[:]
7177 09ed32b79656 mq: Fix --qrefresh --short to work with --exclude and --include Mads Kiilerich <mads@kiilerich.com> parents: 7162 diff changeset	1179 matchfn = cmdutil.match(repo, pats, opts)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1180 if opts.get('short'):
7177 09ed32b79656 mq: Fix --qrefresh --short to work with --exclude and --include Mads Kiilerich <mads@kiilerich.com> parents: 7162 diff changeset	1181 # if amending a patch, we start with existing
09ed32b79656 mq: Fix --qrefresh --short to work with --exclude and --include Mads Kiilerich <mads@kiilerich.com> parents: 7162 diff changeset	1182 # files plus specified files - unfiltered
7113 f7fc5f5ecd62 mq: Allow qrefresh --silent to take parameters Mads Kiilerich <mads@kiilerich.com> parents: 7002 diff changeset	1183 match = cmdutil.matchfiles(repo, mm + aa + dd + matchfn.files())
7177 09ed32b79656 mq: Fix --qrefresh --short to work with --exclude and --include Mads Kiilerich <mads@kiilerich.com> parents: 7162 diff changeset	1184 # filter with inc/exl options
09ed32b79656 mq: Fix --qrefresh --short to work with --exclude and --include Mads Kiilerich <mads@kiilerich.com> parents: 7162 diff changeset	1185 matchfn = cmdutil.match(repo, opts=opts)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1186 else:
6599 cd4db3999ef9 status: use match helpers for various users Matt Mackall <mpm@selenic.com> parents: 6582 diff changeset	1187 match = cmdutil.matchall(repo)
6760 4faaa0535ea7 status: clean up all users for unknown files Matt Mackall <mpm@selenic.com> parents: 6750 diff changeset	1188 m, a, r, d = repo.status(match=match)[:4]
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1189
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1190 # we might end up with files that were added between
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1191 # tip and the dirstate parent, but then changed in the
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1192 # local dirstate. in this case, we want them to only
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1193 # show up in the added section
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1194 for x in m:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1195 if x not in aa:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1196 mm.append(x)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1197 # we might end up with files added by the local dirstate that
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1198 # were deleted by the patch. In this case, they should only
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1199 # show up in the changed section.
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1200 for x in a:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1201 if x in dd:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1202 del dd[dd.index(x)]
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1203 mm.append(x)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1204 else:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1205 aa.append(x)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1206 # make sure any files deleted in the local dirstate
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1207 # are not in the add or change column of the patch
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1208 forget = []
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1209 for x in d + r:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1210 if x in aa:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1211 del aa[aa.index(x)]
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1212 forget.append(x)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1213 continue
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1214 elif x in mm:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1215 del mm[mm.index(x)]
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1216 dd.append(x)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1217
8151 127281884959 util: use built-in set instead of util.unique Martin Geisler <mg@lazybytes.net> parents: 8112 diff changeset	1218 m = list(set(mm))
127281884959 util: use built-in set instead of util.unique Martin Geisler <mg@lazybytes.net> parents: 8112 diff changeset	1219 r = list(set(dd))
127281884959 util: use built-in set instead of util.unique Martin Geisler <mg@lazybytes.net> parents: 8112 diff changeset	1220 a = list(set(aa))
6760 4faaa0535ea7 status: clean up all users for unknown files Matt Mackall <mpm@selenic.com> parents: 6750 diff changeset	1221 c = [filter(matchfn, l) for l in (m, a, r)]
8151 127281884959 util: use built-in set instead of util.unique Martin Geisler <mg@lazybytes.net> parents: 8112 diff changeset	1222 match = cmdutil.matchfiles(repo, set(c[0] + c[1] + c[2]))
7308 b6f5490effbf patch: turn patch.diff() into a generator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7307 diff changeset	1223 chunks = patch.diff(repo, patchparent, match=match,
b6f5490effbf patch: turn patch.diff() into a generator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7307 diff changeset	1224 changes=c, opts=self.diffopts())
b6f5490effbf patch: turn patch.diff() into a generator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7307 diff changeset	1225 for chunk in chunks:
b6f5490effbf patch: turn patch.diff() into a generator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7307 diff changeset	1226 patchf.write(chunk)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1227
7401 41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1228 try:
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1229 if self.diffopts().git:
7566 5f7e3f17aece mq: drop copy records when refreshing regular patches (issue1441) Patrick Mezard <pmezard@gmail.com> parents: 7454 diff changeset	1230 copies = {}
5f7e3f17aece mq: drop copy records when refreshing regular patches (issue1441) Patrick Mezard <pmezard@gmail.com> parents: 7454 diff changeset	1231 for dst in a:
5f7e3f17aece mq: drop copy records when refreshing regular patches (issue1441) Patrick Mezard <pmezard@gmail.com> parents: 7454 diff changeset	1232 src = repo.dirstate.copied(dst)
5f7e3f17aece mq: drop copy records when refreshing regular patches (issue1441) Patrick Mezard <pmezard@gmail.com> parents: 7454 diff changeset	1233 # during qfold, the source file for copies may
5f7e3f17aece mq: drop copy records when refreshing regular patches (issue1441) Patrick Mezard <pmezard@gmail.com> parents: 7454 diff changeset	1234 # be removed. Treat this as a simple add.
5f7e3f17aece mq: drop copy records when refreshing regular patches (issue1441) Patrick Mezard <pmezard@gmail.com> parents: 7454 diff changeset	1235 if src is not None and src in repo.dirstate:
5f7e3f17aece mq: drop copy records when refreshing regular patches (issue1441) Patrick Mezard <pmezard@gmail.com> parents: 7454 diff changeset	1236 copies.setdefault(src, []).append(dst)
5f7e3f17aece mq: drop copy records when refreshing regular patches (issue1441) Patrick Mezard <pmezard@gmail.com> parents: 7454 diff changeset	1237 repo.dirstate.add(dst)
5f7e3f17aece mq: drop copy records when refreshing regular patches (issue1441) Patrick Mezard <pmezard@gmail.com> parents: 7454 diff changeset	1238 # remember the copies between patchparent and tip
7401 41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1239 for dst in aaa:
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1240 f = repo.file(dst)
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1241 src = f.renamed(man[dst])
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1242 if src:
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1243 copies.setdefault(src[0], []).extend(copies.get(dst, []))
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1244 if dst in a:
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1245 copies[src[0]].append(dst)
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1246 # we can't copy a file created by the patch itself
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1247 if dst in copies:
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1248 del copies[dst]
7566 5f7e3f17aece mq: drop copy records when refreshing regular patches (issue1441) Patrick Mezard <pmezard@gmail.com> parents: 7454 diff changeset	1249 for src, dsts in copies.iteritems():
5f7e3f17aece mq: drop copy records when refreshing regular patches (issue1441) Patrick Mezard <pmezard@gmail.com> parents: 7454 diff changeset	1250 for dst in dsts:
5f7e3f17aece mq: drop copy records when refreshing regular patches (issue1441) Patrick Mezard <pmezard@gmail.com> parents: 7454 diff changeset	1251 repo.dirstate.copy(src, dst)
5f7e3f17aece mq: drop copy records when refreshing regular patches (issue1441) Patrick Mezard <pmezard@gmail.com> parents: 7454 diff changeset	1252 else:
5f7e3f17aece mq: drop copy records when refreshing regular patches (issue1441) Patrick Mezard <pmezard@gmail.com> parents: 7454 diff changeset	1253 for dst in a:
5f7e3f17aece mq: drop copy records when refreshing regular patches (issue1441) Patrick Mezard <pmezard@gmail.com> parents: 7454 diff changeset	1254 repo.dirstate.add(dst)
5f7e3f17aece mq: drop copy records when refreshing regular patches (issue1441) Patrick Mezard <pmezard@gmail.com> parents: 7454 diff changeset	1255 # Drop useless copy information
5f7e3f17aece mq: drop copy records when refreshing regular patches (issue1441) Patrick Mezard <pmezard@gmail.com> parents: 7454 diff changeset	1256 for f in list(repo.dirstate.copies()):
5f7e3f17aece mq: drop copy records when refreshing regular patches (issue1441) Patrick Mezard <pmezard@gmail.com> parents: 7454 diff changeset	1257 repo.dirstate.copy(None, f)
7401 41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1258 for f in r:
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1259 repo.dirstate.remove(f)
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1260 # if the patch excludes a modified file, mark that
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1261 # file with mtime=0 so status can see it.
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1262 mm = []
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1263 for i in xrange(len(m)-1, -1, -1):
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1264 if not matchfn(m[i]):
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1265 mm.append(m[i])
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1266 del m[i]
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1267 for f in m:
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1268 repo.dirstate.normal(f)
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1269 for f in mm:
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1270 repo.dirstate.normallookup(f)
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1271 for f in forget:
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1272 repo.dirstate.forget(f)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1273
7401 41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1274 if not msg:
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1275 if not ph.message:
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1276 message = "[mq]: %s\n" % patchfn
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1277 else:
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1278 message = "\n".join(ph.message)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1279 else:
7401 41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1280 message = msg
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1281
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1282 user = ph.user or changes[1]
2694 0fb28dbf0dc7 MQ: uniformise message and logfile option. "Mathieu Clabaut <mathieu.clabaut@gmail.com>" parents: 2682 diff changeset	1283
7401 41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1284 # assumes strip can roll itself back if interrupted
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1285 repo.dirstate.setparents(*cparents)
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1286 self.applied.pop()
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1287 self.applied_dirty = 1
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1288 self.strip(repo, top, update=False,
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1289 backup='strip')
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1290 except:
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1291 repo.dirstate.invalidate()
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1292 raise
5673 dd3ce7515f4d mq: add --currentuser and --user options to qnew and qrefresh peter.arrenbrecht@gmail.com parents: 5645 diff changeset	1293
7401 41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1294 try:
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1295 # might be nice to attempt to roll back strip after this
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1296 patchf.rename()
8706 25e9c71b89de commit: drop the now-unused files parameter Matt Mackall <mpm@selenic.com> parents: 8700 diff changeset	1297 n = repo.commit(message, user, ph.date, match=match,
25e9c71b89de commit: drop the now-unused files parameter Matt Mackall <mpm@selenic.com> parents: 8700 diff changeset	1298 force=True)
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	1299 self.applied.append(statusentry(hex(n), patchfn))
7401 41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1300 except:
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1301 ctx = repo[cparents[0]]
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1302 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1303 self.save_dirty()
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1304 self.ui.warn(_('refresh interrupted while patch was popped! '
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1305 '(revert --all, qpush to recover)\n'))
41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1306 raise
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1307 else:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1308 self.printdiff(repo, patchparent, fp=patchf)
7400 409a9b442308 mq: use atomictempfiles during patch refresh Brendan Cully <brendan@kublai.com> parents: 7399 diff changeset	1309 patchf.rename()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1310 added = repo.status()[1]
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1311 for a in added:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1312 f = repo.wjoin(a)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1313 try:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1314 os.unlink(f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1315 except OSError, e:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1316 if e.errno != errno.ENOENT:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1317 raise
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1318 try: os.removedirs(os.path.dirname(f))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1319 except: pass
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1320 # forget the file copies in the dirstate
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1321 # push should readd the files later on
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1322 repo.dirstate.forget(a)
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	1323 self.pop(repo, force=True)
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	1324 self.push(repo, force=True)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1325 finally:
8112 6ee71f78497c switch lock releasing in the extensions from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8076 diff changeset	1326 wlock.release()
7401 41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1327 self.removeundo(repo)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1328
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1329 def init(self, repo, create=False):
4071 165abe554c80 mq: qinit -c creates a repo even after a regular qinit Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4068 diff changeset	1330 if not create and os.path.isdir(self.path):
2712 8e5cd8d11b51 mq: move many error messages to util.Abort Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2711 diff changeset	1331 raise util.Abort(_("patch queue directory already exists"))
4071 165abe554c80 mq: qinit -c creates a repo even after a regular qinit Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4068 diff changeset	1332 try:
165abe554c80 mq: qinit -c creates a repo even after a regular qinit Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4068 diff changeset	1333 os.mkdir(self.path)
165abe554c80 mq: qinit -c creates a repo even after a regular qinit Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4068 diff changeset	1334 except OSError, inst:
165abe554c80 mq: qinit -c creates a repo even after a regular qinit Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4068 diff changeset	1335 if inst.errno != errno.EEXIST or not create:
165abe554c80 mq: qinit -c creates a repo even after a regular qinit Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4068 diff changeset	1336 raise
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1337 if create:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1338 return self.qrepo(create=True)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1339
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1340 def unapplied(self, repo, patch=None):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1341 if patch and patch not in self.series:
2712 8e5cd8d11b51 mq: move many error messages to util.Abort Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2711 diff changeset	1342 raise util.Abort(_("patch %s is not in series file") % patch)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1343 if not patch:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1344 start = self.series_end()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1345 else:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1346 start = self.series.index(patch) + 1
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	1347 unapplied = []
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	1348 for i in xrange(start, len(self.series)):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	1349 pushable, reason = self.pushable(i)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	1350 if pushable:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	1351 unapplied.append((i, self.series[i]))
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	1352 self.explain_pushable(i)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	1353 return unapplied
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	1354
4239 417c2068cb92 Simplified qseries and hg qapplied to fix some bugs caused by optimization: Thomas Arendsen Hein <thomas@intevation.de> parents: 4238 diff changeset	1355 def qseries(self, repo, missing=None, start=0, length=None, status=None,
3183 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1356 summary=False):
9016 894c5b4be275 mq: align columns in verbose qseries output. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 8948 diff changeset	1357 def displayname(pfx, patchname):
3183 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1358 if summary:
8653 aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	1359 ph = patchheader(self.join(patchname))
7399 e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	1360 msg = ph.message
3183 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1361 msg = msg and ': ' + msg[0] or ': '
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1362 else:
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1363 msg = ''
9016 894c5b4be275 mq: align columns in verbose qseries output. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 8948 diff changeset	1364 msg = "%s%s%s" % (pfx, patchname, msg)
894c5b4be275 mq: align columns in verbose qseries output. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 8948 diff changeset	1365 if self.ui.interactive():
894c5b4be275 mq: align columns in verbose qseries output. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 8948 diff changeset	1366 msg = util.ellipsis(msg, util.termwidth())
894c5b4be275 mq: align columns in verbose qseries output. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 8948 diff changeset	1367 self.ui.write(msg + '\n')
3183 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1368
8152 08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8151 diff changeset	1369 applied = set([p.name for p in self.applied])
4239 417c2068cb92 Simplified qseries and hg qapplied to fix some bugs caused by optimization: Thomas Arendsen Hein <thomas@intevation.de> parents: 4238 diff changeset	1370 if length is None:
3183 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1371 length = len(self.series) - start
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1372 if not missing:
9016 894c5b4be275 mq: align columns in verbose qseries output. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 8948 diff changeset	1373 if self.ui.verbose:
894c5b4be275 mq: align columns in verbose qseries output. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 8948 diff changeset	1374 idxwidth = len(str(start+length - 1))
3473 0e68608bd11d use xrange instead of range Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3465 diff changeset	1375 for i in xrange(start, start+length):
4239 417c2068cb92 Simplified qseries and hg qapplied to fix some bugs caused by optimization: Thomas Arendsen Hein <thomas@intevation.de> parents: 4238 diff changeset	1376 patch = self.series[i]
417c2068cb92 Simplified qseries and hg qapplied to fix some bugs caused by optimization: Thomas Arendsen Hein <thomas@intevation.de> parents: 4238 diff changeset	1377 if patch in applied:
417c2068cb92 Simplified qseries and hg qapplied to fix some bugs caused by optimization: Thomas Arendsen Hein <thomas@intevation.de> parents: 4238 diff changeset	1378 stat = 'A'
417c2068cb92 Simplified qseries and hg qapplied to fix some bugs caused by optimization: Thomas Arendsen Hein <thomas@intevation.de> parents: 4238 diff changeset	1379 elif self.pushable(i)[0]:
417c2068cb92 Simplified qseries and hg qapplied to fix some bugs caused by optimization: Thomas Arendsen Hein <thomas@intevation.de> parents: 4238 diff changeset	1380 stat = 'U'
417c2068cb92 Simplified qseries and hg qapplied to fix some bugs caused by optimization: Thomas Arendsen Hein <thomas@intevation.de> parents: 4238 diff changeset	1381 else:
417c2068cb92 Simplified qseries and hg qapplied to fix some bugs caused by optimization: Thomas Arendsen Hein <thomas@intevation.de> parents: 4238 diff changeset	1382 stat = 'G'
3183 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1383 pfx = ''
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1384 if self.ui.verbose:
9016 894c5b4be275 mq: align columns in verbose qseries output. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 8948 diff changeset	1385 pfx = '%*d %s ' % (idxwidth, i, stat)
4239 417c2068cb92 Simplified qseries and hg qapplied to fix some bugs caused by optimization: Thomas Arendsen Hein <thomas@intevation.de> parents: 4238 diff changeset	1386 elif status and status != stat:
4238 ce6c364ebb2a Fix issue443: inconsistent output of "hg qunapplied -v" Thomas Arendsen Hein <thomas@intevation.de> parents: 4173 diff changeset	1387 continue
9016 894c5b4be275 mq: align columns in verbose qseries output. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 8948 diff changeset	1388 displayname(pfx, patch)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1389 else:
2794 86c54b7cd331 mq: fix variables shadowing builtin Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2792 diff changeset	1390 msng_list = []
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1391 for root, dirs, files in os.walk(self.path):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1392 d = root[len(self.path) + 1:]
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1393 for f in files:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1394 fl = os.path.join(d, f)
1852 fdf9cbf56ec7 Fix mq's usage of opener, which don't allow absolute paths now. Thomas Arendsen Hein <thomas@intevation.de> parents: 1839 diff changeset	1395 if (fl not in self.series and
4241 7c59ade0f0d6 hg qseries -m: guards file was not ignored Thomas Arendsen Hein <thomas@intevation.de> parents: 4239 diff changeset	1396 fl not in (self.status_path, self.series_path,
7c59ade0f0d6 hg qseries -m: guards file was not ignored Thomas Arendsen Hein <thomas@intevation.de> parents: 4239 diff changeset	1397 self.guards_path)
1852 fdf9cbf56ec7 Fix mq's usage of opener, which don't allow absolute paths now. Thomas Arendsen Hein <thomas@intevation.de> parents: 1839 diff changeset	1398 and not fl.startswith('.')):
2794 86c54b7cd331 mq: fix variables shadowing builtin Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2792 diff changeset	1399 msng_list.append(fl)
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8188 diff changeset	1400 for x in sorted(msng_list):
3183 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1401 pfx = self.ui.verbose and ('D ') or ''
9016 894c5b4be275 mq: align columns in verbose qseries output. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 8948 diff changeset	1402 displayname(pfx, x)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1403
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1404 def issaveline(self, l):
2816 52516e48e3f3 Update qsave to use StatusEntry; don't throw exception on bad status lines. Brendan Cully <brendan@kublai.com> parents: 2804 diff changeset	1405 if l.name == '.hg.patches.save.line':
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1406 return True
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1407
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1408 def qrepo(self, create=False):
2819 766ecdc83e43 mq: add join method Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2818 diff changeset	1409 if create or os.path.isdir(self.join(".hg")):
1839 876e4e6ad82b Create local ui object per repository, so .hg/hgrc don't get mixed. Thomas Arendsen Hein <thomas@intevation.de> parents: 1810 diff changeset	1410 return hg.repository(self.ui, path=self.path, create=create)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1411
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1412 def restore(self, repo, rev, delete=None, qupdate=None):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1413 c = repo.changelog.read(rev)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1414 desc = c[4].strip()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1415 lines = desc.splitlines()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1416 i = 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1417 datastart = None
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1418 series = []
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1419 applied = []
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1420 qpp = None
8632 9e055cfdd620 replace "i in range(len(xs))" with "i, x in enumerate(xs)" Martin Geisler <mg@lazybytes.net> parents: 8624 diff changeset	1421 for i, line in enumerate(lines):
9e055cfdd620 replace "i in range(len(xs))" with "i, x in enumerate(xs)" Martin Geisler <mg@lazybytes.net> parents: 8624 diff changeset	1422 if line == 'Patch Data:':
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1423 datastart = i + 1
8632 9e055cfdd620 replace "i in range(len(xs))" with "i, x in enumerate(xs)" Martin Geisler <mg@lazybytes.net> parents: 8624 diff changeset	1424 elif line.startswith('Dirstate:'):
9e055cfdd620 replace "i in range(len(xs))" with "i, x in enumerate(xs)" Martin Geisler <mg@lazybytes.net> parents: 8624 diff changeset	1425 l = line.rstrip()
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1426 l = l[10:].split(' ')
6217 fe8dbbe9520d Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg Joel Rosdahl <joel@rosdahl.net> parents: 6195 diff changeset	1427 qpp = [ bin(x) for x in l ]
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1428 elif datastart != None:
8632 9e055cfdd620 replace "i in range(len(xs))" with "i, x in enumerate(xs)" Martin Geisler <mg@lazybytes.net> parents: 8624 diff changeset	1429 l = line.rstrip()
2818 bdc067ff6cf5 Make mq camelcase consistent with the rest of hg. Brendan Cully <brendan@kublai.com> parents: 2816 diff changeset	1430 se = statusentry(l)
2794 86c54b7cd331 mq: fix variables shadowing builtin Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2792 diff changeset	1431 file_ = se.name
86c54b7cd331 mq: fix variables shadowing builtin Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2792 diff changeset	1432 if se.rev:
2780 ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	1433 applied.append(se)
3185 b3e103c388fc mq: don't write applied patches into series twice in restore Brendan Cully <brendan@kublai.com> parents: 3184 diff changeset	1434 else:
b3e103c388fc mq: don't write applied patches into series twice in restore Brendan Cully <brendan@kublai.com> parents: 3184 diff changeset	1435 series.append(file_)
8527 f9a80054dd3c use 'x is None' instead of 'x == None' Martin Geisler <mg@lazybytes.net> parents: 8525 diff changeset	1436 if datastart is None:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	1437 self.ui.warn(_("No saved patch data found\n"))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1438 return 1
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	1439 self.ui.warn(_("restoring status: %s\n") % lines[0])
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1440 self.full_series = series
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1441 self.applied = applied
2767 60683ab1ed33 mq: rename read_series as parse_series, make simpler and faster Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2766 diff changeset	1442 self.parse_series()
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1443 self.series_dirty = 1
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1444 self.applied_dirty = 1
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1445 heads = repo.changelog.heads()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1446 if delete:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1447 if rev not in heads:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	1448 self.ui.warn(_("save entry has children, leaving it alone\n"))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1449 else:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	1450 self.ui.warn(_("removing save entry %s\n") % short(rev))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1451 pp = repo.dirstate.parents()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1452 if rev in pp:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1453 update = True
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1454 else:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1455 update = False
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1456 self.strip(repo, rev, update=update, backup='strip')
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1457 if qpp:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	1458 self.ui.warn(_("saved queue repository parents: %s %s\n") %
6217 fe8dbbe9520d Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg Joel Rosdahl <joel@rosdahl.net> parents: 6195 diff changeset	1459 (short(qpp[0]), short(qpp[1])))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1460 if qupdate:
5878 d39af2eabb8c transform a bunch of print statements to appropriate ui calls Matt Mackall <mpm@selenic.com> parents: 5788 diff changeset	1461 self.ui.status(_("queue directory updating\n"))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1462 r = self.qrepo()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1463 if not r:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	1464 self.ui.warn(_("Unable to load queue repository\n"))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1465 return 1
2808 30f59f4a327e Introduce update helper functions: update, merge, clean, and revert Matt Mackall <mpm@selenic.com> parents: 2804 diff changeset	1466 hg.clean(r, qpp[0])
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1467
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1468 def save(self, repo, msg=None):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1469 if len(self.applied) == 0:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	1470 self.ui.warn(_("save: no patches applied, exiting\n"))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1471 return 1
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1472 if self.issaveline(self.applied[-1]):
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	1473 self.ui.warn(_("status is already saved\n"))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1474 return 1
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	1475
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1476 ar = [ ':' + x for x in self.full_series ]
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1477 if not msg:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	1478 msg = _("hg patches saved state")
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1479 else:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1480 msg = "hg patches: " + msg.rstrip('\r\n')
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1481 r = self.qrepo()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1482 if r:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1483 pp = r.dirstate.parents()
6217 fe8dbbe9520d Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg Joel Rosdahl <joel@rosdahl.net> parents: 6195 diff changeset	1484 msg += "\nDirstate: %s %s" % (hex(pp[0]), hex(pp[1]))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1485 msg += "\n\nPatch Data:\n"
2816 52516e48e3f3 Update qsave to use StatusEntry; don't throw exception on bad status lines. Brendan Cully <brendan@kublai.com> parents: 2804 diff changeset	1486 text = msg + "\n".join([str(x) for x in self.applied]) + '\n' + (ar and
52516e48e3f3 Update qsave to use StatusEntry; don't throw exception on bad status lines. Brendan Cully <brendan@kublai.com> parents: 2804 diff changeset	1487 "\n".join(ar) + '\n' or "")
8706 25e9c71b89de commit: drop the now-unused files parameter Matt Mackall <mpm@selenic.com> parents: 8700 diff changeset	1488 n = repo.commit(text, force=True)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1489 if not n:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	1490 self.ui.warn(_("repo commit failed\n"))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1491 return 1
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	1492 self.applied.append(statusentry(hex(n),'.hg.patches.save.line'))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1493 self.applied_dirty = 1
4209 dbc3846c09a1 Merge with -stable, fix small test failure Matt Mackall <mpm@selenic.com> parents: 4207 diff changeset	1494 self.removeundo(repo)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1495
2698 c1123e83c8e2 mq: fix qnew and qimport to deal with series file comments Chris Mason <mason@suse.com> parents: 2697 diff changeset	1496 def full_series_end(self):
c1123e83c8e2 mq: fix qnew and qimport to deal with series file comments Chris Mason <mason@suse.com> parents: 2697 diff changeset	1497 if len(self.applied) > 0:
2780 ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	1498 p = self.applied[-1].name
2698 c1123e83c8e2 mq: fix qnew and qimport to deal with series file comments Chris Mason <mason@suse.com> parents: 2697 diff changeset	1499 end = self.find_series(p)
8527 f9a80054dd3c use 'x is None' instead of 'x == None' Martin Geisler <mg@lazybytes.net> parents: 8525 diff changeset	1500 if end is None:
2698 c1123e83c8e2 mq: fix qnew and qimport to deal with series file comments Chris Mason <mason@suse.com> parents: 2697 diff changeset	1501 return len(self.full_series)
c1123e83c8e2 mq: fix qnew and qimport to deal with series file comments Chris Mason <mason@suse.com> parents: 2697 diff changeset	1502 return end + 1
c1123e83c8e2 mq: fix qnew and qimport to deal with series file comments Chris Mason <mason@suse.com> parents: 2697 diff changeset	1503 return 0
c1123e83c8e2 mq: fix qnew and qimport to deal with series file comments Chris Mason <mason@suse.com> parents: 2697 diff changeset	1504
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	1505 def series_end(self, all_patches=False):
4406 f700ea2b0689 mq: fix qtop failure when the series ends with guarded patches. Patrick Mezard <pmezard@gmail.com> parents: 4341 diff changeset	1506 """If all_patches is False, return the index of the next pushable patch
f700ea2b0689 mq: fix qtop failure when the series ends with guarded patches. Patrick Mezard <pmezard@gmail.com> parents: 4341 diff changeset	1507 in the series, or the series length. If all_patches is True, return the
f700ea2b0689 mq: fix qtop failure when the series ends with guarded patches. Patrick Mezard <pmezard@gmail.com> parents: 4341 diff changeset	1508 index of the first patch past the last applied one.
f700ea2b0689 mq: fix qtop failure when the series ends with guarded patches. Patrick Mezard <pmezard@gmail.com> parents: 4341 diff changeset	1509 """
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1510 end = 0
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	1511 def next(start):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	1512 if all_patches:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	1513 return start
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	1514 i = start
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	1515 while i < len(self.series):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	1516 p, reason = self.pushable(i)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	1517 if p:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	1518 break
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	1519 self.explain_pushable(i)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	1520 i += 1
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	1521 return i
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1522 if len(self.applied) > 0:
2780 ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	1523 p = self.applied[-1].name
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1524 try:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1525 end = self.series.index(p)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1526 except ValueError:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1527 return 0
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	1528 return next(end + 1)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	1529 return next(end)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1530
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1531 def appliedname(self, index):
2780 ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	1532 pname = self.applied[index].name
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1533 if not self.ui.verbose:
2677 ec05ce9cbf47 mq: uniform verbose display of patche[s]. "Mathieu Clabaut <mathieu.clabaut@gmail.com>" parents: 2664 diff changeset	1534 p = pname
ec05ce9cbf47 mq: uniform verbose display of patche[s]. "Mathieu Clabaut <mathieu.clabaut@gmail.com>" parents: 2664 diff changeset	1535 else:
2941 d32df6452323 mq: fix appliedname Brendan Cully <brendan@kublai.com> parents: 2940 diff changeset	1536 p = str(self.series.index(pname)) + " " + pname
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1537 return p
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	1538
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1539 def qimport(self, repo, files, patchname=None, rev=None, existing=None,
3691 79151c94c3b4 mq: add --git option to qimport -r Brendan Cully <brendan@kublai.com> parents: 3685 diff changeset	1540 force=None, git=False):
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1541 def checkseries(patchname):
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1542 if patchname in self.series:
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1543 raise util.Abort(_('patch %s is already in the series file')
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1544 % patchname)
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1545 def checkfile(patchname):
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1546 if not force and os.path.exists(self.join(patchname)):
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1547 raise util.Abort(_('patch "%s" already exists')
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1548 % patchname)
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1549
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1550 if rev:
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1551 if files:
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1552 raise util.Abort(_('option "-r" not valid when importing '
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1553 'files'))
3707 67f44b825784 Removed unused ui parameter from revpair/revrange and fix its users. Thomas Arendsen Hein <thomas@intevation.de> parents: 3700 diff changeset	1554 rev = cmdutil.revrange(repo, rev)
9032 1fa80c5428b8 compat: use 'key' argument instead of 'cmp' when sorting a list Alejandro Santos <alejolp@alejolp.com> parents: 9016 diff changeset	1555 rev.sort(reverse=True)
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1556 if (len(files) > 1 or len(rev) > 1) and patchname:
2712 8e5cd8d11b51 mq: move many error messages to util.Abort Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2711 diff changeset	1557 raise util.Abort(_('option "-n" not valid when importing multiple '
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1558 'patches'))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1559 i = 0
2488 2785aeb51be4 mq: add qimported patches if patch dir is a repo Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2301 diff changeset	1560 added = []
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1561 if rev:
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1562 # If mq patches are applied, we can only import revisions
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1563 # that form a linear path to qbase.
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1564 # Otherwise, they should form a linear path to a head.
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1565 heads = repo.changelog.heads(repo.changelog.node(rev[-1]))
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1566 if len(heads) > 1:
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1567 raise util.Abort(_('revision %d is the root of more than one '
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1568 'branch') % rev[-1])
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1569 if self.applied:
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	1570 base = hex(repo.changelog.node(rev[0]))
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1571 if base in [n.rev for n in self.applied]:
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1572 raise util.Abort(_('revision %d is already managed')
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1573 % rev[0])
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	1574 if heads != [bin(self.applied[-1].rev)]:
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1575 raise util.Abort(_('revision %d is not the parent of '
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1576 'the queue') % rev[0])
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	1577 base = repo.changelog.rev(bin(self.applied[0].rev))
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1578 lastparent = repo.changelog.parentrevs(base)[0]
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1579 else:
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1580 if heads != [repo.changelog.node(rev[0])]:
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1581 raise util.Abort(_('revision %d has unmanaged children')
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1582 % rev[0])
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1583 lastparent = None
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1584
3691 79151c94c3b4 mq: add --git option to qimport -r Brendan Cully <brendan@kublai.com> parents: 3685 diff changeset	1585 if git:
79151c94c3b4 mq: add --git option to qimport -r Brendan Cully <brendan@kublai.com> parents: 3685 diff changeset	1586 self.diffopts().git = True
79151c94c3b4 mq: add --git option to qimport -r Brendan Cully <brendan@kublai.com> parents: 3685 diff changeset	1587
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1588 for r in rev:
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1589 p1, p2 = repo.changelog.parentrevs(r)
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1590 n = repo.changelog.node(r)
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	1591 if p2 != nullrev:
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1592 raise util.Abort(_('cannot import merge revision %d') % r)
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1593 if lastparent and lastparent != r:
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1594 raise util.Abort(_('revision %d is not the parent of %d')
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1595 % (r, lastparent))
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1596 lastparent = p1
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1597
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1598 if not patchname:
4037 bbdba01cce28 Enforce unixish style for all generated patch names. Patrick Mezard <pmezard@gmail.com> parents: 4016 diff changeset	1599 patchname = normname('%d.diff' % r)
5981 ca2af0c81c9a mq: don't allow patches with some reserved names Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5980 diff changeset	1600 self.check_reserved_name(patchname)
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1601 checkseries(patchname)
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1602 checkfile(patchname)
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1603 self.full_series.insert(0, patchname)
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1604
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1605 patchf = self.opener(patchname, "w")
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1606 patch.export(repo, [n], fp=patchf, opts=self.diffopts())
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1607 patchf.close()
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1608
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	1609 se = statusentry(hex(n), patchname)
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1610 self.applied.insert(0, se)
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1611
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1612 added.append(patchname)
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1613 patchname = None
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1614 self.parse_series()
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1615 self.applied_dirty = 1
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1616
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1617 for filename in files:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1618 if existing:
3547 891c8d20f80f mq: support qimport - Brendan Cully <brendan@kublai.com> parents: 3492 diff changeset	1619 if filename == '-':
891c8d20f80f mq: support qimport - Brendan Cully <brendan@kublai.com> parents: 3492 diff changeset	1620 raise util.Abort(_('-e is incompatible with import from -'))
3133 15fde1970003 qimport: rename patch to patchname to avoid shadowing module Brendan Cully <brendan@kublai.com> parents: 3091 diff changeset	1621 if not patchname:
4037 bbdba01cce28 Enforce unixish style for all generated patch names. Patrick Mezard <pmezard@gmail.com> parents: 4016 diff changeset	1622 patchname = normname(filename)
5981 ca2af0c81c9a mq: don't allow patches with some reserved names Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5980 diff changeset	1623 self.check_reserved_name(patchname)
3133 15fde1970003 qimport: rename patch to patchname to avoid shadowing module Brendan Cully <brendan@kublai.com> parents: 3091 diff changeset	1624 if not os.path.isfile(self.join(patchname)):
15fde1970003 qimport: rename patch to patchname to avoid shadowing module Brendan Cully <brendan@kublai.com> parents: 3091 diff changeset	1625 raise util.Abort(_("patch %s does not exist") % patchname)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1626 else:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1627 try:
3547 891c8d20f80f mq: support qimport - Brendan Cully <brendan@kublai.com> parents: 3492 diff changeset	1628 if filename == '-':
891c8d20f80f mq: support qimport - Brendan Cully <brendan@kublai.com> parents: 3492 diff changeset	1629 if not patchname:
891c8d20f80f mq: support qimport - Brendan Cully <brendan@kublai.com> parents: 3492 diff changeset	1630 raise util.Abort(_('need --name to import a patch from -'))
891c8d20f80f mq: support qimport - Brendan Cully <brendan@kublai.com> parents: 3492 diff changeset	1631 text = sys.stdin.read()
891c8d20f80f mq: support qimport - Brendan Cully <brendan@kublai.com> parents: 3492 diff changeset	1632 else:
7271 8046f0a070a6 use our urlopener (proxy handling, etc) instead of urllib Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7216 diff changeset	1633 text = url.open(self.ui, filename).read()
7421 4c4324476be6 Catch both IOError and OSError, fix regression introduced by 8046f0a070a6 Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7414 diff changeset	1634 except (OSError, IOError):
6940 05ec27530d04 qimport: report filename in case of IOError Martin Geisler <mg@daimi.au.dk> parents: 6937 diff changeset	1635 raise util.Abort(_("unable to read %s") % filename)
3133 15fde1970003 qimport: rename patch to patchname to avoid shadowing module Brendan Cully <brendan@kublai.com> parents: 3091 diff changeset	1636 if not patchname:
4037 bbdba01cce28 Enforce unixish style for all generated patch names. Patrick Mezard <pmezard@gmail.com> parents: 4016 diff changeset	1637 patchname = normname(os.path.basename(filename))
5981 ca2af0c81c9a mq: don't allow patches with some reserved names Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5980 diff changeset	1638 self.check_reserved_name(patchname)
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1639 checkfile(patchname)
3133 15fde1970003 qimport: rename patch to patchname to avoid shadowing module Brendan Cully <brendan@kublai.com> parents: 3091 diff changeset	1640 patchf = self.opener(patchname, "w")
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1641 patchf.write(text)
7160 1b7b21b634f2 mq: make qimport -f work properly. Closes issue1255. Brendan Cully <brendan@kublai.com> parents: 7158 diff changeset	1642 if not force:
1b7b21b634f2 mq: make qimport -f work properly. Closes issue1255. Brendan Cully <brendan@kublai.com> parents: 7158 diff changeset	1643 checkseries(patchname)
1b7b21b634f2 mq: make qimport -f work properly. Closes issue1255. Brendan Cully <brendan@kublai.com> parents: 7158 diff changeset	1644 if patchname not in self.series:
1b7b21b634f2 mq: make qimport -f work properly. Closes issue1255. Brendan Cully <brendan@kublai.com> parents: 7158 diff changeset	1645 index = self.full_series_end() + i
1b7b21b634f2 mq: make qimport -f work properly. Closes issue1255. Brendan Cully <brendan@kublai.com> parents: 7158 diff changeset	1646 self.full_series[index:index] = [patchname]
2767 60683ab1ed33 mq: rename read_series as parse_series, make simpler and faster Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2766 diff changeset	1647 self.parse_series()
7597 81f68565281c mq, i18n: mark strings for translation Martin Geisler <mg@daimi.au.dk> parents: 7454 diff changeset	1648 self.ui.warn(_("adding %s to series file\n") % patchname)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1649 i += 1
3133 15fde1970003 qimport: rename patch to patchname to avoid shadowing module Brendan Cully <brendan@kublai.com> parents: 3091 diff changeset	1650 added.append(patchname)
15fde1970003 qimport: rename patch to patchname to avoid shadowing module Brendan Cully <brendan@kublai.com> parents: 3091 diff changeset	1651 patchname = None
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1652 self.series_dirty = 1
2488 2785aeb51be4 mq: add qimported patches if patch dir is a repo Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2301 diff changeset	1653 qrepo = self.qrepo()
2785aeb51be4 mq: add qimported patches if patch dir is a repo Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2301 diff changeset	1654 if qrepo:
2785aeb51be4 mq: add qimported patches if patch dir is a repo Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2301 diff changeset	1655 qrepo.add(added)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1656
3373 9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	1657 def delete(ui, repo, patches, *opts):
2905 790fd342b6c7 Allow qdel to delete multiple patches. Brendan Cully <brendan@kublai.com> parents: 2904 diff changeset	1658 """remove patches from queue
2752 5dfeda163bb7 Add -f option to qdelete, to remove patch file. Brendan Cully <brendan@kublai.com> parents: 2751 diff changeset	1659
8929 cb05e2a00291 mq: compact & rewrap documentation for qdelete command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8904 diff changeset	1660 The patches must not be applied, and at least one patch is required. With
cb05e2a00291 mq: compact & rewrap documentation for qdelete command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8904 diff changeset	1661 -k/--keep, the patch files are preserved in the patch directory.
8904 8be38b624902 mq: no longer mention the deprecated qdelete's --revision option C?dric Duval <cedricduval@free.fr> parents: 8894 diff changeset	1662
8be38b624902 mq: no longer mention the deprecated qdelete's --revision option C?dric Duval <cedricduval@free.fr> parents: 8894 diff changeset	1663 To stop managing a patch and move it into permanent history,
8be38b624902 mq: no longer mention the deprecated qdelete's --revision option C?dric Duval <cedricduval@free.fr> parents: 8894 diff changeset	1664 use the qfinish command."""
2724 9c41ae1908c7 mq: replace module-wide repo hash with a repo attribute Brendan Cully <brendan@kublai.com> parents: 2723 diff changeset	1665 q = repo.mq
3373 9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	1666 q.delete(repo, patches, opts)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1667 q.save_dirty()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1668 return 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1669
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1670 def applied(ui, repo, patch=None, **opts):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1671 """print the patches already applied"""
3183 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1672 q = repo.mq
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1673 if patch:
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1674 if patch not in q.series:
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1675 raise util.Abort(_("patch %s is not in series file") % patch)
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1676 end = q.series.index(patch) + 1
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1677 else:
4239 417c2068cb92 Simplified qseries and hg qapplied to fix some bugs caused by optimization: Thomas Arendsen Hein <thomas@intevation.de> parents: 4238 diff changeset	1678 end = q.series_end(True)
3183 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1679 return q.qseries(repo, length=end, status='A', summary=opts.get('summary'))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1680
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1681 def unapplied(ui, repo, patch=None, **opts):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1682 """print the patches not yet applied"""
3183 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1683 q = repo.mq
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1684 if patch:
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1685 if patch not in q.series:
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1686 raise util.Abort(_("patch %s is not in series file") % patch)
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1687 start = q.series.index(patch) + 1
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1688 else:
4238 ce6c364ebb2a Fix issue443: inconsistent output of "hg qunapplied -v" Thomas Arendsen Hein <thomas@intevation.de> parents: 4173 diff changeset	1689 start = q.series_end(True)
ce6c364ebb2a Fix issue443: inconsistent output of "hg qunapplied -v" Thomas Arendsen Hein <thomas@intevation.de> parents: 4173 diff changeset	1690 q.qseries(repo, start=start, status='U', summary=opts.get('summary'))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1691
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1692 def qimport(ui, repo, filename, *opts):
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1693 """import a patch
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1694
7994 3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1695 The patch is inserted into the series after the last applied
3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1696 patch. If no patches have been applied, qimport prepends the patch
6634 d6caebe9c293 mq: qimport: explain insertion point in doc string Adrian Buehlmann <adrian@cadifra.com> parents: 6627 diff changeset	1697 to the series.
d6caebe9c293 mq: qimport: explain insertion point in doc string Adrian Buehlmann <adrian@cadifra.com> parents: 6627 diff changeset	1698
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1699 The patch will have the same name as its source file unless you
8076 5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	1700 give it a new one with -n/--name.
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1701
7994 3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1702 You can register an existing patch inside the patch directory with
8076 5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	1703 the -e/--existing flag.
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1704
8076 5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	1705 With -f/--force, an existing patch of the same name will be
7994 3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1706 overwritten.
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1707
8076 5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	1708 An existing changeset may be placed under mq control with -r/--rev
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1709 (e.g. qimport --rev tip -n patch will place tip under mq control).
8076 5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	1710 With -g/--git, patches imported with --rev will use the git diff
7387 7e9a15fa6c8f update help on git diffs Matt Mackall <mpm@selenic.com> parents: 7308 diff changeset	1711 format. See the diffs help topic for information on why this is
7994 3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1712 important for preserving rename/copy information and permission
3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1713 changes.
8075 1f0a5a5fff43 Update qimport help explaining how to read a patch from stdin (Issue371) David Frey <dpfrey@shaw.ca> parents: 8028 diff changeset	1714
1f0a5a5fff43 Update qimport help explaining how to read a patch from stdin (Issue371) David Frey <dpfrey@shaw.ca> parents: 8028 diff changeset	1715 To import a patch from standard input, pass - as the patch file.
1f0a5a5fff43 Update qimport help explaining how to read a patch from stdin (Issue371) David Frey <dpfrey@shaw.ca> parents: 8028 diff changeset	1716 When importing from standard input, a patch name must be specified
1f0a5a5fff43 Update qimport help explaining how to read a patch from stdin (Issue371) David Frey <dpfrey@shaw.ca> parents: 8028 diff changeset	1717 using the --name flag.
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1718 """
2724 9c41ae1908c7 mq: replace module-wide repo hash with a repo attribute Brendan Cully <brendan@kublai.com> parents: 2723 diff changeset	1719 q = repo.mq
3133 15fde1970003 qimport: rename patch to patchname to avoid shadowing module Brendan Cully <brendan@kublai.com> parents: 3091 diff changeset	1720 q.qimport(repo, filename, patchname=opts['name'],
3691 79151c94c3b4 mq: add --git option to qimport -r Brendan Cully <brendan@kublai.com> parents: 3685 diff changeset	1721 existing=opts['existing'], force=opts['force'], rev=opts['rev'],
79151c94c3b4 mq: add --git option to qimport -r Brendan Cully <brendan@kublai.com> parents: 3685 diff changeset	1722 git=opts['git'])
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1723 q.save_dirty()
8362 bbc74c05b8a4 mq: add -P/--push option to qimport Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8288 diff changeset	1724
bbc74c05b8a4 mq: add -P/--push option to qimport Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8288 diff changeset	1725 if opts.get('push') and not opts.get('rev'):
bbc74c05b8a4 mq: add -P/--push option to qimport Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8288 diff changeset	1726 return q.push(repo, None)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1727 return 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1728
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1729 def init(ui, repo, **opts):
2754 19041b8cbc86 Add more verbose help text to mq commands. Brendan Cully <brendan@kublai.com> parents: 2753 diff changeset	1730 """init a new queue repository
19041b8cbc86 Add more verbose help text to mq commands. Brendan Cully <brendan@kublai.com> parents: 2753 diff changeset	1731
8076 5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	1732 The queue repository is unversioned by default. If
5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	1733 -c/--create-repo is specified, qinit will create a separate nested
5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	1734 repository for patches (qinit -c may also be run later to convert
5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	1735 an unversioned patch repository into a versioned one). You can use
5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	1736 qcommit to commit changes to this queue repository."""
2724 9c41ae1908c7 mq: replace module-wide repo hash with a repo attribute Brendan Cully <brendan@kublai.com> parents: 2723 diff changeset	1737 q = repo.mq
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1738 r = q.init(repo, create=opts['create_repo'])
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1739 q.save_dirty()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1740 if r:
4071 165abe554c80 mq: qinit -c creates a repo even after a regular qinit Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4068 diff changeset	1741 if not os.path.exists(r.wjoin('.hgignore')):
165abe554c80 mq: qinit -c creates a repo even after a regular qinit Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4068 diff changeset	1742 fp = r.wopener('.hgignore', 'w')
6034 83633602e2c5 qinit -c: add ^\.hg and ^\.mq to .hgignore Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6027 diff changeset	1743 fp.write('^\\.hg\n')
83633602e2c5 qinit -c: add ^\.hg and ^\.mq to .hgignore Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6027 diff changeset	1744 fp.write('^\\.mq\n')
4071 165abe554c80 mq: qinit -c creates a repo even after a regular qinit Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4068 diff changeset	1745 fp.write('syntax: glob\n')
165abe554c80 mq: qinit -c creates a repo even after a regular qinit Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4068 diff changeset	1746 fp.write('status\n')
165abe554c80 mq: qinit -c creates a repo even after a regular qinit Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4068 diff changeset	1747 fp.write('guards\n')
165abe554c80 mq: qinit -c creates a repo even after a regular qinit Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4068 diff changeset	1748 fp.close()
165abe554c80 mq: qinit -c creates a repo even after a regular qinit Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4068 diff changeset	1749 if not os.path.exists(r.wjoin('series')):
165abe554c80 mq: qinit -c creates a repo even after a regular qinit Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4068 diff changeset	1750 r.wopener('series', 'w').close()
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1751 r.add(['.hgignore', 'series'])
4071 165abe554c80 mq: qinit -c creates a repo even after a regular qinit Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4068 diff changeset	1752 commands.add(ui, r)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1753 return 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1754
2720 c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	1755 def clone(ui, source, dest=None, **opts):
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	1756 '''clone main and patch repository at same time
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	1757
7983 7b813bdbd5d0 Change double spaces to single spaces in help texts. Martin Geisler <mg@daimi.au.dk> parents: 7874 diff changeset	1758 If source is local, destination will have no patches applied. If
2720 c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	1759 source is remote, this command can not check if patches are
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	1760 applied in source, so cannot guarantee that patches are not
7983 7b813bdbd5d0 Change double spaces to single spaces in help texts. Martin Geisler <mg@daimi.au.dk> parents: 7874 diff changeset	1761 applied in destination. If you clone remote repository, be sure
2720 c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	1762 before that it has no patches applied.
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	1763
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	1764 Source patch repository is looked for in <src>/.hg/patches by
7983 7b813bdbd5d0 Change double spaces to single spaces in help texts. Martin Geisler <mg@daimi.au.dk> parents: 7874 diff changeset	1765 default. Use -p <url> to change.
4862 cba10652a901 mq: improve qclone error handling when patch directory is not a repository. Brendan Cully <brendan@kublai.com> parents: 4737 diff changeset	1766
8760 bf17aeafb869 Spell Mercurial as a proper noun timeless <timeless@gmail.com> parents: 8711 diff changeset	1767 The patch directory must be a nested Mercurial repository, as
4862 cba10652a901 mq: improve qclone error handling when patch directory is not a repository. Brendan Cully <brendan@kublai.com> parents: 4737 diff changeset	1768 would be created by qinit -c.
2720 c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	1769 '''
5226 438ff951df70 avoid double slash problem mentioned in issue695 Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5180 diff changeset	1770 def patchdir(repo):
438ff951df70 avoid double slash problem mentioned in issue695 Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5180 diff changeset	1771 url = repo.url()
438ff951df70 avoid double slash problem mentioned in issue695 Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5180 diff changeset	1772 if url.endswith('/'):
438ff951df70 avoid double slash problem mentioned in issue695 Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5180 diff changeset	1773 url = url[:-1]
438ff951df70 avoid double slash problem mentioned in issue695 Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5180 diff changeset	1774 return url + '/.hg/patches'
2720 c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	1775 if dest is None:
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	1776 dest = hg.defaultdest(source)
8188 f3abe032fc89 add cmdutil.remoteui Matt Mackall <mpm@selenic.com> parents: 8152 diff changeset	1777 sr = hg.repository(cmdutil.remoteui(ui, opts), ui.expandpath(source))
7729 dd08e1e0cea1 mq: allow qclone's -p option to use path alias John Mulligan <phlogistonjohn@asynchrono.us> parents: 7639 diff changeset	1778 if opts['patches']:
dd08e1e0cea1 mq: allow qclone's -p option to use path alias John Mulligan <phlogistonjohn@asynchrono.us> parents: 7639 diff changeset	1779 patchespath = ui.expandpath(opts['patches'])
dd08e1e0cea1 mq: allow qclone's -p option to use path alias John Mulligan <phlogistonjohn@asynchrono.us> parents: 7639 diff changeset	1780 else:
dd08e1e0cea1 mq: allow qclone's -p option to use path alias John Mulligan <phlogistonjohn@asynchrono.us> parents: 7639 diff changeset	1781 patchespath = patchdir(sr)
4862 cba10652a901 mq: improve qclone error handling when patch directory is not a repository. Brendan Cully <brendan@kublai.com> parents: 4737 diff changeset	1782 try:
7874 d812029cda85 cleanup: drop variables for unused return values Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7782 diff changeset	1783 hg.repository(ui, patchespath)
7637 1d54e2f6c0b7 error: move repo errors Matt Mackall <mpm@selenic.com> parents: 7627 diff changeset	1784 except error.RepoError:
4862 cba10652a901 mq: improve qclone error handling when patch directory is not a repository. Brendan Cully <brendan@kublai.com> parents: 4737 diff changeset	1785 raise util.Abort(_('versioned patch repository not found'
cba10652a901 mq: improve qclone error handling when patch directory is not a repository. Brendan Cully <brendan@kublai.com> parents: 4737 diff changeset	1786 ' (see qinit -c)'))
2720 c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	1787 qbase, destrev = None, None
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	1788 if sr.local():
2725 9ffee4f07323 mq: update to handle repomap not longer used Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2724 diff changeset	1789 if sr.mq.applied:
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	1790 qbase = bin(sr.mq.applied[0].rev)
2720 c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	1791 if not hg.islocal(dest):
8152 08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8151 diff changeset	1792 heads = set(sr.heads())
08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8151 diff changeset	1793 destrev = list(heads.difference(sr.heads(qbase)))
4171 1df1baf2002e fix qclone to a remote repo Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4133 diff changeset	1794 destrev.append(sr.changelog.parents(qbase)[0])
6164 0c2b443fb3c3 mq: make qclone ask remote source repo for qbase using lookup protocol Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 6139 diff changeset	1795 elif sr.capable('lookup'):
6380 a632a9a57821 qclone: do not abort if remote hasn't enabled mq (issue1040) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6340 diff changeset	1796 try:
a632a9a57821 qclone: do not abort if remote hasn't enabled mq (issue1040) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6340 diff changeset	1797 qbase = sr.lookup('qbase')
7637 1d54e2f6c0b7 error: move repo errors Matt Mackall <mpm@selenic.com> parents: 7627 diff changeset	1798 except error.RepoError:
6380 a632a9a57821 qclone: do not abort if remote hasn't enabled mq (issue1040) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6340 diff changeset	1799 pass
8027 9c7ca86fc658 expand "repo" to "repository" in help texts Martin Geisler <mg@lazybytes.net> parents: 8026 diff changeset	1800 ui.note(_('cloning main repository\n'))
4476 4ef8fdf57e39 mq: pass a URL to clone Matt Mackall <mpm@selenic.com> parents: 4437 diff changeset	1801 sr, dr = hg.clone(ui, sr.url(), dest,
2720 c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	1802 pull=opts['pull'],
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	1803 rev=destrev,
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	1804 update=False,
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	1805 stream=opts['uncompressed'])
8027 9c7ca86fc658 expand "repo" to "repository" in help texts Martin Geisler <mg@lazybytes.net> parents: 8026 diff changeset	1806 ui.note(_('cloning patch repository\n'))
7874 d812029cda85 cleanup: drop variables for unused return values Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7782 diff changeset	1807 hg.clone(ui, opts['patches'] or patchdir(sr), patchdir(dr),
d812029cda85 cleanup: drop variables for unused return values Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7782 diff changeset	1808 pull=opts['pull'], update=not opts['noupdate'],
d812029cda85 cleanup: drop variables for unused return values Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7782 diff changeset	1809 stream=opts['uncompressed'])
2720 c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	1810 if dr.local():
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	1811 if qbase:
8027 9c7ca86fc658 expand "repo" to "repository" in help texts Martin Geisler <mg@lazybytes.net> parents: 8026 diff changeset	1812 ui.note(_('stripping applied patches from destination '
9c7ca86fc658 expand "repo" to "repository" in help texts Martin Geisler <mg@lazybytes.net> parents: 8026 diff changeset	1813 'repository\n'))
2725 9ffee4f07323 mq: update to handle repomap not longer used Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2724 diff changeset	1814 dr.mq.strip(dr, qbase, update=False, backup=None)
2720 c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	1815 if not opts['noupdate']:
8027 9c7ca86fc658 expand "repo" to "repository" in help texts Martin Geisler <mg@lazybytes.net> parents: 8026 diff changeset	1816 ui.note(_('updating destination repository\n'))
2775 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: 2772 diff changeset	1817 hg.update(dr, dr.changelog.tip())
2720 c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	1818
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1819 def commit(ui, repo, pats, *opts):
2526 37785f986260 mq: Added help for qcommit, consistently talk about queue repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 2488 diff changeset	1820 """commit changes in the queue repository"""
2724 9c41ae1908c7 mq: replace module-wide repo hash with a repo attribute Brendan Cully <brendan@kublai.com> parents: 2723 diff changeset	1821 q = repo.mq
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1822 r = q.qrepo()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1823 if not r: raise util.Abort('no queue repository')
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1824 commands.commit(r.ui, r, pats, *opts)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1825
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1826 def series(ui, repo, **opts):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1827 """print the entire series file"""
2756 caa6d992608b Add -s option to qseries: display first line of patch header. Brendan Cully <brendan@kublai.com> parents: 2754 diff changeset	1828 repo.mq.qseries(repo, missing=opts['missing'], summary=opts['summary'])
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1829 return 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1830
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1831 def top(ui, repo, **opts):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1832 """print the name of the current patch"""
3183 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1833 q = repo.mq
4406 f700ea2b0689 mq: fix qtop failure when the series ends with guarded patches. Patrick Mezard <pmezard@gmail.com> parents: 4341 diff changeset	1834 t = q.applied and q.series_end(True) or 0
3183 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1835 if t:
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1836 return q.qseries(repo, start=t-1, length=1, status='A',
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1837 summary=opts.get('summary'))
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1838 else:
7627 fb32ae9c76e7 mq: lowercase output Martin Geisler <mg@daimi.au.dk> parents: 7621 diff changeset	1839 ui.write(_("no patches applied\n"))
3183 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1840 return 1
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1841
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1842 def next(ui, repo, **opts):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1843 """print the name of the next patch"""
3183 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1844 q = repo.mq
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1845 end = q.series_end()
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1846 if end == len(q.series):
7627 fb32ae9c76e7 mq: lowercase output Martin Geisler <mg@daimi.au.dk> parents: 7621 diff changeset	1847 ui.write(_("all patches applied\n"))
3183 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1848 return 1
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1849 return q.qseries(repo, start=end, length=1, summary=opts.get('summary'))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1850
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1851 def prev(ui, repo, **opts):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1852 """print the name of the previous patch"""
3183 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1853 q = repo.mq
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1854 l = len(q.applied)
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1855 if l == 1:
7627 fb32ae9c76e7 mq: lowercase output Martin Geisler <mg@daimi.au.dk> parents: 7621 diff changeset	1856 ui.write(_("only one patch applied\n"))
3183 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1857 return 1
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1858 if not l:
7627 fb32ae9c76e7 mq: lowercase output Martin Geisler <mg@daimi.au.dk> parents: 7621 diff changeset	1859 ui.write(_("no patches applied\n"))
3183 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1860 return 1
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1861 return q.qseries(repo, start=l-2, length=1, status='A',
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1862 summary=opts.get('summary'))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1863
5673 dd3ce7515f4d mq: add --currentuser and --user options to qnew and qrefresh peter.arrenbrecht@gmail.com parents: 5645 diff changeset	1864 def setupheaderopts(ui, opts):
9198 061eeb602354 coding style: use a space after comma Martin Geisler <mg@lazybytes.net> parents: 9167 diff changeset	1865 def do(opt, val):
5673 dd3ce7515f4d mq: add --currentuser and --user options to qnew and qrefresh peter.arrenbrecht@gmail.com parents: 5645 diff changeset	1866 if not opts[opt] and opts['current' + opt]:
dd3ce7515f4d mq: add --currentuser and --user options to qnew and qrefresh peter.arrenbrecht@gmail.com parents: 5645 diff changeset	1867 opts[opt] = val
dd3ce7515f4d mq: add --currentuser and --user options to qnew and qrefresh peter.arrenbrecht@gmail.com parents: 5645 diff changeset	1868 do('user', ui.username())
5788 4107e823dc2c mq: add --currentdate and --date options to qnew and qrefresh Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 5673 diff changeset	1869 do('date', "%d %d" % util.makedate())
5673 dd3ce7515f4d mq: add --currentuser and --user options to qnew and qrefresh peter.arrenbrecht@gmail.com parents: 5645 diff changeset	1870
4713 c29ee52e0b68 mq: support qnew -I/-X and file name lists Brendan Cully <brendan@kublai.com> parents: 4712 diff changeset	1871 def new(ui, repo, patch, args, *opts):
2754 19041b8cbc86 Add more verbose help text to mq commands. Brendan Cully <brendan@kublai.com> parents: 2753 diff changeset	1872 """create a new patch
19041b8cbc86 Add more verbose help text to mq commands. Brendan Cully <brendan@kublai.com> parents: 2753 diff changeset	1873
7994 3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1874 qnew creates a new patch on top of the currently-applied patch (if
3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1875 any). It will refuse to run if there are any outstanding changes
8076 5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	1876 unless -f/--force is specified, in which case the patch will be
5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	1877 initialized with them. You may also use -I/--include,
5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	1878 -X/--exclude, and/or a list of files after the patch name to add
5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	1879 only changes to matching files to the new patch, leaving the rest
5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	1880 as uncommitted modifications.
2754 19041b8cbc86 Add more verbose help text to mq commands. Brendan Cully <brendan@kublai.com> parents: 2753 diff changeset	1881
8076 5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	1882 -u/--user and -d/--date can be used to set the (given) user and
5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	1883 date, respectively. -U/--currentuser and -D/--currentdate set user
5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	1884 to current user and date to current date.
7306 8e46e59aaf4c mq: reflow qnew help, add help for options Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7297 diff changeset	1885
8076 5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	1886 -e/--edit, -m/--message or -l/--logfile set the patch header as
5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	1887 well as the commit message. If none is specified, the header is
5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	1888 empty and the commit message is '[mq]: PATCH'.
7307 56380212d630 help: commands supporting --git point to the gitdiffs topic (issue1352) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7306 diff changeset	1889
8076 5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	1890 Use the -g/--git option to keep the patch in the git extended diff
7387 7e9a15fa6c8f update help on git diffs Matt Mackall <mpm@selenic.com> parents: 7308 diff changeset	1891 format. Read the diffs help topic for more information on why this
7e9a15fa6c8f update help on git diffs Matt Mackall <mpm@selenic.com> parents: 7308 diff changeset	1892 is important for preserving permission changes and copy/rename
7e9a15fa6c8f update help on git diffs Matt Mackall <mpm@selenic.com> parents: 7308 diff changeset	1893 information.
7306 8e46e59aaf4c mq: reflow qnew help, add help for options Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7297 diff changeset	1894 """
7157 fd3cba5e73ae mq: do not invoke editor until just before patch creation. Closes issue1346. Brendan Cully <brendan@kublai.com> parents: 7142 diff changeset	1895 msg = cmdutil.logmessage(opts)
fd3cba5e73ae mq: do not invoke editor until just before patch creation. Closes issue1346. Brendan Cully <brendan@kublai.com> parents: 7142 diff changeset	1896 def getmsg(): return ui.edit(msg, ui.username())
2724 9c41ae1908c7 mq: replace module-wide repo hash with a repo attribute Brendan Cully <brendan@kublai.com> parents: 2723 diff changeset	1897 q = repo.mq
7157 fd3cba5e73ae mq: do not invoke editor until just before patch creation. Closes issue1346. Brendan Cully <brendan@kublai.com> parents: 7142 diff changeset	1898 opts['msg'] = msg
fd3cba5e73ae mq: do not invoke editor until just before patch creation. Closes issue1346. Brendan Cully <brendan@kublai.com> parents: 7142 diff changeset	1899 if opts.get('edit'):
fd3cba5e73ae mq: do not invoke editor until just before patch creation. Closes issue1346. Brendan Cully <brendan@kublai.com> parents: 7142 diff changeset	1900 opts['msg'] = getmsg
fd3cba5e73ae mq: do not invoke editor until just before patch creation. Closes issue1346. Brendan Cully <brendan@kublai.com> parents: 7142 diff changeset	1901 else:
fd3cba5e73ae mq: do not invoke editor until just before patch creation. Closes issue1346. Brendan Cully <brendan@kublai.com> parents: 7142 diff changeset	1902 opts['msg'] = msg
5673 dd3ce7515f4d mq: add --currentuser and --user options to qnew and qrefresh peter.arrenbrecht@gmail.com parents: 5645 diff changeset	1903 setupheaderopts(ui, opts)
4713 c29ee52e0b68 mq: support qnew -I/-X and file name lists Brendan Cully <brendan@kublai.com> parents: 4712 diff changeset	1904 q.new(repo, patch, args, *opts)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1905 q.save_dirty()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1906 return 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1907
2938 5b7a118f5b6c allow qrefresh to take a list of files; closes #96. Brendan Cully <brendan@kublai.com> parents: 2937 diff changeset	1908 def refresh(ui, repo, pats, *opts):
2940 b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	1909 """update the current patch
b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	1910
7994 3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1911 If any file patterns are provided, the refreshed patch will
3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1912 contain only the modifications that match those patterns; the
3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1913 remaining modifications will remain in the working directory.
4048 5d6b3fa62736 mq: Mention usage of hg add/remove/copy/rename in qrefresh help text. Thomas Arendsen Hein <thomas@intevation.de> parents: 4040 diff changeset	1914
8076 5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	1915 If -s/--short is specified, files currently included in the patch
7994 3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1916 will be refreshed just like matched files and remain in the patch.
7113 f7fc5f5ecd62 mq: Allow qrefresh --silent to take parameters Mads Kiilerich <mads@kiilerich.com> parents: 7002 diff changeset	1917
7994 3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1918 hg add/remove/copy/rename work as usual, though you might want to
8076 5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	1919 use git-style patches (-g/--git or [diff] git=1) to track copies
5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	1920 and renames. See the diffs help topic for more information on the
5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	1921 git diff format.
2940 b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	1922 """
2724 9c41ae1908c7 mq: replace module-wide repo hash with a repo attribute Brendan Cully <brendan@kublai.com> parents: 2723 diff changeset	1923 q = repo.mq
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4476 diff changeset	1924 message = cmdutil.logmessage(opts)
2746 0503eb5c0a33 Add option -e/--edit to qrefresh, to edit the existing header. Brendan Cully <brendan@kublai.com> parents: 2745 diff changeset	1925 if opts['edit']:
5334 448eb46d4d84 mq: fix qrefresh -e with no patches applied Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5226 diff changeset	1926 if not q.applied:
7627 fb32ae9c76e7 mq: lowercase output Martin Geisler <mg@daimi.au.dk> parents: 7621 diff changeset	1927 ui.write(_("no patches applied\n"))
5334 448eb46d4d84 mq: fix qrefresh -e with no patches applied Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5226 diff changeset	1928 return 1
2746 0503eb5c0a33 Add option -e/--edit to qrefresh, to edit the existing header. Brendan Cully <brendan@kublai.com> parents: 2745 diff changeset	1929 if message:
0503eb5c0a33 Add option -e/--edit to qrefresh, to edit the existing header. Brendan Cully <brendan@kublai.com> parents: 2745 diff changeset	1930 raise util.Abort(_('option "-e" incompatible with "-m" or "-l"'))
2780 ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	1931 patch = q.applied[-1].name
8653 aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	1932 ph = patchheader(q.join(patch))
7399 e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	1933 message = ui.edit('\n'.join(ph.message), ph.user or ui.username())
5673 dd3ce7515f4d mq: add --currentuser and --user options to qnew and qrefresh peter.arrenbrecht@gmail.com parents: 5645 diff changeset	1934 setupheaderopts(ui, opts)
3004 ac74046f8f58 qrefresh: exit with status 1 if no patches applied. Bryan O'Sullivan <bos@serpentine.com> parents: 2984 diff changeset	1935 ret = q.refresh(repo, pats, msg=message, **opts)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1936 q.save_dirty()
3004 ac74046f8f58 qrefresh: exit with status 1 if no patches applied. Bryan O'Sullivan <bos@serpentine.com> parents: 2984 diff changeset	1937 return ret
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1938
2937 9dc568f5e03d Fix test-mq-qdiff; add -I and -X options to qdiff Brendan Cully <brendan@kublai.com> parents: 2936 diff changeset	1939 def diff(ui, repo, pats, *opts):
6606 088ba40585b9 mq: expand help text for qdiff Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6561 diff changeset	1940 """diff of the current patch and subsequent modifications
6621 d5cbbe2c49ce mq: lose the trailing whitespace Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6611 diff changeset	1941
7994 3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1942 Shows a diff which includes the current patch as well as any
3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1943 changes which have been made in the working directory since the
3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1944 last refresh (thus showing what the current patch would become
3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1945 after a qrefresh).
6621 d5cbbe2c49ce mq: lose the trailing whitespace Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6611 diff changeset	1946
7994 3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1947 Use 'hg diff' if you only want to see the changes made since the
3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1948 last qrefresh, or 'hg export qtip' if you want to see changes made
3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1949 by the current patch without including changes made since the
3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1950 qrefresh.
6606 088ba40585b9 mq: expand help text for qdiff Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6561 diff changeset	1951 """
2937 9dc568f5e03d Fix test-mq-qdiff; add -I and -X options to qdiff Brendan Cully <brendan@kublai.com> parents: 2936 diff changeset	1952 repo.mq.diff(repo, pats, opts)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1953 return 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1954
2753 84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1955 def fold(ui, repo, files, *opts):
2748 752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	1956 """fold the named patches into the current patch
2753 84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1957
2771 519bf0cd28d2 Add -f option to qfold; improve qfold documentation. Brendan Cully <brendan@kublai.com> parents: 2770 diff changeset	1958 Patches must not yet be applied. Each patch will be successively
519bf0cd28d2 Add -f option to qfold; improve qfold documentation. Brendan Cully <brendan@kublai.com> parents: 2770 diff changeset	1959 applied to the current patch in the order given. If all the
519bf0cd28d2 Add -f option to qfold; improve qfold documentation. Brendan Cully <brendan@kublai.com> parents: 2770 diff changeset	1960 patches apply successfully, the current patch will be refreshed
7994 3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1961 with the new cumulative patch, and the folded patches will be
3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1962 deleted. With -k/--keep, the folded patch files will not be
3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1963 removed afterwards.
2771 519bf0cd28d2 Add -f option to qfold; improve qfold documentation. Brendan Cully <brendan@kublai.com> parents: 2770 diff changeset	1964
7994 3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1965 The header for each folded patch will be concatenated with the
3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1966 current patch header, separated by a line of '* * *'."""
2753 84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1967
2748 752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	1968 q = repo.mq
752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	1969
752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	1970 if not files:
752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	1971 raise util.Abort(_('qfold requires at least one patch name'))
752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	1972 if not q.check_toppatch(repo):
3072 bc3fe3b5b785 Never apply string formatting to generated errors with util.Abort. Thomas Arendsen Hein <thomas@intevation.de> parents: 3027 diff changeset	1973 raise util.Abort(_('No patches applied'))
8425 73d80d5bf478 mq: abort qfold upon local changes (issue1662) David Frey <dpfrey@shaw.ca> parents: 7782 diff changeset	1974 q.check_localchanges(repo)
2748 752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	1975
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4476 diff changeset	1976 message = cmdutil.logmessage(opts)
2753 84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1977 if opts['edit']:
84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1978 if message:
84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1979 raise util.Abort(_('option "-e" incompatible with "-m" or "-l"'))
84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1980
2748 752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	1981 parent = q.lookup('qtip')
752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	1982 patches = []
752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	1983 messages = []
752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	1984 for f in files:
2936 21bf8929efc8 Fix qfold after recent changes Brendan Cully <brendan@kublai.com> parents: 2934 diff changeset	1985 p = q.lookup(f)
21bf8929efc8 Fix qfold after recent changes Brendan Cully <brendan@kublai.com> parents: 2934 diff changeset	1986 if p in patches or p == parent:
21bf8929efc8 Fix qfold after recent changes Brendan Cully <brendan@kublai.com> parents: 2934 diff changeset	1987 ui.warn(_('Skipping already folded patch %s') % p)
21bf8929efc8 Fix qfold after recent changes Brendan Cully <brendan@kublai.com> parents: 2934 diff changeset	1988 if q.isapplied(p):
21bf8929efc8 Fix qfold after recent changes Brendan Cully <brendan@kublai.com> parents: 2934 diff changeset	1989 raise util.Abort(_('qfold cannot fold already applied patch %s') % p)
21bf8929efc8 Fix qfold after recent changes Brendan Cully <brendan@kublai.com> parents: 2934 diff changeset	1990 patches.append(p)
2748 752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	1991
2936 21bf8929efc8 Fix qfold after recent changes Brendan Cully <brendan@kublai.com> parents: 2934 diff changeset	1992 for p in patches:
2753 84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1993 if not message:
8653 aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	1994 ph = patchheader(q.join(p))
7454 1d5ecaa47abb mq: filter out empty commit messages in qfold Brendan Cully <brendan@kublai.com> parents: 7453 diff changeset	1995 if ph.message:
1d5ecaa47abb mq: filter out empty commit messages in qfold Brendan Cully <brendan@kublai.com> parents: 7453 diff changeset	1996 messages.append(ph.message)
2936 21bf8929efc8 Fix qfold after recent changes Brendan Cully <brendan@kublai.com> parents: 2934 diff changeset	1997 pf = q.join(p)
2748 752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	1998 (patchsuccess, files, fuzz) = q.patch(repo, pf)
752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	1999 if not patchsuccess:
2936 21bf8929efc8 Fix qfold after recent changes Brendan Cully <brendan@kublai.com> parents: 2934 diff changeset	2000 raise util.Abort(_('Error folding patch %s') % p)
21bf8929efc8 Fix qfold after recent changes Brendan Cully <brendan@kublai.com> parents: 2934 diff changeset	2001 patch.updatedir(ui, repo, files)
2748 752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	2002
2753 84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2003 if not message:
8653 aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	2004 ph = patchheader(q.join(parent))
7399 e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	2005 message, user = ph.message, ph.user
2753 84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2006 for msg in messages:
84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2007 message.append('* * *')
84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2008 message.extend(msg)
84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2009 message = '\n'.join(message)
84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2010
84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2011 if opts['edit']:
84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2012 message = ui.edit(message, user or ui.username())
2748 752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	2013
752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	2014 q.refresh(repo, msg=message)
3243 1d3aceae87c1 mq: update qfold to call delete correctly Brendan Cully <brendan@kublai.com> parents: 3223 diff changeset	2015 q.delete(repo, patches, opts)
2748 752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	2016 q.save_dirty()
752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	2017
4432 905397be7688 mq: add qgoto command. Bryan O'Sullivan <bos@serpentine.com> parents: 4430 diff changeset	2018 def goto(ui, repo, patch, **opts):
905397be7688 mq: add qgoto command. Bryan O'Sullivan <bos@serpentine.com> parents: 4430 diff changeset	2019 '''push or pop patches until named patch is at top of stack'''
905397be7688 mq: add qgoto command. Bryan O'Sullivan <bos@serpentine.com> parents: 4430 diff changeset	2020 q = repo.mq
905397be7688 mq: add qgoto command. Bryan O'Sullivan <bos@serpentine.com> parents: 4430 diff changeset	2021 patch = q.lookup(patch)
905397be7688 mq: add qgoto command. Bryan O'Sullivan <bos@serpentine.com> parents: 4430 diff changeset	2022 if q.isapplied(patch):
905397be7688 mq: add qgoto command. Bryan O'Sullivan <bos@serpentine.com> parents: 4430 diff changeset	2023 ret = q.pop(repo, patch, force=opts['force'])
905397be7688 mq: add qgoto command. Bryan O'Sullivan <bos@serpentine.com> parents: 4430 diff changeset	2024 else:
905397be7688 mq: add qgoto command. Bryan O'Sullivan <bos@serpentine.com> parents: 4430 diff changeset	2025 ret = q.push(repo, patch, force=opts['force'])
905397be7688 mq: add qgoto command. Bryan O'Sullivan <bos@serpentine.com> parents: 4430 diff changeset	2026 q.save_dirty()
905397be7688 mq: add qgoto command. Bryan O'Sullivan <bos@serpentine.com> parents: 4430 diff changeset	2027 return ret
905397be7688 mq: add qgoto command. Bryan O'Sullivan <bos@serpentine.com> parents: 4430 diff changeset	2028
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2029 def guard(ui, repo, args, *opts):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2030 '''set or print guards for a patch
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2031
2940 b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2032 Guards control whether a patch can be pushed. A patch with no
b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2033 guards is always pushed. A patch with a positive guard ("+foo") is
b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2034 pushed only if the qselect command has activated it. A patch with
b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2035 a negative guard ("-foo") is never pushed if the qselect command
b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2036 has activated it.
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2037
2940 b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2038 With no arguments, print the currently active guards.
b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2039 With arguments, set guards for the named patch.
7772 88887054d277 fancyopts: Parse options that occur after arguments. Augie Fackler <durin42@gmail.com> parents: 7729 diff changeset	2040 NOTE: Specifying negative guards now requires '--'.
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2041
2940 b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2042 To set guards on another patch:
7772 88887054d277 fancyopts: Parse options that occur after arguments. Augie Fackler <durin42@gmail.com> parents: 7729 diff changeset	2043 hg qguard -- other.patch +2.6.17 -stable
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2044 '''
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2045 def status(idx):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2046 guards = q.series_guards[idx] or ['unguarded']
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2047 ui.write('%s: %s\n' % (q.series[idx], ' '.join(guards)))
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2048 q = repo.mq
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2049 patch = None
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2050 args = list(args)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2051 if opts['list']:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2052 if args or opts['none']:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2053 raise util.Abort(_('cannot mix -l/--list with options or arguments'))
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2054 for i in xrange(len(q.series)):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2055 status(i)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2056 return
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2057 if not args or args[0][0:1] in '-+':
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2058 if not q.applied:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2059 raise util.Abort(_('no patches applied'))
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2060 patch = q.applied[-1].name
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2061 if patch is None and args[0][0:1] not in '-+':
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2062 patch = args.pop(0)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2063 if patch is None:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2064 raise util.Abort(_('no patch to work with'))
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2065 if args or opts['none']:
4133 a9ee6c53af8d mq: abort cleanly when invalid patch name is given to qguard Christian Ebert <blacktrash@gmx.net> parents: 4090 diff changeset	2066 idx = q.find_series(patch)
a9ee6c53af8d mq: abort cleanly when invalid patch name is given to qguard Christian Ebert <blacktrash@gmx.net> parents: 4090 diff changeset	2067 if idx is None:
a9ee6c53af8d mq: abort cleanly when invalid patch name is given to qguard Christian Ebert <blacktrash@gmx.net> parents: 4090 diff changeset	2068 raise util.Abort(_('no patch named %s') % patch)
a9ee6c53af8d mq: abort cleanly when invalid patch name is given to qguard Christian Ebert <blacktrash@gmx.net> parents: 4090 diff changeset	2069 q.set_guards(idx, args)
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2070 q.save_dirty()
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2071 else:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2072 status(q.series.index(q.lookup(patch)))
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2073
2747 0016fc748f61 Add command qheader to display the header of a given patch. Brendan Cully <brendan@kublai.com> parents: 2746 diff changeset	2074 def header(ui, repo, patch=None):
7598 26adfaccdf73 lowercase help output Martin Geisler <mg@daimi.au.dk> parents: 7597 diff changeset	2075 """print the header of the topmost or specified patch"""
2747 0016fc748f61 Add command qheader to display the header of a given patch. Brendan Cully <brendan@kublai.com> parents: 2746 diff changeset	2076 q = repo.mq
0016fc748f61 Add command qheader to display the header of a given patch. Brendan Cully <brendan@kublai.com> parents: 2746 diff changeset	2077
0016fc748f61 Add command qheader to display the header of a given patch. Brendan Cully <brendan@kublai.com> parents: 2746 diff changeset	2078 if patch:
0016fc748f61 Add command qheader to display the header of a given patch. Brendan Cully <brendan@kublai.com> parents: 2746 diff changeset	2079 patch = q.lookup(patch)
0016fc748f61 Add command qheader to display the header of a given patch. Brendan Cully <brendan@kublai.com> parents: 2746 diff changeset	2080 else:
0016fc748f61 Add command qheader to display the header of a given patch. Brendan Cully <brendan@kublai.com> parents: 2746 diff changeset	2081 if not q.applied:
7627 fb32ae9c76e7 mq: lowercase output Martin Geisler <mg@daimi.au.dk> parents: 7621 diff changeset	2082 ui.write('no patches applied\n')
3008 c203ccd7d838 qheader: exit withh meaningful error code. Bryan O'Sullivan <bos@serpentine.com> parents: 3006 diff changeset	2083 return 1
2747 0016fc748f61 Add command qheader to display the header of a given patch. Brendan Cully <brendan@kublai.com> parents: 2746 diff changeset	2084 patch = q.lookup('qtip')
8653 aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	2085 ph = patchheader(repo.mq.join(patch))
2747 0016fc748f61 Add command qheader to display the header of a given patch. Brendan Cully <brendan@kublai.com> parents: 2746 diff changeset	2086
7399 e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	2087 ui.write('\n'.join(ph.message) + '\n')
2747 0016fc748f61 Add command qheader to display the header of a given patch. Brendan Cully <brendan@kublai.com> parents: 2746 diff changeset	2088
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2089 def lastsavename(path):
2794 86c54b7cd331 mq: fix variables shadowing builtin Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2792 diff changeset	2090 (directory, base) = os.path.split(path)
86c54b7cd331 mq: fix variables shadowing builtin Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2792 diff changeset	2091 names = os.listdir(directory)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2092 namere = re.compile("%s.([0-9]+)" % base)
2794 86c54b7cd331 mq: fix variables shadowing builtin Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2792 diff changeset	2093 maxindex = None
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2094 maxname = None
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2095 for f in names:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2096 m = namere.match(f)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2097 if m:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2098 index = int(m.group(1))
8527 f9a80054dd3c use 'x is None' instead of 'x == None' Martin Geisler <mg@lazybytes.net> parents: 8525 diff changeset	2099 if maxindex is None or index > maxindex:
2794 86c54b7cd331 mq: fix variables shadowing builtin Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2792 diff changeset	2100 maxindex = index
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2101 maxname = f
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2102 if maxname:
2794 86c54b7cd331 mq: fix variables shadowing builtin Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2792 diff changeset	2103 return (os.path.join(directory, maxname), maxindex)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2104 return (None, None)
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2105
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2106 def savename(path):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2107 (last, index) = lastsavename(path)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2108 if last is None:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2109 index = 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2110 newpath = path + ".%d" % (index + 1)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2111 return newpath
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2112
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2113 def push(ui, repo, patch=None, **opts):
6552 315b36ce6251 mq: add a little documentation on qpush -f Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6382 diff changeset	2114 """push the next patch onto the stack
6553 0bb76d168437 remove trailing spaces Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6552 diff changeset	2115
8076 5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	2116 When -f/--force is applied, all local changes in patched files
5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	2117 will be lost.
6552 315b36ce6251 mq: add a little documentation on qpush -f Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6382 diff changeset	2118 """
2724 9c41ae1908c7 mq: replace module-wide repo hash with a repo attribute Brendan Cully <brendan@kublai.com> parents: 2723 diff changeset	2119 q = repo.mq
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2120 mergeq = None
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2121
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2122 if opts['merge']:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2123 if opts['name']:
6627 d9266e48cd27 mq: qpush -n fix teki321@gmail.com parents: 6621 diff changeset	2124 newpath = repo.join(opts['name'])
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2125 else:
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2126 newpath, i = lastsavename(q.path)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2127 if not newpath:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	2128 ui.warn(_("no saved queues found, please use -n\n"))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2129 return 1
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2130 mergeq = queue(ui, repo.join(""), newpath)
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	2131 ui.warn(_("merging with queue at: %s\n") % mergeq.path)
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2132 ret = q.push(repo, patch, force=opts['force'], list=opts['list'],
7398 2cd1308cb588 mq: gracefully abort qpush/qgoto to guarded patch (issue1186) Brendan Cully <brendan@kublai.com> parents: 7308 diff changeset	2133 mergeq=mergeq, all=opts.get('all'))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2134 return ret
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2135
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2136 def pop(ui, repo, patch=None, **opts):
6611 f4c612da788d mq: add correct documentation for qpop Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6610 diff changeset	2137 """pop the current patch off the stack
6621 d5cbbe2c49ce mq: lose the trailing whitespace Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6611 diff changeset	2138
7994 3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2139 By default, pops off the top of the patch stack. If given a patch
3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2140 name, keeps popping off patches until the named patch is at the
3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2141 top of the stack.
6611 f4c612da788d mq: add correct documentation for qpop Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6610 diff changeset	2142 """
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2143 localupdate = True
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2144 if opts['name']:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2145 q = queue(ui, repo.join(""), repo.join(opts['name']))
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	2146 ui.warn(_('using patch queue: %s\n') % q.path)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2147 localupdate = False
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2148 else:
2724 9c41ae1908c7 mq: replace module-wide repo hash with a repo attribute Brendan Cully <brendan@kublai.com> parents: 2723 diff changeset	2149 q = repo.mq
4099 cf5580c16b13 mq: propagate the return error of pop Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4096 diff changeset	2150 ret = q.pop(repo, patch, force=opts['force'], update=localupdate,
cf5580c16b13 mq: propagate the return error of pop Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4096 diff changeset	2151 all=opts['all'])
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2152 q.save_dirty()
4099 cf5580c16b13 mq: propagate the return error of pop Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4096 diff changeset	2153 return ret
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2154
2750 8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2155 def rename(ui, repo, patch, name=None, **opts):
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2156 """rename a patch
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2157
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2158 With one argument, renames the current patch to PATCH1.
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2159 With two arguments, renames PATCH1 to PATCH2."""
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2160
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2161 q = repo.mq
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2162
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2163 if not name:
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2164 name = patch
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2165 patch = None
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2166
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2167 if patch:
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2168 patch = q.lookup(patch)
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2169 else:
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2170 if not q.applied:
7627 fb32ae9c76e7 mq: lowercase output Martin Geisler <mg@daimi.au.dk> parents: 7621 diff changeset	2171 ui.write(_('no patches applied\n'))
2750 8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2172 return
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2173 patch = q.lookup('qtip')
3083 82c9d1aac308 Make qrename handle directory targets; closes #333. Brendan Cully <brendan@kublai.com> parents: 3082 diff changeset	2174 absdest = q.join(name)
82c9d1aac308 Make qrename handle directory targets; closes #333. Brendan Cully <brendan@kublai.com> parents: 3082 diff changeset	2175 if os.path.isdir(absdest):
4037 bbdba01cce28 Enforce unixish style for all generated patch names. Patrick Mezard <pmezard@gmail.com> parents: 4016 diff changeset	2176 name = normname(os.path.join(name, os.path.basename(patch)))
3083 82c9d1aac308 Make qrename handle directory targets; closes #333. Brendan Cully <brendan@kublai.com> parents: 3082 diff changeset	2177 absdest = q.join(name)
82c9d1aac308 Make qrename handle directory targets; closes #333. Brendan Cully <brendan@kublai.com> parents: 3082 diff changeset	2178 if os.path.exists(absdest):
82c9d1aac308 Make qrename handle directory targets; closes #333. Brendan Cully <brendan@kublai.com> parents: 3082 diff changeset	2179 raise util.Abort(_('%s already exists') % absdest)
3223 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 3186 diff changeset	2180
3083 82c9d1aac308 Make qrename handle directory targets; closes #333. Brendan Cully <brendan@kublai.com> parents: 3082 diff changeset	2181 if name in q.series:
82c9d1aac308 Make qrename handle directory targets; closes #333. Brendan Cully <brendan@kublai.com> parents: 3082 diff changeset	2182 raise util.Abort(_('A patch named %s already exists in the series file') % name)
2750 8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2183
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2184 if ui.verbose:
7627 fb32ae9c76e7 mq: lowercase output Martin Geisler <mg@daimi.au.dk> parents: 7621 diff changeset	2185 ui.write('renaming %s to %s\n' % (patch, name))
2750 8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2186 i = q.find_series(patch)
3685 193e9c6d1a6d Issue424: mq patch loses guard when qrenamed Mathieu Clabaut <mathieu.clabaut@gmail.com> parents: 3681 diff changeset	2187 guards = q.guard_re.findall(q.full_series[i])
193e9c6d1a6d Issue424: mq patch loses guard when qrenamed Mathieu Clabaut <mathieu.clabaut@gmail.com> parents: 3681 diff changeset	2188 q.full_series[i] = name + ''.join([' #' + g for g in guards])
2767 60683ab1ed33 mq: rename read_series as parse_series, make simpler and faster Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2766 diff changeset	2189 q.parse_series()
2750 8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2190 q.series_dirty = 1
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2191
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2192 info = q.isapplied(patch)
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2193 if info:
2818 bdc067ff6cf5 Make mq camelcase consistent with the rest of hg. Brendan Cully <brendan@kublai.com> parents: 2816 diff changeset	2194 q.applied[info[0]] = statusentry(info[1], name)
2750 8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2195 q.applied_dirty = 1
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2196
2819 766ecdc83e43 mq: add join method Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2818 diff changeset	2197 util.rename(q.join(patch), absdest)
2750 8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2198 r = q.qrepo()
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2199 if r:
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2200 wlock = r.wlock()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	2201 try:
6648 2519976a998b mq: handle added patch renaming correctly Weijun Wang <weijun.wang@sun.com> parents: 6635 diff changeset	2202 if r.dirstate[patch] == 'a':
2519976a998b mq: handle added patch renaming correctly Weijun Wang <weijun.wang@sun.com> parents: 6635 diff changeset	2203 r.dirstate.forget(patch)
2519976a998b mq: handle added patch renaming correctly Weijun Wang <weijun.wang@sun.com> parents: 6635 diff changeset	2204 r.dirstate.add(name)
2519976a998b mq: handle added patch renaming correctly Weijun Wang <weijun.wang@sun.com> parents: 6635 diff changeset	2205 else:
2519976a998b mq: handle added patch renaming correctly Weijun Wang <weijun.wang@sun.com> parents: 6635 diff changeset	2206 if r.dirstate[name] == 'r':
2519976a998b mq: handle added patch renaming correctly Weijun Wang <weijun.wang@sun.com> parents: 6635 diff changeset	2207 r.undelete([name])
2519976a998b mq: handle added patch renaming correctly Weijun Wang <weijun.wang@sun.com> parents: 6635 diff changeset	2208 r.copy(patch, name)
2519976a998b mq: handle added patch renaming correctly Weijun Wang <weijun.wang@sun.com> parents: 6635 diff changeset	2209 r.remove([patch], False)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	2210 finally:
8112 6ee71f78497c switch lock releasing in the extensions from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8076 diff changeset	2211 wlock.release()
2750 8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2212
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2213 q.save_dirty()
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2214
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2215 def restore(ui, repo, rev, **opts):
8028 3aaca5901ade expand "rev" to "revision" in help texts Martin Geisler <mg@lazybytes.net> parents: 8027 diff changeset	2216 """restore the queue state saved by a revision"""
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2217 rev = repo.lookup(rev)
2724 9c41ae1908c7 mq: replace module-wide repo hash with a repo attribute Brendan Cully <brendan@kublai.com> parents: 2723 diff changeset	2218 q = repo.mq
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2219 q.restore(repo, rev, delete=opts['delete'],
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2220 qupdate=opts['update'])
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2221 q.save_dirty()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2222 return 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2223
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2224 def save(ui, repo, **opts):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2225 """save current queue state"""
2724 9c41ae1908c7 mq: replace module-wide repo hash with a repo attribute Brendan Cully <brendan@kublai.com> parents: 2723 diff changeset	2226 q = repo.mq
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4476 diff changeset	2227 message = cmdutil.logmessage(opts)
2694 0fb28dbf0dc7 MQ: uniformise message and logfile option. "Mathieu Clabaut <mathieu.clabaut@gmail.com>" parents: 2682 diff changeset	2228 ret = q.save(repo, msg=message)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2229 if ret:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2230 return ret
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2231 q.save_dirty()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2232 if opts['copy']:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2233 path = q.path
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2234 if opts['name']:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2235 newpath = os.path.join(q.basepath, opts['name'])
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2236 if os.path.exists(newpath):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2237 if not os.path.isdir(newpath):
2712 8e5cd8d11b51 mq: move many error messages to util.Abort Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2711 diff changeset	2238 raise util.Abort(_('destination %s exists and is not '
8e5cd8d11b51 mq: move many error messages to util.Abort Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2711 diff changeset	2239 'a directory') % newpath)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2240 if not opts['force']:
2712 8e5cd8d11b51 mq: move many error messages to util.Abort Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2711 diff changeset	2241 raise util.Abort(_('destination %s exists, '
8e5cd8d11b51 mq: move many error messages to util.Abort Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2711 diff changeset	2242 'use -f to force') % newpath)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2243 else:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2244 newpath = savename(path)
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	2245 ui.warn(_("copy %s to %s\n") % (path, newpath))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2246 util.copyfiles(path, newpath)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2247 if opts['empty']:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2248 try:
2819 766ecdc83e43 mq: add join method Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2818 diff changeset	2249 os.unlink(q.join(q.status_path))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2250 except:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2251 pass
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2252 return 0
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2253
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2254 def strip(ui, repo, rev, **opts):
6635 d90d83ebea9e mq: don't update the working copy on strip if parents aren't stripped Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6634 diff changeset	2255 """strip a revision and all its descendants from the repository
d90d83ebea9e mq: don't update the working copy on strip if parents aren't stripped Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6634 diff changeset	2256
8026 683d8ebcf434 expand "dir" to "directory" in help texts Martin Geisler <mg@lazybytes.net> parents: 7994 diff changeset	2257 If one of the working directory's parent revisions is stripped, the
7994 3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2258 working directory will be updated to the parent of the stripped
3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2259 revision.
6635 d90d83ebea9e mq: don't update the working copy on strip if parents aren't stripped Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6634 diff changeset	2260 """
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2261 backup = 'all'
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2262 if opts['backup']:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2263 backup = 'strip'
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2264 elif opts['nobackup']:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2265 backup = 'none'
6635 d90d83ebea9e mq: don't update the working copy on strip if parents aren't stripped Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6634 diff changeset	2266
d90d83ebea9e mq: don't update the working copy on strip if parents aren't stripped Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6634 diff changeset	2267 rev = repo.lookup(rev)
d90d83ebea9e mq: don't update the working copy on strip if parents aren't stripped Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6634 diff changeset	2268 p = repo.dirstate.parents()
d90d83ebea9e mq: don't update the working copy on strip if parents aren't stripped Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6634 diff changeset	2269 cl = repo.changelog
d90d83ebea9e mq: don't update the working copy on strip if parents aren't stripped Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6634 diff changeset	2270 update = True
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	2271 if p[0] == nullid:
6635 d90d83ebea9e mq: don't update the working copy on strip if parents aren't stripped Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6634 diff changeset	2272 update = False
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	2273 elif p[1] == nullid and rev != cl.ancestor(p[0], rev):
6635 d90d83ebea9e mq: don't update the working copy on strip if parents aren't stripped Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6634 diff changeset	2274 update = False
d90d83ebea9e mq: don't update the working copy on strip if parents aren't stripped Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6634 diff changeset	2275 elif rev not in (cl.ancestor(p[0], rev), cl.ancestor(p[1], rev)):
d90d83ebea9e mq: don't update the working copy on strip if parents aren't stripped Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6634 diff changeset	2276 update = False
d90d83ebea9e mq: don't update the working copy on strip if parents aren't stripped Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6634 diff changeset	2277
6472 8c4cd80afd3e mq: add --force option to strip Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6382 diff changeset	2278 repo.mq.strip(repo, rev, backup=backup, update=update, force=opts['force'])
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2279 return 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2280
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2281 def select(ui, repo, args, *opts):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2282 '''set or print guarded patches to push
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2283
2940 b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2284 Use the qguard command to set or print guards on patch, then use
7994 3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2285 qselect to tell mq which guards to use. A patch will be pushed if
3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2286 it has no guards or any positive guards match the currently
3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2287 selected guard, but will not be pushed if any negative guards
3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2288 match the current guard. For example:
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2289
2940 b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2290 qguard foo.patch -stable (negative guard)
b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2291 qguard bar.patch +stable (positive guard)
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2292 qselect stable
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2293
2940 b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2294 This activates the "stable" guard. mq will skip foo.patch (because
7994 3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2295 it has a negative match) but push bar.patch (because it has a
3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2296 positive match).
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2297
2940 b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2298 With no arguments, prints the currently active guards.
b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2299 With one argument, sets the active guard.
3223 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 3186 diff changeset	2300
2940 b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2301 Use -n/--none to deactivate guards (no other arguments needed).
7994 3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2302 When no guards are active, patches with positive guards are
3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2303 skipped and patches with negative guards are pushed.
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2304
2940 b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2305 qselect can change the guards on applied patches. It does not pop
7994 3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2306 guarded patches by default. Use --pop to pop back to the last
3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2307 applied patch that is not guarded. Use --reapply (which implies
3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2308 --pop) to push back to the current patch afterwards, but skip
3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2309 guarded patches.
2844 582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2310
7994 3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2311 Use -s/--series to print a list of all guards in the series file
3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2312 (no other arguments needed). Use -v for more information.'''
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2313
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2314 q = repo.mq
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2315 guards = q.active()
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2316 if args or opts['none']:
2844 582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2317 old_unapplied = q.unapplied(repo)
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2318 old_guarded = [i for i in xrange(len(q.applied)) if
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2319 not q.pushable(i)[0]]
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2320 q.set_active(args)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2321 q.save_dirty()
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2322 if not args:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2323 ui.status(_('guards deactivated\n'))
2844 582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2324 if not opts['pop'] and not opts['reapply']:
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2325 unapplied = q.unapplied(repo)
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2326 guarded = [i for i in xrange(len(q.applied))
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2327 if not q.pushable(i)[0]]
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2328 if len(unapplied) != len(old_unapplied):
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2329 ui.status(_('number of unguarded, unapplied patches has '
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2330 'changed from %d to %d\n') %
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2331 (len(old_unapplied), len(unapplied)))
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2332 if len(guarded) != len(old_guarded):
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2333 ui.status(_('number of guarded, applied patches has changed '
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2334 'from %d to %d\n') %
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2335 (len(old_guarded), len(guarded)))
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2336 elif opts['series']:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2337 guards = {}
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2338 noguards = 0
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2339 for gs in q.series_guards:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2340 if not gs:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2341 noguards += 1
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2342 for g in gs:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2343 guards.setdefault(g, 0)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2344 guards[g] += 1
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2345 if ui.verbose:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2346 guards['NONE'] = noguards
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2347 guards = guards.items()
9032 1fa80c5428b8 compat: use 'key' argument instead of 'cmp' when sorting a list Alejandro Santos <alejolp@alejolp.com> parents: 9016 diff changeset	2348 guards.sort(key=lambda x: x[0][1:])
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2349 if guards:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2350 ui.note(_('guards in series file:\n'))
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2351 for guard, count in guards:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2352 ui.note('%2d ' % count)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2353 ui.write(guard, '\n')
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2354 else:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2355 ui.note(_('no guards in series file\n'))
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2356 else:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2357 if guards:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2358 ui.note(_('active guards:\n'))
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2359 for g in guards:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2360 ui.write(g, '\n')
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2361 else:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2362 ui.write(_('no active guards\n'))
2844 582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2363 reapply = opts['reapply'] and q.applied and q.appliedname(-1)
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2364 popped = False
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2365 if opts['pop'] or opts['reapply']:
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2366 for i in xrange(len(q.applied)):
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2367 pushable, reason = q.pushable(i)
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2368 if not pushable:
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2369 ui.status(_('popping guarded patches\n'))
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2370 popped = True
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2371 if i == 0:
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2372 q.pop(repo, all=True)
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2373 else:
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2374 q.pop(repo, i-1)
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2375 break
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2376 if popped:
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2377 try:
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2378 if reapply:
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2379 ui.status(_('reapplying unguarded patches\n'))
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2380 q.push(repo, reapply)
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2381 finally:
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2382 q.save_dirty()
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2383
6645 37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2384 def finish(ui, repo, revrange, *opts):
37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2385 """move applied patches into repository history
37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2386
7994 3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2387 Finishes the specified revisions (corresponding to applied
3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2388 patches) by moving them out of mq control into regular repository
3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2389 history.
6645 37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2390
8076 5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	2391 Accepts a revision range or the -a/--applied option. If --applied
5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	2392 is specified, all applied mq revisions are removed from mq
5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	2393 control. Otherwise, the given revisions must be at the base of the
5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	2394 stack of applied patches.
6645 37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2395
7994 3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2396 This can be especially useful if your changes have been applied to
3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2397 an upstream repository, or if you are about to push your changes
3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2398 to upstream.
6645 37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2399 """
37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2400 if not opts['applied'] and not revrange:
37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2401 raise util.Abort(_('no revisions specified'))
37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2402 elif opts['applied']:
37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2403 revrange = ('qbase:qtip',) + revrange
37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2404
37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2405 q = repo.mq
37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2406 if not q.applied:
37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2407 ui.status(_('no patches applied\n'))
37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2408 return 0
37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2409
37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2410 revs = cmdutil.revrange(repo, revrange)
37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2411 q.finish(repo, revs)
37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2412 q.save_dirty()
37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2413 return 0
37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2414
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2415 def reposetup(ui, repo):
2818 bdc067ff6cf5 Make mq camelcase consistent with the rest of hg. Brendan Cully <brendan@kublai.com> parents: 2816 diff changeset	2416 class mqrepo(repo.__class__):
8524 21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	2417 @util.propertycache
21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	2418 def mq(self):
21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	2419 return queue(self.ui, self.join(""))
21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	2420
2848 307439d6fede mq: do not allow to push from repo with patches applied Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2845 diff changeset	2421 def abort_if_wdir_patched(self, errmsg, force=False):
307439d6fede mq: do not allow to push from repo with patches applied Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2845 diff changeset	2422 if self.mq.applied and not force:
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	2423 parent = hex(self.dirstate.parents()[0])
2848 307439d6fede mq: do not allow to push from repo with patches applied Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2845 diff changeset	2424 if parent in [s.rev for s in self.mq.applied]:
307439d6fede mq: do not allow to push from repo with patches applied Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2845 diff changeset	2425 raise util.Abort(errmsg)
3223 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 3186 diff changeset	2426
8711 1b95c6f13155 mq: fix commit prototype Matt Mackall <mpm@selenic.com> parents: 8706 diff changeset	2427 def commit(self, text="", user=None, date=None, match=None,
1b95c6f13155 mq: fix commit prototype Matt Mackall <mpm@selenic.com> parents: 8706 diff changeset	2428 force=False, editor=False, extra={}):
2848 307439d6fede mq: do not allow to push from repo with patches applied Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2845 diff changeset	2429 self.abort_if_wdir_patched(
307439d6fede mq: do not allow to push from repo with patches applied Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2845 diff changeset	2430 _('cannot commit over an applied mq patch'),
307439d6fede mq: do not allow to push from repo with patches applied Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2845 diff changeset	2431 force)
2845 addd03c7fbfa Disallow commit over an applied mq patch. Brendan Cully <brendan@kublai.com> parents: 2844 diff changeset	2432
8711 1b95c6f13155 mq: fix commit prototype Matt Mackall <mpm@selenic.com> parents: 8706 diff changeset	2433 return super(mqrepo, self).commit(text, user, date, match, force,
1b95c6f13155 mq: fix commit prototype Matt Mackall <mpm@selenic.com> parents: 8706 diff changeset	2434 editor, extra)
2845 addd03c7fbfa Disallow commit over an applied mq patch. Brendan Cully <brendan@kublai.com> parents: 2844 diff changeset	2435
2848 307439d6fede mq: do not allow to push from repo with patches applied Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2845 diff changeset	2436 def push(self, remote, force=False, revs=None):
4040 55578a8d7e84 mq: allow push if -r is given explicitly Brendan Cully <brendan@kublai.com> parents: 4037 diff changeset	2437 if self.mq.applied and not force and not revs:
2848 307439d6fede mq: do not allow to push from repo with patches applied Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2845 diff changeset	2438 raise util.Abort(_('source has mq patches applied'))
307439d6fede mq: do not allow to push from repo with patches applied Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2845 diff changeset	2439 return super(mqrepo, self).push(remote, force, revs)
3223 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 3186 diff changeset	2440
9145 6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9111 diff changeset	2441 def _findtags(self):
6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9111 diff changeset	2442 '''augment tags from base class with patch tags'''
6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9111 diff changeset	2443 result = super(mqrepo, self)._findtags()
2682 4e2dc5c16e61 Add mq patch names to tagscache instead of overriding lookup. Brendan Cully <brendan@kublai.com> parents: 2677 diff changeset	2444
2724 9c41ae1908c7 mq: replace module-wide repo hash with a repo attribute Brendan Cully <brendan@kublai.com> parents: 2723 diff changeset	2445 q = self.mq
2723 04d9b31faeca mq: do not hold a reference to repo in tags override Brendan Cully <brendan@kublai.com> parents: 2720 diff changeset	2446 if not q.applied:
9145 6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9111 diff changeset	2447 return result
2663 96950d39171d Mq: modify repo.lookup to resolve applied patches too. Brendan Cully <brendan@kublai.com> parents: 2554 diff changeset	2448
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	2449 mqtags = [(bin(patch.rev), patch.name) for patch in q.applied]
5979 b4858eb4b58f mqrepo: don't abort if the status file has an unknown node Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5534 diff changeset	2450
b4858eb4b58f mqrepo: don't abort if the status file has an unknown node Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5534 diff changeset	2451 if mqtags[-1][0] not in self.changelog.nodemap:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	2452 self.ui.warn(_('mq status file refers to unknown node %s\n')
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	2453 % short(mqtags[-1][0]))
9145 6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9111 diff changeset	2454 return result
5979 b4858eb4b58f mqrepo: don't abort if the status file has an unknown node Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5534 diff changeset	2455
2723 04d9b31faeca mq: do not hold a reference to repo in tags override Brendan Cully <brendan@kublai.com> parents: 2720 diff changeset	2456 mqtags.append((mqtags[-1][0], 'qtip'))
04d9b31faeca mq: do not hold a reference to repo in tags override Brendan Cully <brendan@kublai.com> parents: 2720 diff changeset	2457 mqtags.append((mqtags[0][0], 'qbase'))
4219 6cb5be6bd70f mq: add qparent tag (first parent of qbase) Brendan Cully <brendan@kublai.com> parents: 4209 diff changeset	2458 mqtags.append((self.changelog.parents(mqtags[0][0])[0], 'qparent'))
9145 6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9111 diff changeset	2459 tags = result[0]
2723 04d9b31faeca mq: do not hold a reference to repo in tags override Brendan Cully <brendan@kublai.com> parents: 2720 diff changeset	2460 for patch in mqtags:
9145 6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9111 diff changeset	2461 if patch[1] in tags:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	2462 self.ui.warn(_('Tag %s overrides mq patch of the same name\n')
46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	2463 % patch[1])
2723 04d9b31faeca mq: do not hold a reference to repo in tags override Brendan Cully <brendan@kublai.com> parents: 2720 diff changeset	2464 else:
9145 6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9111 diff changeset	2465 tags[patch[1]] = patch[0]
2682 4e2dc5c16e61 Add mq patch names to tagscache instead of overriding lookup. Brendan Cully <brendan@kublai.com> parents: 2677 diff changeset	2466
9145 6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9111 diff changeset	2467 return result
2664 9b8df8dceeed Add qtip and qbase to mq qlookup. Brendan Cully <brendan@kublai.com> parents: 2663 diff changeset	2468
6120 f89878df40fe move the reading of branch.cache from _branchtags to branchtags Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6048 diff changeset	2469 def _branchtags(self, partial, lrev):
3492 fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	2470 q = self.mq
fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	2471 if not q.applied:
6120 f89878df40fe move the reading of branch.cache from _branchtags to branchtags Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6048 diff changeset	2472 return super(mqrepo, self)._branchtags(partial, lrev)
3492 fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	2473
5979 b4858eb4b58f mqrepo: don't abort if the status file has an unknown node Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5534 diff changeset	2474 cl = self.changelog
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	2475 qbasenode = bin(q.applied[0].rev)
5979 b4858eb4b58f mqrepo: don't abort if the status file has an unknown node Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5534 diff changeset	2476 if qbasenode not in cl.nodemap:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	2477 self.ui.warn(_('mq status file refers to unknown node %s\n')
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	2478 % short(qbasenode))
6120 f89878df40fe move the reading of branch.cache from _branchtags to branchtags Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6048 diff changeset	2479 return super(mqrepo, self)._branchtags(partial, lrev)
3492 fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	2480
5979 b4858eb4b58f mqrepo: don't abort if the status file has an unknown node Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5534 diff changeset	2481 qbase = cl.rev(qbasenode)
3492 fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	2482 start = lrev + 1
fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	2483 if start < qbase:
fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	2484 # update the cache (excluding the patches) and save it
fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	2485 self._updatebranchcache(partial, lrev+1, qbase)
fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	2486 self._writebranchcache(partial, cl.node(qbase-1), qbase-1)
fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	2487 start = qbase
fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	2488 # if start = qbase, the cache is as updated as it should be.
fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	2489 # if start > qbase, the cache includes (part of) the patches.
fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	2490 # we might as well use it, but we won't save it.
fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	2491
fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	2492 # update the cache up to the tip
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	2493 self._updatebranchcache(partial, start, len(cl))
3492 fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	2494
3826 b3b868113d24 fix encoding conversion of branch names when mq is loaded Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3763 diff changeset	2495 return partial
3492 fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	2496
2851 82f50658c72b mq: only add mq attribute to local repo Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2850 diff changeset	2497 if repo.local():
82f50658c72b mq: only add mq attribute to local repo Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2850 diff changeset	2498 repo.__class__ = mqrepo
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2499
7216 292fb2ad2846 extensions: use new wrapper functions Matt Mackall <mpm@selenic.com> parents: 7213 diff changeset	2500 def mqimport(orig, ui, repo, args, *kwargs):
292fb2ad2846 extensions: use new wrapper functions Matt Mackall <mpm@selenic.com> parents: 7213 diff changeset	2501 if hasattr(repo, 'abort_if_wdir_patched'):
292fb2ad2846 extensions: use new wrapper functions Matt Mackall <mpm@selenic.com> parents: 7213 diff changeset	2502 repo.abort_if_wdir_patched(_('cannot import over an applied patch'),
292fb2ad2846 extensions: use new wrapper functions Matt Mackall <mpm@selenic.com> parents: 7213 diff changeset	2503 kwargs.get('force'))
292fb2ad2846 extensions: use new wrapper functions Matt Mackall <mpm@selenic.com> parents: 7213 diff changeset	2504 return orig(ui, repo, args, *kwargs)
292fb2ad2846 extensions: use new wrapper functions Matt Mackall <mpm@selenic.com> parents: 7213 diff changeset	2505
7142 88f1b8081f1c Prevent import over an applied patch (closes issue795) Brendan Cully <brendan@kublai.com> parents: 7113 diff changeset	2506 def uisetup(ui):
7216 292fb2ad2846 extensions: use new wrapper functions Matt Mackall <mpm@selenic.com> parents: 7213 diff changeset	2507 extensions.wrapcommand(commands.table, 'import', mqimport)
7142 88f1b8081f1c Prevent import over an applied patch (closes issue795) Brendan Cully <brendan@kublai.com> parents: 7113 diff changeset	2508
3183 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	2509 seriesopts = [('s', 'summary', None, _('print first line of patch header'))]
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	2510
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2511 cmdtable = {
4730 eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2512 "qapplied": (applied, [] + seriesopts, _('hg qapplied [-s] [PATCH]')),
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2513 "qclone":
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2514 (clone,
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2515 [('', 'pull', None, _('use pull protocol to copy metadata')),
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2516 ('U', 'noupdate', None, _('do not update the new working directories')),
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2517 ('', 'uncompressed', None,
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2518 _('use uncompressed transfer (fast over LAN)')),
8027 9c7ca86fc658 expand "repo" to "repository" in help texts Martin Geisler <mg@lazybytes.net> parents: 8026 diff changeset	2519 ('p', 'patches', '', _('location of source patch repository')),
5147 c80af96943aa refactor options from cmdtable Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5053 diff changeset	2520 ] + commands.remoteopts,
4730 eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2521 _('hg qclone [OPTION]... SOURCE [DEST]')),
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2522 "qcommit\|qci":
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2523 (commit,
2185 5acd648770d0 Better help for mq: Corrected synopses, get qcommit options from commands.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 2097 diff changeset	2524 commands.table["^commit\|ci"][1],
4730 eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2525 _('hg qcommit [OPTION]... [FILE]...')),
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2526 "^qdiff":
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2527 (diff,
6668 034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 6650 diff changeset	2528 commands.diffopts + commands.diffopts2 + commands.walkopts,
034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 6650 diff changeset	2529 _('hg qdiff [OPTION]... [FILE]...')),
2904 57b88b86a845 Replace qdel/qfold -f option with -k/--keep. Brendan Cully <brendan@kublai.com> parents: 2883 diff changeset	2530 "qdelete\|qremove\|qrm":
2752 5dfeda163bb7 Add -f option to qdelete, to remove patch file. Brendan Cully <brendan@kublai.com> parents: 2751 diff changeset	2531 (delete,
3373 9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	2532 [('k', 'keep', None, _('keep patch file')),
8904 8be38b624902 mq: no longer mention the deprecated qdelete's --revision option C?dric Duval <cedricduval@free.fr> parents: 8894 diff changeset	2533 ('r', 'rev', [], _('stop managing a revision (DEPRECATED)'))],
4737 2ececafa5859 mq: more qdelete help text tweaks Brendan Cully <brendan@kublai.com> parents: 4736 diff changeset	2534 _('hg qdelete [-k] [-r REV]... [PATCH]...')),
2753 84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2535 'qfold':
84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2536 (fold,
84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2537 [('e', 'edit', None, _('edit patch header')),
4730 eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2538 ('k', 'keep', None, _('keep folded patch files')),
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2539 ] + commands.commitopts,
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2540 _('hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH...')),
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2541 'qgoto':
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2542 (goto,
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2543 [('f', 'force', None, _('overwrite any local changes'))],
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2544 _('hg qgoto [OPTION]... PATCH')),
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2545 'qguard':
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2546 (guard,
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2547 [('l', 'list', None, _('list all patches and guards')),
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2548 ('n', 'none', None, _('drop all guards'))],
7772 88887054d277 fancyopts: Parse options that occur after arguments. Augie Fackler <durin42@gmail.com> parents: 7729 diff changeset	2549 _('hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]...')),
4730 eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2550 'qheader': (header, [], _('hg qheader [PATCH]')),
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2551 "^qimport":
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2552 (qimport,
8026 683d8ebcf434 expand "dir" to "directory" in help texts Martin Geisler <mg@lazybytes.net> parents: 7994 diff changeset	2553 [('e', 'existing', None, _('import file in patch directory')),
8761 0289f384e1e5 Generally replace "file name" with "filename" in help and comments. timeless <timeless@gmail.com> parents: 8760 diff changeset	2554 ('n', 'name', '', _('name of patch file')),
7002 07c8396fa001 i18n, mq: mark command line options for translation Martin Geisler <mg@daimi.au.dk> parents: 6960 diff changeset	2555 ('f', 'force', None, _('overwrite existing files')),
07c8396fa001 i18n, mq: mark command line options for translation Martin Geisler <mg@daimi.au.dk> parents: 6960 diff changeset	2556 ('r', 'rev', [], _('place existing revisions under mq control')),
8362 bbc74c05b8a4 mq: add -P/--push option to qimport Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8288 diff changeset	2557 ('g', 'git', None, _('use git extended diff format')),
bbc74c05b8a4 mq: add -P/--push option to qimport Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8288 diff changeset	2558 ('P', 'push', None, _('qpush after importing'))],
bbc74c05b8a4 mq: add -P/--push option to qimport Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8288 diff changeset	2559 _('hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE...')),
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2560 "^qinit":
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2561 (init,
7002 07c8396fa001 i18n, mq: mark command line options for translation Martin Geisler <mg@daimi.au.dk> parents: 6960 diff changeset	2562 [('c', 'create-repo', None, _('create queue repository'))],
4730 eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2563 _('hg qinit [-c]')),
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2564 "qnew":
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2565 (new,
2939 abd0be815c9c Add qnew -e option. Brendan Cully <brendan@kublai.com> parents: 2938 diff changeset	2566 [('e', 'edit', None, _('edit commit message')),
4713 c29ee52e0b68 mq: support qnew -I/-X and file name lists Brendan Cully <brendan@kublai.com> parents: 4712 diff changeset	2567 ('f', 'force', None, _('import uncommitted changes into patch')),
5025 7041869a1bf6 mq: add qnew --git option Patrick Mezard <pmezard@gmail.com> parents: 4970 diff changeset	2568 ('g', 'git', None, _('use git extended diff format')),
6915 ef14c773b3d6 mq: fix docs for qrefresh -D (issue1234) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 6801 diff changeset	2569 ('U', 'currentuser', None, _('add "From: <current user>" to patch')),
ef14c773b3d6 mq: fix docs for qrefresh -D (issue1234) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 6801 diff changeset	2570 ('u', 'user', '', _('add "From: <given user>" to patch')),
ef14c773b3d6 mq: fix docs for qrefresh -D (issue1234) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 6801 diff changeset	2571 ('D', 'currentdate', None, _('add "Date: <current date>" to patch')),
ef14c773b3d6 mq: fix docs for qrefresh -D (issue1234) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 6801 diff changeset	2572 ('d', 'date', '', _('add "Date: <given date>" to patch'))
ef14c773b3d6 mq: fix docs for qrefresh -D (issue1234) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 6801 diff changeset	2573 ] + commands.walkopts + commands.commitopts,
4730 eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2574 _('hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]...')),
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2575 "qnext": (next, [] + seriesopts, _('hg qnext [-s]')),
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2576 "qprev": (prev, [] + seriesopts, _('hg qprev [-s]')),
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2577 "^qpop":
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2578 (pop,
4730 eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2579 [('a', 'all', None, _('pop all patches')),
6610 92b5be854677 Backed out changeset ff5ef3c0fe10 (fixes wrong documentation) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6609 diff changeset	2580 ('n', 'name', '', _('queue name to pop')),
4730 eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2581 ('f', 'force', None, _('forget any local changes'))],
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2582 _('hg qpop [-a] [-n NAME] [-f] [PATCH \| INDEX]')),
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2583 "^qpush":
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2584 (push,
4730 eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2585 [('f', 'force', None, _('apply if the patch has rejects')),
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2586 ('l', 'list', None, _('list patch name in commit text')),
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2587 ('a', 'all', None, _('apply all patches')),
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2588 ('m', 'merge', None, _('merge from another queue')),
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2589 ('n', 'name', '', _('merge queue name'))],
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2590 _('hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH \| INDEX]')),
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2591 "^qrefresh":
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2592 (refresh,
2746 0503eb5c0a33 Add option -e/--edit to qrefresh, to edit the existing header. Brendan Cully <brendan@kublai.com> parents: 2745 diff changeset	2593 [('e', 'edit', None, _('edit commit message')),
3086 17747e80ea6c mq: Add --git option to qrefresh Brendan Cully <brendan@kublai.com> parents: 3085 diff changeset	2594 ('g', 'git', None, _('use git extended diff format')),
7113 f7fc5f5ecd62 mq: Allow qrefresh --silent to take parameters Mads Kiilerich <mads@kiilerich.com> parents: 7002 diff changeset	2595 ('s', 'short', None, _('refresh only files already in the patch and specified files')),
6915 ef14c773b3d6 mq: fix docs for qrefresh -D (issue1234) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 6801 diff changeset	2596 ('U', 'currentuser', None, _('add/update "From: <current user>" in patch')),
ef14c773b3d6 mq: fix docs for qrefresh -D (issue1234) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 6801 diff changeset	2597 ('u', 'user', '', _('add/update "From: <given user>" in patch')),
ef14c773b3d6 mq: fix docs for qrefresh -D (issue1234) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 6801 diff changeset	2598 ('D', 'currentdate', None, _('update "Date: <current date>" in patch (if present)')),
ef14c773b3d6 mq: fix docs for qrefresh -D (issue1234) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 6801 diff changeset	2599 ('d', 'date', '', _('update "Date: <given date>" in patch (if present)'))
ef14c773b3d6 mq: fix docs for qrefresh -D (issue1234) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 6801 diff changeset	2600 ] + commands.walkopts + commands.commitopts,
4730 eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2601 _('hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]...')),
2751 7d1de4545728 mq: add qmv as alias for qrename Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2750 diff changeset	2602 'qrename\|qmv':
4730 eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2603 (rename, [], _('hg qrename PATCH1 [PATCH2]')),
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2604 "qrestore":
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2605 (restore,
4730 eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2606 [('d', 'delete', None, _('delete save entry')),
8026 683d8ebcf434 expand "dir" to "directory" in help texts Martin Geisler <mg@lazybytes.net> parents: 7994 diff changeset	2607 ('u', 'update', None, _('update queue working directory'))],
4730 eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2608 _('hg qrestore [-d] [-u] REV')),
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2609 "qsave":
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2610 (save,
4730 eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2611 [('c', 'copy', None, _('copy patch directory')),
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2612 ('n', 'name', '', _('copy directory name')),
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2613 ('e', 'empty', None, _('clear queue status file')),
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2614 ('f', 'force', None, _('force copy'))] + commands.commitopts,
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2615 _('hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]')),
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2616 "qselect":
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2617 (select,
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2618 [('n', 'none', None, _('disable all guards')),
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2619 ('s', 'series', None, _('list all guards in series file')),
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2620 ('', 'pop', None, _('pop to before first guarded applied patch')),
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2621 ('', 'reapply', None, _('pop, then reapply patches'))],
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2622 _('hg qselect [OPTION]... [GUARD]...')),
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2623 "qseries":
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2624 (series,
4730 eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2625 [('m', 'missing', None, _('print patches not in series')),
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2626 ] + seriesopts,
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2627 _('hg qseries [-ms]')),
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2628 "^strip":
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2629 (strip,
6472 8c4cd80afd3e mq: add --force option to strip Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6382 diff changeset	2630 [('f', 'force', None, _('force removal with local changes')),
8c4cd80afd3e mq: add --force option to strip Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6382 diff changeset	2631 ('b', 'backup', None, _('bundle unrelated changesets')),
4730 eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2632 ('n', 'nobackup', None, _('no backups'))],
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2633 _('hg strip [-f] [-b] [-n] REV')),
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2634 "qtop": (top, [] + seriesopts, _('hg qtop [-s]')),
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4722 diff changeset	2635 "qunapplied": (unapplied, [] + seriesopts, _('hg qunapplied [-s] [PATCH]')),
6645 37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2636 "qfinish":
37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2637 (finish,
37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2638 [('a', 'applied', None, _('finish all applied changesets'))],
8948 aa0fe57d4abe mq: standardize qfinish cmdline help string Martin Geisler <mg@lazybytes.net> parents: 8932 diff changeset	2639 _('hg qfinish [-a] [REV]...')),
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2640 }

Mercurial > public > mercurial-scm > hg

annotate hgext/mq.py @ 9335:6eaadd777bc4