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

annotate hgext/mq.py @ 15087:adad8d68fb1f

mq: split up overly long line

author	Dan Villiom Podlaski Christiansen <danchr@gmail.com>
date	Sun, 11 Sep 2011 18:49:54 +0200
parents	110d6804bfc6
children	510184e5a09e

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
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 10186 diff changeset	6 # GNU General Public License version 2 or any later version.
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
10973 49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10962 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 create new patch qnew
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9111 diff changeset	20 import existing patch qimport
2554 8264c2034970 help: add help to mq extension Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2531 diff changeset	21
9157 9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9111 diff changeset	22 print patch series qseries
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9111 diff changeset	23 print applied patches qapplied
2554 8264c2034970 help: add help to mq extension Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2531 diff changeset	24
9157 9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9111 diff changeset	25 add known patch to applied stack qpush
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9111 diff changeset	26 remove patch from applied stack qpop
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9111 diff changeset	27 refresh contents of top applied patch qrefresh
10190 9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	28
9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	29 By default, mq will automatically use git patches when required to
9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	30 avoid losing file mode changes, copy records, binary files or empty
9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	31 files creations or deletions. This behaviour can be configured with::
9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	32
9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	33 [mq]
9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	34 git = auto/keep/yes/no
9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	35
9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	36 If set to 'keep', mq will obey the [diff] section configuration while
9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	37 preserving existing git patches upon qrefresh. If set to 'yes' or
9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	38 'no', mq will override the [diff] section and always generate git or
9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	39 regular patches, possibly losing data in the second case.
11234 1ebe048902d9 mq: mention qqueue in module docstring Martin Geisler <mg@lazybytes.net> parents: 11230 diff changeset	40
1ebe048902d9 mq: mention qqueue in module docstring Martin Geisler <mg@lazybytes.net> parents: 11230 diff changeset	41 You will by default be managing a patch queue named "patches". You can
1ebe048902d9 mq: mention qqueue in module docstring Martin Geisler <mg@lazybytes.net> parents: 11230 diff changeset	42 create other, independent patch queues with the :hg:`qqueue` command.
2554 8264c2034970 help: add help to mq extension Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2531 diff changeset	43 '''
8264c2034970 help: add help to mq extension Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2531 diff changeset	44
3891 6b4127c7d52a Simplify i18n imports Matt Mackall <mpm@selenic.com> parents: 3877 diff changeset	45 from mercurial.i18n import _
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	46 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	47 from mercurial.lock import release
14241 45f7aa35f2fd mq: don't hide the patch module Idan Kamara <idankk86@gmail.com> parents: 14239 diff changeset	48 from mercurial import commands, cmdutil, hg, scmutil, util, revset
7637 1d54e2f6c0b7 error: move repo errors Matt Mackall <mpm@selenic.com> parents: 7627 diff changeset	49 from mercurial import repair, extensions, url, error
14241 45f7aa35f2fd mq: don't hide the patch module Idan Kamara <idankk86@gmail.com> parents: 14239 diff changeset	50 from mercurial import patch as patchmod
14636 b98063487a6f mq: use ui.fin when importing patch from '-' Idan Kamara <idankk86@gmail.com> parents: 14635 diff changeset	51 import os, re, errno, shutil
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	52
5645 1f044b04fa0a mq: drop obsolete reference to 'qversion' Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 5534 diff changeset	53 commands.norepo += " qclone"
2720 c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	54
14298 21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	55 seriesopts = [('s', 'summary', None, _('print first line of patch header'))]
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	56
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	57 cmdtable = {}
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	58 command = cmdutil.command(cmdtable)
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	59
4037 bbdba01cce28 Enforce unixish style for all generated patch names. Patrick Mezard <pmezard@gmail.com> parents: 4016 diff changeset	60 # 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	61 # 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	62 normname = util.normpath
bbdba01cce28 Enforce unixish style for all generated patch names. Patrick Mezard <pmezard@gmail.com> parents: 4016 diff changeset	63
8778 c5f36402daad use new style classes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8761 diff changeset	64 class statusentry(object):
10682 8ed350051896 mq: simplify statusentry(), fix restore broken by ee48e5ef8753 Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10681 diff changeset	65 def __init__(self, node, name):
8ed350051896 mq: simplify statusentry(), fix restore broken by ee48e5ef8753 Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10681 diff changeset	66 self.node, self.name = node, name
11375 0f33abfccaa1 mq: __str__ falls back to __repr__ Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11365 diff changeset	67 def __repr__(self):
10678 da2a0c9c895d mq: avoid many hex/bin conversions, keep the binary node when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10663 diff changeset	68 return hex(self.node) + ':' + self.name
2780 ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	69
7399 e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	70 class patchheader(object):
10397 8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	71 def __init__(self, pf, plainmode=False):
8653 aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	72 def eatdiff(lines):
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	73 while lines:
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	74 l = lines[-1]
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	75 if (l.startswith("diff -") or
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	76 l.startswith("Index:") or
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	77 l.startswith("===========")):
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	78 del lines[-1]
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	79 else:
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	80 break
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	81 def eatempty(lines):
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	82 while lines:
10688 d4d3a8a65248 mq: don't use regexp when not necessary Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10687 diff changeset	83 if not lines[-1].strip():
8653 aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	84 del lines[-1]
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	85 else:
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	86 break
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	87
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	88 message = []
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	89 comments = []
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	90 user = None
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	91 date = None
10397 8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	92 parent = None
8653 aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	93 format = None
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	94 subject = None
13229 f3058dd05281 mq: record more data in patchheader class (no behavior changes) Steve Borho <steve@borho.org> parents: 13228 diff changeset	95 branch = None
f3058dd05281 mq: record more data in patchheader class (no behavior changes) Steve Borho <steve@borho.org> parents: 13228 diff changeset	96 nodeid = None
8653 aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	97 diffstart = 0
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	98
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	99 for line in file(pf):
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	100 line = line.rstrip()
10730 4d6bd7b8b6d8 mq: allow lines starting with '--- ' in patch messages Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10691 diff changeset	101 if (line.startswith('diff --git')
4d6bd7b8b6d8 mq: allow lines starting with '--- ' in patch messages Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10691 diff changeset	102 or (diffstart and line.startswith('+++ '))):
8653 aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	103 diffstart = 2
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	104 break
10730 4d6bd7b8b6d8 mq: allow lines starting with '--- ' in patch messages Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10691 diff changeset	105 diffstart = 0 # reset
8653 aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	106 if line.startswith("--- "):
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	107 diffstart = 1
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	108 continue
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	109 elif format == "hgpatch":
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	110 # 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	111 if line.startswith("# User "):
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	112 user = line[7:]
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	113 elif line.startswith("# Date "):
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	114 date = line[7:]
10397 8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	115 elif line.startswith("# Parent "):
14170 31ec4d7eb63f mq: strip extra whitespace from node ids in header (issue2790) Kevin Bullock <kbullock@ringworld.org> parents: 14051 diff changeset	116 parent = line[9:].lstrip()
13229 f3058dd05281 mq: record more data in patchheader class (no behavior changes) Steve Borho <steve@borho.org> parents: 13228 diff changeset	117 elif line.startswith("# Branch "):
f3058dd05281 mq: record more data in patchheader class (no behavior changes) Steve Borho <steve@borho.org> parents: 13228 diff changeset	118 branch = line[9:]
f3058dd05281 mq: record more data in patchheader class (no behavior changes) Steve Borho <steve@borho.org> parents: 13228 diff changeset	119 elif line.startswith("# Node ID "):
f3058dd05281 mq: record more data in patchheader class (no behavior changes) Steve Borho <steve@borho.org> parents: 13228 diff changeset	120 nodeid = line[10:]
8653 aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	121 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	122 message.append(line)
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	123 format = None
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	124 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	125 message = []
8653 aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	126 format = "hgpatch"
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	127 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	128 line.startswith("subject: "))):
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	129 subject = line[9:]
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	130 format = "tag"
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	131 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	132 line.startswith("from: "))):
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	133 user = line[6:]
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	134 format = "tag"
10397 8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	135 elif (format != "tagdone" and (line.startswith("Date: ") or
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	136 line.startswith("date: "))):
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	137 date = line[6:]
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	138 format = "tag"
8653 aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	139 elif format == "tag" and line == "":
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	140 # 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	141 # 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	142 format = "tagdone"
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	143 elif message or line:
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	144 message.append(line)
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	145 comments.append(line)
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	146
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	147 eatdiff(message)
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	148 eatdiff(comments)
13229 f3058dd05281 mq: record more data in patchheader class (no behavior changes) Steve Borho <steve@borho.org> parents: 13228 diff changeset	149 # Remember the exact starting line of the patch diffs before consuming
f3058dd05281 mq: record more data in patchheader class (no behavior changes) Steve Borho <steve@borho.org> parents: 13228 diff changeset	150 # empty lines, for external use by TortoiseHg and others
f3058dd05281 mq: record more data in patchheader class (no behavior changes) Steve Borho <steve@borho.org> parents: 13228 diff changeset	151 self.diffstartline = len(comments)
8653 aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	152 eatempty(message)
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	153 eatempty(comments)
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	154
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	155 # 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	156 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	157 message.insert(0, "")
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	158 message.insert(0, subject)
aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	159
7399 e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	160 self.message = message
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	161 self.comments = comments
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	162 self.user = user
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	163 self.date = date
10397 8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	164 self.parent = parent
13229 f3058dd05281 mq: record more data in patchheader class (no behavior changes) Steve Borho <steve@borho.org> parents: 13228 diff changeset	165 # nodeid and branch are for external use by TortoiseHg and others
f3058dd05281 mq: record more data in patchheader class (no behavior changes) Steve Borho <steve@borho.org> parents: 13228 diff changeset	166 self.nodeid = nodeid
f3058dd05281 mq: record more data in patchheader class (no behavior changes) Steve Borho <steve@borho.org> parents: 13228 diff changeset	167 self.branch = branch
8653 aa011d123f71 mq: initializing patchheader class directly from patch content C?dric Duval <cedricduval@free.fr> parents: 8632 diff changeset	168 self.haspatch = diffstart > 1
10397 8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	169 self.plainmode = plainmode
7399 e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	170
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	171 def setuser(self, user):
8654 f6cc3638f468 mq: rename setheader to updateheader and fix comment C?dric Duval <cedricduval@free.fr> parents: 8653 diff changeset	172 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	173 try:
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	174 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	175 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	176 except ValueError:
10397 8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	177 if self.plainmode or self._hasheader(['Date: ']):
9336 dd6f605b15c0 mq: upgrade the patch to HG format when adding the author name with qrefresh Yann E. MORIN <yann.morin.1998@anciens.enib.fr> parents: 9335 diff changeset	178 self.comments = ['From: ' + user] + self.comments
dd6f605b15c0 mq: upgrade the patch to HG format when adding the author name with qrefresh Yann E. MORIN <yann.morin.1998@anciens.enib.fr> parents: 9335 diff changeset	179 else:
dd6f605b15c0 mq: upgrade the patch to HG format when adding the author name with qrefresh Yann E. MORIN <yann.morin.1998@anciens.enib.fr> parents: 9335 diff changeset	180 tmp = ['# HG changeset patch', '# User ' + user, '']
dd6f605b15c0 mq: upgrade the patch to HG format when adding the author name with qrefresh Yann E. MORIN <yann.morin.1998@anciens.enib.fr> parents: 9335 diff changeset	181 self.comments = tmp + self.comments
7399 e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	182 self.user = user
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	183
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	184 def setdate(self, date):
9337 2b1260436f83 mq: add the date with qrefresh, even if missing (issue1768) Yann E. MORIN <yann.morin.1998@anciens.enib.fr> parents: 9336 diff changeset	185 if not self.updateheader(['Date: ', '# Date '], date):
2b1260436f83 mq: add the date with qrefresh, even if missing (issue1768) Yann E. MORIN <yann.morin.1998@anciens.enib.fr> parents: 9336 diff changeset	186 try:
2b1260436f83 mq: add the date with qrefresh, even if missing (issue1768) Yann E. MORIN <yann.morin.1998@anciens.enib.fr> parents: 9336 diff changeset	187 patchheaderat = self.comments.index('# HG changeset patch')
2b1260436f83 mq: add the date with qrefresh, even if missing (issue1768) Yann E. MORIN <yann.morin.1998@anciens.enib.fr> parents: 9336 diff changeset	188 self.comments.insert(patchheaderat + 1, '# Date ' + date)
2b1260436f83 mq: add the date with qrefresh, even if missing (issue1768) Yann E. MORIN <yann.morin.1998@anciens.enib.fr> parents: 9336 diff changeset	189 except ValueError:
10397 8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	190 if self.plainmode or self._hasheader(['From: ']):
9337 2b1260436f83 mq: add the date with qrefresh, even if missing (issue1768) Yann E. MORIN <yann.morin.1998@anciens.enib.fr> parents: 9336 diff changeset	191 self.comments = ['Date: ' + date] + self.comments
2b1260436f83 mq: add the date with qrefresh, even if missing (issue1768) Yann E. MORIN <yann.morin.1998@anciens.enib.fr> parents: 9336 diff changeset	192 else:
2b1260436f83 mq: add the date with qrefresh, even if missing (issue1768) Yann E. MORIN <yann.morin.1998@anciens.enib.fr> parents: 9336 diff changeset	193 tmp = ['# HG changeset patch', '# Date ' + date, '']
2b1260436f83 mq: add the date with qrefresh, even if missing (issue1768) Yann E. MORIN <yann.morin.1998@anciens.enib.fr> parents: 9336 diff changeset	194 self.comments = tmp + self.comments
2b1260436f83 mq: add the date with qrefresh, even if missing (issue1768) Yann E. MORIN <yann.morin.1998@anciens.enib.fr> parents: 9336 diff changeset	195 self.date = date
7399 e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	196
10397 8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	197 def setparent(self, parent):
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	198 if not self.updateheader(['# Parent '], parent):
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	199 try:
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	200 patchheaderat = self.comments.index('# HG changeset patch')
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	201 self.comments.insert(patchheaderat + 1, '# Parent ' + parent)
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	202 except ValueError:
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	203 pass
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	204 self.parent = parent
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	205
7399 e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	206 def setmessage(self, message):
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	207 if self.comments:
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	208 self._delmsg()
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	209 self.message = [message]
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	210 self.comments += self.message
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	211
8654 f6cc3638f468 mq: rename setheader to updateheader and fix comment C?dric Duval <cedricduval@free.fr> parents: 8653 diff changeset	212 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	213 '''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	214 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	215 res = False
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	216 for prefix in prefixes:
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	217 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	218 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	219 self.comments[i] = prefix + new
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	220 res = True
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	221 break
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	222 return res
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	223
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	224 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	225 '''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	226 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	227 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	228 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	229 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	230 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	231
7399 e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	232 def __str__(self):
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	233 if not self.comments:
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	234 return ''
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	235 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	236
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	237 def _delmsg(self):
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	238 '''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	239 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	240 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	241 if self.message:
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	242 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	243 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	244 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	245 del self.comments[i]
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	246 self.message = self.message[2:]
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	247 break
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	248 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	249 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	250 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	251 ci += 1
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	252 del self.comments[ci]
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	253
8778 c5f36402daad use new style classes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8761 diff changeset	254 class queue(object):
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	255 def __init__(self, ui, path, patchdir=None):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	256 self.basepath = path
11229 1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	257 try:
11270 457813cb3024 mq: fix naming issues for qqueue directories Henrik Stuart <hg@hstuart.dk> parents: 11234 diff changeset	258 fh = open(os.path.join(path, 'patches.queue'))
457813cb3024 mq: fix naming issues for qqueue directories Henrik Stuart <hg@hstuart.dk> parents: 11234 diff changeset	259 cur = fh.read().rstrip()
13400 14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 13373 diff changeset	260 fh.close()
11270 457813cb3024 mq: fix naming issues for qqueue directories Henrik Stuart <hg@hstuart.dk> parents: 11234 diff changeset	261 if not cur:
457813cb3024 mq: fix naming issues for qqueue directories Henrik Stuart <hg@hstuart.dk> parents: 11234 diff changeset	262 curpath = os.path.join(path, 'patches')
457813cb3024 mq: fix naming issues for qqueue directories Henrik Stuart <hg@hstuart.dk> parents: 11234 diff changeset	263 else:
457813cb3024 mq: fix naming issues for qqueue directories Henrik Stuart <hg@hstuart.dk> parents: 11234 diff changeset	264 curpath = os.path.join(path, 'patches-' + cur)
11229 1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	265 except IOError:
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	266 curpath = os.path.join(path, 'patches')
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	267 self.path = patchdir or curpath
13970 d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13878 diff changeset	268 self.opener = scmutil.opener(self.path)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	269 self.ui = ui
14592 fc94add69d9f mq: rename applied_dirty to applieddirty Adrian Buehlmann <adrian@cadifra.com> parents: 14591 diff changeset	270 self.applieddirty = 0
14593 599a72895c0d mq: rename series_dirty to seriesdirty Adrian Buehlmann <adrian@cadifra.com> parents: 14592 diff changeset	271 self.seriesdirty = 0
11462 1b82a26635d7 mq: qimport cleanup on fail (issue2214) Vishakh H <vsh426@gmail.com> parents: 11439 diff changeset	272 self.added = []
14587 5d3bb4460256 mq: rename series_path to seriespath Adrian Buehlmann <adrian@cadifra.com> parents: 14586 diff changeset	273 self.seriespath = "series"
14588 bd3d75a03f80 mq: rename status_path to statuspath Adrian Buehlmann <adrian@cadifra.com> parents: 14587 diff changeset	274 self.statuspath = "status"
14589 7d59ee9e711b mq: rename guards_path to guardspath Adrian Buehlmann <adrian@cadifra.com> parents: 14588 diff changeset	275 self.guardspath = "guards"
14590 dbb80f03d4ae mq: rename active_guards to activeguards Adrian Buehlmann <adrian@cadifra.com> parents: 14589 diff changeset	276 self.activeguards = None
14591 b49099712d30 mq: rename guards_dirty to guardsdirty Adrian Buehlmann <adrian@cadifra.com> parents: 14590 diff changeset	277 self.guardsdirty = False
10190 9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	278 # Handle mq.git as a bool with extended values
9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	279 try:
9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	280 gitmode = ui.configbool('mq', 'git', None)
9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	281 if gitmode is None:
9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	282 raise error.ConfigError()
9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	283 self.gitmode = gitmode and 'yes' or 'no'
9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	284 except error.ConfigError:
9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	285 self.gitmode = ui.config('mq', 'git', 'auto').lower()
10397 8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	286 self.plainmode = ui.configbool('mq', 'plain', False)
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	287
8524 21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	288 @util.propertycache
21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	289 def applied(self):
14588 bd3d75a03f80 mq: rename status_path to statuspath Adrian Buehlmann <adrian@cadifra.com> parents: 14587 diff changeset	290 if os.path.exists(self.join(self.statuspath)):
13507 375ba42f3cda mq: gracefully handle malformated status file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 13409 diff changeset	291 def parselines(lines):
375ba42f3cda mq: gracefully handle malformated status file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 13409 diff changeset	292 for l in lines:
375ba42f3cda mq: gracefully handle malformated status file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 13409 diff changeset	293 entry = l.split(':', 1)
375ba42f3cda mq: gracefully handle malformated status file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 13409 diff changeset	294 if len(entry) > 1:
375ba42f3cda mq: gracefully handle malformated status file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 13409 diff changeset	295 n, name = entry
375ba42f3cda mq: gracefully handle malformated status file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 13409 diff changeset	296 yield statusentry(bin(n), name)
375ba42f3cda mq: gracefully handle malformated status file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 13409 diff changeset	297 elif l.strip():
15087 adad8d68fb1f mq: split up overly long line Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 15085 diff changeset	298 msg = _('malformated mq status line: %s\n') % entry
adad8d68fb1f mq: split up overly long line Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 15085 diff changeset	299 self.ui.warn(msg)
13507 375ba42f3cda mq: gracefully handle malformated status file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 13409 diff changeset	300 # else we ignore empty lines
14588 bd3d75a03f80 mq: rename status_path to statuspath Adrian Buehlmann <adrian@cadifra.com> parents: 14587 diff changeset	301 lines = self.opener.read(self.statuspath).splitlines()
13507 375ba42f3cda mq: gracefully handle malformated status file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 13409 diff changeset	302 return list(parselines(lines))
8524 21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	303 return []
21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	304
21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	305 @util.propertycache
14572 8ff2957c1d82 mq: rename full_series to fullseries Adrian Buehlmann <adrian@cadifra.com> parents: 14564 diff changeset	306 def fullseries(self):
14587 5d3bb4460256 mq: rename series_path to seriespath Adrian Buehlmann <adrian@cadifra.com> parents: 14586 diff changeset	307 if os.path.exists(self.join(self.seriespath)):
5d3bb4460256 mq: rename series_path to seriespath Adrian Buehlmann <adrian@cadifra.com> parents: 14586 diff changeset	308 return self.opener.read(self.seriespath).splitlines()
8524 21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	309 return []
21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	310
21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	311 @util.propertycache
21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	312 def series(self):
14575 845c864200d0 mq: rename parse_series to parseseries Adrian Buehlmann <adrian@cadifra.com> parents: 14574 diff changeset	313 self.parseseries()
8524 21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	314 return self.series
21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	315
21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	316 @util.propertycache
14573 d590ff1f22b2 mq: rename series_guards to seriesguards Adrian Buehlmann <adrian@cadifra.com> parents: 14572 diff changeset	317 def seriesguards(self):
14575 845c864200d0 mq: rename parse_series to parseseries Adrian Buehlmann <adrian@cadifra.com> parents: 14574 diff changeset	318 self.parseseries()
14573 d590ff1f22b2 mq: rename series_guards to seriesguards Adrian Buehlmann <adrian@cadifra.com> parents: 14572 diff changeset	319 return self.seriesguards
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	320
8525 b169ba60eebe mq: new method invalidate Simon Heimberg <simohe@besonet.ch> parents: 8524 diff changeset	321 def invalidate(self):
14573 d590ff1f22b2 mq: rename series_guards to seriesguards Adrian Buehlmann <adrian@cadifra.com> parents: 14572 diff changeset	322 for a in 'applied fullseries series seriesguards'.split():
8525 b169ba60eebe mq: new method invalidate Simon Heimberg <simohe@besonet.ch> parents: 8524 diff changeset	323 if a in self.__dict__:
b169ba60eebe mq: new method invalidate Simon Heimberg <simohe@besonet.ch> parents: 8524 diff changeset	324 delattr(self, a)
14592 fc94add69d9f mq: rename applied_dirty to applieddirty Adrian Buehlmann <adrian@cadifra.com> parents: 14591 diff changeset	325 self.applieddirty = 0
14593 599a72895c0d mq: rename series_dirty to seriesdirty Adrian Buehlmann <adrian@cadifra.com> parents: 14592 diff changeset	326 self.seriesdirty = 0
14591 b49099712d30 mq: rename guards_dirty to guardsdirty Adrian Buehlmann <adrian@cadifra.com> parents: 14590 diff changeset	327 self.guardsdirty = False
14590 dbb80f03d4ae mq: rename active_guards to activeguards Adrian Buehlmann <adrian@cadifra.com> parents: 14589 diff changeset	328 self.activeguards = None
8525 b169ba60eebe mq: new method invalidate Simon Heimberg <simohe@besonet.ch> parents: 8524 diff changeset	329
10184 8a47347d298b mq: stop caching and sharing diff options Patrick Mezard <pmezard@gmail.com> parents: 10114 diff changeset	330 def diffopts(self, opts={}, patchfn=None):
14241 45f7aa35f2fd mq: don't hide the patch module Idan Kamara <idankk86@gmail.com> parents: 14239 diff changeset	331 diffopts = patchmod.diffopts(self.ui, opts)
10190 9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	332 if self.gitmode == 'auto':
9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	333 diffopts.upgrade = True
9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	334 elif self.gitmode == 'keep':
9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	335 pass
9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	336 elif self.gitmode in ('yes', 'no'):
9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	337 diffopts.git = self.gitmode == 'yes'
9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	338 else:
9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	339 raise util.Abort(_('mq.git option can be auto/keep/yes/no'
9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	340 ' got %s') % self.gitmode)
10184 8a47347d298b mq: stop caching and sharing diff options Patrick Mezard <pmezard@gmail.com> parents: 10114 diff changeset	341 if patchfn:
10185 7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 10184 diff changeset	342 diffopts = self.patchopts(diffopts, patchfn)
7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 10184 diff changeset	343 return diffopts
7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 10184 diff changeset	344
10186 296a0b14a686 mq: preserve --git flag when folding patches Patrick Mezard <pmezard@gmail.com> parents: 10185 diff changeset	345 def patchopts(self, diffopts, *patches):
10185 7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 10184 diff changeset	346 """Return a copy of input diff options with git set to true if
10190 9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	347 referenced patch is a git patch and should be preserved as such.
10185 7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 10184 diff changeset	348 """
7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 10184 diff changeset	349 diffopts = diffopts.copy()
10190 9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	350 if not diffopts.git and self.gitmode == 'keep':
9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	351 for patchfn in patches:
9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	352 patchf = self.opener(patchfn, 'r')
9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	353 # if the patch was a git patch, refresh it as a git patch
9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	354 for line in patchf:
9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	355 if line.startswith('diff --git'):
9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	356 diffopts.git = True
9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	357 break
9c2c94934f0d mq: upgrade to git patch when necessary (issue767) Patrick Mezard <pmezard@gmail.com> parents: 10188 diff changeset	358 patchf.close()
10184 8a47347d298b mq: stop caching and sharing diff options Patrick Mezard <pmezard@gmail.com> parents: 10114 diff changeset	359 return diffopts
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	360
2819 766ecdc83e43 mq: add join method Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2818 diff changeset	361 def join(self, *p):
766ecdc83e43 mq: add join method Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2818 diff changeset	362 return os.path.join(self.path, *p)
766ecdc83e43 mq: add join method Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2818 diff changeset	363
14574 12fba7bcb4f1 mq: rename find_series to findseries Adrian Buehlmann <adrian@cadifra.com> parents: 14573 diff changeset	364 def findseries(self, patch):
10685 10248fc845db mq: find_series() simplify and don't use regexps Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10684 diff changeset	365 def matchpatch(l):
10248fc845db mq: find_series() simplify and don't use regexps Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10684 diff changeset	366 l = l.split('#', 1)[0]
10248fc845db mq: find_series() simplify and don't use regexps Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10684 diff changeset	367 return l.strip() == patch
14572 8ff2957c1d82 mq: rename full_series to fullseries Adrian Buehlmann <adrian@cadifra.com> parents: 14564 diff changeset	368 for index, l in enumerate(self.fullseries):
10685 10248fc845db mq: find_series() simplify and don't use regexps Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10684 diff changeset	369 if matchpatch(l):
10248fc845db mq: find_series() simplify and don't use regexps Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10684 diff changeset	370 return index
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	371 return None
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	372
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	373 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	374
14575 845c864200d0 mq: rename parse_series to parseseries Adrian Buehlmann <adrian@cadifra.com> parents: 14574 diff changeset	375 def parseseries(self):
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	376 self.series = []
14573 d590ff1f22b2 mq: rename series_guards to seriesguards Adrian Buehlmann <adrian@cadifra.com> parents: 14572 diff changeset	377 self.seriesguards = []
14572 8ff2957c1d82 mq: rename full_series to fullseries Adrian Buehlmann <adrian@cadifra.com> parents: 14564 diff changeset	378 for l in self.fullseries:
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	379 h = l.find('#')
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	380 if h == -1:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	381 patch = l
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	382 comment = ''
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	383 elif h == 0:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	384 continue
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	385 else:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	386 patch = l[:h]
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	387 comment = l[h:]
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	388 patch = patch.strip()
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	389 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	390 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	391 raise util.Abort(_('%s appears more than once in %s') %
14587 5d3bb4460256 mq: rename series_path to seriespath Adrian Buehlmann <adrian@cadifra.com> parents: 14586 diff changeset	392 (patch, self.join(self.seriespath)))
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	393 self.series.append(patch)
14573 d590ff1f22b2 mq: rename series_guards to seriesguards Adrian Buehlmann <adrian@cadifra.com> parents: 14572 diff changeset	394 self.seriesguards.append(self.guard_re.findall(comment))
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	395
14576 668ea374f46e mq: rename check_guard to checkguard Adrian Buehlmann <adrian@cadifra.com> parents: 14575 diff changeset	396 def checkguard(self, guard):
6607 75b506f0e571 mq: make qselect fail properly on an empty guard Patrick Mezard <pmezard@gmail.com> parents: 6606 diff changeset	397 if not guard:
75b506f0e571 mq: make qselect fail properly on an empty guard Patrick Mezard <pmezard@gmail.com> parents: 6606 diff changeset	398 return _('guard cannot be an empty string')
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	399 bad_chars = '# \t\r\n\f'
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	400 first = guard[0]
8288 9de088320e9a mq: simpler check of first character of guard name Simon Heimberg <simohe@besonet.ch> parents: 8225 diff changeset	401 if first in '-+':
9de088320e9a mq: simpler check of first character of guard name Simon Heimberg <simohe@besonet.ch> parents: 8225 diff changeset	402 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	403 (guard, first))
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	404 for c in bad_chars:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	405 if c in guard:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	406 return _('invalid character in guard %r: %r') % (guard, c)
3223 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 3186 diff changeset	407
14578 28a2646f3b81 mq: rename set_active to setactive Adrian Buehlmann <adrian@cadifra.com> parents: 14577 diff changeset	408 def setactive(self, guards):
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	409 for guard in guards:
14576 668ea374f46e mq: rename check_guard to checkguard Adrian Buehlmann <adrian@cadifra.com> parents: 14575 diff changeset	410 bad = self.checkguard(guard)
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	411 if bad:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	412 raise util.Abort(bad)
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8188 diff changeset	413 guards = sorted(set(guards))
9467 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9440 diff changeset	414 self.ui.debug('active guards: %s\n' % ' '.join(guards))
14590 dbb80f03d4ae mq: rename active_guards to activeguards Adrian Buehlmann <adrian@cadifra.com> parents: 14589 diff changeset	415 self.activeguards = guards
14591 b49099712d30 mq: rename guards_dirty to guardsdirty Adrian Buehlmann <adrian@cadifra.com> parents: 14590 diff changeset	416 self.guardsdirty = True
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	417
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	418 def active(self):
14590 dbb80f03d4ae mq: rename active_guards to activeguards Adrian Buehlmann <adrian@cadifra.com> parents: 14589 diff changeset	419 if self.activeguards is None:
dbb80f03d4ae mq: rename active_guards to activeguards Adrian Buehlmann <adrian@cadifra.com> parents: 14589 diff changeset	420 self.activeguards = []
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	421 try:
14589 7d59ee9e711b mq: rename guards_path to guardspath Adrian Buehlmann <adrian@cadifra.com> parents: 14588 diff changeset	422 guards = self.opener.read(self.guardspath).split()
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	423 except IOError, err:
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10276 diff changeset	424 if err.errno != errno.ENOENT:
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10276 diff changeset	425 raise
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	426 guards = []
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	427 for i, guard in enumerate(guards):
14576 668ea374f46e mq: rename check_guard to checkguard Adrian Buehlmann <adrian@cadifra.com> parents: 14575 diff changeset	428 bad = self.checkguard(guard)
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	429 if bad:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	430 self.ui.warn('%s:%d: %s\n' %
14589 7d59ee9e711b mq: rename guards_path to guardspath Adrian Buehlmann <adrian@cadifra.com> parents: 14588 diff changeset	431 (self.join(self.guardspath), i + 1, bad))
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	432 else:
14590 dbb80f03d4ae mq: rename active_guards to activeguards Adrian Buehlmann <adrian@cadifra.com> parents: 14589 diff changeset	433 self.activeguards.append(guard)
dbb80f03d4ae mq: rename active_guards to activeguards Adrian Buehlmann <adrian@cadifra.com> parents: 14589 diff changeset	434 return self.activeguards
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	435
14577 76357276662e mq: rename set_guards to setguards Adrian Buehlmann <adrian@cadifra.com> parents: 14576 diff changeset	436 def setguards(self, idx, guards):
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	437 for g in guards:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	438 if len(g) < 2:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	439 raise util.Abort(_('guard %r too short') % g)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	440 if g[0] not in '-+':
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	441 raise util.Abort(_('guard %r starts with invalid char') % g)
14576 668ea374f46e mq: rename check_guard to checkguard Adrian Buehlmann <adrian@cadifra.com> parents: 14575 diff changeset	442 bad = self.checkguard(g[1:])
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	443 if bad:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	444 raise util.Abort(bad)
14572 8ff2957c1d82 mq: rename full_series to fullseries Adrian Buehlmann <adrian@cadifra.com> parents: 14564 diff changeset	445 drop = self.guard_re.sub('', self.fullseries[idx])
8ff2957c1d82 mq: rename full_series to fullseries Adrian Buehlmann <adrian@cadifra.com> parents: 14564 diff changeset	446 self.fullseries[idx] = drop + ''.join([' #' + g for g in guards])
14575 845c864200d0 mq: rename parse_series to parseseries Adrian Buehlmann <adrian@cadifra.com> parents: 14574 diff changeset	447 self.parseseries()
14593 599a72895c0d mq: rename series_dirty to seriesdirty Adrian Buehlmann <adrian@cadifra.com> parents: 14592 diff changeset	448 self.seriesdirty = True
3223 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 3186 diff changeset	449
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	450 def pushable(self, idx):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	451 if isinstance(idx, str):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	452 idx = self.series.index(idx)
14573 d590ff1f22b2 mq: rename series_guards to seriesguards Adrian Buehlmann <adrian@cadifra.com> parents: 14572 diff changeset	453 patchguards = self.seriesguards[idx]
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	454 if not patchguards:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	455 return True, None
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	456 guards = self.active()
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	457 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	458 if exactneg:
14464 00256f689f9c mq: print "'foo' 'bar'", not "['foo', 'bar']" when showing guards Martin Geisler <mg@aragost.com> parents: 14448 diff changeset	459 return False, repr(exactneg[0])
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	460 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	461 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	462 if pos:
2850 851b07ec450c mq: apply patch is any posative guard matches Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2848 diff changeset	463 if exactpos:
14464 00256f689f9c mq: print "'foo' 'bar'", not "['foo', 'bar']" when showing guards Martin Geisler <mg@aragost.com> parents: 14448 diff changeset	464 return True, repr(exactpos[0])
00256f689f9c mq: print "'foo' 'bar'", not "['foo', 'bar']" when showing guards Martin Geisler <mg@aragost.com> parents: 14448 diff changeset	465 return False, ' '.join(map(repr, pos))
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	466 return True, ''
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	467
14579 f7b25764d974 mq: rename explain_pushable to explainpushable Adrian Buehlmann <adrian@cadifra.com> parents: 14578 diff changeset	468 def explainpushable(self, idx, all_patches=False):
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	469 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	470 if all_patches or self.ui.verbose:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	471 if isinstance(idx, str):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	472 idx = self.series.index(idx)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	473 pushable, why = self.pushable(idx)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	474 if all_patches and pushable:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	475 if why is None:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	476 write(_('allowing %s - no guards in effect\n') %
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	477 self.series[idx])
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	478 else:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	479 if not why:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	480 write(_('allowing %s - no matching negative guards\n') %
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	481 self.series[idx])
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	482 else:
14464 00256f689f9c mq: print "'foo' 'bar'", not "['foo', 'bar']" when showing guards Martin Geisler <mg@aragost.com> parents: 14448 diff changeset	483 write(_('allowing %s - guarded by %s\n') %
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	484 (self.series[idx], why))
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	485 if not pushable:
2829 05316bb57d01 mq: make guards more strict, add tests Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2828 diff changeset	486 if why:
14464 00256f689f9c mq: print "'foo' 'bar'", not "['foo', 'bar']" when showing guards Martin Geisler <mg@aragost.com> parents: 14448 diff changeset	487 write(_('skipping %s - guarded by %s\n') %
3870 22d18051f9e5 mq: fix explain_pushable for negative guards Brendan Cully <brendan@kublai.com> parents: 3857 diff changeset	488 (self.series[idx], why))
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	489 else:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	490 write(_('skipping %s - no matching guards\n') %
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	491 self.series[idx])
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	492
14580 92101ea35015 mq: rename save_dirty to savedirty Adrian Buehlmann <adrian@cadifra.com> parents: 14579 diff changeset	493 def savedirty(self):
14594 3752b5e1f4c4 mq: rename write_list to writelist Adrian Buehlmann <adrian@cadifra.com> parents: 14593 diff changeset	494 def writelist(items, path):
2772 4720e79486d3 mq: simplify save_dirty Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2771 diff changeset	495 fp = self.opener(path, 'w')
4720e79486d3 mq: simplify save_dirty Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2771 diff changeset	496 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	497 fp.write("%s\n" % i)
2772 4720e79486d3 mq: simplify save_dirty Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2771 diff changeset	498 fp.close()
14592 fc94add69d9f mq: rename applied_dirty to applieddirty Adrian Buehlmann <adrian@cadifra.com> parents: 14591 diff changeset	499 if self.applieddirty:
14594 3752b5e1f4c4 mq: rename write_list to writelist Adrian Buehlmann <adrian@cadifra.com> parents: 14593 diff changeset	500 writelist(map(str, self.applied), self.statuspath)
14593 599a72895c0d mq: rename series_dirty to seriesdirty Adrian Buehlmann <adrian@cadifra.com> parents: 14592 diff changeset	501 if self.seriesdirty:
14594 3752b5e1f4c4 mq: rename write_list to writelist Adrian Buehlmann <adrian@cadifra.com> parents: 14593 diff changeset	502 writelist(self.fullseries, self.seriespath)
14591 b49099712d30 mq: rename guards_dirty to guardsdirty Adrian Buehlmann <adrian@cadifra.com> parents: 14590 diff changeset	503 if self.guardsdirty:
14594 3752b5e1f4c4 mq: rename write_list to writelist Adrian Buehlmann <adrian@cadifra.com> parents: 14593 diff changeset	504 writelist(self.activeguards, self.guardspath)
11546 134eb1c97e94 mq: qrepo.add(mq.added) inside save_dirty inside of doing it manually Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11530 diff changeset	505 if self.added:
134eb1c97e94 mq: qrepo.add(mq.added) inside save_dirty inside of doing it manually Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11530 diff changeset	506 qrepo = self.qrepo()
134eb1c97e94 mq: qrepo.add(mq.added) inside save_dirty inside of doing it manually Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11530 diff changeset	507 if qrepo:
12658 97d7ee445e98 mq: silence spurious output. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 12655 diff changeset	508 qrepo[None].add(f for f in self.added if f not in qrepo[None])
11546 134eb1c97e94 mq: qrepo.add(mq.added) inside save_dirty inside of doing it manually Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11530 diff changeset	509 self.added = []
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	510
4207 b7e66db28571 Remove undo log after mq operations that rollback would break Brendan Cully <brendan@kublai.com> parents: 4206 diff changeset	511 def removeundo(self, repo):
b7e66db28571 Remove undo log after mq operations that rollback would break Brendan Cully <brendan@kublai.com> parents: 4206 diff changeset	512 undo = repo.sjoin('undo')
b7e66db28571 Remove undo log after mq operations that rollback would break Brendan Cully <brendan@kublai.com> parents: 4206 diff changeset	513 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	514 return
b7e66db28571 Remove undo log after mq operations that rollback would break Brendan Cully <brendan@kublai.com> parents: 4206 diff changeset	515 try:
b7e66db28571 Remove undo log after mq operations that rollback would break Brendan Cully <brendan@kublai.com> parents: 4206 diff changeset	516 os.unlink(undo)
b7e66db28571 Remove undo log after mq operations that rollback would break Brendan Cully <brendan@kublai.com> parents: 4206 diff changeset	517 except OSError, inst:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	518 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	519
10184 8a47347d298b mq: stop caching and sharing diff options Patrick Mezard <pmezard@gmail.com> parents: 10114 diff changeset	520 def printdiff(self, repo, diffopts, 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	521 fp=None, changes=None, opts={}):
9640 9e76232fbfbe diff: add --stat for diffstat output Brodie Rao <me+hg@dackz.net> parents: 9599 diff changeset	522 stat = opts.get('stat')
14671 35c2cc322ba8 scmutil: switch match users to supplying contexts Matt Mackall <mpm@selenic.com> parents: 14636 diff changeset	523 m = scmutil.match(repo[node1], files, opts)
11050 5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11049 diff changeset	524 cmdutil.diffordiffstat(self.ui, repo, diffopts, node1, node2, m,
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11049 diff changeset	525 changes, stat, fp)
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	526
10184 8a47347d298b mq: stop caching and sharing diff options Patrick Mezard <pmezard@gmail.com> parents: 10114 diff changeset	527 def mergeone(self, repo, mergeq, head, patch, rev, diffopts):
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	528 # first try just applying the patch
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10276 diff changeset	529 (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	530 strict=True, merge=rev)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	531
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	532 if err == 0:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	533 return (err, n)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	534
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	535 if n is None:
2712 8e5cd8d11b51 mq: move many error messages to util.Abort Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2711 diff changeset	536 raise util.Abort(_("apply failed for patch %s") % patch)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	537
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	538 self.ui.warn(_("patch didn't work out, merging %s\n") % patch)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	539
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	540 # 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	541 hg.clean(repo, head)
11789 e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11767 diff changeset	542 self.strip(repo, [n], update=False, backup='strip')
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	543
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6668 diff changeset	544 ctx = repo[rev]
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	545 ret = hg.merge(repo, rev)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	546 if ret:
2712 8e5cd8d11b51 mq: move many error messages to util.Abort Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2711 diff changeset	547 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	548 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	549 if n is None:
2712 8e5cd8d11b51 mq: move many error messages to util.Abort Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2711 diff changeset	550 raise util.Abort(_("repo commit failed"))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	551 try:
10397 8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	552 ph = patchheader(mergeq.join(patch), self.plainmode)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	553 except:
2712 8e5cd8d11b51 mq: move many error messages to util.Abort Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2711 diff changeset	554 raise util.Abort(_("unable to read %s") % patch)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	555
10185 7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 10184 diff changeset	556 diffopts = self.patchopts(diffopts, patch)
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	557 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	558 comments = str(ph)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	559 if comments:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	560 patchf.write(comments)
10184 8a47347d298b mq: stop caching and sharing diff options Patrick Mezard <pmezard@gmail.com> parents: 10114 diff changeset	561 self.printdiff(repo, diffopts, head, n, fp=patchf)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	562 patchf.close()
4207 b7e66db28571 Remove undo log after mq operations that rollback would break Brendan Cully <brendan@kublai.com> parents: 4206 diff changeset	563 self.removeundo(repo)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	564 return (0, n)
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	565
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	566 def qparents(self, repo, rev=None):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	567 if rev is None:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	568 (p1, p2) = repo.dirstate.parents()
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	569 if p2 == nullid:
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	570 return p1
10686 0c68c2c36ed8 mq: don't use len(list) unless necessary Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10685 diff changeset	571 if not self.applied:
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	572 return None
10678 da2a0c9c895d mq: avoid many hex/bin conversions, keep the binary node when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10663 diff changeset	573 return self.applied[-1].node
da2a0c9c895d mq: avoid many hex/bin conversions, keep the binary node when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10663 diff changeset	574 p1, p2 = repo.changelog.parents(rev)
10680 45eb9b5dacf6 mq: simplify qparents calculation Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10679 diff changeset	575 if p2 != nullid and p2 in [x.node for x in self.applied]:
45eb9b5dacf6 mq: simplify qparents calculation Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10679 diff changeset	576 return p2
10678 da2a0c9c895d mq: avoid many hex/bin conversions, keep the binary node when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10663 diff changeset	577 return p1
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	578
10184 8a47347d298b mq: stop caching and sharing diff options Patrick Mezard <pmezard@gmail.com> parents: 10114 diff changeset	579 def mergepatch(self, repo, mergeq, series, diffopts):
10686 0c68c2c36ed8 mq: don't use len(list) unless necessary Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10685 diff changeset	580 if not self.applied:
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	581 # each of the patches merged in will have two parents. This
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	582 # can confuse the qrefresh, qdiff, and strip code because it
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	583 # needs to know which parent is actually in the patch queue.
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	584 # so, we insert a merge marker with only one parent. This way
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	585 # the first patch in the queue is never a merge patch
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	586 #
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	587 pname = ".hg.patches.merge.marker"
8706 25e9c71b89de commit: drop the now-unused files parameter Matt Mackall <mpm@selenic.com> parents: 8700 diff changeset	588 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	589 self.removeundo(repo)
10678 da2a0c9c895d mq: avoid many hex/bin conversions, keep the binary node when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10663 diff changeset	590 self.applied.append(statusentry(n, pname))
14592 fc94add69d9f mq: rename applied_dirty to applieddirty Adrian Buehlmann <adrian@cadifra.com> parents: 14591 diff changeset	591 self.applieddirty = 1
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	592
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	593 head = self.qparents(repo)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	594
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	595 for patch in series:
2696 be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	596 patch = mergeq.lookup(patch, strict=True)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	597 if not patch:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	598 self.ui.warn(_("patch %s does not exist\n") % patch)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	599 return (1, None)
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	600 pushable, reason = self.pushable(patch)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	601 if not pushable:
14579 f7b25764d974 mq: rename explain_pushable to explainpushable Adrian Buehlmann <adrian@cadifra.com> parents: 14578 diff changeset	602 self.explainpushable(patch, all_patches=True)
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	603 continue
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	604 info = mergeq.isapplied(patch)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	605 if not info:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	606 self.ui.warn(_("patch %s is not applied\n") % patch)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	607 return (1, None)
10678 da2a0c9c895d mq: avoid many hex/bin conversions, keep the binary node when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10663 diff changeset	608 rev = info[1]
10184 8a47347d298b mq: stop caching and sharing diff options Patrick Mezard <pmezard@gmail.com> parents: 10114 diff changeset	609 err, head = self.mergeone(repo, mergeq, head, patch, rev, diffopts)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	610 if head:
10678 da2a0c9c895d mq: avoid many hex/bin conversions, keep the binary node when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10663 diff changeset	611 self.applied.append(statusentry(head, patch))
14592 fc94add69d9f mq: rename applied_dirty to applieddirty Adrian Buehlmann <adrian@cadifra.com> parents: 14591 diff changeset	612 self.applieddirty = 1
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	613 if err:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	614 return (err, head)
14580 92101ea35015 mq: rename save_dirty to savedirty Adrian Buehlmann <adrian@cadifra.com> parents: 14579 diff changeset	615 self.savedirty()
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	616 return (0, head)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	617
2748 752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	618 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	619 '''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	620 patchfile: name of patch file'''
14564 65f4512e40e4 patch: turn patch() touched files dict into a set Patrick Mezard <pmezard@gmail.com> parents: 14553 diff changeset	621 files = set()
2748 752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	622 try:
14260 00a881581400 patch: make patch()/internalpatch() always update the dirstate Patrick Mezard <pmezard@gmail.com> parents: 14259 diff changeset	623 fuzz = patchmod.patch(self.ui, repo, patchfile, strip=1,
14382 2d16f15da7bd patch: remove patch.patch() cwd argument Patrick Mezard <pmezard@gmail.com> parents: 14351 diff changeset	624 files=files, eolmode=None)
14260 00a881581400 patch: make patch()/internalpatch() always update the dirstate Patrick Mezard <pmezard@gmail.com> parents: 14259 diff changeset	625 return (True, list(files), fuzz)
2919 b70740aefa4d Unify mq and hg patch invocation. Brendan Cully <brendan@kublai.com> parents: 2905 diff changeset	626 except Exception, inst:
b70740aefa4d Unify mq and hg patch invocation. Brendan Cully <brendan@kublai.com> parents: 2905 diff changeset	627 self.ui.note(str(inst) + '\n')
b70740aefa4d Unify mq and hg patch invocation. Brendan Cully <brendan@kublai.com> parents: 2905 diff changeset	628 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	629 self.ui.warn(_("patch failed, unable to continue (try -v)\n"))
15085 110d6804bfc6 mq: don't suppress patch tracebacks when applying patches Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 15057 diff changeset	630 self.ui.traceback()
14260 00a881581400 patch: make patch()/internalpatch() always update the dirstate Patrick Mezard <pmezard@gmail.com> parents: 14259 diff changeset	631 return (False, list(files), False)
2796 4c39568007f9 mq: codingstyle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2795 diff changeset	632
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	633 def apply(self, repo, series, list=False, update_status=True,
10661 c4859aad1980 mq: all_files can be a set, remove dangerous default values Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10611 diff changeset	634 strict=False, patchdir=None, merge=None, all_files=None):
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	635 wlock = lock = tr = None
4418 0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4406 diff changeset	636 try:
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	637 wlock = repo.wlock()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	638 lock = repo.lock()
10881 a685011ed38e localrepo: add desc parameter to transaction Steve Borho <steve@borho.org> parents: 10873 diff changeset	639 tr = repo.transaction("qpush")
4418 0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4406 diff changeset	640 try:
4970 30d4d8985dd8 transactions: avoid late tear-down (issue641) Matt Mackall <mpm@selenic.com> parents: 4917 diff changeset	641 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	642 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	643 tr.close()
14580 92101ea35015 mq: rename save_dirty to savedirty Adrian Buehlmann <adrian@cadifra.com> parents: 14579 diff changeset	644 self.savedirty()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	645 return ret
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	646 except:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	647 try:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	648 tr.abort()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	649 finally:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	650 repo.invalidate()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	651 repo.dirstate.invalidate()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	652 raise
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	653 finally:
11230 5116a077c3da make transactions work on non-refcounted python implementations Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 11229 diff changeset	654 release(tr, 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	655 self.removeundo(repo)
4418 0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4406 diff changeset	656
4970 30d4d8985dd8 transactions: avoid late tear-down (issue641) Matt Mackall <mpm@selenic.com> parents: 4917 diff changeset	657 def _apply(self, repo, series, list=False, update_status=True,
10661 c4859aad1980 mq: all_files can be a set, remove dangerous default values Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10611 diff changeset	658 strict=False, patchdir=None, merge=None, all_files=None):
8875 801cacf46e62 mq: fix error message for qpush inexistent-patch (issue1702) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8833 diff changeset	659 '''returns (error, hash)
801cacf46e62 mq: fix error message for qpush inexistent-patch (issue1702) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8833 diff changeset	660 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	661 # TODO unify with commands.py
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	662 if not patchdir:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	663 patchdir = self.path
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	664 err = 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	665 n = None
2934 2f190e998eb3 Teach mq about git patches Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	666 for patchname in series:
2f190e998eb3 Teach mq about git patches Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	667 pushable, reason = self.pushable(patchname)
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	668 if not pushable:
14579 f7b25764d974 mq: rename explain_pushable to explainpushable Adrian Buehlmann <adrian@cadifra.com> parents: 14578 diff changeset	669 self.explainpushable(patchname, all_patches=True)
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	670 continue
9111 ac3f1e6696eb mq: use ui.status when pushing and popping patches Martin Geisler <mg@lazybytes.net> parents: 9110 diff changeset	671 self.ui.status(_("applying %s\n") % patchname)
2934 2f190e998eb3 Teach mq about git patches Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	672 pf = os.path.join(patchdir, patchname)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	673
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	674 try:
10397 8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	675 ph = patchheader(self.join(patchname), self.plainmode)
14239 967be4bb42a7 mq: loosen except clause when reading patch headers Idan Kamara <idankk86@gmail.com> parents: 14210 diff changeset	676 except IOError:
8875 801cacf46e62 mq: fix error message for qpush inexistent-patch (issue1702) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8833 diff changeset	677 self.ui.warn(_("unable to read %s\n") % patchname)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	678 err = 1
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	679 break
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	680
7399 e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	681 message = ph.message
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	682 if not message:
12849 d966eb464888 mq: mark strings that should not be translated Martin Geisler <mg@lazybytes.net> parents: 12848 diff changeset	683 # The commit message should not be translated
10274 04207f5e7344 mq: Do not translate import message that are appended to commits. David Soria Parra <dsp@php.net> parents: 10263 diff changeset	684 message = "imported patch %s\n" % patchname
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	685 else:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	686 if list:
12849 d966eb464888 mq: mark strings that should not be translated Martin Geisler <mg@lazybytes.net> parents: 12848 diff changeset	687 # The commit message should not be translated
10274 04207f5e7344 mq: Do not translate import message that are appended to commits. David Soria Parra <dsp@php.net> parents: 10263 diff changeset	688 message.append("\nimported patch %s" % patchname)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	689 message = '\n'.join(message)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	690
7782 140429276b63 mq: handle empty patches more gracefully (issue1501) Matt Mackall <mpm@selenic.com> parents: 7772 diff changeset	691 if ph.haspatch:
140429276b63 mq: handle empty patches more gracefully (issue1501) Matt Mackall <mpm@selenic.com> parents: 7772 diff changeset	692 (patcherr, files, fuzz) = self.patch(repo, pf)
10661 c4859aad1980 mq: all_files can be a set, remove dangerous default values Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10611 diff changeset	693 if all_files is not None:
c4859aad1980 mq: all_files can be a set, remove dangerous default values Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10611 diff changeset	694 all_files.update(files)
7782 140429276b63 mq: handle empty patches more gracefully (issue1501) Matt Mackall <mpm@selenic.com> parents: 7772 diff changeset	695 patcherr = not patcherr
140429276b63 mq: handle empty patches more gracefully (issue1501) Matt Mackall <mpm@selenic.com> parents: 7772 diff changeset	696 else:
140429276b63 mq: handle empty patches more gracefully (issue1501) Matt Mackall <mpm@selenic.com> parents: 7772 diff changeset	697 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	698 patcherr, files, fuzz = 0, [], 0
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	699
2934 2f190e998eb3 Teach mq about git patches Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	700 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	701 # 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	702 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	703 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	704 for f in files:
12344 b6173aee4a47 Use lexists() instead of exists() where appropriate Patrick Mezard <pmezard@gmail.com> parents: 12067 diff changeset	705 if os.path.lexists(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	706 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	707 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	708 removed.append(f)
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4890 diff changeset	709 for f in removed:
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4890 diff changeset	710 repo.dirstate.remove(f)
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4890 diff changeset	711 for f in merged:
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4890 diff changeset	712 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	713 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	714 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	715
14322 a90131b85fd8 scmutil: drop aliases in cmdutil for match functions Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	716 match = scmutil.matchfiles(repo, files or [])
8706 25e9c71b89de commit: drop the now-unused files parameter Matt Mackall <mpm@selenic.com> parents: 8700 diff changeset	717 n = repo.commit(message, ph.user, ph.date, match=match, force=True)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	718
8527 f9a80054dd3c use 'x is None' instead of 'x == None' Martin Geisler <mg@lazybytes.net> parents: 8525 diff changeset	719 if n is None:
12850 62b334b0dfdf mq: expand 'repo' -> 'repository' in error message Martin Geisler <mg@lazybytes.net> parents: 12849 diff changeset	720 raise util.Abort(_("repository commit failed"))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	721
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	722 if update_status:
10678 da2a0c9c895d mq: avoid many hex/bin conversions, keep the binary node when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10663 diff changeset	723 self.applied.append(statusentry(n, patchname))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	724
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	725 if patcherr:
7782 140429276b63 mq: handle empty patches more gracefully (issue1501) Matt Mackall <mpm@selenic.com> parents: 7772 diff changeset	726 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	727 err = 2
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	728 break
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	729
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	730 if fuzz and strict:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	731 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	732 err = 3
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	733 break
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	734 return (err, n)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	735
8833 14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	736 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	737 if not keep:
14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	738 r = self.qrepo()
14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	739 if r:
14435 5f6090e559fa context: make forget work like commands.forget Matt Mackall <mpm@selenic.com> parents: 14434 diff changeset	740 r[None].forget(patches)
5f6090e559fa context: make forget work like commands.forget Matt Mackall <mpm@selenic.com> parents: 14434 diff changeset	741 for p in patches:
5f6090e559fa context: make forget work like commands.forget Matt Mackall <mpm@selenic.com> parents: 14434 diff changeset	742 os.unlink(self.join(p))
8833 14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	743
14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	744 if numrevs:
14010 d7b4d421b56c mq: prevent traceback when qfinish patches not in series. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13970 diff changeset	745 qfinished = self.applied[:numrevs]
8833 14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	746 del self.applied[:numrevs]
14592 fc94add69d9f mq: rename applied_dirty to applieddirty Adrian Buehlmann <adrian@cadifra.com> parents: 14591 diff changeset	747 self.applieddirty = 1
8833 14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	748
14010 d7b4d421b56c mq: prevent traceback when qfinish patches not in series. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13970 diff changeset	749 unknown = []
d7b4d421b56c mq: prevent traceback when qfinish patches not in series. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13970 diff changeset	750
14574 12fba7bcb4f1 mq: rename find_series to findseries Adrian Buehlmann <adrian@cadifra.com> parents: 14573 diff changeset	751 for (i, p) in sorted([(self.findseries(p), p) for p in patches],
14010 d7b4d421b56c mq: prevent traceback when qfinish patches not in series. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13970 diff changeset	752 reverse=True):
d7b4d421b56c mq: prevent traceback when qfinish patches not in series. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13970 diff changeset	753 if i is not None:
14572 8ff2957c1d82 mq: rename full_series to fullseries Adrian Buehlmann <adrian@cadifra.com> parents: 14564 diff changeset	754 del self.fullseries[i]
14010 d7b4d421b56c mq: prevent traceback when qfinish patches not in series. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13970 diff changeset	755 else:
d7b4d421b56c mq: prevent traceback when qfinish patches not in series. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13970 diff changeset	756 unknown.append(p)
d7b4d421b56c mq: prevent traceback when qfinish patches not in series. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13970 diff changeset	757
d7b4d421b56c mq: prevent traceback when qfinish patches not in series. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13970 diff changeset	758 if unknown:
d7b4d421b56c mq: prevent traceback when qfinish patches not in series. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13970 diff changeset	759 if numrevs:
d7b4d421b56c mq: prevent traceback when qfinish patches not in series. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13970 diff changeset	760 rev = dict((entry.name, entry.node) for entry in qfinished)
d7b4d421b56c mq: prevent traceback when qfinish patches not in series. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13970 diff changeset	761 for p in unknown:
d7b4d421b56c mq: prevent traceback when qfinish patches not in series. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13970 diff changeset	762 msg = _('revision %s refers to unknown patches: %s\n')
d7b4d421b56c mq: prevent traceback when qfinish patches not in series. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13970 diff changeset	763 self.ui.warn(msg % (short(rev[p]), p))
d7b4d421b56c mq: prevent traceback when qfinish patches not in series. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13970 diff changeset	764 else:
d7b4d421b56c mq: prevent traceback when qfinish patches not in series. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13970 diff changeset	765 msg = _('unknown patches: %s\n')
d7b4d421b56c mq: prevent traceback when qfinish patches not in series. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13970 diff changeset	766 raise util.Abort(''.join(msg % p for p in unknown))
d7b4d421b56c mq: prevent traceback when qfinish patches not in series. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13970 diff changeset	767
14575 845c864200d0 mq: rename parse_series to parseseries Adrian Buehlmann <adrian@cadifra.com> parents: 14574 diff changeset	768 self.parseseries()
14593 599a72895c0d mq: rename series_dirty to seriesdirty Adrian Buehlmann <adrian@cadifra.com> parents: 14592 diff changeset	769 self.seriesdirty = 1
6645 37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	770
8833 14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	771 def _revpatches(self, repo, revs):
10678 da2a0c9c895d mq: avoid many hex/bin conversions, keep the binary node when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10663 diff changeset	772 firstrev = repo[self.applied[0].node].rev()
6645 37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	773 patches = []
8833 14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	774 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	775
6645 37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	776 if rev < firstrev:
37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	777 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	778
6e6f5b80e056 mq: warn about finalizing patches without cset message Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8811 diff changeset	779 ctx = repo[rev]
10678 da2a0c9c895d mq: avoid many hex/bin conversions, keep the binary node when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10663 diff changeset	780 base = self.applied[i].node
8832 6e6f5b80e056 mq: warn about finalizing patches without cset message Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8811 diff changeset	781 if ctx.node() != base:
6e6f5b80e056 mq: warn about finalizing patches without cset message Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8811 diff changeset	782 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	783 raise util.Abort(msg % rev)
6e6f5b80e056 mq: warn about finalizing patches without cset message Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8811 diff changeset	784
8833 14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	785 patch = self.applied[i].name
8832 6e6f5b80e056 mq: warn about finalizing patches without cset message Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8811 diff changeset	786 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	787 if ctx.description() == fmt % patch:
6e6f5b80e056 mq: warn about finalizing patches without cset message Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8811 diff changeset	788 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	789 repo.ui.status(msg % patch)
6e6f5b80e056 mq: warn about finalizing patches without cset message Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8811 diff changeset	790 break
6e6f5b80e056 mq: warn about finalizing patches without cset message Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8811 diff changeset	791
8833 14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	792 patches.append(patch)
14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	793 return patches
6645 37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	794
8833 14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	795 def finish(self, repo, revs):
14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	796 patches = self._revpatches(repo, sorted(revs))
14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	797 self._cleanup(patches, len(patches))
6645 37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	798
3088 dc784839516d mq: add qdelete --forget option Brendan Cully <brendan@kublai.com> parents: 3087 diff changeset	799 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	800 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	801 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	802 'patch name'))
4736 04b2c1e27c26 mq: require patch argument or revision for qdelete Brendan Cully <brendan@kublai.com> parents: 4730 diff changeset	803
11365 c3d7daa0928e mq: make 'qdelete <patchidx>' work again. Greg Ward <greg-hg@gerg.ca> parents: 11327 diff changeset	804 realpatches = []
2905 790fd342b6c7 Allow qdel to delete multiple patches. Brendan Cully <brendan@kublai.com> parents: 2904 diff changeset	805 for patch in patches:
790fd342b6c7 Allow qdel to delete multiple patches. Brendan Cully <brendan@kublai.com> parents: 2904 diff changeset	806 patch = self.lookup(patch, strict=True)
790fd342b6c7 Allow qdel to delete multiple patches. Brendan Cully <brendan@kublai.com> parents: 2904 diff changeset	807 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	808 if info:
2905 790fd342b6c7 Allow qdel to delete multiple patches. Brendan Cully <brendan@kublai.com> parents: 2904 diff changeset	809 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	810 if patch not in self.series:
790fd342b6c7 Allow qdel to delete multiple patches. Brendan Cully <brendan@kublai.com> parents: 2904 diff changeset	811 raise util.Abort(_("patch %s not in series file") % patch)
12655 5192b24f309c mq: handle deleting the same patch twice in one command (issue2427) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 12590 diff changeset	812 if patch not in realpatches:
5192b24f309c mq: handle deleting the same patch twice in one command (issue2427) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 12590 diff changeset	813 realpatches.append(patch)
3373 9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	814
8833 14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	815 numrevs = 0
3373 9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	816 if opts.get('rev'):
9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	817 if not self.applied:
9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	818 raise util.Abort(_('no patches applied'))
14319 b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14298 diff changeset	819 revs = scmutil.revrange(repo, opts.get('rev'))
3373 9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	820 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	821 revs.reverse()
8833 14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	822 revpatches = self._revpatches(repo, revs)
11365 c3d7daa0928e mq: make 'qdelete <patchidx>' work again. Greg Ward <greg-hg@gerg.ca> parents: 11327 diff changeset	823 realpatches += revpatches
8833 14639c050251 mq: unify code for qdel -r and qfin Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8832 diff changeset	824 numrevs = len(revpatches)
2905 790fd342b6c7 Allow qdel to delete multiple patches. Brendan Cully <brendan@kublai.com> parents: 2904 diff changeset	825
11365 c3d7daa0928e mq: make 'qdelete <patchidx>' work again. Greg Ward <greg-hg@gerg.ca> parents: 11327 diff changeset	826 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	827
14581 da40ee1adc2b mq: rename check_toppatch to checktoppatch Adrian Buehlmann <adrian@cadifra.com> parents: 14580 diff changeset	828 def checktoppatch(self, repo):
10686 0c68c2c36ed8 mq: don't use len(list) unless necessary Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10685 diff changeset	829 if self.applied:
10678 da2a0c9c895d mq: avoid many hex/bin conversions, keep the binary node when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10663 diff changeset	830 top = self.applied[-1].node
10191 99d285ac5da4 mq: qdiff with the same diff options than qrefresh (issue1350) Patrick Mezard <pmezard@gmail.com> parents: 10190 diff changeset	831 patch = self.applied[-1].name
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	832 pp = repo.dirstate.parents()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	833 if top not in pp:
5432 bfbd9b954315 mq: clarify queue top message Matt Mackall <mpm@selenic.com> parents: 5336 diff changeset	834 raise util.Abort(_("working directory revision is not qtip"))
10191 99d285ac5da4 mq: qdiff with the same diff options than qrefresh (issue1350) Patrick Mezard <pmezard@gmail.com> parents: 10190 diff changeset	835 return top, patch
99d285ac5da4 mq: qdiff with the same diff options than qrefresh (issue1350) Patrick Mezard <pmezard@gmail.com> parents: 10190 diff changeset	836 return None, None
99d285ac5da4 mq: qdiff with the same diff options than qrefresh (issue1350) Patrick Mezard <pmezard@gmail.com> parents: 10190 diff changeset	837
14582 a6467dfbe5dc mq: rename check_substate to checksubstate Adrian Buehlmann <adrian@cadifra.com> parents: 14581 diff changeset	838 def checksubstate(self, repo):
13174 be7e8e9bc5e5 mq: update .hgsubstate if subrepos are clean (issue2499) Kevin Bullock <kbullock@ringworld.org> parents: 13173 diff changeset	839 '''return list of subrepos at a different revision than substate.
be7e8e9bc5e5 mq: update .hgsubstate if subrepos are clean (issue2499) Kevin Bullock <kbullock@ringworld.org> parents: 13173 diff changeset	840 Abort if any subrepos have uncommitted changes.'''
be7e8e9bc5e5 mq: update .hgsubstate if subrepos are clean (issue2499) Kevin Bullock <kbullock@ringworld.org> parents: 13173 diff changeset	841 inclsubs = []
be7e8e9bc5e5 mq: update .hgsubstate if subrepos are clean (issue2499) Kevin Bullock <kbullock@ringworld.org> parents: 13173 diff changeset	842 wctx = repo[None]
be7e8e9bc5e5 mq: update .hgsubstate if subrepos are clean (issue2499) Kevin Bullock <kbullock@ringworld.org> parents: 13173 diff changeset	843 for s in wctx.substate:
be7e8e9bc5e5 mq: update .hgsubstate if subrepos are clean (issue2499) Kevin Bullock <kbullock@ringworld.org> parents: 13173 diff changeset	844 if wctx.sub(s).dirty(True):
be7e8e9bc5e5 mq: update .hgsubstate if subrepos are clean (issue2499) Kevin Bullock <kbullock@ringworld.org> parents: 13173 diff changeset	845 raise util.Abort(
be7e8e9bc5e5 mq: update .hgsubstate if subrepos are clean (issue2499) Kevin Bullock <kbullock@ringworld.org> parents: 13173 diff changeset	846 _("uncommitted changes in subrepository %s") % s)
be7e8e9bc5e5 mq: update .hgsubstate if subrepos are clean (issue2499) Kevin Bullock <kbullock@ringworld.org> parents: 13173 diff changeset	847 elif wctx.sub(s).dirty():
be7e8e9bc5e5 mq: update .hgsubstate if subrepos are clean (issue2499) Kevin Bullock <kbullock@ringworld.org> parents: 13173 diff changeset	848 inclsubs.append(s)
be7e8e9bc5e5 mq: update .hgsubstate if subrepos are clean (issue2499) Kevin Bullock <kbullock@ringworld.org> parents: 13173 diff changeset	849 return inclsubs
be7e8e9bc5e5 mq: update .hgsubstate if subrepos are clean (issue2499) Kevin Bullock <kbullock@ringworld.org> parents: 13173 diff changeset	850
14256 d04ba50e104d mq: allow to qpop/push with a dirty working copy (issue2780) Idan Kamara <idankk86@gmail.com> parents: 14241 diff changeset	851 def localchangesfound(self, refresh=True):
d04ba50e104d mq: allow to qpop/push with a dirty working copy (issue2780) Idan Kamara <idankk86@gmail.com> parents: 14241 diff changeset	852 if refresh:
d04ba50e104d mq: allow to qpop/push with a dirty working copy (issue2780) Idan Kamara <idankk86@gmail.com> parents: 14241 diff changeset	853 raise util.Abort(_("local changes found, refresh first"))
d04ba50e104d mq: allow to qpop/push with a dirty working copy (issue2780) Idan Kamara <idankk86@gmail.com> parents: 14241 diff changeset	854 else:
d04ba50e104d mq: allow to qpop/push with a dirty working copy (issue2780) Idan Kamara <idankk86@gmail.com> parents: 14241 diff changeset	855 raise util.Abort(_("local changes found"))
d04ba50e104d mq: allow to qpop/push with a dirty working copy (issue2780) Idan Kamara <idankk86@gmail.com> parents: 14241 diff changeset	856
14583 28f87e14d923 mq: rename check_localchanges to checklocalchanges Adrian Buehlmann <adrian@cadifra.com> parents: 14582 diff changeset	857 def checklocalchanges(self, repo, force=False, refresh=True):
2875 3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2874 diff changeset	858 m, a, r, d = repo.status()[:4]
10372 27d542bc0f5b qnew: ignore force option Augie Fackler <durin42@gmail.com> parents: 10370 diff changeset	859 if (m or a or r or d) and not force:
14256 d04ba50e104d mq: allow to qpop/push with a dirty working copy (issue2780) Idan Kamara <idankk86@gmail.com> parents: 14241 diff changeset	860 self.localchangesfound(refresh)
2875 3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2874 diff changeset	861 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	862
14051 2b1226693c70 mq: add '.' and '..' to list of forbidden patch names Idan Kamara <idankk86@gmail.com> parents: 13791 diff changeset	863 _reserved = ('series', 'status', 'guards', '.', '..')
14584 3343a74eea4e mq: rename check_reserved_name to checkreservedname Adrian Buehlmann <adrian@cadifra.com> parents: 14583 diff changeset	864 def checkreservedname(self, name):
14054 3c616f512a5b mq: be more explicit on invalid patch name message Idan Kamara <idankk86@gmail.com> parents: 14052 diff changeset	865 if name in self._reserved:
5981 ca2af0c81c9a mq: don't allow patches with some reserved names Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5980 diff changeset	866 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	867 % name)
14054 3c616f512a5b mq: be more explicit on invalid patch name message Idan Kamara <idankk86@gmail.com> parents: 14052 diff changeset	868 for prefix in ('.hg', '.mq'):
3c616f512a5b mq: be more explicit on invalid patch name message Idan Kamara <idankk86@gmail.com> parents: 14052 diff changeset	869 if name.startswith(prefix):
3c616f512a5b mq: be more explicit on invalid patch name message Idan Kamara <idankk86@gmail.com> parents: 14052 diff changeset	870 raise util.Abort(_('patch name cannot begin with "%s"')
3c616f512a5b mq: be more explicit on invalid patch name message Idan Kamara <idankk86@gmail.com> parents: 14052 diff changeset	871 % prefix)
3c616f512a5b mq: be more explicit on invalid patch name message Idan Kamara <idankk86@gmail.com> parents: 14052 diff changeset	872 for c in ('#', ':'):
3c616f512a5b mq: be more explicit on invalid patch name message Idan Kamara <idankk86@gmail.com> parents: 14052 diff changeset	873 if c in name:
3c616f512a5b mq: be more explicit on invalid patch name message Idan Kamara <idankk86@gmail.com> parents: 14052 diff changeset	874 raise util.Abort(_('"%s" cannot be used in the name of a patch')
3c616f512a5b mq: be more explicit on invalid patch name message Idan Kamara <idankk86@gmail.com> parents: 14052 diff changeset	875 % c)
3c616f512a5b mq: be more explicit on invalid patch name message Idan Kamara <idankk86@gmail.com> parents: 14052 diff changeset	876
14422 2e77525e52d9 mq: wrap patch file name checks in a function Idan Kamara <idankk86@gmail.com> parents: 14396 diff changeset	877 def checkpatchname(self, name, force=False):
14584 3343a74eea4e mq: rename check_reserved_name to checkreservedname Adrian Buehlmann <adrian@cadifra.com> parents: 14583 diff changeset	878 self.checkreservedname(name)
14422 2e77525e52d9 mq: wrap patch file name checks in a function Idan Kamara <idankk86@gmail.com> parents: 14396 diff changeset	879 if not force and os.path.exists(self.join(name)):
2e77525e52d9 mq: wrap patch file name checks in a function Idan Kamara <idankk86@gmail.com> parents: 14396 diff changeset	880 if os.path.isdir(self.join(name)):
2e77525e52d9 mq: wrap patch file name checks in a function Idan Kamara <idankk86@gmail.com> parents: 14396 diff changeset	881 raise util.Abort(_('"%s" already exists as a directory')
2e77525e52d9 mq: wrap patch file name checks in a function Idan Kamara <idankk86@gmail.com> parents: 14396 diff changeset	882 % name)
2e77525e52d9 mq: wrap patch file name checks in a function Idan Kamara <idankk86@gmail.com> parents: 14396 diff changeset	883 else:
2e77525e52d9 mq: wrap patch file name checks in a function Idan Kamara <idankk86@gmail.com> parents: 14396 diff changeset	884 raise util.Abort(_('patch "%s" already exists') % name)
5981 ca2af0c81c9a mq: don't allow patches with some reserved names Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5980 diff changeset	885
7162 ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	886 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	887 """options:
fd3cba5e73ae mq: do not invoke editor until just before patch creation. Closes issue1346. Brendan Cully <brendan@kublai.com> parents: 7142 diff changeset	888 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	889 """
4713 c29ee52e0b68 mq: support qnew -I/-X and file name lists Brendan Cully <brendan@kublai.com> parents: 4712 diff changeset	890 msg = opts.get('msg')
5673 dd3ce7515f4d mq: add --currentuser and --user options to qnew and qrefresh peter.arrenbrecht@gmail.com parents: 5645 diff changeset	891 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	892 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	893 if date:
989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6120 diff changeset	894 date = util.parsedate(date)
10184 8a47347d298b mq: stop caching and sharing diff options Patrick Mezard <pmezard@gmail.com> parents: 10114 diff changeset	895 diffopts = self.diffopts({'git': opts.get('git')})
14424 4eb88d296f63 record: check patch name is valid before prompting in qrecord Idan Kamara <idankk86@gmail.com> parents: 14423 diff changeset	896 if opts.get('checkname', True):
4eb88d296f63 record: check patch name is valid before prompting in qrecord Idan Kamara <idankk86@gmail.com> parents: 14423 diff changeset	897 self.checkpatchname(patchfn)
14582 a6467dfbe5dc mq: rename check_substate to checksubstate Adrian Buehlmann <adrian@cadifra.com> parents: 14581 diff changeset	898 inclsubs = self.checksubstate(repo)
13174 be7e8e9bc5e5 mq: update .hgsubstate if subrepos are clean (issue2499) Kevin Bullock <kbullock@ringworld.org> parents: 13173 diff changeset	899 if inclsubs:
be7e8e9bc5e5 mq: update .hgsubstate if subrepos are clean (issue2499) Kevin Bullock <kbullock@ringworld.org> parents: 13173 diff changeset	900 inclsubs.append('.hgsubstate')
4713 c29ee52e0b68 mq: support qnew -I/-X and file name lists Brendan Cully <brendan@kublai.com> parents: 4712 diff changeset	901 if opts.get('include') or opts.get('exclude') or pats:
13174 be7e8e9bc5e5 mq: update .hgsubstate if subrepos are clean (issue2499) Kevin Bullock <kbullock@ringworld.org> parents: 13173 diff changeset	902 if inclsubs:
be7e8e9bc5e5 mq: update .hgsubstate if subrepos are clean (issue2499) Kevin Bullock <kbullock@ringworld.org> parents: 13173 diff changeset	903 pats = list(pats or []) + inclsubs
14671 35c2cc322ba8 scmutil: switch match users to supplying contexts Matt Mackall <mpm@selenic.com> parents: 14636 diff changeset	904 match = scmutil.match(repo[None], 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	905 # 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	906 def badfn(f, msg):
13174 be7e8e9bc5e5 mq: update .hgsubstate if subrepos are clean (issue2499) Kevin Bullock <kbullock@ringworld.org> parents: 13173 diff changeset	907 if f != '.hgsubstate': # .hgsubstate is auto-created
be7e8e9bc5e5 mq: update .hgsubstate if subrepos are clean (issue2499) Kevin Bullock <kbullock@ringworld.org> parents: 13173 diff changeset	908 raise util.Abort('%s: %s' % (f, msg))
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	909 match.bad = badfn
6603 41eb20cc1c02 match: remove files arg from repo.status and friends Matt Mackall <mpm@selenic.com> parents: 6602 diff changeset	910 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	911 else:
14583 28f87e14d923 mq: rename check_localchanges to checklocalchanges Adrian Buehlmann <adrian@cadifra.com> parents: 14582 diff changeset	912 m, a, r, d = self.checklocalchanges(repo, force=True)
14322 a90131b85fd8 scmutil: drop aliases in cmdutil for match functions Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	913 match = scmutil.matchfiles(repo, m + a + r + inclsubs)
10372 27d542bc0f5b qnew: ignore force option Augie Fackler <durin42@gmail.com> parents: 10370 diff changeset	914 if len(repo[None].parents()) > 1:
27d542bc0f5b qnew: ignore force option Augie Fackler <durin42@gmail.com> parents: 10370 diff changeset	915 raise util.Abort(_('cannot manage merge changesets'))
2875 3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2874 diff changeset	916 commitfiles = m + a + r
14581 da40ee1adc2b mq: rename check_toppatch to checktoppatch Adrian Buehlmann <adrian@cadifra.com> parents: 14580 diff changeset	917 self.checktoppatch(repo)
14585 74bf9c84cfd0 mq: rename full_series_end to fullseriesend Adrian Buehlmann <adrian@cadifra.com> parents: 14584 diff changeset	918 insert = self.fullseriesend()
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	919 wlock = repo.wlock()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	920 try:
12878 1634287b6ab1 qnew: give better feedback when doing 'hg qnew foo/' (issue2464) Martin Geisler <mg@aragost.com> parents: 12875 diff changeset	921 try:
1634287b6ab1 qnew: give better feedback when doing 'hg qnew foo/' (issue2464) Martin Geisler <mg@aragost.com> parents: 12875 diff changeset	922 # if patch file write fails, abort early
1634287b6ab1 qnew: give better feedback when doing 'hg qnew foo/' (issue2464) Martin Geisler <mg@aragost.com> parents: 12875 diff changeset	923 p = self.opener(patchfn, "w")
1634287b6ab1 qnew: give better feedback when doing 'hg qnew foo/' (issue2464) Martin Geisler <mg@aragost.com> parents: 12875 diff changeset	924 except IOError, e:
1634287b6ab1 qnew: give better feedback when doing 'hg qnew foo/' (issue2464) Martin Geisler <mg@aragost.com> parents: 12875 diff changeset	925 raise util.Abort(_('cannot write patch "%s": %s')
1634287b6ab1 qnew: give better feedback when doing 'hg qnew foo/' (issue2464) Martin Geisler <mg@aragost.com> parents: 12875 diff changeset	926 % (patchfn, e.strerror))
7162 ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	927 try:
10397 8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	928 if self.plainmode:
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	929 if user:
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	930 p.write("From: " + user + "\n")
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	931 if not date:
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	932 p.write("\n")
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	933 if date:
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	934 p.write("Date: %d %d\n\n" % date)
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	935 else:
7162 ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	936 p.write("# HG changeset patch\n")
10413 e433002acb05 fix up a bunch of check-code warnings Matt Mackall <mpm@selenic.com> parents: 10410 diff changeset	937 p.write("# Parent "
13878 a8d13ee0ce68 misc: replace .parents()[0] with p1() Matt Mackall <mpm@selenic.com> parents: 13793 diff changeset	938 + hex(repo[None].p1().node()) + "\n")
7162 ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	939 if user:
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	940 p.write("# User " + user + "\n")
10397 8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	941 if date:
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	942 p.write("# Date %s %s\n\n" % date)
14943 d3bb825ddae3 globally: use safehasattr(x, '__call__') instead of hasattr(x, '__call__') Augie Fackler <durin42@gmail.com> parents: 14732 diff changeset	943 if util.safehasattr(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	944 msg = msg()
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	945 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	946 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	947 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	948 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	949 try:
14572 8ff2957c1d82 mq: rename full_series to fullseries Adrian Buehlmann <adrian@cadifra.com> parents: 14564 diff changeset	950 self.fullseries[insert:insert] = [patchfn]
10678 da2a0c9c895d mq: avoid many hex/bin conversions, keep the binary node when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10663 diff changeset	951 self.applied.append(statusentry(n, patchfn))
14575 845c864200d0 mq: rename parse_series to parseseries Adrian Buehlmann <adrian@cadifra.com> parents: 14574 diff changeset	952 self.parseseries()
14593 599a72895c0d mq: rename series_dirty to seriesdirty Adrian Buehlmann <adrian@cadifra.com> parents: 14592 diff changeset	953 self.seriesdirty = 1
14592 fc94add69d9f mq: rename applied_dirty to applieddirty Adrian Buehlmann <adrian@cadifra.com> parents: 14591 diff changeset	954 self.applieddirty = 1
7162 ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	955 if msg:
7614 f9fcb189c8e2 mq: make qnew patch format consistent with qrefresh (issue1457) Bernhard Leiner <bleiner@gmail.com> parents: 7568 diff changeset	956 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	957 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	958 if commitfiles:
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	959 parent = self.qparents(repo, n)
14241 45f7aa35f2fd mq: don't hide the patch module Idan Kamara <idankk86@gmail.com> parents: 14239 diff changeset	960 chunks = patchmod.diff(repo, node1=parent, node2=n,
7308 b6f5490effbf patch: turn patch.diff() into a generator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7307 diff changeset	961 match=match, opts=diffopts)
b6f5490effbf patch: turn patch.diff() into a generator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7307 diff changeset	962 for chunk in chunks:
b6f5490effbf patch: turn patch.diff() into a generator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7307 diff changeset	963 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	964 p.close()
8112 6ee71f78497c switch lock releasing in the extensions from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8076 diff changeset	965 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	966 wlock = None
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	967 r = self.qrepo()
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10276 diff changeset	968 if r:
11303 a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11302 diff changeset	969 r[None].add([patchfn])
7162 ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	970 except:
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	971 repo.rollback()
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	972 raise
7280 810ca383da9c remove unused variables Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7271 diff changeset	973 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	974 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	975 try:
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	976 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	977 except:
ce10a2f22258 mq: heavy rearrangement of qnew to make it recover reliably from errors. Brendan Cully <brendan@kublai.com> parents: 7161 diff changeset	978 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	979 raise
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	980 self.removeundo(repo)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	981 finally:
8112 6ee71f78497c switch lock releasing in the extensions from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8076 diff changeset	982 release(wlock)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	983
11789 e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11767 diff changeset	984 def strip(self, repo, revs, 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	985 wlock = lock = None
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	986 try:
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	987 wlock = repo.wlock()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	988 lock = repo.lock()
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	989
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	990 if update:
14583 28f87e14d923 mq: rename check_localchanges to checklocalchanges Adrian Buehlmann <adrian@cadifra.com> parents: 14582 diff changeset	991 self.checklocalchanges(repo, force=force, refresh=False)
11789 e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11767 diff changeset	992 urev = self.qparents(repo, revs[0])
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	993 hg.clean(repo, urev)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	994 repo.dirstate.write()
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	995
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	996 self.removeundo(repo)
11789 e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11767 diff changeset	997 for rev in revs:
e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11767 diff changeset	998 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	999 # 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	1000 # 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	1001 self.removeundo(repo)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1002 finally:
8112 6ee71f78497c switch lock releasing in the extensions from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8076 diff changeset	1003 release(lock, wlock)
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	1004
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1005 def isapplied(self, patch):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1006 """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	1007 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	1008 if a.name == patch:
10678 da2a0c9c895d mq: avoid many hex/bin conversions, keep the binary node when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10663 diff changeset	1009 return (i, a.node, a.name)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1010 return None
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1011
3223 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 3186 diff changeset	1012 # 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	1013 # variations. If strict is passed, we try only #1
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	1014 #
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	1015 # 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	1016 # 2) a unique substring of the patch name was given
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	1017 # 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	1018 def lookup(self, patch, strict=False):
2844 582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	1019 patch = patch and str(patch)
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	1020
14595 f2c9d4091e0e mq: rename partial_name to partialname Adrian Buehlmann <adrian@cadifra.com> parents: 14594 diff changeset	1021 def partialname(s):
2696 be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	1022 if s in self.series:
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	1023 return s
2765 0327bd1c831c mq: print matches if patch name not unique Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2757 diff changeset	1024 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	1025 if len(matches) > 1:
0327bd1c831c mq: print matches if patch name not unique Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2757 diff changeset	1026 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	1027 for m in matches:
0327bd1c831c mq: print matches if patch name not unique Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2757 diff changeset	1028 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	1029 return None
0327bd1c831c mq: print matches if patch name not unique Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2757 diff changeset	1030 if matches:
0327bd1c831c mq: print matches if patch name not unique Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2757 diff changeset	1031 return matches[0]
10686 0c68c2c36ed8 mq: don't use len(list) unless necessary Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10685 diff changeset	1032 if self.series and self.applied:
2696 be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	1033 if s == 'qtip':
14586 af91cb281975 mq: rename series_end to seriesend Adrian Buehlmann <adrian@cadifra.com> parents: 14585 diff changeset	1034 return self.series[self.seriesend(True)-1]
2696 be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	1035 if s == 'qbase':
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	1036 return self.series[0]
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	1037 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	1038
8527 f9a80054dd3c use 'x is None' instead of 'x == None' Martin Geisler <mg@lazybytes.net> parents: 8525 diff changeset	1039 if patch is None:
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1040 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	1041 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	1042 return patch
2696 be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	1043
2819 766ecdc83e43 mq: add join method Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2818 diff changeset	1044 if not os.path.isfile(self.join(patch)):
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1045 try:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1046 sno = int(patch)
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10276 diff changeset	1047 except (ValueError, OverflowError):
2696 be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	1048 pass
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	1049 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	1050 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	1051 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	1052
2696 be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	1053 if not strict:
14595 f2c9d4091e0e mq: rename partial_name to partialname Adrian Buehlmann <adrian@cadifra.com> parents: 14594 diff changeset	1054 res = partialname(patch)
2696 be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	1055 if res:
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	1056 return res
3082 bed7cb835d8d Fixed python2.3 incompatibility (rsplit) in qpush/qpop with index. Thomas Arendsen Hein <thomas@intevation.de> parents: 3076 diff changeset	1057 minus = patch.rfind('-')
bed7cb835d8d Fixed python2.3 incompatibility (rsplit) in qpush/qpop with index. Thomas Arendsen Hein <thomas@intevation.de> parents: 3076 diff changeset	1058 if minus >= 0:
14595 f2c9d4091e0e mq: rename partial_name to partialname Adrian Buehlmann <adrian@cadifra.com> parents: 14594 diff changeset	1059 res = partialname(patch[:minus])
2696 be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	1060 if res:
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	1061 i = self.series.index(res)
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	1062 try:
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10276 diff changeset	1063 off = int(patch[minus + 1:] or 1)
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10276 diff changeset	1064 except (ValueError, OverflowError):
2696 be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	1065 pass
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	1066 else:
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	1067 if i - off >= 0:
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	1068 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	1069 plus = patch.rfind('+')
bed7cb835d8d Fixed python2.3 incompatibility (rsplit) in qpush/qpop with index. Thomas Arendsen Hein <thomas@intevation.de> parents: 3076 diff changeset	1070 if plus >= 0:
14595 f2c9d4091e0e mq: rename partial_name to partialname Adrian Buehlmann <adrian@cadifra.com> parents: 14594 diff changeset	1071 res = partialname(patch[:plus])
2696 be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	1072 if res:
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	1073 i = self.series.index(res)
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	1074 try:
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10276 diff changeset	1075 off = int(patch[plus + 1:] or 1)
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10276 diff changeset	1076 except (ValueError, OverflowError):
2696 be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	1077 pass
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	1078 else:
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	1079 if i + off < len(self.series):
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	1080 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	1081 raise util.Abort(_("patch %s not in series") % patch)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1082
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	1083 def push(self, repo, patch=None, force=False, list=False,
13033 026053f691a4 mq: add an '-e/--exact' option to qpush Steve Losh <steve@stevelosh.com> parents: 13031 diff changeset	1084 mergeq=None, all=False, move=False, exact=False):
10184 8a47347d298b mq: stop caching and sharing diff options Patrick Mezard <pmezard@gmail.com> parents: 10114 diff changeset	1085 diffopts = self.diffopts()
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	1086 wlock = repo.wlock()
8795 51c29aec0b75 mq: eliminate warning on qpush with empty series Adrian Buehlmann <adrian@cadifra.com> parents: 8778 diff changeset	1087 try:
10362 2e3ec7ef5349 mq: don't warn on qpush against a branch head Dirkjan Ochtman <djc.ochtman@kentyde.com> parents: 10361 diff changeset	1088 heads = []
2e3ec7ef5349 mq: don't warn on qpush against a branch head Dirkjan Ochtman <djc.ochtman@kentyde.com> parents: 10361 diff changeset	1089 for b, ls in repo.branchmap().iteritems():
2e3ec7ef5349 mq: don't warn on qpush against a branch head Dirkjan Ochtman <djc.ochtman@kentyde.com> parents: 10361 diff changeset	1090 heads += ls
2e3ec7ef5349 mq: don't warn on qpush against a branch head Dirkjan Ochtman <djc.ochtman@kentyde.com> parents: 10361 diff changeset	1091 if not heads:
2e3ec7ef5349 mq: don't warn on qpush against a branch head Dirkjan Ochtman <djc.ochtman@kentyde.com> parents: 10361 diff changeset	1092 heads = [nullid]
13878 a8d13ee0ce68 misc: replace .parents()[0] with p1() Matt Mackall <mpm@selenic.com> parents: 13793 diff changeset	1093 if repo.dirstate.p1() not in heads and not exact:
8795 51c29aec0b75 mq: eliminate warning on qpush with empty series Adrian Buehlmann <adrian@cadifra.com> parents: 8778 diff changeset	1094 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	1095
8795 51c29aec0b75 mq: eliminate warning on qpush with empty series Adrian Buehlmann <adrian@cadifra.com> parents: 8778 diff changeset	1096 if not self.series:
51c29aec0b75 mq: eliminate warning on qpush with empty series Adrian Buehlmann <adrian@cadifra.com> parents: 8778 diff changeset	1097 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	1098 return 0
7398 2cd1308cb588 mq: gracefully abort qpush/qgoto to guarded patch (issue1186) Brendan Cully <brendan@kublai.com> parents: 7308 diff changeset	1099
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1100 patch = self.lookup(patch)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1101 # 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	1102 # 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	1103 # 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	1104 # go backwards with qpush)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1105 if patch:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1106 info = self.isapplied(patch)
13369 69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587) Afuna <afunamatata@gmail.com> parents: 13224 diff changeset	1107 if info and info[0] >= len(self.applied) - 1:
7398 2cd1308cb588 mq: gracefully abort qpush/qgoto to guarded patch (issue1186) Brendan Cully <brendan@kublai.com> parents: 7308 diff changeset	1108 self.ui.warn(
2cd1308cb588 mq: gracefully abort qpush/qgoto to guarded patch (issue1186) Brendan Cully <brendan@kublai.com> parents: 7308 diff changeset	1109 _('qpush: %s is already at the top\n') % patch)
11439 778377be3662 mq: explicit exit code when patch is already on top Gilles Moris <gilles.moris@free.fr> parents: 11438 diff changeset	1110 return 0
13369 69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587) Afuna <afunamatata@gmail.com> parents: 13224 diff changeset	1111
7398 2cd1308cb588 mq: gracefully abort qpush/qgoto to guarded patch (issue1186) Brendan Cully <brendan@kublai.com> parents: 7308 diff changeset	1112 pushable, reason = self.pushable(patch)
13369 69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587) Afuna <afunamatata@gmail.com> parents: 13224 diff changeset	1113 if pushable:
14586 af91cb281975 mq: rename series_end to seriesend Adrian Buehlmann <adrian@cadifra.com> parents: 14585 diff changeset	1114 if self.series.index(patch) < self.seriesend():
13369 69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587) Afuna <afunamatata@gmail.com> parents: 13224 diff changeset	1115 raise util.Abort(
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587) Afuna <afunamatata@gmail.com> parents: 13224 diff changeset	1116 _("cannot push to a previous patch: %s") % patch)
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587) Afuna <afunamatata@gmail.com> parents: 13224 diff changeset	1117 else:
7398 2cd1308cb588 mq: gracefully abort qpush/qgoto to guarded patch (issue1186) Brendan Cully <brendan@kublai.com> parents: 7308 diff changeset	1118 if reason:
14464 00256f689f9c mq: print "'foo' 'bar'", not "['foo', 'bar']" when showing guards Martin Geisler <mg@aragost.com> parents: 14448 diff changeset	1119 reason = _('guarded by %s') % reason
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1120 else:
7398 2cd1308cb588 mq: gracefully abort qpush/qgoto to guarded patch (issue1186) Brendan Cully <brendan@kublai.com> parents: 7308 diff changeset	1121 reason = _('no matching guards')
2cd1308cb588 mq: gracefully abort qpush/qgoto to guarded patch (issue1186) Brendan Cully <brendan@kublai.com> parents: 7308 diff changeset	1122 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	1123 return 1
2cd1308cb588 mq: gracefully abort qpush/qgoto to guarded patch (issue1186) Brendan Cully <brendan@kublai.com> parents: 7308 diff changeset	1124 elif all:
2cd1308cb588 mq: gracefully abort qpush/qgoto to guarded patch (issue1186) Brendan Cully <brendan@kublai.com> parents: 7308 diff changeset	1125 patch = self.series[-1]
2cd1308cb588 mq: gracefully abort qpush/qgoto to guarded patch (issue1186) Brendan Cully <brendan@kublai.com> parents: 7308 diff changeset	1126 if self.isapplied(patch):
2cd1308cb588 mq: gracefully abort qpush/qgoto to guarded patch (issue1186) Brendan Cully <brendan@kublai.com> parents: 7308 diff changeset	1127 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	1128 return 0
4100 c30c922f907a Modify qpush/qpop idempotent operations to return success Ben Thomas <bthomas@virtualiron.com> parents: 4099 diff changeset	1129
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1130 # 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	1131 # 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	1132 # 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	1133 # 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	1134 # work as it detects an error when done
14586 af91cb281975 mq: rename series_end to seriesend Adrian Buehlmann <adrian@cadifra.com> parents: 14585 diff changeset	1135 start = self.seriesend()
7398 2cd1308cb588 mq: gracefully abort qpush/qgoto to guarded patch (issue1186) Brendan Cully <brendan@kublai.com> parents: 7308 diff changeset	1136 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	1137 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	1138 return 1
14732 e9ed3506f066 backout of d04ba50e104d: allow to qpop/push with a dirty working copy Idan Kamara <idankk86@gmail.com> parents: 14671 diff changeset	1139 if not force:
e9ed3506f066 backout of d04ba50e104d: allow to qpop/push with a dirty working copy Idan Kamara <idankk86@gmail.com> parents: 14671 diff changeset	1140 self.checklocalchanges(repo, refresh=self.applied)
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	1141
13033 026053f691a4 mq: add an '-e/--exact' option to qpush Steve Losh <steve@stevelosh.com> parents: 13031 diff changeset	1142 if exact:
026053f691a4 mq: add an '-e/--exact' option to qpush Steve Losh <steve@stevelosh.com> parents: 13031 diff changeset	1143 if move:
026053f691a4 mq: add an '-e/--exact' option to qpush Steve Losh <steve@stevelosh.com> parents: 13031 diff changeset	1144 raise util.Abort(_("cannot use --exact and --move together"))
026053f691a4 mq: add an '-e/--exact' option to qpush Steve Losh <steve@stevelosh.com> parents: 13031 diff changeset	1145 if self.applied:
026053f691a4 mq: add an '-e/--exact' option to qpush Steve Losh <steve@stevelosh.com> parents: 13031 diff changeset	1146 raise util.Abort(_("cannot push --exact with applied patches"))
026053f691a4 mq: add an '-e/--exact' option to qpush Steve Losh <steve@stevelosh.com> parents: 13031 diff changeset	1147 root = self.series[start]
026053f691a4 mq: add an '-e/--exact' option to qpush Steve Losh <steve@stevelosh.com> parents: 13031 diff changeset	1148 target = patchheader(self.join(root), self.plainmode).parent
026053f691a4 mq: add an '-e/--exact' option to qpush Steve Losh <steve@stevelosh.com> parents: 13031 diff changeset	1149 if not target:
026053f691a4 mq: add an '-e/--exact' option to qpush Steve Losh <steve@stevelosh.com> parents: 13031 diff changeset	1150 raise util.Abort(_("%s does not have a parent recorded" % root))
026053f691a4 mq: add an '-e/--exact' option to qpush Steve Losh <steve@stevelosh.com> parents: 13031 diff changeset	1151 if not repo[target] == repo['.']:
026053f691a4 mq: add an '-e/--exact' option to qpush Steve Losh <steve@stevelosh.com> parents: 13031 diff changeset	1152 hg.update(repo, target)
026053f691a4 mq: add an '-e/--exact' option to qpush Steve Losh <steve@stevelosh.com> parents: 13031 diff changeset	1153
11064 590b1d6ef50b mq: qpush --move, reorder patch series and apply only the patch Mads Kiilerich <mads@kiilerich.com> parents: 11050 diff changeset	1154 if move:
11715 4f9dfb54c8b5 qpush --move: move the right patch even with comment lines Gilles Moris <gilles.moris@free.fr> parents: 11709 diff changeset	1155 if not patch:
13075 d73c3034deee coding style: fix gratuitous whitespace after Python keywords Thomas Arendsen Hein <thomas@jtah.de> parents: 13036 diff changeset	1156 raise util.Abort(_("please specify the patch to move"))
14572 8ff2957c1d82 mq: rename full_series to fullseries Adrian Buehlmann <adrian@cadifra.com> parents: 14564 diff changeset	1157 for i, rpn in enumerate(self.fullseries[start:]):
11715 4f9dfb54c8b5 qpush --move: move the right patch even with comment lines Gilles Moris <gilles.moris@free.fr> parents: 11709 diff changeset	1158 # strip markers for patch guards
4f9dfb54c8b5 qpush --move: move the right patch even with comment lines Gilles Moris <gilles.moris@free.fr> parents: 11709 diff changeset	1159 if self.guard_re.split(rpn, 1)[0] == patch:
4f9dfb54c8b5 qpush --move: move the right patch even with comment lines Gilles Moris <gilles.moris@free.fr> parents: 11709 diff changeset	1160 break
4f9dfb54c8b5 qpush --move: move the right patch even with comment lines Gilles Moris <gilles.moris@free.fr> parents: 11709 diff changeset	1161 index = start + i
14572 8ff2957c1d82 mq: rename full_series to fullseries Adrian Buehlmann <adrian@cadifra.com> parents: 14564 diff changeset	1162 assert index < len(self.fullseries)
8ff2957c1d82 mq: rename full_series to fullseries Adrian Buehlmann <adrian@cadifra.com> parents: 14564 diff changeset	1163 fullpatch = self.fullseries[index]
8ff2957c1d82 mq: rename full_series to fullseries Adrian Buehlmann <adrian@cadifra.com> parents: 14564 diff changeset	1164 del self.fullseries[index]
8ff2957c1d82 mq: rename full_series to fullseries Adrian Buehlmann <adrian@cadifra.com> parents: 14564 diff changeset	1165 self.fullseries.insert(start, fullpatch)
14575 845c864200d0 mq: rename parse_series to parseseries Adrian Buehlmann <adrian@cadifra.com> parents: 14574 diff changeset	1166 self.parseseries()
14593 599a72895c0d mq: rename series_dirty to seriesdirty Adrian Buehlmann <adrian@cadifra.com> parents: 14592 diff changeset	1167 self.seriesdirty = 1
11064 590b1d6ef50b mq: qpush --move, reorder patch series and apply only the patch Mads Kiilerich <mads@kiilerich.com> parents: 11050 diff changeset	1168
14592 fc94add69d9f mq: rename applied_dirty to applieddirty Adrian Buehlmann <adrian@cadifra.com> parents: 14591 diff changeset	1169 self.applieddirty = 1
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1170 if start > 0:
14581 da40ee1adc2b mq: rename check_toppatch to checktoppatch Adrian Buehlmann <adrian@cadifra.com> parents: 14580 diff changeset	1171 self.checktoppatch(repo)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1172 if not patch:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1173 patch = self.series[start]
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1174 end = start + 1
4418 0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4406 diff changeset	1175 else:
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1176 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	1177
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1178 s = self.series[start:end]
10661 c4859aad1980 mq: all_files can be a set, remove dangerous default values Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10611 diff changeset	1179 all_files = set()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1180 try:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1181 if mergeq:
10184 8a47347d298b mq: stop caching and sharing diff options Patrick Mezard <pmezard@gmail.com> parents: 10114 diff changeset	1182 ret = self.mergepatch(repo, mergeq, s, diffopts)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1183 else:
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	1184 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	1185 except:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1186 self.ui.warn(_('cleaning up working directory...'))
13878 a8d13ee0ce68 misc: replace .parents()[0] with p1() Matt Mackall <mpm@selenic.com> parents: 13793 diff changeset	1187 node = repo.dirstate.p1()
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	1188 hg.revert(repo, node, None)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1189 # 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	1190 # created while patching
10662 e8e56d8377ab mq: avoid a (potentially expensive) repo.status(unknown=True) call Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10661 diff changeset	1191 for f in all_files:
e8e56d8377ab mq: avoid a (potentially expensive) repo.status(unknown=True) call Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10661 diff changeset	1192 if f not in repo.dirstate:
10693 2c2b2d384a47 mq: do not try to delete non-existent files (regression from e8e56d8377ab) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10692 diff changeset	1193 try:
13235 6bf39d88c857 rename util.unlink to unlinkpath Adrian Buehlmann <adrian@cadifra.com> parents: 13229 diff changeset	1194 util.unlinkpath(repo.wjoin(f))
10693 2c2b2d384a47 mq: do not try to delete non-existent files (regression from e8e56d8377ab) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10692 diff changeset	1195 except OSError, inst:
2c2b2d384a47 mq: do not try to delete non-existent files (regression from e8e56d8377ab) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10692 diff changeset	1196 if inst.errno != errno.ENOENT:
2c2b2d384a47 mq: do not try to delete non-existent files (regression from e8e56d8377ab) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10692 diff changeset	1197 raise
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1198 self.ui.warn(_('done\n'))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1199 raise
8875 801cacf46e62 mq: fix error message for qpush inexistent-patch (issue1702) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8833 diff changeset	1200
9590 07a62819b309 mq: fix traceback for qpush inexistant-patch with no patch applied Benoit Allard <benoit@aeteurope.nl> parents: 9588 diff changeset	1201 if not self.applied:
07a62819b309 mq: fix traceback for qpush inexistant-patch with no patch applied Benoit Allard <benoit@aeteurope.nl> parents: 9588 diff changeset	1202 return ret[0]
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1203 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	1204 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	1205 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	1206 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	1207 else:
7627 fb32ae9c76e7 mq: lowercase output Martin Geisler <mg@daimi.au.dk> parents: 7621 diff changeset	1208 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	1209 return ret[0]
8875 801cacf46e62 mq: fix error message for qpush inexistent-patch (issue1702) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8833 diff changeset	1210
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1211 finally:
8112 6ee71f78497c switch lock releasing in the extensions from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8076 diff changeset	1212 wlock.release()
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1213
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	1214 def pop(self, repo, patch=None, force=False, update=True, all=False):
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	1215 wlock = repo.wlock()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1216 try:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1217 if patch:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1218 # index, rev, patch
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1219 info = self.isapplied(patch)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1220 if not info:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1221 patch = self.lookup(patch)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1222 info = self.isapplied(patch)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1223 if not info:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1224 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	1225
10686 0c68c2c36ed8 mq: don't use len(list) unless necessary Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10685 diff changeset	1226 if not self.applied:
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1227 # 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	1228 # 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	1229 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	1230 return not all
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1231
7620 fbfd92d51540 mq: refactor the pop code to be more readable and allow more changes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7619 diff changeset	1232 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	1233 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	1234 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	1235 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	1236 else:
fbfd92d51540 mq: refactor the pop code to be more readable and allow more changes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7619 diff changeset	1237 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	1238
fbfd92d51540 mq: refactor the pop code to be more readable and allow more changes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7619 diff changeset	1239 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	1240 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	1241 return
fbfd92d51540 mq: refactor the pop code to be more readable and allow more changes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7619 diff changeset	1242
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1243 if not update:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1244 parents = repo.dirstate.parents()
10678 da2a0c9c895d mq: avoid many hex/bin conversions, keep the binary node when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10663 diff changeset	1245 rr = [x.node 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	1246 for p in parents:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1247 if p in rr:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	1248 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	1249 update = True
7621 6d891df43a5f mq: allow qpop if popped revisions are not working dir parents Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7620 diff changeset	1250 else:
10678 da2a0c9c895d mq: avoid many hex/bin conversions, keep the binary node when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10663 diff changeset	1251 parents = [p.node() for p in repo[None].parents()]
7621 6d891df43a5f mq: allow qpop if popped revisions are not working dir parents Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7620 diff changeset	1252 needupdate = False
6d891df43a5f mq: allow qpop if popped revisions are not working dir parents Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7620 diff changeset	1253 for entry in self.applied[start:]:
10678 da2a0c9c895d mq: avoid many hex/bin conversions, keep the binary node when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10663 diff changeset	1254 if entry.node in parents:
7621 6d891df43a5f mq: allow qpop if popped revisions are not working dir parents Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7620 diff changeset	1255 needupdate = True
6d891df43a5f mq: allow qpop if popped revisions are not working dir parents Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7620 diff changeset	1256 break
6d891df43a5f mq: allow qpop if popped revisions are not working dir parents Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7620 diff changeset	1257 update = needupdate
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1258
14732 e9ed3506f066 backout of d04ba50e104d: allow to qpop/push with a dirty working copy Idan Kamara <idankk86@gmail.com> parents: 14671 diff changeset	1259 if not force and update:
e9ed3506f066 backout of d04ba50e104d: allow to qpop/push with a dirty working copy Idan Kamara <idankk86@gmail.com> parents: 14671 diff changeset	1260 self.checklocalchanges(repo)
e9ed3506f066 backout of d04ba50e104d: allow to qpop/push with a dirty working copy Idan Kamara <idankk86@gmail.com> parents: 14671 diff changeset	1261
14592 fc94add69d9f mq: rename applied_dirty to applieddirty Adrian Buehlmann <adrian@cadifra.com> parents: 14591 diff changeset	1262 self.applieddirty = 1
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1263 end = len(self.applied)
10678 da2a0c9c895d mq: avoid many hex/bin conversions, keep the binary node when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10663 diff changeset	1264 rev = self.applied[start].node
5980 dcda0c90125c mq: pop/refresh: avoid losing revisions not managed by mq Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5979 diff changeset	1265 if update:
14581 da40ee1adc2b mq: rename check_toppatch to checktoppatch Adrian Buehlmann <adrian@cadifra.com> parents: 14580 diff changeset	1266 top = self.checktoppatch(repo)[0]
5980 dcda0c90125c mq: pop/refresh: avoid losing revisions not managed by mq Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5979 diff changeset	1267
7621 6d891df43a5f mq: allow qpop if popped revisions are not working dir parents Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7620 diff changeset	1268 try:
6d891df43a5f mq: allow qpop if popped revisions are not working dir parents Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7620 diff changeset	1269 heads = repo.changelog.heads(rev)
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	1270 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	1271 node = short(rev)
6d891df43a5f mq: allow qpop if popped revisions are not working dir parents Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7620 diff changeset	1272 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	1273
10678 da2a0c9c895d mq: avoid many hex/bin conversions, keep the binary node when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10663 diff changeset	1274 if heads != [self.applied[-1].node]:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	1275 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	1276 "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	1277
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1278 # 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	1279 # form of hg.update.
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1280 if update:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1281 qp = self.qparents(repo, rev)
10663 85e81d9bfb7a mq: simplify and use context API Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10662 diff changeset	1282 ctx = repo[qp]
6760 4faaa0535ea7 status: clean up all users for unknown files Matt Mackall <mpm@selenic.com> parents: 6750 diff changeset	1283 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	1284 if d:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	1285 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	1286 for f in a:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1287 try:
13235 6bf39d88c857 rename util.unlink to unlinkpath Adrian Buehlmann <adrian@cadifra.com> parents: 13229 diff changeset	1288 util.unlinkpath(repo.wjoin(f))
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1289 except OSError, e:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1290 if e.errno != errno.ENOENT:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1291 raise
14434 cc8c09855d19 dirstate: rename forget to drop Matt Mackall <mpm@selenic.com> parents: 14424 diff changeset	1292 repo.dirstate.drop(f)
10048 46de82e50790 mq: qpop: remove added files before re-adding removed files Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9874 diff changeset	1293 for f in m + r:
10663 85e81d9bfb7a mq: simplify and use context API Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10662 diff changeset	1294 fctx = ctx[f]
85e81d9bfb7a mq: simplify and use context API Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10662 diff changeset	1295 repo.wwrite(f, fctx.data(), fctx.flags())
10048 46de82e50790 mq: qpop: remove added files before re-adding removed files Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9874 diff changeset	1296 repo.dirstate.normal(f)
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	1297 repo.dirstate.setparents(qp, nullid)
9110 561ff8d9e4f0 mq: qpop now tells which patches are popped Mads Kiilerich <mads@kiilerich.com> parents: 9067 diff changeset	1298 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	1299 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	1300 del self.applied[start:end]
11789 e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11767 diff changeset	1301 self.strip(repo, [rev], update=False, backup='strip')
10686 0c68c2c36ed8 mq: don't use len(list) unless necessary Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10685 diff changeset	1302 if self.applied:
7627 fb32ae9c76e7 mq: lowercase output Martin Geisler <mg@daimi.au.dk> parents: 7621 diff changeset	1303 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	1304 else:
7627 fb32ae9c76e7 mq: lowercase output Martin Geisler <mg@daimi.au.dk> parents: 7621 diff changeset	1305 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	1306 finally:
8112 6ee71f78497c switch lock releasing in the extensions from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8076 diff changeset	1307 wlock.release()
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1308
2937 9dc568f5e03d Fix test-mq-qdiff; add -I and -X options to qdiff Brendan Cully <brendan@kublai.com> parents: 2936 diff changeset	1309 def diff(self, repo, pats, opts):
14581 da40ee1adc2b mq: rename check_toppatch to checktoppatch Adrian Buehlmann <adrian@cadifra.com> parents: 14580 diff changeset	1310 top, patch = self.checktoppatch(repo)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1311 if not top:
7627 fb32ae9c76e7 mq: lowercase output Martin Geisler <mg@daimi.au.dk> parents: 7621 diff changeset	1312 self.ui.write(_("no patches applied\n"))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1313 return
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1314 qp = self.qparents(repo, top)
9857 24bc6e414610 diff: change --inverse to --reverse Martin Geisler <mg@lazybytes.net> parents: 9824 diff changeset	1315 if opts.get('reverse'):
9725 3f522d2fa633 diff: add --inverse option Yannick Gingras <ygingras@ygingras.net> parents: 9642 diff changeset	1316 node1, node2 = None, qp
3f522d2fa633 diff: add --inverse option Yannick Gingras <ygingras@ygingras.net> parents: 9642 diff changeset	1317 else:
3f522d2fa633 diff: add --inverse option Yannick Gingras <ygingras@ygingras.net> parents: 9642 diff changeset	1318 node1, node2 = qp, None
10191 99d285ac5da4 mq: qdiff with the same diff options than qrefresh (issue1350) Patrick Mezard <pmezard@gmail.com> parents: 10190 diff changeset	1319 diffopts = self.diffopts(opts, patch)
10184 8a47347d298b mq: stop caching and sharing diff options Patrick Mezard <pmezard@gmail.com> parents: 10114 diff changeset	1320 self.printdiff(repo, diffopts, node1, node2, files=pats, opts=opts)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1321
2938 5b7a118f5b6c allow qrefresh to take a list of files; closes #96. Brendan Cully <brendan@kublai.com> parents: 2937 diff changeset	1322 def refresh(self, repo, pats=None, **opts):
10686 0c68c2c36ed8 mq: don't use len(list) unless necessary Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10685 diff changeset	1323 if not self.applied:
7627 fb32ae9c76e7 mq: lowercase output Martin Geisler <mg@daimi.au.dk> parents: 7621 diff changeset	1324 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	1325 return 1
7399 e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	1326 msg = opts.get('msg', '').rstrip()
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	1327 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	1328 newdate = opts.get('date')
989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6120 diff changeset	1329 if newdate:
989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6120 diff changeset	1330 newdate = '%d %d' % util.parsedate(newdate)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1331 wlock = repo.wlock()
10366 d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1332
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1333 try:
14581 da40ee1adc2b mq: rename check_toppatch to checktoppatch Adrian Buehlmann <adrian@cadifra.com> parents: 14580 diff changeset	1334 self.checktoppatch(repo)
10678 da2a0c9c895d mq: avoid many hex/bin conversions, keep the binary node when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10663 diff changeset	1335 (top, patchfn) = (self.applied[-1].node, self.applied[-1].name)
5980 dcda0c90125c mq: pop/refresh: avoid losing revisions not managed by mq Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5979 diff changeset	1336 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	1337 raise util.Abort(_("cannot refresh a revision with children"))
10366 d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1338
14582 a6467dfbe5dc mq: rename check_substate to checksubstate Adrian Buehlmann <adrian@cadifra.com> parents: 14581 diff changeset	1339 inclsubs = self.checksubstate(repo)
13174 be7e8e9bc5e5 mq: update .hgsubstate if subrepos are clean (issue2499) Kevin Bullock <kbullock@ringworld.org> parents: 13173 diff changeset	1340
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1341 cparents = repo.changelog.parents(top)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1342 patchparent = self.qparents(repo, top)
10397 8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	1343 ph = patchheader(self.join(patchfn), self.plainmode)
10184 8a47347d298b mq: stop caching and sharing diff options Patrick Mezard <pmezard@gmail.com> parents: 10114 diff changeset	1344 diffopts = self.diffopts({'git': opts.get('git')}, patchfn)
7399 e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	1345 if msg:
e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	1346 ph.setmessage(msg)
5673 dd3ce7515f4d mq: add --currentuser and --user options to qnew and qrefresh peter.arrenbrecht@gmail.com parents: 5645 diff changeset	1347 if newuser:
7399 e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	1348 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	1349 if newdate:
7399 e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	1350 ph.setdate(newdate)
10397 8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	1351 ph.setparent(hex(patchparent))
5180 5bbbd1f1d586 mq: truncate patch just before rewriting header Brendan Cully <brendan@kublai.com> parents: 4930 diff changeset	1352
7400 409a9b442308 mq: use atomictempfiles during patch refresh Brendan Cully <brendan@kublai.com> parents: 7399 diff changeset	1353 # only commit new patch when write is complete
409a9b442308 mq: use atomictempfiles during patch refresh Brendan Cully <brendan@kublai.com> parents: 7399 diff changeset	1354 patchf = self.opener(patchfn, 'w', atomictemp=True)
409a9b442308 mq: use atomictempfiles during patch refresh Brendan Cully <brendan@kublai.com> parents: 7399 diff changeset	1355
7399 e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	1356 comments = str(ph)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1357 if comments:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1358 patchf.write(comments)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1359
10366 d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1360 # update the dirstate in place, strip off the qtip commit
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1361 # and then commit.
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1362 #
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1363 # this should really read:
13005 cffa35529706 mq: fix comment to reflect change in efbee27415ab Martin Geisler <mg@aragost.com> parents: 13004 diff changeset	1364 # mm, dd, aa = repo.status(top, patchparent)[:3]
10366 d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1365 # but we do it backwards to take advantage of manifest/chlog
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1366 # caching against the next repo.status call
13004 efbee27415ab mq: clean up unused variable in qrefresh Kevin Bullock <kbullock@ringworld.org> parents: 12948 diff changeset	1367 mm, aa, dd = repo.status(patchparent, top)[:3]
10366 d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1368 changes = repo.changelog.read(top)
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1369 man = repo.manifest.read(changes[0])
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1370 aaa = aa[:]
14671 35c2cc322ba8 scmutil: switch match users to supplying contexts Matt Mackall <mpm@selenic.com> parents: 14636 diff changeset	1371 matchfn = scmutil.match(repo[None], pats, opts)
10366 d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1372 # in short mode, we only diff the files included in the
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1373 # patch already plus specified files
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1374 if opts.get('short'):
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1375 # if amending a patch, we start with existing
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1376 # files plus specified files - unfiltered
14322 a90131b85fd8 scmutil: drop aliases in cmdutil for match functions Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	1377 match = scmutil.matchfiles(repo, mm + aa + dd + matchfn.files())
10366 d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1378 # filter with inc/exl options
14671 35c2cc322ba8 scmutil: switch match users to supplying contexts Matt Mackall <mpm@selenic.com> parents: 14636 diff changeset	1379 matchfn = scmutil.match(repo[None], opts=opts)
10366 d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1380 else:
14322 a90131b85fd8 scmutil: drop aliases in cmdutil for match functions Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	1381 match = scmutil.matchall(repo)
10366 d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1382 m, a, r, d = repo.status(match=match)[:4]
12948 de6a28ff5ffc mq: use sets instead of lists for speed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12879 diff changeset	1383 mm = set(mm)
de6a28ff5ffc mq: use sets instead of lists for speed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12879 diff changeset	1384 aa = set(aa)
de6a28ff5ffc mq: use sets instead of lists for speed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12879 diff changeset	1385 dd = set(dd)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1386
10366 d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1387 # we might end up with files that were added between
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1388 # qtip and the dirstate parent, but then changed in the
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1389 # local dirstate. in this case, we want them to only
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1390 # show up in the added section
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1391 for x in m:
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1392 if x not in aa:
12948 de6a28ff5ffc mq: use sets instead of lists for speed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12879 diff changeset	1393 mm.add(x)
10366 d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1394 # we might end up with files added by the local dirstate that
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1395 # were deleted by the patch. In this case, they should only
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1396 # show up in the changed section.
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1397 for x in a:
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1398 if x in dd:
12948 de6a28ff5ffc mq: use sets instead of lists for speed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12879 diff changeset	1399 dd.remove(x)
de6a28ff5ffc mq: use sets instead of lists for speed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12879 diff changeset	1400 mm.add(x)
10366 d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1401 else:
12948 de6a28ff5ffc mq: use sets instead of lists for speed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12879 diff changeset	1402 aa.add(x)
10366 d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1403 # make sure any files deleted in the local dirstate
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1404 # are not in the add or change column of the patch
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1405 forget = []
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1406 for x in d + r:
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1407 if x in aa:
12948 de6a28ff5ffc mq: use sets instead of lists for speed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12879 diff changeset	1408 aa.remove(x)
10366 d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1409 forget.append(x)
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1410 continue
12948 de6a28ff5ffc mq: use sets instead of lists for speed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12879 diff changeset	1411 else:
de6a28ff5ffc mq: use sets instead of lists for speed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12879 diff changeset	1412 mm.discard(x)
de6a28ff5ffc mq: use sets instead of lists for speed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12879 diff changeset	1413 dd.add(x)
de6a28ff5ffc mq: use sets instead of lists for speed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12879 diff changeset	1414
de6a28ff5ffc mq: use sets instead of lists for speed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12879 diff changeset	1415 m = list(mm)
de6a28ff5ffc mq: use sets instead of lists for speed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12879 diff changeset	1416 r = list(dd)
de6a28ff5ffc mq: use sets instead of lists for speed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12879 diff changeset	1417 a = list(aa)
10366 d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1418 c = [filter(matchfn, l) for l in (m, a, r)]
14322 a90131b85fd8 scmutil: drop aliases in cmdutil for match functions Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	1419 match = scmutil.matchfiles(repo, set(c[0] + c[1] + c[2] + inclsubs))
14241 45f7aa35f2fd mq: don't hide the patch module Idan Kamara <idankk86@gmail.com> parents: 14239 diff changeset	1420 chunks = patchmod.diff(repo, patchparent, match=match,
10366 d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1421 changes=c, opts=diffopts)
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1422 for chunk in chunks:
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1423 patchf.write(chunk)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1424
10366 d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1425 try:
10368 f05e0d54f424 Merge with crew-stable Patrick Mezard <pmezard@gmail.com> parents: 10362 10366 diff changeset	1426 if diffopts.git or diffopts.upgrade:
10366 d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1427 copies = {}
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1428 for dst in a:
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1429 src = repo.dirstate.copied(dst)
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1430 # during qfold, the source file for copies may
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1431 # be removed. Treat this as a simple add.
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1432 if src is not None and src in repo.dirstate:
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1433 copies.setdefault(src, []).append(dst)
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1434 repo.dirstate.add(dst)
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1435 # remember the copies between patchparent and qtip
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1436 for dst in aaa:
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1437 f = repo.file(dst)
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1438 src = f.renamed(man[dst])
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1439 if src:
10368 f05e0d54f424 Merge with crew-stable Patrick Mezard <pmezard@gmail.com> parents: 10362 10366 diff changeset	1440 copies.setdefault(src[0], []).extend(
f05e0d54f424 Merge with crew-stable Patrick Mezard <pmezard@gmail.com> parents: 10362 10366 diff changeset	1441 copies.get(dst, []))
10366 d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1442 if dst in a:
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1443 copies[src[0]].append(dst)
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1444 # we can't copy a file created by the patch itself
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1445 if dst in copies:
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1446 del copies[dst]
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1447 for src, dsts in copies.iteritems():
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1448 for dst in dsts:
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1449 repo.dirstate.copy(src, dst)
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1450 else:
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1451 for dst in a:
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1452 repo.dirstate.add(dst)
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1453 # Drop useless copy information
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1454 for f in list(repo.dirstate.copies()):
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1455 repo.dirstate.copy(None, f)
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1456 for f in r:
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1457 repo.dirstate.remove(f)
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1458 # if the patch excludes a modified file, mark that
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1459 # file with mtime=0 so status can see it.
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1460 mm = []
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1461 for i in xrange(len(m)-1, -1, -1):
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1462 if not matchfn(m[i]):
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1463 mm.append(m[i])
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1464 del m[i]
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1465 for f in m:
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1466 repo.dirstate.normal(f)
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1467 for f in mm:
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1468 repo.dirstate.normallookup(f)
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1469 for f in forget:
14434 cc8c09855d19 dirstate: rename forget to drop Matt Mackall <mpm@selenic.com> parents: 14424 diff changeset	1470 repo.dirstate.drop(f)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1471
10366 d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1472 if not msg:
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1473 if not ph.message:
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1474 message = "[mq]: %s\n" % patchfn
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1475 else:
10366 d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1476 message = "\n".join(ph.message)
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1477 else:
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1478 message = msg
2694 0fb28dbf0dc7 MQ: uniformise message and logfile option. "Mathieu Clabaut <mathieu.clabaut@gmail.com>" parents: 2682 diff changeset	1479
10366 d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1480 user = ph.user or changes[1]
5673 dd3ce7515f4d mq: add --currentuser and --user options to qnew and qrefresh peter.arrenbrecht@gmail.com parents: 5645 diff changeset	1481
10366 d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1482 # assumes strip can roll itself back if interrupted
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1483 repo.dirstate.setparents(*cparents)
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1484 self.applied.pop()
14592 fc94add69d9f mq: rename applied_dirty to applieddirty Adrian Buehlmann <adrian@cadifra.com> parents: 14591 diff changeset	1485 self.applieddirty = 1
11789 e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11767 diff changeset	1486 self.strip(repo, [top], update=False,
10366 d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1487 backup='strip')
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1488 except:
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1489 repo.dirstate.invalidate()
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1490 raise
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1491
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1492 try:
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1493 # might be nice to attempt to roll back strip after this
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1494 n = repo.commit(message, user, ph.date, match=match,
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1495 force=True)
13632 33a33f19aad2 mq: do not let qrefresh write bad patch Martin Geisler <mg@lazybytes.net> parents: 13520 diff changeset	1496 # only write patch after a successful commit
15057 774da7121fc9 atomictempfile: make close() consistent with other file-like objects. Greg Ward <greg@gerg.ca> parents: 14987 diff changeset	1497 patchf.close()
10678 da2a0c9c895d mq: avoid many hex/bin conversions, keep the binary node when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10663 diff changeset	1498 self.applied.append(statusentry(n, patchfn))
10366 d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1499 except:
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1500 ctx = repo[cparents[0]]
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1501 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
14580 92101ea35015 mq: rename save_dirty to savedirty Adrian Buehlmann <adrian@cadifra.com> parents: 14579 diff changeset	1502 self.savedirty()
10366 d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1503 self.ui.warn(_('refresh interrupted while patch was popped! '
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1504 '(revert --all, qpush to recover)\n'))
d355cebde5e6 mq: remove qrefresh slow path (issue2025) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10274 diff changeset	1505 raise
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	1506 finally:
8112 6ee71f78497c switch lock releasing in the extensions from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8076 diff changeset	1507 wlock.release()
7401 41e87b4d0c9d mq: recover more gracefully from interrupted qrefresh (issue1216) Brendan Cully <brendan@kublai.com> parents: 7400 diff changeset	1508 self.removeundo(repo)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1509
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1510 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	1511 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	1512 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	1513 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	1514 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	1515 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	1516 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	1517 raise
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1518 if create:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1519 return self.qrepo(create=True)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1520
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1521 def unapplied(self, repo, patch=None):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1522 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	1523 raise util.Abort(_("patch %s is not in series file") % patch)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1524 if not patch:
14586 af91cb281975 mq: rename series_end to seriesend Adrian Buehlmann <adrian@cadifra.com> parents: 14585 diff changeset	1525 start = self.seriesend()
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1526 else:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1527 start = self.series.index(patch) + 1
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	1528 unapplied = []
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	1529 for i in xrange(start, len(self.series)):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	1530 pushable, reason = self.pushable(i)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	1531 if pushable:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	1532 unapplied.append((i, self.series[i]))
14579 f7b25764d974 mq: rename explain_pushable to explainpushable Adrian Buehlmann <adrian@cadifra.com> parents: 14578 diff changeset	1533 self.explainpushable(i)
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	1534 return unapplied
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	1535
4239 417c2068cb92 Simplified qseries and hg qapplied to fix some bugs caused by optimization: Thomas Arendsen Hein <thomas@intevation.de> parents: 4238 diff changeset	1536 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	1537 summary=False):
10824 18def0d5692d qseries: make use of output labeling Brodie Rao <brodie@bitheap.org> parents: 10823 diff changeset	1538 def displayname(pfx, patchname, state):
10932 29c39fe2491b mq: only highlight/label patch name for qseries. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10890 diff changeset	1539 if pfx:
29c39fe2491b mq: only highlight/label patch name for qseries. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10890 diff changeset	1540 self.ui.write(pfx)
3183 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1541 if summary:
10397 8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	1542 ph = patchheader(self.join(patchname), self.plainmode)
9874 c51494c53841 qseries: don't truncate the patch name (issue1912) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 9867 diff changeset	1543 msg = ph.message and ph.message[0] or ''
11327 6c469f2f9f12 mq: use ui.formatted() instead of ui.plain(). Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11321 diff changeset	1544 if self.ui.formatted():
12689 c52c629ce19e termwidth: move to ui.ui from util Augie Fackler <durin42@gmail.com> parents: 12682 diff changeset	1545 width = self.ui.termwidth() - len(pfx) - len(patchname) - 2
9874 c51494c53841 qseries: don't truncate the patch name (issue1912) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 9867 diff changeset	1546 if width > 0:
c51494c53841 qseries: don't truncate the patch name (issue1912) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 9867 diff changeset	1547 msg = util.ellipsis(msg, width)
c51494c53841 qseries: don't truncate the patch name (issue1912) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 9867 diff changeset	1548 else:
c51494c53841 qseries: don't truncate the patch name (issue1912) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 9867 diff changeset	1549 msg = ''
10932 29c39fe2491b mq: only highlight/label patch name for qseries. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10890 diff changeset	1550 self.ui.write(patchname, label='qseries.' + state)
29c39fe2491b mq: only highlight/label patch name for qseries. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10890 diff changeset	1551 self.ui.write(': ')
29c39fe2491b mq: only highlight/label patch name for qseries. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10890 diff changeset	1552 self.ui.write(msg, label='qseries.message.' + state)
3183 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1553 else:
10932 29c39fe2491b mq: only highlight/label patch name for qseries. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10890 diff changeset	1554 self.ui.write(patchname, label='qseries.' + state)
29c39fe2491b mq: only highlight/label patch name for qseries. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10890 diff changeset	1555 self.ui.write('\n')
3183 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1556
8152 08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8151 diff changeset	1557 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	1558 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	1559 length = len(self.series) - start
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1560 if not missing:
9016 894c5b4be275 mq: align columns in verbose qseries output. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 8948 diff changeset	1561 if self.ui.verbose:
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10276 diff changeset	1562 idxwidth = len(str(start + length - 1))
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10276 diff changeset	1563 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	1564 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	1565 if patch in applied:
10824 18def0d5692d qseries: make use of output labeling Brodie Rao <brodie@bitheap.org> parents: 10823 diff changeset	1566 char, state = 'A', '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	1567 elif self.pushable(i)[0]:
10824 18def0d5692d qseries: make use of output labeling Brodie Rao <brodie@bitheap.org> parents: 10823 diff changeset	1568 char, state = 'U', 'unapplied'
4239 417c2068cb92 Simplified qseries and hg qapplied to fix some bugs caused by optimization: Thomas Arendsen Hein <thomas@intevation.de> parents: 4238 diff changeset	1569 else:
10824 18def0d5692d qseries: make use of output labeling Brodie Rao <brodie@bitheap.org> parents: 10823 diff changeset	1570 char, state = 'G', 'guarded'
3183 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1571 pfx = ''
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1572 if self.ui.verbose:
10824 18def0d5692d qseries: make use of output labeling Brodie Rao <brodie@bitheap.org> parents: 10823 diff changeset	1573 pfx = '%*d %s ' % (idxwidth, i, char)
18def0d5692d qseries: make use of output labeling Brodie Rao <brodie@bitheap.org> parents: 10823 diff changeset	1574 elif status and status != char:
4238 ce6c364ebb2a Fix issue443: inconsistent output of "hg qunapplied -v" Thomas Arendsen Hein <thomas@intevation.de> parents: 4173 diff changeset	1575 continue
10824 18def0d5692d qseries: make use of output labeling Brodie Rao <brodie@bitheap.org> parents: 10823 diff changeset	1576 displayname(pfx, patch, state)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1577 else:
2794 86c54b7cd331 mq: fix variables shadowing builtin Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2792 diff changeset	1578 msng_list = []
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1579 for root, dirs, files in os.walk(self.path):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1580 d = root[len(self.path) + 1:]
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1581 for f in files:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1582 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	1583 if (fl not in self.series and
14588 bd3d75a03f80 mq: rename status_path to statuspath Adrian Buehlmann <adrian@cadifra.com> parents: 14587 diff changeset	1584 fl not in (self.statuspath, self.seriespath,
14589 7d59ee9e711b mq: rename guards_path to guardspath Adrian Buehlmann <adrian@cadifra.com> parents: 14588 diff changeset	1585 self.guardspath)
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	1586 and not fl.startswith('.')):
2794 86c54b7cd331 mq: fix variables shadowing builtin Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2792 diff changeset	1587 msng_list.append(fl)
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8188 diff changeset	1588 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	1589 pfx = self.ui.verbose and ('D ') or ''
10824 18def0d5692d qseries: make use of output labeling Brodie Rao <brodie@bitheap.org> parents: 10823 diff changeset	1590 displayname(pfx, x, 'missing')
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1591
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1592 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	1593 if l.name == '.hg.patches.save.line':
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1594 return True
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1595
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1596 def qrepo(self, create=False):
11965 77f1f206e135 mq: don't inherit default and default-push paths with --mq (issue2333) Mads Kiilerich <mads@kiilerich.com> parents: 11715 diff changeset	1597 ui = self.ui.copy()
77f1f206e135 mq: don't inherit default and default-push paths with --mq (issue2333) Mads Kiilerich <mads@kiilerich.com> parents: 11715 diff changeset	1598 ui.setconfig('paths', 'default', '', overlay=False)
77f1f206e135 mq: don't inherit default and default-push paths with --mq (issue2333) Mads Kiilerich <mads@kiilerich.com> parents: 11715 diff changeset	1599 ui.setconfig('paths', 'default-push', '', overlay=False)
2819 766ecdc83e43 mq: add join method Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2818 diff changeset	1600 if create or os.path.isdir(self.join(".hg")):
11965 77f1f206e135 mq: don't inherit default and default-push paths with --mq (issue2333) Mads Kiilerich <mads@kiilerich.com> parents: 11715 diff changeset	1601 return hg.repository(ui, path=self.path, create=create)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1602
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1603 def restore(self, repo, rev, delete=None, qupdate=None):
10681 3f6a6407a3c7 mq: use context API Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10680 diff changeset	1604 desc = repo[rev].description().strip()
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1605 lines = desc.splitlines()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1606 i = 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1607 datastart = None
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1608 series = []
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1609 applied = []
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1610 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	1611 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	1612 if line == 'Patch Data:':
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1613 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	1614 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	1615 l = line.rstrip()
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1616 l = l[10:].split(' ')
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10276 diff changeset	1617 qpp = [bin(x) for x in l]
13031 3da456d0c885 code style: prefer 'is' and 'is not' tests with singletons Martin Geisler <mg@aragost.com> parents: 13005 diff changeset	1618 elif datastart is not None:
8632 9e055cfdd620 replace "i in range(len(xs))" with "i, x in enumerate(xs)" Martin Geisler <mg@lazybytes.net> parents: 8624 diff changeset	1619 l = line.rstrip()
10683 cfbf064f0069 mq: qsave creates entries with the left part empty (':patchname') Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10682 diff changeset	1620 n, name = l.split(':', 1)
cfbf064f0069 mq: qsave creates entries with the left part empty (':patchname') Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10682 diff changeset	1621 if n:
cfbf064f0069 mq: qsave creates entries with the left part empty (':patchname') Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10682 diff changeset	1622 applied.append(statusentry(bin(n), name))
3185 b3e103c388fc mq: don't write applied patches into series twice in restore Brendan Cully <brendan@kublai.com> parents: 3184 diff changeset	1623 else:
10682 8ed350051896 mq: simplify statusentry(), fix restore broken by ee48e5ef8753 Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10681 diff changeset	1624 series.append(l)
8527 f9a80054dd3c use 'x is None' instead of 'x == None' Martin Geisler <mg@lazybytes.net> parents: 8525 diff changeset	1625 if datastart is None:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	1626 self.ui.warn(_("No saved patch data found\n"))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1627 return 1
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	1628 self.ui.warn(_("restoring status: %s\n") % lines[0])
14572 8ff2957c1d82 mq: rename full_series to fullseries Adrian Buehlmann <adrian@cadifra.com> parents: 14564 diff changeset	1629 self.fullseries = series
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1630 self.applied = applied
14575 845c864200d0 mq: rename parse_series to parseseries Adrian Buehlmann <adrian@cadifra.com> parents: 14574 diff changeset	1631 self.parseseries()
14593 599a72895c0d mq: rename series_dirty to seriesdirty Adrian Buehlmann <adrian@cadifra.com> parents: 14592 diff changeset	1632 self.seriesdirty = 1
14592 fc94add69d9f mq: rename applied_dirty to applieddirty Adrian Buehlmann <adrian@cadifra.com> parents: 14591 diff changeset	1633 self.applieddirty = 1
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1634 heads = repo.changelog.heads()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1635 if delete:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1636 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	1637 self.ui.warn(_("save entry has children, leaving it alone\n"))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1638 else:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	1639 self.ui.warn(_("removing save entry %s\n") % short(rev))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1640 pp = repo.dirstate.parents()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1641 if rev in pp:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1642 update = True
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1643 else:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1644 update = False
11789 e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11767 diff changeset	1645 self.strip(repo, [rev], update=update, backup='strip')
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1646 if qpp:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	1647 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	1648 (short(qpp[0]), short(qpp[1])))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1649 if qupdate:
12848 f7f1a146f407 qrestore: trying to improve the English timeless <timeless@gmail.com> parents: 12775 diff changeset	1650 self.ui.status(_("updating queue directory\n"))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1651 r = self.qrepo()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1652 if not r:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	1653 self.ui.warn(_("Unable to load queue repository\n"))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1654 return 1
2808 30f59f4a327e Introduce update helper functions: update, merge, clean, and revert Matt Mackall <mpm@selenic.com> parents: 2804 diff changeset	1655 hg.clean(r, qpp[0])
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1656
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1657 def save(self, repo, msg=None):
10686 0c68c2c36ed8 mq: don't use len(list) unless necessary Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10685 diff changeset	1658 if not self.applied:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	1659 self.ui.warn(_("save: no patches applied, exiting\n"))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1660 return 1
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1661 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	1662 self.ui.warn(_("status is already saved\n"))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1663 return 1
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	1664
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1665 if not msg:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	1666 msg = _("hg patches saved state")
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1667 else:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1668 msg = "hg patches: " + msg.rstrip('\r\n')
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1669 r = self.qrepo()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1670 if r:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1671 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	1672 msg += "\nDirstate: %s %s" % (hex(pp[0]), hex(pp[1]))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1673 msg += "\n\nPatch Data:\n"
10679 35abaea778dc mq: simplify commit message generation Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10678 diff changeset	1674 msg += ''.join('%s\n' % x for x in self.applied)
14572 8ff2957c1d82 mq: rename full_series to fullseries Adrian Buehlmann <adrian@cadifra.com> parents: 14564 diff changeset	1675 msg += ''.join(':%s\n' % x for x in self.fullseries)
10679 35abaea778dc mq: simplify commit message generation Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10678 diff changeset	1676 n = repo.commit(msg, force=True)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1677 if not n:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	1678 self.ui.warn(_("repo commit failed\n"))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1679 return 1
10684 485c1d7f8a77 mq: fix coding style (missing space) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10683 diff changeset	1680 self.applied.append(statusentry(n, '.hg.patches.save.line'))
14592 fc94add69d9f mq: rename applied_dirty to applieddirty Adrian Buehlmann <adrian@cadifra.com> parents: 14591 diff changeset	1681 self.applieddirty = 1
4209 dbc3846c09a1 Merge with -stable, fix small test failure Matt Mackall <mpm@selenic.com> parents: 4207 diff changeset	1682 self.removeundo(repo)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1683
14585 74bf9c84cfd0 mq: rename full_series_end to fullseriesend Adrian Buehlmann <adrian@cadifra.com> parents: 14584 diff changeset	1684 def fullseriesend(self):
10686 0c68c2c36ed8 mq: don't use len(list) unless necessary Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10685 diff changeset	1685 if self.applied:
2780 ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	1686 p = self.applied[-1].name
14574 12fba7bcb4f1 mq: rename find_series to findseries Adrian Buehlmann <adrian@cadifra.com> parents: 14573 diff changeset	1687 end = self.findseries(p)
8527 f9a80054dd3c use 'x is None' instead of 'x == None' Martin Geisler <mg@lazybytes.net> parents: 8525 diff changeset	1688 if end is None:
14572 8ff2957c1d82 mq: rename full_series to fullseries Adrian Buehlmann <adrian@cadifra.com> parents: 14564 diff changeset	1689 return len(self.fullseries)
2698 c1123e83c8e2 mq: fix qnew and qimport to deal with series file comments Chris Mason <mason@suse.com> parents: 2697 diff changeset	1690 return end + 1
c1123e83c8e2 mq: fix qnew and qimport to deal with series file comments Chris Mason <mason@suse.com> parents: 2697 diff changeset	1691 return 0
c1123e83c8e2 mq: fix qnew and qimport to deal with series file comments Chris Mason <mason@suse.com> parents: 2697 diff changeset	1692
14586 af91cb281975 mq: rename series_end to seriesend Adrian Buehlmann <adrian@cadifra.com> parents: 14585 diff changeset	1693 def seriesend(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	1694 """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	1695 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	1696 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	1697 """
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1698 end = 0
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	1699 def next(start):
10687 583adcf63f80 mq: use xrange/enumerate instead of += 1 Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10686 diff changeset	1700 if all_patches or start >= len(self.series):
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	1701 return start
10687 583adcf63f80 mq: use xrange/enumerate instead of += 1 Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10686 diff changeset	1702 for i in xrange(start, len(self.series)):
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	1703 p, reason = self.pushable(i)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	1704 if p:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	1705 break
14579 f7b25764d974 mq: rename explain_pushable to explainpushable Adrian Buehlmann <adrian@cadifra.com> parents: 14578 diff changeset	1706 self.explainpushable(i)
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	1707 return i
10686 0c68c2c36ed8 mq: don't use len(list) unless necessary Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10685 diff changeset	1708 if self.applied:
2780 ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	1709 p = self.applied[-1].name
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1710 try:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1711 end = self.series.index(p)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1712 except ValueError:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1713 return 0
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	1714 return next(end + 1)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	1715 return next(end)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1716
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1717 def appliedname(self, index):
2780 ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	1718 pname = self.applied[index].name
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1719 if not self.ui.verbose:
2677 ec05ce9cbf47 mq: uniform verbose display of patche[s]. "Mathieu Clabaut <mathieu.clabaut@gmail.com>" parents: 2664 diff changeset	1720 p = pname
ec05ce9cbf47 mq: uniform verbose display of patche[s]. "Mathieu Clabaut <mathieu.clabaut@gmail.com>" parents: 2664 diff changeset	1721 else:
2941 d32df6452323 mq: fix appliedname Brendan Cully <brendan@kublai.com> parents: 2940 diff changeset	1722 p = str(self.series.index(pname)) + " " + pname
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1723 return p
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	1724
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1725 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	1726 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	1727 def checkseries(patchname):
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1728 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	1729 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	1730 % patchname)
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1731
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1732 if rev:
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1733 if files:
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1734 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	1735 'files'))
14319 b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14298 diff changeset	1736 rev = scmutil.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	1737 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	1738 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	1739 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	1740 'patches'))
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1741 if rev:
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1742 # 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	1743 # 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	1744 # 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	1745 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	1746 if len(heads) > 1:
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1747 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	1748 'branch') % rev[-1])
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1749 if self.applied:
10678 da2a0c9c895d mq: avoid many hex/bin conversions, keep the binary node when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10663 diff changeset	1750 base = repo.changelog.node(rev[0])
da2a0c9c895d mq: avoid many hex/bin conversions, keep the binary node when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10663 diff changeset	1751 if base in [n.node for n in self.applied]:
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1752 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	1753 % rev[0])
10678 da2a0c9c895d mq: avoid many hex/bin conversions, keep the binary node when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10663 diff changeset	1754 if heads != [self.applied[-1].node]:
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1755 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	1756 'the queue') % rev[0])
10678 da2a0c9c895d mq: avoid many hex/bin conversions, keep the binary node when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10663 diff changeset	1757 base = repo.changelog.rev(self.applied[0].node)
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1758 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	1759 else:
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1760 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	1761 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	1762 % rev[0])
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1763 lastparent = None
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1764
10184 8a47347d298b mq: stop caching and sharing diff options Patrick Mezard <pmezard@gmail.com> parents: 10114 diff changeset	1765 diffopts = self.diffopts({'git': git})
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1766 for r in rev:
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1767 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	1768 n = repo.changelog.node(r)
7639 ae7a614a6a57 mq: remove import of revlog Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	1769 if p2 != nullrev:
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1770 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	1771 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	1772 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	1773 % (r, lastparent))
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1774 lastparent = p1
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1775
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1776 if not patchname:
4037 bbdba01cce28 Enforce unixish style for all generated patch names. Patrick Mezard <pmezard@gmail.com> parents: 4016 diff changeset	1777 patchname = normname('%d.diff' % r)
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1778 checkseries(patchname)
14423 7230aef66b7c mq: use checkpatchname Idan Kamara <idankk86@gmail.com> parents: 14422 diff changeset	1779 self.checkpatchname(patchname, force)
14572 8ff2957c1d82 mq: rename full_series to fullseries Adrian Buehlmann <adrian@cadifra.com> parents: 14564 diff changeset	1780 self.fullseries.insert(0, patchname)
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1781
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1782 patchf = self.opener(patchname, "w")
10611 e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10591 diff changeset	1783 cmdutil.export(repo, [n], fp=patchf, opts=diffopts)
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1784 patchf.close()
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1785
10678 da2a0c9c895d mq: avoid many hex/bin conversions, keep the binary node when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10663 diff changeset	1786 se = statusentry(n, patchname)
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1787 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	1788
11462 1b82a26635d7 mq: qimport cleanup on fail (issue2214) Vishakh H <vsh426@gmail.com> parents: 11439 diff changeset	1789 self.added.append(patchname)
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1790 patchname = None
14575 845c864200d0 mq: rename parse_series to parseseries Adrian Buehlmann <adrian@cadifra.com> parents: 14574 diff changeset	1791 self.parseseries()
14592 fc94add69d9f mq: rename applied_dirty to applieddirty Adrian Buehlmann <adrian@cadifra.com> parents: 14591 diff changeset	1792 self.applieddirty = 1
14593 599a72895c0d mq: rename series_dirty to seriesdirty Adrian Buehlmann <adrian@cadifra.com> parents: 14592 diff changeset	1793 self.seriesdirty = True
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1794
10687 583adcf63f80 mq: use xrange/enumerate instead of += 1 Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10686 diff changeset	1795 for i, filename in enumerate(files):
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1796 if existing:
3547 891c8d20f80f mq: support qimport - Brendan Cully <brendan@kublai.com> parents: 3492 diff changeset	1797 if filename == '-':
891c8d20f80f mq: support qimport - Brendan Cully <brendan@kublai.com> parents: 3492 diff changeset	1798 raise util.Abort(_('-e is incompatible with import from -'))
11699 da0b9109186d mq: support "qimport --existing --name renametothis thatexistingpatch" Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11644 diff changeset	1799 filename = normname(filename)
14584 3343a74eea4e mq: rename check_reserved_name to checkreservedname Adrian Buehlmann <adrian@cadifra.com> parents: 14583 diff changeset	1800 self.checkreservedname(filename)
11699 da0b9109186d mq: support "qimport --existing --name renametothis thatexistingpatch" Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11644 diff changeset	1801 originpath = self.join(filename)
da0b9109186d mq: support "qimport --existing --name renametothis thatexistingpatch" Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11644 diff changeset	1802 if not os.path.isfile(originpath):
da0b9109186d mq: support "qimport --existing --name renametothis thatexistingpatch" Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11644 diff changeset	1803 raise util.Abort(_("patch %s does not exist") % filename)
da0b9109186d mq: support "qimport --existing --name renametothis thatexistingpatch" Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11644 diff changeset	1804
da0b9109186d mq: support "qimport --existing --name renametothis thatexistingpatch" Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11644 diff changeset	1805 if patchname:
14423 7230aef66b7c mq: use checkpatchname Idan Kamara <idankk86@gmail.com> parents: 14422 diff changeset	1806 self.checkpatchname(patchname, force)
11699 da0b9109186d mq: support "qimport --existing --name renametothis thatexistingpatch" Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11644 diff changeset	1807
da0b9109186d mq: support "qimport --existing --name renametothis thatexistingpatch" Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11644 diff changeset	1808 self.ui.write(_('renaming %s to %s\n')
da0b9109186d mq: support "qimport --existing --name renametothis thatexistingpatch" Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11644 diff changeset	1809 % (filename, patchname))
11701 84fb29f5e0d2 mq: fix qimport --name --existing --force on win32 Patrick Mezard <pmezard@gmail.com> parents: 11700 diff changeset	1810 util.rename(originpath, self.join(patchname))
11699 da0b9109186d mq: support "qimport --existing --name renametothis thatexistingpatch" Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11644 diff changeset	1811 else:
da0b9109186d mq: support "qimport --existing --name renametothis thatexistingpatch" Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11644 diff changeset	1812 patchname = filename
da0b9109186d mq: support "qimport --existing --name renametothis thatexistingpatch" Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11644 diff changeset	1813
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1814 else:
14395 dc961471efde mq: check patch name is valid before reading imported file Idan Kamara <idankk86@gmail.com> parents: 14382 diff changeset	1815 if filename == '-' and not patchname:
dc961471efde mq: check patch name is valid before reading imported file Idan Kamara <idankk86@gmail.com> parents: 14382 diff changeset	1816 raise util.Abort(_('need --name to import a patch from -'))
dc961471efde mq: check patch name is valid before reading imported file Idan Kamara <idankk86@gmail.com> parents: 14382 diff changeset	1817 elif not patchname:
14396 170747a3e139 mq: strip all leading slashes from url when importing Idan Kamara <idankk86@gmail.com> parents: 14395 diff changeset	1818 patchname = normname(os.path.basename(filename.rstrip('/')))
14423 7230aef66b7c mq: use checkpatchname Idan Kamara <idankk86@gmail.com> parents: 14422 diff changeset	1819 self.checkpatchname(patchname, force)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1820 try:
3547 891c8d20f80f mq: support qimport - Brendan Cully <brendan@kublai.com> parents: 3492 diff changeset	1821 if filename == '-':
14636 b98063487a6f mq: use ui.fin when importing patch from '-' Idan Kamara <idankk86@gmail.com> parents: 14635 diff changeset	1822 text = self.ui.fin.read()
3547 891c8d20f80f mq: support qimport - Brendan Cully <brendan@kublai.com> parents: 3492 diff changeset	1823 else:
13400 14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 13373 diff changeset	1824 fp = url.open(self.ui, filename)
14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 13373 diff changeset	1825 text = fp.read()
14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 13373 diff changeset	1826 fp.close()
7421 4c4324476be6 Catch both IOError and OSError, fix regression introduced by 8046f0a070a6 Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7414 diff changeset	1827 except (OSError, IOError):
11709 3e561b6af810 mq: clarify the fact that qimport is trying to read a file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11637 diff changeset	1828 raise util.Abort(_("unable to read file %s") % filename)
3133 15fde1970003 qimport: rename patch to patchname to avoid shadowing module Brendan Cully <brendan@kublai.com> parents: 3091 diff changeset	1829 patchf = self.opener(patchname, "w")
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1830 patchf.write(text)
13400 14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 13373 diff changeset	1831 patchf.close()
7160 1b7b21b634f2 mq: make qimport -f work properly. Closes issue1255. Brendan Cully <brendan@kublai.com> parents: 7158 diff changeset	1832 if not force:
1b7b21b634f2 mq: make qimport -f work properly. Closes issue1255. Brendan Cully <brendan@kublai.com> parents: 7158 diff changeset	1833 checkseries(patchname)
1b7b21b634f2 mq: make qimport -f work properly. Closes issue1255. Brendan Cully <brendan@kublai.com> parents: 7158 diff changeset	1834 if patchname not in self.series:
14585 74bf9c84cfd0 mq: rename full_series_end to fullseriesend Adrian Buehlmann <adrian@cadifra.com> parents: 14584 diff changeset	1835 index = self.fullseriesend() + i
14572 8ff2957c1d82 mq: rename full_series to fullseries Adrian Buehlmann <adrian@cadifra.com> parents: 14564 diff changeset	1836 self.fullseries[index:index] = [patchname]
14575 845c864200d0 mq: rename parse_series to parseseries Adrian Buehlmann <adrian@cadifra.com> parents: 14574 diff changeset	1837 self.parseseries()
14593 599a72895c0d mq: rename series_dirty to seriesdirty Adrian Buehlmann <adrian@cadifra.com> parents: 14592 diff changeset	1838 self.seriesdirty = True
7597 81f68565281c mq, i18n: mark strings for translation Martin Geisler <mg@daimi.au.dk> parents: 7454 diff changeset	1839 self.ui.warn(_("adding %s to series file\n") % patchname)
11462 1b82a26635d7 mq: qimport cleanup on fail (issue2214) Vishakh H <vsh426@gmail.com> parents: 11439 diff changeset	1840 self.added.append(patchname)
3133 15fde1970003 qimport: rename patch to patchname to avoid shadowing module Brendan Cully <brendan@kublai.com> parents: 3091 diff changeset	1841 patchname = None
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1842
13409 9e5df8719ad4 mq: remove undo after a qimport Andr? Sintzoff <andre.sintzoff@gmail.com> parents: 13400 diff changeset	1843 self.removeundo(repo)
9e5df8719ad4 mq: remove undo after a qimport Andr? Sintzoff <andre.sintzoff@gmail.com> parents: 13400 diff changeset	1844
14298 21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	1845 @command("qdelete\|qremove\|qrm",
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	1846 [('k', 'keep', None, _('keep patch file')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	1847 ('r', 'rev', [],
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	1848 _('stop managing a revision (DEPRECATED)'), _('REV'))],
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	1849 _('hg qdelete [-k] [PATCH]...'))
3373 9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	1850 def delete(ui, repo, patches, *opts):
2905 790fd342b6c7 Allow qdel to delete multiple patches. Brendan Cully <brendan@kublai.com> parents: 2904 diff changeset	1851 """remove patches from queue
2752 5dfeda163bb7 Add -f option to qdelete, to remove patch file. Brendan Cully <brendan@kublai.com> parents: 2751 diff changeset	1852
8929 cb05e2a00291 mq: compact & rewrap documentation for qdelete command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8904 diff changeset	1853 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	1854 -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	1855
8be38b624902 mq: no longer mention the deprecated qdelete's --revision option C?dric Duval <cedricduval@free.fr> parents: 8894 diff changeset	1856 To stop managing a patch and move it into permanent history,
11307 7f72031d4047 mq: use hg reST role some more Martin Geisler <mg@aragost.com> parents: 11303 diff changeset	1857 use the :hg:`qfinish` command."""
2724 9c41ae1908c7 mq: replace module-wide repo hash with a repo attribute Brendan Cully <brendan@kublai.com> parents: 2723 diff changeset	1858 q = repo.mq
3373 9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	1859 q.delete(repo, patches, opts)
14580 92101ea35015 mq: rename save_dirty to savedirty Adrian Buehlmann <adrian@cadifra.com> parents: 14579 diff changeset	1860 q.savedirty()
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1861 return 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1862
14298 21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	1863 @command("qapplied",
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	1864 [('1', 'last', None, _('show only the last patch'))
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	1865 ] + seriesopts,
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	1866 _('hg qapplied [-1] [-s] [PATCH]'))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1867 def applied(ui, repo, patch=None, **opts):
12538 c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	1868 """print the patches already applied
c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	1869
c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	1870 Returns 0 on success."""
9364 c7c2dd7524dd mq: add options to qapplied/qunapplied to act like qprev/qnext Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9338 diff changeset	1871
3183 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1872 q = repo.mq
9364 c7c2dd7524dd mq: add options to qapplied/qunapplied to act like qprev/qnext Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9338 diff changeset	1873
3183 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1874 if patch:
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1875 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	1876 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	1877 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	1878 else:
14586 af91cb281975 mq: rename series_end to seriesend Adrian Buehlmann <adrian@cadifra.com> parents: 14585 diff changeset	1879 end = q.seriesend(True)
9364 c7c2dd7524dd mq: add options to qapplied/qunapplied to act like qprev/qnext Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9338 diff changeset	1880
c7c2dd7524dd mq: add options to qapplied/qunapplied to act like qprev/qnext Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9338 diff changeset	1881 if opts.get('last') and not end:
c7c2dd7524dd mq: add options to qapplied/qunapplied to act like qprev/qnext Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9338 diff changeset	1882 ui.write(_("no patches applied\n"))
c7c2dd7524dd mq: add options to qapplied/qunapplied to act like qprev/qnext Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9338 diff changeset	1883 return 1
c7c2dd7524dd mq: add options to qapplied/qunapplied to act like qprev/qnext Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9338 diff changeset	1884 elif opts.get('last') and end == 1:
c7c2dd7524dd mq: add options to qapplied/qunapplied to act like qprev/qnext Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9338 diff changeset	1885 ui.write(_("only one patch applied\n"))
c7c2dd7524dd mq: add options to qapplied/qunapplied to act like qprev/qnext Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9338 diff changeset	1886 return 1
c7c2dd7524dd mq: add options to qapplied/qunapplied to act like qprev/qnext Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9338 diff changeset	1887 elif opts.get('last'):
c7c2dd7524dd mq: add options to qapplied/qunapplied to act like qprev/qnext Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9338 diff changeset	1888 start = end - 2
c7c2dd7524dd mq: add options to qapplied/qunapplied to act like qprev/qnext Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9338 diff changeset	1889 end = 1
c7c2dd7524dd mq: add options to qapplied/qunapplied to act like qprev/qnext Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9338 diff changeset	1890 else:
c7c2dd7524dd mq: add options to qapplied/qunapplied to act like qprev/qnext Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9338 diff changeset	1891 start = 0
c7c2dd7524dd mq: add options to qapplied/qunapplied to act like qprev/qnext Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9338 diff changeset	1892
12539 dece1f46f7a2 mq: removed return from callers to patchheader.qseries Erik Zielke <ez@aragost.com> parents: 12538 diff changeset	1893 q.qseries(repo, length=end, start=start, status='A',
dece1f46f7a2 mq: removed return from callers to patchheader.qseries Erik Zielke <ez@aragost.com> parents: 12538 diff changeset	1894 summary=opts.get('summary'))
dece1f46f7a2 mq: removed return from callers to patchheader.qseries Erik Zielke <ez@aragost.com> parents: 12538 diff changeset	1895
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1896
14298 21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	1897 @command("qunapplied",
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	1898 [('1', 'first', None, _('show only the first patch'))] + seriesopts,
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	1899 _('hg qunapplied [-1] [-s] [PATCH]'))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1900 def unapplied(ui, repo, patch=None, **opts):
12538 c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	1901 """print the patches not yet applied
c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	1902
c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	1903 Returns 0 on success."""
9364 c7c2dd7524dd mq: add options to qapplied/qunapplied to act like qprev/qnext Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9338 diff changeset	1904
3183 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1905 q = repo.mq
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1906 if patch:
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1907 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	1908 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	1909 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	1910 else:
14586 af91cb281975 mq: rename series_end to seriesend Adrian Buehlmann <adrian@cadifra.com> parents: 14585 diff changeset	1911 start = q.seriesend(True)
9364 c7c2dd7524dd mq: add options to qapplied/qunapplied to act like qprev/qnext Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9338 diff changeset	1912
c7c2dd7524dd mq: add options to qapplied/qunapplied to act like qprev/qnext Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9338 diff changeset	1913 if start == len(q.series) and opts.get('first'):
c7c2dd7524dd mq: add options to qapplied/qunapplied to act like qprev/qnext Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9338 diff changeset	1914 ui.write(_("all patches applied\n"))
c7c2dd7524dd mq: add options to qapplied/qunapplied to act like qprev/qnext Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9338 diff changeset	1915 return 1
c7c2dd7524dd mq: add options to qapplied/qunapplied to act like qprev/qnext Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9338 diff changeset	1916
c7c2dd7524dd mq: add options to qapplied/qunapplied to act like qprev/qnext Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9338 diff changeset	1917 length = opts.get('first') and 1 or None
12539 dece1f46f7a2 mq: removed return from callers to patchheader.qseries Erik Zielke <ez@aragost.com> parents: 12538 diff changeset	1918 q.qseries(repo, start=start, length=length, status='U',
dece1f46f7a2 mq: removed return from callers to patchheader.qseries Erik Zielke <ez@aragost.com> parents: 12538 diff changeset	1919 summary=opts.get('summary'))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1920
14298 21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	1921 @command("qimport",
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	1922 [('e', 'existing', None, _('import file in patch directory')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	1923 ('n', 'name', '',
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	1924 _('name of patch file'), _('NAME')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	1925 ('f', 'force', None, _('overwrite existing files')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	1926 ('r', 'rev', [],
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	1927 _('place existing revisions under mq control'), _('REV')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	1928 ('g', 'git', None, _('use git extended diff format')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	1929 ('P', 'push', None, _('qpush after importing'))],
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	1930 _('hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE...'))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1931 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	1932 """import a patch
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1933
7994 3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1934 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	1935 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	1936 to the series.
d6caebe9c293 mq: qimport: explain insertion point in doc string Adrian Buehlmann <adrian@cadifra.com> parents: 6627 diff changeset	1937
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1938 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	1939 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	1940
7994 3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1941 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	1942 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	1943
8076 5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	1944 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	1945 overwritten.
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1946
8076 5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	1947 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	1948 (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	1949 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	1950 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	1951 important for preserving rename/copy information and permission
13528 73bf872a91d8 mq: mention qfinish in qimport help Patrick Mezard <pmezard@gmail.com> parents: 13520 diff changeset	1952 changes. Use :hg:`qfinish` to remove changesets from mq control.
8075 1f0a5a5fff43 Update qimport help explaining how to read a patch from stdin (Issue371) David Frey <dpfrey@shaw.ca> parents: 8028 diff changeset	1953
1f0a5a5fff43 Update qimport help explaining how to read a patch from stdin (Issue371) David Frey <dpfrey@shaw.ca> parents: 8028 diff changeset	1954 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	1955 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	1956 using the --name flag.
11700 52c863295754 mq: document possible combination of -e and -n for qimport Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11699 diff changeset	1957
11706 5fdf08b6b50c mq: correct qimport documentation Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11701 diff changeset	1958 To import an existing patch while renaming it::
11700 52c863295754 mq: document possible combination of -e and -n for qimport Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11699 diff changeset	1959
52c863295754 mq: document possible combination of -e and -n for qimport Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11699 diff changeset	1960 hg qimport -e existing-patch -n new-name
12538 c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	1961
c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	1962 Returns 0 if import succeeded.
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3133 diff changeset	1963 """
2724 9c41ae1908c7 mq: replace module-wide repo hash with a repo attribute Brendan Cully <brendan@kublai.com> parents: 2723 diff changeset	1964 q = repo.mq
11462 1b82a26635d7 mq: qimport cleanup on fail (issue2214) Vishakh H <vsh426@gmail.com> parents: 11439 diff changeset	1965 try:
12281 d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	1966 q.qimport(repo, filename, patchname=opts.get('name'),
d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	1967 existing=opts.get('existing'), force=opts.get('force'),
d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	1968 rev=opts.get('rev'), git=opts.get('git'))
11462 1b82a26635d7 mq: qimport cleanup on fail (issue2214) Vishakh H <vsh426@gmail.com> parents: 11439 diff changeset	1969 finally:
14580 92101ea35015 mq: rename save_dirty to savedirty Adrian Buehlmann <adrian@cadifra.com> parents: 14579 diff changeset	1970 q.savedirty()
8362 bbc74c05b8a4 mq: add -P/--push option to qimport Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8288 diff changeset	1971
bbc74c05b8a4 mq: add -P/--push option to qimport Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8288 diff changeset	1972 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	1973 return q.push(repo, None)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1974 return 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1975
10480 3076b39d7f3e mq: unify implementation of qinit and init -Q Brendan Cully <brendan@kublai.com> parents: 10476 diff changeset	1976 def qinit(ui, repo, create):
3076b39d7f3e mq: unify implementation of qinit and init -Q Brendan Cully <brendan@kublai.com> parents: 10476 diff changeset	1977 """initialize a new queue repository
2754 19041b8cbc86 Add more verbose help text to mq commands. Brendan Cully <brendan@kublai.com> parents: 2753 diff changeset	1978
10480 3076b39d7f3e mq: unify implementation of qinit and init -Q Brendan Cully <brendan@kublai.com> parents: 10476 diff changeset	1979 This command also creates a series file for ordering patches, and
3076b39d7f3e mq: unify implementation of qinit and init -Q Brendan Cully <brendan@kublai.com> parents: 10476 diff changeset	1980 an mq-specific .hgignore file in the queue repository, to exclude
12538 c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	1981 the status and guards files (these contain mostly transient state).
c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	1982
c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	1983 Returns 0 if initialization succeeded."""
2724 9c41ae1908c7 mq: replace module-wide repo hash with a repo attribute Brendan Cully <brendan@kublai.com> parents: 2723 diff changeset	1984 q = repo.mq
10480 3076b39d7f3e mq: unify implementation of qinit and init -Q Brendan Cully <brendan@kublai.com> parents: 10476 diff changeset	1985 r = q.init(repo, create)
14580 92101ea35015 mq: rename save_dirty to savedirty Adrian Buehlmann <adrian@cadifra.com> parents: 14579 diff changeset	1986 q.savedirty()
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1987 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	1988 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	1989 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	1990 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	1991 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	1992 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	1993 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	1994 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	1995 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	1996 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	1997 r.wopener('series', 'w').close()
11303 a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11302 diff changeset	1998 r[None].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	1999 commands.add(ui, r)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2000 return 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2001
14298 21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2002 @command("^qinit",
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2003 [('c', 'create-repo', None, _('create queue repository'))],
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2004 _('hg qinit [-c]'))
10480 3076b39d7f3e mq: unify implementation of qinit and init -Q Brendan Cully <brendan@kublai.com> parents: 10476 diff changeset	2005 def init(ui, repo, **opts):
3076b39d7f3e mq: unify implementation of qinit and init -Q Brendan Cully <brendan@kublai.com> parents: 10476 diff changeset	2006 """init a new queue repository (DEPRECATED)
3076b39d7f3e mq: unify implementation of qinit and init -Q Brendan Cully <brendan@kublai.com> parents: 10476 diff changeset	2007
3076b39d7f3e mq: unify implementation of qinit and init -Q Brendan Cully <brendan@kublai.com> parents: 10476 diff changeset	2008 The queue repository is unversioned by default. If
3076b39d7f3e mq: unify implementation of qinit and init -Q Brendan Cully <brendan@kublai.com> parents: 10476 diff changeset	2009 -c/--create-repo is specified, qinit will create a separate nested
3076b39d7f3e mq: unify implementation of qinit and init -Q Brendan Cully <brendan@kublai.com> parents: 10476 diff changeset	2010 repository for patches (qinit -c may also be run later to convert
3076b39d7f3e mq: unify implementation of qinit and init -Q Brendan Cully <brendan@kublai.com> parents: 10476 diff changeset	2011 an unversioned patch repository into a versioned one). You can use
3076b39d7f3e mq: unify implementation of qinit and init -Q Brendan Cully <brendan@kublai.com> parents: 10476 diff changeset	2012 qcommit to commit changes to this queue repository.
3076b39d7f3e mq: unify implementation of qinit and init -Q Brendan Cully <brendan@kublai.com> parents: 10476 diff changeset	2013
3076b39d7f3e mq: unify implementation of qinit and init -Q Brendan Cully <brendan@kublai.com> parents: 10476 diff changeset	2014 This command is deprecated. Without -c, it's implied by other relevant
11193 687c7d395f20 Use our custom hg reStructuredText role some more Martin Geisler <mg@aragost.com> parents: 11121 diff changeset	2015 commands. With -c, use :hg:`init --mq` instead."""
12281 d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2016 return qinit(ui, repo, create=opts.get('create_repo'))
10480 3076b39d7f3e mq: unify implementation of qinit and init -Q Brendan Cully <brendan@kublai.com> parents: 10476 diff changeset	2017
14298 21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2018 @command("qclone",
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2019 [('', 'pull', None, _('use pull protocol to copy metadata')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2020 ('U', 'noupdate', None, _('do not update the new working directories')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2021 ('', 'uncompressed', None,
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2022 _('use uncompressed transfer (fast over LAN)')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2023 ('p', 'patches', '',
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2024 _('location of source patch repository'), _('REPO')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2025 ] + commands.remoteopts,
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2026 _('hg qclone [OPTION]... SOURCE [DEST]'))
2720 c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	2027 def clone(ui, source, dest=None, **opts):
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	2028 '''clone main and patch repository at same time
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	2029
7983 7b813bdbd5d0 Change double spaces to single spaces in help texts. Martin Geisler <mg@daimi.au.dk> parents: 7874 diff changeset	2030 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	2031 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	2032 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	2033 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	2034 before that it has no patches applied.
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	2035
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	2036 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	2037 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	2038
8760 bf17aeafb869 Spell Mercurial as a proper noun timeless <timeless@gmail.com> parents: 8711 diff changeset	2039 The patch directory must be a nested Mercurial repository, as
11193 687c7d395f20 Use our custom hg reStructuredText role some more Martin Geisler <mg@aragost.com> parents: 11121 diff changeset	2040 would be created by :hg:`init --mq`.
12538 c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2041
c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2042 Return 0 on success.
2720 c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	2043 '''
5226 438ff951df70 avoid double slash problem mentioned in issue695 Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5180 diff changeset	2044 def patchdir(repo):
438ff951df70 avoid double slash problem mentioned in issue695 Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5180 diff changeset	2045 url = repo.url()
438ff951df70 avoid double slash problem mentioned in issue695 Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5180 diff changeset	2046 if url.endswith('/'):
438ff951df70 avoid double slash problem mentioned in issue695 Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5180 diff changeset	2047 url = url[:-1]
438ff951df70 avoid double slash problem mentioned in issue695 Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5180 diff changeset	2048 return url + '/.hg/patches'
2720 c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	2049 if dest is None:
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	2050 dest = hg.defaultdest(source)
11273 d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11271 diff changeset	2051 sr = hg.repository(hg.remoteui(ui, opts), ui.expandpath(source))
12281 d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2052 if opts.get('patches'):
d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2053 patchespath = ui.expandpath(opts.get('patches'))
7729 dd08e1e0cea1 mq: allow qclone's -p option to use path alias John Mulligan <phlogistonjohn@asynchrono.us> parents: 7639 diff changeset	2054 else:
dd08e1e0cea1 mq: allow qclone's -p option to use path alias John Mulligan <phlogistonjohn@asynchrono.us> parents: 7639 diff changeset	2055 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	2056 try:
7874 d812029cda85 cleanup: drop variables for unused return values Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7782 diff changeset	2057 hg.repository(ui, patchespath)
7637 1d54e2f6c0b7 error: move repo errors Matt Mackall <mpm@selenic.com> parents: 7627 diff changeset	2058 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	2059 raise util.Abort(_('versioned patch repository not found'
10690 ea85c01c7835 mq: no longer refer to deprecated qinit -c command C?dric Duval <cedricduval@free.fr> parents: 10689 diff changeset	2060 ' (see init --mq)'))
2720 c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	2061 qbase, destrev = None, None
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	2062 if sr.local():
2725 9ffee4f07323 mq: update to handle repomap not longer used Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2724 diff changeset	2063 if sr.mq.applied:
10678 da2a0c9c895d mq: avoid many hex/bin conversions, keep the binary node when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10663 diff changeset	2064 qbase = sr.mq.applied[0].node
2720 c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	2065 if not hg.islocal(dest):
8152 08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8151 diff changeset	2066 heads = set(sr.heads())
08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8151 diff changeset	2067 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	2068 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	2069 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	2070 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	2071 qbase = sr.lookup('qbase')
7637 1d54e2f6c0b7 error: move repo errors Matt Mackall <mpm@selenic.com> parents: 7627 diff changeset	2072 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	2073 pass
8027 9c7ca86fc658 expand "repo" to "repository" in help texts Martin Geisler <mg@lazybytes.net> parents: 8026 diff changeset	2074 ui.note(_('cloning main repository\n'))
14553 d976542986d2 hg: add opts argument to clone for internal remoteui Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14529 diff changeset	2075 sr, dr = hg.clone(ui, opts, sr.url(), dest,
12281 d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2076 pull=opts.get('pull'),
2720 c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	2077 rev=destrev,
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	2078 update=False,
12281 d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2079 stream=opts.get('uncompressed'))
8027 9c7ca86fc658 expand "repo" to "repository" in help texts Martin Geisler <mg@lazybytes.net> parents: 8026 diff changeset	2080 ui.note(_('cloning patch repository\n'))
14553 d976542986d2 hg: add opts argument to clone for internal remoteui Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14529 diff changeset	2081 hg.clone(ui, opts, opts.get('patches') or patchdir(sr), patchdir(dr),
12281 d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2082 pull=opts.get('pull'), update=not opts.get('noupdate'),
d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2083 stream=opts.get('uncompressed'))
2720 c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	2084 if dr.local():
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	2085 if qbase:
8027 9c7ca86fc658 expand "repo" to "repository" in help texts Martin Geisler <mg@lazybytes.net> parents: 8026 diff changeset	2086 ui.note(_('stripping applied patches from destination '
9c7ca86fc658 expand "repo" to "repository" in help texts Martin Geisler <mg@lazybytes.net> parents: 8026 diff changeset	2087 'repository\n'))
11789 e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11767 diff changeset	2088 dr.mq.strip(dr, [qbase], update=False, backup=None)
12281 d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2089 if not opts.get('noupdate'):
8027 9c7ca86fc658 expand "repo" to "repository" in help texts Martin Geisler <mg@lazybytes.net> parents: 8026 diff changeset	2090 ui.note(_('updating destination repository\n'))
2775 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: 2772 diff changeset	2091 hg.update(dr, dr.changelog.tip())
2720 c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2713 diff changeset	2092
14298 21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2093 @command("qcommit\|qci",
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2094 commands.table["^commit\|ci"][1],
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2095 _('hg qcommit [OPTION]... [FILE]...'))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2096 def commit(ui, repo, pats, *opts):
10361 49cd2e7fd91c mq: deprecate qinit and qcommit Dirkjan Ochtman <djc.ochtman@kentyde.com> parents: 10360 diff changeset	2097 """commit changes in the queue repository (DEPRECATED)
49cd2e7fd91c mq: deprecate qinit and qcommit Dirkjan Ochtman <djc.ochtman@kentyde.com> parents: 10360 diff changeset	2098
11193 687c7d395f20 Use our custom hg reStructuredText role some more Martin Geisler <mg@aragost.com> parents: 11121 diff changeset	2099 This command is deprecated; use :hg:`commit --mq` instead."""
2724 9c41ae1908c7 mq: replace module-wide repo hash with a repo attribute Brendan Cully <brendan@kublai.com> parents: 2723 diff changeset	2100 q = repo.mq
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2101 r = q.qrepo()
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10276 diff changeset	2102 if not r:
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10276 diff changeset	2103 raise util.Abort('no queue repository')
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2104 commands.commit(r.ui, r, pats, *opts)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2105
14298 21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2106 @command("qseries",
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2107 [('m', 'missing', None, _('print patches not in series')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2108 ] + seriesopts,
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2109 _('hg qseries [-ms]'))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2110 def series(ui, repo, **opts):
12538 c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2111 """print the entire series file
c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2112
c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2113 Returns 0 on success."""
12281 d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2114 repo.mq.qseries(repo, missing=opts.get('missing'), summary=opts.get('summary'))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2115 return 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2116
14468 755aabb3eada mq: no need to make a copy of seriesopts Idan Kamara <idankk86@gmail.com> parents: 14464 diff changeset	2117 @command("qtop", seriesopts, _('hg qtop [-s]'))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2118 def top(ui, repo, **opts):
12538 c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2119 """print the name of the current patch
c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2120
c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2121 Returns 0 on success."""
3183 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	2122 q = repo.mq
14586 af91cb281975 mq: rename series_end to seriesend Adrian Buehlmann <adrian@cadifra.com> parents: 14585 diff changeset	2123 t = q.applied and q.seriesend(True) or 0
3183 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	2124 if t:
12539 dece1f46f7a2 mq: removed return from callers to patchheader.qseries Erik Zielke <ez@aragost.com> parents: 12538 diff changeset	2125 q.qseries(repo, start=t - 1, length=1, status='A',
dece1f46f7a2 mq: removed return from callers to patchheader.qseries Erik Zielke <ez@aragost.com> parents: 12538 diff changeset	2126 summary=opts.get('summary'))
3183 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	2127 else:
7627 fb32ae9c76e7 mq: lowercase output Martin Geisler <mg@daimi.au.dk> parents: 7621 diff changeset	2128 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	2129 return 1
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2130
14468 755aabb3eada mq: no need to make a copy of seriesopts Idan Kamara <idankk86@gmail.com> parents: 14464 diff changeset	2131 @command("qnext", seriesopts, _('hg qnext [-s]'))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2132 def next(ui, repo, **opts):
12538 c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2133 """print the name of the next patch
c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2134
c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2135 Returns 0 on success."""
3183 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	2136 q = repo.mq
14586 af91cb281975 mq: rename series_end to seriesend Adrian Buehlmann <adrian@cadifra.com> parents: 14585 diff changeset	2137 end = q.seriesend()
3183 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	2138 if end == len(q.series):
7627 fb32ae9c76e7 mq: lowercase output Martin Geisler <mg@daimi.au.dk> parents: 7621 diff changeset	2139 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	2140 return 1
12539 dece1f46f7a2 mq: removed return from callers to patchheader.qseries Erik Zielke <ez@aragost.com> parents: 12538 diff changeset	2141 q.qseries(repo, start=end, length=1, summary=opts.get('summary'))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2142
14468 755aabb3eada mq: no need to make a copy of seriesopts Idan Kamara <idankk86@gmail.com> parents: 14464 diff changeset	2143 @command("qprev", seriesopts, _('hg qprev [-s]'))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2144 def prev(ui, repo, **opts):
12538 c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2145 """print the name of the previous patch
c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2146
c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2147 Returns 0 on success."""
3183 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	2148 q = repo.mq
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	2149 l = len(q.applied)
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	2150 if l == 1:
7627 fb32ae9c76e7 mq: lowercase output Martin Geisler <mg@daimi.au.dk> parents: 7621 diff changeset	2151 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	2152 return 1
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	2153 if not l:
7627 fb32ae9c76e7 mq: lowercase output Martin Geisler <mg@daimi.au.dk> parents: 7621 diff changeset	2154 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	2155 return 1
12539 dece1f46f7a2 mq: removed return from callers to patchheader.qseries Erik Zielke <ez@aragost.com> parents: 12538 diff changeset	2156 q.qseries(repo, start=l - 2, length=1, status='A',
dece1f46f7a2 mq: removed return from callers to patchheader.qseries Erik Zielke <ez@aragost.com> parents: 12538 diff changeset	2157 summary=opts.get('summary'))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2158
5673 dd3ce7515f4d mq: add --currentuser and --user options to qnew and qrefresh peter.arrenbrecht@gmail.com parents: 5645 diff changeset	2159 def setupheaderopts(ui, opts):
9733 f16ec85f125c mq: do not call ui.username unless it is necessary Martin Geisler <mg@lazybytes.net> parents: 9725 diff changeset	2160 if not opts.get('user') and opts.get('currentuser'):
f16ec85f125c mq: do not call ui.username unless it is necessary Martin Geisler <mg@lazybytes.net> parents: 9725 diff changeset	2161 opts['user'] = ui.username()
f16ec85f125c mq: do not call ui.username unless it is necessary Martin Geisler <mg@lazybytes.net> parents: 9725 diff changeset	2162 if not opts.get('date') and opts.get('currentdate'):
f16ec85f125c mq: do not call ui.username unless it is necessary Martin Geisler <mg@lazybytes.net> parents: 9725 diff changeset	2163 opts['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	2164
14298 21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2165 @command("^qnew",
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2166 [('e', 'edit', None, _('edit commit message')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2167 ('f', 'force', None, _('import uncommitted changes (DEPRECATED)')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2168 ('g', 'git', None, _('use git extended diff format')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2169 ('U', 'currentuser', None, _('add "From: <current user>" to patch')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2170 ('u', 'user', '',
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2171 _('add "From: <USER>" to patch'), _('USER')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2172 ('D', 'currentdate', None, _('add "Date: <current date>" to patch')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2173 ('d', 'date', '',
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2174 _('add "Date: <DATE>" to patch'), _('DATE'))
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2175 ] + commands.walkopts + commands.commitopts,
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2176 _('hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]...'))
4713 c29ee52e0b68 mq: support qnew -I/-X and file name lists Brendan Cully <brendan@kublai.com> parents: 4712 diff changeset	2177 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	2178 """create a new patch
19041b8cbc86 Add more verbose help text to mq commands. Brendan Cully <brendan@kublai.com> parents: 2753 diff changeset	2179
7994 3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2180 qnew creates a new patch on top of the currently-applied patch (if
10808 1ebba857b371 mq: remove reference for deprecated -f option Wagner Bruna <wbruna@softwareexpress.com.br> parents: 10770 diff changeset	2181 any). The patch will be initialized with any outstanding changes
1ebba857b371 mq: remove reference for deprecated -f option Wagner Bruna <wbruna@softwareexpress.com.br> parents: 10770 diff changeset	2182 in the working directory. You may also use -I/--include,
8076 5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	2183 -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	2184 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	2185 as uncommitted modifications.
2754 19041b8cbc86 Add more verbose help text to mq commands. Brendan Cully <brendan@kublai.com> parents: 2753 diff changeset	2186
8076 5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	2187 -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	2188 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	2189 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	2190
8076 5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	2191 -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	2192 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	2193 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	2194
8076 5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	2195 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	2196 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	2197 is important for preserving permission changes and copy/rename
7e9a15fa6c8f update help on git diffs Matt Mackall <mpm@selenic.com> parents: 7308 diff changeset	2198 information.
12538 c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2199
c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2200 Returns 0 on successful creation of a new patch.
7306 8e46e59aaf4c mq: reflow qnew help, add help for options Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7297 diff changeset	2201 """
14635 217b7d83afc3 cmdutil, logmessage: use ui.fin when reading from '-' Idan Kamara <idankk86@gmail.com> parents: 14620 diff changeset	2202 msg = cmdutil.logmessage(ui, opts)
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10276 diff changeset	2203 def getmsg():
12281 d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2204 return ui.edit(msg, opts.get('user') or ui.username())
2724 9c41ae1908c7 mq: replace module-wide repo hash with a repo attribute Brendan Cully <brendan@kublai.com> parents: 2723 diff changeset	2205 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	2206 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	2207 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	2208 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	2209 else:
fd3cba5e73ae mq: do not invoke editor until just before patch creation. Closes issue1346. Brendan Cully <brendan@kublai.com> parents: 7142 diff changeset	2210 opts['msg'] = msg
5673 dd3ce7515f4d mq: add --currentuser and --user options to qnew and qrefresh peter.arrenbrecht@gmail.com parents: 5645 diff changeset	2211 setupheaderopts(ui, opts)
4713 c29ee52e0b68 mq: support qnew -I/-X and file name lists Brendan Cully <brendan@kublai.com> parents: 4712 diff changeset	2212 q.new(repo, patch, args, *opts)
14580 92101ea35015 mq: rename save_dirty to savedirty Adrian Buehlmann <adrian@cadifra.com> parents: 14579 diff changeset	2213 q.savedirty()
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2214 return 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2215
14298 21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2216 @command("^qrefresh",
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2217 [('e', 'edit', None, _('edit commit message')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2218 ('g', 'git', None, _('use git extended diff format')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2219 ('s', 'short', None,
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2220 _('refresh only files already in the patch and specified files')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2221 ('U', 'currentuser', None,
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2222 _('add/update author field in patch with current user')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2223 ('u', 'user', '',
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2224 _('add/update author field in patch with given user'), _('USER')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2225 ('D', 'currentdate', None,
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2226 _('add/update date field in patch with current date')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2227 ('d', 'date', '',
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2228 _('add/update date field in patch with given date'), _('DATE'))
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2229 ] + commands.walkopts + commands.commitopts,
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2230 _('hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]...'))
2938 5b7a118f5b6c allow qrefresh to take a list of files; closes #96. Brendan Cully <brendan@kublai.com> parents: 2937 diff changeset	2231 def refresh(ui, repo, pats, *opts):
2940 b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2232 """update the current patch
b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2233
7994 3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2234 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	2235 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	2236 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	2237
8076 5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	2238 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	2239 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	2240
11947 59ec12093261 mq: save qrefresh message for easy recovery in case it fails (issue2062) Renato Cunha <renatoc@gmail.com> parents: 11939 diff changeset	2241 If -e/--edit is specified, Mercurial will start your configured editor for
59ec12093261 mq: save qrefresh message for easy recovery in case it fails (issue2062) Renato Cunha <renatoc@gmail.com> parents: 11939 diff changeset	2242 you to enter a message. In case qrefresh fails, you will find a backup of
59ec12093261 mq: save qrefresh message for easy recovery in case it fails (issue2062) Renato Cunha <renatoc@gmail.com> parents: 11939 diff changeset	2243 your message in ``.hg/last-message.txt``.
59ec12093261 mq: save qrefresh message for easy recovery in case it fails (issue2062) Renato Cunha <renatoc@gmail.com> parents: 11939 diff changeset	2244
7994 3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2245 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	2246 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	2247 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	2248 git diff format.
12538 c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2249
c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2250 Returns 0 on success.
2940 b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2251 """
2724 9c41ae1908c7 mq: replace module-wide repo hash with a repo attribute Brendan Cully <brendan@kublai.com> parents: 2723 diff changeset	2252 q = repo.mq
14635 217b7d83afc3 cmdutil, logmessage: use ui.fin when reading from '-' Idan Kamara <idankk86@gmail.com> parents: 14620 diff changeset	2253 message = cmdutil.logmessage(ui, opts)
12281 d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2254 if opts.get('edit'):
5334 448eb46d4d84 mq: fix qrefresh -e with no patches applied Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5226 diff changeset	2255 if not q.applied:
7627 fb32ae9c76e7 mq: lowercase output Martin Geisler <mg@daimi.au.dk> parents: 7621 diff changeset	2256 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	2257 return 1
2746 0503eb5c0a33 Add option -e/--edit to qrefresh, to edit the existing header. Brendan Cully <brendan@kublai.com> parents: 2745 diff changeset	2258 if message:
0503eb5c0a33 Add option -e/--edit to qrefresh, to edit the existing header. Brendan Cully <brendan@kublai.com> parents: 2745 diff changeset	2259 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	2260 patch = q.applied[-1].name
10397 8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	2261 ph = patchheader(q.join(patch), q.plainmode)
7399 e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	2262 message = ui.edit('\n'.join(ph.message), ph.user or ui.username())
11947 59ec12093261 mq: save qrefresh message for easy recovery in case it fails (issue2062) Renato Cunha <renatoc@gmail.com> parents: 11939 diff changeset	2263 # We don't want to lose the patch message if qrefresh fails (issue2062)
14529 e7a1814854b9 localrepo: add savecommitmessage() to write last-message.txt Patrick Mezard <pmezard@gmail.com> parents: 14509 diff changeset	2264 repo.savecommitmessage(message)
5673 dd3ce7515f4d mq: add --currentuser and --user options to qnew and qrefresh peter.arrenbrecht@gmail.com parents: 5645 diff changeset	2265 setupheaderopts(ui, opts)
14620 2b9c32929e62 mq: make qrefresh/qfold keep wlock until saving patch status Yuya Nishihara <yuya@tcha.org> parents: 14600 diff changeset	2266 wlock = repo.wlock()
2b9c32929e62 mq: make qrefresh/qfold keep wlock until saving patch status Yuya Nishihara <yuya@tcha.org> parents: 14600 diff changeset	2267 try:
2b9c32929e62 mq: make qrefresh/qfold keep wlock until saving patch status Yuya Nishihara <yuya@tcha.org> parents: 14600 diff changeset	2268 ret = q.refresh(repo, pats, msg=message, **opts)
2b9c32929e62 mq: make qrefresh/qfold keep wlock until saving patch status Yuya Nishihara <yuya@tcha.org> parents: 14600 diff changeset	2269 q.savedirty()
2b9c32929e62 mq: make qrefresh/qfold keep wlock until saving patch status Yuya Nishihara <yuya@tcha.org> parents: 14600 diff changeset	2270 return ret
2b9c32929e62 mq: make qrefresh/qfold keep wlock until saving patch status Yuya Nishihara <yuya@tcha.org> parents: 14600 diff changeset	2271 finally:
2b9c32929e62 mq: make qrefresh/qfold keep wlock until saving patch status Yuya Nishihara <yuya@tcha.org> parents: 14600 diff changeset	2272 wlock.release()
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2273
14298 21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2274 @command("^qdiff",
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2275 commands.diffopts + commands.diffopts2 + commands.walkopts,
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2276 _('hg qdiff [OPTION]... [FILE]...'))
2937 9dc568f5e03d Fix test-mq-qdiff; add -I and -X options to qdiff Brendan Cully <brendan@kublai.com> parents: 2936 diff changeset	2277 def diff(ui, repo, pats, *opts):
6606 088ba40585b9 mq: expand help text for qdiff Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6561 diff changeset	2278 """diff of the current patch and subsequent modifications
6621 d5cbbe2c49ce mq: lose the trailing whitespace Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6611 diff changeset	2279
7994 3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2280 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	2281 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	2282 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	2283 after a qrefresh).
6621 d5cbbe2c49ce mq: lose the trailing whitespace Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6611 diff changeset	2284
10973 49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10962 diff changeset	2285 Use :hg:`diff` if you only want to see the changes made since the
49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10962 diff changeset	2286 last qrefresh, or :hg:`export qtip` if you want to see changes
49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10962 diff changeset	2287 made by the current patch without including changes made since the
7994 3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2288 qrefresh.
12538 c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2289
c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2290 Returns 0 on success.
6606 088ba40585b9 mq: expand help text for qdiff Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6561 diff changeset	2291 """
2937 9dc568f5e03d Fix test-mq-qdiff; add -I and -X options to qdiff Brendan Cully <brendan@kublai.com> parents: 2936 diff changeset	2292 repo.mq.diff(repo, pats, opts)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2293 return 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2294
14298 21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2295 @command('qfold',
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2296 [('e', 'edit', None, _('edit patch header')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2297 ('k', 'keep', None, _('keep folded patch files')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2298 ] + commands.commitopts,
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2299 _('hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH...'))
2753 84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2300 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	2301 """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	2302
2771 519bf0cd28d2 Add -f option to qfold; improve qfold documentation. Brendan Cully <brendan@kublai.com> parents: 2770 diff changeset	2303 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	2304 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	2305 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	2306 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	2307 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	2308 removed afterwards.
2771 519bf0cd28d2 Add -f option to qfold; improve qfold documentation. Brendan Cully <brendan@kublai.com> parents: 2770 diff changeset	2309
7994 3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2310 The header for each folded patch will be concatenated with the
12755 db79d3627872 mq: switched to `` around * * * Erik Zielke <ez@aragost.com> parents: 12689 diff changeset	2311 current patch header, separated by a line of ``* * *``.
12538 c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2312
c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2313 Returns 0 on success."""
2753 84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2314
2748 752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	2315 q = repo.mq
752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	2316
752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	2317 if not files:
752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	2318 raise util.Abort(_('qfold requires at least one patch name'))
14581 da40ee1adc2b mq: rename check_toppatch to checktoppatch Adrian Buehlmann <adrian@cadifra.com> parents: 14580 diff changeset	2319 if not q.checktoppatch(repo)[0]:
12067 a4fbbe0fbc38 Lowercase error messages Martin Geisler <mg@lazybytes.net> parents: 11965 diff changeset	2320 raise util.Abort(_('no patches applied'))
14583 28f87e14d923 mq: rename check_localchanges to checklocalchanges Adrian Buehlmann <adrian@cadifra.com> parents: 14582 diff changeset	2321 q.checklocalchanges(repo)
2748 752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	2322
14635 217b7d83afc3 cmdutil, logmessage: use ui.fin when reading from '-' Idan Kamara <idankk86@gmail.com> parents: 14620 diff changeset	2323 message = cmdutil.logmessage(ui, opts)
12281 d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2324 if opts.get('edit'):
2753 84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2325 if message:
84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2326 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	2327
2748 752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	2328 parent = q.lookup('qtip')
752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	2329 patches = []
752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	2330 messages = []
752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	2331 for f in files:
2936 21bf8929efc8 Fix qfold after recent changes Brendan Cully <brendan@kublai.com> parents: 2934 diff changeset	2332 p = q.lookup(f)
21bf8929efc8 Fix qfold after recent changes Brendan Cully <brendan@kublai.com> parents: 2934 diff changeset	2333 if p in patches or p == parent:
12208 482443557cad mq: add newline after qfold warning Patrick Mezard <pmezard@gmail.com> parents: 12070 diff changeset	2334 ui.warn(_('Skipping already folded patch %s\n') % p)
2936 21bf8929efc8 Fix qfold after recent changes Brendan Cully <brendan@kublai.com> parents: 2934 diff changeset	2335 if q.isapplied(p):
21bf8929efc8 Fix qfold after recent changes Brendan Cully <brendan@kublai.com> parents: 2934 diff changeset	2336 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	2337 patches.append(p)
2748 752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	2338
2936 21bf8929efc8 Fix qfold after recent changes Brendan Cully <brendan@kublai.com> parents: 2934 diff changeset	2339 for p in patches:
2753 84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2340 if not message:
10397 8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	2341 ph = patchheader(q.join(p), q.plainmode)
7454 1d5ecaa47abb mq: filter out empty commit messages in qfold Brendan Cully <brendan@kublai.com> parents: 7453 diff changeset	2342 if ph.message:
1d5ecaa47abb mq: filter out empty commit messages in qfold Brendan Cully <brendan@kublai.com> parents: 7453 diff changeset	2343 messages.append(ph.message)
2936 21bf8929efc8 Fix qfold after recent changes Brendan Cully <brendan@kublai.com> parents: 2934 diff changeset	2344 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	2345 (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	2346 if not patchsuccess:
12067 a4fbbe0fbc38 Lowercase error messages Martin Geisler <mg@lazybytes.net> parents: 11965 diff changeset	2347 raise util.Abort(_('error folding patch %s') % p)
2748 752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	2348
2753 84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2349 if not message:
10397 8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	2350 ph = patchheader(q.join(parent), q.plainmode)
7399 e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	2351 message, user = ph.message, ph.user
2753 84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2352 for msg in messages:
84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2353 message.append('* * *')
84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2354 message.extend(msg)
84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2355 message = '\n'.join(message)
84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2356
12281 d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2357 if opts.get('edit'):
2753 84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2358 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	2359
10186 296a0b14a686 mq: preserve --git flag when folding patches Patrick Mezard <pmezard@gmail.com> parents: 10185 diff changeset	2360 diffopts = q.patchopts(q.diffopts(), *patches)
14620 2b9c32929e62 mq: make qrefresh/qfold keep wlock until saving patch status Yuya Nishihara <yuya@tcha.org> parents: 14600 diff changeset	2361 wlock = repo.wlock()
2b9c32929e62 mq: make qrefresh/qfold keep wlock until saving patch status Yuya Nishihara <yuya@tcha.org> parents: 14600 diff changeset	2362 try:
2b9c32929e62 mq: make qrefresh/qfold keep wlock until saving patch status Yuya Nishihara <yuya@tcha.org> parents: 14600 diff changeset	2363 q.refresh(repo, msg=message, git=diffopts.git)
2b9c32929e62 mq: make qrefresh/qfold keep wlock until saving patch status Yuya Nishihara <yuya@tcha.org> parents: 14600 diff changeset	2364 q.delete(repo, patches, opts)
2b9c32929e62 mq: make qrefresh/qfold keep wlock until saving patch status Yuya Nishihara <yuya@tcha.org> parents: 14600 diff changeset	2365 q.savedirty()
2b9c32929e62 mq: make qrefresh/qfold keep wlock until saving patch status Yuya Nishihara <yuya@tcha.org> parents: 14600 diff changeset	2366 finally:
2b9c32929e62 mq: make qrefresh/qfold keep wlock until saving patch status Yuya Nishihara <yuya@tcha.org> parents: 14600 diff changeset	2367 wlock.release()
2748 752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	2368
14298 21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2369 @command("qgoto",
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2370 [('f', 'force', None, _('overwrite any local changes'))],
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2371 _('hg qgoto [OPTION]... PATCH'))
4432 905397be7688 mq: add qgoto command. Bryan O'Sullivan <bos@serpentine.com> parents: 4430 diff changeset	2372 def goto(ui, repo, patch, **opts):
12538 c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2373 '''push or pop patches until named patch is at top of stack
c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2374
c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2375 Returns 0 on success.'''
4432 905397be7688 mq: add qgoto command. Bryan O'Sullivan <bos@serpentine.com> parents: 4430 diff changeset	2376 q = repo.mq
905397be7688 mq: add qgoto command. Bryan O'Sullivan <bos@serpentine.com> parents: 4430 diff changeset	2377 patch = q.lookup(patch)
905397be7688 mq: add qgoto command. Bryan O'Sullivan <bos@serpentine.com> parents: 4430 diff changeset	2378 if q.isapplied(patch):
12281 d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2379 ret = q.pop(repo, patch, force=opts.get('force'))
4432 905397be7688 mq: add qgoto command. Bryan O'Sullivan <bos@serpentine.com> parents: 4430 diff changeset	2380 else:
12281 d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2381 ret = q.push(repo, patch, force=opts.get('force'))
14580 92101ea35015 mq: rename save_dirty to savedirty Adrian Buehlmann <adrian@cadifra.com> parents: 14579 diff changeset	2382 q.savedirty()
4432 905397be7688 mq: add qgoto command. Bryan O'Sullivan <bos@serpentine.com> parents: 4430 diff changeset	2383 return ret
905397be7688 mq: add qgoto command. Bryan O'Sullivan <bos@serpentine.com> parents: 4430 diff changeset	2384
14298 21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2385 @command("qguard",
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2386 [('l', 'list', None, _('list all patches and guards')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2387 ('n', 'none', None, _('drop all guards'))],
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2388 _('hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]'))
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2389 def guard(ui, repo, args, *opts):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2390 '''set or print guards for a patch
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2391
2940 b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2392 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	2393 guards is always pushed. A patch with a positive guard ("+foo") is
11307 7f72031d4047 mq: use hg reST role some more Martin Geisler <mg@aragost.com> parents: 11303 diff changeset	2394 pushed only if the :hg:`qselect` command has activated it. A patch with
7f72031d4047 mq: use hg reST role some more Martin Geisler <mg@aragost.com> parents: 11303 diff changeset	2395 a negative guard ("-foo") is never pushed if the :hg:`qselect` command
2940 b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2396 has activated it.
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2397
2940 b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2398 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	2399 With arguments, set guards for the named patch.
12389 4ac734b9b3fd Use note admonition Erik Zielke <ez@aragost.com> parents: 12380 diff changeset	2400
4ac734b9b3fd Use note admonition Erik Zielke <ez@aragost.com> parents: 12380 diff changeset	2401 .. note::
4ac734b9b3fd Use note admonition Erik Zielke <ez@aragost.com> parents: 12380 diff changeset	2402 Specifying negative guards now requires '--'.
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2403
9824 87c92b260710 mq: fix literal blocks in docstrings Martin Geisler <mg@lazybytes.net> parents: 9733 diff changeset	2404 To set guards on another patch::
87c92b260710 mq: fix literal blocks in docstrings Martin Geisler <mg@lazybytes.net> parents: 9733 diff changeset	2405
10476 3113736dbac5 mq: more instructive use of "--" in qguard help (issue2040) Martin Geisler <mg@lazybytes.net> parents: 10413 diff changeset	2406 hg qguard other.patch -- +2.6.17 -stable
12538 c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2407
c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2408 Returns 0 on success.
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2409 '''
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2410 def status(idx):
14573 d590ff1f22b2 mq: rename series_guards to seriesguards Adrian Buehlmann <adrian@cadifra.com> parents: 14572 diff changeset	2411 guards = q.seriesguards[idx] or ['unguarded']
11819 1c00577b0298 qguard: label patch names by status when listing guards Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11789 diff changeset	2412 if q.series[idx] in applied:
1c00577b0298 qguard: label patch names by status when listing guards Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11789 diff changeset	2413 state = 'applied'
1c00577b0298 qguard: label patch names by status when listing guards Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11789 diff changeset	2414 elif q.pushable(idx)[0]:
1c00577b0298 qguard: label patch names by status when listing guards Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11789 diff changeset	2415 state = 'unapplied'
1c00577b0298 qguard: label patch names by status when listing guards Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11789 diff changeset	2416 else:
1c00577b0298 qguard: label patch names by status when listing guards Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11789 diff changeset	2417 state = 'guarded'
1c00577b0298 qguard: label patch names by status when listing guards Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11789 diff changeset	2418 label = 'qguard.patch qguard.%s qseries.%s' % (state, state)
1c00577b0298 qguard: label patch names by status when listing guards Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11789 diff changeset	2419 ui.write('%s: ' % ui.label(q.series[idx], label))
1c00577b0298 qguard: label patch names by status when listing guards Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11789 diff changeset	2420
10822 4c63f8e787b8 qguard: make use of output labeling Brodie Rao <brodie@bitheap.org> parents: 10814 diff changeset	2421 for i, guard in enumerate(guards):
4c63f8e787b8 qguard: make use of output labeling Brodie Rao <brodie@bitheap.org> parents: 10814 diff changeset	2422 if guard.startswith('+'):
11310 ac873ecfc3c2 Backed out changeset: e1dde7363601 Steve Borho <steve@borho.org> parents: 11302 diff changeset	2423 ui.write(guard, label='qguard.positive')
10822 4c63f8e787b8 qguard: make use of output labeling Brodie Rao <brodie@bitheap.org> parents: 10814 diff changeset	2424 elif guard.startswith('-'):
11310 ac873ecfc3c2 Backed out changeset: e1dde7363601 Steve Borho <steve@borho.org> parents: 11302 diff changeset	2425 ui.write(guard, label='qguard.negative')
10822 4c63f8e787b8 qguard: make use of output labeling Brodie Rao <brodie@bitheap.org> parents: 10814 diff changeset	2426 else:
11310 ac873ecfc3c2 Backed out changeset: e1dde7363601 Steve Borho <steve@borho.org> parents: 11302 diff changeset	2427 ui.write(guard, label='qguard.unguarded')
10822 4c63f8e787b8 qguard: make use of output labeling Brodie Rao <brodie@bitheap.org> parents: 10814 diff changeset	2428 if i != len(guards) - 1:
11310 ac873ecfc3c2 Backed out changeset: e1dde7363601 Steve Borho <steve@borho.org> parents: 11302 diff changeset	2429 ui.write(' ')
ac873ecfc3c2 Backed out changeset: e1dde7363601 Steve Borho <steve@borho.org> parents: 11302 diff changeset	2430 ui.write('\n')
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2431 q = repo.mq
11819 1c00577b0298 qguard: label patch names by status when listing guards Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11789 diff changeset	2432 applied = set(p.name for p in q.applied)
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2433 patch = None
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2434 args = list(args)
12281 d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2435 if opts.get('list'):
d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2436 if args or opts.get('none'):
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2437 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	2438 for i in xrange(len(q.series)):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2439 status(i)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2440 return
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2441 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	2442 if not q.applied:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2443 raise util.Abort(_('no patches applied'))
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2444 patch = q.applied[-1].name
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2445 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	2446 patch = args.pop(0)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2447 if patch is None:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2448 raise util.Abort(_('no patch to work with'))
12281 d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2449 if args or opts.get('none'):
14574 12fba7bcb4f1 mq: rename find_series to findseries Adrian Buehlmann <adrian@cadifra.com> parents: 14573 diff changeset	2450 idx = q.findseries(patch)
4133 a9ee6c53af8d mq: abort cleanly when invalid patch name is given to qguard Christian Ebert <blacktrash@gmx.net> parents: 4090 diff changeset	2451 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	2452 raise util.Abort(_('no patch named %s') % patch)
14577 76357276662e mq: rename set_guards to setguards Adrian Buehlmann <adrian@cadifra.com> parents: 14576 diff changeset	2453 q.setguards(idx, args)
14580 92101ea35015 mq: rename save_dirty to savedirty Adrian Buehlmann <adrian@cadifra.com> parents: 14579 diff changeset	2454 q.savedirty()
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2455 else:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2456 status(q.series.index(q.lookup(patch)))
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2457
14298 21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2458 @command("qheader", [], _('hg qheader [PATCH]'))
2747 0016fc748f61 Add command qheader to display the header of a given patch. Brendan Cully <brendan@kublai.com> parents: 2746 diff changeset	2459 def header(ui, repo, patch=None):
12538 c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2460 """print the header of the topmost or specified patch
c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2461
c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2462 Returns 0 on success."""
2747 0016fc748f61 Add command qheader to display the header of a given patch. Brendan Cully <brendan@kublai.com> parents: 2746 diff changeset	2463 q = repo.mq
0016fc748f61 Add command qheader to display the header of a given patch. Brendan Cully <brendan@kublai.com> parents: 2746 diff changeset	2464
0016fc748f61 Add command qheader to display the header of a given patch. Brendan Cully <brendan@kublai.com> parents: 2746 diff changeset	2465 if patch:
0016fc748f61 Add command qheader to display the header of a given patch. Brendan Cully <brendan@kublai.com> parents: 2746 diff changeset	2466 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	2467 else:
0016fc748f61 Add command qheader to display the header of a given patch. Brendan Cully <brendan@kublai.com> parents: 2746 diff changeset	2468 if not q.applied:
10510 f77f3383c666 i18n: mark more strings for translation Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10498 diff changeset	2469 ui.write(_('no patches applied\n'))
3008 c203ccd7d838 qheader: exit withh meaningful error code. Bryan O'Sullivan <bos@serpentine.com> parents: 3006 diff changeset	2470 return 1
2747 0016fc748f61 Add command qheader to display the header of a given patch. Brendan Cully <brendan@kublai.com> parents: 2746 diff changeset	2471 patch = q.lookup('qtip')
10397 8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10382 diff changeset	2472 ph = patchheader(q.join(patch), q.plainmode)
2747 0016fc748f61 Add command qheader to display the header of a given patch. Brendan Cully <brendan@kublai.com> parents: 2746 diff changeset	2473
7399 e71bda2d2087 mq: create patch header class to abstract header manipulation Brendan Cully <brendan@kublai.com> parents: 7398 diff changeset	2474 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	2475
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2476 def lastsavename(path):
2794 86c54b7cd331 mq: fix variables shadowing builtin Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2792 diff changeset	2477 (directory, base) = os.path.split(path)
86c54b7cd331 mq: fix variables shadowing builtin Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2792 diff changeset	2478 names = os.listdir(directory)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2479 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	2480 maxindex = None
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2481 maxname = None
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2482 for f in names:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2483 m = namere.match(f)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2484 if m:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2485 index = int(m.group(1))
8527 f9a80054dd3c use 'x is None' instead of 'x == None' Martin Geisler <mg@lazybytes.net> parents: 8525 diff changeset	2486 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	2487 maxindex = index
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2488 maxname = f
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2489 if maxname:
2794 86c54b7cd331 mq: fix variables shadowing builtin Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2792 diff changeset	2490 return (os.path.join(directory, maxname), maxindex)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2491 return (None, None)
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2492
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2493 def savename(path):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2494 (last, index) = lastsavename(path)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2495 if last is None:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2496 index = 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2497 newpath = path + ".%d" % (index + 1)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2498 return newpath
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2499
14298 21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2500 @command("^qpush",
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2501 [('f', 'force', None, _('apply on top of local changes')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2502 ('e', 'exact', None, _('apply the target patch to its recorded parent')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2503 ('l', 'list', None, _('list patch name in commit text')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2504 ('a', 'all', None, _('apply all patches')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2505 ('m', 'merge', None, _('merge from another queue (DEPRECATED)')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2506 ('n', 'name', '',
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2507 _('merge queue name (DEPRECATED)'), _('NAME')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2508 ('', 'move', None, _('reorder patch series and apply only the patch'))],
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2509 _('hg qpush [-f] [-l] [-a] [--move] [PATCH \| INDEX]'))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2510 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	2511 """push the next patch onto the stack
6553 0bb76d168437 remove trailing spaces Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6552 diff changeset	2512
8076 5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	2513 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	2514 will be lost.
12538 c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2515
13725 6783f47d90dd mq: fix typo in docstring Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 13632 diff changeset	2516 Return 0 on success.
6552 315b36ce6251 mq: add a little documentation on qpush -f Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6382 diff changeset	2517 """
2724 9c41ae1908c7 mq: replace module-wide repo hash with a repo attribute Brendan Cully <brendan@kublai.com> parents: 2723 diff changeset	2518 q = repo.mq
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2519 mergeq = None
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2520
12281 d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2521 if opts.get('merge'):
d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2522 if opts.get('name'):
d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2523 newpath = repo.join(opts.get('name'))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2524 else:
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2525 newpath, i = lastsavename(q.path)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2526 if not newpath:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	2527 ui.warn(_("no saved queues found, please use -n\n"))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2528 return 1
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2529 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	2530 ui.warn(_("merging with queue at: %s\n") % mergeq.path)
12281 d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2531 ret = q.push(repo, patch, force=opts.get('force'), list=opts.get('list'),
13033 026053f691a4 mq: add an '-e/--exact' option to qpush Steve Losh <steve@stevelosh.com> parents: 13031 diff changeset	2532 mergeq=mergeq, all=opts.get('all'), move=opts.get('move'),
026053f691a4 mq: add an '-e/--exact' option to qpush Steve Losh <steve@stevelosh.com> parents: 13031 diff changeset	2533 exact=opts.get('exact'))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2534 return ret
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2535
14298 21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2536 @command("^qpop",
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2537 [('a', 'all', None, _('pop all patches')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2538 ('n', 'name', '',
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2539 _('queue name to pop (DEPRECATED)'), _('NAME')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2540 ('f', 'force', None, _('forget any local changes to patched files'))],
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2541 _('hg qpop [-a] [-f] [PATCH \| INDEX]'))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2542 def pop(ui, repo, patch=None, **opts):
6611 f4c612da788d mq: add correct documentation for qpop Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6610 diff changeset	2543 """pop the current patch off the stack
6621 d5cbbe2c49ce mq: lose the trailing whitespace Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6611 diff changeset	2544
7994 3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2545 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	2546 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	2547 top of the stack.
12538 c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2548
c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2549 Return 0 on success.
6611 f4c612da788d mq: add correct documentation for qpop Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6610 diff changeset	2550 """
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2551 localupdate = True
12281 d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2552 if opts.get('name'):
d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2553 q = queue(ui, repo.join(""), repo.join(opts.get('name')))
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	2554 ui.warn(_('using patch queue: %s\n') % q.path)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2555 localupdate = False
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2556 else:
2724 9c41ae1908c7 mq: replace module-wide repo hash with a repo attribute Brendan Cully <brendan@kublai.com> parents: 2723 diff changeset	2557 q = repo.mq
12281 d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2558 ret = q.pop(repo, patch, force=opts.get('force'), update=localupdate,
d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2559 all=opts.get('all'))
14580 92101ea35015 mq: rename save_dirty to savedirty Adrian Buehlmann <adrian@cadifra.com> parents: 14579 diff changeset	2560 q.savedirty()
4099 cf5580c16b13 mq: propagate the return error of pop Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4096 diff changeset	2561 return ret
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2562
14298 21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2563 @command("qrename\|qmv", [], _('hg qrename PATCH1 [PATCH2]'))
2750 8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2564 def rename(ui, repo, patch, name=None, **opts):
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2565 """rename a patch
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2566
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2567 With one argument, renames the current patch to PATCH1.
12538 c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2568 With two arguments, renames PATCH1 to PATCH2.
c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2569
c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2570 Returns 0 on success."""
2750 8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2571
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2572 q = repo.mq
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2573
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2574 if not name:
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2575 name = patch
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2576 patch = None
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2577
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2578 if patch:
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2579 patch = q.lookup(patch)
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2580 else:
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2581 if not q.applied:
7627 fb32ae9c76e7 mq: lowercase output Martin Geisler <mg@daimi.au.dk> parents: 7621 diff changeset	2582 ui.write(_('no patches applied\n'))
2750 8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2583 return
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2584 patch = q.lookup('qtip')
3083 82c9d1aac308 Make qrename handle directory targets; closes #333. Brendan Cully <brendan@kublai.com> parents: 3082 diff changeset	2585 absdest = q.join(name)
82c9d1aac308 Make qrename handle directory targets; closes #333. Brendan Cully <brendan@kublai.com> parents: 3082 diff changeset	2586 if os.path.isdir(absdest):
4037 bbdba01cce28 Enforce unixish style for all generated patch names. Patrick Mezard <pmezard@gmail.com> parents: 4016 diff changeset	2587 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	2588 absdest = q.join(name)
14423 7230aef66b7c mq: use checkpatchname Idan Kamara <idankk86@gmail.com> parents: 14422 diff changeset	2589 q.checkpatchname(name)
2750 8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2590
10510 f77f3383c666 i18n: mark more strings for translation Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10498 diff changeset	2591 ui.note(_('renaming %s to %s\n') % (patch, name))
14574 12fba7bcb4f1 mq: rename find_series to findseries Adrian Buehlmann <adrian@cadifra.com> parents: 14573 diff changeset	2592 i = q.findseries(patch)
14572 8ff2957c1d82 mq: rename full_series to fullseries Adrian Buehlmann <adrian@cadifra.com> parents: 14564 diff changeset	2593 guards = q.guard_re.findall(q.fullseries[i])
8ff2957c1d82 mq: rename full_series to fullseries Adrian Buehlmann <adrian@cadifra.com> parents: 14564 diff changeset	2594 q.fullseries[i] = name + ''.join([' #' + g for g in guards])
14575 845c864200d0 mq: rename parse_series to parseseries Adrian Buehlmann <adrian@cadifra.com> parents: 14574 diff changeset	2595 q.parseseries()
14593 599a72895c0d mq: rename series_dirty to seriesdirty Adrian Buehlmann <adrian@cadifra.com> parents: 14592 diff changeset	2596 q.seriesdirty = 1
2750 8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2597
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2598 info = q.isapplied(patch)
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2599 if info:
2818 bdc067ff6cf5 Make mq camelcase consistent with the rest of hg. Brendan Cully <brendan@kublai.com> parents: 2816 diff changeset	2600 q.applied[info[0]] = statusentry(info[1], name)
14592 fc94add69d9f mq: rename applied_dirty to applieddirty Adrian Buehlmann <adrian@cadifra.com> parents: 14591 diff changeset	2601 q.applieddirty = 1
2750 8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2602
11513 0c944b7af564 mq: fixed ENOENT when qrename to new/directory.patch Yuya Nishihara <yuya@tcha.org> parents: 11462 diff changeset	2603 destdir = os.path.dirname(absdest)
0c944b7af564 mq: fixed ENOENT when qrename to new/directory.patch Yuya Nishihara <yuya@tcha.org> parents: 11462 diff changeset	2604 if not os.path.isdir(destdir):
0c944b7af564 mq: fixed ENOENT when qrename to new/directory.patch Yuya Nishihara <yuya@tcha.org> parents: 11462 diff changeset	2605 os.makedirs(destdir)
2819 766ecdc83e43 mq: add join method Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2818 diff changeset	2606 util.rename(q.join(patch), absdest)
2750 8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2607 r = q.qrepo()
12875 b59b5193d4d0 mq: qrename should not touch the dirstate if src is untracked (issue2460) Patrick Mezard <pmezard@gmail.com> parents: 12850 diff changeset	2608 if r and patch in r.dirstate:
11303 a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11302 diff changeset	2609 wctx = r[None]
2750 8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2610 wlock = r.wlock()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	2611 try:
6648 2519976a998b mq: handle added patch renaming correctly Weijun Wang <weijun.wang@sun.com> parents: 6635 diff changeset	2612 if r.dirstate[patch] == 'a':
14434 cc8c09855d19 dirstate: rename forget to drop Matt Mackall <mpm@selenic.com> parents: 14424 diff changeset	2613 r.dirstate.drop(patch)
6648 2519976a998b mq: handle added patch renaming correctly Weijun Wang <weijun.wang@sun.com> parents: 6635 diff changeset	2614 r.dirstate.add(name)
2519976a998b mq: handle added patch renaming correctly Weijun Wang <weijun.wang@sun.com> parents: 6635 diff changeset	2615 else:
2519976a998b mq: handle added patch renaming correctly Weijun Wang <weijun.wang@sun.com> parents: 6635 diff changeset	2616 if r.dirstate[name] == 'r':
11303 a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11302 diff changeset	2617 wctx.undelete([name])
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11302 diff changeset	2618 wctx.copy(patch, name)
14435 5f6090e559fa context: make forget work like commands.forget Matt Mackall <mpm@selenic.com> parents: 14434 diff changeset	2619 wctx.forget([patch])
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	2620 finally:
8112 6ee71f78497c switch lock releasing in the extensions from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8076 diff changeset	2621 wlock.release()
2750 8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2622
14580 92101ea35015 mq: rename save_dirty to savedirty Adrian Buehlmann <adrian@cadifra.com> parents: 14579 diff changeset	2623 q.savedirty()
2750 8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2624
14298 21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2625 @command("qrestore",
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2626 [('d', 'delete', None, _('delete save entry')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2627 ('u', 'update', None, _('update queue working directory'))],
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2628 _('hg qrestore [-d] [-u] REV'))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2629 def restore(ui, repo, rev, **opts):
10360 bcf90e712dc3 mq: deprecate qsave, qrestore and related options Dirkjan Ochtman <djc.ochtman@kentyde.com> parents: 10359 diff changeset	2630 """restore the queue state saved by a revision (DEPRECATED)
bcf90e712dc3 mq: deprecate qsave, qrestore and related options Dirkjan Ochtman <djc.ochtman@kentyde.com> parents: 10359 diff changeset	2631
12352 5be733b20bd1 mq: fix the deprecation comment for qsave & qrestore. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 12344 diff changeset	2632 This command is deprecated, use :hg:`rebase` instead."""
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2633 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	2634 q = repo.mq
12281 d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2635 q.restore(repo, rev, delete=opts.get('delete'),
d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2636 qupdate=opts.get('update'))
14580 92101ea35015 mq: rename save_dirty to savedirty Adrian Buehlmann <adrian@cadifra.com> parents: 14579 diff changeset	2637 q.savedirty()
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2638 return 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2639
14298 21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2640 @command("qsave",
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2641 [('c', 'copy', None, _('copy patch directory')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2642 ('n', 'name', '',
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2643 _('copy directory name'), _('NAME')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2644 ('e', 'empty', None, _('clear queue status file')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2645 ('f', 'force', None, _('force copy'))] + commands.commitopts,
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2646 _('hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]'))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2647 def save(ui, repo, **opts):
10360 bcf90e712dc3 mq: deprecate qsave, qrestore and related options Dirkjan Ochtman <djc.ochtman@kentyde.com> parents: 10359 diff changeset	2648 """save current queue state (DEPRECATED)
bcf90e712dc3 mq: deprecate qsave, qrestore and related options Dirkjan Ochtman <djc.ochtman@kentyde.com> parents: 10359 diff changeset	2649
12352 5be733b20bd1 mq: fix the deprecation comment for qsave & qrestore. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 12344 diff changeset	2650 This command is deprecated, use :hg:`rebase` instead."""
2724 9c41ae1908c7 mq: replace module-wide repo hash with a repo attribute Brendan Cully <brendan@kublai.com> parents: 2723 diff changeset	2651 q = repo.mq
14635 217b7d83afc3 cmdutil, logmessage: use ui.fin when reading from '-' Idan Kamara <idankk86@gmail.com> parents: 14620 diff changeset	2652 message = cmdutil.logmessage(ui, opts)
2694 0fb28dbf0dc7 MQ: uniformise message and logfile option. "Mathieu Clabaut <mathieu.clabaut@gmail.com>" parents: 2682 diff changeset	2653 ret = q.save(repo, msg=message)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2654 if ret:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2655 return ret
14580 92101ea35015 mq: rename save_dirty to savedirty Adrian Buehlmann <adrian@cadifra.com> parents: 14579 diff changeset	2656 q.savedirty()
12281 d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2657 if opts.get('copy'):
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2658 path = q.path
12281 d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2659 if opts.get('name'):
d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2660 newpath = os.path.join(q.basepath, opts.get('name'))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2661 if os.path.exists(newpath):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2662 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	2663 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	2664 'a directory') % newpath)
12281 d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2665 if not opts.get('force'):
2712 8e5cd8d11b51 mq: move many error messages to util.Abort Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2711 diff changeset	2666 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	2667 'use -f to force') % newpath)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2668 else:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2669 newpath = savename(path)
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	2670 ui.warn(_("copy %s to %s\n") % (path, newpath))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2671 util.copyfiles(path, newpath)
12281 d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2672 if opts.get('empty'):
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2673 try:
14588 bd3d75a03f80 mq: rename status_path to statuspath Adrian Buehlmann <adrian@cadifra.com> parents: 14587 diff changeset	2674 os.unlink(q.join(q.statuspath))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2675 except:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2676 pass
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2677 return 0
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2678
14298 21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2679 @command("strip",
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2680 [('f', 'force', None, _('force removal of changesets, discard '
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2681 'uncommitted changes (no backup)')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2682 ('b', 'backup', None, _('bundle only changesets with local revision'
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2683 ' number greater than REV which are not'
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2684 ' descendants of REV (DEPRECATED)')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2685 ('n', 'no-backup', None, _('no backups')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2686 ('', 'nobackup', None, _('no backups (DEPRECATED)')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2687 ('k', 'keep', None, _("do not modify working copy during strip"))],
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2688 _('hg strip [-k] [-f] [-n] REV...'))
11789 e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11767 diff changeset	2689 def strip(ui, repo, revs, *opts):
e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11767 diff changeset	2690 """strip changesets and all their descendants from the repository
e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11767 diff changeset	2691
e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11767 diff changeset	2692 The strip command removes the specified changesets and all their
14502 deb82fdda94e strip: make it clear that --force discards changes (issue310) Patrick Mezard <pmezard@gmail.com> parents: 14170 diff changeset	2693 descendants. If the working directory has uncommitted changes, the
deb82fdda94e strip: make it clear that --force discards changes (issue310) Patrick Mezard <pmezard@gmail.com> parents: 14170 diff changeset	2694 operation is aborted unless the --force flag is supplied, in which
deb82fdda94e strip: make it clear that --force discards changes (issue310) Patrick Mezard <pmezard@gmail.com> parents: 14170 diff changeset	2695 case changes will be discarded.
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	2696
11073 ee5b112aa529 mq: rewrite strip docstrings Faheem Mitha <faheem@email.unc.edu> parents: 10947 diff changeset	2697 If a parent of the working directory is stripped, then the working
ee5b112aa529 mq: rewrite strip docstrings Faheem Mitha <faheem@email.unc.edu> parents: 10947 diff changeset	2698 directory will automatically be updated to the most recent
ee5b112aa529 mq: rewrite strip docstrings Faheem Mitha <faheem@email.unc.edu> parents: 10947 diff changeset	2699 available ancestor of the stripped parent after the operation
ee5b112aa529 mq: rewrite strip docstrings Faheem Mitha <faheem@email.unc.edu> parents: 10947 diff changeset	2700 completes.
ee5b112aa529 mq: rewrite strip docstrings Faheem Mitha <faheem@email.unc.edu> parents: 10947 diff changeset	2701
ee5b112aa529 mq: rewrite strip docstrings Faheem Mitha <faheem@email.unc.edu> parents: 10947 diff changeset	2702 Any stripped changesets are stored in ``.hg/strip-backup`` as a
11193 687c7d395f20 Use our custom hg reStructuredText role some more Martin Geisler <mg@aragost.com> parents: 11121 diff changeset	2703 bundle (see :hg:`help bundle` and :hg:`help unbundle`). They can
687c7d395f20 Use our custom hg reStructuredText role some more Martin Geisler <mg@aragost.com> parents: 11121 diff changeset	2704 be restored by running :hg:`unbundle .hg/strip-backup/BUNDLE`,
11073 ee5b112aa529 mq: rewrite strip docstrings Faheem Mitha <faheem@email.unc.edu> parents: 10947 diff changeset	2705 where BUNDLE is the bundle file created by the strip. Note that
ee5b112aa529 mq: rewrite strip docstrings Faheem Mitha <faheem@email.unc.edu> parents: 10947 diff changeset	2706 the local revision numbers will in general be different after the
ee5b112aa529 mq: rewrite strip docstrings Faheem Mitha <faheem@email.unc.edu> parents: 10947 diff changeset	2707 restore.
ee5b112aa529 mq: rewrite strip docstrings Faheem Mitha <faheem@email.unc.edu> parents: 10947 diff changeset	2708
12282 9e457c3f47d9 mq: rename strip --nobackup option to --no-backup (issue2377) Christian Ebert <blacktrash@gmx.net> parents: 12281 diff changeset	2709 Use the --no-backup option to discard the backup bundle once the
11073 ee5b112aa529 mq: rewrite strip docstrings Faheem Mitha <faheem@email.unc.edu> parents: 10947 diff changeset	2710 operation completes.
12538 c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2711
c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2712 Return 0 on success.
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	2713 """
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2714 backup = 'all'
12281 d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2715 if opts.get('backup'):
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2716 backup = 'strip'
13224 0a1eefaf98f2 strip: typo bugfix related to '--nobackup -> --no-backup' rename (issue2377) Jacek Sowi?ski <mruwek.gentoo@vcf.pl> parents: 13035 diff changeset	2717 elif opts.get('no_backup') or opts.get('nobackup'):
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2718 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	2719
d90d83ebea9e mq: don't update the working copy on strip if parents aren't stripped Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6634 diff changeset	2720 cl = repo.changelog
14319 b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14298 diff changeset	2721 revs = set(scmutil.revrange(repo, revs))
12767 c3316b6a3219 strip: support revision sets Wagner Bruna <wbruna@softwareexpress.com.br> parents: 12755 diff changeset	2722 if not revs:
12775 cbbcabde2414 mq: mark string for i18n Wagner Bruna <wbruna@softwareexpress.com.br> parents: 12767 diff changeset	2723 raise util.Abort(_('empty revision set'))
11789 e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11767 diff changeset	2724
e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11767 diff changeset	2725 descendants = set(cl.descendants(*revs))
e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11767 diff changeset	2726 strippedrevs = revs.union(descendants)
e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11767 diff changeset	2727 roots = revs.difference(descendants)
e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11767 diff changeset	2728
e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11767 diff changeset	2729 update = False
e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11767 diff changeset	2730 # if one of the wdir parent is stripped we'll need
e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11767 diff changeset	2731 # to update away to an earlier revision
e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11767 diff changeset	2732 for p in repo.dirstate.parents():
e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11767 diff changeset	2733 if p != nullid and cl.rev(p) in strippedrevs:
e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11767 diff changeset	2734 update = True
e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11767 diff changeset	2735 break
e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11767 diff changeset	2736
e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11767 diff changeset	2737 rootnodes = set(cl.node(r) for r in roots)
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	2738
11637 64f284da1278 mq: cleanup status if applied mq is stripped (issue1881) Vishakh H <vsh426@gmail.com> parents: 11546 diff changeset	2739 q = repo.mq
64f284da1278 mq: cleanup status if applied mq is stripped (issue1881) Vishakh H <vsh426@gmail.com> parents: 11546 diff changeset	2740 if q.applied:
11789 e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11767 diff changeset	2741 # refresh queue state if we're about to strip
e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11767 diff changeset	2742 # applied patches
e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11767 diff changeset	2743 if cl.rev(repo.lookup('qtip')) in strippedrevs:
14592 fc94add69d9f mq: rename applied_dirty to applieddirty Adrian Buehlmann <adrian@cadifra.com> parents: 14591 diff changeset	2744 q.applieddirty = True
11637 64f284da1278 mq: cleanup status if applied mq is stripped (issue1881) Vishakh H <vsh426@gmail.com> parents: 11546 diff changeset	2745 start = 0
64f284da1278 mq: cleanup status if applied mq is stripped (issue1881) Vishakh H <vsh426@gmail.com> parents: 11546 diff changeset	2746 end = len(q.applied)
11789 e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11767 diff changeset	2747 for i, statusentry in enumerate(q.applied):
e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11767 diff changeset	2748 if statusentry.node in rootnodes:
e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11767 diff changeset	2749 # if one of the stripped roots is an applied
e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11767 diff changeset	2750 # patch, only part of the queue is stripped
e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11767 diff changeset	2751 start = i
e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11767 diff changeset	2752 break
11637 64f284da1278 mq: cleanup status if applied mq is stripped (issue1881) Vishakh H <vsh426@gmail.com> parents: 11546 diff changeset	2753 del q.applied[start:end]
14580 92101ea35015 mq: rename save_dirty to savedirty Adrian Buehlmann <adrian@cadifra.com> parents: 14579 diff changeset	2754 q.savedirty()
11637 64f284da1278 mq: cleanup status if applied mq is stripped (issue1881) Vishakh H <vsh426@gmail.com> parents: 11546 diff changeset	2755
12682 58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12658 diff changeset	2756 revs = list(rootnodes)
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12658 diff changeset	2757 if update and opts.get('keep'):
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12658 diff changeset	2758 wlock = repo.wlock()
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12658 diff changeset	2759 try:
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12658 diff changeset	2760 urev = repo.mq.qparents(repo, revs[0])
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12658 diff changeset	2761 repo.dirstate.rebuild(urev, repo[urev].manifest())
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12658 diff changeset	2762 repo.dirstate.write()
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12658 diff changeset	2763 update = False
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12658 diff changeset	2764 finally:
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12658 diff changeset	2765 wlock.release()
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12658 diff changeset	2766
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12658 diff changeset	2767 repo.mq.strip(repo, revs, backup=backup, update=update,
12281 d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2768 force=opts.get('force'))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2769 return 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2770
14298 21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2771 @command("qselect",
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2772 [('n', 'none', None, _('disable all guards')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2773 ('s', 'series', None, _('list all guards in series file')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2774 ('', 'pop', None, _('pop to before first guarded applied patch')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2775 ('', 'reapply', None, _('pop, then reapply patches'))],
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2776 _('hg qselect [OPTION]... [GUARD]...'))
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2777 def select(ui, repo, args, *opts):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2778 '''set or print guarded patches to push
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2779
11307 7f72031d4047 mq: use hg reST role some more Martin Geisler <mg@aragost.com> parents: 11303 diff changeset	2780 Use the :hg:`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	2781 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	2782 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	2783 selected guard, but will not be pushed if any negative guards
9824 87c92b260710 mq: fix literal blocks in docstrings Martin Geisler <mg@lazybytes.net> parents: 9733 diff changeset	2784 match the current guard. For example::
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2785
13791 794f4476b974 mq: fix qselect help for qguard timeless@gmail.com parents: 13725 diff changeset	2786 qguard foo.patch -- -stable (negative guard)
794f4476b974 mq: fix qselect help for qguard timeless@gmail.com parents: 13725 diff changeset	2787 qguard bar.patch +stable (positive guard)
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2788 qselect stable
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2789
2940 b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2790 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	2791 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	2792 positive match).
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2793
2940 b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2794 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	2795 With one argument, sets the active guard.
3223 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 3186 diff changeset	2796
2940 b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2797 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	2798 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	2799 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	2800
2940 b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2801 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	2802 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	2803 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	2804 --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	2805 guarded patches.
2844 582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2806
7994 3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2807 Use -s/--series to print a list of all guards in the series file
12538 c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2808 (no other arguments needed). Use -v for more information.
c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2809
c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2810 Returns 0 on success.'''
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2811
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2812 q = repo.mq
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2813 guards = q.active()
12281 d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2814 if args or opts.get('none'):
2844 582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2815 old_unapplied = q.unapplied(repo)
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2816 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	2817 not q.pushable(i)[0]]
14578 28a2646f3b81 mq: rename set_active to setactive Adrian Buehlmann <adrian@cadifra.com> parents: 14577 diff changeset	2818 q.setactive(args)
14580 92101ea35015 mq: rename save_dirty to savedirty Adrian Buehlmann <adrian@cadifra.com> parents: 14579 diff changeset	2819 q.savedirty()
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2820 if not args:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2821 ui.status(_('guards deactivated\n'))
12281 d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2822 if not opts.get('pop') and not opts.get('reapply'):
2844 582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2823 unapplied = q.unapplied(repo)
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2824 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	2825 if not q.pushable(i)[0]]
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2826 if len(unapplied) != len(old_unapplied):
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2827 ui.status(_('number of unguarded, unapplied patches has '
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2828 'changed from %d to %d\n') %
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2829 (len(old_unapplied), len(unapplied)))
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2830 if len(guarded) != len(old_guarded):
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2831 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	2832 'from %d to %d\n') %
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2833 (len(old_guarded), len(guarded)))
12281 d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2834 elif opts.get('series'):
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2835 guards = {}
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2836 noguards = 0
14573 d590ff1f22b2 mq: rename series_guards to seriesguards Adrian Buehlmann <adrian@cadifra.com> parents: 14572 diff changeset	2837 for gs in q.seriesguards:
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2838 if not gs:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2839 noguards += 1
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2840 for g in gs:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2841 guards.setdefault(g, 0)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2842 guards[g] += 1
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2843 if ui.verbose:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2844 guards['NONE'] = noguards
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2845 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	2846 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	2847 if guards:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2848 ui.note(_('guards in series file:\n'))
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2849 for guard, count in guards:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2850 ui.note('%2d ' % count)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2851 ui.write(guard, '\n')
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2852 else:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2853 ui.note(_('no guards in series file\n'))
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2854 else:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2855 if guards:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2856 ui.note(_('active guards:\n'))
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2857 for g in guards:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2858 ui.write(g, '\n')
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2859 else:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2860 ui.write(_('no active guards\n'))
12281 d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2861 reapply = opts.get('reapply') and q.applied and q.appliedname(-1)
2844 582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2862 popped = False
12281 d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2863 if opts.get('pop') or opts.get('reapply'):
2844 582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2864 for i in xrange(len(q.applied)):
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2865 pushable, reason = q.pushable(i)
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2866 if not pushable:
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2867 ui.status(_('popping guarded patches\n'))
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2868 popped = True
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2869 if i == 0:
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2870 q.pop(repo, all=True)
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2871 else:
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10276 diff changeset	2872 q.pop(repo, i - 1)
2844 582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2873 break
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2874 if popped:
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2875 try:
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2876 if reapply:
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2877 ui.status(_('reapplying unguarded patches\n'))
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2878 q.push(repo, reapply)
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2879 finally:
14580 92101ea35015 mq: rename save_dirty to savedirty Adrian Buehlmann <adrian@cadifra.com> parents: 14579 diff changeset	2880 q.savedirty()
2821 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2819 diff changeset	2881
14298 21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2882 @command("qfinish",
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2883 [('a', 'applied', None, _('finish all applied changesets'))],
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2884 _('hg qfinish [-a] [REV]...'))
6645 37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2885 def finish(ui, repo, revrange, *opts):
37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2886 """move applied patches into repository history
37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2887
7994 3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2888 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	2889 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	2890 history.
6645 37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2891
8076 5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8075 diff changeset	2892 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	2893 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	2894 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	2895 stack of applied patches.
6645 37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2896
7994 3c22fdc741d8 mq: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2897 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	2898 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	2899 to upstream.
12538 c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2900
c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2901 Returns 0 on success.
6645 37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2902 """
12281 d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2903 if not opts.get('applied') and not revrange:
6645 37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2904 raise util.Abort(_('no revisions specified'))
12281 d9cf0d1d0d0f mq: consistently use opts.get() to prevent potential KeyError Christian Ebert <blacktrash@gmx.net> parents: 12266 diff changeset	2905 elif opts.get('applied'):
11730 7469ff872122 qfinish: fix range logic for --applied Matt Mackall <mpm@selenic.com> parents: 11717 diff changeset	2906 revrange = ('qbase::qtip',) + revrange
6645 37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2907
37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2908 q = repo.mq
37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2909 if not q.applied:
37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2910 ui.status(_('no patches applied\n'))
37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2911 return 0
37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2912
14319 b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14298 diff changeset	2913 revs = scmutil.revrange(repo, revrange)
6645 37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2914 q.finish(repo, revs)
14580 92101ea35015 mq: rename save_dirty to savedirty Adrian Buehlmann <adrian@cadifra.com> parents: 14579 diff changeset	2915 q.savedirty()
6645 37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2916 return 0
37eedb1a1848 mq: introduce the qfinish command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6644 diff changeset	2917
14298 21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2918 @command("qqueue",
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2919 [('l', 'list', False, _('list all available queues')),
14987 3709cca378ff mq/qqueue: print current queue name "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 14943 diff changeset	2920 ('', 'active', False, _('print name of active queue')),
14298 21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2921 ('c', 'create', False, _('create new queue')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2922 ('', 'rename', False, _('rename active queue')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2923 ('', 'delete', False, _('delete reference to queue')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2924 ('', 'purge', False, _('delete queue, and remove patch dir')),
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2925 ],
21719639276d mq: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14267 diff changeset	2926 _('[OPTION] [QUEUE]'))
11229 1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2927 def qqueue(ui, repo, name=None, **opts):
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2928 '''manage multiple patch queues
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2929
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2930 Supports switching between different patch queues, as well as creating
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2931 new patch queues and deleting existing ones.
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2932
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2933 Omitting a queue name or specifying -l/--list will show you the registered
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2934 queues - by default the "normal" patches queue is registered. The currently
14987 3709cca378ff mq/qqueue: print current queue name "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 14943 diff changeset	2935 active queue will be marked with "(active)". Specifying --active will print
3709cca378ff mq/qqueue: print current queue name "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 14943 diff changeset	2936 only the name of the active queue.
11229 1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2937
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2938 To create a new queue, use -c/--create. The queue is automatically made
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2939 active, except in the case where there are applied patches from the
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2940 currently active queue in the repository. Then the queue will only be
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2941 created and switching will fail.
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2942
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2943 To delete an existing queue, use --delete. You cannot delete the currently
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2944 active queue.
12538 c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2945
c87216e5e43e mq: added return 0 on success Erik Zielke <ez@aragost.com> parents: 12508 diff changeset	2946 Returns 0 on success.
11229 1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2947 '''
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2948
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2949 q = repo.mq
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2950
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2951 _defaultqueue = 'patches'
11270 457813cb3024 mq: fix naming issues for qqueue directories Henrik Stuart <hg@hstuart.dk> parents: 11234 diff changeset	2952 _allqueues = 'patches.queues'
457813cb3024 mq: fix naming issues for qqueue directories Henrik Stuart <hg@hstuart.dk> parents: 11234 diff changeset	2953 _activequeue = 'patches.queue'
11229 1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2954
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2955 def _getcurrent():
11270 457813cb3024 mq: fix naming issues for qqueue directories Henrik Stuart <hg@hstuart.dk> parents: 11234 diff changeset	2956 cur = os.path.basename(q.path)
457813cb3024 mq: fix naming issues for qqueue directories Henrik Stuart <hg@hstuart.dk> parents: 11234 diff changeset	2957 if cur.startswith('patches-'):
457813cb3024 mq: fix naming issues for qqueue directories Henrik Stuart <hg@hstuart.dk> parents: 11234 diff changeset	2958 cur = cur[8:]
457813cb3024 mq: fix naming issues for qqueue directories Henrik Stuart <hg@hstuart.dk> parents: 11234 diff changeset	2959 return cur
11229 1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2960
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2961 def _noqueues():
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2962 try:
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2963 fh = repo.opener(_allqueues, 'r')
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2964 fh.close()
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2965 except IOError:
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2966 return True
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2967
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2968 return False
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2969
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2970 def _getqueues():
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2971 current = _getcurrent()
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2972
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2973 try:
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2974 fh = repo.opener(_allqueues, 'r')
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2975 queues = [queue.strip() for queue in fh if queue.strip()]
13400 14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 13373 diff changeset	2976 fh.close()
11229 1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2977 if current not in queues:
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2978 queues.append(current)
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2979 except IOError:
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2980 queues = [_defaultqueue]
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2981
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2982 return sorted(queues)
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2983
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2984 def _setactive(name):
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2985 if q.applied:
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2986 raise util.Abort(_('patches applied - cannot set new queue active'))
11938 b8b1e6e78486 mq/qqueue: split _setactive "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11819 diff changeset	2987 _setactivenocheck(name)
b8b1e6e78486 mq/qqueue: split _setactive "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11819 diff changeset	2988
b8b1e6e78486 mq/qqueue: split _setactive "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11819 diff changeset	2989 def _setactivenocheck(name):
11229 1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2990 fh = repo.opener(_activequeue, 'w')
11270 457813cb3024 mq: fix naming issues for qqueue directories Henrik Stuart <hg@hstuart.dk> parents: 11234 diff changeset	2991 if name != 'patches':
457813cb3024 mq: fix naming issues for qqueue directories Henrik Stuart <hg@hstuart.dk> parents: 11234 diff changeset	2992 fh.write(name)
11229 1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2993 fh.close()
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2994
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2995 def _addqueue(name):
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2996 fh = repo.opener(_allqueues, 'a')
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2997 fh.write('%s\n' % (name,))
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2998 fh.close()
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	2999
11939 7d2ea5ce4aac mq/qqueue: enable renaming of active queue "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11938 diff changeset	3000 def _queuedir(name):
7d2ea5ce4aac mq/qqueue: enable renaming of active queue "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11938 diff changeset	3001 if name == 'patches':
7d2ea5ce4aac mq/qqueue: enable renaming of active queue "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11938 diff changeset	3002 return repo.join('patches')
7d2ea5ce4aac mq/qqueue: enable renaming of active queue "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11938 diff changeset	3003 else:
7d2ea5ce4aac mq/qqueue: enable renaming of active queue "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11938 diff changeset	3004 return repo.join('patches-' + name)
7d2ea5ce4aac mq/qqueue: enable renaming of active queue "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11938 diff changeset	3005
11270 457813cb3024 mq: fix naming issues for qqueue directories Henrik Stuart <hg@hstuart.dk> parents: 11234 diff changeset	3006 def _validname(name):
457813cb3024 mq: fix naming issues for qqueue directories Henrik Stuart <hg@hstuart.dk> parents: 11234 diff changeset	3007 for n in name:
457813cb3024 mq: fix naming issues for qqueue directories Henrik Stuart <hg@hstuart.dk> parents: 11234 diff changeset	3008 if n in ':\\/.':
457813cb3024 mq: fix naming issues for qqueue directories Henrik Stuart <hg@hstuart.dk> parents: 11234 diff changeset	3009 return False
457813cb3024 mq: fix naming issues for qqueue directories Henrik Stuart <hg@hstuart.dk> parents: 11234 diff changeset	3010 return True
457813cb3024 mq: fix naming issues for qqueue directories Henrik Stuart <hg@hstuart.dk> parents: 11234 diff changeset	3011
11966 22f1994fb669 mq/qqueue: commonalise the queue deletion code "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11947 diff changeset	3012 def _delete(name):
22f1994fb669 mq/qqueue: commonalise the queue deletion code "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11947 diff changeset	3013 if name not in existing:
22f1994fb669 mq/qqueue: commonalise the queue deletion code "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11947 diff changeset	3014 raise util.Abort(_('cannot delete queue that does not exist'))
22f1994fb669 mq/qqueue: commonalise the queue deletion code "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11947 diff changeset	3015
22f1994fb669 mq/qqueue: commonalise the queue deletion code "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11947 diff changeset	3016 current = _getcurrent()
22f1994fb669 mq/qqueue: commonalise the queue deletion code "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11947 diff changeset	3017
22f1994fb669 mq/qqueue: commonalise the queue deletion code "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11947 diff changeset	3018 if name == current:
22f1994fb669 mq/qqueue: commonalise the queue deletion code "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11947 diff changeset	3019 raise util.Abort(_('cannot delete currently active queue'))
22f1994fb669 mq/qqueue: commonalise the queue deletion code "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11947 diff changeset	3020
22f1994fb669 mq/qqueue: commonalise the queue deletion code "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11947 diff changeset	3021 fh = repo.opener('patches.queues.new', 'w')
22f1994fb669 mq/qqueue: commonalise the queue deletion code "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11947 diff changeset	3022 for queue in existing:
22f1994fb669 mq/qqueue: commonalise the queue deletion code "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11947 diff changeset	3023 if queue == name:
22f1994fb669 mq/qqueue: commonalise the queue deletion code "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11947 diff changeset	3024 continue
22f1994fb669 mq/qqueue: commonalise the queue deletion code "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11947 diff changeset	3025 fh.write('%s\n' % (queue,))
22f1994fb669 mq/qqueue: commonalise the queue deletion code "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11947 diff changeset	3026 fh.close()
22f1994fb669 mq/qqueue: commonalise the queue deletion code "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11947 diff changeset	3027 util.rename(repo.join('patches.queues.new'), repo.join(_allqueues))
22f1994fb669 mq/qqueue: commonalise the queue deletion code "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11947 diff changeset	3028
14987 3709cca378ff mq/qqueue: print current queue name "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 14943 diff changeset	3029 if not name or opts.get('list') or opts.get('active'):
11229 1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	3030 current = _getcurrent()
14987 3709cca378ff mq/qqueue: print current queue name "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 14943 diff changeset	3031 if opts.get('active'):
3709cca378ff mq/qqueue: print current queue name "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 14943 diff changeset	3032 ui.write('%s\n' % (current,))
3709cca378ff mq/qqueue: print current queue name "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 14943 diff changeset	3033 return
11229 1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	3034 for queue in _getqueues():
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	3035 ui.write('%s' % (queue,))
11767 9b771b4ce2f3 mq/qqueue: --list does not print (active) with --quiet "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11730 diff changeset	3036 if queue == current and not ui.quiet:
11229 1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	3037 ui.write(_(' (active)\n'))
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	3038 else:
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	3039 ui.write('\n')
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	3040 return
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	3041
11270 457813cb3024 mq: fix naming issues for qqueue directories Henrik Stuart <hg@hstuart.dk> parents: 11234 diff changeset	3042 if not _validname(name):
457813cb3024 mq: fix naming issues for qqueue directories Henrik Stuart <hg@hstuart.dk> parents: 11234 diff changeset	3043 raise util.Abort(
457813cb3024 mq: fix naming issues for qqueue directories Henrik Stuart <hg@hstuart.dk> parents: 11234 diff changeset	3044 _('invalid queue name, may not contain the characters ":\\/."'))
457813cb3024 mq: fix naming issues for qqueue directories Henrik Stuart <hg@hstuart.dk> parents: 11234 diff changeset	3045
11229 1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	3046 existing = _getqueues()
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	3047
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	3048 if opts.get('create'):
11271 d1aca0863a9d mq: prevent the creation of a queue whose name is already taken C?dric Duval <cedricduval@free.fr> parents: 11270 diff changeset	3049 if name in existing:
d1aca0863a9d mq: prevent the creation of a queue whose name is already taken C?dric Duval <cedricduval@free.fr> parents: 11270 diff changeset	3050 raise util.Abort(_('queue "%s" already exists') % name)
11229 1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	3051 if _noqueues():
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	3052 _addqueue(_defaultqueue)
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	3053 _addqueue(name)
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	3054 _setactive(name)
11939 7d2ea5ce4aac mq/qqueue: enable renaming of active queue "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11938 diff changeset	3055 elif opts.get('rename'):
11229 1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	3056 current = _getcurrent()
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	3057 if name == current:
11939 7d2ea5ce4aac mq/qqueue: enable renaming of active queue "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11938 diff changeset	3058 raise util.Abort(_('can\'t rename "%s" to its current name') % name)
7d2ea5ce4aac mq/qqueue: enable renaming of active queue "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11938 diff changeset	3059 if name in existing:
7d2ea5ce4aac mq/qqueue: enable renaming of active queue "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11938 diff changeset	3060 raise util.Abort(_('queue "%s" already exists') % name)
7d2ea5ce4aac mq/qqueue: enable renaming of active queue "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11938 diff changeset	3061
7d2ea5ce4aac mq/qqueue: enable renaming of active queue "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11938 diff changeset	3062 olddir = _queuedir(current)
7d2ea5ce4aac mq/qqueue: enable renaming of active queue "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11938 diff changeset	3063 newdir = _queuedir(name)
7d2ea5ce4aac mq/qqueue: enable renaming of active queue "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11938 diff changeset	3064
7d2ea5ce4aac mq/qqueue: enable renaming of active queue "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11938 diff changeset	3065 if os.path.exists(newdir):
7d2ea5ce4aac mq/qqueue: enable renaming of active queue "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11938 diff changeset	3066 raise util.Abort(_('non-queue directory "%s" already exists') %
7d2ea5ce4aac mq/qqueue: enable renaming of active queue "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11938 diff changeset	3067 newdir)
11229 1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	3068
11270 457813cb3024 mq: fix naming issues for qqueue directories Henrik Stuart <hg@hstuart.dk> parents: 11234 diff changeset	3069 fh = repo.opener('patches.queues.new', 'w')
11229 1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	3070 for queue in existing:
11939 7d2ea5ce4aac mq/qqueue: enable renaming of active queue "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11938 diff changeset	3071 if queue == current:
7d2ea5ce4aac mq/qqueue: enable renaming of active queue "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11938 diff changeset	3072 fh.write('%s\n' % (name,))
7d2ea5ce4aac mq/qqueue: enable renaming of active queue "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11938 diff changeset	3073 if os.path.exists(olddir):
7d2ea5ce4aac mq/qqueue: enable renaming of active queue "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11938 diff changeset	3074 util.rename(olddir, newdir)
7d2ea5ce4aac mq/qqueue: enable renaming of active queue "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11938 diff changeset	3075 else:
7d2ea5ce4aac mq/qqueue: enable renaming of active queue "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11938 diff changeset	3076 fh.write('%s\n' % (queue,))
11229 1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	3077 fh.close()
11270 457813cb3024 mq: fix naming issues for qqueue directories Henrik Stuart <hg@hstuart.dk> parents: 11234 diff changeset	3078 util.rename(repo.join('patches.queues.new'), repo.join(_allqueues))
11939 7d2ea5ce4aac mq/qqueue: enable renaming of active queue "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11938 diff changeset	3079 _setactivenocheck(name)
11229 1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	3080 elif opts.get('delete'):
11966 22f1994fb669 mq/qqueue: commonalise the queue deletion code "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11947 diff changeset	3081 _delete(name)
11967 6e3875a80533 mq/qqueue: add --purge option to delete a queue and its patch dir "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11966 diff changeset	3082 elif opts.get('purge'):
6e3875a80533 mq/qqueue: add --purge option to delete a queue and its patch dir "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11966 diff changeset	3083 if name in existing:
6e3875a80533 mq/qqueue: add --purge option to delete a queue and its patch dir "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11966 diff changeset	3084 _delete(name)
6e3875a80533 mq/qqueue: add --purge option to delete a queue and its patch dir "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11966 diff changeset	3085 qdir = _queuedir(name)
6e3875a80533 mq/qqueue: add --purge option to delete a queue and its patch dir "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11966 diff changeset	3086 if os.path.exists(qdir):
6e3875a80533 mq/qqueue: add --purge option to delete a queue and its patch dir "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 11966 diff changeset	3087 shutil.rmtree(qdir)
11229 1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	3088 else:
11271 d1aca0863a9d mq: prevent the creation of a queue whose name is already taken C?dric Duval <cedricduval@free.fr> parents: 11270 diff changeset	3089 if name not in existing:
d1aca0863a9d mq: prevent the creation of a queue whose name is already taken C?dric Duval <cedricduval@free.fr> parents: 11270 diff changeset	3090 raise util.Abort(_('use --create to create a new queue'))
11229 1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	3091 _setactive(name)
1e701ffd9df4 mq: support multiple patch queues using qqueue Henrik Stuart <hg@hstuart.dk> parents: 11216 diff changeset	3092
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	3093 def reposetup(ui, repo):
2818 bdc067ff6cf5 Make mq camelcase consistent with the rest of hg. Brendan Cully <brendan@kublai.com> parents: 2816 diff changeset	3094 class mqrepo(repo.__class__):
8524 21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	3095 @util.propertycache
21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	3096 def mq(self):
21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	3097 return queue(self.ui, self.join(""))
21c87b299a04 mq: only read files when needed Simon Heimberg <simohe@besonet.ch> parents: 8484 diff changeset	3098
14596 6a0070d00bc8 mq: rename abort_if_wdir_patched to abortifwdirpatched Adrian Buehlmann <adrian@cadifra.com> parents: 14595 diff changeset	3099 def abortifwdirpatched(self, errmsg, force=False):
2848 307439d6fede mq: do not allow to push from repo with patches applied Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2845 diff changeset	3100 if self.mq.applied and not force:
13520 9510ddf87c43 mq: forbid commit of merge involving mq patches Martin Geisler <mg@aragost.com> parents: 13508 diff changeset	3101 parents = self.dirstate.parents()
9510ddf87c43 mq: forbid commit of merge involving mq patches Martin Geisler <mg@aragost.com> parents: 13508 diff changeset	3102 patches = [s.node for s in self.mq.applied]
9510ddf87c43 mq: forbid commit of merge involving mq patches Martin Geisler <mg@aragost.com> parents: 13508 diff changeset	3103 if parents[0] in patches or parents[1] in patches:
2848 307439d6fede mq: do not allow to push from repo with patches applied Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2845 diff changeset	3104 raise util.Abort(errmsg)
3223 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 3186 diff changeset	3105
8711 1b95c6f13155 mq: fix commit prototype Matt Mackall <mpm@selenic.com> parents: 8706 diff changeset	3106 def commit(self, text="", user=None, date=None, match=None,
1b95c6f13155 mq: fix commit prototype Matt Mackall <mpm@selenic.com> parents: 8706 diff changeset	3107 force=False, editor=False, extra={}):
14596 6a0070d00bc8 mq: rename abort_if_wdir_patched to abortifwdirpatched Adrian Buehlmann <adrian@cadifra.com> parents: 14595 diff changeset	3108 self.abortifwdirpatched(
2848 307439d6fede mq: do not allow to push from repo with patches applied Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2845 diff changeset	3109 _('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	3110 force)
2845 addd03c7fbfa Disallow commit over an applied mq patch. Brendan Cully <brendan@kublai.com> parents: 2844 diff changeset	3111
8711 1b95c6f13155 mq: fix commit prototype Matt Mackall <mpm@selenic.com> parents: 8706 diff changeset	3112 return super(mqrepo, self).commit(text, user, date, match, force,
1b95c6f13155 mq: fix commit prototype Matt Mackall <mpm@selenic.com> parents: 8706 diff changeset	3113 editor, extra)
2845 addd03c7fbfa Disallow commit over an applied mq patch. Brendan Cully <brendan@kublai.com> parents: 2844 diff changeset	3114
13327 dc11e30b48a3 mq: factor out push conditions checks Patrick Mezard <pmezard@gmail.com> parents: 13256 diff changeset	3115 def checkpush(self, force, revs):
12378 ab237534d800 mq: always require --force when pushing patches (issue2363) Patrick Mezard <pmezard@gmail.com> parents: 12352 diff changeset	3116 if self.mq.applied and not force:
ab237534d800 mq: always require --force when pushing patches (issue2363) Patrick Mezard <pmezard@gmail.com> parents: 12352 diff changeset	3117 haspatches = True
ab237534d800 mq: always require --force when pushing patches (issue2363) Patrick Mezard <pmezard@gmail.com> parents: 12352 diff changeset	3118 if revs:
ab237534d800 mq: always require --force when pushing patches (issue2363) Patrick Mezard <pmezard@gmail.com> parents: 12352 diff changeset	3119 # Assume applied patches have no non-patch descendants
ab237534d800 mq: always require --force when pushing patches (issue2363) Patrick Mezard <pmezard@gmail.com> parents: 12352 diff changeset	3120 # and are not on remote already. If they appear in the
ab237534d800 mq: always require --force when pushing patches (issue2363) Patrick Mezard <pmezard@gmail.com> parents: 12352 diff changeset	3121 # set of resolved 'revs', bail out.
ab237534d800 mq: always require --force when pushing patches (issue2363) Patrick Mezard <pmezard@gmail.com> parents: 12352 diff changeset	3122 applied = set(e.node for e in self.mq.applied)
ab237534d800 mq: always require --force when pushing patches (issue2363) Patrick Mezard <pmezard@gmail.com> parents: 12352 diff changeset	3123 haspatches = bool([n for n in revs if n in applied])
ab237534d800 mq: always require --force when pushing patches (issue2363) Patrick Mezard <pmezard@gmail.com> parents: 12352 diff changeset	3124 if haspatches:
ab237534d800 mq: always require --force when pushing patches (issue2363) Patrick Mezard <pmezard@gmail.com> parents: 12352 diff changeset	3125 raise util.Abort(_('source has mq patches applied'))
13327 dc11e30b48a3 mq: factor out push conditions checks Patrick Mezard <pmezard@gmail.com> parents: 13256 diff changeset	3126 super(mqrepo, self).checkpush(force, revs)
3223 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 3186 diff changeset	3127
9145 6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9111 diff changeset	3128 def _findtags(self):
6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9111 diff changeset	3129 '''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	3130 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	3131
2724 9c41ae1908c7 mq: replace module-wide repo hash with a repo attribute Brendan Cully <brendan@kublai.com> parents: 2723 diff changeset	3132 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	3133 if not q.applied:
9145 6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9111 diff changeset	3134 return result
2663 96950d39171d Mq: modify repo.lookup to resolve applied patches too. Brendan Cully <brendan@kublai.com> parents: 2554 diff changeset	3135
10678 da2a0c9c895d mq: avoid many hex/bin conversions, keep the binary node when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10663 diff changeset	3136 mqtags = [(patch.node, 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	3137
13508 0396ca8015be mq: fix qpush recursion in _findtags when status file is wrong (issue2664) Matt Mackall <mpm@selenic.com> parents: 13507 diff changeset	3138 try:
14174 bab267e7fc1a remove unused variables timeless <timeless@mozdev.org> parents: 14168 diff changeset	3139 self.changelog.rev(mqtags[-1][0])
14600 17c16bcf6926 mq: catch correct exception when calling changelog.rev() Idan Kamara <idankk86@gmail.com> parents: 14596 diff changeset	3140 except error.LookupError:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	3141 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	3142 % short(mqtags[-1][0]))
9145 6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9111 diff changeset	3143 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	3144
2723 04d9b31faeca mq: do not hold a reference to repo in tags override Brendan Cully <brendan@kublai.com> parents: 2720 diff changeset	3145 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	3146 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	3147 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	3148 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	3149 for patch in mqtags:
9145 6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9111 diff changeset	3150 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	3151 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	3152 % patch[1])
2723 04d9b31faeca mq: do not hold a reference to repo in tags override Brendan Cully <brendan@kublai.com> parents: 2720 diff changeset	3153 else:
9145 6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9111 diff changeset	3154 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	3155
9145 6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9111 diff changeset	3156 return result
2664 9b8df8dceeed Add qtip and qbase to mq qlookup. Brendan Cully <brendan@kublai.com> parents: 2663 diff changeset	3157
6120 f89878df40fe move the reading of branch.cache from _branchtags to branchtags Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6048 diff changeset	3158 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	3159 q = self.mq
fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	3160 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	3161 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	3162
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	3163 cl = self.changelog
10678 da2a0c9c895d mq: avoid many hex/bin conversions, keep the binary node when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10663 diff changeset	3164 qbasenode = q.applied[0].node
13508 0396ca8015be mq: fix qpush recursion in _findtags when status file is wrong (issue2664) Matt Mackall <mpm@selenic.com> parents: 13507 diff changeset	3165 try:
0396ca8015be mq: fix qpush recursion in _findtags when status file is wrong (issue2664) Matt Mackall <mpm@selenic.com> parents: 13507 diff changeset	3166 qbase = cl.rev(qbasenode)
0396ca8015be mq: fix qpush recursion in _findtags when status file is wrong (issue2664) Matt Mackall <mpm@selenic.com> parents: 13507 diff changeset	3167 except error.LookupError:
6960 46da38eef1b0 i18n: mark strings for translation in mq extension Martin Geisler <mg@daimi.au.dk> parents: 6940 diff changeset	3168 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	3169 % 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	3170 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	3171
fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	3172 start = lrev + 1
fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	3173 if start < qbase:
fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	3174 # update the cache (excluding the patches) and save it
10770 fe39f0160c74 localrepo: change _updatebranchcache to use a context generator Sune Foldager <cryo@cyanite.org> parents: 10755 diff changeset	3175 ctxgen = (self[r] for r in xrange(lrev + 1, qbase))
fe39f0160c74 localrepo: change _updatebranchcache to use a context generator Sune Foldager <cryo@cyanite.org> parents: 10755 diff changeset	3176 self._updatebranchcache(partial, ctxgen)
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10276 diff changeset	3177 self._writebranchcache(partial, cl.node(qbase - 1), qbase - 1)
3492 fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	3178 start = qbase
fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	3179 # 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	3180 # 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	3181 # 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	3182
fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	3183 # update the cache up to the tip
10770 fe39f0160c74 localrepo: change _updatebranchcache to use a context generator Sune Foldager <cryo@cyanite.org> parents: 10755 diff changeset	3184 ctxgen = (self[r] for r in xrange(start, len(cl)))
fe39f0160c74 localrepo: change _updatebranchcache to use a context generator Sune Foldager <cryo@cyanite.org> parents: 10755 diff changeset	3185 self._updatebranchcache(partial, ctxgen)
3492 fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	3186
3826 b3b868113d24 fix encoding conversion of branch names when mq is loaded Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3763 diff changeset	3187 return partial
3492 fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	3188
2851 82f50658c72b mq: only add mq attribute to local repo Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2850 diff changeset	3189 if repo.local():
82f50658c72b mq: only add mq attribute to local repo Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2850 diff changeset	3190 repo.__class__ = mqrepo
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	3191
7216 292fb2ad2846 extensions: use new wrapper functions Matt Mackall <mpm@selenic.com> parents: 7213 diff changeset	3192 def mqimport(orig, ui, repo, args, *kwargs):
14596 6a0070d00bc8 mq: rename abort_if_wdir_patched to abortifwdirpatched Adrian Buehlmann <adrian@cadifra.com> parents: 14595 diff changeset	3193 if (hasattr(repo, 'abortifwdirpatched')
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10276 diff changeset	3194 and not kwargs.get('no_commit', False)):
14596 6a0070d00bc8 mq: rename abort_if_wdir_patched to abortifwdirpatched Adrian Buehlmann <adrian@cadifra.com> parents: 14595 diff changeset	3195 repo.abortifwdirpatched(_('cannot import over an applied patch'),
7216 292fb2ad2846 extensions: use new wrapper functions Matt Mackall <mpm@selenic.com> parents: 7213 diff changeset	3196 kwargs.get('force'))
292fb2ad2846 extensions: use new wrapper functions Matt Mackall <mpm@selenic.com> parents: 7213 diff changeset	3197 return orig(ui, repo, args, *kwargs)
292fb2ad2846 extensions: use new wrapper functions Matt Mackall <mpm@selenic.com> parents: 7213 diff changeset	3198
10402 d216fa04e48a mq: make init -Q do what qinit -c did Brendan Cully <brendan@kublai.com> parents: 10401 diff changeset	3199 def mqinit(orig, ui, args, *kwargs):
10558 6505773080e4 mq: simplify --mq handling / keep compatibility with other extensions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10510 diff changeset	3200 mq = kwargs.pop('mq', None)
10402 d216fa04e48a mq: make init -Q do what qinit -c did Brendan Cully <brendan@kublai.com> parents: 10401 diff changeset	3201
d216fa04e48a mq: make init -Q do what qinit -c did Brendan Cully <brendan@kublai.com> parents: 10401 diff changeset	3202 if not mq:
d216fa04e48a mq: make init -Q do what qinit -c did Brendan Cully <brendan@kublai.com> parents: 10401 diff changeset	3203 return orig(ui, args, *kwargs)
d216fa04e48a mq: make init -Q do what qinit -c did Brendan Cully <brendan@kublai.com> parents: 10401 diff changeset	3204
10691 a778a367c20b mq: fix init with nonexistent or non-local repository C?dric Duval <cedricduval@free.fr> parents: 10690 diff changeset	3205 if args:
a778a367c20b mq: fix init with nonexistent or non-local repository C?dric Duval <cedricduval@free.fr> parents: 10690 diff changeset	3206 repopath = args[0]
a778a367c20b mq: fix init with nonexistent or non-local repository C?dric Duval <cedricduval@free.fr> parents: 10690 diff changeset	3207 if not hg.islocal(repopath):
a778a367c20b mq: fix init with nonexistent or non-local repository C?dric Duval <cedricduval@free.fr> parents: 10690 diff changeset	3208 raise util.Abort(_('only a local queue repository '
a778a367c20b mq: fix init with nonexistent or non-local repository C?dric Duval <cedricduval@free.fr> parents: 10690 diff changeset	3209 'may be initialized'))
a778a367c20b mq: fix init with nonexistent or non-local repository C?dric Duval <cedricduval@free.fr> parents: 10690 diff changeset	3210 else:
a778a367c20b mq: fix init with nonexistent or non-local repository C?dric Duval <cedricduval@free.fr> parents: 10690 diff changeset	3211 repopath = cmdutil.findrepo(os.getcwd())
a778a367c20b mq: fix init with nonexistent or non-local repository C?dric Duval <cedricduval@free.fr> parents: 10690 diff changeset	3212 if not repopath:
12067 a4fbbe0fbc38 Lowercase error messages Martin Geisler <mg@lazybytes.net> parents: 11965 diff changeset	3213 raise util.Abort(_('there is no Mercurial repository here '
10691 a778a367c20b mq: fix init with nonexistent or non-local repository C?dric Duval <cedricduval@free.fr> parents: 10690 diff changeset	3214 '(.hg not found)'))
10402 d216fa04e48a mq: make init -Q do what qinit -c did Brendan Cully <brendan@kublai.com> parents: 10401 diff changeset	3215 repo = hg.repository(ui, repopath)
10480 3076b39d7f3e mq: unify implementation of qinit and init -Q Brendan Cully <brendan@kublai.com> parents: 10476 diff changeset	3216 return qinit(ui, repo, True)
10402 d216fa04e48a mq: make init -Q do what qinit -c did Brendan Cully <brendan@kublai.com> parents: 10401 diff changeset	3217
10359 ec02cf8d1628 mq: add --mq option to some commands Brendan Cully <brendan@kublai.com> parents: 10282 diff changeset	3218 def mqcommand(orig, ui, repo, args, *kwargs):
ec02cf8d1628 mq: add --mq option to some commands Brendan Cully <brendan@kublai.com> parents: 10282 diff changeset	3219 """Add --mq option to operate on patch repository instead of main"""
ec02cf8d1628 mq: add --mq option to some commands Brendan Cully <brendan@kublai.com> parents: 10282 diff changeset	3220
ec02cf8d1628 mq: add --mq option to some commands Brendan Cully <brendan@kublai.com> parents: 10282 diff changeset	3221 # some commands do not like getting unknown options
10558 6505773080e4 mq: simplify --mq handling / keep compatibility with other extensions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10510 diff changeset	3222 mq = kwargs.pop('mq', None)
10359 ec02cf8d1628 mq: add --mq option to some commands Brendan Cully <brendan@kublai.com> parents: 10282 diff changeset	3223
ec02cf8d1628 mq: add --mq option to some commands Brendan Cully <brendan@kublai.com> parents: 10282 diff changeset	3224 if not mq:
ec02cf8d1628 mq: add --mq option to some commands Brendan Cully <brendan@kublai.com> parents: 10282 diff changeset	3225 return orig(ui, repo, args, *kwargs)
ec02cf8d1628 mq: add --mq option to some commands Brendan Cully <brendan@kublai.com> parents: 10282 diff changeset	3226
ec02cf8d1628 mq: add --mq option to some commands Brendan Cully <brendan@kublai.com> parents: 10282 diff changeset	3227 q = repo.mq
ec02cf8d1628 mq: add --mq option to some commands Brendan Cully <brendan@kublai.com> parents: 10282 diff changeset	3228 r = q.qrepo()
ec02cf8d1628 mq: add --mq option to some commands Brendan Cully <brendan@kublai.com> parents: 10282 diff changeset	3229 if not r:
11120 0bedcbcb3ae2 mq: mark error message for translation Martin Geisler <mg@lazybytes.net> parents: 11119 diff changeset	3230 raise util.Abort(_('no queue repository'))
10407 2e8926e9cc32 mq: incorporate mq repo config when using --mq Brendan Cully <brendan@kublai.com> parents: 10402 diff changeset	3231 return orig(r.ui, r, args, *kwargs)
10359 ec02cf8d1628 mq: add --mq option to some commands Brendan Cully <brendan@kublai.com> parents: 10282 diff changeset	3232
11107 9c72c5c094aa mq: add a line to hg summary Matt Mackall <mpm@selenic.com> parents: 11078 diff changeset	3233 def summary(orig, ui, repo, args, *kwargs):
9c72c5c094aa mq: add a line to hg summary Matt Mackall <mpm@selenic.com> parents: 11078 diff changeset	3234 r = orig(ui, repo, args, *kwargs)
9c72c5c094aa mq: add a line to hg summary Matt Mackall <mpm@selenic.com> parents: 11078 diff changeset	3235 q = repo.mq
9c72c5c094aa mq: add a line to hg summary Matt Mackall <mpm@selenic.com> parents: 11078 diff changeset	3236 m = []
9c72c5c094aa mq: add a line to hg summary Matt Mackall <mpm@selenic.com> parents: 11078 diff changeset	3237 a, u = len(q.applied), len(q.unapplied(repo))
9c72c5c094aa mq: add a line to hg summary Matt Mackall <mpm@selenic.com> parents: 11078 diff changeset	3238 if a:
11121 d061ef1d781c mq: make use of output labeling for summary Eric Eisner <ede@mit.edu> parents: 11120 diff changeset	3239 m.append(ui.label(_("%d applied"), 'qseries.applied') % a)
11107 9c72c5c094aa mq: add a line to hg summary Matt Mackall <mpm@selenic.com> parents: 11078 diff changeset	3240 if u:
11121 d061ef1d781c mq: make use of output labeling for summary Eric Eisner <ede@mit.edu> parents: 11120 diff changeset	3241 m.append(ui.label(_("%d unapplied"), 'qseries.unapplied') % u)
11107 9c72c5c094aa mq: add a line to hg summary Matt Mackall <mpm@selenic.com> parents: 11078 diff changeset	3242 if m:
11310 ac873ecfc3c2 Backed out changeset: e1dde7363601 Steve Borho <steve@borho.org> parents: 11302 diff changeset	3243 ui.write("mq: %s\n" % ', '.join(m))
11107 9c72c5c094aa mq: add a line to hg summary Matt Mackall <mpm@selenic.com> parents: 11078 diff changeset	3244 else:
11119 2e270443a2c6 mq: mark string for translation Martin Geisler <mg@lazybytes.net> parents: 11107 diff changeset	3245 ui.note(_("mq: (empty queue)\n"))
11107 9c72c5c094aa mq: add a line to hg summary Matt Mackall <mpm@selenic.com> parents: 11078 diff changeset	3246 return r
9c72c5c094aa mq: add a line to hg summary Matt Mackall <mpm@selenic.com> parents: 11078 diff changeset	3247
14210 68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets Idan Kamara <idankk86@gmail.com> parents: 14191 diff changeset	3248 def revsetmq(repo, subset, x):
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets Idan Kamara <idankk86@gmail.com> parents: 14191 diff changeset	3249 """``mq()``
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets Idan Kamara <idankk86@gmail.com> parents: 14191 diff changeset	3250 Changesets managed by MQ.
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets Idan Kamara <idankk86@gmail.com> parents: 14191 diff changeset	3251 """
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets Idan Kamara <idankk86@gmail.com> parents: 14191 diff changeset	3252 revset.getargs(x, 0, 0, _("mq takes no arguments"))
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets Idan Kamara <idankk86@gmail.com> parents: 14191 diff changeset	3253 applied = set([repo[r.node].rev() for r in repo.mq.applied])
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets Idan Kamara <idankk86@gmail.com> parents: 14191 diff changeset	3254 return [r for r in subset if r in applied]
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets Idan Kamara <idankk86@gmail.com> parents: 14191 diff changeset	3255
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets Idan Kamara <idankk86@gmail.com> parents: 14191 diff changeset	3256 def extsetup(ui):
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets Idan Kamara <idankk86@gmail.com> parents: 14191 diff changeset	3257 revset.symbols['mq'] = revsetmq
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets Idan Kamara <idankk86@gmail.com> parents: 14191 diff changeset	3258
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets Idan Kamara <idankk86@gmail.com> parents: 14191 diff changeset	3259 # tell hggettext to extract docstrings from these functions:
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets Idan Kamara <idankk86@gmail.com> parents: 14191 diff changeset	3260 i18nfunctions = [revsetmq]
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets Idan Kamara <idankk86@gmail.com> parents: 14191 diff changeset	3261
7142 88f1b8081f1c Prevent import over an applied patch (closes issue795) Brendan Cully <brendan@kublai.com> parents: 7113 diff changeset	3262 def uisetup(ui):
10591 ff2704a8ded3 mq: drop -Q in favor of --mq only Matt Mackall <mpm@selenic.com> parents: 10589 diff changeset	3263 mqopt = [('', 'mq', None, _("operate on patch repository"))]
10402 d216fa04e48a mq: make init -Q do what qinit -c did Brendan Cully <brendan@kublai.com> parents: 10401 diff changeset	3264
7216 292fb2ad2846 extensions: use new wrapper functions Matt Mackall <mpm@selenic.com> parents: 7213 diff changeset	3265 extensions.wrapcommand(commands.table, 'import', mqimport)
11107 9c72c5c094aa mq: add a line to hg summary Matt Mackall <mpm@selenic.com> parents: 11078 diff changeset	3266 extensions.wrapcommand(commands.table, 'summary', summary)
10402 d216fa04e48a mq: make init -Q do what qinit -c did Brendan Cully <brendan@kublai.com> parents: 10401 diff changeset	3267
d216fa04e48a mq: make init -Q do what qinit -c did Brendan Cully <brendan@kublai.com> parents: 10401 diff changeset	3268 entry = extensions.wrapcommand(commands.table, 'init', mqinit)
d216fa04e48a mq: make init -Q do what qinit -c did Brendan Cully <brendan@kublai.com> parents: 10401 diff changeset	3269 entry[1].extend(mqopt)
d216fa04e48a mq: make init -Q do what qinit -c did Brendan Cully <brendan@kublai.com> parents: 10401 diff changeset	3270
14448 7d367e8f892d mq: allow --mq for qrecord Idan Kamara <idankk86@gmail.com> parents: 14435 diff changeset	3271 nowrap = set(commands.norepo.split(" "))
12036 31f02288bbc4 mq: extend support for the --mq argument to extension commands Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11970 diff changeset	3272
31f02288bbc4 mq: extend support for the --mq argument to extension commands Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11970 diff changeset	3273 def dotable(cmdtable):
31f02288bbc4 mq: extend support for the --mq argument to extension commands Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11970 diff changeset	3274 for cmd in cmdtable.keys():
31f02288bbc4 mq: extend support for the --mq argument to extension commands Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11970 diff changeset	3275 cmd = cmdutil.parsealiases(cmd)[0]
31f02288bbc4 mq: extend support for the --mq argument to extension commands Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11970 diff changeset	3276 if cmd in nowrap:
31f02288bbc4 mq: extend support for the --mq argument to extension commands Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11970 diff changeset	3277 continue
31f02288bbc4 mq: extend support for the --mq argument to extension commands Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11970 diff changeset	3278 entry = extensions.wrapcommand(cmdtable, cmd, mqcommand)
31f02288bbc4 mq: extend support for the --mq argument to extension commands Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11970 diff changeset	3279 entry[1].extend(mqopt)
31f02288bbc4 mq: extend support for the --mq argument to extension commands Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11970 diff changeset	3280
31f02288bbc4 mq: extend support for the --mq argument to extension commands Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11970 diff changeset	3281 dotable(commands.table)
31f02288bbc4 mq: extend support for the --mq argument to extension commands Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11970 diff changeset	3282
31f02288bbc4 mq: extend support for the --mq argument to extension commands Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11970 diff changeset	3283 for extname, extmodule in extensions.extensions():
31f02288bbc4 mq: extend support for the --mq argument to extension commands Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11970 diff changeset	3284 if extmodule.__file__ != __file__:
31f02288bbc4 mq: extend support for the --mq argument to extension commands Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11970 diff changeset	3285 dotable(getattr(extmodule, 'cmdtable', {}))
7142 88f1b8081f1c Prevent import over an applied patch (closes issue795) Brendan Cully <brendan@kublai.com> parents: 7113 diff changeset	3286
10826 717c35d55fb3 color: colorize based on output labels instead of parsing output Brodie Rao <brodie@bitheap.org> parents: 10824 diff changeset	3287
717c35d55fb3 color: colorize based on output labels instead of parsing output Brodie Rao <brodie@bitheap.org> parents: 10824 diff changeset	3288 colortable = {'qguard.negative': 'red',
717c35d55fb3 color: colorize based on output labels instead of parsing output Brodie Rao <brodie@bitheap.org> parents: 10824 diff changeset	3289 'qguard.positive': 'yellow',
717c35d55fb3 color: colorize based on output labels instead of parsing output Brodie Rao <brodie@bitheap.org> parents: 10824 diff changeset	3290 'qguard.unguarded': 'green',
717c35d55fb3 color: colorize based on output labels instead of parsing output Brodie Rao <brodie@bitheap.org> parents: 10824 diff changeset	3291 'qseries.applied': 'blue bold underline',
717c35d55fb3 color: colorize based on output labels instead of parsing output Brodie Rao <brodie@bitheap.org> parents: 10824 diff changeset	3292 'qseries.guarded': 'black bold',
717c35d55fb3 color: colorize based on output labels instead of parsing output Brodie Rao <brodie@bitheap.org> parents: 10824 diff changeset	3293 'qseries.missing': 'red bold',
717c35d55fb3 color: colorize based on output labels instead of parsing output Brodie Rao <brodie@bitheap.org> parents: 10824 diff changeset	3294 'qseries.unapplied': 'black bold'}

Mercurial > public > mercurial-scm > hg-stable

annotate hgext/mq.py @ 15087:adad8d68fb1f